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

Alexandre Julliard : imm32: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 700910be7c02cdd9a05b3e45e90d17479eac40d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=700910be7c02cdd9a05b3e45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:01:04 2019 +0200 imm32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/Makefile.in | 2 ++ dlls/imm32/imm.c | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index b190888..cebcf4c 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -2,6 +2,8 @@ MODULE = imm32.dll IMPORTLIB = imm32 IMPORTS = user32 gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ imm.c diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b2ac662..5f68c1d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -33,7 +33,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -318,8 +317,8 @@ static HMODULE load_graphics_driver(void) if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0; + lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); @@ -1643,7 +1642,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME)) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE;

1 0

Alexandre Julliard : inetcomm: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: afc721f0f1a0d0bb7fc1e577633d5b5a8ee75da7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afc721f0f1a0d0bb7fc1e577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:01:34 2019 +0200 inetcomm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/Makefile.in | 2 ++ dlls/inetcomm/mimeintl.c | 3 +-- dlls/inetcomm/mimeole.c | 5 ++--- dlls/inetcomm/protocol.c | 19 +++++++++---------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index 690e302..198ef0b 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -2,6 +2,8 @@ MODULE = inetcomm.dll IMPORTLIB = inetcomm IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ imaptransport.c \ inetcomm_main.c \ diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 07d3ae5..ec7d340 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -34,7 +34,6 @@ #include "mlang.h" #include "wine/list.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "inetcomm_private.h" @@ -415,7 +414,7 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE break; case VT_LPWSTR: cpiSource = CP_UNICODE; - src_len = strlenW(pIn->u.pwszVal) * sizeof(WCHAR); + src_len = lstrlenW(pIn->u.pwszVal) * sizeof(WCHAR); break; default: return E_INVALIDARG; diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index bb0f9bd..2c481ab 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -37,7 +37,6 @@ #include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "inetcomm_private.h" @@ -3713,13 +3712,13 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx TRACE("display name %s\n", debugstr_w(display_name)); - len = strlenW(display_name); + len = lstrlenW(display_name); mhtml_url = heap_alloc((len+1)*sizeof(WCHAR) + sizeof(mhtml_prefixW)); if(!mhtml_url) return E_OUTOFMEMORY; memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); - strcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); + lstrcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); HeapFree(GetProcessHeap(), 0, display_name); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index c6a59fe..e50e5a6 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -26,7 +26,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); @@ -70,7 +69,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); if(ret) memcpy(ret, str, size); @@ -83,20 +82,20 @@ static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) { const WCHAR *p; - if(strncmpiW(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) + if(wcsnicmp(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) return E_FAIL; r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); - p = strchrW(r->mhtml, '!'); + p = wcschr(r->mhtml, '!'); if(p) { r->mhtml_len = p - r->mhtml; /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ - if(!strncmpW(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) + if(!wcsncmp(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) p += ARRAY_SIZE(mhtml_separatorW); else p++; }else { - r->mhtml_len = strlenW(r->mhtml); + r->mhtml_len = lstrlenW(r->mhtml); } r->location = p; @@ -142,7 +141,7 @@ static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessag if(FAILED(hres)) return report_result(protocol, hres); - found = !strcmpW(protocol->location, value.u.pwszVal); + found = !lstrcmpW(protocol->location, value.u.pwszVal); PropVariantClear(&value); }while(!found); }else { @@ -670,14 +669,14 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(FAILED(hres)) return hres; - if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { + if(!wcsnicmp(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { FIXME("Relative URL is mhtml protocol\n"); return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } len += url.mhtml_len; if(*pwzRelativeUrl) - len += strlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); + len += lstrlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); if(len >= cchResult) { *pcchResult = 0; return E_FAIL; @@ -690,7 +689,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(*pwzRelativeUrl) { memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); p += ARRAY_SIZE(mhtml_separatorW); - strcpyW(p, pwzRelativeUrl); + lstrcpyW(p, pwzRelativeUrl); }else { *p = 0; }

1 0

Alexandre Julliard : inetcpl: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: e01d9db2748d666e5be3927f72481702420f9738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e01d9db2748d666e5be3927f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:01:46 2019 +0200 inetcpl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/Makefile.in | 2 ++ dlls/inetcpl.cpl/connections.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index f84c4ce..972c666 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -2,6 +2,8 @@ MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 DELAYIMPORTS = cryptui wininet ole32 urlmon shell32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ connections.c \ content.c \ diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 2132ac5..c24374f 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <wininet.h> #include <winuser.h> #include <winreg.h> @@ -27,7 +28,6 @@ #include "inetcpl.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -193,7 +193,7 @@ static void connections_on_initdialog(HWND hwnd) EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), TRUE); } - port = strchrW(address, ':'); + port = wcschr(address, ':'); if(port) { *port = 0;

1 0

