wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Sebastian Lackner : krnl386.exe16: Fix incorrect interpretation of SIB byte when parsing x86 opcode.
by Alexandre Julliard 07 Nov '14

07 Nov '14

Module: wine Branch: master Commit: 8035f90f3b5b4dab85d1c458d7675aba636ea4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8035f90f3b5b4dab85d1c458d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 7 05:19:58 2014 +0100 krnl386.exe16: Fix incorrect interpretation of SIB byte when parsing x86 opcode. --- dlls/krnl386.exe16/instr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 459885d..b44bd55 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -194,7 +194,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, GET_VAL( &sib, BYTE ); rm = sib & 7; ss = sib >> 6; - switch(sib >> 3) + switch((sib >> 3) & 7) { case 0: index = context->Eax; break; case 1: index = context->Ecx; break;

1 0

Sebastian Lackner : ntoskrnl.exe: Fix incorrect interpretation of SIB byte when parsing x86 opcode.
by Alexandre Julliard 07 Nov '14

07 Nov '14

Module: wine Branch: master Commit: 927a44e676134506647b3ed50f75d32d56b610f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=927a44e676134506647b3ed50… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 7 05:19:33 2014 +0100 ntoskrnl.exe: Fix incorrect interpretation of SIB byte when parsing x86 opcode. --- dlls/ntoskrnl.exe/instr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 85ab9eb..fe35686 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -139,7 +139,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, GET_VAL( &sib, BYTE ); rm = sib & 7; ss = sib >> 6; - switch(sib >> 3) + switch((sib >> 3) & 7) { case 0: index = context->Eax; break; case 1: index = context->Ecx; break;

1 0

Stefan Dösinger : d3d8/tests: The device restores the mode settings from the registry.
by Alexandre Julliard 07 Nov '14

07 Nov '14

Module: wine Branch: master Commit: bd6a5de27d283062ceef93dd7bd3a3a57d90cbda URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6a5de27d283062ceef93dd7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 6 23:47:20 2014 +0100 d3d8/tests: The device restores the mode settings from the registry. --- dlls/d3d8/tests/device.c | 158 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 121 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd6a5de27d283062ceef9…

1 0

Stefan Dösinger : d3d9/tests: The device restores the mode settings from the registry.
by Alexandre Julliard 07 Nov '14

07 Nov '14

Module: wine Branch: master Commit: 7fb22f502e1d6edc59b7d97056428c9a8a539dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb22f502e1d6edc59b7d9705… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 6 23:47:19 2014 +0100 d3d9/tests: The device restores the mode settings from the registry. --- dlls/d3d9/tests/device.c | 152 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 116 insertions(+), 36 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 05585fd..d3618e2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3900,56 +3900,115 @@ done: static void test_mode_change(void) { - RECT fullscreen_rect, focus_rect, r; + RECT d3d_rect, focus_rect, r; struct device_desc device_desc; IDirect3DSurface9 *backbuffer; IDirect3DDevice9 *device; D3DSURFACE_DESC desc; IDirect3D9 *d3d9; DEVMODEW devmode; - UINT refcount; + ULONG refcount; + UINT adapter_mode_count, i; HRESULT hr; DWORD ret; + LONG change_ret; + D3DDISPLAYMODE d3ddm; + DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; - focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); - device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); - SetRect(&fullscreen_rect, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight); + adapter_mode_count = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, D3DFMT_X8R8G8B8); + for (i = 0; i < adapter_mode_count; ++i) + { + hr = IDirect3D9_EnumAdapterModes(d3d9, D3DADAPTER_DEFAULT, D3DFMT_X8R8G8B8, i, &d3ddm); + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); + + if (d3ddm.Width == registry_mode.dmPelsWidth && d3ddm.Height == registry_mode.dmPelsHeight) + continue; + /* The r200 driver on Windows XP enumerates modes like 320x200 and 320x240 but + * refuses to create a device at these sizes. */ + if (d3ddm.Width < 640 || d3ddm.Height < 480) + continue; + + if (!user32_width) + { + user32_width = d3ddm.Width; + user32_height = d3ddm.Height; + continue; + } + + /* Make sure the d3d mode is smaller in width or height and at most + * equal in the other dimension than the mode passed to + * ChangeDisplaySettings. Otherwise Windows shrinks the window to + * the ChangeDisplaySettings parameters + 12. */ + if (d3ddm.Width == user32_width && d3ddm.Height == user32_height) + continue; + if (d3ddm.Width <= user32_width && d3ddm.Height <= user32_height) + { + d3d_width = d3ddm.Width; + d3d_height = d3ddm.Height; + break; + } + if (user32_width <= d3ddm.Width && user32_height <= d3ddm.Height) + { + d3d_width = user32_width; + d3d_height = user32_height; + user32_width = d3ddm.Width; + user32_height = d3ddm.Height; + break; + } + } + + if (!d3d_width) + { + skip("Could not find adequate modes, skipping mode tests.\n"); + IDirect3D9_Release(d3d9); + return; + } + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + + focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, user32_width / 2, user32_height / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, user32_width / 2, user32_height / 2, 0, 0, 0, 0); + + SetRect(&d3d_rect, 0, 0, d3d_width, d3d_height); GetWindowRect(focus_window, &focus_rect); device_desc.device_window = device_window; - device_desc.width = registry_mode.dmPelsWidth; - device_desc.height = registry_mode.dmPelsHeight; + device_desc.width = d3d_width; + device_desc.height = d3d_height; device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d9, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); + change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); goto done; } - memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); - devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - devmode.dmPelsWidth = 640; - devmode.dmPelsHeight = 480; - - ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); - ok(ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", ret); + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); - memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == 640, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == 480, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == user32_width && devmode.dmPelsHeight == user32_height, + "Expected resolution %ux%u, got %ux%u.\n", + user32_width, user32_height, devmode.dmPelsWidth, devmode.dmPelsHeight); GetWindowRect(device_window, &r); - ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", - fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + ok(EqualRect(&r, &d3d_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + d3d_rect.left, d3d_rect.top, d3d_rect.right, d3d_rect.bottom, r.left, r.top, r.right, r.bottom); GetWindowRect(focus_window, &r); ok(EqualRect(&r, &focus_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -3960,31 +4019,52 @@ static void test_mode_change(void) ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); hr = IDirect3DSurface9_GetDesc(backbuffer, &desc); ok(SUCCEEDED(hr), "Failed to get backbuffer desc, hr %#x.\n", hr); - ok(desc.Width == registry_mode.dmPelsWidth, "Got unexpected backbuffer width %u.\n", desc.Width); - ok(desc.Height == registry_mode.dmPelsHeight, "Got unexpected backbuffer height %u.\n", desc.Height); + ok(desc.Width == d3d_width, "Got unexpected backbuffer width %u, expected %u.\n", + desc.Width, d3d_width); + ok(desc.Height == d3d_height, "Got unexpected backbuffer height %u, expected %u.\n", + desc.Height, d3d_height); IDirect3DSurface9_Release(backbuffer); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + todo_wine ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", + registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, devmode.dmPelsWidth, devmode.dmPelsHeight); + + change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + + /* The mode restore also happens when the device was created at the original screen size. */ + + device_desc.device_window = device_window; + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + ok(!!(device = create_device(d3d9, focus_window, &device_desc)), "Failed to create a D3D device.\n"); + + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", + registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, devmode.dmPelsWidth, devmode.dmPelsHeight); done: DestroyWindow(device_window); DestroyWindow(focus_window); IDirect3D9_Release(d3d9); - - memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); - ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); } static void test_device_window_reset(void)

