Changeset 9398 for trunk/include

Timestamp:

Nov 12, 2002, 6:04:37 PM (23 years ago)

Author:

sandervl

Message:

updates

Location:

trunk/include

Files:

• initdll.h (modified) (1 diff)
• win/winbase.h (modified) (1 diff)
• win/wine/obj_misc.h (modified) (2 diffs)

trunk/include/initdll.h

@@ -89 +89 @@
 ULONG APIENTRY inittermDInput(ULONG hModule, ULONG ulFlag);
 ULONG APIENTRY inittermDSound(ULONG hModule, ULONG ulFlag);
+ULONG APIENTRY inittermWinSpool(ULONG hModule, ULONG ulFlag);
 
 ULONG APIENTRY InitializeKernel32();

trunk/include/win/winbase.h

@@ -1210 +1210 @@
 
 #ifdef __WINE__
-#define CRITICAL_SECTION_INIT { 0, -1, 0, 0, 0, 0 }
+#define CRITICAL_SECTION_INIT(name) { (void *)(__FILE__ ": " name), -1, 0, 0, 0, 0 }
 #endif
 

trunk/include/win/wine/obj_misc.h

@@ -1 @@
-/* $Id: obj_misc.h,v 1.5 1999-08-22 22:52:08 sandervl Exp $ */
+/* $Id: obj_misc.h,v 1.6 2002-11-12 17:04:37 sandervl Exp $ */
 /*
  * Defines miscellaneous COM interfaces and APIs defined in objidl.h.
@@ -95 +95 @@
 #define IMallocSpy_METHODS \
     ICOM_METHOD1 (ULONG,PreAlloc,        ULONG,cbRequest) \
-    ICOM_VMETHOD1(      PostAlloc,       void*,pActual) \
-    ICOM_METHOD2 (void*,PreFree,         void*,pRequest, BOOL,fSpyed) \
+    ICOM_METHOD1 (PVOID,PostAlloc,       void*,pActual) \
+    ICOM_METHOD2 (PVOID,PreFree,         void*,pRequest, BOOL,fSpyed) \
     ICOM_VMETHOD1(      PostFree,        BOOL,fSpyed) \
     ICOM_METHOD4 (ULONG,PreRealloc,      void*,pRequest, ULONG,cbRequest, void**,ppNewRequest, BOOL,fSpyed) \
-    ICOM_METHOD2 (void*,PostRealloc,     void*,pActual, BOOL,fSpyed) \
-    ICOM_METHOD2 (void*,PreGetSize,      void*,pRequest, BOOL,fSpyed) \
+    ICOM_METHOD2 (PVOID,PostRealloc,     void*,pActual, BOOL,fSpyed) \
+    ICOM_METHOD2 (PVOID,PreGetSize,      void*,pRequest, BOOL,fSpyed) \
     ICOM_METHOD2 (ULONG,PostGetSize,     ULONG,cbActual, BOOL,fSpyed) \
-    ICOM_METHOD2 (void*,PreDidAlloc,     void*,pRequest, BOOL,fSpyed) \
+    ICOM_METHOD2 (PVOID,PreDidAlloc,     void*,pRequest, BOOL,fSpyed) \
     ICOM_METHOD3 (int,  PostDidAlloc,    void*,pRequest, BOOL,fSpyed, int,fActual) \
     ICOM_METHOD  (int,  PreHeapMinimize) \