June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Make wine_server_call() cdecl.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: c911eff7b403836ded4e57536e30d70cf969ccbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c911eff7b403836ded4e5753… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 11:33:16 2019 +0200 ntdll: Make wine_server_call() cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 2 +- include/wine/server.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 094b530..8274f11 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -312,7 +312,7 @@ unsigned int server_call_unlocked( void *req_ptr ) *| } *| SERVER_END_REQ; */ -unsigned int wine_server_call( void *req_ptr ) +unsigned int CDECL wine_server_call( void *req_ptr ) { sigset_t old_set; unsigned int ret; diff --git a/include/wine/server.h b/include/wine/server.h index d573d1f..ac5dcc6 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -49,7 +49,7 @@ struct __server_request_info struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ }; -extern unsigned int wine_server_call( void *req_ptr ); +extern unsigned int CDECL wine_server_call( void *req_ptr ); extern void CDECL wine_server_send_fd( int fd ); extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options );

1 0

Zebediah Figura : winex11: Remove redundant calls to update_key_state().
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 178d2c57689d3cc27c9f0fbc517e59b8a87ec399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=178d2c57689d3cc27c9f0fbc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 17 14:46:19 2019 -0500 winex11: Remove redundant calls to update_key_state(). These will not actually do anything, and were probably added by mistake, after the similar calls to VK_CONTROL et al. above. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3b8d916..b063491 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1288,8 +1288,6 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) update_key_state( keystate, VK_CONTROL, (keystate[VK_LCONTROL] | keystate[VK_RCONTROL]) & 0x80 ); update_key_state( keystate, VK_MENU, (keystate[VK_LMENU] | keystate[VK_RMENU]) & 0x80 ); update_key_state( keystate, VK_SHIFT, (keystate[VK_LSHIFT] | keystate[VK_RSHIFT]) & 0x80 ); - update_key_state( keystate, VK_LWIN, keystate[VK_LWIN] & 0x80 ); - update_key_state( keystate, VK_RWIN, keystate[VK_RWIN] & 0x80 ); set_async_key_state( keystate ); return TRUE; }

1 0

Alexandre Julliard : ntdll: Make the standard C functions available for importing.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: bdd48b41d313dd6776620a9116d9249b4d7ee3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdd48b41d313dd6776620a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:47:16 2019 +0200 ntdll: Make the standard C functions available for importing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 236 +++++++++++++++++++++++++------------------------- 1 file changed, 118 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdd48b41d313dd677662…

1 0

