Autosyncing with Wine HEAD

[reactos.git] / reactos / dll / win32 / comdlg32 / cdlg32.c

diff --git a/reactos/dll/win32/comdlg32/cdlg32.c b/reactos/dll/win32/comdlg32/cdlg32.c
index c927d1e..57f3036 100644 (file)
--- a/reactos/dll/win32/comdlg32/cdlg32.c
+++ b/reactos/dll/win32/comdlg32/cdlg32.c
@@ -19,16 +19,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "commdlg.h"
+#include "cderr.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
+#include "cdlg.h"
+
+
 HINSTANCE      COMDLG32_hInstance = 0;
 
 static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES;
 
-HINSTANCE      SHELL32_hInstance = 0;
-HINSTANCE      SHFOLDER_hInstance = 0;
+static HINSTANCE       SHELL32_hInstance;
+static HINSTANCE       SHFOLDER_hInstance;
 
 /* ITEMIDLIST */
 LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
@@ -52,17 +63,17 @@ BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR);
  *     FALSE if sibling could not be loaded or instantiated twice, TRUE
  *     otherwise.
  */
-static const char * GPA_string = "Failed to get entry point %s for hinst = 0x%08x\n";
+static const char GPA_string[] = "Failed to get entry point %s for hinst = %p\n";
 #define GPA(dest, hinst, name) \
        if(!(dest = (void*)GetProcAddress(hinst,name)))\
        { \
-         ERR((LPSTR)GPA_string, debugstr_a(name), hinst); \
+         ERR(GPA_string, debugstr_a(name), hinst); \
          return FALSE; \
        }
 
 BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
 {
-       TRACE("(%p, %ld, %p)\n", hInstance, Reason, Reserved);
+       TRACE("(%p, %d, %p)\n", hInstance, Reason, Reserved);
 
        switch(Reason)
        {
@@ -143,7 +154,7 @@ LPVOID COMDLG32_AllocMem(
  */
 void COMDLG32_SetCommDlgExtendedError(DWORD err)
 {
-       TRACE("(%08lx)\n", err);
+       TRACE("(%08x)\n", err);
         if (COMDLG32_TlsIndex == TLS_OUT_OF_INDEXES)
          COMDLG32_TlsIndex = TlsAlloc();
        if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES)