May 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : configure: Workaround for clang not reporting an error on unknown options.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 7f810293b762912a4d956d6945bfb6815f90e715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f810293b762912a4d956d694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 21 13:56:08 2013 +0200 configure: Workaround for clang not reporting an error on unknown options. --- configure | 203 +++++++++++++++++++++++++++++++++++++++------------------- configure.ac | 46 +++++++------ 2 files changed, 161 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f810293b762912a4d956…

1 0

Alexandre Julliard : ole32/tests: Fix array indices in a trace.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: aaa680bfda4c665733ed2d24508bef43f37852d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa680bfda4c665733ed2d245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 21 14:57:53 2013 +0200 ole32/tests: Fix array indices in a trace. --- dlls/ole32/tests/clipboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 5a16032..db090bd 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -742,8 +742,8 @@ static void test_cf_dataobject(IDataObject *data) cfs_seen[count] = fmt.cfFormat; ok(fmt_ptr->first_use_of_cf != seen_cf, "got %08x expected %08x\n", fmt_ptr->first_use_of_cf, !seen_cf); - ok(fmt_ptr->res[0] == 0, "got %08x\n", fmt_ptr->res[1]); - ok(fmt_ptr->res[1] == 0, "got %08x\n", fmt_ptr->res[2]); + ok(fmt_ptr->res[0] == 0, "got %08x\n", fmt_ptr->res[0]); + ok(fmt_ptr->res[1] == 0, "got %08x\n", fmt_ptr->res[1]); if(fmt.ptd) { DVTARGETDEVICE *target;

1 0

Huw Davies : user32: Move back to using WC<-> MB in order to specify an alternative codepage.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: bf85df3f0e543adb86130480eabc227e8b33a645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf85df3f0e543adb86130480e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 21 12:51:21 2013 +0100 user32: Move back to using WC<->MB in order to specify an alternative codepage. --- dlls/user32/message.c | 26 ++++++++++++++++---------- dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 8 ++++---- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e819983..24588ac 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -584,6 +584,10 @@ static BOOL CALLBACK broadcast_message_callback( HWND hwnd, LPARAM lparam ) return TRUE; } +DWORD get_input_codepage( void ) +{ + return CP_ACP; +} /*********************************************************************** * map_wparam_AtoW @@ -594,6 +598,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { char ch[2]; WCHAR wch[2]; + DWORD cp = get_input_codepage(); wch[0] = wch[1] = 0; switch(message) @@ -612,7 +617,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { ch[0] = low; ch[1] = HIBYTE(*wparam); - RtlMultiByteToUnicodeN( wch, sizeof(wch), NULL, ch, 2 ); + MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); TRACE( "map %02x,%02x -> %04x mapping %u\n", (BYTE)ch[0], (BYTE)ch[1], wch[0], mapping ); if (data) data->lead_byte[mapping] = 0; } @@ -620,14 +625,14 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { ch[0] = data->lead_byte[mapping]; ch[1] = low; - RtlMultiByteToUnicodeN( wch, sizeof(wch), NULL, ch, 2 ); + MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); TRACE( "map stored %02x,%02x -> %04x mapping %u\n", (BYTE)ch[0], (BYTE)ch[1], wch[0], mapping ); data->lead_byte[mapping] = 0; } else if (!IsDBCSLeadByte( low )) { ch[0] = low; - RtlMultiByteToUnicodeN( wch, sizeof(wch), NULL, ch, 1 ); + MultiByteToWideChar( cp, 0, ch, 1, wch, 2 ); TRACE( "map %02x -> %04x\n", (BYTE)ch[0], wch[0] ); if (data) data->lead_byte[mapping] = 0; } @@ -655,14 +660,14 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping case WM_MENUCHAR: ch[0] = LOBYTE(*wparam); ch[1] = HIBYTE(*wparam); - RtlMultiByteToUnicodeN( wch, sizeof(wch), NULL, ch, 2 ); + MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); *wparam = MAKEWPARAM(wch[0], wch[1]); break; case WM_IME_CHAR: ch[0] = HIBYTE(*wparam); ch[1] = LOBYTE(*wparam); - if (ch[0]) RtlMultiByteToUnicodeN( wch, sizeof(wch[0]), NULL, ch, 2 ); - else RtlMultiByteToUnicodeN( wch, sizeof(wch[0]), NULL, ch + 1, 1 ); + if (ch[0]) MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); + else MultiByteToWideChar( cp, 0, ch + 1, 1, wch, 1 ); *wparam = MAKEWPARAM(wch[0], HIWORD(*wparam)); break; } @@ -677,9 +682,10 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping */ static void map_wparam_WtoA( MSG *msg, BOOL remove ) { - BYTE ch[2]; + BYTE ch[4]; WCHAR wch[2]; DWORD len; + DWORD cp = get_input_codepage(); switch(msg->message) { @@ -688,7 +694,7 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) { wch[0] = LOWORD(msg->wParam); ch[0] = ch[1] = 0; - RtlUnicodeToMultiByteN( (LPSTR)ch, 2, &len, wch, sizeof(wch[0]) ); + len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); if (len == 2) /* DBCS char */ { struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; @@ -716,13 +722,13 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) wch[0] = LOWORD(msg->wParam); wch[1] = HIWORD(msg->wParam); ch[0] = ch[1] = 0; - RtlUnicodeToMultiByteN( (LPSTR)ch, 2, NULL, wch, sizeof(wch) ); + WideCharToMultiByte( cp, 0, wch, 2, (LPSTR)ch, 4, NULL, NULL ); msg->wParam = MAKEWPARAM( ch[0] | (ch[1] << 8), 0 ); break; case WM_IME_CHAR: wch[0] = LOWORD(msg->wParam); ch[0] = ch[1] = 0; - RtlUnicodeToMultiByteN( (LPSTR)ch, 2, &len, wch, sizeof(wch[0]) ); + len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); if (len == 2) msg->wParam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(msg->wParam) ); else diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index dc50157..5666412 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -227,6 +227,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, extern void *get_hook_proc( void *proc, const WCHAR *module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; +extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) DECLSPEC_HIDDEN; extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index e6b5194..ebccbe4 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -220,8 +220,9 @@ static WPARAM map_wparam_char_WtoA( WPARAM wParam, DWORD len ) { WCHAR wch = wParam; BYTE ch[2]; + DWORD cp = get_input_codepage(); - RtlUnicodeToMultiByteN( (LPSTR)ch, len, &len, &wch, sizeof(wch) ); + len = WideCharToMultiByte( cp, 0, &wch, 1, (LPSTR)ch, len, NULL, NULL ); if (len == 2) return MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(wParam) ); else @@ -827,9 +828,8 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN { WCHAR wch = wParam; char ch[2]; - DWORD len; - - RtlUnicodeToMultiByteN( ch, 2, &len, &wch, sizeof(wch) ); + DWORD cp = get_input_codepage(); + DWORD len = WideCharToMultiByte( cp, 0, &wch, 1, ch, 2, NULL, NULL ); ret = callback( hwnd, msg, (BYTE)ch[0], lParam, result, arg ); if (len == 2) ret = callback( hwnd, msg, (BYTE)ch[1], lParam, result, arg ); }

