Changeset 21824 for branches/gcc-kmk/src/user32

Timestamp:

Nov 25, 2011, 10:19:52 PM (14 years ago)

Author:

dmik

Message:

Make the debug version of ported DLLs build.

Location:

branches/gcc-kmk/src/user32

Files:

• dbglocal.cpp (modified) (1 diff)
• dbgwrap.cpp (modified) (1 diff)
• initterm.cpp (modified) (1 diff)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (1 diff)
• win32wbaseprop.cpp (modified) (4 diffs)
• wndmsg.cpp (modified) (2 diffs)
• wndmsg.h (modified) (1 diff)

branches/gcc-kmk/src/user32/dbglocal.cpp

@@ -20 +20 @@
 USHORT DbgEnabledLvl2USER32[DBG_MAXFILES] = {0};
 
-static char  *DbgFileNames[DBG_MAXFILES] =
+static const char *DbgFileNames[DBG_MAXFILES] =
 {
 "user32",

branches/gcc-kmk/src/user32/dbgwrap.cpp

@@ -16 +16 @@
 
 #define DBG_LOCALLOG    DBG_trace
-#include <dbglocal.h>
+#include "dbglocal.h"
 
 #define DBGWRAP_MODULE "USER32"

branches/gcc-kmk/src/user32/initterm.cpp

@@ -152 +152 @@
            return 0UL;
 
-    dprintf(("user32 init %s %s (%x)", __DATE__, __TIME__, inittermUser32));
+    dprintf(("user32 init %s %s (%x)", __DATE__, __TIME__, DLL_InitUser32));
 
     //SvL: Try to start communication with our message spy queue server

branches/gcc-kmk/src/user32/win32wbase.cpp

@@ -307 +307 @@
 BOOL Win32BaseWindow::IsWindowUnicode()
 {
-    dprintf2(("IsWindowUnicode %x %d", getWindowHandle(), WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W));
+    dprintf2(("IsWindowUnicode %x %d", getWindowHandle(),
+              WINPROC_GetProcType((HWINDOWPROC)getWindowProc()) == WIN_PROC_32W));
     return (WINPROC_GetProcType((HWINDOWPROC)getWindowProc()) == WIN_PROC_32W);
 }
@@ -4299 +4300 @@
 //******************************************************************************
 //******************************************************************************
-LONG  Win32BaseWindow::release(char *function, int line)
+LONG  Win32BaseWindow::release(const char *function, int line)
 {
 //    dprintf2(("release %s %d %x %d", function, line, getWindowHandle(), getRefCount()-1));

branches/gcc-kmk/src/user32/win32wbase.h

@@ -353 +353 @@
 #ifdef DEBUG
          LONG addRef();
-         LONG release(char *function = __FUNCTION__, int line = __LINE__ );
+         LONG release(const char *function = __FUNCTION__, int line = __LINE__ );
 #endif
 

branches/gcc-kmk/src/user32/win32wbaseprop.cpp

@@ -70 +70 @@
 
     if(HIWORD(str)) {
-         dprintf2(("GetProp %x %s %x", getWindowHandle, str, prop ? prop->handle : 0));
-    }
-    else dprintf2(("GetProp %x %x %x", getWindowHandle, str, prop ? prop->handle : 0));
+         dprintf2(("GetProp %x %s %x", getWindowHandle(), str, prop ? prop->handle : 0));
+    }
+    else dprintf2(("GetProp %x %x %x", getWindowHandle(), str, prop ? prop->handle : 0));
 
     return prop ? prop->handle : 0;
@@ -85 +85 @@
 
     if (HIWORD(str)) {
-         dprintf2(("SetProp %x %s %x", getWindowHandle, str, handle));
-    }
-    else dprintf2(("SetProp %x %x %x", getWindowHandle, str, handle));
+         dprintf2(("SetProp %x %s %x", getWindowHandle(), str, handle));
+    }
+    else dprintf2(("SetProp %x %x %x", getWindowHandle(), str, handle));
 
     if (!(prop = findWindowProperty(str)))
@@ -192 +192 @@
     INT ret = -1;
 
-    dprintf(("EnumPropsExA %x %x %x", getWindowHandle, func, lParam));
+    dprintf(("EnumPropsExA %x %x %x", getWindowHandle(), func, lParam));
 
     for (prop = propertyList; (prop); prop = next)
@@ -220 +220 @@
     INT ret = -1;
 
-    dprintf(("EnumPropsExW %x %x %x", getWindowHandle, func, lParam));
+    dprintf(("EnumPropsExW %x %x %x", getWindowHandle(), func, lParam));
 
     for (prop = propertyList; (prop); prop = next)

branches/gcc-kmk/src/user32/wndmsg.cpp

@@ -23 +23 @@
 typedef struct
 {
-    LPSTR pszMsg;
+    LPCSTR pszMsg;
     UINT msg;
     UINT Flags;
@@ -750 +750 @@
 
 
-char *GetMsgText(int Msg)
+const char *GetMsgText(int Msg)
 {
  static char msgtxt[64];

branches/gcc-kmk/src/user32/wndmsg.h

@@ -17 +17 @@
 
 #ifdef DEBUG_LOGGING
-char *GetMsgText(int Msg);
+const char *GetMsgText(int Msg);
 
 void DebugPrintMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL fUnicode, BOOL fInternalMsg);