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

Alexandre Julliard : mlang: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: ea992bfd90e32b6b415824af2c9b0244b2d2fd4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea992bfd90e32b6b415824af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:26:51 2019 +0200 mlang: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/Makefile.in | 2 ++ dlls/mlang/mlang.c | 16 +++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in index abee2a2..82d2e56 100644 --- a/dlls/mlang/Makefile.in +++ b/dlls/mlang/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = mlang IMPORTS = uuid ole32 gdi32 advapi32 DELAYIMPORTS = oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mlang.c diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f12df29..1b1aed3 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -38,7 +37,6 @@ #include "mlang.h" #include "mimeole.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" @@ -1283,12 +1281,12 @@ static HRESULT lcid_from_rfc1766(IEnumRfc1766 *iface, LCID *lcid, LPCWSTR rfc176 while (IEnumRfc1766_Next(iface, 1, &info, &num) == S_OK) { - if (!strcmpiW(info.wszRfc1766, rfc1766)) + if (!wcsicmp(info.wszRfc1766, rfc1766)) { *lcid = info.lcid; return S_OK; } - if (strlenW(rfc1766) == 2 && !memcmp(info.wszRfc1766, rfc1766, 2 * sizeof(WCHAR))) + if (lstrlenW(rfc1766) == 2 && !memcmp(info.wszRfc1766, rfc1766, 2 * sizeof(WCHAR))) { *lcid = PRIMARYLANGID(info.lcid); return S_OK; @@ -2426,7 +2424,7 @@ static BOOL CALLBACK enum_locales_proc(LPWSTR locale) info = &data->info[data->total]; - info->lcid = strtolW(locale, &end, 16); + info->lcid = wcstol(locale, &end, 16); if (*end) /* invalid number */ return FALSE; @@ -2764,14 +2762,14 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( { pCharsetInfo->uiCodePage = mlang_data[i].family_codepage; pCharsetInfo->uiInternetEncoding = mlang_data[i].mime_cp_info[n].cp; - strcpyW(pCharsetInfo->wszCharset, csetW); + lstrcpyW(pCharsetInfo->wszCharset, csetW); return S_OK; } if (mlang_data[i].mime_cp_info[n].alias && !lstrcmpiW(Charset, mlang_data[i].mime_cp_info[n].alias)) { pCharsetInfo->uiCodePage = mlang_data[i].family_codepage; pCharsetInfo->uiInternetEncoding = mlang_data[i].mime_cp_info[n].cp; - strcpyW(pCharsetInfo->wszCharset, mlang_data[i].mime_cp_info[n].alias); + lstrcpyW(pCharsetInfo->wszCharset, mlang_data[i].mime_cp_info[n].alias); return S_OK; } } @@ -2793,7 +2791,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( { pCharsetInfo->uiCodePage = mlang_data[i].family_codepage; pCharsetInfo->uiInternetEncoding = mlang_data[i].mime_cp_info[n].cp; - strcpyW(pCharsetInfo->wszCharset, csetW); + lstrcpyW(pCharsetInfo->wszCharset, csetW); return S_OK; } } @@ -3951,7 +3949,7 @@ static BOOL register_codepages(void) { for (info = family->mime_cp_info; info < family->mime_cp_info + family->number_of_cp; info++) { - sprintfW(buf, formatW, info->cp); + swprintf(buf, ARRAY_SIZE(buf), formatW, info->cp); status = RegCreateKeyW(db_key, buf, &key); if (status != ERROR_SUCCESS) continue;

1 0

Alexandre Julliard : mmcndmgr: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: ca0f73c0ce0d143870294e9cd1b742bc7df82455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca0f73c0ce0d143870294e9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:27:03 2019 +0200 mmcndmgr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmcndmgr/Makefile.in | 2 ++ dlls/mmcndmgr/mmcndmgr.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmcndmgr/Makefile.in b/dlls/mmcndmgr/Makefile.in index adf36ce..3bc8209 100644 --- a/dlls/mmcndmgr/Makefile.in +++ b/dlls/mmcndmgr/Makefile.in @@ -1,6 +1,8 @@ MODULE = mmcndmgr.dll IMPORTS = uuid oleaut32 ole32 user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mmcndmgr.c diff --git a/dlls/mmcndmgr/mmcndmgr.c b/dlls/mmcndmgr/mmcndmgr.c index 255b27d..4e6e2e6 100644 --- a/dlls/mmcndmgr/mmcndmgr.c +++ b/dlls/mmcndmgr/mmcndmgr.c @@ -26,9 +26,7 @@ #include "ole2.h" #include "rpcproxy.h" -#include "wine/unicode.h" #include "wine/debug.h" -#include "wine/library.h" #include "initguid.h" #include "mmc.h"

1 0

Alexandre Julliard : mmdevldr.vxd: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 4f91b614562a66be8cda78c026da2a6e17a4e4ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f91b614562a66be8cda78c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:28:21 2019 +0200 mmdevldr.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevldr.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mmdevldr.vxd/Makefile.in b/dlls/mmdevldr.vxd/Makefile.in index 096ae7c..3885733 100644 --- a/dlls/mmdevldr.vxd/Makefile.in +++ b/dlls/mmdevldr.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = mmdevldr.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mmdevldr.c

