- Wine-Commits - list.winehq.org

Zebediah Figura : user32: Map DEV_BROADCAST_DEVICEINTERFACE to ANSI for registered device notifications.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: d05b88dd88845d9b4b986046be62e6c4a0236518 URL: https://gitlab.winehq.org/wine/wine/-/commit/d05b88dd88845d9b4b986046be62e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 7 23:07:28 2023 -0600 user32: Map DEV_BROADCAST_DEVICEINTERFACE to ANSI for registered device notifications. --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ++-- dlls/user32/input.c | 46 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ff93cfc98ec..c4521ed652a 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1400,7 +1400,7 @@ static LRESULT WINAPI device_notify_proc(HWND window, UINT message, WPARAM wpara if (IsEqualGUID(&iface->dbcc_classguid, &bus_class)) { ++got_bus_arrival; - todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\ROOT#WINETEST#0#{deadbeef-29ef-4538-a5fd-b69573a362c1}"), + ok(!strcmp(iface->dbcc_name, "\\\\?\\ROOT#WINETEST#0#{deadbeef-29ef-4538-a5fd-b69573a362c1}"), "got name %s\n", debugstr_a(iface->dbcc_name)); } else if (IsEqualGUID(&iface->dbcc_classguid, &child_class)) @@ -1428,7 +1428,7 @@ static LRESULT WINAPI device_notify_proc(HWND window, UINT message, WPARAM wpara if (IsEqualGUID(&iface->dbcc_classguid, &bus_class)) { ++got_bus_removal; - todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\ROOT#WINETEST#0#{deadbeef-29ef-4538-a5fd-b69573a362c1}"), + ok(!strcmp(iface->dbcc_name, "\\\\?\\ROOT#WINETEST#0#{deadbeef-29ef-4538-a5fd-b69573a362c1}"), "got name %s\n", debugstr_a(iface->dbcc_name)); } else if (IsEqualGUID(&iface->dbcc_classguid, &child_class)) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 3b0a13842c8..2f4dc06f6ce 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -495,12 +495,52 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout ) } -static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +static DWORD CALLBACK devnotify_window_callbackW(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) { SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); return 0; } +static DWORD CALLBACK devnotify_window_callbackA(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + if (flags & 0x8000) + { + switch (header->dbch_devicetype) + { + case DBT_DEVTYP_DEVICEINTERFACE: + { + const DEV_BROADCAST_DEVICEINTERFACE_W *ifaceW = (const DEV_BROADCAST_DEVICEINTERFACE_W *)header; + size_t lenW = wcslen( ifaceW->dbcc_name ); + DEV_BROADCAST_DEVICEINTERFACE_A *ifaceA; + DWORD lenA; + + if (!(ifaceA = malloc( offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[lenW * 3 + 1]) ))) + return 0; + lenA = WideCharToMultiByte( CP_ACP, 0, ifaceW->dbcc_name, lenW + 1, + ifaceA->dbcc_name, lenW * 3 + 1, NULL, NULL ); + + ifaceA->dbcc_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[lenA + 1]); + ifaceA->dbcc_devicetype = ifaceW->dbcc_devicetype; + ifaceA->dbcc_reserved = ifaceW->dbcc_reserved; + ifaceA->dbcc_classguid = ifaceW->dbcc_classguid; + SendMessageTimeoutA( handle, WM_DEVICECHANGE, flags, (LPARAM)ifaceA, SMTO_ABORTIFHUNG, 2000, NULL ); + free( ifaceA ); + return 0; + } + + default: + FIXME( "unimplemented W to A mapping for %#lx\n", header->dbch_devicetype ); + /* fall through */ + case DBT_DEVTYP_HANDLE: + case DBT_DEVTYP_OEM: + break; + } + } + + SendMessageTimeoutA( handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL ); + return 0; +} + static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) { FIXME("Support for service handles is not yet implemented!\n"); @@ -580,8 +620,10 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWOR if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) details.cb = devnotify_service_callback; + else if (IsWindowUnicode( handle )) + details.cb = devnotify_window_callbackW; else - details.cb = devnotify_window_callback; + details.cb = devnotify_window_callbackA; return I_ScRegisterDeviceNotification( &details, filter, 0 ); }

1 0

