Browse Source

* fix for 3299

marco 21 years ago
parent
commit
922b9ebd6d

+ 6 - 3
rtl/win32/wininc/redef.inc

@@ -753,8 +753,8 @@ function RegisterClass(const lpWndClass: TWndClass): ATOM;external 'user32' name
 function RegisterClassA(const lpWndClass: TWndClassA): ATOM; external 'user32' name 'RegisterClassA';
 function RegisterClassEx(const WndClass: TWndClassEx): ATOM;external 'user32' name 'RegisterClassExA';
 function RegisterClassExA(const WndClass: TWndClassExA): ATOM; external 'user32' name 'RegisterClassExA';
-//function RegisterClassExW(const WndClass: TWndClassExW): ATOM; external 'user32' name 'RegisterClassExW';
-//function RegisterClassW(const lpWndClass: TWndClassW): ATOM; external 'user32' name 'RegisterClassW';
+function RegisterClassExW(const WndClass: TWndClassExW): ATOM; external 'user32' name 'RegisterClassExW';
+function RegisterClassW(const lpWndClass: TWndClassW): ATOM; external 'user32' name 'RegisterClassW';
 function RegOpenKey(hKey: HKEY; lpSubKey: PChar; var phkResult: HKEY): Longint;external 'advapi32' name 'RegOpenKeyA';
 function RegOpenKeyA(hKey: HKEY; lpSubKey: LPCSTR; var phkResult: HKEY): Longint; external 'advapi32' name 'RegOpenKeyA';
 function RegOpenKeyEx(hKey: HKEY; lpSubKey: PChar; ulOptions: DWORD; samDesired: REGSAM; var phkResult: HKEY): Longint;external 'advapi32' name 'RegOpenKeyExA';
