August 2018 - Wine-commits - list.winehq.org

Józef Kucia : vkd3d: Export vkd3d_get_dxgi_format() function.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: vkd3d Branch: master Commit: c75f9ee39dffc0c319c067e2bde047d1f8af5359 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c75f9ee39dffc0c319c067e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 28 12:19:55 2018 +0200 vkd3d: Export vkd3d_get_dxgi_format() function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 1 + libs/vkd3d/utils.c | 18 +++++++++++++++ libs/vkd3d/vkd3d.map | 1 + tests/vkd3d_api.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index fcff166..de80542 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -144,6 +144,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); #endif /* VKD3D_NO_PROTOTYPES */ diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 11c46dd..682822e 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -200,6 +200,24 @@ bool dxgi_format_is_typeless(DXGI_FORMAT dxgi_format) } } +DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format) +{ + DXGI_FORMAT dxgi_format; + VkFormat vk_format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(vkd3d_formats); ++i) + { + vk_format = vkd3d_formats[i].vk_format; + dxgi_format = vkd3d_formats[i].dxgi_format; + if (vk_format == format && !dxgi_format_is_typeless(dxgi_format)) + return dxgi_format; + } + + FIXME("Unhandled Vulkan format %#x.\n", format); + return DXGI_FORMAT_UNKNOWN; +} + bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) { static const D3D_FEATURE_LEVEL valid_feature_levels[] = diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 7d0f838..f43c85c 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -7,6 +7,7 @@ global: vkd3d_create_instance; vkd3d_create_root_signature_deserializer; vkd3d_get_device_parent; + vkd3d_get_dxgi_format; vkd3d_get_vk_device; vkd3d_get_vk_format; vkd3d_get_vk_physical_device; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 2c022ba..e0912c5 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -899,6 +899,69 @@ static void test_vulkan_resource_present_state(void) destroy_test_context(&context); } +static void test_formats(void) +{ + DXGI_FORMAT dxgi_format, format; + VkFormat vk_format; + unsigned int i; + + static const DXGI_FORMAT formats[] = + { + DXGI_FORMAT_R32G32B32A32_FLOAT, + DXGI_FORMAT_R32G32B32A32_UINT, + DXGI_FORMAT_R32G32B32A32_SINT, + DXGI_FORMAT_R32G32B32_FLOAT, + DXGI_FORMAT_R32G32B32_UINT, + DXGI_FORMAT_R32G32B32_SINT, + DXGI_FORMAT_R16G16B16A16_FLOAT, + DXGI_FORMAT_R16G16B16A16_UNORM, + DXGI_FORMAT_R16G16B16A16_UINT, + DXGI_FORMAT_R16G16B16A16_SNORM, + DXGI_FORMAT_R16G16B16A16_SINT, + DXGI_FORMAT_R32G32_FLOAT, + DXGI_FORMAT_R32G32_UINT, + DXGI_FORMAT_R32G32_SINT, + DXGI_FORMAT_R10G10B10A2_UNORM, + DXGI_FORMAT_R11G11B10_FLOAT, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UINT, + DXGI_FORMAT_R8G8B8A8_SNORM, + DXGI_FORMAT_R8G8B8A8_SINT, + DXGI_FORMAT_R16G16_FLOAT, + DXGI_FORMAT_R16G16_UNORM, + DXGI_FORMAT_R16G16_UINT, + DXGI_FORMAT_R16G16_SNORM, + DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_D32_FLOAT, + DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_UINT, + DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R8G8_UNORM, + DXGI_FORMAT_R8G8_UINT, + DXGI_FORMAT_R8G8_SNORM, + DXGI_FORMAT_R8G8_SINT, + DXGI_FORMAT_R16_FLOAT, + DXGI_FORMAT_D16_UNORM, + DXGI_FORMAT_R16_UNORM, + DXGI_FORMAT_R16_UINT, + DXGI_FORMAT_R16_SNORM, + DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_R8_UNORM, + DXGI_FORMAT_R8_UINT, + DXGI_FORMAT_R8_SNORM, + DXGI_FORMAT_R8_SINT, + }; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + format = formats[i]; + vk_format = vkd3d_get_vk_format(format); + dxgi_format = vkd3d_get_dxgi_format(vk_format); + ok(dxgi_format == format, "Got format %#x, expected %#x.\n", dxgi_format, format); + } +} + static bool have_d3d12_device(void) { ID3D12Device *device; @@ -927,4 +990,5 @@ START_TEST(vkd3d_api) run_test(test_vkd3d_queue); run_test(test_resource_internal_refcount); run_test(test_vulkan_resource_present_state); + run_test(test_formats); }