Zhiyi Zhang : include: Add dcomptypes.idl.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 74e6345712fe97c6a21fe48f877eb012577ae6d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/74e6345712fe97c6a21fe48f877eb0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 2 21:11:34 2023 +0800 include: Add dcomptypes.idl. --- include/Makefile.in | 1 + include/dcomptypes.idl | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 49b5f7c4b01..07917b4923d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -182,6 +182,7 @@ SOURCES = \ dciddi.h \ dciman.h \ dcommon.idl \ + dcomptypes.idl \ dde.h \ dde.rh \ ddeml.h \ diff --git a/include/dcomptypes.idl b/include/dcomptypes.idl new file mode 100644 index 00000000000..2ee6b17cde3 --- /dev/null +++ b/include/dcomptypes.idl @@ -0,0 +1,77 @@ +/* + * Copyright 2023 Zhiyi Zhang for CodeWeavers + * + * 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 + */ + +import "dxgitype.idl"; +import "dxgi1_5.idl"; + +enum DCOMPOSITION_BITMAP_INTERPOLATION_MODE +{ + DCOMPOSITION_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0, + DCOMPOSITION_BITMAP_INTERPOLATION_MODE_LINEAR = 1, + DCOMPOSITION_BITMAP_INTERPOLATION_MODE_INHERIT = 0xffffffff +}; + +enum DCOMPOSITION_BORDER_MODE +{ + DCOMPOSITION_BORDER_MODE_SOFT = 0, + DCOMPOSITION_BORDER_MODE_HARD = 1, + DCOMPOSITION_BORDER_MODE_INHERIT = 0xffffffff +}; + +enum DCOMPOSITION_COMPOSITE_MODE +{ + DCOMPOSITION_COMPOSITE_MODE_SOURCE_OVER = 0, + DCOMPOSITION_COMPOSITE_MODE_DESTINATION_INVERT = 1, + DCOMPOSITION_COMPOSITE_MODE_MIN_BLEND = 2, + DCOMPOSITION_COMPOSITE_MODE_INHERIT = 0xffffffff +}; + +enum DCOMPOSITION_BACKFACE_VISIBILITY +{ + DCOMPOSITION_BACKFACE_VISIBILITY_VISIBLE = 0, + DCOMPOSITION_BACKFACE_VISIBILITY_HIDDEN = 1, + DCOMPOSITION_BACKFACE_VISIBILITY_INHERIT = 0xffffffff +}; + +enum DCOMPOSITION_OPACITY_MODE +{ + DCOMPOSITION_OPACITY_MODE_LAYER = 0, + DCOMPOSITION_OPACITY_MODE_MULTIPLY = 1, + DCOMPOSITION_OPACITY_MODE_INHERIT = 0xffffffff +}; + +enum DCOMPOSITION_DEPTH_MODE +{ + DCOMPOSITION_DEPTH_MODE_TREE = 0, + DCOMPOSITION_DEPTH_MODE_SPATIAL = 1, + DCOMPOSITION_DEPTH_MODE_SORTED = 3, + DCOMPOSITION_DEPTH_MODE_INHERIT = 0xffffffff +}; + +typedef struct +{ + LARGE_INTEGER lastFrameTime; + DXGI_RATIONAL currentCompositionRate; + LARGE_INTEGER currentTime; + LARGE_INTEGER timeFrequency; + LARGE_INTEGER nextEstimatedFrameTime; +} DCOMPOSITION_FRAME_STATISTICS; + +cpp_quote("#define COMPOSITIONOBJECT_READ 0x0001L") +cpp_quote("#define COMPOSITIONOBJECT_WRITE 0x0002L") +cpp_quote("#define COMPOSITIONOBJECT_ALL_ACCESS (COMPOSITIONOBJECT_READ | COMPOSITIONOBJECT_WRITE)")

1 0

Zhiyi Zhang : include: Add dcomp.idl.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 98336958555d653c66385e94a812d3dfdf8b41b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/98336958555d653c66385e94a812d3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 2 21:22:35 2023 +0800 include: Add dcomp.idl. Note that overloaded C++ methods are renamed to avoid conflicts. --- include/Makefile.in | 1 + include/dcomp.idl | 442 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 443 insertions(+)

1 0

