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

Alexandre Julliard : regsvr32: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

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 : msiexec: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

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

Nikolay Sivov : ntdll: Initialize critical section debug info with correct pointer value.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: fe0f8a150fdaaf71052ab50597207086cf5f4b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe0f8a150fdaaf71052ab505… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:19:22 2019 +0300 ntdll: Initialize critical section debug info with correct pointer value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 3 ++- dlls/kernel32/tests/sync.c | 14 +++++++++++++- dlls/ntdll/critsection.c | 44 ++++++++++++++++++++++++++------------------ dlls/ntdll/tests/rtl.c | 1 - 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6d47d70..9f5b614 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -402,7 +402,8 @@ void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit ) HANDLE sem = crit->LockSemaphore; if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); crit->LockSemaphore = ConvertToGlobalHandle( sem ); - RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); + if (crit->DebugInfo != (void *)(ULONG_PTR)-1) + RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 188689a..97566f1 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2648,6 +2648,7 @@ static void test_crit_section(void) InitializeCriticalSection(&cs); ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); if (!pInitializeCriticalSectionEx) { @@ -2658,9 +2659,20 @@ static void test_crit_section(void) memset(&cs, 0, sizeof(cs)); ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); -todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + + cs.DebugInfo = NULL; + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } START_TEST(sync) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 42e432c..e8ffc1c 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -59,6 +59,13 @@ static inline void small_pause(void) #endif } +static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; + +static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) +{ + return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; +} + #ifdef __linux__ static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ @@ -226,7 +233,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; @@ -321,20 +328,21 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULON * so (e.g.) MakeCriticalSectionGlobal() doesn't free it using HeapFree(). */ if (flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) - crit->DebugInfo = NULL; + crit->DebugInfo = no_debug_info_marker; else - crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); - - if (crit->DebugInfo) { - crit->DebugInfo->Type = 0; - crit->DebugInfo->CreatorBackTraceIndex = 0; - crit->DebugInfo->CriticalSection = crit; - crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->EntryCount = 0; - crit->DebugInfo->ContentionCount = 0; - memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + if (crit->DebugInfo) + { + crit->DebugInfo->Type = 0; + crit->DebugInfo->CreatorBackTraceIndex = 0; + crit->DebugInfo->CriticalSection = crit; + crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->EntryCount = 0; + crit->DebugInfo->ContentionCount = 0; + memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + } } crit->LockCount = -1; crit->RecursionCount = 0; @@ -396,7 +404,7 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) crit->LockCount = -1; crit->RecursionCount = 0; crit->OwningThread = 0; - if (crit->DebugInfo) + if (crit_section_has_debuginfo( crit )) { /* only free the ones we made in here */ if (!crit->DebugInfo->Spare[0]) @@ -454,7 +462,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if ( status == STATUS_TIMEOUT ) { const char *name = NULL; - if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[0]; + if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; if (!name) name = "?"; ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); @@ -472,7 +480,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if (status == STATUS_WAIT_0) break; /* Throw exception only for Wine internal locks */ - if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[0])) continue; + if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; /* only throw deadlock exception if configured timeout is reached */ if (timeout > 0) continue; @@ -485,7 +493,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) rec.ExceptionInformation[0] = (ULONG_PTR)crit; RtlRaiseException( &rec ); } - if (crit->DebugInfo) crit->DebugInfo->ContentionCount++; + if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS; } @@ -518,7 +526,7 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 5fe72ec..62662cb 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3152,7 +3152,6 @@ static void test_RtlInitializeCriticalSectionEx(void) memset(&cs, 0x11, sizeof(cs)); pRtlInitializeCriticalSectionEx(&cs, 0, RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO); - todo_wine ok(cs.DebugInfo == no_debug, "expected DebugInfo == ~0, got %p\n", cs.DebugInfo); ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount);

1 0

Alexandre Julliard : progman: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

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 April 30, 2019

April 30, 2019

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 : msidb: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

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 : icinfo: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 30ab4fe8ca331b8521daef2707428978508b07cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ab4fe8ca331b8521daef27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:48:09 2019 +0200 icinfo: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/Makefile.in | 3 ++- programs/icinfo/icinfo.c | 17 ++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index fb642f0..a5de949 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -1,5 +1,6 @@ MODULE = icinfo.exe -APPMODE = -mconsole -municode IMPORTS = msvfw32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = icinfo.c diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 1059183..489e646 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -18,28 +18,27 @@ #include <stdio.h> #include <string.h> -#include <wine/unicode.h> #include "windows.h" #include "mmsystem.h" #include "vfw.h" -static int mywprintf(const WCHAR *format, ...) +static int WINAPIV mywprintf(const WCHAR *format, ...) { static char output_bufA[65536]; static WCHAR output_bufW[sizeof(output_bufA)]; - va_list parms; + __ms_va_list parms; DWORD nOut; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); - va_start(parms, format); - vsnprintfW(output_bufW, ARRAY_SIZE(output_bufW), format, parms); - va_end(parms); + __ms_va_start(parms, format); + vswprintf(output_bufW, ARRAY_SIZE(output_bufW), format, parms); + __ms_va_end(parms); /* Try to write as unicode whenever we think it's a console */ if (((DWORD_PTR)hout & 3) == 3) { - res = WriteConsoleW(hout, output_bufW, strlenW(output_bufW), &nOut, NULL); + res = WriteConsoleW(hout, output_bufW, lstrlenW(output_bufW), &nOut, NULL); } else { @@ -82,9 +81,9 @@ int wmain(int argc, WCHAR* argv[]) static const WCHAR unk_opt_fmt[] = {'U','n','k','n','o','w','n',' ','o','p','t','i','o','n',':',' ','%','s','\n',0}; for (i = 1; i < argc; i++) { - if (!strcmpW(argv[i], about)) + if (!lstrcmpW(argv[i], about)) doabout = 1; - else if (!strcmpW(argv[i], configure)) + else if (!lstrcmpW(argv[i], configure)) doconfigure = 1; else { mywprintf(unk_opt_fmt, argv[i]);

1 0

Alexandre Julliard : ipconfig: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

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

Alexandre Julliard : net: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

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

Nikolay Sivov : ntdll: Account for null terminating char in unload traces (Coverity).
by Alexandre Julliard April 30, 2019

April 30, 2019

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