1 0

Jacek Caban : mshtml/tests: Run style tests in IE9 mode.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 59f333307ec5a92fa5c7ab81f66fd5336ff313bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f333307ec5a92fa5c7ab81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:45:49 2018 +0200 mshtml/tests: Run style tests in IE9 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 350 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 300 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59f333307ec5a92fa5c7…

1 0

Marcus Meissner : ntdll: Fix buffer size to MultiByteToWideChar.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 0c790adf300dd37f624029023bc6de53cb21373c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c790adf300dd37f62402902… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 28 13:23:14 2018 +0200 ntdll: Fix buffer size to MultiByteToWideChar. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 7baf474..722ca99 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -512,7 +512,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - MultiByteToWideChar(CP_ACP, 0, tests[i].dos, -1, path, sizeof(path)); + MultiByteToWideChar(CP_ACP, 0, tests[i].dos, -1, path, ARRAY_SIZE(path)); ret = pRtlDosPathNameToNtPathName_U(path, &nameW, &file_part, NULL); if (pRtlDosPathNameToNtPathName_U_WithStatus) @@ -534,7 +534,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) continue; } - MultiByteToWideChar(CP_ACP, 0, tests[i].nt, -1, path, sizeof(path)); + MultiByteToWideChar(CP_ACP, 0, tests[i].nt, -1, path, ARRAY_SIZE(path)); ok(!lstrcmpW(nameW.Buffer, path), "%s: Expected %s, got %s.\n", tests[i].dos, tests[i].nt, wine_dbgstr_w(nameW.Buffer));

1 0

Alex Henrie : shell32: Add network folder icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 5e8803ace482757ee583c63722fddfafbcbcd38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8803ace482757ee583c637… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:57 2018 -0600 shell32: Add network folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index d34555b..047d09d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -693,6 +693,10 @@ IDI_SHELL_DEFRAGMENT ICON resources/drive.ico /* @makedep: resources/menu.ico */ IDI_SHELL_TREEVIEW ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NETWORK_FOLDER ICON resources/folder.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 5531240..a785c35 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -259,6 +259,7 @@ #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_TREEVIEW 171 +#define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add checklist folder icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: fa1bf3b30faeed315d2a4e4d8fbc3a6699275e52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1bf3b30faeed315d2a4e4d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:58 2018 -0600 shell32: Add checklist folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 047d09d..9004ebb 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -700,6 +700,10 @@ IDI_SHELL_NETWORK_FOLDER ICON resources/folder.ico /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index a785c35..e623b94 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -261,6 +261,7 @@ #define IDI_SHELL_TREEVIEW 171 #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 +#define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

Alex Henrie : shell32: Add network connections icon.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 19c364bd0d19a8b3f546e1936c66792f42847bd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c364bd0d19a8b3f546e193… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:59 2018 -0600 shell32: Add network connections icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 9004ebb..06b483e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -704,6 +704,9 @@ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico /* @makedep: resources/folder.ico */ IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico +/* @makedep: resources/network.ico */ +IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e623b94..6761596 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -262,6 +262,7 @@ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_CHECKLIST_FOLDER 174 +#define IDI_SHELL_NET_CONNECTIONS 175 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

