September 2013 - Wine-commits

Ken Thomases : winemac: Send WM_ENTER/EXITSIZEMOVE messages at start/ end of a resizing operation.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 4ad9d5f04affb22f6e3724b66da814088a89c897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad9d5f04affb22f6e3724b66… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:01:03 2013 -0500 winemac: Send WM_ENTER/EXITSIZEMOVE messages at start/end of a resizing operation. --- dlls/winemac.drv/cocoa_window.m | 7 +++++++ dlls/winemac.drv/event.c | 4 ++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 16 ++++++++++++++++ 5 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d833d04..a602adb 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1476,6 +1476,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) windowDidEndLiveResize:(NSNotification *)notification { + macdrv_query* query = macdrv_create_query(); + query->type = QUERY_RESIZE_END; + query->window = (macdrv_window)[self retain]; + + [self.queue query:query timeout:0.3]; + macdrv_release_query(query); + self.liveResizeDisplayTimer = nil; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 97f1e3b..709079a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -146,6 +146,10 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_PASTEBOARD_DATA\n"); success = query_pasteboard_data(hwnd, query->pasteboard_data.type); break; + case QUERY_RESIZE_END: + TRACE("QUERY_RESIZE_END\n"); + success = query_resize_end(hwnd); + break; case QUERY_RESIZE_START: TRACE("QUERY_RESIZE_START\n"); success = query_resize_start(hwnd); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d308e69..a0e0b52 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -161,6 +161,7 @@ extern void macdrv_app_deactivated(void) DECLSPEC_HIDDEN; extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_did_minimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; +extern BOOL query_resize_end(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 71d8c9f..2f26b34 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -272,6 +272,7 @@ enum { QUERY_DRAG_OPERATION, QUERY_IME_CHAR_RECT, QUERY_PASTEBOARD_DATA, + QUERY_RESIZE_END, QUERY_RESIZE_START, NUM_QUERY_TYPES }; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 411270c..4cb8082 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1991,6 +1991,22 @@ fail: BOOL query_resize_start(HWND hwnd) { TRACE("hwnd %p\n", hwnd); + sync_window_min_max_info(hwnd); + SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); + + return TRUE; +} + + +/*********************************************************************** + * query_resize_end + * + * Handler for QUERY_RESIZE_END query. + */ +BOOL query_resize_end(HWND hwnd) +{ + TRACE("hwnd %p\n", hwnd); + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); return TRUE; }

1 0

Qian Hong : imm32: Validate input context in multiple IMC functions.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: b4b428ee9e7cdffe6f49c2d539107fbb9d002895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b428ee9e7cdffe6f49c2d53… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Sep 17 22:52:02 2013 +0800 imm32: Validate input context in multiple IMC functions. Both tests and fixes improved by Aric Stewart. --- dlls/imm32/imm.c | 166 ++++++++++++++----- dlls/imm32/tests/imm32.c | 405 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 523 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b428ee9e7cdffe6f49c…

1 0

Aric Stewart : imm32: Fix ImmGetDescription behavior with a null HKL.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 8b933495fb4b9a874b9f1f3560847739520ba384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b933495fb4b9a874b9f1f356… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 17 13:52:23 2013 -0500 imm32: Fix ImmGetDescription behavior with a null HKL. --- dlls/imm32/imm.c | 3 +++ dlls/imm32/tests/imm32.c | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 59e7ff2..29bf4af 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1523,6 +1523,8 @@ UINT WINAPI ImmGetDescriptionA( /* find out how many characters in the unicode buffer */ len = ImmGetDescriptionW( hKL, NULL, 0 ); + if (!len) + return 0; /* allocate a buffer of that size */ buf = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR) ); @@ -1550,6 +1552,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); + if (!hKL) return 0; if (!uBufLen) return lstrlenW( name ); lstrcpynW( lpszDescription, name, uBufLen ); return lstrlenW( lpszDescription ); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7abc4c3..7162f82 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -629,18 +629,19 @@ static void test_ImmGetContext(void) static void test_ImmGetDescription(void) { HKL hkl; - WCHAR japime[] = { 'E', '0', '0', '1', '0', '4', '1', '1', 0 }; WCHAR descW[100]; CHAR descA[100]; UINT ret, lret; /* FIXME: invalid keyboard layouts should not pass */ ret = ImmGetDescriptionW(NULL, NULL, 0); - todo_wine ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + ret = ImmGetDescriptionA(NULL, NULL, 0); + ok(!ret, "ImmGetDescriptionA failed, expected 0 received %d.\n", ret); /* load a language with valid IMM descriptions */ - hkl = LoadKeyboardLayoutW(japime, KLF_ACTIVATE); - todo_wine ok(hkl != 0, "LoadKeyboardLayoutW failed, expected != 0.\n"); + hkl = GetKeyboardLayout(0); + ok(hkl != 0, "GetKeyboardLayout failed, expected != 0.\n"); ret = ImmGetDescriptionW(hkl, NULL, 0); if(!ret) @@ -649,6 +650,12 @@ static void test_ImmGetDescription(void) return; } + SetLastError(0xdeadcafe); + ret = ImmGetDescriptionW(0, NULL, 100); + ok (ret == 0, "ImmGetDescriptionW with 0 hkl should return 0\n"); + ret = GetLastError(); + ok (ret == 0xdeadcafe, "Last Error should remain unchanged\n"); + ret = ImmGetDescriptionW(hkl, descW, 0); ok(ret, "ImmGetDescriptionW failed, expected != 0 received 0.\n");

