wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Michael Stefaniuc : kernel32/tests: Remove another identical if/ else branch.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 3bc7549f4272d92c02377d0cbd725bdcaa6ddc36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc7549f4272d92c02377d0cb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:31:38 2016 +0200 kernel32/tests: Remove another identical if/else branch. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 583abf6..40de97a 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2782,10 +2782,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); - if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); - else - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); /* Now a bit more complicated, the page containing the code is protected with * PAGE_GUARD memory protection. */

1 0

Michael Stefaniuc : kernel32/tests: Remove an identical if / else branch.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 85dea19312eef9c1c659d95b81e16d186ff56b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85dea19312eef9c1c659d95b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:30:22 2016 +0200 kernel32/tests: Remove an identical if / else branch. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 836d7ec..6520513 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -187,15 +187,8 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR * len=pGetLongPathNameA(fullpath,tmpstr,MAX_PATH); if(passfail==NULL) { ok(len, "%s: GetLongPathNameA failed\n",errstr); - if(HAS_TRAIL_SLASH_A(fullpath)) { - ok(lstrcmpiA(fullpathlong,tmpstr)==0, - "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr,tmpstr,fullpathlong); - } else { - ok(lstrcmpiA(fullpathlong,tmpstr)==0, - "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr,tmpstr,fullpathlong); - } + ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", + errstr, tmpstr, fullpathlong); } else { passfail->longlen=len; passfail->longerror=GetLastError();

1 0

Michael Stefaniuc : kernel32/tests: Use todo_wine_if().
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 3e6b503adb51ff854bfe942caf5297c4cb730612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6b503adb51ff854bfe942ca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:27:03 2016 +0200 kernel32/tests: Use todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ab94c01..5327865 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4358,17 +4358,10 @@ static void test_file_access(void) else { /* FIXME: Remove once Wine is fixed */ - if ((td[j].access & (GENERIC_READ | GENERIC_WRITE)) || - (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || - (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || - (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA))) - { -todo_wine - ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - } - else + todo_wine_if((td[j].access & (GENERIC_READ | GENERIC_WRITE) || + (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || + (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || + (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA)))) { ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError());

1 0

Nikolay Sivov : wshom.ocx/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: b00d68a1946d41b7d276d8ba917183d90b0d47a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00d68a1946d41b7d276d8ba9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 20:07:42 2016 +0300 wshom.ocx/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/tests/wshom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index a3d398e..61df0c1 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -213,8 +213,8 @@ static void test_wshshell(void) SysFreeString(str); /* current directory */ -if (0) /* crashes on native */ - hr = IWshShell3_get_CurrentDirectory(sh3, NULL); + if (0) /* crashes on native */ + hr = IWshShell3_get_CurrentDirectory(sh3, NULL); str = NULL; hr = IWshShell3_get_CurrentDirectory(sh3, &str);

1 0

Nikolay Sivov : user32/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 6c8887b830358dc109ea7781b2bb182c8104ce47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8887b830358dc109ea7781b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 20:06:22 2016 +0300 user32/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 6 +++--- dlls/user32/tests/menu.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 0d7c6d6..1813367 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -184,7 +184,7 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ (VKey != VK_MENU)) /* <ALT>-down...<something else>-up */ message = WM_SYSKEYUP; - TrackSysKey = 0; + TrackSysKey = 0; } InputKeyStateTable[VKey] &= ~0x80; flags |= KF_REPEAT | KF_UP; @@ -1767,8 +1767,8 @@ static void test_keyboard_layout_name(void) BOOL ret; char klid[KL_NAMELENGTH]; -if (0) /* crashes on native system */ - ret = GetKeyboardLayoutNameA(NULL); + if (0) /* crashes on native system */ + ret = GetKeyboardLayoutNameA(NULL); SetLastError(0xdeadbeef); ret = GetKeyboardLayoutNameW(NULL); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index ae7b957..a42bc1c 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3972,13 +3972,15 @@ static void test_AppendMenu(void) mii.wID = 206; ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); ok(ret, "InsertMenuItem failed\n"); -if (0) /* FIXME: uncomment once Wine is fixed */ +if (0) /* FIXME: uncomment once Wine is fixed */ { check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); +} mii.wID = 207; ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); ok(ret, "SetMenuItemInfo failed\n"); -if (0) /* FIXME: uncomment once Wine is fixed */ +if (0) /* FIXME: uncomment once Wine is fixed */ { check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); +} DestroyMenu(hmenu); hbmp = CreateBitmap(1, 1, 1, 1, NULL);