1 0

Alexandre Julliard : mmdevapi: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: eae787f9134340d27e8a41c45fbb6dddf2b41e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae787f9134340d27e8a41c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:27:51 2019 +0200 mmdevapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/Makefile.in | 2 ++ dlls/mmdevapi/audiovolume.c | 2 -- dlls/mmdevapi/devenum.c | 7 ++----- dlls/mmdevapi/main.c | 7 +------ dlls/mmdevapi/mmdevapi.h | 4 ---- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 530f767..5f44f7b 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,6 +1,8 @@ MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ audiovolume.c \ devenum.c \ diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 76f9f4e..24d210a 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -26,7 +25,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "ole2.h" #include "mmdeviceapi.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 685ec27..82e1bb9 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define NONAMELESSUNION @@ -28,7 +26,6 @@ #include "winreg.h" #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "initguid.h" #include "ole2.h" @@ -448,7 +445,7 @@ static HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (strlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + DWORD size_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); WCHAR *name = HeapAlloc(GetProcessHeap(), 0, size_bytes); memcpy(name, pv.u.pwszVal, size_bytes); MMDevice_Create(name, &guid, curflow, @@ -1431,7 +1428,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR RegCloseKey(propkey); buffer[38] = 0; CLSIDFromString(buffer, &key->fmtid); - key->pid = atoiW(&buffer[39]); + key->pid = wcstol(&buffer[39], NULL, 10); return S_OK; } diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 8886975..7680b45 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -17,16 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/library.h" #include "ole2.h" #include "olectl.h" @@ -44,7 +40,6 @@ #include "mmdevapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); @@ -139,7 +134,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) TRACE("Loading driver list %s\n", wine_dbgstr_w(driver_list)); for(next = p = driver_list; next; p = next + 1){ - next = strchrW(p, ','); + next = wcschr(p, ','); if(next) *next = '\0'; diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index b85c757..bc9788e 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -16,10 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : mmsystem: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: c1df11c167346df70bbdbb3e939417ba7ad593f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1df11c167346df70bbdbb3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:28:37 2019 +0200 mmsystem: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmsystem.dll16/Makefile.in | 2 +- dlls/mmsystem.dll16/message16.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in index 1eb0ce9..e1033b4 100644 --- a/dlls/mmsystem.dll16/Makefile.in +++ b/dlls/mmsystem.dll16/Makefile.in @@ -1,7 +1,7 @@ MODULE = mmsystem.dll16 IMPORTS = winmm user32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll C_SRCS = \ driver.c \ diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 012d3dc..32c5192 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -844,7 +844,7 @@ static LRESULT CALLBACK MMSYSTDRV_Callback3216(struct mmsystdrv_thunk* thunk, HD SetEvent((HANDLE)thunk->callback); break; default: - WARN("Unknown callback type %x\n", thunk->flags & CALLBACK_TYPEMASK); + WARN("Unknown callback type %x\n", thunk->flags); return FALSE; } TRACE("Done\n");

1 0

Alexandre Julliard : monodebg.vxd: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 15287e0fd214bdbf28676a76344b69db8f2bcf4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=15287e0fd214bdbf28676a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:28:46 2019 +0200 monodebg.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/monodebg.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/monodebg.vxd/Makefile.in b/dlls/monodebg.vxd/Makefile.in index ccbfdba..8fea327 100644 --- a/dlls/monodebg.vxd/Makefile.in +++ b/dlls/monodebg.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = monodebg.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ monodebg.c

1 0

Alexandre Julliard : mouse.drv: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: c1a01fd399725f69979edcdffbba80be95fda191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a01fd399725f69979edcdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:02 2019 +0200 mouse.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mouse.drv16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in index 7fe1386..ce1ea19 100644 --- a/dlls/mouse.drv16/Makefile.in +++ b/dlls/mouse.drv16/Makefile.in @@ -1,7 +1,7 @@ MODULE = mouse.drv16 IMPORTS = user32 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = mouse.c

1 0

Alexandre Julliard : mpr: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 1e117a5682e829cb5b92eedb2d562757cf9076aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e117a5682e829cb5b92eedb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:30 2019 +0200 mpr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/Makefile.in | 2 ++ dlls/mpr/nps.c | 3 --- dlls/mpr/wnet.c | 51 +++++++++++++++++++++++++-------------------------- 3 files changed, 27 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e117a5682e829cb5b92…

1 0

Alexandre Julliard : mprapi: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 5afcbaa30f922187ab3f362ba8d3fd0f1fb244b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5afcbaa30f922187ab3f362b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:36 2019 +0200 mprapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mprapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in index 2bf309f..e33e57e 100644 --- a/dlls/mprapi/Makefile.in +++ b/dlls/mprapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = mprapi.dll IMPORTLIB = mprapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mprapi.c

1 0

Józef Kucia : tests: Prefer uint64_t to UINT64.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: 843349c5e07d38cabd8a1b0f9f1f3bbf6059861a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=843349c5e07d38cabd8a1b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:36 2019 +0200 tests: Prefer uint64_t to UINT64. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 90 ++++++++++++++++++++++++------------------------- tests/d3d12_crosstest.h | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=843349c5e07d38cabd8…

1 0