1 0

Piotr Caban : msvcrt: Don' t use CDECL calling convention in MSVCRT_wcsrtombs_l (internal function).
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 1f1624612e45d4ff6330fc3acb82db30bf906ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1624612e45d4ff6330fc3ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 18 09:25:26 2013 +0200 msvcrt: Don't use CDECL calling convention in MSVCRT_wcsrtombs_l (internal function). --- dlls/msvcrt/wcs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index dca6a3d..60eae92 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -392,7 +392,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, /********************************************************************* * wcsrtombs_l (INTERNAL) */ -static MSVCRT_size_t CDECL MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcstr, +static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo;

1 0

Henri Verbeet : ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_create ().
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: c69cd599a394a8e54094679e1551391f5b0ce3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69cd599a394a8e54094679e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:09 2013 +0200 ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_create(). --- dlls/ddraw/device.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7510ed8..210a522 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6752,6 +6752,16 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_INVALIDCAPS; } + if ((target->surface_desc.u4.ddpfPixelFormat.dwFlags + & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 + | DDPF_PALETTEINDEXEDTO8)) + && !wined3d_surface_get_palette(target->wined3d_surface)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target); + return DDERR_NOPALETTEATTACHED; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Henri Verbeet : ddraw: Verify that the surface is in video memory in d3d_device_create().
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 4f899571617d3cde94da2e9b54cc53557784b956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f899571617d3cde94da2e9b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:10 2013 +0200 ddraw: Verify that the surface is in video memory in d3d_device_create(). --- dlls/ddraw/device.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 210a522..9f537c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6762,6 +6762,12 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_NOPALETTEATTACHED; } + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target); + return D3DERR_SURFACENOTINVIDMEM; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Jacek Caban : winetest: Added a binary file that has no known MIME type.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: tools Branch: master Commit: 6fb74a2f0458c41c31ed0535ca2ba7dd3ce85c3d URL: http://source.winehq.org/git/tools.git/?a=commit;h=6fb74a2f0458c41c31ed0535… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 15:43:39 2013 +0200 winetest: Added a binary file that has no known MIME type. --- winetest/tests/file.winetest | Bin 0 -> 4839 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/winetest/tests/file.winetest b/winetest/tests/file.winetest new file mode 100644 index 0000000..b42dec0 Binary files /dev/null and b/winetest/tests/file.winetest differ

1 0