Alexandre Julliard : inetmib1: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 7fa73a79af933787fe54f69da48ddbdb1c1056be URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa73a79af933787fe54f69d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:01:57 2019 +0200 inetmib1: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/Makefile.in | 2 ++ dlls/inetmib1/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in index 25391ff..9ee6216 100644 --- a/dlls/inetmib1/Makefile.in +++ b/dlls/inetmib1/Makefile.in @@ -2,5 +2,7 @@ MODULE = inetmib1.dll IMPORTS = snmpapi DELAYIMPORTS = iphlpapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 2f7b9ca..96e3b1f 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <assert.h> #include <stdarg.h> #include <stdlib.h>

1 0

Alexandre Julliard : infosoft: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 691fe545125cf9216e70d6e3afc58bd4a7a8c355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=691fe545125cf9216e70d6e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:08 2019 +0200 infosoft: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/Makefile.in | 2 ++ dlls/infosoft/infosoft_main.c | 1 - dlls/infosoft/wordbreaker.c | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index 359bd80..813e65d 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -1,6 +1,8 @@ MODULE = infosoft.dll IMPORTS = uuid advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ infosoft_main.c \ wordbreaker.c diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 9524291..1d93b49 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include <stdio.h> diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index ceb9e18..aa432eb 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -29,7 +28,6 @@ #include "winuser.h" #include "ole2.h" #include "indexsrv.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(infosoft); @@ -128,7 +126,7 @@ static HRESULT WINAPI wb_BreakText( IWordBreaker *iface, { case 0: /* skip spaces and punctuation */ - if (!ch || ispunctW(ch) || isspaceW(ch)) + if (!ch || iswpunct(ch) || iswspace(ch)) ts->iCur ++; else state = 1; @@ -136,7 +134,7 @@ static HRESULT WINAPI wb_BreakText( IWordBreaker *iface, case 1: /* find the end of the word */ - if (ch && !ispunctW(ch) && !isspaceW(ch)) + if (ch && !iswpunct(ch) && !iswspace(ch)) len++; else {

1 0

Alexandre Julliard : initpki: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: ccb6c28e4c7488e351a8d9c4ee1e1587682d970c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccb6c28e4c7488e351a8d9c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:22 2019 +0200 initpki: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/initpki/Makefile.in | 2 ++ dlls/initpki/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/initpki/Makefile.in b/dlls/initpki/Makefile.in index f8997f2..c1d2ffc 100644 --- a/dlls/initpki/Makefile.in +++ b/dlls/initpki/Makefile.in @@ -1,4 +1,6 @@ MODULE = initpki.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/initpki/main.c b/dlls/initpki/main.c index c5def6c..b7260f3 100644 --- a/dlls/initpki/main.c +++ b/dlls/initpki/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : inkobj: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 057447e824af2f87ccdd60c0fe5dc80765e2eb26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057447e824af2f87ccdd60c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:30 2019 +0200 inkobj: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inkobj/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/inkobj/Makefile.in b/dlls/inkobj/Makefile.in index 3025cd7..e5cede5 100644 --- a/dlls/inkobj/Makefile.in +++ b/dlls/inkobj/Makefile.in @@ -1,4 +1,6 @@ MODULE = inkobj.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ inkobj.c

1 0

Alexandre Julliard : inseng: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: bca0617fe2c2099e7b3cd758993dbf0ac28bc290 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca0617fe2c2099e7b3cd758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:38 2019 +0200 inseng: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inseng/Makefile.in | 2 ++ dlls/inseng/inseng_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 652e06b..797a0d2 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,6 +1,8 @@ MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = inseng_main.c IDL_SRCS = inseng_classes.idl diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 93649e2..631a936 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : itircl: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 193f5e9321d3914e6e4726573eae0e05acc2b0a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=193f5e9321d3914e6e472657… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:49 2019 +0200 itircl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itircl/Makefile.in | 2 ++ dlls/itircl/itircl_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/itircl/Makefile.in b/dlls/itircl/Makefile.in index b348829..6e360eb 100644 --- a/dlls/itircl/Makefile.in +++ b/dlls/itircl/Makefile.in @@ -1,4 +1,6 @@ MODULE = itircl.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ itircl_main.c diff --git a/dlls/itircl/itircl_main.c b/dlls/itircl/itircl_main.c index 4fb05c0..e35bbba 100644 --- a/dlls/itircl/itircl_main.c +++ b/dlls/itircl/itircl_main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : itss: Build with msvcrt.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: fcc40a07909dc7626b6d1e2ec73f823d828a47e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc40a07909dc7626b6d1e2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 11:14:22 2019 +0200 itss: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/Makefile.in | 2 ++ dlls/itss/chm_lib.c | 25 +++++++++++-------------- dlls/itss/itss.c | 2 -- dlls/itss/lzx.c | 17 ++++------------- dlls/itss/moniker.c | 16 +++++++--------- dlls/itss/protocol.c | 29 ++++++++++++++--------------- dlls/itss/storage.c | 26 ++++++++++++-------------- 7 files changed, 50 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc40a07909dc7626b6d…

1 0