May 2020 - Wine-Commits - list.winehq.org

Jacek Caban : winecrt0: Build exception functions on clang msvc target.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 9666ed9c466d803eec868e5db1d63c10b614d4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9666ed9c466d803eec868e5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:56 2020 +0200 winecrt0: Build exception functions on clang msvc target. We may potentially use compiler __try/__except support in this case, but there is no reason not to support both. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 3a0ecfef68..137ee2d6ee 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -23,7 +23,9 @@ #include "wine/exception.h" #include "wine/asm.h" -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) || defined(__clang__) + +#if defined(__i386__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "movl 4(%esp),%ecx\n\t" /* jmp_buf */ @@ -62,7 +64,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, "call " __ASM_STDCALL("RtlUnwind",16) "\n\t" "call *16(%ebp)" ) -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ @@ -134,7 +136,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, /* we need an extra call to make sure the stack is correctly aligned */ "callq *%rax" ) -#elif defined(__GNUC__) && defined(__arm__) +#elif defined(__arm__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "str r1, [r0]\n\t" /* jmp_buf->Frame */ @@ -196,7 +198,7 @@ void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_ for (;;) target(); } -#elif defined(__GNUC__) && defined(__aarch64__) +#elif defined(__aarch64__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "str x1, [x0]\n\t" /* jmp_buf->Frame */ @@ -383,3 +385,5 @@ DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, } return ExceptionContinueSearch; } + +#endif /* __GNUC__ || __clang__ */

1 0

