November 2021 - Wine-commits

Alexandre Julliard : widl: Windows file formats are always little-endian.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: ad53edfab98a1544b4367a4afa31f5fe770bc03e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad53edfab98a1544b4367a4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 17:44:35 2021 +0100 widl: Windows file formats are always little-endian. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib_struct.h | 20 -------------------- tools/widl/utils.c | 26 ++++++++++---------------- tools/widl/utils.h | 1 - tools/widl/write_msft.c | 14 -------------- 4 files changed, 10 insertions(+), 51 deletions(-) diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 58dd95ec3bd..2a1fb745087 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -138,13 +138,8 @@ typedef struct tagMSFT_TypeInfoBase { /*040*/ INT helpstringcontext; /* */ INT helpcontext; /* */ INT oCustData; /* offset in customer data table */ -#ifdef WORDS_BIGENDIAN - INT16 cbSizeVft; /* virtual table size, including inherits */ - INT16 cImplTypes; /* nr of implemented interfaces */ -#else INT16 cImplTypes; /* nr of implemented interfaces */ INT16 cbSizeVft; /* virtual table size, including inherits */ -#endif /*050*/ INT size; /* size in bytes, at least for structures */ /* FIXME: name of this field */ INT datatype1; /* position in type description table */ @@ -174,13 +169,8 @@ typedef struct { /* INT recsize; record size including some extra stuff */ INT DataType; /* data type of the member, eg return of function */ INT Flags; /* something to do with attribute flags (LOWORD) */ -#ifdef WORDS_BIGENDIAN - INT16 funcdescsize; /* size of reconstituted FUNCDESC and related structs */ - INT16 VtableOffset; /* offset in vtable */ -#else INT16 VtableOffset; /* offset in vtable */ INT16 funcdescsize; /* size of reconstituted FUNCDESC and related structs */ -#endif INT FKCCIC; /* bit string with the following */ /* meaning (bit 0 is the lsb): */ /* bits 0 - 2: FUNCKIND */ @@ -191,13 +181,8 @@ typedef struct { /* bit 13: oEntry is numeric */ /* bit 14: has retval param */ /* bits 16 - 31: index of next function with same id */ -#ifdef WORDS_BIGENDIAN - INT16 nroargs; /* nr of optional arguments */ - INT16 nrargs; /* number of arguments (including optional ????) */ -#else INT16 nrargs; /* number of arguments (including optional ????) */ INT16 nroargs; /* nr of optional arguments */ -#endif /* optional attribute fields, the number of them is variable */ INT OptAttr[1]; /* @@ -230,13 +215,8 @@ typedef struct { /* INT recsize; // record size including some extra stuff */ INT DataType; /* data type of the variable */ INT Flags; /* VarFlags (LOWORD) */ -#ifdef WORDS_BIGENDIAN - INT16 vardescsize; /* size of reconstituted VARDESC and related structs */ - INT16 VarKind; /* VarKind */ -#else INT16 VarKind; /* VarKind */ INT16 vardescsize; /* size of reconstituted VARDESC and related structs */ -#endif INT OffsValue; /* value of the variable or the offset */ /* in the data structure */ /* optional attribute fields, the number of them is variable */ diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 81558011d66..cf95f76e602 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -211,7 +211,6 @@ size_t strappend(char **buf, size_t *len, size_t pos, const char* fmt, ...) * Function for writing to a memory buffer. */ -int byte_swapped = 0; unsigned char *output_buffer; size_t output_buffer_pos; size_t output_buffer_size; @@ -351,29 +350,24 @@ void put_byte( unsigned char val ) void put_word( unsigned short val ) { - if (byte_swapped) val = (val << 8) | (val >> 8); - put_data( &val, sizeof(val) ); + check_output_buffer_space( 2 ); + output_buffer[output_buffer_pos++] = val; + output_buffer[output_buffer_pos++] = val >> 8; } void put_dword( unsigned int val ) { - if (byte_swapped) - val = ((val << 24) | ((val << 8) & 0x00ff0000) | ((val >> 8) & 0x0000ff00) | (val >> 24)); - put_data( &val, sizeof(val) ); + check_output_buffer_space( 4 ); + output_buffer[output_buffer_pos++] = val; + output_buffer[output_buffer_pos++] = val >> 8; + output_buffer[output_buffer_pos++] = val >> 16; + output_buffer[output_buffer_pos++] = val >> 24; } void put_qword( unsigned int val ) { - if (byte_swapped) - { - put_dword( 0 ); - put_dword( val ); - } - else - { - put_dword( val ); - put_dword( 0 ); - } + put_dword( val ); + put_dword( 0 ); } /* pointer-sized word */ diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 1c172206781..29a04bff69d 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -40,7 +40,6 @@ int is_valid_uuid(const char *s); /* buffer management */ -extern int byte_swapped; extern unsigned char *output_buffer; extern size_t output_buffer_pos; extern size_t output_buffer_size; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 311b5017049..5e1e7274152 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -302,17 +302,10 @@ static int ctl2_encode_name( value = lhash_val_of_name_sys(typelib->typelib_header.varflags & 0x0f, typelib->typelib_header.lcid, converted_name + 4); -#ifdef WORDS_BIGENDIAN - converted_name[3] = length & 0xff; - converted_name[2] = length >> 8; - converted_name[1] = value; - converted_name[0] = value >> 8; -#else converted_name[0] = length & 0xff; converted_name[1] = length >> 8; converted_name[2] = value; converted_name[3] = value >> 8; -#endif for (offset = (4 - length) & 3; offset; offset--) converted_name[length + offset + 3] = 0x57; @@ -349,14 +342,8 @@ static int ctl2_encode_string( if (length < 3) size += 4; converted_string = xmalloc(size); memcpy(converted_string + 2, string, length); - -#ifdef WORDS_BIGENDIAN - converted_string[1] = length & 0xff; - converted_string[0] = (length >> 8) & 0xff; -#else converted_string[0] = length & 0xff; converted_string[1] = (length >> 8) & 0xff; -#endif if(length < 3) { /* strings of this length are padded with up to 8 bytes incl the 2 byte length */ for(offset = 0; offset < 4; offset++) @@ -2738,7 +2725,6 @@ static void save_all_changes(msft_typelib_t *typelib) ctl2_finalize_typeinfos(typelib, filepos); - byte_swapped = 0; init_output_buffer(); put_data(&typelib->typelib_header, sizeof(typelib->typelib_header));

1 0

Louis Lenders : combase: Add stub for RoOriginateError.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 6b59b26fff0e55c5d71a8cee9e0ddaf82e6f09f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b59b26fff0e55c5d71a8cee… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Nov 11 13:55:31 2021 +0100 combase: Add stub for RoOriginateError. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51983 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../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 */

1 0

Jacek Caban : user32: Introduce user_driver_funcs struct.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: d1290b6ec7b1f1d0a18742f4da939a8839f55857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1290b6ec7b1f1d0a18742f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 11 14:12:44 2021 +0100 user32: Introduce user_driver_funcs struct. And use it instead of USER_DRIVER. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1290b6ec7b1f1d0a187…

1 0

Jacek Caban : user32: Use user_driver_funcs to expose user driver function from drivers.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: fd675485be8686ec5e3b4667d3f3e9739a4a07ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd675485be8686ec5e3b4667… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 11 14:13:16 2021 +0100 user32: Use user_driver_funcs to expose user driver function from drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd675485be8686ec5e3b…

1 0

Jacek Caban : win32u: Use user_driver_funcs to pass driver to __wine_set_display_driver.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 73bf140c014eba38045207f234bb4ff51e75a6bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=73bf140c014eba38045207f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 11 14:13:29 2021 +0100 win32u: Use user_driver_funcs to pass driver to __wine_set_display_driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 15 +++++------ dlls/win32u/driver.c | 45 ++++++++++++++++--------------- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/win32u_private.h | 2 +- dlls/win32u/wrappers.c | 19 ++----------- dlls/wineandroid.drv/init.c | 14 ---------- dlls/wineandroid.drv/wineandroid.drv.spec | 4 --- dlls/winemac.drv/gdi.c | 14 ---------- dlls/winemac.drv/winemac.drv.spec | 4 --- dlls/winex11.drv/init.c | 14 ---------- dlls/winex11.drv/winex11.drv.spec | 4 --- include/wine/gdi_driver.h | 4 +-- 13 files changed, 36 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73bf140c014eba380452…

1 0

Jacek Caban : win32u: Move null user driver implementation from user32.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 694b1b472bc6383a9f91c3e26f61172a08b15aac URL: https://source.winehq.org/git/wine.git/?a=commit;h=694b1b472bc6383a9f91c3e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 11 14:13:35 2021 +0100 win32u: Move null user driver implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 209 +--------------------------------- dlls/win32u/driver.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 310 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=694b1b472bc6383a9f91…

1 0

Jacek Caban : win32u: Move NtUserCountClipboardFormats implementation from user32.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 170cb0d9306387dd07d964921dc7f99e44050fba URL: https://source.winehq.org/git/wine.git/?a=commit;h=170cb0d9306387dd07d96492… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 11 14:13:45 2021 +0100 win32u: Move NtUserCountClipboardFormats implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index a13085719a9..b9bcc184ca1 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -926,27 +926,6 @@ done: } -/************************************************************************** - * CountClipboardFormats (USER32.@) - */ -INT WINAPI CountClipboardFormats(void) -{ - INT count = 0; - - USER_Driver->pUpdateClipboard(); - - SERVER_START_REQ( get_clipboard_formats ) - { - wine_server_call( req ); - count = reply->count; - } - SERVER_END_REQ; - - TRACE("returning %d\n", count); - return count; -} - - /************************************************************************** * EnumClipboardFormats (USER32.@) */ @@ -1107,7 +1086,7 @@ INT WINAPI GetPriorityClipboardFormat(UINT *list, INT nCount) TRACE( "%p %u\n", list, nCount ); - if(CountClipboardFormats() == 0) + if (NtUserCountClipboardFormats() == 0) return 0; for (i = 0; i < nCount; i++) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e6906f025b7..87f4dc468bf 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -83,7 +83,7 @@ @ stdcall CopyIcon(long) @ stdcall CopyImage(long long long long long) @ stdcall CopyRect(ptr ptr) -@ stdcall CountClipboardFormats() +@ stdcall CountClipboardFormats() NtUserCountClipboardFormats @ stdcall CreateAcceleratorTableA(ptr long) @ stdcall CreateAcceleratorTableW(ptr long) @ stdcall CreateCaret(long long long long) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 92e1858b9bc..306a3302260 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ bitblt.c \ bitmap.c \ brush.c \ + clipboard.c \ clipping.c \ dc.c \ dib.c \ diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c new file mode 100644 index 00000000000..8d0e09fdb55 --- /dev/null +++ b/dlls/win32u/clipboard.c @@ -0,0 +1,55 @@ +/* + * WIN32 clipboard implementation + * + * Copyright 1994 Martin Ayotte + * Copyright 1996 Alex Korobka + * Copyright 1999 Noel Borthwick + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2016 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#if 0 +#pragma makedep unix +#endif + +#include "win32u_private.h" +#include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(clipboard); + + +/************************************************************************** + * NtUserCountClipboardFormats (win32u.@) + */ +INT WINAPI NtUserCountClipboardFormats(void) +{ + INT count = 0; + + user_driver->pUpdateClipboard(); + + SERVER_START_REQ( get_clipboard_formats ) + { + wine_server_call( req ); + count = reply->count; + } + SERVER_END_REQ; + + TRACE( "returning %d\n", count ); + return count; +} diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index ae83749d10f..15e7d3701f7 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -56,7 +56,7 @@ struct d3dkmt_device struct list entry; /* List entry */ }; -static const struct user_driver_funcs *user_driver; +static const struct user_driver_funcs lazy_load_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); @@ -70,9 +70,10 @@ static pthread_mutex_t driver_lock = PTHREAD_MUTEX_INITIALIZER; */ const struct gdi_dc_funcs *get_display_driver(void) { - if (!user_driver) + if (user_driver == &lazy_load_driver) { - if (!user_callbacks || !user_callbacks->pGetDesktopWindow() || !user_driver) + if (!user_callbacks || !user_callbacks->pGetDesktopWindow() || + user_driver == &lazy_load_driver) { static struct user_driver_funcs empty_funcs; WARN( "failed to load the display driver, falling back to null driver\n" ); @@ -123,7 +124,7 @@ static BOOL CDECL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT static BOOL CDECL nulldrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) { - if (!user_driver || !user_driver->dc_funcs.pCreateCompatibleDC) return TRUE; + if (!user_driver->dc_funcs.pCreateCompatibleDC) return TRUE; return user_driver->dc_funcs.pCreateCompatibleDC( NULL, pdev ); } @@ -989,6 +990,31 @@ static void CDECL nulldrv_ThreadDetach( void ) { } +/********************************************************************** + * Lazy loading user driver + * + * Initial driver used before another driver is loaded. + * Each entry point simply loads the real driver and chains to it. + */ + +static const struct user_driver_funcs *load_driver(void) +{ + get_display_driver(); + return user_driver; +} + +static void CDECL loaderdrv_UpdateClipboard(void) +{ + load_driver()->pUpdateClipboard(); +} + +static const struct user_driver_funcs lazy_load_driver = +{ + .pUpdateClipboard = loaderdrv_UpdateClipboard, +}; + +const struct user_driver_funcs *user_driver = &lazy_load_driver; + /****************************************************************************** * __wine_set_display_driver (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index c8dae928340..4737aa30cd2 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1167,6 +1167,7 @@ static struct unix_funcs unix_funcs = NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, + NtUserCountClipboardFormats, GDIRealizePalette, GDISelectPalette, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8327e588b77..daea9cfe21a 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -803,7 +803,7 @@ @ stub NtUserConsoleControl @ stub NtUserConvertMemHandle @ stub NtUserCopyAcceleratorTable -@ stub NtUserCountClipboardFormats +@ stdcall NtUserCountClipboardFormats() @ stub NtUserCreateAcceleratorTable @ stub NtUserCreateActivationGroup @ stub NtUserCreateActivationObject diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index de3c69b9ed4..a78c7bb906b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -194,6 +194,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); + INT (WINAPI *pNtUserCountClipboardFormats)(void); /* Wine-specific functions */ UINT (WINAPI *pGDIRealizePalette)( HDC hdc ); @@ -229,6 +230,8 @@ extern HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) DECLSPE extern ULONG query_reg_ascii_value( HKEY hkey, const char *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) DECLSPEC_HIDDEN; +extern const struct user_driver_funcs *user_driver DECLSPEC_HIDDEN; + static inline WCHAR *win32u_wcsrchr( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 922723903b9..d236fb6b2db 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -596,6 +596,11 @@ NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER return unix_funcs->pNtGdiDdDDISetVidPnSourceOwner( desc ); } +INT WINAPI NtUserCountClipboardFormats(void) +{ + return unix_funcs->pNtUserCountClipboardFormats(); +} + UINT WINAPI GDIRealizePalette( HDC hdc ) { return unix_funcs->pGDIRealizePalette( hdc ); diff --git a/include/ntuser.h b/include/ntuser.h index c05c743b553..de493b7a6d7 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -25,6 +25,7 @@ BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); +INT WINAPI NtUserCountClipboardFormats(void); HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *device, DEVMODEW *devmode, DWORD flags, ACCESS_MASK access, ULONG heap_size );

1 0

Mohamad Al-Jaf : kernelbase: Implement AppPolicyGetMediaFoundationCodecLoading.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: b5c1f4a7a451eb11ee8188623352747dcfe660ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5c1f4a7a451eb11ee818862… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 11 05:01:26 2021 -0500 kernelbase: Implement AppPolicyGetMediaFoundationCodecLoading. Enables native Windows 10 media foundation libraries to run. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 14 ++++++++++++++ include/appmodel.h | 7 +++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec index 3c1b4058a9f..89fe702bbc2 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -1,7 +1,7 @@ @ stub AppPolicyGetClrCompat @ stub AppPolicyGetCreateFileAccess @ stub AppPolicyGetLifecycleManagement -@ stub AppPolicyGetMediaFoundationCodecLoading +@ stdcall AppPolicyGetMediaFoundationCodecLoading(ptr ptr) kernelbase.AppPolicyGetMediaFoundationCodecLoading @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) kernelbase.AppPolicyGetProcessTerminationMethod @ stdcall AppPolicyGetShowDeveloperDiagnostic(ptr ptr) kernelbase.AppPolicyGetShowDeveloperDiagnostic @ stdcall AppPolicyGetThreadInitializationType(ptr ptr) kernelbase.AppPolicyGetThreadInitializationType diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index dd9f4a8ddce..55208889c35 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -43,7 +43,7 @@ # @ stub AppPolicyGetClrCompat # @ stub AppPolicyGetCreateFileAccess # @ stub AppPolicyGetLifecycleManagement -# @ stub AppPolicyGetMediaFoundationCodecLoading +@ stdcall AppPolicyGetMediaFoundationCodecLoading(ptr ptr) @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) @ stdcall AppPolicyGetShowDeveloperDiagnostic(ptr ptr) @ stdcall AppPolicyGetThreadInitializationType(ptr ptr) diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index b90ee1cba2c..e6cf892a4dc 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -88,6 +88,20 @@ INT WINAPI MulDiv( INT a, INT b, INT c ) return ret; } +/*********************************************************************** + * AppPolicyGetMediaFoundationCodecLoading (KERNELBASE.@) + */ + +LONG WINAPI AppPolicyGetMediaFoundationCodecLoading(HANDLE token, AppPolicyMediaFoundationCodecLoading *policy) +{ + FIXME("%p, %p\n", token, policy); + + if(policy) + *policy = AppPolicyMediaFoundationCodecLoading_All; + + return ERROR_SUCCESS; +} + /*********************************************************************** * AppPolicyGetProcessTerminationMethod (KERNELBASE.@) */ diff --git a/include/appmodel.h b/include/appmodel.h index e4288bbfbb0..8c219e8080a 100644 --- a/include/appmodel.h +++ b/include/appmodel.h @@ -22,6 +22,12 @@ extern "C" { #endif +typedef enum AppPolicyMediaFoundationCodecLoading +{ + AppPolicyMediaFoundationCodecLoading_All = 0, + AppPolicyMediaFoundationCodecLoading_InboxOnly = 1, +} AppPolicyMediaFoundationCodecLoading; + typedef enum AppPolicyProcessTerminationMethod { AppPolicyProcessTerminationMethod_ExitProcess = 0, @@ -78,6 +84,7 @@ typedef struct PACKAGE_ID } PACKAGE_ID; +LONG WINAPI AppPolicyGetMediaFoundationCodecLoading(HANDLE token, AppPolicyMediaFoundationCodecLoading *policy); LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy); LONG WINAPI AppPolicyGetShowDeveloperDiagnostic(HANDLE token, AppPolicyShowDeveloperDiagnostic *policy); LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy);

