diff --git a/Contrib/Library/TypeLib/TypeLib.cpp b/Contrib/Library/TypeLib/TypeLib.cpp index 137cb052..095dddfb 100644 --- a/Contrib/Library/TypeLib/TypeLib.cpp +++ b/Contrib/Library/TypeLib/TypeLib.cpp @@ -11,115 +11,115 @@ #define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) extern "C" BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { - return TRUE; + return TRUE; } // Functions NSISFunction(Register) { - - EXDLL_INIT(); - char filename[1024]; - popstring(filename); + EXDLL_INIT(); - wchar_t ole_filename[1024]; - MultiByteToWideChar(CP_ACP, 0, filename, 1024, ole_filename, 1024); + char filename[1024]; + popstring(filename); - ITypeLib* typeLib; - HRESULT hr; + wchar_t ole_filename[1024]; + MultiByteToWideChar(CP_ACP, 0, filename, 1024, ole_filename, 1024); - hr = LoadTypeLib(ole_filename, &typeLib); - - if (SUCCEEDED(hr)) { + ITypeLib* typeLib; + HRESULT hr; - RegisterTypeLib(typeLib, ole_filename, NULL); - - hr = typeLib->Release(); + hr = LoadTypeLib(ole_filename, &typeLib); + + if (SUCCEEDED(hr)) { + + RegisterTypeLib(typeLib, ole_filename, NULL); + + hr = typeLib->Release(); + + } - } - } NSISFunction(UnRegister) { - EXDLL_INIT(); + EXDLL_INIT(); - char filename[1024]; - popstring(filename); + char filename[1024]; + popstring(filename); - wchar_t ole_filename[1024]; - MultiByteToWideChar(CP_ACP, 0, filename, 1024, ole_filename, 1024); + wchar_t ole_filename[1024]; + MultiByteToWideChar(CP_ACP, 0, filename, 1024, ole_filename, 1024); - ITypeLib* typeLib; - HRESULT hr; - - hr = LoadTypeLibEx(ole_filename, REGKIND_NONE, &typeLib); + ITypeLib* typeLib; + HRESULT hr; - if (SUCCEEDED(hr)) - { + hr = LoadTypeLibEx(ole_filename, REGKIND_NONE, &typeLib); - TLIBATTR* typelibAttr; - - hr = typeLib->GetLibAttr(&typelibAttr); - - if(SUCCEEDED(hr)) - { - - UnRegisterTypeLib(typelibAttr->guid, - typelibAttr->wMajorVerNum, - typelibAttr->wMinorVerNum, - typelibAttr->lcid, - typelibAttr->syskind); + if (SUCCEEDED(hr)) + { + + TLIBATTR* typelibAttr; + + hr = typeLib->GetLibAttr(&typelibAttr); + + if(SUCCEEDED(hr)) + { + + UnRegisterTypeLib(typelibAttr->guid, + typelibAttr->wMajorVerNum, + typelibAttr->wMinorVerNum, + typelibAttr->lcid, + typelibAttr->syskind); + + typeLib->ReleaseTLibAttr(typelibAttr); + + } + + typeLib->Release(); + + } - typeLib->ReleaseTLibAttr(typelibAttr); - - } - - typeLib->Release(); - - } - } NSISFunction(GetLibVersion) { - EXDLL_INIT(); + EXDLL_INIT(); - char filename[1024]; - popstring(filename); + char filename[1024]; + popstring(filename); - wchar_t ole_filename[1024]; - MultiByteToWideChar(CP_ACP, 0, filename, 1024, ole_filename, 1024); + wchar_t ole_filename[1024]; + MultiByteToWideChar(CP_ACP, 0, filename, 1024, ole_filename, 1024); - ITypeLib* typeLib; - HRESULT hr; + ITypeLib* typeLib; + HRESULT hr; - hr = LoadTypeLib(ole_filename, &typeLib); - - if (SUCCEEDED(hr)) - { + hr = LoadTypeLib(ole_filename, &typeLib); - TLIBATTR* typelibAttr; - - hr = typeLib->GetLibAttr(&typelibAttr); + if (SUCCEEDED(hr)) + { - if (SUCCEEDED(hr)) - { - - char buf[33]; + TLIBATTR* typelibAttr; - wsprintf(buf, "%d", typelibAttr->wMajorVerNum); - pushstring(buf); - wsprintf(buf, "%d", typelibAttr->wMinorVerNum); - pushstring(buf); + hr = typeLib->GetLibAttr(&typelibAttr); + + if (SUCCEEDED(hr)) + { + + char buf[33]; + + wsprintf(buf, "%d", typelibAttr->wMajorVerNum); + pushstring(buf); + wsprintf(buf, "%d", typelibAttr->wMinorVerNum); + pushstring(buf); typeLib->ReleaseTLibAttr(typelibAttr); - } + } - typeLib->Release(); + typeLib->Release(); - } + } }