December 2020 - Wine-commits

Jacek Caban : condrv: Don't requre write access for IOCTL_CONDRV_CTRL_EVENT ioctl.
by Alexandre Julliard 30 Dec '20

30 Dec '20

Module: wine Branch: master Commit: 2265db40e73e35723bd9ef284a0123070fe86814 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2265db40e73e35723bd9ef28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 29 23:05:38 2020 +0100 condrv: Don't requre write access for IOCTL_CONDRV_CTRL_EVENT ioctl. Fixes propagating CONTROL_C_EXIT exception from console server handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50304 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index c20b22e061f..5c3c550070d 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -38,7 +38,7 @@ #define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 18, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 19, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 19, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_CONDRV_BEEP CTL_CODE(FILE_DEVICE_CONSOLE, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_CONDRV_FLUSH CTL_CODE(FILE_DEVICE_CONSOLE, 21, METHOD_BUFFERED, FILE_ANY_ACCESS)

1 0

Jacek Caban : conhost: Ignore CONTROL_C_EXIT exceptions in Unix mode.
by Alexandre Julliard 30 Dec '20

30 Dec '20

Module: wine Branch: master Commit: d7d315ddf40b22158fba76b1156ffe09770103de URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7d315ddf40b22158fba76b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 29 23:05:45 2020 +0100 conhost: Ignore CONTROL_C_EXIT exceptions in Unix mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50304 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 4b156f21ea3..3e41577a44b 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2674,6 +2674,14 @@ static int main_loop( struct console *console, HANDLE signal ) return 0; } +static LONG WINAPI handle_ctrl_c( EXCEPTION_POINTERS *eptr ) +{ + if (eptr->ExceptionRecord->ExceptionCode != CONTROL_C_EXIT) return EXCEPTION_CONTINUE_SEARCH; + /* In Unix mode, ignore ctrl c exceptions. Signals are sent it to clients as well and we will + * terminate the usual way if they don't handle it. */ + return EXCEPTION_CONTINUE_EXECUTION; +} + int __cdecl wmain(int argc, WCHAR *argv[]) { int headless = 0, i, width = 0, height = 0; @@ -2763,5 +2771,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) ? si.wShowWindow : SW_SHOW ); } + if (console.is_unix) RtlAddVectoredExceptionHandler( FALSE, handle_ctrl_c ); + return main_loop( &console, signal ); }

1 0

Alistair Leslie-Hughes : include: Add DBACCESSORFLAGSENUM/DBBINDSTATUSENUM values.
by Alexandre Julliard 30 Dec '20

30 Dec '20