Alexandre Julliard : user32: Scale dialog base units based on DPI awareness.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: a525631920d74e9d797f38305b89e63aed1c5c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a525631920d74e9d797f3830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 28 12:05:55 2018 +0200 user32: Scale dialog base units based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 14 +++++++------- dlls/user32/tests/sysparams.c | 10 +++++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index e584cc1..7b91819 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1505,22 +1505,22 @@ BOOL WINAPI CheckRadioButton( HWND hwndDlg, int firstID, */ DWORD WINAPI GetDialogBaseUnits(void) { - static DWORD units; + static LONG cx, cy; - if (!units) + if (!cx) { HDC hdc; - SIZE size; if ((hdc = GetDC(0))) { - size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); - if (size.cx) units = MAKELONG( size.cx, size.cy ); + cx = GdiGetCharDimensions( hdc, NULL, &cy ); ReleaseDC( 0, hdc ); } - TRACE("base units = %d,%d\n", LOWORD(units), HIWORD(units) ); + TRACE( "base units = %d,%d\n", cx, cy ); } - return units; + + return MAKELONG( MulDiv( cx, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ), + MulDiv( cy, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI )); } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 846551e..8f9defc 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3217,7 +3217,7 @@ static void test_dpi_mapping(void) { HWND hwnd, child; HDC hdc; - UINT win_dpi; + UINT win_dpi, units; POINT point; BOOL ret; HRGN rgn, update; @@ -3292,6 +3292,7 @@ static void test_dpi_mapping(void) ShowWindow( hwnd, SW_MINIMIZE ); ShowWindow( hwnd, SW_RESTORE ); GetWindowPlacement( hwnd, &wpl_orig ); + units = GetDialogBaseUnits(); for (j = DPI_AWARENESS_UNAWARE; j <= DPI_AWARENESS_PER_MONITOR_AWARE; j++) { @@ -3407,6 +3408,13 @@ static void test_dpi_mapping(void) i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); UpdateWindow( hwnd ); DeleteObject( update ); + /* test dialog units */ + ret = GetDialogBaseUnits(); + point.x = LOWORD( units ); + point.y = HIWORD( units ); + scale_point_dpi_aware( &point, i, j ); + ok( LOWORD(ret) == point.x && HIWORD(ret) == point.y, "%lu/%lu: wrong units %d,%d / %d,%d\n", + i, j, LOWORD(ret), HIWORD(ret), point.x, point.y ); /* test window points mapping */ SetRect( &rect, 0, 0, 100, 100 ); rect.right = rect.left + 100;

1 0

Alexandre Julliard : user32: Switch to the window DPI awareness for MDI scrolling.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 440484fc076d209dfd95bc63ed08fa141cee55fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=440484fc076d209dfd95bc63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 28 12:21:28 2018 +0200 user32: Switch to the window DPI awareness for MDI scrolling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index f990335..10a3882 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1688,11 +1688,14 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) */ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) { + DPI_AWARENESS_CONTEXT context; SCROLLINFO info; RECT childRect, clientRect; HWND *list; DWORD style; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + GetClientRect( hwnd, &clientRect ); SetRectEmpty( &childRect ); @@ -1748,6 +1751,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) } break; } + SetThreadDpiAwarenessContext( context ); } @@ -1757,10 +1761,12 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + DPI_AWARENESS_CONTEXT context; INT newPos = -1; INT curPos, length, minPos, maxPos, shift; RECT rect; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hWnd )); GetClientRect( hWnd, &rect ); switch(uMsg) @@ -1778,7 +1784,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, shift = GetSystemMetrics(SM_CXVSCROLL); break; default: - return; + goto done; } switch( wParam ) @@ -1801,7 +1807,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, break; case SB_THUMBTRACK: - return; + goto done; case SB_TOP: newPos = minPos; @@ -1811,7 +1817,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, break; case SB_ENDSCROLL: CalcChildScroll(hWnd,(uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ); - return; + goto done; } if( newPos > maxPos ) @@ -1828,6 +1834,8 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, else ScrollWindowEx(hWnd ,curPos - newPos, 0, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); +done: + SetThreadDpiAwarenessContext( context ); }

1 0

