March 2011 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Fix buffer size in _ecvt_s.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: f48cfa2be0e0d199072308cd759c2e75734a7cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48cfa2be0e0d199072308cd7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 20:33:06 2011 +0200 msvcrt: Fix buffer size in _ecvt_s. --- dlls/msvcrt/math.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ab9cec4..3428398 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1306,17 +1306,17 @@ int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigit (*sign) = 0; return 0; } - result = (char*)MSVCRT_malloc(max(ndigits + 7, 7)); + /* handle cases with zero ndigits or less */ + prec = ndigits; + if( prec < 1) prec = 2; + result = (char*)MSVCRT_malloc(prec + 7); if( number < 0) { *sign = TRUE; number = -number; } else *sign = FALSE; - /* handle cases with zero ndigits or less */ - prec = ndigits; - if( prec < 1) prec = 2; - len = snprintf(result, 80, "%.*le", prec - 1, number); + len = snprintf(result, prec + 7, "%.*le", prec - 1, number); /* take the decimal "point away */ if( prec != 1) memmove( result + 1, result + 2, len - 1 );

1 0

Henri Verbeet : wined3d: Merge the IWineD3DBaseShader implementations.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 45fd0d4e7a2c0935a68d05e2833dc9aced1e3e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fd0d4e7a2c0935a68d05e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:23 2011 +0200 wined3d: Merge the IWineD3DBaseShader implementations. --- dlls/wined3d/shader.c | 203 ++++-------------------------------------------- 1 files changed, 17 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45fd0d4e7a2c0935a68d0…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DBaseShaderClass.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 5555d904beee92833996059d288539478164a40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5555d904beee92833996059d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:24 2011 +0200 wined3d: Get rid of IWineD3DBaseShaderClass. --- dlls/wined3d/arb_program_shader.c | 185 +++++++++++---------- dlls/wined3d/device.c | 12 +- dlls/wined3d/glsl_shader.c | 169 ++++++++++---------- dlls/wined3d/shader.c | 319 +++++++++++++++++++------------------ dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 81 +++++----- 6 files changed, 388 insertions(+), 382 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5555d904beee928339960…

1 0

Henri Verbeet : wined3d: Remove COM from the shader implementation.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: f8f83ff2f7da887570eeafbc24e47ca7f824bcc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f83ff2f7da887570eeafbc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:25 2011 +0200 wined3d: Remove COM from the shader implementation. --- dlls/d3d10core/d3d10core_private.h | 6 +- dlls/d3d10core/shader.c | 10 +- dlls/d3d8/d3d8_private.h | 6 +- dlls/d3d8/device.c | 21 +++--- dlls/d3d8/shader.c | 8 +- dlls/d3d8/vertexdeclaration.c | 4 +- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 12 ++-- dlls/d3d9/shader.c | 12 ++-- dlls/wined3d/arb_program_shader.c | 10 +- dlls/wined3d/device.c | 24 +++--- dlls/wined3d/glsl_shader.c | 12 ++-- dlls/wined3d/shader.c | 150 ++++++++++++------------------------ dlls/wined3d/stateblock.c | 12 ++-- dlls/wined3d/wined3d.spec | 6 ++ dlls/wined3d/wined3d_private.h | 21 +++--- include/wine/wined3d.idl | 41 ++++------ 17 files changed, 153 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8f83ff2f7da887570eea…

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DBaseShader typedefs.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 8fe80e18b2856de90108ae18215502bf8bb73057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe80e18b2856de90108ae182… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:26 2011 +0200 wined3d: Get rid of the IWineD3DBaseShader typedefs. --- dlls/wined3d/arb_program_shader.c | 48 ++++++++++++++++----------------- dlls/wined3d/device.c | 48 ++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 52 +++++++++++++++++------------------- dlls/wined3d/shader.c | 28 ++++++++++---------- dlls/wined3d/state.c | 4 +- dlls/wined3d/stateblock.c | 4 +- dlls/wined3d/wined3d_private.h | 16 +++++------ 7 files changed, 96 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fe80e18b2856de90108a…

1 0

