June 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Move WM_WINDOWPOSCHANGED implementation from user32.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: c7e0697e9ce0d5a67af0c3dca6ea95a4c15aece5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7e0697e9ce0d5a67af0c3dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 13:08:03 2022 +0200 win32u: Move WM_WINDOWPOSCHANGED implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 33 --------------------------------- dlls/win32u/defwnd.c | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 3eebc952ee1..c40d2ebedab 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -38,35 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); #define DRAG_FILE 0x454C4946 -/*********************************************************************** - * DEFWND_HandleWindowPosChanged - * - * Handle the WM_WINDOWPOSCHANGED message. - */ -static void DEFWND_HandleWindowPosChanged( HWND hwnd, const WINDOWPOS *winpos ) -{ - RECT rect; - - WIN_GetRectangles( hwnd, COORDS_PARENT, NULL, &rect ); - if (!(winpos->flags & SWP_NOCLIENTMOVE)) - SendMessageW( hwnd, WM_MOVE, 0, MAKELONG(rect.left, rect.top)); - - if (!(winpos->flags & SWP_NOCLIENTSIZE) || (winpos->flags & SWP_STATECHANGED)) - { - if (IsIconic( hwnd )) - { - SendMessageW( hwnd, WM_SIZE, SIZE_MINIMIZED, 0 ); - } - else - { - WPARAM wp = IsZoomed( hwnd ) ? SIZE_MAXIMIZED : SIZE_RESTORED; - - SendMessageW( hwnd, WM_SIZE, wp, MAKELONG(rect.right-rect.left, rect.bottom-rect.top) ); - } - } -} - - /*********************************************************************** * DEFWND_ControlColor * @@ -158,10 +129,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCMOUSELEAVE: return NC_HandleNCMouseLeave( hwnd ); - case WM_WINDOWPOSCHANGED: - DEFWND_HandleWindowPosChanged( hwnd, (const WINDOWPOS *)lParam ); - break; - case WM_RBUTTONUP: { POINT pt; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index b3726bf8e88..e367a769401 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -489,6 +489,29 @@ static LONG handle_window_pos_changing( HWND hwnd, WINDOWPOS *winpos ) return 0; } +static void handle_window_pos_changed( HWND hwnd, const WINDOWPOS *winpos ) +{ + RECT rect; + + get_window_rects( hwnd, COORDS_PARENT, NULL, &rect, get_thread_dpi() ); + if (!(winpos->flags & SWP_NOCLIENTMOVE)) + send_message( hwnd, WM_MOVE, 0, MAKELONG( rect.left, rect.top )); + + if (!(winpos->flags & SWP_NOCLIENTSIZE) || (winpos->flags & SWP_STATECHANGED)) + { + if (is_iconic( hwnd )) + { + send_message( hwnd, WM_SIZE, SIZE_MINIMIZED, 0 ); + } + else + { + WPARAM wp = is_zoomed( hwnd ) ? SIZE_MAXIMIZED : SIZE_RESTORED; + send_message( hwnd, WM_SIZE, wp, + MAKELONG( rect.right-rect.left, rect.bottom-rect.top )); + } + } +} + /*********************************************************************** * draw_moving_frame * @@ -2324,6 +2347,10 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, case WM_WINDOWPOSCHANGING: return handle_window_pos_changing( hwnd, (WINDOWPOS *)lparam ); + case WM_WINDOWPOSCHANGED: + handle_window_pos_changed( hwnd, (const WINDOWPOS *)lparam ); + break; + case WM_PAINTICON: case WM_PAINT: {

1 0

