November 2021 - Wine-Devel - list.winehq.org

[PATCH v4 3/5] win32u: Use user_driver_funcs to pass driver to __wine_set_display_driver.
by Jacek Caban Nov. 11, 2021

Nov. 11, 2021

2 1

[PATCH v4 1/5] user32: Introduce user_driver_funcs struct.
by Jacek Caban Nov. 11, 2021

Nov. 11, 2021

And use it instead of USER_DRIVER. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 24 +++++++-------- dlls/user32/painting.c | 9 ++---- dlls/user32/sysparams.c | 1 - dlls/user32/user_private.h | 56 ++-------------------------------- dlls/user32/win.c | 6 +--- dlls/user32/winpos.c | 9 ++---- dlls/winemac.drv/mouse.c | 2 +- include/wine/gdi_driver.h | 61 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 79 insertions(+), 89 deletions(-)

2 1

[PATCH v2] combase: Add stub for RoOriginateError.
by Louis Lenders Nov. 11, 2021

Nov. 11, 2021

v2: add the prototype to include/roerrorapi.h https://bugs.winehq.org/show_bug.cgi?id=51983 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 9 +++++++++ include/roerrorapi.h | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index 99f1ca357cf..cf410136631 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -2,7 +2,7 @@ @ stub RoCaptureErrorContext @ stub RoFailFastWithErrorContext @ stub RoGetErrorReportingFlags -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) combase.RoOriginateError @ stub RoOriginateErrorW @ stub RoResolveRestrictedErrorInfoReference @ stub RoSetErrorReportingFlags diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index 0b390f1f80a..d969540e94d 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -7,7 +7,7 @@ @ stub RoGetMatchingRestrictedErrorInfo @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) combase.RoOriginateError @ stub RoOriginateErrorW @ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException @ stub RoReportFailedDelegate diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 7343da6a0ef..c2fafacdea3 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -301,7 +301,7 @@ @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) @ stub RoOriginateErrorW @ stdcall RoOriginateLanguageException(long ptr ptr) @ stub RoParameterizedTypeExtraGetTypeSignature diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 53da979d681..7d871fb885c 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -290,6 +290,15 @@ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknow return FALSE; } +/*********************************************************************** + * RoOriginateError (combase.@) + */ +BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) +{ + FIXME("(%x %s) stub\n", error, debugstr_hstring(message)); + return FALSE; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */ diff --git a/include/roerrorapi.h b/include/roerrorapi.h index dd9c7f16ec0..454e1a6c2e9 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -24,6 +24,7 @@ #include <rpc.h> HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); +BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message); BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); #endif /* _ROERROR_H */ -- 2.33.1

2 1

[PATCH v3 2/5] user32: Use user_driver_funcs to expose user driver function from drivers.
by Jacek Caban Nov. 11, 2021

Nov. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 167 ++++++++++--------- dlls/user32/user32.spec | 1 + dlls/wineandroid.drv/android.h | 27 +++ dlls/wineandroid.drv/init.c | 132 ++++----------- dlls/wineandroid.drv/wineandroid.drv.spec | 24 --- dlls/winemac.drv/gdi.c | 156 +++++++---------- dlls/winemac.drv/macdrv.h | 53 ++++++ dlls/winemac.drv/macdrv_main.c | 1 + dlls/winemac.drv/winemac.drv.spec | 39 ----- dlls/winex11.drv/display.c | 1 - dlls/winex11.drv/event.c | 2 - dlls/winex11.drv/init.c | 194 +++++++++++----------- dlls/winex11.drv/winex11.drv.spec | 41 ----- dlls/winex11.drv/x11drv.h | 50 ++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xim.c | 2 - include/wine/gdi_driver.h | 2 + 17 files changed, 411 insertions(+), 482 deletions(-)

2 1

[PATCH v3 1/5] user32: Introduce user_driver_funcs struct.
by Jacek Caban Nov. 11, 2021

Nov. 11, 2021

