April 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : user32: Implemented GetWindowRgnBox with some tests.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: a2b7aafdaea0fde68cfdee6650eff44a28b3b5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b7aafdaea0fde68cfdee665… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 2 03:53:00 2009 -0400 user32: Implemented GetWindowRgnBox with some tests. --- dlls/user32/tests/win.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 20 ++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 89eefcd..4aa3674 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -51,6 +51,7 @@ static BOOL (WINAPI *pGetLayeredWindowAttributes)(HWND,COLORREF*,BYTE*,DWORD*); static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -5529,6 +5530,48 @@ static void test_handles( HWND full_hwnd ) #endif } +static void test_winregion(void) +{ + HWND hwnd; + RECT r; + int ret; + HRGN hrgn; + + if (!pGetWindowRgnBox) + { + win_skip("GetWindowRgnBox not supported\n"); + return; + } + + hwnd = CreateWindowExA(0, "static", NULL, WS_VISIBLE, 10, 10, 10, 10, NULL, 0, 0, NULL); + /* NULL prect */ + SetLastError(0xdeadbeef); + ret = pGetWindowRgnBox(hwnd, NULL); + ok( ret == ERROR, "Expected ERROR, got %d\n", ret); + ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); + + hrgn = CreateRectRgn(2, 3, 10, 15); + ok( hrgn != NULL, "Region creation failed\n"); + if (hrgn) + { + SetWindowRgn(hwnd, hrgn, FALSE); + + SetLastError(0xdeadbeef); + ret = pGetWindowRgnBox(hwnd, NULL); + ok( ret == ERROR, "Expected ERROR, got %d\n", ret); + ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); + + r.left = r.top = r.right = r.bottom = 0; + ret = pGetWindowRgnBox(hwnd, &r); + ok( ret == SIMPLEREGION, "Expected SIMPLEREGION, got %d\n", ret); + ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, + "Expected (2,3,10,15), got (%d,%d,%d,%d)\n", r.left, r.top, + r.right, r.bottom); + DeleteObject(hrgn); + } + DestroyWindow(hwnd); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -5539,6 +5582,7 @@ START_TEST(win) pSetLayeredWindowAttributes = (void *)GetProcAddress( user32, "SetLayeredWindowAttributes" ); pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); + pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); if (!RegisterWindowClasses()) assert(0); @@ -5608,6 +5652,7 @@ START_TEST(win) test_SetForegroundWindow(hwndMain); test_shell_window(); test_handles( hwndMain ); + test_winregion(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d55717..8efdf0a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -385,7 +385,7 @@ @ stdcall GetWindowPlacement(long ptr) @ stdcall GetWindowRect(long ptr) @ stdcall GetWindowRgn(long long) -# @ stub GetWindowRgnBox +@ stdcall GetWindowRgnBox(long ptr) @ stdcall GetWindowTextA(long ptr long) @ stdcall GetWindowTextLengthA(long) @ stdcall GetWindowTextLengthW(long) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 42904d9..7f18da5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -155,6 +155,26 @@ int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn ) return nRet; } +/*********************************************************************** + * GetWindowRgnBox (USER32.@) + */ +int WINAPI GetWindowRgnBox( HWND hwnd, LPRECT prect ) +{ + int ret = ERROR; + HRGN hrgn; + + if (!prect) + return ERROR; + + if ((hrgn = CreateRectRgn(0, 0, 0, 0))) + { + if ((ret = GetWindowRgn( hwnd, hrgn )) != ERROR ) + ret = GetRgnBox( hrgn, prect ); + DeleteObject(hrgn); + } + + return ret; +} /*********************************************************************** * SetWindowRgn (USER32.@)

1 0