Jacek Caban : mshtml: Support using array to check for allowed values and use it in IHTMLStyle: :put_fontStyle implementation.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: 4c59ce88fa7049006c86525717c22f02ccd16303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c59ce88fa7049006c865257… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:43:45 2018 +0200 mshtml: Support using array to check for allowed values and use it in IHTMLStyle::put_fontStyle implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 57 ++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 272b644..a137b56 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -207,6 +207,17 @@ static const WCHAR word_wrapW[] = static const WCHAR z_indexW[] = {'z','-','i','n','d','e','x',0}; +static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; +static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; +static const WCHAR obliqueW[] = {'o','b','l','i','q','u','e',0}; + +static const WCHAR *font_style_values[] = { + italicW, + normalW, + obliqueW, + NULL +}; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 @@ -220,6 +231,7 @@ typedef struct { const WCHAR *name; DISPID dispid; unsigned flags; + const WCHAR **allowed_values; } style_tbl_entry_t; static const style_tbl_entry_t style_tbl[] = { @@ -263,7 +275,7 @@ static const style_tbl_entry_t style_tbl[] = { {floatW, DISPID_IHTMLSTYLE_STYLEFLOAT}, {font_familyW, DISPID_IHTMLSTYLE_FONTFAMILY}, {font_sizeW, DISPID_IHTMLSTYLE_FONTSIZE, ATTR_FIX_PX}, - {font_styleW, DISPID_IHTMLSTYLE_FONTSTYLE}, + {font_styleW, DISPID_IHTMLSTYLE_FONTSTYLE, 0, font_style_values}, {font_variantW, DISPID_IHTMLSTYLE_FONTVARIANT}, {font_weightW, DISPID_IHTMLSTYLE_FONTWEIGHT, ATTR_STR_TO_INT}, {heightW, DISPID_IHTMLSTYLE_HEIGHT, ATTR_FIX_PX}, @@ -316,8 +328,6 @@ static const WCHAR valLineThrough[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; static const WCHAR valUnderline[] = {'u','n','d','e','r','l','i','n','e',0}; -static const WCHAR szNormal[] = - {'n','o','r','m','a','l',0}; static const WCHAR styleNone[] = {'n','o','n','e',0}; static const WCHAR valOverline[] = @@ -408,17 +418,31 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, unsigned flags) +static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value) { nsAString str_name, str_value, str_empty; LPWSTR val = NULL; nsresult nsres; + HRESULT hres = S_OK; if(value) { + unsigned flags = style_tbl[sid].flags; if(flags & ATTR_FIX_PX) val = fix_px_value(value); else if(flags & ATTR_FIX_URL) val = fix_url_value(value); + + if(style_tbl[sid].allowed_values) { + const WCHAR **iter; + for(iter = style_tbl[sid].allowed_values; *iter; iter++) { + if(!strcmpiW(*iter, value)) + break; + } + if(!*iter) { + hres = E_INVALIDARG; + value = emptyW; + } + } } nsAString_InitDepend(&str_name, style_tbl[sid].name); @@ -434,7 +458,7 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ nsAString_Finish(&str_empty); heap_free(val); - return S_OK; + return hres; } static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) @@ -477,21 +501,19 @@ static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, cons static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT *value) { const WCHAR *val; - unsigned flags; WCHAR buf[14]; HRESULT hres; - flags = style_tbl[sid].flags; hres = var_to_styleval(value, sid, buf, &val); if(FAILED(hres)) return hres; - return set_nsstyle_property(style->nsstyle, sid, val, flags); + return set_nsstyle_property(style->nsstyle, sid, val); } static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const WCHAR *value) { - return set_nsstyle_property(style->nsstyle, sid, value, style_tbl[sid].flags); + return set_nsstyle_property(style->nsstyle, sid, value); } static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, nsAString *value) @@ -885,19 +907,10 @@ static HRESULT WINAPI HTMLStyle_get_fontFamily(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_fontStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - static const WCHAR szItalic[] = {'i','t','a','l','i','c',0}; - static const WCHAR szOblique[] = {'o','b','l','i','q','u','e',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - /* fontStyle can only be one of the follow values. */ - if(!v || strcmpiW(szNormal, v) == 0 || strcmpiW(szItalic, v) == 0 || - strcmpiW(szOblique, v) == 0) - { - return set_style_property(This, STYLEID_FONT_STYLE, v); - } - - return E_INVALIDARG; + return set_style_property(This, STYLEID_FONT_STYLE, v); } static HRESULT WINAPI HTMLStyle_get_fontStyle(IHTMLStyle *iface, BSTR *p) @@ -917,7 +930,7 @@ static HRESULT WINAPI HTMLStyle_put_fontVariant(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); /* fontVariant can only be one of the follow values. */ - if(!v || strcmpiW(szNormal, v) == 0 || strcmpiW(szCaps, v) == 0) + if(!v || strcmpiW(normalW, v) == 0 || strcmpiW(szCaps, v) == 0) { return set_style_property(This, STYLEID_FONT_VARIANT, v); } @@ -955,7 +968,7 @@ static HRESULT WINAPI HTMLStyle_put_fontWeight(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); /* fontWeight can only be one of the following */ - if(v && *v && strcmpiW(szNormal, v) && strcmpiW(styleBold, v) && strcmpiW(styleBolder, v) + if(v && *v && strcmpiW(normalW, v) && strcmpiW(styleBold, v) && strcmpiW(styleBolder, v) && strcmpiW(styleLighter, v) && strcmpiW(style100, v) && strcmpiW(style200, v) && strcmpiW(style300, v) && strcmpiW(style400, v) && strcmpiW(style500, v) && strcmpiW(style600, v) && strcmpiW(style700, v) && strcmpiW(style800, v) && strcmpiW(style900, v)) @@ -4795,7 +4808,7 @@ HRESULT set_elem_style(HTMLElement *elem, styleid_t styleid, const WCHAR *val) if(FAILED(hres)) return hres; - hres = set_nsstyle_property(style, styleid, val, 0); + hres = set_nsstyle_property(style, styleid, val); nsIDOMCSSStyleDeclaration_Release(style); return hres; }

1 0

Jacek Caban : mshtml: Use generic value checks for IHTMLStyle:: put_fontVariant implementation.
by Alexandre Julliard 28 Aug '18

28 Aug '18

Module: wine Branch: master Commit: ab2bd77c0869517a5bbe225591df9c2fead796ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab2bd77c0869517a5bbe2255… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 12:44:03 2018 +0200 mshtml: Use generic value checks for IHTMLStyle::put_fontVariant implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a137b56..b89ffbc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -207,6 +207,7 @@ static const WCHAR word_wrapW[] = static const WCHAR z_indexW[] = {'z','-','i','n','d','e','x',0}; +static const WCHAR capsW[] = {'s','m','a','l','l','-','c','a','p','s',0}; static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; static const WCHAR obliqueW[] = {'o','b','l','i','q','u','e',0}; @@ -218,6 +219,12 @@ static const WCHAR *font_style_values[] = { NULL }; +static const WCHAR *font_variant_values[] = { + capsW, + normalW, + NULL +}; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 @@ -276,7 +283,7 @@ static const style_tbl_entry_t style_tbl[] = { {font_familyW, DISPID_IHTMLSTYLE_FONTFAMILY}, {font_sizeW, DISPID_IHTMLSTYLE_FONTSIZE, ATTR_FIX_PX}, {font_styleW, DISPID_IHTMLSTYLE_FONTSTYLE, 0, font_style_values}, - {font_variantW, DISPID_IHTMLSTYLE_FONTVARIANT}, + {font_variantW, DISPID_IHTMLSTYLE_FONTVARIANT, 0, font_variant_values}, {font_weightW, DISPID_IHTMLSTYLE_FONTWEIGHT, ATTR_STR_TO_INT}, {heightW, DISPID_IHTMLSTYLE_HEIGHT, ATTR_FIX_PX}, {leftW, DISPID_IHTMLSTYLE_LEFT}, @@ -925,17 +932,10 @@ static HRESULT WINAPI HTMLStyle_get_fontStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_fontVariant(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - static const WCHAR szCaps[] = {'s','m','a','l','l','-','c','a','p','s',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - /* fontVariant can only be one of the follow values. */ - if(!v || strcmpiW(normalW, v) == 0 || strcmpiW(szCaps, v) == 0) - { - return set_style_property(This, STYLEID_FONT_VARIANT, v); - } - - return E_INVALIDARG; + return set_style_property(This, STYLEID_FONT_VARIANT, v); } static HRESULT WINAPI HTMLStyle_get_fontVariant(IHTMLStyle *iface, BSTR *p)

1 0