January 2014 - Wine-commits

Jactry Zeng : riched20: Add UTF8 support for EM_SETTEXTEX.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 88214a5874b4fa3f009444b65a8a424105454f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88214a5874b4fa3f009444b65… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Jan 21 08:55:29 2014 +0800 riched20: Add UTF8 support for EM_SETTEXTEX. --- dlls/riched20/editor.c | 16 ++++++++++++---- dlls/riched20/tests/editor.c | 8 ++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 85848bc..e419bf6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3329,8 +3329,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, SETTEXTEX *pStruct = (SETTEXTEX *)wParam; int from, to, len; ME_Style *style; - BOOL bRtf, bUnicode, bSelection; + BOOL bRtf, bUnicode, bSelection, bUTF8; int oldModify = editor->nModifyStep; + static const char utf8_bom[] = {0xef, 0xbb, 0xbf}; if (!pStruct) return 0; @@ -3339,6 +3340,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf", 6))); bUnicode = !bRtf && pStruct->codepage == CP_UNICODE; + bUTF8 = (lParam && (!strncmp((char *)lParam, utf8_bom, 3))); TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", bUnicode ? debugstr_w((LPCWSTR)lParam) : debugstr_a((LPCSTR)lParam), @@ -3364,9 +3366,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len = lParam ? strlen((char *)lParam) : 0; } } else { - wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); - ME_InsertTextFromCursor(editor, 0, wszText, len, style); - ME_EndToUnicode(pStruct->codepage, wszText); + if (bUTF8 && !bUnicode) { + wszText = ME_ToUnicode(CP_UTF8, (void *)(lParam+3), &len); + ME_InsertTextFromCursor(editor, 0, wszText, len, style); + ME_EndToUnicode(CP_UTF8, wszText); + } else { + wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); + ME_InsertTextFromCursor(editor, 0, wszText, len, style); + ME_EndToUnicode(pStruct->codepage, wszText); + } } if (bSelection) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ae0f72f..2efee9a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3901,17 +3901,17 @@ static void test_EM_SETTEXTEX(void) setText.codepage = CP_ACP; SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); - todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); result = strcmp(bufACP, "TestUTF8WithBOM"); - todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); setText.flags = 0; setText.codepage = CP_UTF8; SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); - todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); result = strcmp(bufACP, "TestUTF8WithBOM"); - todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); DestroyWindow(hwndRichEdit); }

1 0

Andrey Gusev : Assorted spelling and typos fixes.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: e7f0a8a081dd088bf50fd6e6b8b846b3c05b75a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f0a8a081dd088bf50fd6e6b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 22 13:25:54 2014 +0200 Assorted spelling and typos fixes. --- dlls/d3d9/tests/device.c | 2 +- dlls/d3drm/frame.c | 4 ++-- dlls/d3dxof/d3dxof.c | 2 +- dlls/d3dxof/main.c | 2 +- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 6 +++--- dlls/dbghelp/storage.c | 2 +- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 10 +++++----- dlls/ddraw/tests/ddraw7.c | 10 +++++----- dlls/ddraw/tests/dsurface.c | 4 ++-- dlls/ddraw/utils.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7f0a8a081dd088bf50fd…

1 0

André Hentschel : setupapi/tests: Remove dead code.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 0d688c7d520696dc26457317ec97864be5039a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d688c7d520696dc26457317e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:31:06 2014 +0100 setupapi/tests: Remove dead code. --- dlls/setupapi/tests/stringtable.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 8048f8a..2818e30 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -48,10 +48,6 @@ static HSTRING_TABLE (WINAPI *pStringTableInitializeEx)(DWORD, DWORD); static DWORD (WINAPI *pStringTableLookUpString)(HSTRING_TABLE, LPWSTR, DWORD); static DWORD (WINAPI *pStringTableLookUpStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); static LPWSTR (WINAPI *pStringTableStringFromId)(HSTRING_TABLE, DWORD); -#if 0 -static BOOL (WINAPI *pStringTableStringFromIdEx)(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); -static VOID (WINAPI *pStringTableTrim)(HSTRING_TABLE); -#endif static HMODULE hdll; static WCHAR string[] = {'s','t','r','i','n','g',0};

1 0

André Hentschel : comctl32/tests: Avoid preprocessor checks to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: e32237d34ade0f29af579fde39dd85ac34f6f9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32237d34ade0f29af579fde3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:17 2014 +0100 comctl32/tests: Avoid preprocessor checks to ensure it compiles. --- dlls/comctl32/tests/imagelist.c | 5 +++-- dlls/comctl32/tests/monthcal.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index caf7539..38fb744 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -809,7 +809,8 @@ static ULONG check_bitmap_data(const char *bm_data, ULONG bm_data_size, image_size = DIB_GetWidthBytes(bmih->biWidth, bmih->biBitCount) * bmih->biHeight; ok(bmih->biSizeImage == image_size, "wrong biSizeImage %u\n", bmih->biSizeImage); -#if 0 + +if (0) { char fname[256]; FILE *f; @@ -818,7 +819,7 @@ static ULONG check_bitmap_data(const char *bm_data, ULONG bm_data_size, fwrite(bm_data, 1, bm_data_size, f); fclose(f); } -#endif + return hdr_size + image_size; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 145d20f..78ef541 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1082,7 +1082,8 @@ static void test_hittest(void) expect(mchit.uHit, res); expect_hex(MCHT_CALENDARDATEPREV, res); -#if 0 +if (0) +{ /* (125, 115) is in active area - date from this month */ mchit.pt.x = 125; mchit.pt.y = 115; @@ -1091,7 +1092,7 @@ static void test_hittest(void) expect(115, mchit.pt.y); expect(mchit.uHit, res); expect(MCHT_CALENDARDATE, res); -#endif +} /* in active area - date from next month */ mchit.pt.x = 11 * r.right / 14;

1 0

André Hentschel : d3d10/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 10fc362dfeb9dfd43469f3572b846b7a88c615c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fc362dfeb9dfd43469f3572… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:24 2014 +0100 d3d10/tests: Avoid preprocessor check to ensure it compiles. --- dlls/d3d10/tests/effect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e16d458..a07bc6c 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2679,11 +2679,12 @@ static void test_effect_local_shader(ID3D10Device *device) p = null_technique->lpVtbl->GetPassByName(null_technique, "invalid"); ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); -#if 0 +if (0) +{ /* This crashes on W7/DX10, if t is a valid technique and name=NULL. */ p = t->lpVtbl->GetPassByName(t, NULL); ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); -#endif +} p = t->lpVtbl->GetPassByIndex(t, 0xffffffff); ok(null_pass == p, "GetPassByIndex got %p, expected %p\n", p, null_pass);

