Changeset 1671 for trunk/src/user32/user32.cpp

Timestamp:

Nov 9, 1999, 8:23:17 PM (26 years ago)

Author:

sandervl

Message:

dprintf2 addition + Rene Pronk's mnemonics changes

File:

• trunk/src/user32/user32.cpp (modified) (24 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.51 1999-11-08 13:44:14 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.52 1999-11-09 19:23:16 sandervl Exp $ */
 
 /*
@@ -99 +99 @@
 BOOL WIN32API CopyRect( PRECT lprcDst, const RECT * lprcSrc)
 {
-//    ddprintf(("USER32:  CopyRect\n"));
+    dprintf2(("USER32:  CopyRect\n"));
     if (!lprcDst || !lprcSrc) {
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -113 +113 @@
 BOOL WIN32API EqualRect( const RECT *lprc1, const RECT *lprc2)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  EqualRect\n");
-#endif
+    dprintf2(("USER32:  EqualRect\n"));
     if (!lprc1 || !lprc2)
     {
@@ -131 +129 @@
 BOOL WIN32API InflateRect( PRECT lprc, int dx, int  dy)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  InflateRect\n");
-#endif
+    dprintf(("USER32:  InflateRect\n"));
     if (!lprc)
     {
@@ -151 +147 @@
 BOOL WIN32API IntersectRect( PRECT lprcDst, const RECT * lprcSrc1, const RECT * lprcSrc2)
 {
-#ifdef DEBUG
-////    WriteLog("USER32:  IntersectRect\n");
-#endif
+    dprintf2(("USER32:  IntersectRect\n"));
     if (!lprcDst || !lprcSrc1 || !lprcSrc2)
     {
@@ -191 +185 @@
 BOOL WIN32API OffsetRect( PRECT lprc, int x, int  y)
 {
-#ifdef DEBUG
-////    WriteLog("USER32:  OffsetRect\n");
-#endif
+    dprintf2(("USER32:  OffsetRect\n"));
     if (!lprc)
     {
@@ -211 +203 @@
 BOOL WIN32API PtInRect( const RECT *lprc, POINT pt)
 {
-#ifdef DEBUG1
-    WriteLog("USER32:  PtInRect\n");
-#endif
+    dprintf2(("USER32:  PtInRect\n"));
     if (!lprc)
     {
@@ -260 +250 @@
 BOOL WIN32API SubtractRect( PRECT lprcDest, const RECT * lprcSrc1, const RECT * lprcSrc2)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  SubtractRect");
-#endif
+    dprintf2(("USER32:  SubtractRect"));
     RECT tmp;
 
@@ -303 +291 @@
 BOOL WIN32API UnionRect( PRECT lprcDst, const RECT *lprcSrc1, const RECT *lprcSrc2)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  UnionRect\n");
-#endif
+    dprintf2(("USER32:  UnionRect\n"));
     if (!lprcDst || !lprcSrc1 || !lprcSrc2)
     {
@@ -341 +327 @@
 BOOL WIN32API ClipCursor(const RECT * lpRect)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  ClipCursor\n");
-#endif
+    dprintf(("USER32:  ClipCursor\n"));
     return O32_ClipCursor(lpRect);
 }
@@ -350 +334 @@
 HCURSOR WIN32API CreateCursor( HINSTANCE hInst, int xHotSpot, int yHotSpot, int nWidth, int nHeight, const VOID *pvANDPlane, const VOID *pvXORPlane)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  CreateCursor\n");
-#endif
+    dprintf(("USER32:  CreateCursor\n"));
     return O32_CreateCursor(hInst,xHotSpot,yHotSpot,nWidth,nHeight,pvANDPlane,pvXORPlane);
 }
@@ -359 +341 @@
 BOOL WIN32API DestroyCursor( HCURSOR hCursor)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  DestroyCursor\n");
-#endif
+    dprintf(("USER32:  DestroyCursor\n"));
     return O32_DestroyCursor(hCursor);
 }
@@ -368 +348 @@
 BOOL WIN32API GetClipCursor( LPRECT lpRect)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  GetClipCursor\n");
-#endif
+    dprintf(("USER32:  GetClipCursor\n"));
     return O32_GetClipCursor(lpRect);
 }
@@ -377 +355 @@
 HCURSOR WIN32API GetCursor(void)
 {
-#ifdef DEBUG
-////    WriteLog("USER32:  GetCursor\n");
-#endif
+    dprintf2(("USER32:  GetCursor\n"));
     return O32_GetCursor();
 }
@@ -388 +364 @@
     BOOL rc;
     POINT point;
-#ifdef DEBUG
-////    WriteLog("USER32:  GetCursorPos\n");
-#endif
+
+    dprintf2(("USER32:  GetCursorPos\n"));
+
     if (!lpPoint) return FALSE;
     if (OSLibWinQueryPointerPos(OSLIB_HWND_DESKTOP,&point)) //POINT == POINTL
@@ -422 +398 @@
   {
     return LoadCursorA(NULL,lpFileName);
-  } else
+  } 
+  else
   {
     dprintf(("USER32:LoadCursorFromFileA (%s) not implemented.\n",
@@ -476 +453 @@
 BOOL WIN32API SetCursorPos( int X, int Y)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  SetCursorPos\n");
-#endif
+    dprintf(("USER32:  SetCursorPos %d %d", X,Y));
     return O32_SetCursorPos(X,Y);
 }
@@ -512 +487 @@
 int WIN32API ShowCursor( BOOL bShow)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  ShowCursor\n");
-#endif
+    dprintf2(("USER32:  ShowCursor %d", bShow));
     return O32_ShowCursor(bShow);
 }
@@ -547 +520 @@
 UINT WIN32API GetDoubleClickTime(void)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  GetDoubleClickTime\n");
-#endif
+    dprintf(("USER32:  GetDoubleClickTime\n"));
     return O32_GetDoubleClickTime();
 }
@@ -845 +816 @@
         break;
     }
-#ifdef DEBUG
-    WriteLog("USER32:  GetSystemMetrics %d returned %d\n", nIndex, rc);
-#endif
+    dprintf(("USER32:  GetSystemMetrics %d returned %d\n", nIndex, rc));
     return(rc);
 }
@@ -949 +918 @@
         break;
   }
-#ifdef DEBUG
-  WriteLog("USER32:  SystemParametersInfoA %d, returned %d\n", uiAction, rc);
-#endif
+  dprintf(("USER32:  SystemParametersInfoA %d, returned %d\n", uiAction, rc));
   return(rc);
 }
@@ -1133 +1100 @@
 WORD WIN32API GetAsyncKeyState(INT nVirtKey)
 {
-#ifdef DEBUG
-////    WriteLog("USER32:  GetAsyncKeyState Not implemented\n");
-#endif
+    dprintf2(("USER32:  GetAsyncKeyState Not implemented\n"));
     return 0;
 }
@@ -1185 +1150 @@
 int WIN32API GetKeyboardLayoutList(int nBuff, HKL *lpList)
 {
-#ifdef DEBUG
-  WriteLog("USER32:  GetKeyboardLayoutList, not implemented\n");
-#endif
+  dprintf(("USER32:  GetKeyboardLayoutList, not implemented\n"));
   return(0);
 }
@@ -1257 +1220 @@
 {
 //SvL: Hehe. 32 MB logfile for Opera after a minute.
-#ifdef DEBUG
-//    WriteLog("USER32:  GetKeyState %d\n", nVirtKey);
-#endif
+    dprintf2(("USER32:  GetKeyState %d\n", nVirtKey));
     return O32_GetKeyState(nVirtKey);
 }