Changeset 10097 for trunk/src/comctl32/commctrl.c

Timestamp:

May 15, 2003, 4:25:14 PM (22 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comctl32/commctrl.c (modified) (12 diffs)

trunk/src/comctl32/commctrl.c

@@ -111 +111 @@
 
 
-HANDLE COMCTL32_hHeap = (HANDLE)NULL;
-LPSTR    COMCTL32_aSubclass = (LPSTR)NULL;
+HANDLE COMCTL32_hHeap = NULL;
+LPSTR    COMCTL32_aSubclass = NULL;
 HMODULE COMCTL32_hModule = 0;
 LANGID  COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
-HBRUSH  COMCTL32_hPattern55AABrush = (HANDLE)NULL;
+HBRUSH  COMCTL32_hPattern55AABrush = NULL;
 COMCTL32_SysColor  comctl32_color;
 
-static HBITMAP COMCTL32_hPattern55AABitmap = (HANDLE)NULL;
+static HBITMAP COMCTL32_hPattern55AABitmap = NULL;
 
 static const WORD wPattern55AA[] =
@@ -128 +128 @@
 
 /***********************************************************************
- * COMCTL32_LibMain [Internal] Initializes the internal 'COMCTL32.DLL'.
+ * DllMain [Internal] Initializes the internal 'COMCTL32.DLL'.
  *
  * PARAMS
@@ -140 +140 @@
  */
 
-BOOL WINAPI
-COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+#ifdef __WIN32OS2__
+BOOL WINAPI COMCTL32_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+#else
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+#endif
 {
     TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
@@ -205 +208 @@
             /* delete local pattern brush */
             DeleteObject (COMCTL32_hPattern55AABrush);
-            COMCTL32_hPattern55AABrush = (HANDLE)NULL;
+            COMCTL32_hPattern55AABrush = NULL;
             DeleteObject (COMCTL32_hPattern55AABitmap);
-            COMCTL32_hPattern55AABitmap = (HANDLE)NULL;
+            COMCTL32_hPattern55AABitmap = NULL;
 
             /* delete global subclassing atom */
             GlobalDeleteAtom (LOWORD(COMCTL32_aSubclass));
             TRACE("Subclassing atom deleted: %p\n", COMCTL32_aSubclass);
-            COMCTL32_aSubclass = (LPSTR)NULL;
+            COMCTL32_aSubclass = NULL;
 
             /* destroy private heap */
             HeapDestroy (COMCTL32_hHeap);
             TRACE("Heap destroyed: %p\n", COMCTL32_hHeap);
-            COMCTL32_hHeap = (HANDLE)NULL;
+            COMCTL32_hHeap = NULL;
             break;
     }
@@ -421 +424 @@
             TRACE("control id 0x%x\n", *lpRun);
             GetWindowRect (hwndCtrl, &rcCtrl);
-            MapWindowPoints ((HWND)0, hwnd, (LPPOINT)&rcCtrl, 2);
+            MapWindowPoints (NULL, hwnd, (LPPOINT)&rcCtrl, 2);
             SubtractRect (lpRect, lpRect, &rcCtrl);
         }
@@ -883 +886 @@
     nWidth  = (INT)lpBitmapInfo->biWidth;
     nHeight = (INT)lpBitmapInfo->biHeight;
-    hdcScreen = GetDC ((HWND)0);
+    hdcScreen = GetDC (NULL);
     hbm = CreateCompatibleBitmap (hdcScreen, nWidth, nHeight);
     if (hbm) {
@@ -896 +899 @@
         DeleteDC (hdcDst);
     }
-    ReleaseDC ((HWND)0, hdcScreen);
+    ReleaseDC (NULL, hdcScreen);
     GlobalFree ((HGLOBAL)lpBitmapInfo);
     FreeResource (hglb);
@@ -1041 +1044 @@
 
 /***********************************************************************
- * SetWindowSubclass [COMCTL32.@]
+ * SetWindowSubclass [COMCTL32.410]
  *
  * Starts a window subclass
@@ -1140 +1143 @@
 
 /***********************************************************************
- * GetWindowSubclass [COMCTL32.@]
+ * GetWindowSubclass [COMCTL32.411]
  *
  * Gets the Reference data from a subclass.
@@ -1147 +1150 @@
  *     hWnd [in] Handle to window which were subclassing
  *     pfnSubclass [in] Pointer to the subclass procedure
- *     iID [in] Unique indentifier of the subclassing procedure
+ *     uID [in] Unique indentifier of the subclassing procedure
  *     pdwRef [out] Pointer to the reference data
  *
  * RETURNS
- *     Success: non-sero
- *     Failure: zero
+ *     Success: Non-zero
+ *     Failure: 0
  */
 
@@ -1180 +1183 @@
 
 /***********************************************************************
- * RemoveWindowSubclass [COMCTL32.@]
+ * RemoveWindowSubclass [COMCTL32.412]
  *
  * Removes a window subclass.
@@ -1244 +1247 @@
 
 /***********************************************************************
- * DefSubclassProc [COMCTL32.@]
+ * DefSubclassProc [COMCTL32.413]
  *
  * Calls the next window procedure (ie. the one before this subclass)