Nikolay Sivov : d2d1/effect: Move effect instance creation to the device context.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: a2935a518bfd3d6180a4d4d12851181e0278f6a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2935a518bfd3d6180a4d4d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 19 21:39:07 2022 +0300 d2d1/effect: Move effect instance creation to the device context. Creating new effects from effect context does not reuse calling context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 23 ++++++++++++++++++++--- dlls/d2d1/effect.c | 18 ++---------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 62eb98a94a1..be7b8f9f8e2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1947,18 +1947,35 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect_context *effect_context; + struct d2d_effect *object; HRESULT hr; - FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); + TRACE("iface %p, effect_id %s, effect %p.\n", iface, debugstr_guid(effect_id), effect); if (!(effect_context = calloc(1, sizeof(*effect_context)))) return E_OUTOFMEMORY; d2d_effect_context_init(effect_context, context); - hr = ID2D1EffectContext_CreateEffect(&effect_context->ID2D1EffectContext_iface, effect_id, effect); + if (!(object = calloc(1, sizeof(*object)))) + { + ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); + return E_OUTOFMEMORY; + } + hr = d2d_effect_init(object, effect_context, effect_id); ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); - return hr; + if (FAILED(hr)) + { + WARN("Failed to initialise effect, hr %#lx.\n", hr); + free(object); + return hr; + } + + *effect = &object->ID2D1Effect_iface; + + TRACE("Created effect %p.\n", *effect); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection( diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 78db9489be9..f5d5494c67a 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -123,25 +123,11 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectCont REFCLSID clsid, ID2D1Effect **effect) { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); - struct d2d_effect *object; - HRESULT hr; TRACE("iface %p, clsid %s, effect %p.\n", iface, debugstr_guid(clsid), effect); - if (!(object = calloc(1, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d2d_effect_init(object, effect_context, clsid))) - { - WARN("Failed to initialise effect, hr %#lx.\n", hr); - free(object); - return hr; - } - - TRACE("Created effect %p.\n", object); - *effect = &object->ID2D1Effect_iface; - - return S_OK; + return ID2D1DeviceContext1_CreateEffect(&effect_context->device_context->ID2D1DeviceContext1_iface, + clsid, effect); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface,

1 0

Jacek Caban : win32u: Move default WM_CTL* window message implementation from user32.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 88870884a54b943d62882c2d37e47660983cf6f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88870884a54b943d62882c2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 13:16:15 2022 +0200 win32u: Move default WM_CTL* window message implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 12 ------------ dlls/win32u/defwnd.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index c40d2ebedab..be41f6c47a0 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -161,18 +161,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa DEFWND_Print(hwnd, (HDC)wParam, lParam); return 0; - case WM_CTLCOLORMSGBOX: - case WM_CTLCOLOREDIT: - case WM_CTLCOLORLISTBOX: - case WM_CTLCOLORBTN: - case WM_CTLCOLORDLG: - case WM_CTLCOLORSTATIC: - case WM_CTLCOLORSCROLLBAR: - return (LRESULT)DEFWND_ControlColor( (HDC)wParam, msg - WM_CTLCOLORMSGBOX ); - - case WM_CTLCOLOR: - return (LRESULT)DEFWND_ControlColor( (HDC)wParam, HIWORD(lParam) ); - case WM_SYSCOMMAND: return NC_HandleSysCommand( hwnd, wParam, lParam ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index e367a769401..506ff0f9fd9 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2261,6 +2261,38 @@ static LRESULT handle_nc_button_dbl_click( HWND hwnd, WPARAM wparam, LPARAM lpar return 0; } +static HBRUSH handle_control_color( HDC hdc, UINT type ) +{ + if (type == CTLCOLOR_SCROLLBAR) + { + HBRUSH hb = get_sys_color_brush( COLOR_SCROLLBAR ); + COLORREF bk = get_sys_color( COLOR_3DHILIGHT ); + NtGdiGetAndSetDCDword( hdc, NtGdiSetTextColor, get_sys_color( COLOR_3DFACE ), NULL ); + NtGdiGetAndSetDCDword( hdc, NtGdiSetBkColor, bk, NULL ); + + /* if COLOR_WINDOW happens to be the same as COLOR_3DHILIGHT + * we better use 0x55aa bitmap brush to make scrollbar's background + * look different from the window background. + */ + if (bk == get_sys_color( COLOR_WINDOW )) return get_55aa_brush(); + + NtGdiUnrealizeObject( hb ); + return hb; + } + + NtGdiGetAndSetDCDword( hdc, NtGdiSetTextColor, get_sys_color( COLOR_WINDOWTEXT ), NULL ); + + if (type == CTLCOLOR_EDIT || type == CTLCOLOR_LISTBOX) + NtGdiGetAndSetDCDword( hdc, NtGdiSetBkColor, get_sys_color( COLOR_WINDOW ), NULL ); + else + { + NtGdiGetAndSetDCDword( hdc, NtGdiSetBkColor, get_sys_color( COLOR_3DFACE ), NULL); + return get_sys_color_brush( COLOR_3DFACE ); + } + + return get_sys_color_brush( COLOR_WINDOW ); +} + LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { LRESULT result = 0; @@ -2474,6 +2506,18 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, handle_set_cursor( hwnd, wparam, lparam ); break; + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSTATIC: + case WM_CTLCOLORSCROLLBAR: + return (LRESULT)handle_control_color( (HDC)wparam, msg - WM_CTLCOLORMSGBOX ); + + case WM_CTLCOLOR: + return (LRESULT)handle_control_color( (HDC)wparam, HIWORD( lparam )); + case WM_SYSCOMMAND: result = handle_sys_command( hwnd, wparam, lparam ); break;

1 0

Alex Henrie : shell32/tests: Add tests for Program Manager name sanitization.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 33f65267b5c7569ece08b3c6dd2a5344db0c9ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33f65267b5c7569ece08b3c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 17 12:33:13 2022 -0600 shell32/tests: Add tests for Program Manager name sanitization. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/progman_dde.c | 72 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 5d532f9222f..cb1ff8ddb9f 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -23,7 +23,7 @@ * functionality * - Todo: Handle CommonGroupFlag * Better AddItem Tests (Lots of parameters to test) - * Tests for Invalid Characters in Names / Invalid Parameters + * Tests for invalid parameters */ #include <stdio.h> @@ -425,6 +425,75 @@ static void test_request_groups(DWORD instance, HCONV hconv) FindClose(hfind); } +static void test_name_sanitization(DWORD instance, HCONV hConv) +{ + static const char original_name[] = "\x01\x1F !#$%&'*+,-./:;<=>?@[\\]^`{|}~\x7F\xFF"; + static const char sanitized_name[] = "__ !#$%&'_+,-.__;_=__@[_]^`{_}~\x7F\xFF"; + char buf[128]; + UINT error; + + if (0) /* the directory isn't deleted on windows < 7 */ + { + error = dde_execute(instance, hConv, "[CreateGroup(\" \")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(check_exists(" "), "directory not created\n"); + ok(!check_window_exists(" "), "window should not exist\n"); + + error = dde_execute(instance, hConv, "[DeleteGroup(\" \")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists(" "), "directory should not exist\n"); + } + + if (0) /* these calls will actually delete the start menu */ + { + error = dde_execute(instance, hConv, "[DeleteGroup(\"\")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists("../Programs"), "directory should not exist\n"); + + error = dde_execute(instance, hConv, "[DeleteGroup(\"..\")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists("../../Start Menu"), "directory should not exist\n"); + } + + sprintf(buf, "[CreateGroup(\"Group%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + todo_wine ok(check_exists(buf), "directory not created\n"); + if (!check_exists(buf)) return; + ok(check_window_exists(buf), "window not created\n"); + + sprintf(buf, "[ShowGroup(\"Group%s\", 0)]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + ok(check_window_exists(buf), "window not created\n"); + + sprintf(buf, "[AddItem(notepad,\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link not created\n"); + + sprintf(buf, "[ReplaceItem(\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link should still exist\n"); + + sprintf(buf, "[DeleteItem(\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link should still exist\n"); + + sprintf(buf, "[DeleteGroup(\"Group%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + ok(!check_exists(buf), "directory should not exist\n"); +} + START_TEST(progman_dde) { DWORD instance = 0; @@ -479,6 +548,7 @@ START_TEST(progman_dde) /* Run Tests */ test_progman_dde2(instance, hConv); + test_name_sanitization(instance, hConv); /* Cleanup & Exit */ ret = DdeDisconnect(hConv);

1 0

Jacek Caban : win32u: Move more default window messages implementation from user32.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 04716457559706e7b406f08546e86b9d6765cbc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04716457559706e7b406f085… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 13:58:48 2022 +0200 win32u: Move more default window messages implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 98 -------------------------------------- dlls/win32u/defwnd.c | 109 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- 4 files changed, 111 insertions(+), 99 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index dcc0f4d2138..96dd2e873fa 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -#define DRAG_FILE 0x454C4946 - /*********************************************************************** * DEFWND_ControlColor * @@ -90,34 +88,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCMOUSELEAVE: return NC_HandleNCMouseLeave( hwnd ); - case WM_RBUTTONUP: - { - POINT pt; - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - ClientToScreen(hwnd, &pt); - SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(pt.x, pt.y) ); - } - break; - - case WM_NCRBUTTONUP: - /* - * FIXME : we must NOT send WM_CONTEXTMENU on a WM_NCRBUTTONUP (checked - * in Windows), but what _should_ we do? According to MSDN : - * "If it is appropriate to do so, the system sends the WM_SYSCOMMAND - * message to the window". When is it appropriate? - */ - break; - - case WM_XBUTTONUP: - case WM_NCXBUTTONUP: - if (HIWORD(wParam) == XBUTTON1 || HIWORD(wParam) == XBUTTON2) - { - SendMessageW(hwnd, WM_APPCOMMAND, (WPARAM)hwnd, - MAKELPARAM(LOWORD(wParam), FAPPCOMMAND_MOUSE | HIWORD(wParam))); - } - break; - case WM_SYSCOMMAND: return NC_HandleSysCommand( hwnd, wParam, lParam ); @@ -146,74 +116,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; } - case WM_VKEYTOITEM: - case WM_CHARTOITEM: - return -1; - - case WM_DROPOBJECT: - return DRAG_FILE; - - case WM_QUERYDROPOBJECT: - return (GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) != 0; - - case WM_QUERYDRAGICON: - { - UINT len; - - HICON hIcon = (HICON)GetClassLongPtrW( hwnd, GCLP_HICON ); - HINSTANCE instance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); - if (hIcon) return (LRESULT)hIcon; - for(len=1; len<64; len++) - if((hIcon = LoadIconW(instance, MAKEINTRESOURCEW(len)))) - return (LRESULT)hIcon; - return (LRESULT)LoadIconW(0, (LPWSTR)IDI_APPLICATION); - } - break; - - case WM_ISACTIVEICON: - return (win_get_flags( hwnd ) & WIN_NCACTIVATED) != 0; - - case WM_NOTIFYFORMAT: - if (IsWindowUnicode(hwnd)) return NFR_UNICODE; - else return NFR_ANSI; - - case WM_QUERYOPEN: - case WM_QUERYENDSESSION: - return 1; - - case WM_HELP: - SendMessageW( GetParent(hwnd), msg, wParam, lParam ); - break; - - case WM_STYLECHANGED: - if (wParam == GWL_STYLE && (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)) - { - STYLESTRUCT *style = (STYLESTRUCT *)lParam; - if ((style->styleOld ^ style->styleNew) & (WS_CAPTION|WS_THICKFRAME|WS_VSCROLL|WS_HSCROLL)) - NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER | - SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE ); - } - break; - - case WM_INPUTLANGCHANGEREQUEST: - NtUserActivateKeyboardLayout( (HKL)lParam, 0 ); - break; - - case WM_INPUTLANGCHANGE: - { - struct user_thread_info *info = get_user_thread_info(); - int count = 0; - HWND *win_array = WIN_ListChildren( hwnd ); - info->kbd_layout = (HKL)lParam; - - if (!win_array) - break; - while (win_array[count]) - SendMessageW( win_array[count++], WM_INPUTLANGCHANGE, wParam, lParam); - HeapFree(GetProcessHeap(),0,win_array); - break; - } - default: return NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 0470ed77eac..5625f15d42a 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +#define DRAG_FILE 0x454c4946 + /* bits in the dwKeyData */ #define KEYDATA_ALT 0x2000 #define KEYDATA_PREVSTATE 0x4000 @@ -2350,6 +2352,28 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, case WM_NCLBUTTONDBLCLK: return handle_nc_button_dbl_click( hwnd, wparam, lparam ); + case WM_RBUTTONUP: + { + POINT pt; + pt.x = (short)LOWORD( lparam ); + pt.y = (short)HIWORD( lparam ); + client_to_screen( hwnd, &pt ); + send_message( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM( pt.x, pt.y )); + } + break; + + case WM_NCRBUTTONUP: + break; + + case WM_XBUTTONUP: + case WM_NCXBUTTONUP: + if (HIWORD(wparam) == XBUTTON1 || HIWORD(wparam) == XBUTTON2) + { + send_message( hwnd, WM_APPCOMMAND, (WPARAM)hwnd, + MAKELPARAM( LOWORD( wparam ), FAPPCOMMAND_MOUSE | HIWORD( wparam ))); + } + break; + case WM_CONTEXTMENU: if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) send_message( get_parent( hwnd ), msg, (WPARAM)hwnd, lparam ); @@ -2640,6 +2664,91 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, send_message( parent, msg, wparam, lparam ); break; } + + case WM_VKEYTOITEM: + case WM_CHARTOITEM: + result = -1; + break; + + case WM_DROPOBJECT: + result = DRAG_FILE; + break; + + case WM_QUERYDROPOBJECT: + result = (get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) != 0; + break; + + case WM_QUERYDRAGICON: + { + UINT len; + HICON icon = (HICON)get_class_long_ptr( hwnd, GCLP_HICON, FALSE ); + HINSTANCE instance = (HINSTANCE)get_window_long_ptr( hwnd, GWLP_HINSTANCE, FALSE ); + + if (icon) + { + result = (LRESULT)icon; + break; + } + + for (len = 1; len < 64; len++) + { + if((icon = LoadImageW( instance, MAKEINTRESOURCEW( len ), IMAGE_ICON, 0, 0, + LR_SHARED | LR_DEFAULTSIZE ))) + { + result = (LRESULT)icon; + break; + } + } + if (!result) result = (LRESULT)LoadImageW( 0, (WCHAR *)IDI_APPLICATION, IMAGE_ICON, + 0, 0, LR_SHARED | LR_DEFAULTSIZE ); + break; + } + + case WM_ISACTIVEICON: + result = (win_get_flags( hwnd ) & WIN_NCACTIVATED) != 0; + break; + + case WM_NOTIFYFORMAT: + result = is_window_unicode(hwnd) ? NFR_UNICODE : NFR_ANSI; + break; + + case WM_QUERYOPEN: + case WM_QUERYENDSESSION: + result = 1; + break; + + case WM_HELP: + send_message( get_parent( hwnd ), msg, wparam, lparam ); + break; + + case WM_STYLECHANGED: + if (wparam == GWL_STYLE && (get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)) + { + STYLESTRUCT *style = (STYLESTRUCT *)lparam; + if ((style->styleOld ^ style->styleNew) & (WS_CAPTION|WS_THICKFRAME|WS_VSCROLL|WS_HSCROLL)) + NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER | + SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE ); + } + break; + + case WM_INPUTLANGCHANGEREQUEST: + NtUserActivateKeyboardLayout( (HKL)lparam, 0 ); + break; + + case WM_INPUTLANGCHANGE: + { + struct user_thread_info *info = get_user_thread_info(); + HWND *win_array = list_window_children( 0, hwnd, NULL, 0 ); + int count = 0; + info->kbd_layout = (HKL)lparam; + + if (!win_array) + break; + while (win_array[count]) + send_message( win_array[count++], WM_INPUTLANGCHANGE, wparam, lparam ); + free( win_array ); + break; + } } return result; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index b2d16b07d8e..808d3f83e37 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -473,6 +473,7 @@ extern void user_check_not_lock(void) DECLSPEC_HIDDEN; /* window.c */ struct tagWND; extern HDWP begin_defer_window_pos( INT count ) DECLSPEC_HIDDEN; +extern BOOL client_to_screen( HWND hwnd, POINT *pt ) DECLSPEC_HIDDEN; extern void destroy_thread_windows(void) DECLSPEC_HIDDEN; extern LRESULT destroy_window( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_client_rect( HWND hwnd, RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e8562f6a685..4a6b321d391 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2840,7 +2840,7 @@ other_process: /* one of the parents may belong to another process, do it the h } /* see ClientToScreen */ -static BOOL client_to_screen( HWND hwnd, POINT *pt ) +BOOL client_to_screen( HWND hwnd, POINT *pt ) { POINT offset; BOOL mirrored;

1 0

Nikolay Sivov : d2d1/effect: Add CheckFeatureSupport().
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 7eabfd477ffea9d17d5ed020cd6aa693a1f8e302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eabfd477ffea9d17d5ed020… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 19 20:38:37 2022 +0300 d2d1/effect: Add CheckFeatureSupport(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index d298985c020..78db9489be9 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -359,9 +359,23 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicCol static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface, D2D1_FEATURE feature, void *data, UINT32 data_size) { - FIXME("iface %p, feature %#x, data %p, data_size %u stub!\n", iface, feature, data, data_size); + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + D3D11_FEATURE d3d11_feature; - return E_NOTIMPL; + TRACE("iface %p, feature %#x, data %p, data_size %u.\n", iface, feature, data, data_size); + + /* Data structures are compatible. */ + switch (feature) + { + case D2D1_FEATURE_DOUBLES: d3d11_feature = D3D11_FEATURE_DOUBLES; break; + case D2D1_FEATURE_D3D10_X_HARDWARE_OPTIONS: d3d11_feature = D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS; break; + default: + WARN("Unexpected feature index %d.\n", feature); + return E_INVALIDARG; + } + + return ID3D11Device1_CheckFeatureSupport(effect_context->device_context->d3d_device, + d3d11_feature, data, data_size); } static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface,

1 0

Nikolay Sivov : d2d1/effect: Add LoadPixelShader().
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: f15b3172602fc41c61c8e8353083d24895469208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f15b3172602fc41c61c8e835… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 19 20:08:26 2022 +0300 d2d1/effect: Add LoadPixelShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 8345a5aa7d7..2da655b00d8 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -195,10 +195,27 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransf static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface, REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) { - FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ID3D11PixelShader *shader; + HRESULT hr; + + TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - return E_NOTIMPL; + if (ID2D1EffectContext_IsShaderLoaded(iface, shader_id)) + return S_OK; + + if (FAILED(hr = ID3D11Device1_CreatePixelShader(effect_context->device_context->d3d_device, + buffer, buffer_size, NULL, &shader))) + { + WARN("Failed to create a pixel shader, hr %#lx.\n", hr); + return hr; + } + + hr = d2d_effect_context_add_shader(effect_context, shader_id, shader); + ID3D11PixelShader_Release(shader); + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface,

1 0

Jinoh Kang : winedbg: Fix typos in manpage.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: beee5160a8d6f9114c066df83e21cd4b1378cd45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beee5160a8d6f9114c066df8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Jun 19 01:39:53 2022 +0900 winedbg: Fix typos in manpage. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/winedbg/winedbg.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 871b7ad6764..7eae4faa756 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -82,14 +82,14 @@ This will run \fBgdb\fR in its own xterm instead of using the current Unix console for textual display. .PP In all modes, the rest of the command line, when passed, is used to -identify which programs, if any, has to debugged: +identify which program, if any, is to be debugged: .IP \fIprogram_name\fR This is the name of an executable to start for a debugging session. \fBwinedbg\fR will actually create a process with this -executable. If \fIprograms_arguments\fR are also given, they will be +executable. If \fIprogram_arguments\fR are also given, they will be used as arguments for creating the process to be debugged. .IP \fIwpid\fR -\fBwinedbg\fR will attach to the process which Windows pid is \fIwpid\fR. +\fBwinedbg\fR will attach to the process whose Windows pid is \fIwpid\fR. Use the \fBinfo proc\fR command within \fBwinedbg\fR to list running processes and their Windows pids. .IP \fBdefault\fR

1 0

Daniel Lehman : include: Add _tcsto[u]ll declarations.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: c695ec59b1867336f3282470e768e05f3bf4b2c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c695ec59b1867336f3282470… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Jun 13 23:17:26 2022 -0700 include: Add _tcsto[u]ll declarations. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- include/msvcrt/corecrt_wstdlib.h | 4 ++++ include/msvcrt/stdlib.h | 4 ++-- include/tchar.h | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h index 53acdfe5a08..eef1fa26e0b 100644 --- a/include/msvcrt/corecrt_wstdlib.h +++ b/include/msvcrt/corecrt_wstdlib.h @@ -57,6 +57,10 @@ _ACRTIMP __int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int); _ACRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t); _ACRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int); _ACRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t); +_ACRTIMP __int64 __cdecl wcstoll(const wchar_t*,wchar_t**,int); +_ACRTIMP __int64 __cdecl _wcstoll_l(const wchar_t*,wchar_t**,int,_locale_t); +_ACRTIMP unsigned __int64 __cdecl wcstoull(const wchar_t*,wchar_t**,int); +_ACRTIMP unsigned __int64 __cdecl _wcstoull_l(const wchar_t*,wchar_t**,int,_locale_t); #ifdef __cplusplus } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 7a2a774dfb5..f7acdda73cb 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -227,8 +227,8 @@ _ACRTIMP float __cdecl strtof(const char*,char**); _ACRTIMP double __cdecl strtod(const char*,char**); _ACRTIMP __msvcrt_long __cdecl strtol(const char*,char**,int); _ACRTIMP __msvcrt_ulong __cdecl strtoul(const char*,char**,int); -_ACRTIMP __int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); -_ACRTIMP unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); +_ACRTIMP __int64 __cdecl _strtoll_l(const char*,char**,int,_locale_t); +_ACRTIMP unsigned __int64 __cdecl _strtoull_l(const char*,char**,int,_locale_t); _ACRTIMP __int64 __cdecl strtoimax(const char*,char**,int); _ACRTIMP __int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); _ACRTIMP unsigned __int64 __cdecl strtoumax(const char*,char**,int); diff --git a/include/tchar.h b/include/tchar.h index 526565ee0b5..a51bd5b359f 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -150,7 +150,11 @@ extern "C" { #define _tcstod WINE_tchar_routine(strtod, strtod, wcstod) #define _tcstok WINE_tchar_routine(strtok, _mbstok, _wcstok) #define _tcstol WINE_tchar_routine(strtol, strtol, wcstol) +#define _tcstoll WINE_tchar_routine(strtoll, strtoll, wcstoll) +#define _tcstoll_l WINE_tchar_routine(_strtoll_l, _strtoll_l, _wcstoll_l) #define _tcstoul WINE_tchar_routine(strtoul, strtoul, wcstoul) +#define _tcstoull WINE_tchar_routine(strtoull, strtoull, wcstoull) +#define _tcstoull_l WINE_tchar_routine(_strtoull_l, _strtoull_l, _wcstoull_l) #define _tcsupr WINE_tchar_routine(_strupr, _mbsupr, _wcsupr) #define _tcsupr_s WINE_tchar_routine(_strupr_s, _mbsupr_s, _wcsupr_s) #define _tcsxfrm WINE_tchar_routine(strxfrm, strxfrm, wcsxfrm)