1 0

Nikolay Sivov : shell32/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 27f91d71a2401781d38576d90183c26b519366e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f91d71a2401781d38576d90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 20:02:20 2016 +0300 shell32/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/appbar.c | 4 ++-- dlls/shell32/tests/shelldispatch.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index dbac4e6..1505a40 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -423,8 +423,8 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void) return; } -if (0) /* crashes on native */ - hr = pGetCurrentProcessExplicitAppUserModelID(NULL); + if (0) /* crashes on native */ + hr = pGetCurrentProcessExplicitAppUserModelID(NULL); appid = (void*)0xdeadbeef; hr = pGetCurrentProcessExplicitAppUserModelID(&appid); diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 70b6c36..9a47c67 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -728,9 +728,9 @@ todo_wine hr = IWebBrowser2_get_Document(wb, &doc); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) +if (hr == S_OK) { test_dispatch_typeinfo(doc, viewdual_riids); - +} IWebBrowser2_Release(wb); /* IServiceProvider */

1 0

Nikolay Sivov : scrrun/tests: Fix a warning on GCC 6.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: bbb1602442c1b3789d8085c9f9853d8f7800d686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb1602442c1b3789d8085c9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 19:59:50 2016 +0300 scrrun/tests: Fix a warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index a1b7d06..a94782f 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -101,8 +101,8 @@ static void test_comparemode(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ - hr = IDictionary_get_CompareMode(dict, NULL); + if (0) /* crashes on native */ + hr = IDictionary_get_CompareMode(dict, NULL); method = 10; hr = IDictionary_get_CompareMode(dict, &method); @@ -933,8 +933,8 @@ static void test_IEnumVARIANT(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ - hr = IDictionary__NewEnum(dict, NULL); + if (0) /* crashes on native */ + hr = IDictionary__NewEnum(dict, NULL); hr = IDictionary__NewEnum(dict, &enum1); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Andrew Eikum : mmdevapi: Fix some DEVPKEY definitions.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: ba858c28fd489a812ea0f55a11680a8edaf99ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba858c28fd489a812ea0f55a1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 9 10:17:04 2016 -0500 mmdevapi: Fix some DEVPKEY definitions. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 1 + dlls/mmdevapi/tests/propstore.c | 6 +++--- include/devpkey.h | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b8b714c..221fb39 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -356,6 +356,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.vt = VT_LPWSTR; pv.u.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); pv.u.pwszVal = guidstr; diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 665136f..6447113 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -64,7 +64,7 @@ static void test_propertystore(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); - ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); @@ -118,8 +118,8 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name || broken(!found_name), "DEVPKEY_Device_FriendlyName not found\n"); - ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); + ok(found_name, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_desc, "DEVPKEY_Device_DeviceDesc not found\n"); } static void test_setvalue_on_wow64(IPropertyStore *store) diff --git a/include/devpkey.h b/include/devpkey.h index ebaabc1..648ef42 100644 --- a/include/devpkey.h +++ b/include/devpkey.h @@ -57,6 +57,6 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x2 DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4);

1 0

