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

Timestamp:

Oct 17, 1999, 5:46:10 PM (26 years ago)

Author:

sandervl

Message:

Dialog fixes + ported Wine apis

File:

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

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.42 1999-10-14 19:31:31 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.43 1999-10-17 15:46:08 sandervl Exp $ */
 
 /*
@@ -1373 +1373 @@
 SHORT WIN32API GetKeyState( int nVirtKey)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  GetKeyState %d\n", nVirtKey);
+//SvL: Hehe. 32 MB logfile for Opera after a minute.
+#ifdef DEBUG
+//    WriteLog("USER32:  GetKeyState %d\n", nVirtKey);
 #endif
     return O32_GetKeyState(nVirtKey);
@@ -1870 +1871 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API EndDeferWindowPos( HDWP hWinPosInfo)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  EndDeferWindowPos\n");
-#endif
-    return O32_EndDeferWindowPos(hWinPosInfo);
-}
-//******************************************************************************
-//******************************************************************************
-HWND WIN32API FindWindowW( LPCWSTR lpClassName, LPCWSTR lpWindowName)
-{
- char *astring1 = UnicodeToAsciiString((LPWSTR)lpClassName);
- char *astring2 = UnicodeToAsciiString((LPWSTR)lpWindowName);
- HWND rc;
-
-#ifdef DEBUG
-    WriteLog("USER32:  FindWindowW\n");
-#endif
-    rc = O32_FindWindow(astring1, astring2);
-    FreeAsciiString(astring1);
-    FreeAsciiString(astring2);
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
 HWND WIN32API GetForegroundWindow(void)
 {
@@ -1938 +1914 @@
 //******************************************************************************
 //******************************************************************************
-#if 0
-int WIN32API GetUpdateRgn( HWND hWnd, HRGN hRgn, BOOL bErase)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetUpdateRgn\n");
-#endif
-    hWnd = Win32Window::Win32ToOS2Handle(hWnd);
-
-    return O32_GetUpdateRgn(hWnd,hRgn,bErase);
-}
-#endif
 /*****************************************************************************
  * Name      : int WIN32API GetWindowRgn
@@ -2288 +2253 @@
 BOOL WIN32API ScreenToClient (HWND hwnd, LPPOINT pt)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  ScreenToClient\n");
-#endif
     Win32BaseWindow *wnd;
     PRECT rcl;
+
+    dprintf(("ScreenToClient %x (%d,%d)\n", hwnd, pt->x, pt->y));
 
     if (!hwnd) return (TRUE);
@@ -2302 +2266 @@
     OSLibWinMapWindowPoints (OSLIB_HWND_DESKTOP, wnd->getOS2WindowHandle(), (OSLIBPOINT *)pt, 1);
     pt->y = (rcl->bottom - rcl->top) - pt->y;
+    dprintf(("ScreenToClient %x returned (%d,%d)\n", hwnd, pt->x, pt->y));
     return (TRUE);
 }
 
-/* Scroll Bar Functions */
-
-#if 0
-BOOL WIN32API ScrollDC( HDC arg1, int arg2, int arg3, const RECT * arg4, const RECT * arg5, HRGN arg6, PRECT  arg7)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  ScrollDC\n");
-#endif
-    return O32_ScrollDC(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-}
-#endif
-
 /* Icon Functions */
-
 int WIN32API LookupIconIdFromDirectory(PBYTE presbits, BOOL fIcon)
 {