1 0

Huw Davies : user32: Use the codepage associated with the input locale for WM_CHAR-type conversions .
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 5d5d0935ea5469e32b33c8b9c968f7b2d66f3d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5d0935ea5469e32b33c8b9c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 21 12:51:22 2013 +0100 user32: Use the codepage associated with the input locale for WM_CHAR-type conversions. --- dlls/user32/message.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 24588ac..a6a839c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -586,7 +586,14 @@ static BOOL CALLBACK broadcast_message_callback( HWND hwnd, LPARAM lparam ) DWORD get_input_codepage( void ) { - return CP_ACP; + DWORD cp; + int ret; + HKL hkl = GetKeyboardLayout( 0 ); + + ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (!ret) cp = CP_ACP; + return cp; } /***********************************************************************

1 0

Zhan Jianyu : vbscript: Implemented builtin function CInt.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: c6ce31ce831402a5ac0f7eac2e798b92132bb78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ce31ce831402a5ac0f7eac2… Author: Zhan Jianyu <nasa4836(a)gmail.com> Date: Tue May 21 21:29:03 2013 +0800 vbscript: Implemented builtin function CInt. --- dlls/vbscript/global.c | 14 ++++++++++++-- dlls/vbscript/tests/api.vbs | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 392b88f..49dcb50 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -378,8 +378,18 @@ static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int val; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = to_int(arg, &val); + if(FAILED(hres)) + return hres; + + return return_int(res, val); } static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index b6d8cd5..1151071 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -433,4 +433,27 @@ Call ok(getVT(vbYes) = "VT_I2", "getVT(vbYes) = " & getVT(vbYes)) Call ok(vbNo = 7, "vbNo = " & vbNo) Call ok(getVT(vbNo) = "VT_I2", "getVT(vbNo) = " & getVT(vbNo)) +Call ok(CInt(-36.75) = -37, "CInt(-36.75) = " & CInt(-36.75)) +Call ok(getVT(CInt(-36.75)) = "VT_I2", "getVT(CInt(-36.75)) = " & getVT(CInt(-36.75))) +Call ok(CInt(-36.50) = -36, "CInt(-36.50) = " & CInt(-36.50)) +Call ok(getVT(CInt(-36.50)) = "VT_I2", "getVT(CInt(-36.50)) = " & getVT(CInt(-36.50))) +Call ok(CInt(-36.25) = -36, "CInt(-36.25) = " & CInt(-36.25)) +Call ok(getVT(CInt(-36.25)) = "VT_I2", "getVT(CInt(-36.25)) = " & getVT(CInt(-36.25))) +Call ok(CInt(-36) = -36, "CInt(-36) = " & CInt(-36)) +Call ok(getVT(CInt(-36)) = "VT_I2", "getVT(CInt(-36)) = " & getVT(CInt(-36))) +Call ok(CInt(0) = 0, "CInt(0) = " & CInt(0)) +Call ok(getVT(CInt(0)) = "VT_I2", "getVT(CInt(0)) = " & getVT(CInt(0))) +Call ok(CInt(0.0) = 0, "CInt(0.0) = " & CInt(0)) +Call ok(getVT(CInt(0.0)) = "VT_I2", "getVT(CInt(0.0)) = " & getVT(CInt(0.0))) +Call ok(CInt(0.5) = 0, "CInt(0.5) = " & CInt(0)) +Call ok(getVT(CInt(0.5)) = "VT_I2", "getVT(CInt(0.5)) = " & getVT(CInt(0.5))) +Call ok(CInt(36) = 36, "CInt(36) = " & CInt(36)) +Call ok(getVT(CInt(36)) = "VT_I2", "getVT(CInt(36)) = " & getVT(CInt(36))) +Call ok(CInt(36.25) = 36, "CInt(36.25) = " & CInt(36.25)) +Call ok(getVT(CInt(36.25)) = "VT_I2", "getVT(CInt(36.25)) = " & getVT(CInt(36.25))) +Call ok(CInt(36.50) = 36, "CInt(36.50) = " & CInt(36.50)) +Call ok(getVT(CInt(36.50)) = "VT_I2", "getVT(CInt(36.50)) = " & getVT(CInt(36.50))) +Call ok(CInt(36.75) = 37, "CInt(36.75) = " & CInt(36.75)) +Call ok(getVT(CInt(36.75)) = "VT_I2", "getVT(CInt(36.75)) = " & getVT(CInt(36.75))) + Call reportSuccess()

1 0

Zhan Jianyu : vbscript: Implemented builtin function CBool.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 75be5eee639d1d0fd3542cc744d15b0f20f43e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75be5eee639d1d0fd3542cc74… Author: Zhan Jianyu <nasa4836(a)gmail.com> Date: Tue May 21 21:30:06 2013 +0800 vbscript: Implemented builtin function CBool. --- dlls/vbscript/global.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 8 ++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 49dcb50..fbd8601 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -114,6 +114,16 @@ static HRESULT return_int(VARIANT *res, int val) return S_OK; } +static HRESULT return_bool(VARIANT *res, int val) +{ + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = val != 0 ? VARIANT_TRUE : VARIANT_FALSE; + } + + return S_OK; +} + static inline HRESULT return_double(VARIANT *res, double val) { if(res) { @@ -400,8 +410,30 @@ static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int val; + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + switch(V_VT(arg)) { + case VT_I2: + val = V_I2(arg); + break; + case VT_I4: + val = V_I4(arg); + break; + case VT_R4: + val = V_R4(arg) > 0.0 || V_R4(arg) < 0.0; + break; + case VT_R8: + val = V_R8(arg) > 0.0 || V_R8(arg) < 0.0; + break; + default: + ERR("Not a numeric vaule: %s\n", debugstr_variant(arg)); + return E_FAIL; + } + + return return_bool(res, val); } static HRESULT Global_CByte(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1151071..3c496b1 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -456,4 +456,12 @@ Call ok(getVT(CInt(36.50)) = "VT_I2", "getVT(CInt(36.50)) = " & getVT(CInt(36.50 Call ok(CInt(36.75) = 37, "CInt(36.75) = " & CInt(36.75)) Call ok(getVT(CInt(36.75)) = "VT_I2", "getVT(CInt(36.75)) = " & getVT(CInt(36.75))) + +Call ok(CBool(5) = true, "CBool(5) = " & CBool(5)) +Call ok(getVT(CBool(5)) = "VT_BOOL", "getVT(CBool(5)) = " & getVT(CBool(5))) +Call ok(CBool(0) = false, "CBool(0) = " & CBool(0)) +Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) +Call ok(CBool(-5) = true, "CBool(-5) = " & CBool(-5)) +Call ok(getVT(CBool(-5)) = "VT_BOOL", "getVT(CBool(-5)) = " & getVT(CBool(-5))) + Call reportSuccess()

1 0

Stefan Dösinger : wined3d: Correct an ERR/FIXME.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 10929cbe43d8feb6fbd3c9ea20c8551d90938c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10929cbe43d8feb6fbd3c9ea2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 21 13:18:20 2013 +0200 wined3d: Correct an ERR/FIXME. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cdd744c..bd7fbd7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4563,7 +4563,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 if (!pal) { - ERR("This code should never get entered for DirectDraw!, expect problems\n"); + FIXME("No palette set.\n"); if (index_in_alpha) { /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if

1 0

Stefan Dösinger : d3d9/tests: d3d9ex video memory accounting tests.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 30e9a37bbbde8290a79b19f2b60fb8ffbf561fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e9a37bbbde8290a79b19f2b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 21 13:18:21 2013 +0200 d3d9/tests: d3d9ex video memory accounting tests. --- dlls/d3d9/tests/d3d9ex.c | 49 ++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5e5524e..2deef76 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -908,6 +908,54 @@ done: DestroyWindow(window); } +static void test_vidmem_accounting(void) +{ + IDirect3DDevice9Ex *device; + unsigned int i; + HWND window; + HRESULT hr = D3D_OK; + ULONG ref; + UINT vidmem_start, vidmem_end; + INT diff; + IDirect3DTexture9 *textures[20]; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + vidmem_start = IDirect3DDevice9_GetAvailableTextureMem(device); + memset(textures, 0, sizeof(textures)); + for (i = 0; i < 20 && SUCCEEDED(hr); i++) + { + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &textures[i], NULL); + /* No D3DERR_OUTOFVIDEOMEMORY in d3d9ex */ + ok(SUCCEEDED(hr) || hr == E_OUTOFMEMORY, "Failed to create texture, hr %#x.\n", hr); + } + vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device); + + diff = vidmem_start - vidmem_end; + diff = abs(diff); + ok(diff < 1024 * 1024, "Expected a video memory difference of less than 1 MB, got %u MB.\n", + diff / 1024 / 1024); + + for (i = 0; i < 20; i++) + { + if (textures[i]) + IDirect3DTexture9_Release(textures[i]); + } + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + DestroyWindow(window); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -935,4 +983,5 @@ START_TEST(d3d9ex) test_texture_sysmem_create(); test_reset(); test_reset_resources(); + test_vidmem_accounting(); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3283a6e..abf565a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6396,6 +6396,63 @@ done: } +static void test_vidmem_accounting(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + HWND window; + HRESULT hr = D3D_OK; + IDirect3DTexture9 *textures[20]; + unsigned int i; + UINT vidmem_start, vidmem_end, diff; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + vidmem_start = IDirect3DDevice9_GetAvailableTextureMem(device); + memset(textures, 0, sizeof(textures)); + for (i = 0; i < sizeof(textures) / sizeof(*textures) && SUCCEEDED(hr); i++) + { + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &textures[i], NULL); + /* D3DERR_OUTOFVIDEOMEMORY is returned when the card runs out of video memory + * E_FAIL is returned on address space or system memory exhaustion */ + ok(SUCCEEDED(hr) || hr == D3DERR_OUTOFVIDEOMEMORY || hr == E_OUTOFMEMORY, + "Failed to create texture, hr %#x.\n", hr); + } + vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device); + + ok(vidmem_start > vidmem_end, "Expected available texture memory to decrease during texture creation.\n"); + diff = vidmem_start - vidmem_end; + ok(diff > 1024 * 1024 * 2 * i, "Expected a video memory difference of at least %u MB, got %u MB.\n", + 2 * i, diff / 1024 / 1024); + + for (i = 0; i < sizeof(textures) / sizeof(*textures); i++) + { + if (textures[i]) + IDirect3DTexture9_Release(textures[i]); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6485,6 +6542,7 @@ START_TEST(device) test_swvp_buffer(); test_rtpatch(); test_npot_textures(); + test_vidmem_accounting(); } out:

1 0

Daniel Jelinski : msi: Remove trailing spaces from command line property name.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 4b4bd0201ccc22015f6eb797821a0af0ba37b5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4bd0201ccc22015f6eb7978… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri May 17 23:24:10 2013 +0200 msi: Remove trailing spaces from command line property name. --- dlls/msi/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f519f4b..e6422a7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -332,6 +332,8 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, len = ptr2 - ptr; if (!len) return ERROR_INVALID_COMMAND_LINE; + while (ptr[len - 1] == ' ') len--; + prop = msi_alloc( (len + 1) * sizeof(WCHAR) ); memcpy( prop, ptr, len * sizeof(WCHAR) ); prop[len] = 0;

1 0

Nikolay Sivov : comctl32: Remove duplicated code for scroll control size calculation.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 4f99560ef006d729b9a79284124d045788ba83fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f99560ef006d729b9a792841… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 19 10:54:39 2013 +0400 comctl32: Remove duplicated code for scroll control size calculation. --- dlls/comctl32/tab.c | 35 ++++++++--------------------------- 1 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 43d8cdf..229e72b 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1023,37 +1023,18 @@ static void TAB_SetupScrolling( /* * Calculate the position of the scroll control. */ - if(infoPtr->dwStyle & TCS_VERTICAL) - { - controlPos.right = clientRect->right; - controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); + controlPos.right = clientRect->right; + controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - if (infoPtr->dwStyle & TCS_BOTTOM) - { - controlPos.top = clientRect->bottom - infoPtr->tabHeight; - controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); - } - else - { - controlPos.bottom = clientRect->top + infoPtr->tabHeight; - controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); - } + if (infoPtr->dwStyle & TCS_BOTTOM) + { + controlPos.top = clientRect->bottom - infoPtr->tabHeight; + controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); } else { - controlPos.right = clientRect->right; - controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - - if (infoPtr->dwStyle & TCS_BOTTOM) - { - controlPos.top = clientRect->bottom - infoPtr->tabHeight; - controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); - } - else - { - controlPos.bottom = clientRect->top + infoPtr->tabHeight; - controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); - } + controlPos.bottom = clientRect->top + infoPtr->tabHeight; + controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); } /*

1 0