Zebediah Figura : ddraw/tests: Add more tests for EnumSurfaces().
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 2389fae064cc34ba1e87fdfc2b46691414817541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2389fae064cc34ba1e87fdfc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 15:42:06 2020 -0500 ddraw/tests: Add more tests for EnumSurfaces(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 168 +++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 169 ++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 636 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2389fae064cc34ba1e87…

1 0

Zhiyi Zhang : wined3d: Move device window to the correct output in wined3d_swapchain_state_resize_target().
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 7ee8674ed27474d2559dcd06f3e3de526e03fe49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee8674ed27474d2559dcd06… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:30 2020 +0800 wined3d: Move device window to the correct output in wined3d_swapchain_state_resize_target(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 86f8277a27..dd0419412a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1472,7 +1472,9 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta struct wined3d_output *output, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; RECT original_window_rect, window_rect; + int x, y, width, height; HWND window; HRESULT hr; @@ -1488,37 +1490,42 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta AdjustWindowRectEx(&window_rect, GetWindowLongW(window, GWL_STYLE), FALSE, GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + + x = original_window_rect.left; + y = original_window_rect.top; + width = window_rect.right - window_rect.left; + height = window_rect.bottom - window_rect.top; } - else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) + else { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - wined3d_mutex_unlock(); - return hr; + actual_mode = *mode; + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + { + ERR("Failed to set display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - else - { - if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) { - ERR("Failed to get display mode, hr %#x.\n", hr); + ERR("Failed to get output description, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); + x = output_desc.desktop_rect.left; + y = output_desc.desktop_rect.top; + width = output_desc.desktop_rect.right - output_desc.desktop_rect.left; + height = output_desc.desktop_rect.bottom - output_desc.desktop_rect.top; } wined3d_mutex_unlock(); - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + MoveWindow(window, x, y, width, height, TRUE); return WINED3D_OK; }

1 0

Hans Leidekker : msxml6: Update version resource.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: dd41471f0711aa1e0999fa91f4de970bd1b42e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd41471f0711aa1e0999fa91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 1 09:44:48 2020 +0200 msxml6: Update version resource. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml6/rsrc.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc index 9c6e55c551..d803f67962 100644 --- a/dlls/msxml6/rsrc.rc +++ b/dlls/msxml6/rsrc.rc @@ -18,10 +18,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSXML 6.0" #define WINE_FILENAME_STR "msxml6.dll" -#define WINE_FILEVERSION 6,10,1129,0 -#define WINE_FILEVERSION_STR "6.10.1129.0" -#define WINE_PRODUCTVERSION 6,10,1129,0 -#define WINE_PRODUCTVERSION_STR "6.10.1129.0" +#define WINE_FILEVERSION 6,30,7601,24498 +#define WINE_FILEVERSION_STR "6.30.7601.24498" +#define WINE_PRODUCTVERSION 6,30,7601,24498 +#define WINE_PRODUCTVERSION_STR "6.30.7601.24498" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Jacek Caban : ntdll: Export _chkstk from importlib.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 93d1eecb6aa4f911e4bf4ea2b32969b21588292c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d1eecb6aa4f911e4bf4ea2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:42 2020 +0200 ntdll: Export _chkstk from importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_i386.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5d083b0142..0dd3813987 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1640,7 +1640,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e9a93e551d..e73682af0f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1736,7 +1736,7 @@ # @ stub _GetMUIStringFromCache # @ stub _OpenMuiStringCache @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk # @ stub __dllonexit3 @ stub __misaligned_access # @ stub __wgetmainargs diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b2e467c70c..b19b334bb4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1413,7 +1413,7 @@ @ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl __isascii(long) NTDLL___isascii @ cdecl __iscsym(long) NTDLL___iscsym @ cdecl __iscsymf(long) NTDLL___iscsymf @@ -1430,7 +1430,7 @@ @ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) -@ stdcall -private -arch=i386 -norelay _chkstk() +@ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused @ cdecl -arch=i386 -ret64 _ftol() NTDLL__ftol @ cdecl _i64toa(int64 ptr long) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e905ed0af1..5396037502 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -3050,7 +3050,7 @@ __ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) /************************************************************************** * _chkstk (NTDLL.@) */ -__ASM_STDCALL_FUNC( _chkstk, 0, +__ASM_GLOBAL_FUNC( _chkstk, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" @@ -3061,7 +3061,7 @@ __ASM_STDCALL_FUNC( _chkstk, 0, /************************************************************************** * _alloca_probe (NTDLL.@) */ -__ASM_STDCALL_FUNC( _alloca_probe, 0, +__ASM_GLOBAL_FUNC( _alloca_probe, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t"

1 0

Nikolay Sivov : dwrite: Use feature tags directly instead of SDK symbols.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: eadd97cbcea105cade5981503b3bb8eceaa3a127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadd97cbcea105cade598150… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 13:45:55 2020 +0300 dwrite: Use feature tags directly instead of SDK symbols. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index a5a1a232e7..e7693b58ae 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -285,15 +285,15 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i { static const unsigned int common_features[] = { - DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION, - DWRITE_FONT_FEATURE_TAG_LOCALIZED_FORMS, - DWRITE_FONT_FEATURE_TAG_REQUIRED_LIGATURES, + DWRITE_MAKE_OPENTYPE_TAG('c','c','m','p'), + DWRITE_MAKE_OPENTYPE_TAG('l','o','c','l'), + DWRITE_MAKE_OPENTYPE_TAG('r','l','i','g'), }; static const unsigned int horizontal_features[] = { - DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES, - DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_LIGATURES, - DWRITE_FONT_FEATURE_TAG_STANDARD_LIGATURES, + DWRITE_MAKE_OPENTYPE_TAG('c','a','l','t'), + DWRITE_MAKE_OPENTYPE_TAG('c','l','i','g'), + DWRITE_MAKE_OPENTYPE_TAG('l','i','g','a'), DWRITE_MAKE_OPENTYPE_TAG('r','c','l','t'), }; struct scriptshaping_cache *cache = context->cache;

1 0

Hans Leidekker : msxml3: Update version resource.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 608a7f94e8fb9182b70f0b8d550e961e724f7d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608a7f94e8fb9182b70f0b8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 1 09:44:47 2020 +0200 msxml3: Update version resource. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index 127ecee884..51da3e809e 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -16,10 +16,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" #define WINE_FILENAME_STR "msxml3.dll" -#define WINE_FILEVERSION 8,90,1101,0 -#define WINE_FILEVERSION_STR "8.90.1101.0" -#define WINE_PRODUCTVERSION 8,90,1101,0 -#define WINE_PRODUCTVERSION_STR "8.90.1101.0" +#define WINE_FILEVERSION 8,110,7601,24402 +#define WINE_FILEVERSION_STR "8.110.7601.24402" +#define WINE_PRODUCTVERSION 8,110,7601,24402 +#define WINE_PRODUCTVERSION_STR "8.110.7601.24402" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : kernel32: Move some stub functions to kernelbase.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 0c90da7f7ed77c6ad067319ada66377c641c82d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c90da7f7ed77c6ad067319a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 20:15:08 2020 +0200 kernel32: Move some stub functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 23 --------------------- dlls/kernel32/kernel32.spec | 26 ++++++++++++------------ dlls/kernel32/locale.c | 28 ------------------------- dlls/kernel32/process.c | 33 ------------------------------ dlls/kernel32/time.c | 24 ---------------------- dlls/kernel32/version.c | 36 --------------------------------- dlls/kernelbase/file.c | 22 ++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 26 ++++++++++++------------ dlls/kernelbase/locale.c | 27 +++++++++++++++++++++++++ dlls/kernelbase/process.c | 45 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 12 +++++++++++ dlls/kernelbase/version.c | 40 ++++++++++++++++++++++++++++++++++++ 12 files changed, 172 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c90da7f7ed77c6ad067…

1 0

Alexandre Julliard : kernel32: Move volume functions to kernelbase.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: e36a9c459d7d1644f401eb49f3684c6fe42f7948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36a9c459d7d1644f401eb49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 11:54:11 2020 +0200 kernel32: Move volume functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 40 +- dlls/kernel32/volume.c | 1675 +----------------------------------- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 40 +- dlls/kernelbase/volume.c | 1777 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 1851 insertions(+), 1684 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e36a9c459d7d1644f401…

1 0

Brendan Shanks : user32: Move DisplayConfig stubs together into sysparams.c.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 91cf6d716e09976ac1667f33499930d367c7479d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91cf6d716e09976ac1667f33… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:28 2020 -0700 user32: Move DisplayConfig stubs together into sysparams.c. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 26 -------------------------- dlls/user32/sysparams.c | 44 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bed5812a47..6e1f60612b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -240,17 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * QueryDisplayConfig (USER32.@) - */ -LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, - UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, - DISPLAYCONFIG_TOPOLOGY_ID *topologyid) -{ - FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); - return ERROR_CALL_NOT_IMPLEMENTED; -} - /*********************************************************************** * RegisterSystemThread (USER32.@) */ @@ -545,21 +534,6 @@ BOOL WINAPI IsWindowRedirectedForPrint( HWND hwnd ) return FALSE; } -/********************************************************************** - * GetDisplayConfigBufferSizes [USER32.@] - */ -LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) -{ - FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); - - if (!num_path_info || !num_mode_info) - return ERROR_INVALID_PARAMETER; - - *num_path_info = 0; - *num_mode_info = 0; - return ERROR_NOT_SUPPORTED; -} - /********************************************************************** * RegisterPointerDeviceNotifications [USER32.@] */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 043742a9bf..c43720eca8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3345,15 +3345,6 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND } -/*********************************************************************** - * DisplayConfigGetDeviceInfo (USER32.@) - */ -LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) -{ - FIXME("stub: %p\n", packet); - return ERROR_NOT_SUPPORTED; -} - /*********************************************************************** * EnumDisplaySettingsW (USER32.@) * @@ -4494,3 +4485,38 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) { return TRUE; } + +/********************************************************************** + * GetDisplayConfigBufferSizes (USER32.@) + */ +LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) +{ + FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); + + if (!num_path_info || !num_mode_info) + return ERROR_INVALID_PARAMETER; + + *num_path_info = 0; + *num_mode_info = 0; + return ERROR_NOT_SUPPORTED; +} + +/*********************************************************************** + * QueryDisplayConfig (USER32.@) + */ +LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, + UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, + DISPLAYCONFIG_TOPOLOGY_ID *topologyid) +{ + FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DisplayConfigGetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) +{ + FIXME("stub: %p\n", packet); + return ERROR_NOT_SUPPORTED; +}

1 0