* Sync up to trunk head (r65095).

[reactos.git] / base / system / regsvr32 / regsvr32.c

diff --git a/base/system/regsvr32/regsvr32.c b/base/system/regsvr32/regsvr32.c
index c3e4d86..28ae13e 100644 (file)
--- a/base/system/regsvr32/regsvr32.c
+++ b/base/system/regsvr32/regsvr32.c
@@ -9,8 +9,6 @@
  * PROGRAMMER:      ShadowFlare (blakflare@hotmail.com)
  */
 
-#define WIN32_LEAN_AND_MEAN
-
 // Both UNICODE and _UNICODE must be either defined or undefined
 // because some headers use UNICODE and others use _UNICODE
 #ifdef UNICODE
@@ -23,11 +21,13 @@
 #endif
 #endif
 
-#include <windows.h>
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
 #include <ole2.h>
-#include <stdio.h>
-#include <string.h>
-#include <malloc.h>
 #include <tchar.h>
 
 typedef HRESULT (WINAPI *DLLREGISTER)(void);
@@ -52,8 +52,6 @@ LPCWSTR tszDllInstall = L"DllInstall";
 #define tszDllInstall szDllInstall
 #endif
 
-
-
 #include "resource.h"
 
 LPCTSTR ModuleTitle = _T("RegSvr32");
@@ -67,7 +65,6 @@ TCHAR MissingEntry[RC_STRING_MAX_SIZE];
 TCHAR FailureMessage[RC_STRING_MAX_SIZE];
 TCHAR SuccessMessage[RC_STRING_MAX_SIZE];
 
-
 // The macro CommandLineToArgv maps to a function that converts
 // a command-line string to argc and argv similar to the ones
 // in the standard main function.  If this code is compiled for
@@ -451,7 +448,6 @@ int WINAPI _tWinMain(
                                                        nRetValue = EXITCODE_FAILURE;
                                        }
                                        else {
-                                               FreeLibrary(hDll);
                                                // DllInstall was not found, display an error message
                                                lptMsgBuffer = (LPTSTR)malloc((_tcslen(MissingEntry) - 8 + _tcslen(tszDllInstall) * 2 + _tcslen(lptDllName) * 2 + 1) * sizeof(TCHAR));
                                                _stprintf(lptMsgBuffer,MissingEntry,lptDllName,tszDllInstall,tszDllInstall,lptDllName);
@@ -482,4 +478,3 @@ int WINAPI _tWinMain(
        OleUninitialize();
        return nRetValue;
 }
-