Changeset 317 for trunk/src

Timestamp:

Jul 16, 1999, 7:50:10 PM (26 years ago)

Author:

cbratschi

Message:

Button from WINE, first user32.cpp work

Location:

trunk/src/user32/new

Files:

• button.cpp (added)
• controls.cpp (added)
• makefile (modified) (3 diffs)
• user32.cpp (modified) (19 diffs)

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 1999-07-16 11:32:08 sandervl Exp $
+# $Id: makefile,v 1.4 1999-07-16 17:50:10 cbratschi Exp $
 
 #
@@ -27 +27 @@
         uitools.obj unknown.obj spy.obj wndmsg.obj \
         pmwindow.obj win32class.obj win32wnd.obj win32dlg.obj \
-        msgbox.obj window.obj windowmsg.obj windowclass.obj windlgmsg.obj \
+        msgbox.obj window.obj windowmsg.obj windowclass.obj windlgmsg.obj \
         windowword.obj gen_object.obj oslibwin.obj win32wndchild.obj
+        controls.obj button.obj
 
 
@@ -66 +67 @@
 spy.obj: spy.cpp $(PDWIN32_INCLUDE)\spy.h
 
+controls.obj: controls.cpp $(PDWIN32_INCLUDE)\win\controls.h
+button.obj: button.cpp $(PDWIN32_INCLUDE)\win\button.h
+
 msgbox.obj:    msgbox.cpp
 window.obj:    window.cpp win32class.h win32wnd.h win32wndchild.h

trunk/src/user32/new/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.1 1999-07-14 08:35:36 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.2 1999-07-16 17:50:10 cbratschi Exp $ */
 
 /*
@@ -189 +189 @@
     WriteLog("USER32:  MessageBeep\n");
 #endif
+/*
+    switch (arg1)
+    {
+      case 0xFFFFFFFF:
+        DosBeep(500,50);
+        return TRUE;
+      case MB_ICONASTERISK:
+        return WinAlarm(HWND_DESKTOP,WA_ERROR);
+      case MB_ICONEXCLAMATION:
+        return WinAlaram(HWND_DESKTOP,WA_WARNING);
+      case MB_ICONHAND:
+      case MB_ICONQUESTION:
+      case MB_OK:
+        return WinAlaram(HWND_DESKTOP,WA_NOTE);
+      default:
+        return WinAlarm(HWND_DESKTOP,WA_ERROR); //CB: should be right
+    }
+*/
     return O32_MessageBeep(arg1);
 }
 //******************************************************************************
-// Not implemented by Open32 (31-5-99 Christoph Bratschi)
 //******************************************************************************
 BOOL WIN32API IsDlgButtonChecked( HWND arg1, UINT  arg2)
@@ -199 +216 @@
     WriteLog("USER32:  IsDlgButtonChecked\n");
 #endif
-//    return O32_IsDlgButtonChecked(arg1, arg2);
+    //CB: get button state
     return (BOOL)SendDlgItemMessageA(arg1,arg2,BM_GETCHECK,0,0);
 }
@@ -207 +224 @@
 {
     dprintf(("USER32:  GetWindowTextLength\n"));
+    //return WinQueryWindowTextLength(arg1);
     return O32_GetWindowTextLength(arg1);
 }
@@ -214 +232 @@
 {
     dprintf(("USER32:  GetWindowTextA\n"));
+    //return WinQueryWindowText(arg1,arg3,arg2);
     return O32_GetWindowText(arg1, arg2, arg3);
 }
@@ -254 +273 @@
 {
 //    dprintf(("USER32:  GetFocus\n"));
+    //return WinQueryFocus(HWND_DESKTOP);
     return O32_GetFocus();
 }
@@ -278 +298 @@
 {
     dprintf(("USER32:  GetDesktopWindow\n"));
+    //return HWND_DESKTOP //CB: WinQueryDesktopWindow();, hab and hdc not available!
     return O32_GetDesktopWindow();
 }
@@ -310 +331 @@
 ////    WriteLog("USER32:  OffsetRect\n");
 #endif
+    //CB: inc values
+    // todo
     return O32_OffsetRect(arg1, arg2, arg3);
 }
@@ -317 +340 @@
 {
 //    ddprintf(("USER32:  CopyRect\n"));
+    //memcpy();
     return O32_CopyRect(arg1, arg2);
 }
@@ -335 +359 @@
 {
     dprintf(("USER32:  SetFocus\n"));
+    //return WinSetFocus(HWND_DESKTOP,arg1);
     return O32_SetFocus(arg1);
 }
@@ -344 +369 @@
     WriteLog("USER32:  ReleaseDC\n");
 #endif
+    //return WinReleasePS(arg2);
     return O32_ReleaseDC(arg1, arg2);
 }
@@ -355 +381 @@
     else    WriteLog("USER32:  InvalidateRect for window %X NULL, %d\n", arg1, arg3);
 #endif
+    //return WinInvalidateRect(arg1,arg2,arg3);
     return O32_InvalidateRect(arg1, arg2, arg3);
 }
@@ -372 +399 @@
  HDC hdc;
 
+   //hdc = WinGetPS(arg1);
    hdc = O32_GetDC(arg1);
 #ifdef DEBUG
@@ -385 +413 @@
     WriteLog("USER32:  GetDCEx\n");
 #endif
+    //return GetDC(arg1);
+    //change values
     return O32_GetDCEx(arg1, arg2, arg3);
 }
@@ -394 +424 @@
     WriteLog("USER32:  EndPaint\n");
 #endif
+    //return WinEndPaint(arg2->hdc);
     return O32_EndPaint(arg1, arg2);
 }
@@ -403 +434 @@
 {
     dprintf(("USER32: BeginPaint %X\n", arg2));
+    //return WinBeginPaint(arg1,);
+    //CB: emulate
     return O32_BeginPaint(arg1, arg2);
 }
@@ -413 +446 @@
    switch(arg1) {
     case SM_CXICONSPACING: //TODO: size of grid cell for large icons
+        //rc = WinQuerySysValue(HWND_DESKTOP,SV_CXICON);
+        //CB: better: return standard windows icon size
+        //rc = 32;
         rc = O32_GetSystemMetrics(SM_CXICON);
         break;
@@ -765 +801 @@
 }
 //******************************************************************************
-// Not implemented by Open32 (5-31-99 Christoph Bratschi)
 //******************************************************************************
 BOOL WIN32API CheckRadioButton( HWND arg1, UINT arg2, UINT arg3, UINT  arg4)
@@ -772 +807 @@
     WriteLog("USER32:  CheckRadioButton\n");
 #endif
-//    return O32_CheckRadioButton(arg1, arg2, arg3, arg4);
+    //CB: check radio buttons in interval
     if (arg2 > arg3) return (FALSE);
     for (UINT x=arg2;x <= arg3;x++)