1 0

Vincent Povirk : windowscodecs: Fix race condition loading libpng.
by Alexandre Julliard 07 Nov '14

07 Nov '14

Module: wine Branch: master Commit: a5d569934ff347ca183dbc03c11ca2837cb911c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d569934ff347ca183dbc03c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 6 11:37:46 2014 -0600 windowscodecs: Fix race condition loading libpng. --- dlls/windowscodecs/pngformat.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index a8ecb73..b3e6cc6 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -200,13 +200,28 @@ MAKE_FUNCPTR(png_write_info); MAKE_FUNCPTR(png_write_rows); #undef MAKE_FUNCPTR +static CRITICAL_SECTION init_png_cs; +static CRITICAL_SECTION_DEBUG init_png_cs_debug = +{ + 0, 0, &init_png_cs, + { &init_png_cs_debug.ProcessLocksList, + &init_png_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_png_cs") } +}; +static CRITICAL_SECTION init_png_cs = { &init_png_cs_debug, -1, 0, 0, 0, 0 }; + static void *load_libpng(void) { - if((libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) { + void *result; + + EnterCriticalSection(&init_png_cs); + + if(!libpng_handle && (libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) { #define LOAD_FUNCPTR(f) \ if((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) { \ libpng_handle = NULL; \ + LeaveCriticalSection(&init_png_cs); \ return NULL; \ } LOAD_FUNCPTR(png_create_read_struct); @@ -251,7 +266,12 @@ static void *load_libpng(void) #undef LOAD_FUNCPTR } - return libpng_handle; + + result = libpng_handle; + + LeaveCriticalSection(&init_png_cs); + + return result; } static void user_error_fn(png_structp png_ptr, png_const_charp error_message) @@ -997,7 +1017,7 @@ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) *ppv = NULL; - if (!libpng_handle && !load_libpng()) + if (!load_libpng()) { ERR("Failed reading PNG because unable to find %s\n",SONAME_LIBPNG); return E_FAIL; @@ -1726,7 +1746,7 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) *ppv = NULL; - if (!libpng_handle && !load_libpng()) + if (!load_libpng()) { ERR("Failed writing PNG because unable to find %s\n",SONAME_LIBPNG); return E_FAIL;