Zebediah Figura : winex11: Update the state of all keys on KeymapNotify.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 1bc9c4fdb2e6c2762105c14cdafb7d4ea3370625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc9c4fdb2e6c2762105c14c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 17 14:46:20 2019 -0500 winex11: Update the state of all keys on KeymapNotify. The Binding of Isaac transitions in and out of fullscreen when the "F" key is pressed. Specifically, it will swap states when receiving WM_KEYDOWN, provided that the previous key state was not pressed (i.e. bit 30 is 0). However, as part of the process of transitioning, it hides and shows its window, causing it to temporarily lose focus. If the F key is released while the window does not have focus, Wine misses this fact, and thinks that the key was already pressed the next time it is pressed, causing the game to refuse to change focus. Windows will not deliver WM_KEYUP messages to a window that does not have focus, but it will always report the true previous state of any key on the keyboard when requested. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 55 +++++++++------------------------------------ 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b063491..131c5f5 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1212,13 +1212,12 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) BOOL changed = FALSE; struct { WORD vkey; - BOOL pressed; - } modifiers[6]; /* VK_LSHIFT through VK_RMENU are contiguous */ - BOOL lwin_pressed = FALSE, rwin_pressed = FALSE; + WORD pressed; + } keys[256]; if (!get_async_key_state( keystate )) return FALSE; - memset(modifiers, 0, sizeof(modifiers)); + memset(keys, 0, sizeof(keys)); EnterCriticalSection( &kbd_section ); @@ -1229,59 +1228,27 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { for (j = 0; j < 8; j++) { - int m; - vkey = keyc2vkey[(i * 8) + j]; - switch(vkey & 0xff) - { - case VK_LMENU: - case VK_RMENU: - case VK_LCONTROL: - case VK_RCONTROL: - case VK_LSHIFT: - case VK_RSHIFT: - m = (vkey & 0xff) - VK_LSHIFT; - /* Take the vkey from the first keycode we encounter for this modifier */ - if (!modifiers[m].vkey) modifiers[m].vkey = vkey; - if (event->xkeymap.key_vector[i] & (1<<j)) modifiers[m].pressed = TRUE; - break; - case VK_LWIN: - if (event->xkeymap.key_vector[i] & (1<<j)) lwin_pressed = TRUE; - break; - case VK_RWIN: - if (event->xkeymap.key_vector[i] & (1<<j)) rwin_pressed = TRUE; - break; - } + /* If multiple keys map to the same vkey, we want to report it as + * pressed iff any of them are pressed. */ + if (!keys[vkey & 0xff].vkey) keys[vkey & 0xff].vkey = vkey; + if (event->xkeymap.key_vector[i] & (1<<j)) keys[vkey & 0xff].pressed = TRUE; } } - for (vkey = VK_LSHIFT; vkey <= VK_RMENU; vkey++) + for (vkey = 1; vkey <= 0xff; vkey++) { - int m = vkey - VK_LSHIFT; - if (modifiers[m].vkey && !(keystate[vkey] & 0x80) != !modifiers[m].pressed) + if (keys[vkey].vkey && !(keystate[vkey] & 0x80) != !keys[vkey].pressed) { TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", - modifiers[m].vkey, keystate[vkey]); + keys[vkey].vkey, keystate[vkey]); - update_key_state( keystate, vkey, modifiers[m].pressed ); + update_key_state( keystate, vkey, keys[vkey].pressed ); changed = TRUE; } } - if (!(keystate[VK_LWIN] & 0x80) != !lwin_pressed) - { - TRACE( "Adjusting state for VK_LWIN. State before %#.2x\n", keystate[VK_LWIN]); - update_key_state( keystate, VK_LWIN, lwin_pressed ); - changed = TRUE; - } - if (!(keystate[VK_RWIN] & 0x80) != !rwin_pressed) - { - TRACE( "Adjusting state for VK_RWIN. State before %#.2x\n", keystate[VK_RWIN]); - update_key_state( keystate, VK_RWIN, rwin_pressed ); - changed = TRUE; - } - LeaveCriticalSection( &kbd_section ); if (!changed) return FALSE;

1 0

Alexandre Julliard : winecrt0: Provide our own setjmp/ longjmp functions for exception handling.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 61680b444960fb006f78e969f8bdb09d321363d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61680b444960fb006f78e969… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 10:17:43 2019 +0200 winecrt0: Provide our own setjmp/longjmp functions for exception handling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcrt/except_arm.c | 62 +------------- dlls/msvcrt/except_arm64.c | 50 +---------- dlls/msvcrt/except_i386.c | 21 +---- dlls/msvcrt/except_x86_64.c | 60 +------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/winecrt0/exception.c | 198 +++++++++++++++++++++++++++++++++++++++++++- include/wine/exception.h | 43 +++++----- tools/widl/typegen.c | 6 +- 13 files changed, 236 insertions(+), 216 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61680b444960fb006f78…

1 0

Jarkko Korpi : wininet: Silence no support on this platform message.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: c9b2801c0d0974a40055e6e775d1e137f633b406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b2801c0d0974a40055e6e7… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Tue Jun 18 04:29:28 2019 +0000 wininet: Silence no support on this platform message. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b9f9f91..6671950 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2324,7 +2324,8 @@ static WCHAR *get_proxy_autoconfig_url(void) CFRelease( settings ); return ret; #else - FIXME( "no support on this platform\n" ); + static int once; + if (!once++) FIXME( "no support on this platform\n" ); return NULL; #endif }

1 0

Alexandre Julliard : propsys: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 445af46a1838b724d12c012f0be4bc62445e6864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=445af46a1838b724d12c012f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:45 2019 +0200 propsys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/Makefile.in | 2 ++ dlls/propsys/propstore.c | 2 -- dlls/propsys/propsys_main.c | 10 ++++------ dlls/propsys/propvar.c | 9 +++------ 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index a445922..ec0b223 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -2,6 +2,8 @@ MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ propstore.c \ propsys_main.c \ diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 9c848fc..6212f29 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -29,7 +28,6 @@ #include "rpcproxy.h" #include "propsys.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "initguid.h" diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 65d157d..7ae3870 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -20,7 +20,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -30,7 +29,6 @@ #include "rpcproxy.h" #include "propsys.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "propsys_private.h" @@ -307,7 +305,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch return E_NOT_SUFFICIENT_BUFFER; } - sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, + swprintf(psz, cch, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], pkey->fmtid.Data4[2], pkey->fmtid.Data4[3], pkey->fmtid.Data4[4], pkey->fmtid.Data4[5], pkey->fmtid.Data4[6], pkey->fmtid.Data4[7]); @@ -317,11 +315,11 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch *p++ = ' '; cch -= GUIDSTRING_MAX - 1 + 1; - len = sprintfW(pidW, pid_fmtW, pkey->pid); + len = swprintf(pidW, ARRAY_SIZE(pidW), pid_fmtW, pkey->pid); if (cch >= len + 1) { - strcpyW(p, pidW); + lstrcpyW(p, pidW); return S_OK; } else @@ -497,7 +495,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) } /* Overflow is not checked. */ - while (isdigitW(*pszString)) + while (iswdigit(*pszString)) { pkey->pid *= 10; pkey->pid += (*pszString - '0'); diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 98fb129..dcfee2b 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> @@ -37,7 +35,6 @@ #include "strsafe.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(propsys); @@ -124,7 +121,7 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, case VT_BSTR: { WCHAR *end; - *res = strtolW(pv->u.pwszVal, &end, 0); + *res = wcstol(pv->u.pwszVal, &end, 0); if (pv->u.pwszVal == end) return DISP_E_TYPEMISMATCH; src_signed = *res < 0; @@ -587,7 +584,7 @@ static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str) '-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%','0','2','X', '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - sprintfW(str, format, guid->Data1, guid->Data2, guid->Data3, + swprintf(str, 39, format, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } @@ -764,7 +761,7 @@ HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) case VT_BSTR: return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); case VT_LPWSTR: - return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, lstrlenW(ppropvar->u.pwszVal), guid); case VT_CLSID: memcpy(guid, ppropvar->u.puuid, sizeof(*ppropvar->u.puuid)); return S_OK;

1 0

Alexandre Julliard : powrprof: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 15eb79cca300ea5d9e8b36bf3167337590eee090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15eb79cca300ea5d9e8b36bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:01 2019 +0200 powrprof: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/Makefile.in | 2 ++ dlls/powrprof/powrprof.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in index e51fc62..a410e9b 100644 --- a/dlls/powrprof/Makefile.in +++ b/dlls/powrprof/Makefile.in @@ -2,4 +2,6 @@ MODULE = powrprof.dll IMPORTLIB = powrprof IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = powrprof.c diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index d870fe2..92bab03 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -18,6 +18,7 @@ #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -28,7 +29,6 @@ #include "winternl.h" #include "powrprof.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(powrprof); @@ -178,7 +178,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) TRACE("Using default: 3600\n"); *RangeMax = 3600; } else { - *RangeMax = atoiW((LPCWSTR)lpValue); + *RangeMax = wcstol((LPCWSTR)lpValue, NULL, 10); } cbValue = sizeof(lpValue); @@ -189,7 +189,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) TRACE("Using default: 3\n"); *RangeMin = 3; } else { - *RangeMin = atoiW((LPCWSTR)lpValue); + *RangeMin = wcstol((LPCWSTR)lpValue, NULL, 10); } RegCloseKey(hKey);

1 0

Alexandre Julliard : pdh: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 0a23d04270631f4ace3648d5fab224ade441641a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a23d04270631f4ace3648d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:05:33 2019 +0200 pdh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/Makefile.in | 2 ++ dlls/pdh/pdh_main.c | 53 ++++++++++++++++++++++++++-------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index 86e14a0..d3ce7a4 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,5 +1,7 @@ MODULE = pdh.dll IMPORTLIB = pdh +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ pdh_main.c diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 11c917a..daa0e2d 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(pdh); @@ -53,7 +52,7 @@ static inline WCHAR *pdh_strdup( const WCHAR *src ) WCHAR *dst; if (!src) return NULL; - if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); return dst; } @@ -213,21 +212,21 @@ static BOOL is_local_machine( const WCHAR *name, DWORD len ) DWORD buflen = ARRAY_SIZE(buf); if (!GetComputerNameW( buf, &buflen )) return FALSE; - return len == buflen && !strncmpiW( name, buf, buflen ); + return len == buflen && !wcsnicmp( name, buf, buflen ); } static BOOL pdh_match_path( LPCWSTR fullpath, LPCWSTR path ) { const WCHAR *p; - if (path[0] == '\\' && path[1] == '\\' && (p = strchrW( path + 2, '\\' )) && + if (path[0] == '\\' && path[1] == '\\' && (p = wcschr( path + 2, '\\' )) && is_local_machine( path + 2, p - path - 2 )) { path += p - path; } - if (strchrW( path, '\\' )) p = fullpath; - else p = strrchrW( fullpath, '\\' ) + 1; - return !strcmpW( p, path ); + if (wcschr( path, '\\' )) p = fullpath; + else p = wcsrchr( fullpath, '\\' ) + 1; + return !wcscmp( p, path ); } /*********************************************************************** @@ -929,13 +928,13 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST { if (counter_sources[i].index == index) { - WCHAR *p = strrchrW( counter_sources[i].path, '\\' ) + 1; - unsigned int required = strlenW( p ) + 1; + WCHAR *p = wcsrchr( counter_sources[i].path, '\\' ) + 1; + unsigned int required = lstrlenW( p ) + 1; if (*size < required) ret = PDH_MORE_DATA; else { - strcpyW( buffer, p ); + lstrcpyW( buffer, p ); ret = ERROR_SUCCESS; } *size = required; @@ -1061,7 +1060,7 @@ PDH_STATUS WINAPI PdhValidatePathA( LPCSTR path ) static PDH_STATUS validate_path( LPCWSTR path ) { if (!path || !*path) return PDH_INVALID_ARGUMENT; - if (*path++ != '\\' || !strchrW( path, '\\' )) return PDH_CSTATUS_BAD_COUNTERNAME; + if (*path++ != '\\' || !wcschr( path, '\\' )) return PDH_CSTATUS_BAD_COUNTERNAME; return ERROR_SUCCESS; } @@ -1202,30 +1201,30 @@ PDH_STATUS WINAPI PdhMakeCounterPathW( PDH_COUNTER_PATH_ELEMENTS_W *e, LPWSTR bu path[0] = 0; if (e->szMachineName) { - strcatW(path, bslash); - strcatW(path, bslash); - strcatW(path, e->szMachineName); + lstrcatW(path, bslash); + lstrcatW(path, bslash); + lstrcatW(path, e->szMachineName); } - strcatW(path, bslash); - strcatW(path, e->szObjectName); + lstrcatW(path, bslash); + lstrcatW(path, e->szObjectName); if (e->szInstanceName) { - strcatW(path, lparen); + lstrcatW(path, lparen); if (e->szParentInstance) { - strcatW(path, e->szParentInstance); - strcatW(path, fslash); + lstrcatW(path, e->szParentInstance); + lstrcatW(path, fslash); } - strcatW(path, e->szInstanceName); - sprintfW(instance, fmt, e->dwInstanceIndex); - strcatW(path, instance); - strcatW(path, rparen); + lstrcatW(path, e->szInstanceName); + swprintf(instance, ARRAY_SIZE(instance), fmt, e->dwInstanceIndex); + lstrcatW(path, instance); + lstrcatW(path, rparen); } - strcatW(path, bslash); - strcatW(path, e->szCounterName); + lstrcatW(path, bslash); + lstrcatW(path, e->szCounterName); - len = strlenW(path) + 1; - if (*buflen >= len) strcpyW(buffer, path); + len = lstrlenW(path) + 1; + if (*buflen >= len) lstrcpyW(buffer, path); else ret = PDH_MORE_DATA; *buflen = len; return ret;

1 0

Alexandre Julliard : olethk32: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: ee5127647f183f2529debdba71725628194b9306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5127647f183f2529debdba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:55 2019 +0200 olethk32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olethk32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/olethk32/Makefile.in b/dlls/olethk32/Makefile.in index 1a8f17a..6888b46 100644 --- a/dlls/olethk32/Makefile.in +++ b/dlls/olethk32/Makefile.in @@ -1,5 +1,7 @@ MODULE = olethk32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c RC_SRCS = version.rc

1 0