Zhiyi Zhang : include: Add DirectComposition error codes.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 58427faace44e9e5f87323073ebf3f65352e8461 URL: https://gitlab.winehq.org/wine/wine/-/commit/58427faace44e9e5f87323073ebf3f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 17 11:21:29 2023 +0800 include: Add DirectComposition error codes. --- include/winerror.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index fb44eaacbed..ccb58199101 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -4023,6 +4023,10 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DXGI_ERROR_HW_PROTECTION_OUTOFMEMORY _HRESULT_TYPEDEF_(0x887a0030) #define DXGI_ERROR_MODE_CHANGE_IN_PROGRESS _HRESULT_TYPEDEF_(0x887a0025) +#define DCOMPOSITION_ERROR_WINDOW_ALREADY_COMPOSED _HRESULT_TYPEDEF_(0x88980800) +#define DCOMPOSITION_ERROR_SURFACE_BEING_RENDERED _HRESULT_TYPEDEF_(0x88980801) +#define DCOMPOSITION_ERROR_SURFACE_NOT_BEING_RENDERED _HRESULT_TYPEDEF_(0x88980802) + #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002)

1 0

Zhiyi Zhang : include: Add dcompanimation.idl.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: c10568fc31445ba310e6067fb29e0b8fd9f1ea0e URL: https://gitlab.winehq.org/wine/wine/-/commit/c10568fc31445ba310e6067fb29e0b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 20 16:48:00 2023 +0800 include: Add dcompanimation.idl. --- include/Makefile.in | 1 + include/dcompanimation.idl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 07917b4923d..2284a902b5f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -182,6 +182,7 @@ SOURCES = \ dciddi.h \ dciman.h \ dcommon.idl \ + dcompanimation.idl \ dcomptypes.idl \ dde.h \ dde.rh \ diff --git a/include/dcompanimation.idl b/include/dcompanimation.idl new file mode 100644 index 00000000000..dac6a2615ed --- /dev/null +++ b/include/dcompanimation.idl @@ -0,0 +1,36 @@ +/* + * Copyright 2023 Zhiyi Zhang for CodeWeavers + * + * 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 + */ + +import "wtypes.idl"; +import "unknwn.idl"; + +[ + local, + object, + uuid(cbfd91d9-51b2-45e4-b3de-d19ccfb863c5), + pointer_default(unique) +] +interface IDCompositionAnimation : IUnknown +{ + HRESULT Reset(); + HRESULT SetAbsoluteBeginTime([in] LARGE_INTEGER time); + HRESULT AddCubic([in] double offset, [in] float constant_coefficient, [in] float linear_coefficient, [in] float quadratic_coefficient, [in] float cubic_coefficient); + HRESULT AddSinusoidal([in] double offset, [in] float bias, [in] float amplitude, [in] float frequency, [in] float phase); + HRESULT AddRepeat([in] double offset, [in] double duration); + HRESULT End([in] double offset, [in] float value); +};

1 0

Alexandre Julliard : notepad: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: e1f18466112790c9f0ddbc48488b227d2556b986 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1f18466112790c9f0ddbc48488b22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:39:31 2023 +0100 notepad: Use standard va_list instead of __ms_va_list. --- programs/notepad/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index c4e99013fe6..d9269b31b93 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -169,7 +169,7 @@ static int AlertUnicodeCharactersLost(LPCWSTR szFileName) load_encoding_name(ENCODING_ANSI, szEnc, ARRAY_SIZE(szEnc)); args[0] = (DWORD_PTR)szFileName; args[1] = (DWORD_PTR)szEnc; - FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, szMsgFormat, 0, 0, (LPWSTR)&szMsg, 0, (__ms_va_list*)args); + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, szMsgFormat, 0, 0, (LPWSTR)&szMsg, 0, (va_list *)args); rc = MessageBoxW(Globals.hMainWnd, szMsg, szCaption, MB_OKCANCEL|MB_ICONEXCLAMATION); LocalFree(szMsg);

1 0

