Remove LOCAL_*() exports
Dimitrie O. Paun
dpaun at rogers.com
Fri May 13 15:13:37 CDT 2005
There is a slight problems with the headers, you can't
include stackframe.h after wine/server.h or somesuch.
Please note that the only renamed function is local_compact()
in dlls/kernel/local16.c since it is different from the
external LOCAL_Compact().
This is step one in the series of patches.
ChangeLog
Dimi Paun <dimi at lattica.com>
Make LOCAL_*() just wrappers around Local*16() functions.
Index: include/local.h
===================================================================
RCS file: /var/cvs/wine/include/local.h,v
retrieving revision 1.6
diff -u -p -r1.6 local.h
--- include/local.h 28 Aug 2003 21:43:35 -0000 1.6
+++ include/local.h 13 May 2005 19:23:46 -0000
@@ -23,22 +23,133 @@
#include <windef.h>
#include <wine/windef16.h>
+#include <wine/winbase16.h>
+#include <stackframe.h>
/* These function are equivalent to the Local* API functions, */
/* excepted that they need DS as the first parameter. This */
/* allows managing several heaps from the emulation library. */
+static inline HLOCAL16 LOCAL_Alloc( HANDLE16 ds, UINT16 flags, WORD size )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ HLOCAL16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalAlloc16 (flags, size);
+ CURRENT_DS = oldDS;
+ return ret;
+}
+
+static inline HLOCAL16 LOCAL_ReAlloc( HANDLE16 ds, HLOCAL16 handle, WORD size, UINT16 flags )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ HLOCAL16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalReAlloc16 (handle, size, flags);
+ CURRENT_DS = oldDS;
+ return ret;
+}
+
+static inline HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL16 handle )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ HLOCAL16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalFree16 (handle);
+ CURRENT_DS = oldDS;
+ return ret;
+}
+static inline HLOCAL16 LOCAL_Handle( HANDLE16 ds, WORD addr )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ HLOCAL16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalHandle16 (addr);
+ CURRENT_DS = oldDS;
+ return ret;
+}
+
+static inline UINT16 LOCAL_Size( HANDLE16 ds, HLOCAL16 handle )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ UINT16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalSize16 (handle);
+ CURRENT_DS = oldDS;
+ return ret;
+}
+
+static inline UINT16 LOCAL_Flags( HANDLE16 ds, HLOCAL16 handle )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ UINT16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalFlags16 (handle);
+ CURRENT_DS = oldDS;
+ return ret;
+}
+
+
+static inline UINT16 LOCAL_HeapSize( HANDLE16 ds )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ UINT16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalHeapSize16 ();
+ CURRENT_DS = oldDS;
+ return ret;
+}
+
+static inline UINT16 LOCAL_CountFree( HANDLE16 ds )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ UINT16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalCountFree16 ();
+ CURRENT_DS = oldDS;
+ return ret;
+}
+
+static inline void *LOCAL_Lock( HANDLE16 ds, HLOCAL16 handle )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ SEGPTR ret;
+
+ CURRENT_DS = ds;
+ ret = LocalLock16 (handle);
+ CURRENT_DS = oldDS;
+
+ return MapSL(ret);
+}
+
+static inline BOOL16 LOCAL_Unlock( HANDLE16 ds, HLOCAL16 handle )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ BOOL16 ret;
+
+ CURRENT_DS = ds;
+ ret = LocalUnlock16 (handle);
+ CURRENT_DS = oldDS;
+ return ret;
+}
+
+static inline WORD LOCAL_Compact( HANDLE16 ds, UINT16 minfree )
+{
+ HANDLE16 oldDS = CURRENT_DS;
+ WORD ret;
+
+ CURRENT_DS = ds;
+ ret = LocalCompact16 (minfree);
+ CURRENT_DS = oldDS;
+ return ret;
+}
-extern HLOCAL16 LOCAL_Alloc( HANDLE16 ds, UINT16 flags, WORD size );
-extern HLOCAL16 LOCAL_ReAlloc( HANDLE16 ds, HLOCAL16 handle,
- WORD size, UINT16 flags );
-extern HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL16 handle );
-extern HLOCAL16 LOCAL_Handle( HANDLE16 ds, WORD addr );
-extern UINT16 LOCAL_Size( HANDLE16 ds, HLOCAL16 handle );
-extern UINT16 LOCAL_Flags( HANDLE16 ds, HLOCAL16 handle );
-extern UINT16 LOCAL_HeapSize( HANDLE16 ds );
-extern UINT16 LOCAL_CountFree( HANDLE16 ds );
-extern void *LOCAL_Lock( HANDLE16 ds, HLOCAL16 handle );
-extern BOOL16 LOCAL_Unlock( HANDLE16 ds, HLOCAL16 handle );
-extern WORD LOCAL_Compact( HANDLE16 ds, UINT16 minfree, UINT16 flags );
#endif /* __WINE_LOCAL_H */
Index: dlls/kernel/kernel32.spec
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/kernel32.spec,v
retrieving revision 1.150
diff -u -p -r1.150 kernel32.spec
--- dlls/kernel/kernel32.spec 11 May 2005 12:57:50 -0000 1.150
+++ dlls/kernel/kernel32.spec 12 May 2005 19:24:01 -0000
@@ -1138,6 +1138,14 @@
@ stdcall LocalInit16(long long long)
@ stdcall LocalLock16(long)
@ stdcall LocalUnlock16(long)
+@ stdcall LocalReAlloc16(long long long)
+@ stdcall LocalFree16(long)
+@ stdcall LocalSize16(long)
+@ stdcall LocalHandle16(long)
+@ stdcall LocalFlags16(long)
+@ stdcall LocalCompact16(long)
+@ stdcall LocalCountFree16()
+@ stdcall LocalHeapSize16()
@ stdcall LockResource16(long)
@ stdcall SelectorAccessRights16(long long long)
@ stdcall SetSelectorBase(long long)
@@ -1169,13 +1177,4 @@
# Wine dll separation hacks, these will go away, don't use them
#
@ cdecl DOSMEM_AllocSelector(long)
-@ cdecl LOCAL_Alloc(long long long)
-@ cdecl LOCAL_Compact(long long long)
-@ cdecl LOCAL_CountFree(long)
-@ cdecl LOCAL_Free(long long)
-@ cdecl LOCAL_HeapSize(long)
-@ cdecl LOCAL_Lock(long long)
-@ cdecl LOCAL_ReAlloc(long long long long)
-@ cdecl LOCAL_Size(long long)
-@ cdecl LOCAL_Unlock(long long)
@ stdcall NE_DefResourceHandler(long long long)
Index: dlls/kernel/local16.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/local16.c,v
retrieving revision 1.10
diff -u -p -r1.10 local16.c
--- dlls/kernel/local16.c 24 Mar 2005 21:01:38 -0000 1.10
+++ dlls/kernel/local16.c 12 May 2005 18:03:56 -0000
@@ -35,9 +35,9 @@
#include <string.h>
#include "wine/winbase16.h"
#include "wownt32.h"
-#include "local.h"
#include "module.h"
#include "stackframe.h"
+#include "local.h"
#include "toolhelp.h"
#include "kernel_private.h"
#include "wine/debug.h"
@@ -726,9 +726,9 @@ static WORD LOCAL_GetFreeSpace(WORD ds,
/***********************************************************************
- * LOCAL_Compact
+ * local_compact
*/
-WORD LOCAL_Compact( HANDLE16 ds, UINT16 minfree, UINT16 flags )
+static UINT16 local_compact( HANDLE16 ds, UINT16 minfree, UINT16 flags )
{
char *ptr = MapSL( MAKESEGPTR( ds, 0 ) );
LOCALHEAPINFO *pInfo;
@@ -845,7 +845,7 @@ WORD LOCAL_Compact( HANDLE16 ds, UINT16
}
table = *(WORD *)pEntry;
}
- return LOCAL_Compact(ds, 0xffff, LMEM_NODISCARD);
+ return local_compact(ds, 0xffff, LMEM_NODISCARD);
}
@@ -931,7 +931,7 @@ notify_done:
arena = LOCAL_FindFreeBlock( ds, size );
if (arena == 0) {
/* no space: try to make some */
- LOCAL_Compact( ds, size, flags );
+ local_compact( ds, size, flags );
arena = LOCAL_FindFreeBlock( ds, size );
}
if (arena == 0) {
@@ -1117,12 +1117,11 @@ static void LOCAL_FreeHandleEntry( HANDL
/***********************************************************************
- * LOCAL_Free
- *
- * Implementation of LocalFree().
+ * LocalFree (KERNEL.7)
*/
-HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL16 handle )
+HLOCAL16 WINAPI LocalFree16( HLOCAL16 handle )
{
+ HANDLE16 ds = CURRENT_DS;
char *ptr = MapSL( MAKESEGPTR( ds, 0 ) );
TRACE("%04x ds=%04x\n", handle, ds );
@@ -1150,15 +1149,13 @@ HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL
/***********************************************************************
- * LOCAL_Alloc
- *
- * Implementation of LocalAlloc().
- *
+ * LocalAlloc (KERNEL.5)
*/
-HLOCAL16 LOCAL_Alloc( HANDLE16 ds, WORD flags, WORD size )
+HLOCAL16 WINAPI LocalAlloc16( UINT16 flags, WORD size )
{
+ HANDLE16 ds = CURRENT_DS;
+ HLOCAL16 handle = 0;
char *ptr;
- HLOCAL16 handle;
TRACE("%04x %d ds=%04x\n", flags, size, ds );
@@ -1171,7 +1168,7 @@ HLOCAL16 LOCAL_Alloc( HANDLE16 ds, WORD
if(size)
{
if (!(hmem = LOCAL_GetBlock( ds, size + MOVEABLE_PREFIX, flags )))
- return 0;
+ goto exit;
}
else /* We just need to allocate a discarded handle */
hmem = 0;
@@ -1180,7 +1177,7 @@ HLOCAL16 LOCAL_Alloc( HANDLE16 ds, WORD
WARN("Couldn't get handle.\n");
if(hmem)
LOCAL_FreeArena( ds, ARENA_HEADER(hmem) );
- return 0;
+ goto exit;
}
ptr = MapSL( MAKESEGPTR( ds, 0 ) );
plhe = (LOCALHANDLEENTRY *)(ptr + handle);
@@ -1199,21 +1196,21 @@ HLOCAL16 LOCAL_Alloc( HANDLE16 ds, WORD
}
else /* FIXED */
{
- if(!size)
- return 0;
- handle = LOCAL_GetBlock( ds, size, flags );
+ if(size) handle = LOCAL_GetBlock( ds, size, flags );
}
+
+exit:
+ CURRENT_STACK16->ecx = handle; /* must be returned in cx too */
return handle;
}
/***********************************************************************
- * LOCAL_ReAlloc
- *
- * Implementation of LocalReAlloc().
+ * LocalReAlloc (KERNEL.6)
*/
-HLOCAL16 LOCAL_ReAlloc( HANDLE16 ds, HLOCAL16 handle, WORD size, WORD flags )
+HLOCAL16 WINAPI LocalReAlloc16( HLOCAL16 handle, WORD size, UINT16 flags )
{
+ HANDLE16 ds = CURRENT_DS;
char *ptr = MapSL( MAKESEGPTR( ds, 0 ) );
LOCALHEAPINFO *pInfo;
LOCALARENA *pArena, *pNext;
@@ -1433,20 +1430,11 @@ static HLOCAL16 LOCAL_InternalLock( LPST
/***********************************************************************
- * LOCAL_Lock
- */
-void *LOCAL_Lock( HANDLE16 ds, HLOCAL16 handle )
-{
- char *ptr = MapSL( MAKESEGPTR( ds, 0 ) );
- return handle ? ptr + LOCAL_InternalLock( ptr, handle ) : NULL;
-}
-
-
-/***********************************************************************
- * LOCAL_Unlock
+ * LocalUnlock (KERNEL.9)
*/
-BOOL16 LOCAL_Unlock( HANDLE16 ds, HLOCAL16 handle )
+BOOL16 WINAPI LocalUnlock16( HLOCAL16 handle )
{
+ HANDLE16 ds = CURRENT_DS;
char *ptr = MapSL( MAKESEGPTR( ds, 0 ) );
TRACE("%04x\n", handle );
@@ -1463,12 +1451,11 @@ BOOL16 LOCAL_Unlock( HANDLE16 ds, HLOCAL
/***********************************************************************
- * LOCAL_Size
- *
- * Implementation of LocalSize().
+ * LocalSize (KERNEL.10)
*/
-WORD LOCAL_Size( HANDLE16 ds, HLOCAL16 handle )
+UINT16 WINAPI LocalSize16( HLOCAL16 handle )
{
+ HANDLE16 ds = CURRENT_DS;
char *ptr = MapSL( MAKESEGPTR( ds, 0 ) );
LOCALARENA *pArena;
@@ -1489,12 +1476,11 @@ WORD LOCAL_Size( HANDLE16 ds, HLOCAL16 h
/***********************************************************************
- * LOCAL_Flags
- *
- * Implementation of LocalFlags().
+ * LocalFlags (KERNEL.12)
*/
-WORD LOCAL_Flags( HANDLE16 ds, HLOCAL16 handle )
+UINT16 WINAPI LocalFlags16( HLOCAL16 handle )
{
+ HANDLE16 ds = CURRENT_DS;
char *ptr = MapSL( MAKESEGPTR( ds, 0 ) );
if (HANDLE_MOVEABLE(handle))
@@ -1514,25 +1500,22 @@ WORD LOCAL_Flags( HANDLE16 ds, HLOCAL16
/***********************************************************************
- * LOCAL_HeapSize
- *
- * Implementation of LocalHeapSize().
+ * LocalHeapSize (KERNEL.162)
*/
-WORD LOCAL_HeapSize( HANDLE16 ds )
+WORD WINAPI LocalHeapSize16(void)
{
+ HANDLE16 ds = CURRENT_DS;
LOCALHEAPINFO *pInfo = LOCAL_GetHeap( ds );
- if (!pInfo) return 0;
- return pInfo->last - pInfo->first;
+ return pInfo ? pInfo->last - pInfo->first : 0;
}
/***********************************************************************
- * LOCAL_CountFree
- *
- * Implementation of LocalCountFree().
+ * LocalCountFree (KERNEL.161)
*/
-WORD LOCAL_CountFree( HANDLE16 ds )
+WORD WINAPI LocalCountFree16(void)
{
+ HANDLE16 ds = CURRENT_DS;
WORD arena, total;
LOCALARENA *pArena;
LOCALHEAPINFO *pInfo;
@@ -1561,12 +1544,11 @@ WORD LOCAL_CountFree( HANDLE16 ds )
/***********************************************************************
- * LOCAL_Handle
- *
- * Implementation of LocalHandle().
+ * LocalHandle (KERNEL.11)
*/
-HLOCAL16 LOCAL_Handle( HANDLE16 ds, WORD addr )
+HLOCAL16 WINAPI LocalHandle16( WORD addr )
{
+ HANDLE16 ds = CURRENT_DS;
char *ptr = MapSL( MAKESEGPTR( ds, 0 ) );
LOCALHEAPINFO *pInfo;
WORD table;
@@ -1594,33 +1576,6 @@ HLOCAL16 LOCAL_Handle( HANDLE16 ds, WORD
}
-/***********************************************************************
- * LocalAlloc (KERNEL.5)
- */
-HLOCAL16 WINAPI LocalAlloc16( UINT16 flags, WORD size )
-{
- HLOCAL16 ret = LOCAL_Alloc( CURRENT_DS, flags, size );
- CURRENT_STACK16->ecx = ret; /* must be returned in cx too */
- return ret;
-}
-
-
-/***********************************************************************
- * LocalReAlloc (KERNEL.6)
- */
-HLOCAL16 WINAPI LocalReAlloc16( HLOCAL16 handle, WORD size, UINT16 flags )
-{
- return LOCAL_ReAlloc( CURRENT_DS, handle, size, flags );
-}
-
-
-/***********************************************************************
- * LocalFree (KERNEL.7)
- */
-HLOCAL16 WINAPI LocalFree16( HLOCAL16 handle )
-{
- return LOCAL_Free( CURRENT_DS, handle );
-}
/***********************************************************************
@@ -1637,48 +1592,12 @@ SEGPTR WINAPI LocalLock16( HLOCAL16 hand
/***********************************************************************
- * LocalUnlock (KERNEL.9)
- */
-BOOL16 WINAPI LocalUnlock16( HLOCAL16 handle )
-{
- return LOCAL_Unlock( CURRENT_DS, handle );
-}
-
-
-/***********************************************************************
- * LocalSize (KERNEL.10)
- */
-UINT16 WINAPI LocalSize16( HLOCAL16 handle )
-{
- return LOCAL_Size( CURRENT_DS, handle );
-}
-
-
-/***********************************************************************
- * LocalHandle (KERNEL.11)
- */
-HLOCAL16 WINAPI LocalHandle16( WORD addr )
-{
- return LOCAL_Handle( CURRENT_DS, addr );
-}
-
-
-/***********************************************************************
- * LocalFlags (KERNEL.12)
- */
-UINT16 WINAPI LocalFlags16( HLOCAL16 handle )
-{
- return LOCAL_Flags( CURRENT_DS, handle );
-}
-
-
-/***********************************************************************
* LocalCompact (KERNEL.13)
*/
UINT16 WINAPI LocalCompact16( UINT16 minfree )
{
TRACE("%04x\n", minfree );
- return LOCAL_Compact( CURRENT_DS, minfree, 0 );
+ return local_compact( CURRENT_DS, minfree, 0 );
}
@@ -1746,25 +1665,6 @@ DWORD WINAPI GetHeapSpaces16( HMODULE16
/***********************************************************************
- * LocalCountFree (KERNEL.161)
- */
-WORD WINAPI LocalCountFree16(void)
-{
- return LOCAL_CountFree( CURRENT_DS );
-}
-
-
-/***********************************************************************
- * LocalHeapSize (KERNEL.162)
- */
-WORD WINAPI LocalHeapSize16(void)
-{
- TRACE("(void)\n" );
- return LOCAL_HeapSize( CURRENT_DS );
-}
-
-
-/***********************************************************************
* LocalHandleDelta (KERNEL.310)
*/
WORD WINAPI LocalHandleDelta16( WORD delta )
Index: dlls/kernel/toolhelp.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/toolhelp.c,v
retrieving revision 1.27
diff -u -p -r1.27 toolhelp.c
--- dlls/kernel/toolhelp.c 24 Mar 2005 21:01:38 -0000 1.27
+++ dlls/kernel/toolhelp.c 11 May 2005 20:21:41 -0000
@@ -31,6 +31,7 @@
#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
+#include "stackframe.h"
#include "winerror.h"
#include "local.h"
#include "tlhelp32.h"
Index: dlls/gdi/gdiobj.c
===================================================================
RCS file: /var/cvs/wine/dlls/gdi/gdiobj.c,v
retrieving revision 1.9
diff -u -p -r1.9 gdiobj.c
--- dlls/gdi/gdiobj.c 20 Apr 2005 12:52:46 -0000 1.9
+++ dlls/gdi/gdiobj.c 13 May 2005 19:25:10 -0000
@@ -1459,7 +1459,7 @@ DWORD WINAPI GdiSeeGdiDo16( WORD wReqTyp
case 0x0002: /* LocalFree */
return LOCAL_Free( GDI_HeapSel, wParam1 );
case 0x0003: /* LocalCompact */
- return LOCAL_Compact( GDI_HeapSel, wParam3, 0 );
+ return LOCAL_Compact( GDI_HeapSel, wParam3 );
case 0x0103: /* LocalHeap */
return GDI_HeapSel;
default:
Index: dlls/user/cursoricon.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/cursoricon.c,v
retrieving revision 1.3
diff -u -p -r1.3 cursoricon.c
--- dlls/user/cursoricon.c 27 Apr 2005 10:23:24 -0000 1.3
+++ dlls/user/cursoricon.c 13 May 2005 19:59:02 -0000
@@ -57,13 +57,13 @@
#include "winerror.h"
#include "ntstatus.h"
#include "excpt.h"
+#include "user_private.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/exception.h"
#include "cursoricon.h"
#include "module.h"
#include "wine/debug.h"
-#include "user_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(cursor);
WINE_DECLARE_DEBUG_CHANNEL(icon);
Index: dlls/user/input.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/input.c,v
retrieving revision 1.5
diff -u -p -r1.5 input.c
--- dlls/user/input.c 28 Apr 2005 12:04:14 -0000 1.5
+++ dlls/user/input.c 13 May 2005 20:00:09 -0000
@@ -37,10 +37,10 @@
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
+#include "user_private.h"
#include "winuser.h"
#include "winnls.h"
#include "wine/server.h"
-#include "user_private.h"
#include "winternl.h"
#include "wine/debug.h"
#include "winerror.h"
Index: dlls/user/menu.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/menu.c,v
retrieving revision 1.27
diff -u -p -r1.27 menu.c
--- dlls/user/menu.c 10 May 2005 13:17:33 -0000 1.27
+++ dlls/user/menu.c 13 May 2005 20:00:45 -0000
@@ -48,11 +48,11 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wownt32.h"
+#include "user_private.h"
#include "wine/server.h"
#include "wine/unicode.h"
#include "win.h"
#include "controls.h"
-#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(menu);
Index: dlls/user/message.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/message.c,v
retrieving revision 1.82
diff -u -p -r1.82 message.c
--- dlls/user/message.c 11 May 2005 13:03:15 -0000 1.82
+++ dlls/user/message.c 13 May 2005 20:01:06 -0000
@@ -33,13 +33,13 @@
#include "winnls.h"
#include "dde.h"
#include "wine/unicode.h"
-#include "wine/server.h"
#include "user_private.h"
#include "win.h"
#include "winpos.h"
#include "controls.h"
#include "winproc.h"
#include "wine/debug.h"
+#include "wine/server.h"
WINE_DEFAULT_DEBUG_CHANNEL(msg);
WINE_DECLARE_DEBUG_CHANNEL(relay);
Index: dlls/user/msgbox.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/msgbox.c,v
retrieving revision 1.1
diff -u -p -r1.1 msgbox.c
--- dlls/user/msgbox.c 25 Apr 2005 11:33:36 -0000 1.1
+++ dlls/user/msgbox.c 13 May 2005 20:01:49 -0000
@@ -28,9 +28,9 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "winreg.h"
+#include "user_private.h"
#include "winternl.h"
#include "dlgs.h"
-#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dialog);
Index: dlls/user/painting.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/painting.c,v
retrieving revision 1.29
diff -u -p -r1.29 painting.c
--- dlls/user/painting.c 13 May 2005 14:03:06 -0000 1.29
+++ dlls/user/painting.c 13 May 2005 20:02:17 -0000
@@ -30,9 +30,9 @@
#include "wingdi.h"
#include "ntstatus.h"
#include "winuser.h"
+#include "user_private.h"
#include "wine/server.h"
#include "win.h"
-#include "user_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(win);
Index: dlls/user/user_private.h
===================================================================
RCS file: /var/cvs/wine/dlls/user/user_private.h,v
retrieving revision 1.12
diff -u -p -r1.12 user_private.h
--- dlls/user/user_private.h 11 May 2005 13:03:15 -0000 1.12
+++ dlls/user/user_private.h 13 May 2005 19:57:22 -0000
@@ -22,13 +22,13 @@
#define __WINE_USER_PRIVATE_H
#include <stdarg.h>
+#include "local.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winternl.h"
-#include "local.h"
extern WORD USER_HeapSel;
Index: dlls/user/win.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/win.c,v
retrieving revision 1.4
diff -u -p -r1.4 win.c
--- dlls/user/win.c 13 May 2005 13:58:17 -0000 1.4
+++ dlls/user/win.c 13 May 2005 20:02:46 -0000
@@ -30,10 +30,10 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wownt32.h"
-#include "wine/server.h"
#include "wine/unicode.h"
#include "win.h"
#include "user_private.h"
+#include "wine/server.h"
#include "controls.h"
#include "cursoricon.h"
#include "winpos.h"
Index: dlls/user/winpos.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/winpos.c,v
retrieving revision 1.2
diff -u -p -r1.2 winpos.c
--- dlls/user/winpos.c 27 Apr 2005 10:23:24 -0000 1.2
+++ dlls/user/winpos.c 13 May 2005 20:03:10 -0000
@@ -31,9 +31,9 @@
#include "winerror.h"
#include "ntstatus.h"
#include "wine/winuser16.h"
+#include "user_private.h"
#include "wine/server.h"
#include "controls.h"
-#include "user_private.h"
#include "win.h"
#include "winpos.h"
#include "wine/debug.h"
Index: windows/user.c
===================================================================
RCS file: /var/cvs/wine/windows/user.c,v
retrieving revision 1.111
diff -u -p -r1.111 user.c
--- windows/user.c 27 Apr 2005 11:09:55 -0000 1.111
+++ windows/user.c 13 May 2005 19:58:25 -0000
@@ -28,10 +28,10 @@
#include "wingdi.h"
#include "winuser.h"
#include "wine/winuser16.h"
+#include "user_private.h"
#include "winreg.h"
#include "winternl.h"
#include "tlhelp32.h"
-#include "user_private.h"
#include "win.h"
#include "controls.h"
#include "cursoricon.h"
@@ -553,7 +553,7 @@ DWORD WINAPI UserSeeUserDo16(WORD wReqTy
case USUD_LOCALFREE:
return LOCAL_Free(USER_HeapSel, wParam1);
case USUD_LOCALCOMPACT:
- return LOCAL_Compact(USER_HeapSel, wParam3, 0);
+ return LOCAL_Compact(USER_HeapSel, wParam3);
case USUD_LOCALHEAP:
return USER_HeapSel;
case USUD_FIRSTCLASS:
--
Dimi.
More information about the wine-patches
mailing list