Henri Verbeet : wined3d: Rename "numContexts" to "context_count".
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 692aa004d00080d7361a2c0d35db68a67a3a87c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692aa004d00080d7361a2c0d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 20:49:27 2011 +0200 wined3d: Rename "numContexts" to "context_count". --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 18 ++++++++++-------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e52bc48..3b0a9b6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -659,7 +659,7 @@ static void context_enum_surface_fbo_entries(IWineD3DDeviceImpl *device, { UINT i; - for (i = 0; i < device->numContexts; ++i) + for (i = 0; i < device->context_count; ++i) { struct wined3d_context *context = device->contexts[i]; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1370,7 +1370,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, } ctx = pwglCreateContext(hdc); - if (device->numContexts) + if (device->context_count) { if (!pwglShareLists(device->contexts[0]->glCtx, ctx)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 695dbb2..1ef9c62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -504,7 +504,8 @@ BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *cont TRACE("Adding context %p.\n", context); if (!device->contexts) new_array = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_array)); - else new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, sizeof(*new_array) * (device->numContexts + 1)); + else new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, + sizeof(*new_array) * (device->context_count + 1)); if (!new_array) { @@ -512,7 +513,7 @@ BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *cont return FALSE; } - new_array[device->numContexts++] = context; + new_array[device->context_count++] = context; device->contexts = new_array; return TRUE; } @@ -525,7 +526,7 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c TRACE("Removing context %p.\n", context); - for (i = 0; i < device->numContexts; ++i) + for (i = 0; i < device->context_count; ++i) { if (device->contexts[i] == context) { @@ -540,15 +541,15 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c return; } - if (!--device->numContexts) + if (!--device->context_count) { HeapFree(GetProcessHeap(), 0, device->contexts); device->contexts = NULL; return; } - memmove(&device->contexts[i], &device->contexts[i + 1], (device->numContexts - i) * sizeof(*device->contexts)); - new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, device->numContexts * sizeof(*device->contexts)); + memmove(&device->contexts[i], &device->contexts[i + 1], (device->context_count - i) * sizeof(*device->contexts)); + new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, device->context_count * sizeof(*device->contexts)); if (!new_array) { ERR("Failed to shrink context array. Oh well.\n"); @@ -6283,7 +6284,7 @@ static void delete_opengl_contexts(IWineD3DDeviceImpl *device, IWineD3DSwapChain context_release(context); - while (device->numContexts) + while (device->context_count) { context_destroy(device, device->contexts[0]); } @@ -7065,7 +7066,8 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) { BYTE shift; UINT i; - for(i = 0; i < This->numContexts; i++) { + for (i = 0; i < This->context_count; ++i) + { context = This->contexts[i]; if(isStateDirty(context, rep)) continue; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f76cdde..5d4dfa7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1013,7 +1013,7 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_ IWineD3DDeviceImpl *device = This->resource.device; unsigned int i; - for (i = 0; i < device->numContexts; ++i) + for (i = 0; i < device->context_count; ++i) { context_surface_update(device->contexts[i], This); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8587afc..c985378 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1759,7 +1759,7 @@ struct IWineD3DDeviceImpl /* Context management */ struct wined3d_context **contexts; - UINT numContexts; + UINT context_count; /* High level patch management */ #define PATCHMAP_SIZE 43

1 0

André Hentschel : uxtheme/tests: Fix typo.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 1f8f7cf7af317fded4daef9407e35b34bc400c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8f7cf7af317fded4daef940… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 30 21:51:02 2011 +0200 uxtheme/tests: Fix typo. --- dlls/uxtheme/tests/system.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 7f77546..b730246 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -421,7 +421,7 @@ static void test_OpenThemeDataEx(void) ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", GetLastError()); - skip("No active theme, skipping rest of OpenThemeData tests\n"); + skip("No active theme, skipping rest of OpenThemeDataEx tests\n"); return; }

1 0

Vincent Pelletier : dinput: Effect length can actually be 0.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: f1beea4f861be815b5b6c3d539ba4eec9c668414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1beea4f861be815b5b6c3d53… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Wed Mar 30 21:52:14 2011 +0200 dinput: Effect length can actually be 0. This fixes force feedback devices slamming for 10ms at full strength, as attack is an absolute value, not a factor of effect level. --- dlls/dinput/effect_linuxinput.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index fbc5994..0154f49 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -606,13 +606,12 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( else env = NULL; if (peff->lpEnvelope == NULL) { - /* if this type had an envelope, reset it - * note that length can never be zero, so we set it to something minuscule */ + /* if this type had an envelope, reset it */ if (env) { - env->attack_length = 0x10; - env->attack_level = 0x7FFF; - env->fade_length = 0x10; - env->fade_level = 0x7FFF; + env->attack_length = 0; + env->attack_level = 0; + env->fade_length = 0; + env->fade_level = 0; } } else { /* did we get passed an envelope for a type that doesn't even have one? */

1 0

Piotr Caban : mshtml/tests: Ignore calls missing in IE6.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 454da235ea30fae25bb6d12c8661565301dc2830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454da235ea30fae25bb6d12c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 22:28:27 2011 +0200 mshtml/tests: Ignore calls missing in IE6. --- dlls/mshtml/tests/htmldoc.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2df4e74..b0ceea0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -74,6 +74,12 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + static IOleDocumentView *view = NULL; static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; @@ -1213,7 +1219,7 @@ static void continue_binding(IBindStatusCallback *callback) BINDSTATUS_BEGINDOWNLOADDATA, doc_url); ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); if(status_code != HTTP_STATUS_OK) { - CHECK_CALLED(IsErrorUrl); + CHECK_CALLED_BROKEN(IsErrorUrl); SET_EXPECT(IsErrorUrl); } @@ -3928,7 +3934,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); - todo_wine CHECK_CALLED(IsErrorUrl); + todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); } else todo_wine CHECK_CALLED(GetTravelLog); @@ -4068,18 +4074,18 @@ static void test_download(DWORD flags) CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); SET_CALLED(SetStatusText); - if(nav_url) { /* avoiding race, FIXME: fund better way */ + if(nav_url) { /* avoiding race, FIXME: find better way */ SET_CALLED(UpdateUI); SET_CALLED(Exec_UPDATECOMMANDS); SET_CALLED(Exec_SETTITLE); - todo_wine CHECK_CALLED(UpdateBackForwardState); + todo_wine CHECK_CALLED_BROKEN(UpdateBackForwardState); } if(!editmode && !(flags & DWL_EMPTY)) todo_wine CHECK_CALLED(FireNavigateComplete2); if(!editmode) CHECK_CALLED(FireDocumentComplete); todo_wine CHECK_CALLED(ActiveElementChanged); - todo_wine CHECK_CALLED(IsErrorUrl); + todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); load_state = LD_COMPLETE;

1 0

Piotr Caban : msvcrt: Added space for nullbyte in size returned by wcstombs_s and mbstowcs_s.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: fdffe548f10d4b07a8fb0af9668ba310824b2304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdffe548f10d4b07a8fb0af96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 15:45:04 2011 +0200 msvcrt: Added space for nullbyte in size returned by wcstombs_s and mbstowcs_s. --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/tests/string.c | 8 ++++++++ dlls/msvcrt/wcs.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 2a2ac72..caadc32 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1900,7 +1900,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, if(!wcstr && !size) { conv = MSVCRT__mbstowcs_l(NULL, mbstr, 0, locale); if(ret) - *ret = conv; + *ret = conv+1; return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f3d8dc4..6aba883 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1337,6 +1337,10 @@ static void test_mbstowcs(void) ok(ret == 3, "ret = %d\n", (int)ret); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); + ok(err == 0, "err = %d\n", err); + ok(ret == 3, "ret = %d\n", (int)ret); + err = pwcstombs_s(&ret, mOut, 6, wSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); @@ -1346,6 +1350,10 @@ static void test_mbstowcs(void) ok(err == 0, "err = %d\n", err); ok(ret == 5, "ret = %d\n", (int)ret); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + + err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); } static void test_gcvt(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 93aa0f0..cf3cba3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -341,7 +341,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, if(!mbstr && !size) { conv = MSVCRT__wcstombs_l(NULL, wcstr, 0, locale); if(ret) - *ret = conv; + *ret = conv+1; return 0; }

1 0