1 0

André Hentschel : d3dxof/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 81ea0cd86f67474056660f97bfce3c2eb1dd9df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ea0cd86f67474056660f97b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:33 2014 +0100 d3dxof/tests: Avoid preprocessor check to ensure it compiles. --- dlls/d3dxof/tests/d3dxof.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index f4ab68a..67baac0 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -1184,12 +1184,13 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) for (i = 0; i < level; i++) printf(" "); printf("Found Data Reference (%d)\n", j); -#if 0 +if (0) +{ hr = IDirectXFileDataReference_GetId(lpDirectXFileData, &clsid); ok(hr == DXFILE_OK, "IDirectXFileData_GetId: %x\n", hr); hr = IDirectXFileDataReference_GetName(lpDirectXFileData, name, &len); ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); -#endif +} IDirectXFileDataReference_Resolve(p2, &pfdo); process_data(pfdo, level); IDirectXFileData_Release(pfdo);

1 0

André Hentschel : d3dx9_36/tests: Avoid preprocessor checks to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 28b9e1b947ae362825b5e3745bc67388f62d11db URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b9e1b947ae362825b5e3745… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:21 2014 +0100 d3dx9_36/tests: Avoid preprocessor checks to ensure it compiles. --- dlls/d3dx9_36/tests/mesh.c | 7 ++++--- dlls/d3dx9_36/tests/shader.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 2eb2146..1c3748f 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4070,14 +4070,15 @@ static void D3DXCreateTextTest(void) d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_faces); if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); -#if 0 +if (0) +{ /* too much detail requested, so will appear to hang */ trace("Waiting for D3DXCreateText to finish with deviation = FLT_MIN ...\n"); - hr = D3DXCreateText(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); + hr = D3DXCreateTextA(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); trace("D3DXCreateText finish with deviation = FLT_MIN\n"); -#endif +} hr = D3DXCreateTextA(device, hdc, "wine", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index c0d5f00..4406cd1 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1564,11 +1564,12 @@ static void test_get_shader_samplers(void) UINT count = 2; HRESULT hr; -#if 0 +if (0) +{ /* crashes if bytecode is NULL */ hr = D3DXGetShaderSamplers(NULL, NULL, &count); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK); -#endif +} hr = D3DXGetShaderSamplers(get_shader_samplers_blob, NULL, NULL); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK);

1 0

André Hentschel : shell32/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 9d1fdf1165e81116d7401a8dc4a65d78a053efd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1fdf1165e81116d7401a8dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:31 2014 +0100 shell32/tests: Avoid preprocessor check to ensure it compiles. --- dlls/shell32/tests/string.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 1d55ecf..81f4754 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -87,13 +87,14 @@ static void test_StrRetToStringNW(void) "STRRET_OFFSET: dup failed, ret=%d\n", ret); /* The next test crashes on W2K, WinXP and W2K3, so we don't test. */ -#if 0 +if (0) +{ /* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */ strret.uType = STRRET_WSTR; U(strret).pOleStr = CoDupStrW("Test"); pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL); trace("NULL dest: ret=%d\n", ret); -#endif +} } START_TEST(string)

1 0

André Hentschel : shlwapi/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: e98844e5c92e47a5a8d15e70007ff8f06982cb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98844e5c92e47a5a8d15e700… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 24 23:07:39 2014 +0100 shlwapi/tests: Avoid preprocessor check to ensure it compiles. --- dlls/shlwapi/tests/istream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index bacd0e6..95485b9 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -283,10 +283,11 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); -#if 0 /* This test crashes on WinXP SP2 */ +if (0) /* This test crashes on WinXP SP2 */ +{ ret = (*pSHCreateStreamOnFileA)(test_file, mode | stgm, NULL); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); -#endif +} stream = NULL; ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CONVERT | stgm, &stream);

1 0

Henri Verbeet : ddraw/tests: Rewrite AttachmentTest() and AttachmentTest7( ).
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: fffaf03c0d722aa4e9036ec69e77c2d9b2c60ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffaf03c0d722aa4e9036ec69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:51 2014 +0100 ddraw/tests: Rewrite AttachmentTest() and AttachmentTest7(). --- dlls/ddraw/tests/ddraw1.c | 247 ++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 247 ++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 273 ++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 255 +++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 583 ------------------------------------------- 5 files changed, 1022 insertions(+), 583 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fffaf03c0d722aa4e9036…

1 0