1 0

Huw Davies : mlang: Accept "ascii" as an alias for "us-ascii".
by Alexandre Julliard 07 Nov '14

07 Nov '14

Module: wine Branch: master Commit: 48c36db40c83de59e660182699dcc7a0e1b22813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c36db40c83de59e66018269… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 6 15:55:39 2014 +0000 mlang: Accept "ascii" as an alias for "us-ascii". --- dlls/mlang/mlang.c | 13 ++++++++++++- dlls/mlang/tests/mlang.c | 12 ++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e44e862..8a4e78f 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -65,6 +65,7 @@ typedef struct const char *web_charset; const char *header_charset; const char *body_charset; + const WCHAR *alias; } MIME_CP_INFO; /* These data are based on the codepage info in libs/unicode/cpmap.pl */ @@ -363,6 +364,9 @@ static const MIME_CP_INFO vietnamese_cp[] = MIMECONTF_MIME_LATEST, "windows-1258", "windows-1258", "windows-1258" } }; + +static const WCHAR asciiW[] = {'a','s','c','i','i',0}; + static const MIME_CP_INFO western_cp[] = { { "IBM EBCDIC (US-Canada)", @@ -415,7 +419,7 @@ static const MIME_CP_INFO western_cp[] = 20127, MIMECONTF_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, - "us-ascii", "us-ascii", "us-ascii" }, + "us-ascii", "us-ascii", "us-ascii", asciiW }, { "Western European (ISO)", 28591, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | @@ -2600,6 +2604,13 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( strcpyW(pCharsetInfo->wszCharset, csetW); return S_OK; } + if (mlang_data[i].mime_cp_info[n].alias && !lstrcmpiW(Charset, mlang_data[i].mime_cp_info[n].alias)) + { + pCharsetInfo->uiCodePage = mlang_data[i].family_codepage; + pCharsetInfo->uiInternetEncoding = mlang_data[i].mime_cp_info[n].cp; + strcpyW(pCharsetInfo->wszCharset, mlang_data[i].mime_cp_info[n].alias); + return S_OK; + } } } diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 1d52af6..a840b4a 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -696,6 +696,17 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) IEnumCodePage_Release(iEnumCP); } +static void test_GetCharsetInfo_alias(IMultiLanguage *ml) +{ + WCHAR asciiW[] = {'a','s','c','i','i',0}; + MIMECSETINFO info; + HRESULT hr; + + hr = IMultiLanguage_GetCharsetInfo(ml, asciiW, &info); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(info.wszCharset, asciiW), "got %s\n", wine_dbgstr_w(info.wszCharset)); +} + static void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) { ok(sinfo1->ScriptId == sinfo2->ScriptId, "ScriptId mismatch: %d != %d\n", sinfo1->ScriptId, sinfo2->ScriptId); @@ -2000,6 +2011,7 @@ START_TEST(mlang) test_GetNumberOfCodePageInfo((IMultiLanguage2 *)iML); test_IMLangConvertCharset(iML); + test_GetCharsetInfo_alias(iML); IMultiLanguage_Release(iML);

1 0

Rosanne DiMesio : Add a disclaimer to the Downloads page
by Jeremy Newman 06 Nov '14

06 Nov '14

Module: website Branch: master Commit: 184552b2f23563ebfd5627de1f3486bf6c802ace URL: http://source.winehq.org/git/website.git/?a=commit;h=184552b2f23563ebfd5627… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Nov 5 20:41:20 2014 -0600 Add a disclaimer to the Downloads page Needed to make it clear to users that packages listed are not "official" and may contain unsupported patches. --- templates/en/download.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/en/download.template b/templates/en/download.template index ca13e58..a1cf748 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -36,6 +36,8 @@ requested in exchange for hosting the Wine web site.</p> <h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine Binary Downloads</h2> +<p>Binary packages are built and maintained by the distros, and may contain patches that are not supported here. The links below are provided solely as a convenience to users and do not represent an endorsement.</p> + <table style="margin: 0 0 15px 0;" width="100%"> <tr> <td width="200">Latest stable release:</td><td>Wine {$config_stable_release}</td>

1 0

Alex Henrie : kernel32/tests: Add UTF-7 encoded surrounding characters tests.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 3069e0c0a149b752396745e7b264a6b706ff31ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3069e0c0a149b752396745e7b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 6 00:11:25 2014 -0700 kernel32/tests: Add UTF-7 encoded surrounding characters tests. --- dlls/kernel32/tests/codepage.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 89bbd60..147989b 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -481,6 +481,50 @@ static void test_utf7_encoding(void) ok(output[expected_len] == '#', "i=0x%04x: expected output[%i]='#', got output[%i]=%i\n", i, expected_len, expected_len, output[expected_len]); } + + /* test which one-byte characters are absorbed into surrounding base64 blocks + * (Windows always ends the base64 block when it encounters a directly encodable character) */ + for (i = 0; i <= 0xFFFF; i++) + { + input[0] = 0x2672; + input[1] = i; + input[2] = 0x2672; + input[3] = 0; + + memset(output, '#', sizeof(output) - 1); + output[sizeof(output) - 1] = 0; + + len = WideCharToMultiByte(CP_UTF7, 0, input, 4, output, sizeof(output) - 1, NULL, NULL); + + if (i == '+') + { + /* '+' is a special case and is encoded as "+-" */ + expected_len = 13; + strcpy(expected, "+JnI-+-+JnI-"); + } + else if (i <= 0x7F && directly_encodable_table[i]) + { + /* encodes directly */ + expected_len = 12; + sprintf(expected, "+JnI-%c+JnI-", i); + } + else + { + /* base64-encodes */ + expected_len = 11; + sprintf(expected, "+Jn%c%c%c%cZy-", + base64_encoding_table[8 | ((i & 0xC000) >> 14)], + base64_encoding_table[(i & 0x3F00) >> 8], + base64_encoding_table[(i & 0x00FC) >> 2], + base64_encoding_table[((i & 0x0003) << 4) | 2]); + } + + ok(len == expected_len, "i=0x%04x: expected len=%i, got len=%i\n", i, expected_len, len); + ok(memcmp(output, expected, expected_len) == 0, + "i=0x%04x: expected output='%s', got output='%s'\n", i, expected, output); + ok(output[expected_len] == '#', "i=0x%04x: expected output[%i]='#', got output[%i]=%i\n", + i, expected_len, expected_len, output[expected_len]); + } } static void test_undefined_byte_char(void)

