September 2013 - Wine-Commits

Huw Davies : server: Android has struct user in asm/user.h.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 2a32d5765a1d07e07c73c727eedcf5a7db3b261c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a32d5765a1d07e07c73c727e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 24 16:13:27 2013 +0100 server: Android has struct user in asm/user.h. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ server/ptrace.c | 8 +++++++- 4 files changed, 12 insertions(+), 1 deletions(-) diff --git a/configure b/configure index d1cd164..58f2579 100755 --- a/configure +++ b/configure @@ -5949,6 +5949,7 @@ for ac_header in \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ + asm/user.h \ curses.h \ direct.h \ dirent.h \ diff --git a/configure.ac b/configure.ac index 0fce454..1055b0a 100644 --- a/configure.ac +++ b/configure.ac @@ -409,6 +409,7 @@ AC_CHECK_HEADERS(\ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ + asm/user.h \ curses.h \ direct.h \ dirent.h \ diff --git a/include/config.h.in b/include/config.h.in index 5863d10..01e484e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -35,6 +35,9 @@ /* Define to 1 if you have the <asm/types.h> header file. */ #undef HAVE_ASM_TYPES_H +/* Define to 1 if you have the <asm/user.h> header file. */ +#undef HAVE_ASM_USER_H + /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H diff --git a/server/ptrace.c b/server/ptrace.c index ed72b7d..9897a08 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -528,9 +528,15 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } -#if defined(linux) && defined(HAVE_SYS_USER_H) && (defined(__i386__) || defined(__x86_64__)) +#if defined(linux) && (defined(HAVE_SYS_USER_H) || defined(HAVE_ASM_USER_H)) \ + && (defined(__i386__) || defined(__x86_64__)) +#ifdef HAVE_SYS_USER_H #include <sys/user.h> +#endif +#ifdef HAVE_ASM_USER_H +#include <asm/user.h> +#endif /* debug register offset in struct user */ #define DR_OFFSET(dr) ((((struct user *)0)->u_debugreg) + (dr))

1 0

Jacek Caban : dinput.h: Added missing DI_WRITEPROTECT define.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 8555e77b0ea4138b2ef7f3894e636d0585324e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8555e77b0ea4138b2ef7f3894… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 24 16:55:30 2013 +0200 dinput.h: Added missing DI_WRITEPROTECT define. >From mingw-w64. --- include/dinput.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index 8c779c2..a714eeb 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -136,6 +136,7 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DI_TRUNCATED ((HRESULT)0x00000008) #define DI_SETTINGSNOTSAVED ((HRESULT)0x0000000B) #define DI_TRUNCATEDANDRESTARTED ((HRESULT)0x0000000C) +#define DI_WRITEPROTECT ((HRESULT)0x00000013) #define DIERR_OLDDIRECTINPUTVERSION \ MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_OLD_WIN_VERSION)

1 0

Piotr Caban : msvcp80: Add ostream::operator<<(unsigned short) implementation.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 435cf5cebc82ebff92fa0167c18b80fdcc9b8542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435cf5cebc82ebff92fa0167c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:49:23 2013 +0200 msvcp80: Add ostream::operator<<(unsigned short) implementation. --- dlls/msvcp80/ios.c | 26 ++++++++++++++++++++------ dlls/msvcp80/msvcp80.spec | 4 ++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/ios.c b/dlls/msvcp80/ios.c index de0033d..9cdaf1d 100644 --- a/dlls/msvcp80/ios.c +++ b/dlls/msvcp80/ios.c @@ -6540,19 +6540,15 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_short(basic_ostream_wc basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); } -/* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)G@Z */ -/* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)G@Z */ -DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_print_ushort, 8) -basic_ostream_wchar* __thiscall basic_ostream_wchar_print_ushort(basic_ostream_wchar *this, unsigned short val) +static basic_ostream_wchar* basic_ostream_print_ushort(basic_ostream_wchar *this, unsigned short val, const num_put *numput) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this); int state = IOSTATE_goodbit; - TRACE("(%p %u)\n", this, val); + TRACE("(%p %d)\n", this, val); if(basic_ostream_wchar_sentry_create(this)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); - const num_put *numput = num_put_wchar_use_facet(strbuf->loc); ostreambuf_iterator_wchar dest = {0, strbuf}; num_put_wchar_put_ulong(numput, &dest, dest, &base->base, basic_ios_wchar_fill_get(base), val); @@ -6563,6 +6559,24 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_print_ushort(basic_ostream_w return this; } +/* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)G@Z */ +/* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)G@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_print_ushort, 8) +basic_ostream_wchar* __thiscall basic_ostream_wchar_print_ushort(basic_ostream_wchar *this, unsigned short val) +{ + return basic_ostream_print_ushort(this, val, num_put_wchar_use_facet( + basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); +} + +/* ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)G@Z */ +/* ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)G@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_ushort, 8) +basic_ostream_wchar* __thiscall basic_ostream_short_print_ushort(basic_ostream_wchar *this, unsigned short val) +{ + return basic_ostream_print_ushort(this, val, num_put_short_use_facet( + basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); +} + static basic_ostream_wchar* basic_ostream_print_int(basic_ostream_wchar *this, int val, const num_put *numput) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this); diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 0a913ef..64e25b7 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -1606,8 +1606,8 @@ @ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)_N@Z(ptr long) basic_ostream_char_print_bool @ thiscall -arch=i386 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)F@Z(ptr long) basic_ostream_short_print_short @ cdecl -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)F@Z(ptr long) basic_ostream_short_print_short -@ stub -arch=win32 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)G@Z -@ stub -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)G@Z +@ thiscall -arch=win32 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)G@Z(ptr long) basic_ostream_short_print_ushort +@ cdecl -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)G@Z(ptr long) basic_ostream_short_print_ushort @ thiscall -arch=i386 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)H@Z(ptr long) basic_ostream_short_print_int @ cdecl -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)H@Z(ptr long) basic_ostream_short_print_int @ thiscall -arch=i386 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)I@Z(ptr long) basic_ostream_short_print_uint

1 0

Michael Stefaniuc : windowscodecs: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: b08869420a3dd602b2c479f1ccd4d8b4dd45829c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08869420a3dd602b2c479f1c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:31:50 2013 +0200 windowscodecs: Avoid using CONST. --- dlls/windowscodecs/regsvr.c | 90 +++++++++++++++++++++--------------------- 1 files changed, 45 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b08869420a3dd602b2c47…

1 0

Michael Stefaniuc : user32: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 7c7fa1051c31b93729c5d299a96b9ee8d83be312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7fa1051c31b93729c5d299a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:25:02 2013 +0200 user32: Avoid using CONST. --- dlls/user32/dde_misc.c | 2 +- dlls/user32/message.c | 4 ++-- dlls/user32/tests/resource.c | 2 +- dlls/user32/winproc.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 724c074..ddbfa86 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -241,7 +241,7 @@ BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer) * DdeSetQualityOfService (USER32.@) */ -BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, CONST SECURITY_QUALITY_OF_SERVICE *pqosNew, +BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, const SECURITY_QUALITY_OF_SERVICE *pqosNew, PSECURITY_QUALITY_OF_SERVICE pqosPrev) { FIXME("(%p %p %p): stub\n", hwndClient, pqosNew, pqosPrev); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 27e3441..b6720fb 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4080,7 +4080,7 @@ BOOL WINAPI WaitMessage(void) /*********************************************************************** * MsgWaitForMultipleObjectsEx (USER32.@) */ -DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, CONST HANDLE *pHandles, +DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, DWORD timeout, DWORD mask, DWORD flags ) { HANDLE handles[MAXIMUM_WAIT_OBJECTS]; @@ -4114,7 +4114,7 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, CONST HANDLE *pHandles, /*********************************************************************** * MsgWaitForMultipleObjects (USER32.@) */ -DWORD WINAPI MsgWaitForMultipleObjects( DWORD count, CONST HANDLE *handles, +DWORD WINAPI MsgWaitForMultipleObjects( DWORD count, const HANDLE *handles, BOOL wait_all, DWORD timeout, DWORD mask ) { return MsgWaitForMultipleObjectsEx( count, handles, timeout, mask, diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 346cc2a..6b89ef7 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -331,7 +331,7 @@ static void test_accel2(void) } static void test_PrivateExtractIcons(void) { - CONST CHAR szShell32Dll[] = "shell32.dll"; + const CHAR szShell32Dll[] = "shell32.dll"; HICON ahIcon[256]; UINT aIconId[256]; UINT cIcons, cIcons2; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index ebccbe4..57adfc2 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1122,7 +1122,7 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM return wow_handlers.static_proc( hwnd, msg, wParam, lParam, TRUE ); } -static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) +static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution();

1 0

Nikolay Sivov : oleaut32: LoadRegTypeLib() should check actual typelib version.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 1c23b501f75f7ae508851800df251c585492dc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c23b501f75f7ae508851800d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 24 12:27:02 2013 +0400 oleaut32: LoadRegTypeLib() should check actual typelib version. --- dlls/oleaut32/tests/typelib.c | 27 +++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 14 ++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2966e9a..7f92051 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4734,7 +4734,6 @@ static void test_LoadRegTypeLib(void) if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_register_test, 2, 0, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); /* manifest version is 2.7, actual is 2.5 */ @@ -4755,7 +4754,6 @@ todo_wine if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 7, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 5, LOCALE_NEUTRAL, &tl); @@ -5025,6 +5023,30 @@ static void test_SetTypeDescAlias(SYSKIND kind) DeleteFileA(filenameA); } +static void test_GetLibAttr(void) +{ + ULONG ref1, ref2; + TLIBATTR *attr; + ITypeLib *tl; + HRESULT hr; + + hr = LoadTypeLib(wszStdOle2, &tl); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref1 = ITypeLib_AddRef(tl); + ITypeLib_Release(tl); + + hr = ITypeLib_GetLibAttr(tl, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref2 = ITypeLib_AddRef(tl); + ITypeLib_Release(tl); + ok(ref2 == ref1, "got %d, %d\n", ref2, ref1); + + ITypeLib_ReleaseTLibAttr(tl, attr); + ITypeLib_Release(tl); +} + START_TEST(typelib) { const char *filename; @@ -5062,4 +5084,5 @@ START_TEST(typelib) test_LoadTypeLib(); test_TypeInfo2_GetContainingTypeLib(); test_LoadRegTypeLib(); + test_GetLibAttr(); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 616445a..c77bc62 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -536,6 +536,20 @@ HRESULT WINAPI LoadRegTypeLib( { res= LoadTypeLib(bstr, ppTLib); SysFreeString(bstr); + + if (*ppTLib) + { + TLIBATTR *attr; + + res = ITypeLib_GetLibAttr(*ppTLib, &attr); + if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor)) + { + ITypeLib_ReleaseTLibAttr(*ppTLib, attr); + ITypeLib_Release(*ppTLib); + *ppTLib = NULL; + res = TYPE_E_LIBNOTREGISTERED; + } + } } TRACE("(IID: %s) load %s (%p)\n",debugstr_guid(rguid), SUCCEEDED(res)? "SUCCESS":"FAILED", *ppTLib);

1 0

Henri Verbeet : wined3d: Get rid of clearing the texture bindings in state_init_default().
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 9516ce33d8e098dc446344bbef1aa1d7871a04d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9516ce33d8e098dc446344bbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:46 2013 +0200 wined3d: Get rid of clearing the texture bindings in state_init_default(). This is arbitrary, we don't do it for any of the other resource bindings either, and the wined3d_state structure is assumed to be zero-initialized. --- dlls/wined3d/stateblock.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c593a63..04bedf1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1378,11 +1378,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi /* TODO: Vertex offset in the presampled displacement map. */ state->sampler_states[i][WINED3D_SAMP_DMAP_OFFSET] = 0; } - - for (i = 0; i < gl_info->limits.textures; ++i) - { - state->textures[i] = NULL; - } } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,

1 0

Henri Verbeet : wined3d: Add fallback depth format info for when ARB_depth_texture is not available .
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 8eb73cd0e9aaa1d2d4bd922d03b6ee7a51e865ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb73cd0e9aaa1d2d4bd922d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:44 2013 +0200 wined3d: Add fallback depth format info for when ARB_depth_texture is not available. These use the generic GL_DEPTH_COMPONENT internal format, and can't be used for texturing. --- dlls/wined3d/utils.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e13e094..920a2fc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -884,10 +884,18 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, /* Depth stencil formats */ + {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, + {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, @@ -919,6 +927,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, NULL}, + {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -936,6 +948,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, convert_s4x4_uint_d24_unorm}, + {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for GdipTransformRegion with an empty region path.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 3870e5b25584a3d48b852bb6cc09a13fc7091916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3870e5b25584a3d48b852bb6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:25:12 2013 +0900 gdiplus/tests: Add a test for GdipTransformRegion with an empty region path. --- dlls/gdiplus/tests/region.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index a254bed..7d20c3c 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -117,6 +117,7 @@ static void test_getregiondata(void) DWORD buf[100]; GpRect rect; GpPath *path; + GpMatrix *matrix; memset(buf, 0xee, sizeof(buf)); @@ -376,6 +377,14 @@ static void test_getregiondata(void) ok((*(buf + 8) & (~ 0x00004000)) == 0x00000000, "expected 00000000 got %08x\n", *(buf + 8) & (~ 0x00004000)); + /* Transform an empty region */ + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + status = GdipTransformRegion(region, matrix); +todo_wine + expect(Ok, status); + GdipDeleteMatrix(matrix); + status = GdipDeleteRegion(region); expect(Ok, status);

1 0

Piotr Caban : msvcrt: Improve error handling in wcsrtombs function.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: b50833389ee2038337947e0220175920c2e36415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50833389ee2038337947e022… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:51:48 2013 +0200 msvcrt: Improve error handling in wcsrtombs function. --- dlls/msvcrt/wcs.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d1e738f..1cf2276 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -407,8 +407,10 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst if(!mbstr) { tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, *wcstr, -1, NULL, 0, NULL, &used_default)-1; - if(used_default) + if(!tmp || used_default) { + *MSVCRT__errno() = MSVCRT_EILSEQ; return -1; + } return tmp; } @@ -418,8 +420,10 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst size = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, *wcstr, 1, buf, 3, NULL, &used_default); - if(used_default) + if(!size || used_default) { + *MSVCRT__errno() = MSVCRT_EILSEQ; return -1; + } if(tmp+size > count) return tmp; @@ -476,6 +480,8 @@ static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, if(!mbstr && !size && wcstr) { conv = MSVCRT_wcsrtombs_l(NULL, wcstr, 0, locale); + if(conv == -1) + return *MSVCRT__errno(); if(ret) *ret = conv+1; return 0; @@ -492,7 +498,11 @@ static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, conv = count; conv = MSVCRT_wcsrtombs_l(mbstr, wcstr, conv, locale); - if(conv<size) + if(conv == -1) { + if(size) + mbstr[0] = '\0'; + return *MSVCRT__errno(); + }else if(conv < size) mbstr[conv++] = '\0'; else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0')) mbstr[conv-1] = '\0';

1 0