Module: wine Branch: master Commit: 345ba70276229d9d3c3a7b5e1e1c9fe6a1abc1bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=345ba70276229d9d3c3a7b5e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 30 19:17:39 2020 +1100 include: Add DBACCESSORFLAGSENUM/DBBINDSTATUSENUM values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/access.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/access.idl b/include/access.idl index 5ade09b85ce..fe1f3baddd7 100644 --- a/include/access.idl +++ b/include/access.idl @@ -32,6 +32,27 @@ interface IAccessor : IUnknown typedef DWORD DBBINDSTATUS; + enum DBACCESSORFLAGSENUM + { + DBACCESSOR_INVALID = 0x00, + DBACCESSOR_PASSBYREF = 0x01, + DBACCESSOR_ROWDATA = 0x02, + DBACCESSOR_PARAMETERDATA = 0x04, + DBACCESSOR_OPTIMIZED = 0x08, + DBACCESSOR_INHERITED = 0x10, + }; + + enum DBBINDSTATUSENUM + { + DBBINDSTATUS_OK = 0, + DBBINDSTATUS_BADORDINAL = 1, + DBBINDSTATUS_UNSUPPORTEDCONVERSION = 2, + DBBINDSTATUS_BADBINDINFO = 3, + DBBINDSTATUS_BADSTORAGEFLAGS = 4, + DBBINDSTATUS_NOINTERFACE = 5, + DBBINDSTATUS_MULTIPLESTORAGE = 6, + }; + [local] HRESULT AddRefAccessor([in] HACCESSOR hAccessor, [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount);

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 30 Dec '20

30 Dec '20

Module: wine Branch: master Commit: 784cb2060ab63076adc349dcb1d15a6cb5eb2bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=784cb2060ab63076adc349dc… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Dec 30 10:17:58 2020 +0200 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.fi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 30311d82807..b2c6524548e 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -39,7 +39,7 @@ Winen kääntämiseen tarvitaan jokin seuraavista: FreeBSD 8.0 tai uudempi Solaris x86 9 tai uudempi NetBSD-current - Mac OS X 10.5 tai uudempi + Mac OS X 10.8 tai uudempi Wine vaatii kerneliltä tuen säikeille. Tämän takia toistaiseksi vain yllä mainittuja käyttöjärjestelmiä tuetaan; tulevaisuudessa saatetaan lisätä tuki @@ -59,8 +59,9 @@ Tietoa NetBSD:lle: USER_LDT, SYSVSHM, SYSVSEM ja SYSVMSG täytyy aktivoida kernelistä. Tietoa Mac OS X:lle: - Winen onnistuneeseen kääntämiseen x86:lla tarvitaan Xcode 2.4 tai uudempi. - Mac-ajuri vaatii OS X 10.6:n tai uudemman, ja sitä ei käännetä 10.5:ssä. + Winen kääntämiseen tarvitaan Xcode Command Line Tools tai Apple cctools. + Vähimmäisversiot ovat clang 3.8, MacOSX10.10.sdk ja mingw-w64 v8. + MacOSX10.14.sdk ja myöhemmät sopivat vain wine64:n kääntämiseen. Tuetut tiedostojärjestelmät:

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard 29 Dec '20

29 Dec '20

Module: wine Branch: master Commit: 1ad1d5c143abab4457b6e3e0874bbaf730c04e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ad1d5c143abab4457b6e3e0… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Dec 29 16:39:45 2020 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 1684 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 840 insertions(+), 844 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ad1d5c143abab4457b6…

1 0

Alex Henrie : winebus: Remove redundant preprocessor check for libsdl2.
by Alexandre Julliard 29 Dec '20

29 Dec '20

Module: wine Branch: master Commit: 3e8b27fef3fb31dc3cc1476763a2a1a033d9ec5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8b27fef3fb31dc3cc14767… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 28 23:14:05 2020 -0700 winebus: Remove redundant preprocessor check for libsdl2. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index fa691011fde..8f48b44eb95 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -69,7 +69,6 @@ static void *sdl_handle = NULL; static HANDLE deviceloop_handle; static UINT quit_event = -1; -#ifdef SONAME_LIBSDL2 #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(SDL_GetError); MAKE_FUNCPTR(SDL_Init); @@ -109,7 +108,6 @@ MAKE_FUNCPTR(SDL_memset); MAKE_FUNCPTR(SDL_GameControllerAddMapping); MAKE_FUNCPTR(SDL_RegisterEvents); MAKE_FUNCPTR(SDL_PushEvent); -#endif static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetVendor)(SDL_Joystick * joystick);

1 0

Esme Povirk : user32/tests: Don't kill explorer to test shell window.
by Alexandre Julliard 29 Dec '20

29 Dec '20

Module: wine Branch: master Commit: bc2e193d9ade47660e17bf720ec68d32e9984846 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc2e193d9ade47660e17bf72… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Dec 28 15:14:45 2020 -0600 user32/tests: Don't kill explorer to test shell window. Killing explorer breaks later tests. We can create a new desktop without a shell instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48142 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 96 +++++++++++++------------------------------------ 1 file changed, 24 insertions(+), 72 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 843da8900f1..c9d2819e1a9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1288,87 +1288,24 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) return CallNextHookEx(hhook, nCode, wParam, lParam); } -static const WCHAR winlogonW[] = - {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'W','i','n','l','o','g','o','n',0}; -static const WCHAR autorestartshellW[] = - {'A','u','t','o','R','e','s','t','a','r','t','S','h','e','l','l',0}; - -static DWORD get_autorestart(void) -{ - DWORD type, val, len = sizeof(val); - REGSAM access = KEY_ALL_ACCESS|KEY_WOW64_64KEY; - HKEY hkey; - LONG res; - - if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, winlogonW, 0, 0, 0, access, NULL, &hkey, 0 )) return 0; - res = RegQueryValueExW( hkey, autorestartshellW, NULL, &type, (BYTE *)&val, &len ); - RegCloseKey( hkey ); - return (!res && type == REG_DWORD) ? val : 0; -} - -static BOOL set_autorestart( DWORD val ) -{ - REGSAM access = KEY_ALL_ACCESS|KEY_WOW64_64KEY; - HKEY hkey; - LONG res; - - if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, winlogonW, 0, 0, 0, access, NULL, &hkey, 0 )) return FALSE; - res = RegSetValueExW( hkey, autorestartshellW, 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); - RegCloseKey( hkey ); - return !res; -} - -static void test_shell_window(void) +static DWORD WINAPI test_shell_window_thread(LPVOID param) { BOOL ret; - DWORD error, restart = get_autorestart(); HMODULE hinst, hUser32; BOOL (WINAPI*SetShellWindow)(HWND); HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; HWND shellWindow, nextWnd; + HDESK testDesktop = (HDESK)param; - if (restart && !set_autorestart(0)) - { - skip("cannot disable automatic shell restart (needs admin rights\n"); - return; - } + SetThreadDesktop(testDesktop); shellWindow = GetShellWindow(); hinst = GetModuleHandleA(NULL); hUser32 = GetModuleHandleA("user32"); - SetShellWindow = (void *)GetProcAddress(hUser32, "SetShellWindow"); - - if (shellWindow) { - DWORD pid; - HANDLE hProcess; - - GetWindowThreadProcessId(shellWindow, &pid); - hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); - if (!hProcess) - { - skip( "cannot get access to shell process\n" ); - set_autorestart(restart); - return; - } - - SetLastError(0xdeadbeef); - ret = DestroyWindow(shellWindow); - error = GetLastError(); + ok(shellWindow == NULL, "Newly created desktop has a shell window %p\n", shellWindow); - ok(!ret, "DestroyWindow(shellWindow)\n"); - /* passes on Win XP, but not on Win98 */ - ok(error==ERROR_ACCESS_DENIED || error == 0xdeadbeef, - "got %u after DestroyWindow(shellWindow)\n", error); - - /* close old shell instance */ - ret = TerminateProcess(hProcess, 0); - ok(ret, "termination of previous shell process failed: GetLastError()=%d\n", GetLastError()); - WaitForSingleObject(hProcess, INFINITE); /* wait for termination */ - CloseHandle(hProcess); - } + SetShellWindow = (void *)GetProcAddress(hUser32, "SetShellWindow"); hwnd1 = CreateWindowExA(0, "#32770", "TEST1", WS_OVERLAPPEDWINDOW/*|WS_VISIBLE*/, 100, 100, 300, 200, 0, 0, hinst, 0); @@ -1381,8 +1318,8 @@ static void test_shell_window(void) ok(!ret, "second call to SetShellWindow(hwnd1)\n"); ret = SetShellWindow(0); - error = GetLastError(); /* passes on Win XP, but not on Win98 + DWORD error = GetLastError(); ok(!ret, "reset shell window by SetShellWindow(0)\n"); ok(error==ERROR_INVALID_WINDOW_HANDLE, "ERROR_INVALID_WINDOW_HANDLE after SetShellWindow(0)\n"); */ @@ -1442,7 +1379,24 @@ static void test_shell_window(void) DestroyWindow(hwnd3); DestroyWindow(hwnd4); DestroyWindow(hwnd5); - set_autorestart(restart); + + return 0; +} + +static void test_shell_window(void) +{ + HDESK hdesk; + HANDLE hthread; + + hdesk = CreateDesktopA("winetest", NULL, NULL, 0, GENERIC_ALL, NULL); + + hthread = CreateThread(NULL, 0, test_shell_window_thread, (LPVOID)hdesk, 0, NULL); + + WaitForSingleObject(hthread, INFINITE); + + DeleteObject(hthread); + + CloseDesktop(hdesk); } /************** MDI test ****************/ @@ -12075,7 +12029,5 @@ START_TEST(win) */ test_topmost(); - /* Execute the SetShellWindow() test last, since it kills explorer and that - * breaks a lot of things. */ test_shell_window(); }

1 0

Qijia Liu : winedbg: Remove arm_disasm_branchreg.
by Alexandre Julliard 29 Dec '20

29 Dec '20

Module: wine Branch: master Commit: c20d49026fbec0abc8735e0cdefed0ea41d65490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c20d49026fbec0abc8735e0c… Author: Qijia Liu <liumeo(a)pku.edu.cn> Date: Tue Dec 29 17:45:52 2020 +0000 winedbg: Remove arm_disasm_branchreg. According to A8.8.18 of ARM DDI 0406C.d, b instruction only takes immediate argument. Signed-off-by: Qijia Liu <liumeo(a)pku.edu.cn> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 28edaa14abe..be4b310032c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -214,12 +214,6 @@ static UINT arm_disasm_halfwordtrans(UINT inst, ADDRESS64 *addr) return 0; } -static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) -{ - dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); - return 0; -} - static UINT arm_disasm_branchxchg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tbx%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); @@ -1478,7 +1472,6 @@ static const struct inst_arm tbl_arm[] = { { 0x0f8000f0, 0x00800090, arm_disasm_longmul }, { 0x0fb00ff0, 0x01000090, arm_disasm_swp }, { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, - { 0x0ffffff0, 0x012fff00, arm_disasm_branchreg }, { 0x0ffffff0, 0x012fff10, arm_disasm_branchxchg }, { 0x0fbf0fff, 0x010f0000, arm_disasm_mrstrans }, { 0x0dbef000, 0x0128f000, arm_disasm_msrtrans },

1 0

Paul Gofman : ntdll: Use WINAPI calling convention for stub_entry_point().
by Alexandre Julliard 29 Dec '20

29 Dec '20

Module: wine Branch: master Commit: c181a0ad59192a45cf913315b8f38e490e74ad7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c181a0ad59192a45cf913315… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 29 17:05:45 2020 +0300 ntdll: Use WINAPI calling convention for stub_entry_point(). Otherwise it ends up being stdcall function in the gcc PE build and cdecl in ELF while allocate_stub() currently assumes cdecl. Fixes missing function details output on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 45ad496fd64..9b7e30b2c2b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -295,7 +295,7 @@ static inline BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, * * Entry point for stub functions. */ -static void stub_entry_point( const char *dll, const char *name, void *ret_addr ) +static void WINAPI stub_entry_point( const char *dll, const char *name, void *ret_addr ) { EXCEPTION_RECORD rec; @@ -406,15 +406,15 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->name = name; stub->entry = stub_entry_point; #else - stub->movq_rdi[0] = 0x48; /* movq $dll,%rdi */ - stub->movq_rdi[1] = 0xbf; + stub->movq_rdi[0] = 0x48; /* movq $dll,%rcx */ + stub->movq_rdi[1] = 0xb9; stub->dll = dll; - stub->movq_rsi[0] = 0x48; /* movq $name,%rsi */ - stub->movq_rsi[1] = 0xbe; + stub->movq_rsi[0] = 0x48; /* movq $name,%rdx */ + stub->movq_rsi[1] = 0xba; stub->name = name; - stub->movq_rsp_rdx[0] = 0x48; /* movq (%rsp),%rdx */ + stub->movq_rsp_rdx[0] = 0x4c; /* movq (%rsp),%r8 */ stub->movq_rsp_rdx[1] = 0x8b; - stub->movq_rsp_rdx[2] = 0x14; + stub->movq_rsp_rdx[2] = 0x04; stub->movq_rsp_rdx[3] = 0x24; stub->movq_rax[0] = 0x48; /* movq $entry, %rax */ stub->movq_rax[1] = 0xb8;

1 0

Paul Gofman : user32: Add stub for SetDisplayConfig().
by Alexandre Julliard 29 Dec '20

29 Dec '20

Module: wine Branch: master Commit: aaf05c106e5d212943266ae0fa7bc62ee285e273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf05c106e5d212943266ae0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 29 17:10:57 2020 +0300 user32: Add stub for SetDisplayConfig(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50420 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 12 ++++++++++++ dlls/user32/user32.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a620116053a..55d6d7e53a7 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4794,3 +4794,15 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) return ERROR_INVALID_PARAMETER; } } + +/*********************************************************************** + * SetDisplayConfig (USER32.@) + */ +LONG WINAPI SetDisplayConfig(UINT32 path_info_count, DISPLAYCONFIG_PATH_INFO *path_info, UINT32 mode_info_count, + DISPLAYCONFIG_MODE_INFO *mode_info, UINT32 flags) +{ + FIXME("path_info_count %u, path_info %p, mode_info_count %u, mode_info %p, flags %#x stub.\n", + path_info_count, path_info, mode_info_count, mode_info, flags); + + return ERROR_SUCCESS; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8051ae3f767..4ef75247d71 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -663,6 +663,7 @@ @ stdcall SetDeskWallPaper(str) # @ stub SetDeskWallpaper # @ stub SetDesktopBitmap +@ stdcall SetDisplayConfig(long ptr long ptr long) @ stdcall SetDlgItemInt(long long long long) @ stdcall SetDlgItemTextA(long long str) @ stdcall SetDlgItemTextW(long long wstr)

1 0