Henri Verbeet : wined3d: Remove some code that doesn' t make a whole lot of sense.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: c697bdc3a15e8dad13c4cd58d52ce6891bc3e999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c697bdc3a15e8dad13c4cd58d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:40:59 2009 +0200 wined3d: Remove some code that doesn't make a whole lot of sense. The "instr" parameter to shader_glsl_gen_modifier() is actually a source parameter, so comparing against WINED3DSIO_TEXKILL is just silly. --- dlls/wined3d/glsl_shader.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae9aa7f..7b7a7b3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -941,9 +941,6 @@ static void shader_glsl_gen_modifier ( char *out_str) { out_str[0] = 0; - - if (instr == WINED3DSIO_TEXKILL) - return; switch (instr & WINED3DSP_SRCMOD_MASK) { case WINED3DSPSM_DZ: /* Need to handle this in the instructions itself (texld & texcrd). */

1 0

Henri Verbeet : wined3d: Compare num_params against 1 in shader_glsl_map2gl ().
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: fb6547a3e121fe0b0511526247d6ebb538ffc19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6547a3e121fe0b051152624… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Compare num_params against 1 in shader_glsl_map2gl(). num_params includes the destination parameter, while we're only interested in source parameters. This doesn't cause problems for any of the instrctions currently handled by shader_glsl_map2gl() though, since they all happen to have at least 1 source parameter. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7b7a7b3..9953764 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1740,7 +1740,8 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s(", instruction); - if (curOpcode->num_params > 0) { + if (curOpcode->num_params > 1) + { shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], write_mask, &src_param); shader_addline(buffer, "%s", src_param.param_str); for (i = 2; i < curOpcode->num_params; ++i) {

1 0

Nikolay Sivov : comctl32: Enable selection overwriting in IP Address control.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 4902dd9801a2e6068dec3b6aee44ceb0564a7135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4902dd9801a2e6068dec3b6ae… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 1 17:43:08 2009 -0400 comctl32: Enable selection overwriting in IP Address control. --- dlls/comctl32/ipaddress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index e5631a2..a90f6e9 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -508,7 +508,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return return_val; } else if (len == 3 && startsel==endsel && endsel==len) IPADDRESS_GotoNextField (infoPtr, index, POS_SELALL); - else if (len < 3) break; + else if (len < 3 || startsel != endsel) break; } else if(c == '.' || c == ' ') { if(len && startsel==endsel && startsel != 0) { IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL);

1 0

Henri Verbeet : wined3d: Store the instruction handler index in struct wined3d_shader_instruction.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 44648b2b91fb01b2b2b1ab0140ce4a67c77913ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=44648b2b91fb01b2b2b1ab014… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Store the instruction handler index in struct wined3d_shader_instruction. This allows us to avoid comparing against WINED3DSIO_*, which is specific to the bytecode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 76 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 42 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44648b2b91fb01b2b2b1a…

1 0

Rob Shearman : include: Add defines for NI_MAXHOST and NI_MAXSERV to ws2tcpip.h.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 9993b0a079903368224b3f889075bdc773cfae28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9993b0a079903368224b3f889… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Apr 1 17:13:38 2009 +0100 include: Add defines for NI_MAXHOST and NI_MAXSERV to ws2tcpip.h. --- include/ws2tcpip.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 8084170..fc9f258 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -92,6 +92,14 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_EAI_SOCKTYPE WSAESOCKTNOSUPPORT #endif +#ifndef USE_WS_PREFIX +# define NI_MAXHOST 1025 +# define NI_MAXSERV 32 +#else +# define WS_NI_MAXHOST 1025 +# define WS_NI_MAXSERV 32 +#endif + /* Possible Windows flags for getnameinfo() */ #ifndef USE_WS_PREFIX # define NI_NOFQDN 0x01

1 0

Henri Verbeet : wined3d: Store the source and destination parameter count in struct wined3d_shader_instruction .
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 7bde2792c2122704d7b89cbbe76c041461107fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bde2792c2122704d7b89cbbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Store the source and destination parameter count in struct wined3d_shader_instruction. --- dlls/wined3d/arb_program_shader.c | 2 ++ dlls/wined3d/baseshader.c | 6 ++++-- dlls/wined3d/glsl_shader.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bf0c114..a30041e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1581,6 +1581,8 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; + tmp_ins.dst_count = tmp_ins.opcode->dst_token ? 1 : 0; + tmp_ins.src_count = tmp_ins.opcode->num_params - tmp_ins.dst_count; for (i = 0; i < nComponents; i++) { tmp_ins.dst = ((ins->dst) & ~WINED3DSP_WRITEMASK_ALL)|(WINED3DSP_WRITEMASK_0<<i); tmp_ins.src[1] = ins->src[1]+i; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a8fe8c3..71c5420 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -845,7 +845,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, ins.coissue = opcode_token & WINED3DSI_COISSUE; /* Destination token */ - if (curOpcode->dst_token) + ins.dst_count = curOpcode->dst_token ? 1 : 0; + if (ins.dst_count) { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); @@ -857,7 +858,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) ins.predicate = *pToken++; /* Other source tokens */ - for (i = 0; i < (curOpcode->num_params - curOpcode->dst_token); ++i) + ins.src_count = curOpcode->num_params - curOpcode->dst_token; + for (i = 0; i < ins.src_count; ++i) { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 615b90e..72c07ea 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1293,7 +1293,7 @@ void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instructi { DWORD mask = ins->dst & WINED3DSP_DSTMOD_MASK; - if (ins->opcode->dst_token && mask) + if (ins->dst_count && mask) { glsl_dst_param_t dst_param; @@ -1712,7 +1712,6 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { - CONST SHADER_OPCODE *curOpcode = ins->opcode; SHADER_BUFFER *buffer = ins->buffer; glsl_src_param_t src_param; const char *instruction; @@ -1741,12 +1740,13 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s(", instruction); - if (curOpcode->num_params > 1) + if (ins->src_count) { shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], write_mask, &src_param); shader_addline(buffer, "%s", src_param.param_str); - for (i = 2; i < curOpcode->num_params; ++i) { - shader_glsl_add_src_param(ins, ins->src[i-1], ins->src_addr[i-1], write_mask, &src_param); + for (i = 1; i < ins->src_count; ++i) + { + shader_glsl_add_src_param(ins, ins->src[i], ins->src_addr[i], write_mask, &src_param); shader_addline(buffer, ", %s", src_param.param_str); } } @@ -2076,6 +2076,8 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) } tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; + tmp_ins.dst_count = tmp_ins.opcode->dst_token ? 1 : 0; + tmp_ins.src_count = tmp_ins.opcode->num_params - tmp_ins.dst_count; for (i = 0; i < nComponents; ++i) { tmp_ins.dst = ((ins->dst) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f557509..fe71327 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -464,6 +464,8 @@ struct wined3d_shader_instruction DWORD src[4]; DWORD src_addr[4]; SHADER_BUFFER *buffer; + UINT dst_count; + UINT src_count; }; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *);

1 0

Alexandre Julliard : configure: Disable all 16-bit code on Cygwin.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 391fce6e53eb93cee4fbd889802d457c86cd829c URL: http://source.winehq.org/git/wine.git/?a=commit;h=391fce6e53eb93cee4fbd8898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:59:52 2009 +0200 configure: Disable all 16-bit code on Cygwin. --- configure | 4 +--- configure.ac | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 5468a78..3e4d8d6 100755 --- a/configure +++ b/configure @@ -3883,7 +3883,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi ;; - *-mingw32*) + *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} ;; i[3456789]86*) @@ -7503,8 +7503,6 @@ fi LIBEXT="dll" fi IMPLIBEXT="a" - WIN16_FILES="" - WIN16_INSTALL="" enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} enable_msvcrt=${enable_msvcrt:-no} diff --git a/configure.ac b/configure.ac index e3d4b63..e6d9688 100644 --- a/configure.ac +++ b/configure.ac @@ -121,7 +121,7 @@ case $host in AC_SUBST(TARGETFLAGS,"-m64") fi ;; - *-mingw32*) + *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} ;; i[[3456789]]86*) @@ -522,9 +522,6 @@ case $host_os in LIBEXT="dll" fi IMPLIBEXT="a" - dnl We can't build 16-bit NE dlls - WIN16_FILES="" - WIN16_INSTALL="" dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no}

1 0

Alexandre Julliard : kernel32: Use __wine_main_environ by default, environ is broken on FreeBSD too.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 7b7f35aee566021f7ec276fec15ee57262780b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7f35aee566021f7ec276fec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:00:33 2009 +0200 kernel32: Use __wine_main_environ by default, environ is broken on FreeBSD too. --- dlls/kernel32/process.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0dd7f67..286f0ab 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -58,9 +58,9 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); #ifdef __APPLE__ extern char **__wine_get_main_environment(void); -#define environ __wine_get_main_environment() #else -extern char **environ; +extern char **__wine_main_environ; +static char **__wine_get_main_environment(void) { return __wine_main_environ; } #endif typedef struct @@ -280,9 +280,10 @@ static BOOL build_initial_environment(void) char **e; WCHAR *p, *endptr; void *ptr; + char **env = __wine_get_main_environment(); /* Compute the total size of the Unix environment */ - for (e = environ; *e; e++) + for (e = env; *e; e++) { if (is_special_env_var( *e )) continue; size += MultiByteToWideChar( CP_UNIXCP, 0, *e, -1, NULL, 0 ); @@ -299,7 +300,7 @@ static BOOL build_initial_environment(void) endptr = p + size / sizeof(WCHAR); /* And fill it with the Unix environment */ - for (e = environ; *e; e++) + for (e = env; *e; e++) { char *str = *e;

1 0

Alexandre Julliard : libwine: Don' t export mmap functions for the Windows build.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: f41b2396457cd133eee0666538ecbf03691b0675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41b2396457cd133eee066653… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 20:27:59 2009 +0200 libwine: Don't export mmap functions for the Windows build. --- libs/wine/mmap.c | 29 ++++++++++------------------- libs/wine/wine.def | 5 ----- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index d107fc7..fc5b1d9 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -41,6 +41,8 @@ #include "wine/library.h" #include "wine/list.h" +#ifdef HAVE_MMAP + struct reserved_area { struct list entry; @@ -51,8 +53,6 @@ struct reserved_area static struct list reserved_areas = LIST_INIT(reserved_areas); static const unsigned int granularity_mask = 0xffff; /* reserved areas have 64k granularity */ -#ifdef HAVE_MMAP - #ifndef MAP_NORESERVE #define MAP_NORESERVE 0 #endif @@ -390,23 +390,6 @@ void mmap_init(void) reserve_dos_area(); } -#else /* HAVE_MMAP */ - -void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) -{ - return (void *)-1; -} - -static inline int munmap( void *ptr, size_t size ) -{ - return 0; -} - -void mmap_init(void) -{ -} - -#endif /*********************************************************************** * wine_mmap_add_reserved_area @@ -602,3 +585,11 @@ int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, voi } return ret; } + +#else /* HAVE_MMAP */ + +void mmap_init(void) +{ +} + +#endif diff --git a/libs/wine/wine.def b/libs/wine/wine.def index 318db78..a99c170 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -49,7 +49,6 @@ EXPORTS toupperW vsnprintfW vsprintfW - wine_anon_mmap wine_call_on_stack wine_casemap_lower wine_casemap_upper @@ -96,10 +95,6 @@ EXPORTS wine_ldt_is_system wine_ldt_realloc_entries wine_ldt_set_entry - wine_mmap_add_reserved_area - wine_mmap_enum_reserved_areas - wine_mmap_is_in_reserved_area - wine_mmap_remove_reserved_area wine_pthread_get_functions wine_pthread_set_functions wine_switch_to_stack

1 0