Changeset 5416 for trunk/src/comctl32/CCBase.h

Timestamp:

Mar 31, 2001, 3:25:59 PM (24 years ago)

Author:

sandervl

Message:

Resync with Wine + previous merge fixes

File:

• trunk/src/comctl32/CCBase.h (modified) (4 diffs)

trunk/src/comctl32/CCBase.h

@@ -1 @@
-/* $Id: CCBase.h,v 1.11 2000-11-19 11:51:47 sandervl Exp $ */
+/* $Id: CCBase.h,v 1.12 2001-03-31 13:25:25 sandervl Exp $ */
 /*
  * COMCTL32 Base Functions and Macros for all Controls
@@ -7 +7 @@
 #ifndef __CCBASE_H
 #define __CCBASE_H
+
+#include <heapstring.h>
 
 #define getInfoPtr(hwnd) ((COMCTL32_HEADER*)GetWindowLongA(hwnd,0))
@@ -20 +22 @@
 } COMCTL32_HEADER;
 
-PVOID initControl(HWND hwnd,DWORD dwSize);
-VOID doneControl(HWND hwnd);
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+PVOID initControl(HWND hwnd,DWORD dwSize);
+VOID doneControl(HWND hwnd);
 
 LRESULT defComCtl32ProcA(HWND hwnd,UINT Msg,WPARAM wParam,LPARAM lParam);
@@ -65 +66 @@
 INT lstrcmpAW(WCHAR *textA,BOOL textaunicode,WCHAR *textB,BOOL textbunicode);
 
+
 //read note in CCBase.cpp!!
 INT lstrcmpniA(CHAR *textA,CHAR *textB,INT len);
 INT lstrcmpniAtoW(CHAR *textA,WCHAR* textB,INT len);
-INT lstrcmpniW(WCHAR *textA,WCHAR *textB,INT len);
+////INT lstrcmpniW(WCHAR *textA,WCHAR *textB,INT len);
 INT lstrcmpniAW(WCHAR *textA,BOOL unicodeA,WCHAR *textB,BOOL unicodeB,INT len);