Changeset 5391 for trunk/src

Timestamp:

Mar 28, 2001, 6:20:32 PM (24 years ago)

Author:

sandervl

Message:

log msg updates

Location:

trunk/src/user32

Files:

• dde.cpp (modified) (5 diffs)
• loadres.cpp (modified) (5 diffs)

trunk/src/user32/dde.cpp

@@ -1 @@
-/* $Id: dde.cpp,v 1.10 2000-02-16 14:34:14 sandervl Exp $ */
+/* $Id: dde.cpp,v 1.11 2001-03-28 16:20:32 sandervl Exp $ */
 
 /*
@@ -42 +42 @@
                                        PDWORD  arg8)
 {
-
     dprintf(("USER32:  DdeClientTransaction\n"));
 
@@ -58 +57 @@
 //******************************************************************************
 //******************************************************************************
-HCONV WIN32API DdeConnect( DWORD arg1, HSZ arg2, HSZ arg3, LPCONVCONTEXT  arg4)
+HCONV WIN32API DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic, 
+                          LPCONVCONTEXT pCC)
 {
  HCONV rc;
 
-    rc = O32_DdeConnect(arg1, arg2, arg3, arg4);
-    dprintf(("USER32: DdeConnect %x %x returned %d (%x)", arg2, arg3, rc, DdeGetLastError(arg1)));
+    rc = O32_DdeConnect(idInst, hszService, hszTopic, pCC);
+    dprintf(("USER32: DdeConnect %x %x %x %x returned %d (%x)", idInst, hszService, hszTopic, pCC, rc, DdeGetLastError(idInst)));
     return rc;
 }
@@ -85 +85 @@
 //******************************************************************************
 //******************************************************************************
-HSZ WIN32API DdeCreateStringHandleA(DWORD arg1, LPCSTR arg2, int  arg3)
+HSZ WIN32API DdeCreateStringHandleA(DWORD idInst, LPCSTR lpszString, int codepage)
 {
  HSZ rc;
 
-    rc = O32_DdeCreateStringHandle(arg1, arg2, arg3);
-    dprintf(("USER32: OS2DdeCreateStringHandleA %s returned %x", arg2, rc));
+    rc = O32_DdeCreateStringHandle(idInst, lpszString, codepage);
+    dprintf(("USER32: DdeCreateStringHandleA %x %s %x returned %x", idInst, lpszString, codepage, rc));
     return rc;
 }
@@ -170 +170 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API DdeInitializeA(PDWORD arg1, PFNCALLBACK arg2, DWORD arg3, DWORD  arg4)
-{
- UINT rc;
-
-    rc = O32_DdeInitialize(arg1, arg2, arg3, arg4);
-
-    dprintf(("USER32:  DdeInitializeA\n"));
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
-UINT WIN32API DdeInitializeW(PDWORD arg1, PFNCALLBACK arg2, DWORD arg3, DWORD  arg4)
-{
-
-    dprintf(("USER32:  DdeInitializeW\n"));
+HDDEDATA EXPENTRY_O32 DdeCallback(UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, 
+                                  HSZ hsz2, HDDEDATA hdata, DWORD dwData1, 
+                                  DWORD dwData2) 
+{
+   dprintf(("DdeCallback %x %x %x %x %x %x %x %x", uType, uFmt, hconv, hsz1, hsz2,
+            hdata, dwData1, dwData2));
+   return 0;
+}
+//******************************************************************************
+//******************************************************************************
+UINT WIN32API DdeInitializeA(PDWORD lpidInst, PFNCALLBACK pfnCallback, 
+                             DWORD afCmd, DWORD ulRes)
+{
+ UINT ret;
+
+//    ret = O32_DdeInitialize(lpidInst, pfnCallback, afCmd, ulRes);
+    ret = O32_DdeInitialize(lpidInst, (PFNCALLBACK_O32)DdeCallback, afCmd, ulRes);
+    dprintf(("USER32: DdeInitialize %x %x %x %x returned %x", lpidInst, pfnCallback, afCmd, ulRes, ret));
+    return ret;
+}
+//******************************************************************************
+//******************************************************************************
+UINT WIN32API DdeInitializeW(PDWORD lpidInst, PFNCALLBACK pfnCallback, 
+                             DWORD afCmd, DWORD ulRes)
+{
+ UINT ret;
 
     // NOTE: This will not work as is (needs UNICODE support)
-    return O32_DdeInitialize(arg1, arg2, arg3, arg4);
+    ret = O32_DdeInitialize(lpidInst, (PFNCALLBACK_O32)DdeCallback, afCmd, ulRes);
+    dprintf(("USER32: DdeInitializeW %x %x %x %x returned %x", lpidInst, pfnCallback, afCmd, ulRes, ret));
+    return ret;
+//    return O32_DdeInitialize(arg1, arg2, arg3, arg4);
 }
 //******************************************************************************

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.35 2001-03-27 16:17:51 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.36 2001-03-28 16:20:32 sandervl Exp $ */
 
 /*
@@ -94 +94 @@
     }
 
-#ifdef DEBUG_ENABLELOG_LEVEL2
     if(i) {
-        char *astring = (char *)HEAP_strdupWtoA(GetProcessHeap(), 0, lpBuffer);
-        dprintf(("LoadStringW from %X, id %d %s\n", hinst, wID, astring));
-        HEAP_free(astring);
-    }
-#else
-    dprintf(("LoadStringW from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
-#endif
+         dprintf(("LoadStringW from %X, id %d %ls buffersize %d", hinst, wID, lpBuffer, cchBuffer));
+    }
+    else dprintf(("LoadStringW from %X, id %d buffersize %d", hinst, wID, cchBuffer));
     return(i);
 }
@@ -119 +114 @@
 HICON WIN32API LoadIconW(HINSTANCE hinst, LPCWSTR lpszIcon)
 {
-    dprintf(("LoadIconA %x %x", hinst, lpszIcon));
+    if(HIWORD(lpszIcon)) {
+         dprintf(("LoadIconW %x %ls", hinst, lpszIcon));
+    }
+    else dprintf(("LoadIconW %x %x", hinst, lpszIcon));
     return LoadImageW(hinst, lpszIcon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE);
 }
@@ -344 +342 @@
 
   if(HIWORD(lpszBitmap)) {
-        dprintf(("LoadBitmapW %x %s returned %08xh\n", hinst, lpszBitmap, hBitmap));
+        dprintf(("LoadBitmapW %x %ls returned %08xh\n", hinst, lpszBitmap, hBitmap));
   }
   else  dprintf(("LoadBitmapW %x %x returned %08xh\n", hinst, lpszBitmap, hBitmap));
@@ -382 +380 @@
  HANDLE hRet = 0;
 
-  dprintf(("LoadImageW %x %x %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
+  if(HIWORD(lpszName)) {
+        dprintf(("LoadImageW %x %ls %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
+  }
+  else  dprintf(("LoadImageW %x %x %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
 
   if (fuLoad & LR_DEFAULTSIZE) {