1 0

Mohamad Al-Jaf : kernel32: Forward AppPolicyGetMediaFoundationCodecLoading to kernelbase.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: d5c998770e4b916cb3d180792501622fc7e4539b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5c998770e4b916cb3d18079… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 11 05:01:27 2021 -0500 kernel32: Forward AppPolicyGetMediaFoundationCodecLoading to kernelbase. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7c25caf19d7..9667f82a5da 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -157,6 +157,7 @@ @ stdcall -import AllocateUserPhysicalPagesNuma(long ptr ptr long) @ stdcall ApplicationRecoveryFinished(long) @ stdcall ApplicationRecoveryInProgress(ptr) +@ stdcall AppPolicyGetMediaFoundationCodecLoading(ptr ptr) kernelbase.AppPolicyGetMediaFoundationCodecLoading @ stdcall -import AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @ stdcall -import AttachConsole(long)

1 0

Zhiyi Zhang : shell32: Check This->sPathTarget before calling get_display_name().
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 681d2dfd9d0f6df0a0f34a751663b43369de85b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=681d2dfd9d0f6df0a0f34a75… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 17:26:31 2021 +0800 shell32: Check This->sPathTarget before calling get_display_name(). Fix Excel 2010 crashing in get_display_name() when clicking the ribbon bar file tab. The check was removed in 984f608. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_fs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 64571200493..214b9326342 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -867,8 +867,9 @@ IShellFolder_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) && (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) { - get_display_name( pszPath, This->sPathTarget, pidl, - IsEqualCLSID( This->pclsid, &CLSID_UnixFolder )); + if (This->sPathTarget) + get_display_name( pszPath, This->sPathTarget, pidl, + IsEqualCLSID( This->pclsid, &CLSID_UnixFolder )); } else { /* pidl has to contain exactly one non null SHITEMID */ hr = E_INVALIDARG;

1 0