Huw Davies : iphlpapi: Add a version of get_dns_servers for Android.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 208eae73ae8fda6ffd34688a0f64c3456d2010ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=208eae73ae8fda6ffd34688a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 17 13:09:16 2013 +0100 iphlpapi: Add a version of get_dns_servers for Android. --- configure | 2 + configure.ac | 2 + dlls/iphlpapi/iphlpapi_main.c | 49 +++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 +++++ 4 files changed, 59 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a01bee0..e6f6971 100755 --- a/configure +++ b/configure @@ -13370,6 +13370,8 @@ esac ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ + __res_get_state \ + __res_getservers \ _finite \ _isnan \ _pclose \ diff --git a/configure.ac b/configure.ac index b69c379..e03928c 100644 --- a/configure.ac +++ b/configure.ac @@ -1997,6 +1997,8 @@ dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ + __res_get_state \ + __res_getservers \ _finite \ _isnan \ _pclose \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6ce2c94..f84c700 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -978,7 +978,56 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) } return addr - servers; } +#elif defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS) + +static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) +{ + extern struct res_state *__res_get_state( void ); + extern int __res_getservers( struct res_state *, struct sockaddr_storage *, int ); + struct res_state *state = __res_get_state(); + int i, found = 0, total = __res_getservers( state, NULL, 0 ); + SOCKADDR_STORAGE *addr = servers; + struct sockaddr_storage *buf; + + if ((!servers || !num) && !ip4_only) return total; + + buf = HeapAlloc( GetProcessHeap(), 0, total * sizeof(struct sockaddr_storage) ); + total = __res_getservers( state, buf, total ); + + for (i = 0; i < total; i++) + { + if (buf[i].ss_family == AF_INET6 && ip4_only) continue; + if (buf[i].ss_family != AF_INET && buf[i].ss_family != AF_INET6) continue; + + found++; + if (!servers || !num) continue; + + if (buf[i].ss_family == AF_INET6) + { + SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)addr; + struct sockaddr_in6 *ptr = (struct sockaddr_in6 *)(buf + i); + s->sin6_family = WS_AF_INET6; + s->sin6_port = ptr->sin6_port; + s->sin6_flowinfo = ptr->sin6_flowinfo; + memcpy( &s->sin6_addr, &ptr->sin6_addr, sizeof(IN6_ADDR) ); + s->sin6_scope_id = ptr->sin6_scope_id; + memset( (char *)s + sizeof(SOCKADDR_IN6), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); + } + else + { + *(struct sockaddr_in *)addr = *(struct sockaddr_in *)(buf + i); + memset( (char *)addr + sizeof(struct sockaddr_in), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); + } + if (++addr >= servers + num) break; + } + + HeapFree( GetProcessHeap(), 0, buf ); + return found; +} #else + static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) { FIXME("Unimplemented on this system\n"); diff --git a/include/config.h.in b/include/config.h.in index 505dd28..62bee90 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1233,6 +1233,12 @@ /* Define to 1 if you have the `_vsnprintf' function. */ #undef HAVE__VSNPRINTF +/* Define to 1 if you have the `__res_getservers' function. */ +#undef HAVE___RES_GETSERVERS + +/* Define to 1 if you have the `__res_get_state' function. */ +#undef HAVE___RES_GET_STATE + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT

1 0

Piotr Caban : msvcrt: Don't forward memcmp to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 4fbf246298f8cef5cb40290084c8858a1b547fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbf246298f8cef5cb4029008… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:44:56 2013 +0200 msvcrt: Don't forward memcmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 23d29a3..93c09ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1370,7 +1370,7 @@ @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc @ cdecl memchr(ptr long long) MSVCRT_memchr -@ cdecl memcmp(ptr ptr long) ntdll.memcmp +@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp @ cdecl memcpy(ptr ptr long) MSVCRT_memcpy @ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) ntdll.memmove diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 082029d..b6a51b6 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1594,11 +1594,19 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 #undef I10_OUTPUT_MAX_PREC /********************************************************************* + * memcmp (MSVCRT.@) + */ +int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) +{ + return memcmp(ptr1, ptr2, n); +} + +/********************************************************************* * memcpy (MSVCRT.@) */ -void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) +void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) { - return memmove( dst, src, n ); + return memmove(dst, src, n); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't forward memmove to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 5b1f7f85494fb6ad4c2e781558864bd9018641eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1f7f85494fb6ad4c2e78155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:11 2013 +0200 msvcrt: Don't forward memmove to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 93c09ce..79124c5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1373,7 +1373,7 @@ @ cdecl memcmp(ptr ptr long) MSVCRT_memcmp @ cdecl memcpy(ptr ptr long) MSVCRT_memcpy @ cdecl memcpy_s(ptr long ptr long) -@ cdecl memmove(ptr ptr long) ntdll.memmove +@ cdecl memmove(ptr ptr long) MSVCRT_memmove @ cdecl memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl mktime(ptr) MSVCRT_mktime diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b6a51b6..645cc03 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1610,6 +1610,14 @@ void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) } /********************************************************************* + * memmove (MSVCRT.@) + */ +void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) +{ + return memmove(dst, src, n); +} + +/********************************************************************* * memset (MSVCRT.@) */ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n)

1 0