wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Dmitry Timoshkov : crypt32: CryptMsgUpdate should skip broken certificates.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: 1875620466d178faead9d0ccea08bd2eee7c7722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1875620466d178faead9d0cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 30 17:55:24 2019 +0800 crypt32: CryptMsgUpdate should skip broken certificates. CertOpenStore() already verifies the certificate before adding it to the memory store from the file, this patch makes CryptMsgUpdate() behave in a similar way. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45757 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index ce068f3..aa697e3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -683,6 +683,13 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, &itemDecoded); if (ret) { + /* Ignore an item that failed to decode but the decoder doesn't want to fail the whole process */ + if (!size) + { + ptr += itemEncoded; + continue; + } + cItems++; if (itemSizes != &itemSize) itemSizes = CryptMemRealloc(itemSizes, @@ -5628,6 +5635,25 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL verify_and_copy_certificate(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + PCCERT_CONTEXT cert; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, pbEncoded, cbEncoded); + if (!cert) + { + WARN("CertCreateCertificateContext error %#x\n", GetLastError()); + *pcbStructInfo = 0; + *pcbDecoded = 0; + return TRUE; + } + + CertFreeCertificateContext(cert); + + return CRYPT_AsnDecodeCopyBytes(pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, pcbDecoded); +} + static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5637,7 +5663,7 @@ static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, offsetof(CRYPT_SIGNED_INFO, cCertEncoded), offsetof(CRYPT_SIGNED_INFO, rgCertEncoded), MEMBERSIZE(CRYPT_SIGNED_INFO, cCertEncoded, cCrlEncoded), - CRYPT_AsnDecodeCopyBytes, + verify_and_copy_certificate, sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,

1 0

Nikolay Sivov : ntdll: Account for null terminating char in unload traces (Coverity).
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: 9fcb2c88222de1943784d7b4dd7d18374706740e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fcb2c88222de1943784d7b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 12:26:26 2019 +0300 ntdll: Account for null terminating char in unload traces (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 994ff6f..034b98c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -177,7 +177,7 @@ static unsigned int unload_trace_seq; static void module_push_unload_trace( const LDR_MODULE *ldr ) { RTL_UNLOAD_EVENT_TRACE *ptr = &unload_traces[unload_trace_seq]; - unsigned int len = min(sizeof(ptr->ImageName), ldr->BaseDllName.Length); + unsigned int len = min(sizeof(ptr->ImageName) - sizeof(WCHAR), ldr->BaseDllName.Length); ptr->BaseAddress = ldr->BaseAddress; ptr->SizeOfImage = ldr->SizeOfImage;

1 0

Alexandre Julliard : regsvr32: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: 4c5dd0e51370881133c3423272dcac3f6b3b27fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c5dd0e51370881133c34232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:51:01 2019 +0200 regsvr32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/Makefile.in | 3 ++- programs/regsvr32/regsvr32.c | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index 15646a6..d8aee0e 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -1,7 +1,8 @@ MODULE = regsvr32.exe -APPMODE = -mwindows -municode IMPORTS = ole32 user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ regsvr32.c diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index cfbb80d..77a839e 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -22,14 +22,9 @@ */ #define WIN32_LEAN_AND_MEAN - -#include "config.h" -#include "wine/port.h" - #include <windows.h> #include <ole2.h> #include "regsvr32.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(regsvr32); @@ -195,7 +190,7 @@ static WCHAR *parse_command_line(WCHAR *command_line) { if (command_line[0] == ':' && command_line[1]) { - int len = strlenW(command_line); + int len = lstrlenW(command_line); command_line++; len--; @@ -246,7 +241,7 @@ int wmain(int argc, WCHAR* argv[]) if (argv[i][2] && argv[i][2] != ':') continue; - switch (tolowerW(argv[i][1])) + switch (towlower(argv[i][1])) { case 'u': Unregister = TRUE;

1 0

Alexandre Julliard : progman: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: 65e2d341a01a876526b028cc5877badb1a30c444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e2d341a01a876526b028cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:50:49 2019 +0200 progman: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/progman/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index a15100a..46ca3d3 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -1,7 +1,8 @@ MODULE = progman.exe -APPMODE = -mwindows IMPORTS = shell32 comdlg32 user32 gdi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ dialog.c \ group.c \

1 0

Alexandre Julliard : oleview: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: cd6aa5f229c8135a4b9902411c0d7789ca37ed90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd6aa5f229c8135a4b990241… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:50:41 2019 +0200 oleview: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/Makefile.in | 3 ++- programs/oleview/oleview.c | 1 - programs/oleview/typelib.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 0a30f10..bf305c3 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -1,7 +1,8 @@ MODULE = oleview.exe -APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ details.c \ interface.c \ diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index ca4710e..410cb05 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -21,7 +21,6 @@ #include "main.h" #include "commdlg.h" #include "shellapi.h" -#include "wine/unicode.h" GLOBALS globals; static const WCHAR wszRegEdit[] = { '\\','r','e','g','e','d','i','t','.','e','x','e','\0' }; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 99de87b..92dbebc 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -21,7 +21,6 @@ #include "main.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(oleview); @@ -607,7 +606,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen if(pTypeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION) { AddToTLDataStrW(tld, wszVT_HRESULT); - if(strcmpW(wszText, wszVT_VOID)) pFuncDesc->cParams++; + if(lstrcmpW(wszText, wszVT_VOID)) pFuncDesc->cParams++; } else { AddToTLDataStrW(tld, wszText);

1 0

Alexandre Julliard : netstat: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: b13ce7597bba40cf3eabfe9fadff75d6b6db37a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13ce7597bba40cf3eabfe9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 11:54:02 2019 +0200 netstat: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/Makefile.in | 3 ++- programs/netstat/netstat.c | 39 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/programs/netstat/Makefile.in b/programs/netstat/Makefile.in index 78389db..7b877a7 100644 --- a/programs/netstat/Makefile.in +++ b/programs/netstat/Makefile.in @@ -1,7 +1,8 @@ MODULE = netstat.exe -APPMODE = -mconsole -municode IMPORTS = iphlpapi user32 ws2_32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = netstat.c RC_SRCS = netstat.rc diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index afa211d..b332020 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -17,10 +17,10 @@ */ #define NONAMELESSUNION +#include <stdio.h> #include "netstat.h" #include <winsock2.h> #include <iphlpapi.h> -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netstat); @@ -146,7 +146,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - strcpyW(msg, failedW); + lstrcpyW(msg, failedW); } return msg; } @@ -154,7 +154,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { static WCHAR *NETSTAT_port_name(UINT port, WCHAR name[]) { /* FIXME: can we get the name? */ - sprintfW(name, fmtport, htons((WORD)port)); + swprintf(name, 32, fmtport, htons((WORD)port)); return name; } @@ -164,7 +164,8 @@ static WCHAR *NETSTAT_host_name(UINT ip, WCHAR name[]) /* FIXME: can we get the name? */ nip = htonl(ip); - sprintfW(name, fmtip, (nip >> 24) & 0xFF, (nip >> 16) & 0xFF, (nip >> 8) & 0xFF, (nip) & 0xFF); + swprintf(name, MAX_HOSTNAME_LEN, fmtip, + (nip >> 24) & 0xFF, (nip >> 16) & 0xFF, (nip >> 8) & 0xFF, (nip) & 0xFF); return name; } @@ -173,9 +174,9 @@ static void NETSTAT_conn_header(void) WCHAR local[22], remote[22], state[22]; NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_TCP_ACTIVE_CONN)); NETSTAT_wprintf(fmtn); - strcpyW(local, NETSTAT_load_message(IDS_TCP_LOCAL_ADDR)); - strcpyW(remote, NETSTAT_load_message(IDS_TCP_REMOTE_ADDR)); - strcpyW(state, NETSTAT_load_message(IDS_TCP_STATE)); + lstrcpyW(local, NETSTAT_load_message(IDS_TCP_LOCAL_ADDR)); + lstrcpyW(remote, NETSTAT_load_message(IDS_TCP_REMOTE_ADDR)); + lstrcpyW(state, NETSTAT_load_message(IDS_TCP_STATE)); NETSTAT_wprintf(fmttcpout, NETSTAT_load_message(IDS_TCP_PROTO), local, remote, state); } @@ -199,7 +200,7 @@ static void NETSTAT_eth_stats(void) NETSTAT_wprintf(NETSTAT_load_message(IDS_ETH_STAT)); NETSTAT_wprintf(fmtn); NETSTAT_wprintf(fmtn); - strcpyW(recv, NETSTAT_load_message(IDS_ETH_RECV)); + lstrcpyW(recv, NETSTAT_load_message(IDS_ETH_RECV)); NETSTAT_wprintf(fmtethheader, recv, NETSTAT_load_message(IDS_ETH_SENT)); octets[0] = octets[1] = 0; @@ -264,8 +265,8 @@ static void NETSTAT_tcp_table(void) NETSTAT_host_name(table->table[i].dwRemoteAddr, RemoteIp); NETSTAT_port_name(table->table[i].dwRemotePort, RemotePort); - sprintfW(Host, fmtcolon, HostIp, HostPort); - sprintfW(Remote, fmtcolon, RemoteIp, RemotePort); + swprintf(Host, ARRAY_SIZE(Host), fmtcolon, HostIp, HostPort); + swprintf(Remote, ARRAY_SIZE(Remote), fmtcolon, RemoteIp, RemotePort); NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, tcpstatesW[table->table[i].u.dwState]); } } @@ -313,7 +314,7 @@ static void NETSTAT_udp_table(void) NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); NETSTAT_port_name(table->table[i].dwLocalPort, HostPort); - sprintfW(Host, fmtcolon, HostIp, HostPort); + swprintf(Host, ARRAY_SIZE(Host), fmtcolon, HostIp, HostPort); NETSTAT_wprintf(fmtudpout, udpW, Host); } HeapFree(GetProcessHeap(), 0, table); @@ -336,14 +337,14 @@ static void NETSTAT_udp_stats(void) static NETSTATPROTOCOLS NETSTAT_get_protocol(WCHAR name[]) { - if (!strcmpiW(name, ipW)) return PROT_IP; - if (!strcmpiW(name, ipv6W)) return PROT_IPV6; - if (!strcmpiW(name, icmpW)) return PROT_ICMP; - if (!strcmpiW(name, icmpv6W)) return PROT_ICMPV6; - if (!strcmpiW(name, tcpW)) return PROT_TCP; - if (!strcmpiW(name, tcpv6W)) return PROT_TCPV6; - if (!strcmpiW(name, udpW)) return PROT_UDP; - if (!strcmpiW(name, udpv6W)) return PROT_UDPV6; + if (!wcsicmp(name, ipW)) return PROT_IP; + if (!wcsicmp(name, ipv6W)) return PROT_IPV6; + if (!wcsicmp(name, icmpW)) return PROT_ICMP; + if (!wcsicmp(name, icmpv6W)) return PROT_ICMPV6; + if (!wcsicmp(name, tcpW)) return PROT_TCP; + if (!wcsicmp(name, tcpv6W)) return PROT_TCPV6; + if (!wcsicmp(name, udpW)) return PROT_UDP; + if (!wcsicmp(name, udpv6W)) return PROT_UDPV6; return PROT_UNKNOWN; }

1 0

Alexandre Julliard : net: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: cf391dc3e7c35b6d34ef807f9d3f16a009b7029a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf391dc3e7c35b6d34ef807f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:50:04 2019 +0200 net: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/Makefile.in | 3 ++- programs/net/net.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 5890278..eacbc85 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -1,7 +1,8 @@ MODULE = net.exe -APPMODE = -mconsole -municode IMPORTS = netapi32 user32 advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = net.c RC_SRCS = net.rc diff --git a/programs/net/net.c b/programs/net/net.c index 8a4c3f1..b364369 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -18,7 +18,6 @@ #include <windows.h> #include <lm.h> -#include <wine/unicode.h> #include <wine/debug.h> #include "resources.h"

1 0

Alexandre Julliard : msiexec: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: 8dff0e34452f4874873c91a7ec3b92a7cf1c3e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dff0e34452f4874873c91a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 12:10:09 2019 +0200 msiexec: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/Makefile.in | 3 ++- programs/msiexec/msiexec.c | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 6d0cf9a..e82acc0 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -1,7 +1,8 @@ MODULE = msiexec.exe -APPMODE = -mwindows IMPORTS = msi ole32 advapi32 user32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ msiexec.c \ service.c diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 3340ade..17d4bf8 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -29,7 +29,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "initguid.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -92,7 +91,7 @@ static void ShowUsage(int ExitCode) *msi_res = 0; LoadStringW(hmsi, 10, msi_res, len + 1); - sprintfW(msiexec_help, msi_res, msiexec_version); + swprintf(msiexec_help, len + 1 + ARRAY_SIZE(msiexec_version), msi_res, msiexec_version); MsiMessageBoxW(0, msiexec_help, NULL, 0, GetUserDefaultLangID(), 0); } HeapFree(GetProcessHeap(), 0, msi_res); @@ -153,7 +152,7 @@ static LPWSTR build_properties(struct string_list *property_list) p = ret; for(list = property_list; list; list = list->next) { - value = strchrW(list->str,'='); + value = wcschr(list->str,'='); if(!value) continue; len = value - list->str; @@ -164,7 +163,7 @@ static LPWSTR build_properties(struct string_list *property_list) /* check if the value contains spaces and maybe quote it */ value++; - needs_quote = strchrW(value,' ') ? 1 : 0; + needs_quote = wcschr(value,' ') ? 1 : 0; if(needs_quote) *p++ = '"'; len = lstrlenW(value); @@ -420,13 +419,13 @@ static int custom_action_server(const WCHAR *arg) TRACE("%s\n", debugstr_w(arg)); - if (!(client_pid = atoiW(arg))) + if (!(client_pid = wcstol(arg, NULL, 10))) { ERR("Invalid parameter %s\n", debugstr_w(arg)); return 1; } - sprintfW(buffer, pipe_name, client_pid, sizeof(void *) * 8); + swprintf(buffer, ARRAY_SIZE(buffer), pipe_name, client_pid, sizeof(void *) * 8); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) {

1 0

Alexandre Julliard : msidb: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: 40058d04866589b733711db03dcac522dba35ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=40058d04866589b733711db0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 11:53:27 2019 +0200 msidb: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/Makefile.in | 3 ++- programs/msidb/main.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in index 5efb431..1e9e404 100644 --- a/programs/msidb/Makefile.in +++ b/programs/msidb/Makefile.in @@ -1,5 +1,6 @@ MODULE = msidb.exe -APPMODE = -mconsole -municode IMPORTS = msi shlwapi +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = main.c diff --git a/programs/msidb/main.c b/programs/msidb/main.c index 36255c4..2a3458e 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -21,13 +21,13 @@ #define WIN32_LEAN_AND_MEAN #include <stdlib.h> +#include <stdio.h> #include <windows.h> #include <msi.h> #include <msiquery.h> #include <shlwapi.h> #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); @@ -132,7 +132,7 @@ static int valid_state( struct msidb_state *state ) static int process_argument( struct msidb_state *state, int i, int argc, WCHAR *argv[] ) { /* msidb accepts either "-" or "/" style flags */ - if (strlenW(argv[i]) != 2 || (argv[i][0] != '-' && argv[i][0] != '/')) + if (lstrlenW(argv[i]) != 2 || (argv[i][0] != '-' && argv[i][0] != '/')) return 0; switch( argv[i][1] ) { @@ -220,9 +220,9 @@ static const WCHAR *basenameW( const WCHAR *filename ) { const WCHAR *dir_end; - dir_end = strrchrW( filename, '/' ); + dir_end = wcsrchr( filename, '/' ); if (dir_end) return dir_end + 1; - dir_end = strrchrW( filename, '\\' ); + dir_end = wcsrchr( filename, '\\' ); if (dir_end) return dir_end + 1; return filename; } @@ -460,14 +460,14 @@ static int import_tables( struct msidb_state *state ) WCHAR *ext; /* permit specifying tables with wildcards ('Feature*') */ - if (strstrW( table_name, wildcard ) != NULL) + if (wcsstr( table_name, wildcard ) != NULL) { WIN32_FIND_DATAW f; HANDLE handle; WCHAR *path; DWORD len; - len = strlenW( state->table_folder ) + 1 + strlenW( table_name ) + 1; /* %s/%s\0 */ + len = lstrlenW( state->table_folder ) + 1 + lstrlenW( table_name ) + 1; /* %s/%s\0 */ path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); if (path == NULL) return 0; @@ -498,7 +498,7 @@ static int import_tables( struct msidb_state *state ) if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0) { const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); + swprintf( table_path, ARRAY_SIZE(table_path), format, table_name ); table_name = table_path; } if (!import_table( state, table_name )) @@ -515,7 +515,7 @@ static int export_table( struct msidb_state *state, const WCHAR *table_name ) WCHAR table_path[MAX_PATH]; UINT ret; - snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); + swprintf( table_path, ARRAY_SIZE(table_path), format, table_name ); ret = MsiDatabaseExportW( state->database_handle, table_name, state->table_folder, table_path ); if (ret != ERROR_SUCCESS) { @@ -603,7 +603,7 @@ static int export_tables( struct msidb_state *state ) LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) { - if (strcmpW( data->name, wildcard ) == 0) + if (lstrcmpW( data->name, wildcard ) == 0) { if (!export_all_tables( state )) return 0; /* failed, do not commit changes */

1 0

Alexandre Julliard : ipconfig: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: adeb282c3329c1525e1d40b80c2764b872c5d1fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=adeb282c3329c1525e1d40b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:49:31 2019 +0200 ipconfig: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/Makefile.in | 3 ++- programs/ipconfig/ipconfig.c | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 9a56319..0bb93ec 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -1,7 +1,8 @@ MODULE = ipconfig.exe -APPMODE = -mconsole -municode IMPORTS = iphlpapi ws2_32 user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = ipconfig.c RC_SRCS = ipconfig.rc diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 4370a28..adb3f8d 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -21,10 +21,10 @@ #define NONAMELESSUNION +#include <stdio.h> #include <winsock2.h> #include <windows.h> #include <iphlpapi.h> -#include <wine/unicode.h> #include "ipconfig.h" @@ -130,7 +130,7 @@ static void print_field(int msg, const WCHAR *value) WCHAR name_buffer[ARRAY_SIZE(field)]; LoadStringW(GetModuleHandleW(NULL), msg, name_buffer, ARRAY_SIZE(name_buffer)); - memcpy(field, name_buffer, sizeof(WCHAR) * min(strlenW(name_buffer), ARRAY_SIZE(field) - 1)); + memcpy(field, name_buffer, sizeof(WCHAR) * min(lstrlenW(name_buffer), ARRAY_SIZE(field) - 1)); ipconfig_printfW(formatW, field, value); } @@ -259,10 +259,10 @@ static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len) for (i = 0; i < len - 1; i++) { - sprintfW(p, fmtW, addr[i]); + swprintf(p, 4, fmtW, addr[i]); p += 3; } - sprintfW(p, fmt2W, addr[i]); + swprintf(p, 3, fmt2W, addr[i]); } return buf; @@ -386,13 +386,13 @@ int wmain(int argc, WCHAR *argv[]) if (argc > 1) { - if (!strcmpW(slashHelp, argv[1])) + if (!lstrcmpW(slashHelp, argv[1])) { ipconfig_message(STRING_USAGE); WSACleanup(); return 1; } - else if (!strcmpiW(slashAll, argv[1])) + else if (!wcsicmp(slashAll, argv[1])) { if (argv[2]) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019