And use it instead of USER_DRIVER. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 24 +++++++-------- dlls/user32/painting.c | 9 ++---- dlls/user32/sysparams.c | 1 - dlls/user32/user_private.h | 56 ++-------------------------------- dlls/user32/win.c | 6 +--- dlls/user32/winpos.c | 9 ++---- dlls/winemac.drv/mouse.c | 2 +- include/wine/gdi_driver.h | 61 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 79 insertions(+), 89 deletions(-)

2 1

[PATCH v2 2/5] user32: Use user_driver_funcs to expose user driver function from drivers.
by Jacek Caban Nov. 11, 2021

Nov. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed null driver handling. dlls/user32/driver.c | 167 ++++++++++--------- dlls/user32/user32.spec | 1 + dlls/wineandroid.drv/android.h | 27 +++ dlls/wineandroid.drv/init.c | 132 ++++----------- dlls/wineandroid.drv/wineandroid.drv.spec | 24 --- dlls/winemac.drv/gdi.c | 148 ++++++----------- dlls/winemac.drv/macdrv.h | 52 ++++++ dlls/winemac.drv/mouse.c | 2 +- dlls/winemac.drv/winemac.drv.spec | 39 ----- dlls/winex11.drv/display.c | 1 - dlls/winex11.drv/event.c | 2 - dlls/winex11.drv/init.c | 194 +++++++++++----------- dlls/winex11.drv/winex11.drv.spec | 41 ----- dlls/winex11.drv/x11drv.h | 50 ++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xim.c | 2 - include/wine/gdi_driver.h | 2 + 17 files changed, 403 insertions(+), 482 deletions(-)

3 3

[PATCH v3 5/5] win32u: Move NtUserCountClipboardFormats implementation from user32.
by Jacek Caban Nov. 11, 2021

Nov. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/clipboard.c | 23 +-------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/clipboard.c | 55 ++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 34 +++++++++++++++++++--- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/wrappers.c | 5 ++++ include/ntuser.h | 1 + 10 files changed, 99 insertions(+), 28 deletions(-) create mode 100644 dlls/win32u/clipboard.c

1 0

[PATCH v3 4/5] win32u: Move null user driver implementation from user32.
by Jacek Caban Nov. 11, 2021

Nov. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 209 +---------------------------- dlls/win32u/driver.c | 310 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 310 insertions(+), 209 deletions(-)

1 0

[PATCH v3 3/5] win32u: Use user_driver_funcs to pass driver to __wine_set_display_driver.
by Jacek Caban Nov. 11, 2021

Nov. 11, 2021

1 0

[PATCH] combase: add stub for RoOriginateError
by Louis Lenders Nov. 11, 2021

Nov. 11, 2021

https://bugs.winehq.org/show_bug.cgi?id=51983 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index 99f1ca357cf..cf410136631 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -2,7 +2,7 @@ @ stub RoCaptureErrorContext @ stub RoFailFastWithErrorContext @ stub RoGetErrorReportingFlags -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) combase.RoOriginateError @ stub RoOriginateErrorW @ stub RoResolveRestrictedErrorInfoReference @ stub RoSetErrorReportingFlags diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index 0b390f1f80a..d969540e94d 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -7,7 +7,7 @@ @ stub RoGetMatchingRestrictedErrorInfo @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) combase.RoOriginateError @ stub RoOriginateErrorW @ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException @ stub RoReportFailedDelegate diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 7343da6a0ef..c2fafacdea3 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -301,7 +301,7 @@ @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) @ stub RoOriginateErrorW @ stdcall RoOriginateLanguageException(long ptr ptr) @ stub RoParameterizedTypeExtraGetTypeSignature diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 53da979d681..7d871fb885c 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -290,6 +290,15 @@ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknow return FALSE; } +/*********************************************************************** + * RoOriginateError (combase.@) + */ +BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) +{ + FIXME("(%x %s) stub\n", error, debugstr_hstring(message)); + return FALSE; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */ -- 2.33.1

2 1