January 2009 - Wine-Commits

Henri Verbeet : wined3d: Fix a few format specifiers in IWineD3DStateBlockImpl_Capture().
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 73e042496c255b23d99c33a085a98fd2e6807eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e042496c255b23d99c33a08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 31 16:57:10 2008 +0100 wined3d: Fix a few format specifiers in IWineD3DStateBlockImpl_Capture(). --- dlls/wined3d/stateblock.c | 81 ++++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73e042496c255b23d99c3…

1 0

Henri Verbeet : wined3d: Use slightly nicer loops in device_map_fixed_function_samplers().
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 0657e8d87a6e5efb4b036a6daa2d79084c9e0d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0657e8d87a6e5efb4b036a6da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 31 16:57:10 2008 +0100 wined3d: Use slightly nicer loops in device_map_fixed_function_samplers(). --- dlls/wined3d/device.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 06698f5..64dd866 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3671,13 +3671,16 @@ static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { int i, tex; + WORD ffu_map; device_update_fixed_function_usage_map(This); + ffu_map = This->fixed_function_usage_map; if (This->max_ffp_textures == This->max_ffp_texture_stages || - This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { - for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { - if (!(This->fixed_function_usage_map & (1 << i))) continue; + This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (!(ffu_map & 1)) continue; if (This->texUnitMap[i] != i) { device_map_stage(This, i, i); @@ -3690,8 +3693,9 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { /* Now work out the mapping */ tex = 0; - for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { - if (!(This->fixed_function_usage_map & (1 << i))) continue; + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (!(ffu_map & 1)) continue; if (This->texUnitMap[i] != tex) { device_map_stage(This, i, tex);

1 0

Austin English : kernel32/tests: Fix compile on powerpc.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: e9569d9c4ebb2995d325cedc4be280f8e6726370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9569d9c4ebb2995d325cedc4… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 31 09:20:06 2008 -0600 kernel32/tests: Fix compile on powerpc. --- dlls/kernel32/tests/loader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 5187d88..106926f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -52,6 +52,8 @@ static IMAGE_NT_HEADERS nt_header = IMAGE_FILE_MACHINE_I386, /* Machine */ #elif defined __x86_64__ IMAGE_FILE_MACHINE_AMD64, /* Machine */ +#elif defined __powerpc__ + IMAGE_FILE_MACHINE_POWERPC, /* Machine */ #else # error You must specify the machine type #endif

1 0

Alexandre Julliard : ntdll: Use INT_MAX for the semaphore count since LONG_MAX won't work on 64-bit.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 82ebebc671941af0374e2a8c3b826348c2a7af42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ebebc671941af0374e2a8c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 31 21:55:11 2008 +0100 ntdll: Use INT_MAX for the semaphore count since LONG_MAX won't work on 64-bit. --- dlls/ntdll/threadpool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index af42b30..31a1a56 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -148,7 +148,7 @@ static NTSTATUS add_work_item_to_queue(struct work_item *work_item) if (!work_item_event) { HANDLE sem; - status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, LONG_MAX); + status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, INT_MAX); if (interlocked_cmpxchg_ptr( &work_item_event, sem, 0 )) NtClose(sem); /* somebody beat us to it */ }

1 0

Andrew Talbot : advapi32: Remove unused function.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 5c8978c58ba9fa336645de728f106aa08d9d186e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8978c58ba9fa336645de728… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 31 12:17:01 2008 +0000 advapi32: Remove unused function. --- dlls/advapi32/crypt.h | 1 - dlls/advapi32/crypt_des.c | 27 --------------------------- 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index 8fb5139..3d630da 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -82,7 +82,6 @@ typedef struct tagCRYPTHASH #define MAXPROVTYPES 999 -extern unsigned char *CRYPT_DESkey8to7( unsigned char *dst, const unsigned char *key ); extern unsigned char *CRYPT_DEShash( unsigned char *dst, const unsigned char *key, const unsigned char *src ); extern unsigned char *CRYPT_DESunhash( unsigned char *dst, const unsigned char *key, diff --git a/dlls/advapi32/crypt_des.c b/dlls/advapi32/crypt_des.c index 840eb1b..2da2d77 100644 --- a/dlls/advapi32/crypt_des.c +++ b/dlls/advapi32/crypt_des.c @@ -252,33 +252,6 @@ static void xor( unsigned char *dst, const unsigned char *a, const unsigned char dst[i] = a[i] ^ b[i]; } -unsigned char *CRYPT_DESkey8to7( unsigned char *dst, const unsigned char *key ) -{ - int i; - unsigned char tmp[7]; - static const unsigned char map8to7[56] = - { - 0, 1, 2, 3, 4, 5, 6, - 8, 9, 10, 11, 12, 13, 14, - 16, 17, 18, 19, 20, 21, 22, - 24, 25, 26, 27, 28, 29, 30, - 32, 33, 34, 35, 36, 37, 38, - 40, 41, 42, 43, 44, 45, 46, - 48, 49, 50, 51, 52, 53, 54, - 56, 57, 58, 59, 60, 61, 62 - }; - - if ((dst == NULL) || (key == NULL)) - return NULL; - - Permute( tmp, key, map8to7, 7 ); - - for (i = 0; i < 7; i++) - dst[i] = tmp[i]; - - return dst; -} - unsigned char *CRYPT_DEShash( unsigned char *dst, const unsigned char *key, const unsigned char *src ) { int i;

1 0

Christian Costa : ddraw: Display fixme only once in IDirectDrawImpl_WaitForVerticalBlank.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 3b64f895b1b8c703c730d25dca24c0b8ae4dd0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b64f895b1b8c703c730d25dc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 31 13:15:05 2008 +0100 ddraw: Display fixme only once in IDirectDrawImpl_WaitForVerticalBlank. --- dlls/ddraw/ddraw.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8033b15..7024a0f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1107,7 +1107,14 @@ IDirectDrawImpl_WaitForVerticalBlank(IDirectDraw7 *iface, HANDLE h) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); - FIXME("(%p)->(%x,%p): Stub\n", This, Flags, h); + static BOOL hide = FALSE; + + /* This function is called often, so print the fixme only once */ + if(!hide) + { + FIXME("(%p)->(%x,%p): Stub\n", This, Flags, h); + hide = TRUE; + } /* MSDN says DDWAITVB_BLOCKBEGINEVENT is not supported */ if(Flags & DDWAITVB_BLOCKBEGINEVENT)

1 0

Alexandre Julliard : kernel32: Convert FormatMessageA/ W to use an MS ABI vararg list for x86_64.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 5f36d0239f494af0cb3a219aebde6803f66c534b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f36d0239f494af0cb3a219ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 31 20:52:42 2008 +0100 kernel32: Convert FormatMessageA/W to use an MS ABI vararg list for x86_64. --- dlls/kernel32/format_msg.c | 4 ++-- dlls/ntdll/resource.c | 2 +- dlls/shell32/shellord.c | 12 ++++++------ dlls/shell32/shlfileop.c | 2 +- dlls/shlwapi/ordinal.c | 6 +++--- include/winbase.h | 4 ++-- include/winternl.h | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 0920d66..41a2317 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -135,7 +135,7 @@ DWORD WINAPI FormatMessageA( DWORD dwLanguageId, LPSTR lpBuffer, DWORD nSize, - va_list* _args ) + __ms_va_list* _args ) { LPDWORD args=(LPDWORD)_args; DWORD ret = 0; @@ -356,7 +356,7 @@ DWORD WINAPI FormatMessageW( DWORD dwLanguageId, LPWSTR lpBuffer, DWORD nSize, - va_list* _args ) + __ms_va_list* _args ) { LPDWORD args=(LPDWORD)_args; #if defined(__i386__) || defined(__sparc__) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 4a8b260..5f3e845 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -438,7 +438,7 @@ NTSTATUS WINAPI RtlFindMessage( HMODULE hmod, ULONG type, ULONG lang, */ NTSTATUS WINAPI RtlFormatMessage( LPWSTR Message, UCHAR MaxWidth, BOOLEAN IgnoreInserts, BOOLEAN Ansi, - BOOLEAN ArgumentIsArray, va_list * Arguments, + BOOLEAN ArgumentIsArray, __ms_va_list * Arguments, LPWSTR Buffer, ULONG BufferSize ) { FIXME("(%s, %u, %s, %s, %s, %p, %p, %d)\n", debugstr_w(Message), diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index a945569..7893445 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -356,10 +356,10 @@ int WINAPIV ShellMessageBoxW( WCHAR szText[100],szTitle[100]; LPCWSTR pszText = szText, pszTitle = szTitle; LPWSTR pszTemp; - va_list args; + __ms_va_list args; int ret; - va_start(args, uType); + __ms_va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ TRACE("(%p,%p,%p,%p,%08x)\n", @@ -378,7 +378,7 @@ int WINAPIV ShellMessageBoxW( FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args); - va_end(args); + __ms_va_end(args); ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType); LocalFree((HLOCAL)pszTemp); @@ -414,10 +414,10 @@ int WINAPIV ShellMessageBoxA( char szText[100],szTitle[100]; LPCSTR pszText = szText, pszTitle = szTitle; LPSTR pszTemp; - va_list args; + __ms_va_list args; int ret; - va_start(args, uType); + __ms_va_start(args, uType); /* wvsprintfA(buf,fmt, args); */ TRACE("(%p,%p,%p,%p,%08x)\n", @@ -436,7 +436,7 @@ int WINAPIV ShellMessageBoxA( FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPSTR)&pszTemp, 0, &args); - va_end(args); + __ms_va_end(args); ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType); LocalFree((HLOCAL)pszTemp); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 9176420..ec7ba54 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -291,7 +291,7 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); + szText, 0, 0, szBuffer, sizeof(szBuffer), (__ms_va_list*)args); hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 5da2879..932f54f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4309,10 +4309,10 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, WCHAR szText[100], szTitle[100]; LPCWSTR pszText = szText, pszTitle = szTitle; LPWSTR pszTemp; - va_list args; + __ms_va_list args; int ret; - va_start(args, uType); + __ms_va_start(args, uType); TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType); @@ -4329,7 +4329,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args); - va_end(args); + __ms_va_end(args); ret = MessageBoxW(hWnd, pszTemp, pszTitle, uType); LocalFree(pszTemp); diff --git a/include/winbase.h b/include/winbase.h index f7bb9bf..d3b392c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1533,8 +1533,8 @@ WINBASEAPI BOOL WINAPI FlsSetValue(DWORD,PVOID); WINBASEAPI BOOL WINAPI FlushFileBuffers(HANDLE); WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,SIZE_T); WINBASEAPI BOOL WINAPI FlushViewOfFile(LPCVOID,SIZE_T); -WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*); -WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*); +WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,__ms_va_list*); +WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,__ms_va_list*); #define FormatMessage WINELIB_NAME_AW(FormatMessage) WINBASEAPI BOOL WINAPI FreeEnvironmentStringsA(LPSTR); WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); diff --git a/include/winternl.h b/include/winternl.h index ed93bbf..4704e1c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2331,7 +2331,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); -NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPWSTR,UCHAR,BOOLEAN,BOOLEAN,BOOLEAN,va_list *,LPWSTR,ULONG); +NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPWSTR,UCHAR,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG); NTSYSAPI void WINAPI RtlFreeAnsiString(PANSI_STRING); NTSYSAPI BOOLEAN WINAPI RtlFreeHandle(RTL_HANDLE_TABLE *,RTL_HANDLE *); NTSYSAPI BOOLEAN WINAPI RtlFreeHeap(HANDLE,ULONG,PVOID);

1 0

Alexandre Julliard : wldap32: Convert ber_printf to use an MS ABI vararg list for x86_64.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 71de29b7957e05061d4e9438d24e991168862b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71de29b7957e05061d4e9438d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 31 20:49:07 2008 +0100 wldap32: Convert ber_printf to use an MS ABI vararg list for x86_64. --- dlls/wldap32/ber.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 5615135..41acd70 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -325,12 +325,12 @@ ULONG CDECL WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len ) INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP - va_list list; + __ms_va_list list; int ret = 0; char new_fmt[2]; new_fmt[1] = 0; - va_start( list, fmt ); + __ms_va_start( list, fmt ); while (*fmt) { new_fmt[0] = *fmt++; @@ -391,7 +391,7 @@ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) } if (ret == -1) break; } - va_end( list ); + __ms_va_end( list ); return ret; #else return LBER_ERROR; @@ -420,12 +420,12 @@ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP - va_list list; + __ms_va_list list; int ret = 0; char new_fmt[2]; new_fmt[1] = 0; - va_start( list, fmt ); + __ms_va_start( list, fmt ); while (*fmt) { new_fmt[0] = *fmt++; @@ -491,7 +491,7 @@ INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) } if (ret == -1) break; } - va_end( list ); + __ms_va_end( list ); return ret; #else return LBER_ERROR;

1 0

Alexandre Julliard : user32: Convert wvsprintfA/ W to use an MS ABI vararg list for x86_64.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: fb7acdcb283edeae36e243ec024d6bf4f4db8098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7acdcb283edeae36e243ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 31 20:46:08 2008 +0100 user32: Convert wvsprintfA/W to use an MS ABI vararg list for x86_64. --- dlls/kernel32/string.c | 10 +++++----- dlls/user32/wsprintf.c | 20 ++++++++++---------- include/windef.h | 12 ++++++++++++ include/winuser.h | 4 ++-- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/string.c b/dlls/kernel32/string.c index ecac281..1f606fd 100644 --- a/dlls/kernel32/string.c +++ b/dlls/kernel32/string.c @@ -36,7 +36,7 @@ static INT (WINAPI *pLoadStringA)(HINSTANCE, UINT, LPSTR, INT); -static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, va_list); +static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, __ms_va_list); /*********************************************************************** @@ -118,7 +118,7 @@ INT WINAPI k32LoadStringA(HINSTANCE instance, UINT resource_id, /*********************************************************************** * k32wvsprintfA (KERNEL32.16) */ -INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, va_list args) +INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, __ms_va_list args) { if(!pwvsprintfA) pwvsprintfA = user32_proc_address("wvsprintfA"); return (*pwvsprintfA)(buffer, spec, args); @@ -130,12 +130,12 @@ INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, va_list args) */ INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...) { - va_list args; + __ms_va_list args; INT res; - va_start(args, spec); + __ms_va_start(args, spec); res = k32wvsprintfA(buffer, spec, args); - va_end(args); + __ms_va_end(args); return res; } diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index 7f98bee..6cb4912 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -385,7 +385,7 @@ static INT16 wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec, VA_LIST16 a /*********************************************************************** * wvsnprintfA (internal) */ -static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) +static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -488,7 +488,7 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) /*********************************************************************** * wvsnprintfW (internal) */ -static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args ) +static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer; @@ -603,7 +603,7 @@ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, VA_LIST16 args ) /*********************************************************************** * wvsprintfA (USER32.@) */ -INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) +INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, __ms_va_list args ) { INT res = wvsnprintfA( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -613,7 +613,7 @@ INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) /*********************************************************************** * wvsprintfW (USER32.@) */ -INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args ) +INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, __ms_va_list args ) { INT res = wvsnprintfW( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -637,12 +637,12 @@ INT16 WINAPIV wsprintf16( LPSTR buffer, LPCSTR spec, VA_LIST16 valist ) */ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) { - va_list valist; + __ms_va_list valist; INT res; - va_start( valist, spec ); + __ms_va_start( valist, spec ); res = wvsnprintfA( buffer, 1024, spec, valist ); - va_end( valist ); + __ms_va_end( valist ); return ( res == -1 ) ? 1024 : res; } @@ -652,11 +652,11 @@ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) */ INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... ) { - va_list valist; + __ms_va_list valist; INT res; - va_start( valist, spec ); + __ms_va_start( valist, spec ); res = wvsnprintfW( buffer, 1024, spec, valist ); - va_end( valist ); + __ms_va_end( valist ); return ( res == -1 ) ? 1024 : res; } diff --git a/include/windef.h b/include/windef.h index 3c9de7a..825255b 100644 --- a/include/windef.h +++ b/include/windef.h @@ -84,6 +84,18 @@ extern "C" { # endif #endif /* __cdecl */ +#ifndef __ms_va_list +# if defined(__x86_64__) && defined (__GNUC__) +# define __ms_va_list __builtin_ms_va_list +# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __ms_va_end(list) __builtin_ms_va_end(list) +# else +# define __ms_va_list va_list +# define __ms_va_start(list,arg) va_start(list,arg) +# define __ms_va_end(list) va_end(list) +# endif +#endif + #ifdef __WINESRC__ #define __ONLY_IN_WINELIB(x) do_not_use_this_in_wine #else diff --git a/include/winuser.h b/include/winuser.h index 8382a07..fd91d92 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -5068,8 +5068,8 @@ WINUSERAPI VOID WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR); WINUSERAPI INT WINAPIV wsprintfA(LPSTR,LPCSTR,...); WINUSERAPI INT WINAPIV wsprintfW(LPWSTR,LPCWSTR,...); #define wsprintf WINELIB_NAME_AW(wsprintf) -WINUSERAPI INT WINAPI wvsprintfA(LPSTR,LPCSTR,va_list); -WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list); +WINUSERAPI INT WINAPI wvsprintfA(LPSTR,LPCSTR,__ms_va_list); +WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); #define wvsprintf WINELIB_NAME_AW(wvsprintf) /* Undocumented functions */

1 0

Alexandre Julliard : cmd: Don't include time.h before winsock. h to avoid conflicts.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: aa6f1c730a6e476c36accac678fe85caf2127d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa6f1c730a6e476c36accac67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 31 20:05:33 2008 +0100 cmd: Don't include time.h before winsock.h to avoid conflicts. --- programs/cmd/wcmdmain.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 954f5a3..b135a16 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -26,7 +26,6 @@ */ #include "config.h" -#include <time.h> #include "wcmd.h" #include "wine/debug.h"

1 0