Huw Davies : usp10: Free the final page.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 0dbd2e37f916d6b52eac8bad7fa529aa952a0b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbd2e37f916d6b52eac8bad7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 9 15:45:24 2016 +0100 usp10: Free the final page. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index dc1cc06..0471fc6 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1019,7 +1019,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { heap_free(((ScriptCache *)*psc)->widths[i]); } - for (i = 0; i < 0x10; i++) + for (i = 0; i < NUM_PAGES; i++) { unsigned int j; if (((ScriptCache *)*psc)->page[i]) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index c1a5ccf..1c0d1c5 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -125,6 +125,8 @@ #define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) #define GLYPH_MAX 65536 +#define NUM_PAGES 17 + #define GSUB_E_NOFEATURE -2 #define GSUB_E_NOGLYPH -1 @@ -169,7 +171,7 @@ typedef struct { OUTLINETEXTMETRICW *otm; SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; - CacheGlyphPage *page[0x11]; + CacheGlyphPage *page[NUM_PAGES]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table;

1 0

Nikolay Sivov : usp10: Better implementation for ScriptGetLogicalWidths().
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 0695368406b54c97e6f6d3b32601910042384424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0695368406b54c97e6f6d3b32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 16:59:33 2016 +0300 usp10: Better implementation for ScriptGetLogicalWidths(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 27 +++++++++++++++++++----- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index aed0620..e77f90e 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3610,6 +3610,58 @@ static void test_ScriptGetFontFunctions(HDC hdc) } } +struct logical_width_test +{ + int char_count; + int glyph_count; + int advances[3]; + WORD map[3]; + int widths[3]; + BOOL clusterstart[3]; + BOOL diacritic[3]; + BOOL zerowidth[3]; + BOOL todo; +}; + +static const struct logical_width_test logical_width_tests[] = +{ + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 }, { 1, 0, 0 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 }, { 0 }, { 1, 1, 1 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 27, 21, 12 }, { 0, 0, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 21, 12 }, { 0, 1, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 21, 12 }, { 1, 1, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 2, 2 }, { 15, 6, 6 }, { 1, 0, 1 } }, +}; + +static void test_ScriptGetLogicalWidths(void) +{ + SCRIPT_ANALYSIS sa = { 0 }; + unsigned int i, j; + + for (i = 0; i < sizeof(logical_width_tests)/sizeof(logical_width_tests[0]); i++) + { + const struct logical_width_test *ptr = logical_width_tests + i; + SCRIPT_VISATTR attrs[3]; + int widths[3]; + HRESULT hr; + + memset(attrs, 0, sizeof(attrs)); + for (j = 0; j < ptr->glyph_count; j++) + { + attrs[j].fClusterStart = ptr->clusterstart[j]; + attrs[j].fDiacritic = ptr->diacritic[j]; + attrs[j].fZeroWidth = ptr->zerowidth[j]; + } + + hr = ScriptGetLogicalWidths(&sa, ptr->char_count, ptr->glyph_count, ptr->advances, ptr->map, attrs, widths); + ok(hr == S_OK, "got 0x%08x\n", hr); + + todo_wine_if(ptr->todo) + ok(!memcmp(ptr->widths, widths, sizeof(widths)), "test %u: got wrong widths\n", i); + } +} + START_TEST(usp10) { HWND hwnd; @@ -3663,6 +3715,7 @@ START_TEST(usp10) test_newlines(); test_ScriptGetFontFunctions(hdc); + test_ScriptGetLogicalWidths(); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f5eba8d..dc1cc06 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3890,16 +3890,33 @@ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) * Failure: a non-zero HRESULT. */ HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *sa, int nbchars, int nbglyphs, - const int *glyph_width, const WORD *log_clust, + const int *advances, const WORD *log_clust, const SCRIPT_VISATTR *sva, int *widths) { - int i; + int i, next = 0, direction; TRACE("(%p, %d, %d, %p, %p, %p, %p)\n", - sa, nbchars, nbglyphs, glyph_width, log_clust, sva, widths); + sa, nbchars, nbglyphs, advances, log_clust, sva, widths); + + if (sa->fRTL && !sa->fLogicalOrder) + direction = -1; + else + direction = 1; + + for (i = 0; i < nbchars; i++) + { + int clust_size = get_cluster_size(log_clust, nbchars, i, direction, NULL, NULL); + int advance = get_glyph_cluster_advance(advances, sva, log_clust, nbglyphs, nbchars, log_clust[i], direction); + int j; + + for (j = 0; j < clust_size; j++) + { + widths[next] = advance / clust_size; + next++; + if (j) i++; + } + } - /* FIXME */ - for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; }

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
78
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 August 2016