Alexandre Julliard : taskmgr: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: dbfeb4b7f4717ac9da8bc6ecf38bb91afa2c424e URL: https://gitlab.winehq.org/wine/wine/-/commit/dbfeb4b7f4717ac9da8bc6ecf38bb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:40:14 2023 +0100 taskmgr: Use standard va_list instead of __ms_va_list. --- programs/taskmgr/perfpage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 4689d4e3312..505846e3b4f 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -188,8 +188,7 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) args[0] = CommitChargeTotal; args[1] = CommitChargeLimit; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - wszMemUsage, 0, 0, Text, - ARRAY_SIZE(Text), (__ms_va_list*)args); + wszMemUsage, 0, 0, Text, ARRAY_SIZE(Text), (va_list *)args); SendMessageW(hStatusWnd, SB_SETTEXTW, 2, (LPARAM)Text); /*

1 0

Alexandre Julliard : winefile: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 297f7cb37e937ddeb3b50a999af27dc3ac484fe6 URL: https://gitlab.winehq.org/wine/wine/-/commit/297f7cb37e937ddeb3b50a999af27d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:40:27 2023 +0100 winefile: Use standard va_list instead of __ms_va_list. --- programs/winefile/winefile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 8ad785b924a..6d18954e05a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2405,8 +2405,7 @@ static void set_space_status(void) args[1] = (DWORD_PTR)StrFormatByteSizeW(ulTotalBytes.QuadPart, b2, ARRAY_SIZE(b2)); FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, ARRAY_SIZE(buffer), - (__ms_va_list*)args); + RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, ARRAY_SIZE(buffer), (va_list *)args); } else lstrcpyW(buffer, sQMarks);

1 0

Alexandre Julliard : include: Move __builtin_ms_va_list definitions to vadefs.h.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: f4c3801495f4fe17a10e2f21339de3b511c78339 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4c3801495f4fe17a10e2f21339de3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:41:45 2023 +0100 include: Move __builtin_ms_va_list definitions to vadefs.h. --- include/msvcrt/corecrt.h | 12 ------------ include/msvcrt/vadefs.h | 10 +++++++++- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 4dc2ca53208..bec9c8911c2 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -122,18 +122,6 @@ # endif #endif -#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) -# include <stdarg.h> -# undef va_list -# undef va_start -# undef va_end -# undef va_copy -# define va_list __builtin_ms_va_list -# define va_start(list,arg) __builtin_ms_va_start(list,arg) -# define va_end(list) __builtin_ms_va_end(list) -# define va_copy(dest,src) __builtin_ms_va_copy(dest,src) -#endif - #ifndef WINAPIV # if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define WINAPIV __attribute__((pcs("aapcs"))) diff --git a/include/msvcrt/vadefs.h b/include/msvcrt/vadefs.h index 2a612fc055c..462c2d6815f 100644 --- a/include/msvcrt/vadefs.h +++ b/include/msvcrt/vadefs.h @@ -27,7 +27,15 @@ #define _ADDRESSOF(v) (&(v)) #endif -#if defined(__GNUC__) || defined(__clang__) +#if defined (__GNUC__) && (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) + +typedef __builtin_ms_va_list va_list; +#define _crt_va_start(v,l) __builtin_ms_va_start(v,l) +#define _crt_va_arg(v,l) __builtin_va_arg(v,l) +#define _crt_va_end(v) __builtin_ms_va_end(v) +#define _crt_va_copy(d,s) __builtin_ms_va_copy(d,s) + +#elif defined(__GNUC__) || defined(__clang__) typedef __builtin_va_list va_list; #define _crt_va_start(v,l) __builtin_va_start(v,l)

1 0

Alexandre Julliard : start: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: b19d3e779be2f4d6211c9293a00454154df41276 URL: https://gitlab.winehq.org/wine/wine/-/commit/b19d3e779be2f4d6211c9293a00454… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:40:02 2023 +0100 start: Use standard va_list instead of __ms_va_list. --- programs/start/start.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 62804917941..4fd6cfc4481 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -77,7 +77,7 @@ static void fatal_error(const WCHAR *msg, DWORD error_code, const WCHAR *filenam output(L": "); args[0] = (DWORD_PTR)filename; status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, - NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, (__ms_va_list *)args ); + NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, (va_list *)args ); if (!status) { WINE_ERR("FormatMessage failed\n"); @@ -99,7 +99,7 @@ static void fatal_string_error(int which, DWORD error_code, const WCHAR *filenam fatal_error(msg, error_code, filename); } - + static void fatal_string(int which) { WCHAR msg[2048];

1 0