1 0

Ziqing Hui : d2d1: Partially implement RegisterEffectFromStream().
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 05b796ff98d9d0c16943bbe9eb7490293fc2519f URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b796ff98d9d0c16943bbe9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jun 18 17:21:38 2022 +0300 d2d1: Partially implement RegisterEffectFromStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/factory.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 187 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 413571338ba..4c74839f39a 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -1,7 +1,7 @@ MODULE = d2d1.dll IMPORTLIB = d2d1 IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 -DELAYIMPORTS = dwrite +DELAYIMPORTS = dwrite xmllite ole32 C_SRCS = \ bitmap.c \ diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 367f13da5e5..4a08a0cf76d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -19,6 +19,9 @@ #define D2D1_INIT_GUID #include "d2d1_private.h" +#include "xmllite.h" +#include "wine/list.h" + WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -27,6 +30,21 @@ struct d2d_settings d2d_settings = ~0u, /* No ID2D1Factory version limit by default. */ }; +struct d2d_effect_registration +{ + struct list entry; + PD2D1_EFFECT_FACTORY factory; + UINT32 registration_count; + CLSID id; + + UINT32 input_count; +}; + +static void d2d_effect_registration_cleanup(struct d2d_effect_registration *reg) +{ + free(reg); +} + struct d2d_factory { ID2D1Factory3 ID2D1Factory3_iface; @@ -38,6 +56,8 @@ struct d2d_factory float dpi_x; float dpi_y; + struct list effects; + CRITICAL_SECTION cs; }; @@ -112,6 +132,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory3 *iface) { struct d2d_factory *factory = impl_from_ID2D1Factory3(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); + struct d2d_effect_registration *reg, *reg2; TRACE("%p decreasing refcount to %lu.\n", iface, refcount); @@ -119,6 +140,10 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory3 *iface) { if (factory->device) ID3D10Device1_Release(factory->device); + LIST_FOR_EACH_ENTRY_SAFE(reg, reg2, &factory->effects, struct d2d_effect_registration, entry) + { + d2d_effect_registration_cleanup(reg); + } DeleteCriticalSection(&factory->cs); free(factory); } @@ -564,24 +589,179 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory3 *if return E_NOTIMPL; } +static HRESULT parse_effect_get_next_xml_node(IXmlReader *reader, XmlNodeType expected_type, + const WCHAR *expected_name, unsigned int *depth) +{ + const WCHAR *node_name; + XmlNodeType node_type; + HRESULT hr; + + assert(expected_type != XmlNodeType_Whitespace); + + while ((hr = IXmlReader_Read(reader, &node_type)) == S_OK) + { + if (node_type == XmlNodeType_Whitespace) + continue; + + if (expected_type != XmlNodeType_None && node_type != expected_type) + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + + if (expected_name) + { + if (FAILED(hr = IXmlReader_GetLocalName(reader, &node_name, NULL))) + return hr; + + if (wcscmp(node_name, expected_name)) + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + } + + if (depth) + IXmlReader_GetDepth(reader, depth); + return S_OK; + } + + return hr; +} + +static HRESULT parse_effect_skip_element(IXmlReader *reader, unsigned int element_depth) +{ + XmlNodeType node_type; + unsigned int depth; + HRESULT hr; + + if (IXmlReader_IsEmptyElement(reader)) return S_OK; + + while ((hr = IXmlReader_Read(reader, &node_type)) == S_OK) + { + IXmlReader_GetDepth(reader, &depth); + if (node_type == XmlNodeType_EndElement && depth == element_depth + 1) + { + return S_OK; + } + } + + return hr; +} + +static HRESULT parse_effect_xml(IXmlReader *reader) +{ + const WCHAR *node_name; + XmlNodeType node_type; + unsigned int depth; + HRESULT hr; + + /* Xml declaration node is mandatory. */ + if ((hr = parse_effect_get_next_xml_node(reader, XmlNodeType_XmlDeclaration, L"xml", NULL)) != S_OK) + return hr; + + /* Top level "Effect" element. */ + if ((hr = parse_effect_get_next_xml_node(reader, XmlNodeType_Element, L"Effect", NULL)) != S_OK) + return hr; + + /* Loop inside effect node */ + while ((hr = parse_effect_get_next_xml_node(reader, XmlNodeType_None, NULL, &depth)) == S_OK) + { + if (FAILED(hr = IXmlReader_GetNodeType(reader, &node_type))) return hr; + if (node_type != XmlNodeType_Element && node_type != XmlNodeType_EndElement) continue; + if (FAILED(hr = IXmlReader_GetLocalName(reader, &node_name, NULL))) return hr; + if (node_type == XmlNodeType_EndElement) break; + + if (!wcscmp(node_name, L"Property") + || !wcscmp(node_name, L"Inputs")) + { + hr = parse_effect_skip_element(reader, depth); + } + else + { + WARN("Unexpected element %s.\n", debugstr_w(node_name)); + hr = parse_effect_skip_element(reader, depth); + } + + if (FAILED(hr)) + return hr; + } + + return hr; +} + static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory3 *iface, REFCLSID effect_id, IStream *property_xml, const D2D1_PROPERTY_BINDING *bindings, UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) { - FIXME("iface %p, effect_id %s, property_xml %p, bindings %p, binding_count %u, effect_factory %p stub!\n", + struct d2d_factory *factory = impl_from_ID2D1Factory3(iface); + struct d2d_effect_registration *effect; + IXmlReader *reader; + HRESULT hr; + + TRACE("iface %p, effect_id %s, property_xml %p, bindings %p, binding_count %u, effect_factory %p.\n", iface, debugstr_guid(effect_id), property_xml, bindings, binding_count, effect_factory); - return E_NOTIMPL; + LIST_FOR_EACH_ENTRY(effect, &factory->effects, struct d2d_effect_registration, entry) + { + if (IsEqualGUID(effect_id, &effect->id)) + { + ++effect->registration_count; + return S_OK; + } + } + + if (FAILED(hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL))) + return hr; + + if (FAILED(hr = IXmlReader_SetInput(reader, (IUnknown *)property_xml))) + { + IXmlReader_Release(reader); + return hr; + } + + if (!(effect = calloc(1, sizeof(*effect)))) + { + IXmlReader_Release(reader); + return E_OUTOFMEMORY; + } + + hr = parse_effect_xml(reader); + IXmlReader_Release(reader); + if (FAILED(hr)) + { + WARN("Failed to parse effect xml, hr %#lx.\n", hr); + d2d_effect_registration_cleanup(effect); + return hr; + } + + effect->registration_count = 1; + effect->id = *effect_id; + effect->factory = effect_factory; + list_add_tail(&factory->effects, &effect->entry); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory3 *iface, REFCLSID effect_id, const WCHAR *property_xml, const D2D1_PROPERTY_BINDING *bindings, UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) { - FIXME("iface %p, effect_id %s, property_xml %s, bindings %p, binding_count %u, effect_factory %p stub!\n", - iface, debugstr_guid(effect_id), debugstr_w(property_xml), bindings, binding_count, effect_factory); + static const LARGE_INTEGER zero; + IStream *stream; + ULONG size; + HRESULT hr; - return S_OK; + TRACE("iface %p, effect_id %s, property_xml %s, bindings %p, binding_count %u, effect_factory %p.\n", + iface, debugstr_guid(effect_id), debugstr_w(property_xml), bindings, binding_count, effect_factory); + + if (FAILED(hr = CreateStreamOnHGlobal(NULL, TRUE, &stream))) + return hr; + + size = sizeof(*property_xml) * (wcslen(property_xml) + 1); + if (SUCCEEDED(hr = IStream_Write(stream, property_xml, size, NULL))) + hr = IStream_Seek(stream, zero, SEEK_SET, NULL); + + if (SUCCEEDED(hr)) + hr = ID2D1Factory3_RegisterEffectFromStream(iface, effect_id, stream, bindings, + binding_count, effect_factory); + + IStream_Release(stream); + return hr; } static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory3 *iface, REFCLSID effect_id) @@ -742,6 +922,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact &d2d_factory_multithread_noop_vtbl : &d2d_factory_multithread_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); + list_init(&factory->effects); InitializeCriticalSection(&factory->cs); }

1 0