1 0

Alex Henrie : kernel32/tests: Add UTF-7 non-encoded surrounding characters tests.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 7c1580a4a805fce66adb1512bf9d9aa6bb280a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1580a4a805fce66adb1512b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 6 00:11:24 2014 -0700 kernel32/tests: Add UTF-7 non-encoded surrounding characters tests. --- dlls/kernel32/tests/codepage.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8423c75..89bbd60 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <limits.h> #include "wine/test.h" @@ -412,6 +413,76 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } +static void test_utf7_encoding(void) +{ + WCHAR input[16]; + char output[16], expected[16]; + int i, len, expected_len; + + static const BOOL directly_encodable_table[] = + { + 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, /* 0x00 - 0x0F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 - 0x1F */ + 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, /* 0x20 - 0x2F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 0x30 - 0x3F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x40 - 0x4F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 0x50 - 0x5F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x60 - 0x6F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 /* 0x70 - 0x7F */ + }; + static const char base64_encoding_table[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + + if (WideCharToMultiByte(CP_UTF7, 0, foobarW, -1, NULL, 0, NULL, NULL) == 0 && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("UTF-7 encoding not implemented\n"); + return; + } + + /* test which characters are encoded if surrounded by non-encoded characters */ + for (i = 0; i <= 0xFFFF; i++) + { + input[0] = ' '; + input[1] = i; + input[2] = ' '; + input[3] = 0; + + memset(output, '#', sizeof(output) - 1); + output[sizeof(output) - 1] = 0; + + len = WideCharToMultiByte(CP_UTF7, 0, input, 4, output, sizeof(output) - 1, NULL, NULL); + + if (i == '+') + { + /* '+' is a special case and is encoded as "+-" */ + expected_len = 5; + strcpy(expected, " +- "); + } + else if (i <= 0x7F && directly_encodable_table[i]) + { + /* encodes directly */ + expected_len = 4; + sprintf(expected, " %c ", i); + } + else + { + /* base64-encodes */ + expected_len = 8; + sprintf(expected, " +%c%c%c- ", + base64_encoding_table[(i & 0xFC00) >> 10], + base64_encoding_table[(i & 0x03F0) >> 4], + base64_encoding_table[(i & 0x000F) << 2]); + } + + ok(len == expected_len, "i=0x%04x: expected len=%i, got len=%i\n", i, expected_len, len); + ok(memcmp(output, expected, expected_len) == 0, + "i=0x%04x: expected output='%s', got output='%s'\n", i, expected, output); + ok(output[expected_len] == '#', "i=0x%04x: expected output[%i]='#', got output[%i]=%i\n", + i, expected_len, expected_len, output[expected_len]); + } +} + static void test_undefined_byte_char(void) { static const struct tag_testset { @@ -618,6 +689,8 @@ START_TEST(codepage) test_string_conversion(NULL); test_string_conversion(&bUsedDefaultChar); + test_utf7_encoding(); + test_undefined_byte_char(); test_threadcp(); }

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement: onerror property semi-stub implementation.
by Alexandre Julliard 06 Nov '14

06 Nov '14

Module: wine Branch: master Commit: 4dea0b258cb6aab66799886636ffc7590d816bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dea0b258cb6aab6679988663… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 6 12:21:47 2014 +0100 mshtml: Added IHTMLScriptElement:onerror property semi-stub implementation. --- dlls/mshtml/htmlscript.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 61e1ee3..7fb1cfc 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" #include "htmlscript.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -290,15 +291,19 @@ static HRESULT WINAPI HTMLScriptElement_get_readyState(IHTMLScriptElement *iface static HRESULT WINAPI HTMLScriptElement_put_onerror(IHTMLScriptElement *iface, VARIANT v) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + + return set_node_event(&This->element.node, EVENTID_ERROR, &v); } static HRESULT WINAPI HTMLScriptElement_get_onerror(IHTMLScriptElement *iface, VARIANT *p) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_ERROR, p); } static HRESULT WINAPI HTMLScriptElement_put_type(IHTMLScriptElement *iface, BSTR v)

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2014