@@ -1059,7 +1059,10 @@ end;
 
 {
   $Log$
-  Revision 1.26  2004-11-07 20:25:02  marco
+  Revision 1.27  2004-11-07 20:46:27  marco
+   * fix for 3299
+
+  Revision 1.26  2004/11/07 20:25:02  marco
    * fixes for bug 3303 (devmodew)
 
   Revision 1.25  2004/08/08 16:52:52  florian

+ 41 - 1
rtl/win32/wininc/struct.inc

@@ -6194,6 +6194,24 @@
      TWNDCLASSA = WNDCLASS;
      PWNDCLASS = ^WNDCLASS;
 
+
+     WNDCLASSW = record
+          style : UINT;
+          lpfnWndProc : WNDPROC;
+          cbClsExtra : longint;
+          cbWndExtra : longint;
+          hInstance : HANDLE;
+          hIcon : HICON;
+          hCursor : HCURSOR;
+          hbrBackground : HBRUSH;
+          lpszMenuName : LPCWSTR;
+          lpszClassName : LPCWSTR;
+       end;
+     LPWNDCLASSW = ^WNDCLASSW;
+     _WNDCLASSW  = WNDCLASSW;
+     TWNDCLASSW  = WNDCLASSW;
+     PWNDCLASSW  = ^WNDCLASSW;
+
      WNDCLASSEX = record
           cbSize : UINT;
           style : UINT;
@@ -6214,6 +6232,25 @@
      TWNDCLASSEXA = WNDCLASSEX;
      PWNDCLASSEX = ^WNDCLASSEX;
 
+     WNDCLASSEXW = record
+          cbSize : UINT;
+          style : UINT;
+          lpfnWndProc : WNDPROC;
+          cbClsExtra : longint;
+          cbWndExtra : longint;
+          hInstance : HANDLE;
+          hIcon : HICON;
+          hCursor : HCURSOR;
+          hbrBackground : HBRUSH;
+          lpszMenuName : LPCWSTR;
+          lpszClassName : LPCWSTR;
+          hIconSm : HANDLE;
+       end;
+     LPWNDCLASSEXW = ^WNDCLASSEXW;
+     _WNDCLASSEXW  = WNDCLASSEXW;
+     TWNDCLASSEXW  = WNDCLASSEXW;
+     PWNDCLASSEXW  = ^WNDCLASSEXW;
+
      CONNECTDLGSTRUCT = record
           cbStructure : DWORD;
           hwndOwner : HWND;
@@ -7082,7 +7119,10 @@ type
 
 {
   $Log$
-  Revision 1.27  2004-11-07 20:25:02  marco
+  Revision 1.28  2004-11-07 20:46:27  marco
+   * fix for 3299
+
+  Revision 1.27  2004/11/07 20:25:02  marco
    * fixes for bug 3303 (devmodew)
 
   Revision 1.26  2004/07/27 12:03:15  michael

+ 5 - 2
rtl/win32/wininc/unidef.inc

@@ -191,7 +191,7 @@ function CallWindowProc(lpPrevWndFunc:WNDPROC; hWnd:HWND; Msg:UINT; wParam:WPARA
 function RegisterClass(lpWndClass:LPWNDCLASS):ATOM; external 'user32' name 'RegisterClassW';
 function UnregisterClass(lpClassName:LPCWSTR; hInstance:HINST):WINBOOL; external 'user32' name 'UnregisterClassW';
 function GetClassInfo(hInstance:HINST; lpClassName:LPCWSTR; lpWndClass:LPWNDCLASS):WINBOOL; external 'user32' name 'GetClassInfoW';
-function RegisterClassEx(_para1:LPWNDCLASSEX):ATOM; external 'user32' name 'RegisterClassExW';
+function RegisterClassEx(_para1:LPWNDCLASSEXW):ATOM; external 'user32' name 'RegisterClassExW';
 function GetClassInfoEx(_para1:HINST; _para2:LPCWSTR; _para3:LPWNDCLASSEX):WINBOOL; external 'user32' name 'GetClassInfoExW';
 function CreateWindowEx(dwExStyle:DWORD; lpClassName:LPCWSTR; lpWindowName:LPCWSTR; dwStyle:DWORD; X:longint;Y:longint; nWidth:longint; nHeight:longint; hWndParent:HWND; hMenu:HMENU;hInstance:HINST; lpParam:LPVOID):HWND;
   external 'user32' name 'CreateWindowExW';
@@ -492,7 +492,10 @@ end;
 
 {
   $Log$
-  Revision 1.10  2004-11-07 20:25:02  marco
+  Revision 1.11  2004-11-07 20:46:27  marco
+   * fix for 3299
+
+  Revision 1.10  2004/11/07 20:25:02  marco
    * fixes for bug 3303 (devmodew)
 
   Revision 1.9  2004/08/08 16:52:52  florian

+ 6 - 3
rtl/win32/wininc/unifun.inc

@@ -188,10 +188,10 @@ function PostMessageW(hWnd:HWND; Msg:UINT; wParam:WPARAM; lParam:LPARAM):WINBOOL
 function PostThreadMessageW(idThread:DWORD; Msg:UINT; wParam:WPARAM; lParam:LPARAM):WINBOOL; external 'user32' name 'PostThreadMessageW';
 function DefWindowProcW(hWnd:HWND; Msg:UINT; wParam:WPARAM; lParam:LPARAM):LRESULT; external 'user32' name 'DefWindowProcW';
 function CallWindowProcW(lpPrevWndFunc:WNDPROC; hWnd:HWND; Msg:UINT; wParam:WPARAM; lParam:LPARAM):LRESULT; external 'user32' name 'CallWindowProcW';
-function RegisterClassW(lpWndClass:LPWNDCLASS):ATOM; external 'user32' name 'RegisterClassW';
+function RegisterClassW(lpWndClass:LPWNDCLASSW):ATOM; external 'user32' name 'RegisterClassW';
 function UnregisterClassW(lpClassName:LPCWSTR; hInstance:HINST):WINBOOL; external 'user32' name 'UnregisterClassW';
 function GetClassInfoW(hInstance:HINST; lpClassName:LPCWSTR; lpWndClass:LPWNDCLASS):WINBOOL; external 'user32' name 'GetClassInfoW';
-function RegisterClassExW(_para1:LPWNDCLASSEX):ATOM; external 'user32' name 'RegisterClassExW';
+function RegisterClassExW(_para1:LPWNDCLASSEXW):ATOM; external 'user32' name 'RegisterClassExW';
 function GetClassInfoExW(_para1:HINST; _para2:LPCWSTR; _para3:LPWNDCLASSEX):WINBOOL; external 'user32' name 'GetClassInfoExW';
 function CreateWindowExW(dwExStyle:DWORD; lpClassName:LPCWSTR; lpWindowName:LPCWSTR; dwStyle:DWORD; X:longint;Y:longint; nWidth:longint; nHeight:longint; hWndParent:HWND; hMenu:HMENU;hInstance:HINST; lpParam:LPVOID):HWND;
   external 'user32' name 'CreateWindowExW';
@@ -492,7 +492,10 @@ end;
 
 {
   $Log$
-  Revision 1.10  2004-11-07 20:25:02  marco
+  Revision 1.11  2004-11-07 20:46:27  marco
+   * fix for 3299
+
+  Revision 1.10  2004/11/07 20:25:02  marco
    * fixes for bug 3303 (devmodew)
 
   Revision 1.9  2004/08/08 16:52:52  florian