March 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : krnl386: Get rid of DOS floppy disk support.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 7f2aef05066111362df6d789ec6108890f321b1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f2aef05066111362df6d789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:23:09 2020 +0100 krnl386: Get rid of DOS floppy disk support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosexe.h | 3 - dlls/krnl386.exe16/int13.c | 305 ---------------------------------------- dlls/krnl386.exe16/interrupts.c | 2 +- 4 files changed, 1 insertion(+), 310 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f2aef05066111362df6…

1 0

Alexandre Julliard : krnl386: Get rid of DOS EMS support.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: d94a4e46c1321a15951ef8dcdb5164564bf01ed7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94a4e46c1321a15951ef8dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:23:05 2020 +0100 krnl386: Get rid of DOS EMS support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosexe.h | 17 -- dlls/krnl386.exe16/int21.c | 1 - dlls/krnl386.exe16/int67.c | 495 ---------------------------------------- dlls/krnl386.exe16/interrupts.c | 5 +- 5 files changed, 1 insertion(+), 518 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d94a4e46c1321a15951e…

1 0

Gijs Vermeulen : cmd: Use wide character string literals in directory.c.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: e737aafa8e0beca5c53557ea2d37ed92263dbb38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e737aafa8e0beca5c53557ea… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Mar 24 21:12:51 2020 +0100 cmd: Use wide character string literals in directory.c. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/directory.c | 68 ++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 49 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index c38bdfce04..41e1f4e929 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -220,8 +220,7 @@ static void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) { /* Convert to a username */ if (LookupAccountSidW(NULL, pSID, name, &nameLen, domain, &domainLen, &nameuse)) { - static const WCHAR fmt[] = {'%','s','%','c','%','s','\0'}; - swprintf(owner, ownerlen, fmt, domain, '\\', name); + swprintf(owner, ownerlen, L"%s%c%s", domain, '\\', name); } heap_free(secBuffer); } @@ -253,10 +252,6 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le int concurrentDirs = 0; BOOL done_header = FALSE; - static const WCHAR fmtDir[] = {'%','1','!','1','0','s','!',' ',' ','%','2','!','8','s','!',' ',' ', - '<','D','I','R','>',' ',' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - static const WCHAR fmtFile[] = {'%','1','!','1','0','s','!',' ',' ','%','2','!','8','s','!',' ',' ', - ' ',' ','%','3','!','1','0','s','!',' ',' ','\0'}; static const WCHAR fmt2[] = {'%','1','!','-','1','3','s','!','\0'}; static const WCHAR fmt3[] = {'%','1','!','-','2','3','s','!','\0'}; static const WCHAR fmt4[] = {'%','1','\0'}; @@ -317,9 +312,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (!bare) { if (level != 0 && (entry_count > 0)) WCMD_output_asis (newlineW); if (!recurse || ((entry_count > 0) && done_header==FALSE)) { - static const WCHAR headerW[] = {'D','i','r','e','c','t','o','r','y',' ','o','f', - ' ','%','1','\n','\n','\0'}; - WCMD_output (headerW, real_path); + WCMD_output (L"Directory of %1\n\n", real_path); done_header = TRUE; } } @@ -388,13 +381,11 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le tmp_width = cur_width; if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - static const WCHAR fmt[] = {'[','%','1',']','\0'}; - WCMD_output (fmt, fd[i].cFileName); + WCMD_output (L"[%1]", fd[i].cFileName); dir_count++; tmp_width = tmp_width + lstrlenW(fd[i].cFileName) + 2; } else { - static const WCHAR fmt[] = {'%','1','\0'}; - WCMD_output (fmt, fd[i].cFileName); + WCMD_output (L"%1", fd[i].cFileName); tmp_width = tmp_width + lstrlenW(fd[i].cFileName) ; file_count++; file_size.u.LowPart = fd[i].nFileSizeLow; @@ -406,15 +397,14 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if ((cur_width + widest) > max_width) { cur_width = 0; } else { - static const WCHAR padfmt[] = {'%','1','!','*','s','!','\0'}; - WCMD_output(padfmt, cur_width - tmp_width, nullW); + WCMD_output(L"%1!*s!", cur_width - tmp_width, nullW); } } else if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { dir_count++; if (!bare) { - WCMD_output (fmtDir, datestring, timestring); + WCMD_output (L"%1!10s! %2!8s! <DIR> ", datestring, timestring); if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); WCMD_output(fmt4,fd[i].cFileName); @@ -433,7 +423,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; if (!bare) { - WCMD_output (fmtFile, datestring, timestring, + WCMD_output (L"%1!10s! %2!8s! %3!10s! ", datestring, timestring, WCMD_filesize64(file_size.QuadPart)); if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); @@ -449,14 +439,10 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (!bare) { if (file_count == 1) { - static const WCHAR fmt[] = {' ',' ',' ',' ',' ',' ',' ','1',' ','f','i','l','e',' ', - '%','1','!','2','5','s','!',' ','b','y','t','e','s','\n','\0'}; - WCMD_output (fmt, WCMD_filesize64 (byte_count.QuadPart)); + WCMD_output (L" 1 file %1!25s! bytes\n", WCMD_filesize64 (byte_count.QuadPart)); } else { - static const WCHAR fmt[] = {'%','1','!','8','d','!',' ','f','i','l','e','s',' ','%','2','!','2','4','s','!', - ' ','b','y','t','e','s','\n','\0'}; - WCMD_output (fmt, file_count, WCMD_filesize64 (byte_count.QuadPart)); + WCMD_output (L"%1!8d! files %2!24s! bytes\n", file_count, WCMD_filesize64 (byte_count.QuadPart)); } } byte_total = byte_total + byte_count.QuadPart; @@ -465,13 +451,9 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (!bare && !recurse) { if (dir_count == 1) { - static const WCHAR fmt[] = {'%','1','!','8','d','!',' ','d','i','r','e','c','t','o','r','y', - ' ',' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - WCMD_output (fmt, 1); + WCMD_output (L"%1!8d! directory ", 1); } else { - static const WCHAR fmt[] = {'%','1','!','8','d','!',' ','d','i','r','e','c','t','o','r','i', - 'e','s','\0'}; - WCMD_output (fmt, dir_count); + WCMD_output (L"%1!8d! directories", dir_count); } } } @@ -555,7 +537,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le static void WCMD_dir_trailer(WCHAR drive) { ULARGE_INTEGER avail, total, freebytes; DWORD status; - WCHAR driveName[] = {'c',':','\\','\0'}; + WCHAR driveName[] = L"c:\\"; driveName[0] = drive; status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes); @@ -564,18 +546,10 @@ static void WCMD_dir_trailer(WCHAR drive) { if (errorlevel==0 && !bare) { if (recurse) { - static const WCHAR fmt1[] = {'\n',' ',' ',' ',' ',' ','T','o','t','a','l',' ','f','i','l','e','s', - ' ','l','i','s','t','e','d',':','\n','%','1','!','8','d','!',' ','f','i','l','e', - 's','%','2','!','2','5','s','!',' ','b','y','t','e','s','\n','\0'}; - static const WCHAR fmt2[] = {'%','1','!','8','d','!',' ','d','i','r','e','c','t','o','r','i','e','s',' ','%', - '2','!','1','8','s','!',' ','b','y','t','e','s',' ','f','r','e','e','\n','\n', - '\0'}; - WCMD_output (fmt1, file_total, WCMD_filesize64 (byte_total)); - WCMD_output (fmt2, dir_total, WCMD_filesize64 (freebytes.QuadPart)); + WCMD_output (L"\n Total files listed:\n%1!8d! files%2!25s! bytes\n", file_total, WCMD_filesize64 (byte_total)); + WCMD_output (L"%1!8d! directories %2!18s! bytes free\n\n", dir_total, WCMD_filesize64 (freebytes.QuadPart)); } else { - static const WCHAR fmt[] = {' ','%','1','!','1','8','s','!',' ','b','y','t','e','s',' ','f','r','e','e', - '\n','\n','\0'}; - WCMD_output (fmt, WCMD_filesize64 (freebytes.QuadPart)); + WCMD_output (L" %1!18s! bytes free\n\n", WCMD_filesize64 (freebytes.QuadPart)); } } } @@ -605,12 +579,11 @@ void WCMD_directory (WCHAR *args) WCHAR dir[MAX_PATH]; WCHAR fname[MAX_PATH]; WCHAR ext[MAX_PATH]; - static const WCHAR dircmdW[] = {'D','I','R','C','M','D','\0'}; errorlevel = 0; /* Prefill quals with (uppercased) DIRCMD env var */ - if (GetEnvironmentVariableW(dircmdW, string, ARRAY_SIZE(string))) { + if (GetEnvironmentVariableW(L"DIRCMD", string, ARRAY_SIZE(string))) { p = string; while ( (*p = toupper(*p)) ) ++p; lstrcatW(string,quals); @@ -804,11 +777,9 @@ void WCMD_directory (WCHAR *args) lstrcpyW(fullname, thisArg); } else if (thisArg[1] == ':' && thisArg[2] != '\\') { WCHAR envvar[4]; - static const WCHAR envFmt[] = {'=','%','c',':','\0'}; - wsprintfW(envvar, envFmt, thisArg[0]); + wsprintfW(envvar, L"=%c:", thisArg[0]); if (!GetEnvironmentVariableW(envvar, fullname, MAX_PATH)) { - static const WCHAR noEnvFmt[] = {'%','c',':','\0'}; - wsprintfW(fullname, noEnvFmt, thisArg[0]); + wsprintfW(fullname, L"%c:", thisArg[0]); } lstrcatW(fullname, slashW); lstrcatW(fullname, &thisArg[2]); @@ -906,8 +877,7 @@ void WCMD_directory (WCHAR *args) } } } else { - static const WCHAR newLine2[] = {'\n','\n','\0'}; - if (!bare) WCMD_output_asis (newLine2); + if (!bare) WCMD_output_asis (L"\n\n"); } /* Clear any errors from previous invocations, and process it */

1 0

Alexandre Julliard : krnl386: Fix some calling convention mismatches.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 7b68705d3cf5642f7a71e5c18b9bf66a768452c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b68705d3cf5642f7a71e5c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:22:41 2020 +0100 krnl386: Fix some calling convention mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/selector.c | 18 +++++++++--------- dlls/krnl386.exe16/thunk.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 8c45d6af04..765d2ee9b8 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -575,7 +575,7 @@ __ASM_STDCALL_FUNC( SUnMapLS, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_8, 0, "movl 8(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,8(%ebp)\n\t" "ret" ) @@ -584,7 +584,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_8, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_12, 0, "movl 12(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,12(%ebp)\n\t" "ret" ) @@ -593,7 +593,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_12, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_16, 0, "movl 16(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,16(%ebp)\n\t" "ret" ) @@ -602,7 +602,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_16, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_20, 0, "movl 20(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,20(%ebp)\n\t" "ret" ) @@ -611,7 +611,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_20, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_24, 0, "movl 24(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,24(%ebp)\n\t" "ret" ) @@ -620,7 +620,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_24, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_28, 0, "movl 28(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,28(%ebp)\n\t" "ret" ) @@ -629,7 +629,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_28, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_32, 0, "movl 32(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,32(%ebp)\n\t" "ret" ) @@ -638,7 +638,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_32, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_36, 0, "movl 36(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,36(%ebp)\n\t" "ret" ) @@ -647,7 +647,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_36, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_40, 0, "movl 40(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,40(%ebp)\n\t" "ret" ) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 91a24f19c4..3b54bd4edc 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -148,10 +148,10 @@ SEGPTR CALL32_CBClientEx_RetAddr = 0; extern int call_entry_point( void *func, int nb_args, const DWORD *args ); extern void __wine_call_from_16_thunk(void); -extern void FT_Prolog(void); -extern void FT_PrologPrime(void); -extern void QT_Thunk(void); -extern void QT_ThunkPrime(void); +extern void WINAPI FT_Prolog(void); +extern void WINAPI FT_PrologPrime(void); +extern void WINAPI QT_Thunk(void); +extern void WINAPI QT_ThunkPrime(void); /*********************************************************************** * *

1 0

Gijs Vermeulen : cmd: Use wide character string literals in batch.c.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 5fd548fc9b17fe5010704031b260cee574f737c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd548fc9b17fe5010704031… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Mar 24 21:12:50 2020 +0100 cmd: Use wide character string literals in batch.c. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index f494b80ae2..371f75af54 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -224,8 +224,7 @@ WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline) { - static const WCHAR defaultDelims[] = { ' ', '\t', ',', '=', ';', '\0' }; - return WCMD_parameter_with_delims (s, n, start, raw, wholecmdline, defaultDelims); + return WCMD_parameter_with_delims (s, n, start, raw, wholecmdline, L" \t,=;"); } /**************************************************************************** @@ -537,11 +536,10 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */ if (wmemchr(firstModifier, 'a', modifierLen) != NULL) { - WCHAR defaults[] = {'-','-','-','-','-','-','-','-','-','\0'}; doneModifier = TRUE; if (exists) { - lstrcpyW(thisoutput, defaults); + lstrcpyW(thisoutput, L"---------"); if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) thisoutput[0]='d'; if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) @@ -589,12 +587,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* FIXME: Output full 64 bit size (sprintf does not support I64 here) */ ULONG/*64*/ fullsize = /*(fileInfo.nFileSizeHigh << 32) +*/ fileInfo.nFileSizeLow; - static const WCHAR fmt[] = {'%','u','\0'}; doneModifier = TRUE; if (exists) { if (finaloutput[0] != 0x00) lstrcatW(finaloutput, spaceW); - wsprintfW(thisoutput, fmt, fullsize); + wsprintfW(thisoutput, L"%u", fullsize); lstrcatW(finaloutput, thisoutput); } }

1 0

Dmitry Timoshkov : adsldp: Forward IADsOpenDSObject::AddRef/Release to base object.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 2512bf2c1def78edafaf4bbd8448bfb97f44b1dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2512bf2c1def78edafaf4bbd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:17:35 2020 +0800 adsldp: Forward IADsOpenDSObject::AddRef/Release to base object. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7ff1aa09b4..c49f9ef70b 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -806,21 +806,13 @@ static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID rii static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface) { LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); - return InterlockedIncrement(&ldap->ref); + return IADs_AddRef(&ldap->IADs_iface); } static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface) { LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); - LONG ref = InterlockedDecrement(&ldap->ref); - - if (!ref) - { - TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, ldap); - } - - return ref; + return IADs_Release(&ldap->IADs_iface); } static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count)

1 0

Nikolay Sivov : mf: Fix string array access for registration data helpers.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: d0f4487c61f6393021bef6ea9d6c33aed38824b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0f4487c61f6393021bef6ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 15:01:24 2020 +0300 mf: Fix string array access for registration data helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 8e42837b46..ac80c51016 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1090,7 +1090,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *count, BOOL unique, const WCHAR *str) +static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *capacity, BOOL unique, const WCHAR *str) { WCHAR *ptrW; int len, i; @@ -1104,17 +1104,17 @@ static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *coun } } - if (!vector->calpwstr.cElems || *count > vector->calpwstr.cElems - 1) + if (!*capacity || *capacity - 1 < vector->calpwstr.cElems) { unsigned int new_count; WCHAR **ptr; - new_count = *count ? *count * 2 : 10; + new_count = *capacity ? *capacity * 2 : 10; ptr = CoTaskMemRealloc(vector->calpwstr.pElems, new_count * sizeof(*vector->calpwstr.pElems)); if (!ptr) return E_OUTOFMEMORY; vector->calpwstr.pElems = ptr; - *count = new_count; + *capacity = new_count; } len = lstrlenW(str); @@ -1129,12 +1129,14 @@ static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *coun static int __cdecl qsort_string_compare(const void *a, const void *b) { - return lstrcmpW(a, b); + const WCHAR *left = *(const WCHAR **)a, *right = *(const WCHAR **)b; + return lstrcmpW(left, right); } static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int maxlen, PROPVARIANT *dst) { static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + unsigned int capacity = 0, count, size; HRESULT hr = S_OK; int i, index; WCHAR *buffW; @@ -1148,8 +1150,6 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned for (i = 0; i < ARRAY_SIZE(hkey_roots); ++i) { - unsigned int count; - DWORD size; HKEY hkey; if (RegOpenKeyW(hkey_roots[i], path, &hkey)) @@ -1162,7 +1162,8 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned { if (filter && !wcschr(buffW, filter)) continue; - if (FAILED(hr = prop_string_vector_append(dst, &count, i > 0, buffW))) + + if (FAILED(hr = prop_string_vector_append(dst, &capacity, i > 0, buffW))) break; size = maxlen; }

1 0

Dmitry Timoshkov : adsldp: Turn FIXME into a TRACE for IADsOpenDSObject::OpenDSObject().
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 0662aaaddc0679abe032ca8ea9f48c34cba48179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0662aaaddc0679abe032ca8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:17:24 2020 +0800 adsldp: Turn FIXME into a TRACE for IADsOpenDSObject::OpenDSObject(). It's in a good enough state already. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 03f7571afd..7ff1aa09b4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -924,7 +924,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B HRESULT hr; ULONG err; - FIXME("%p,%s,%s,%p,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); + TRACE("%p,%s,%s,%p,%08x,%p\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); hr = parse_path(path, &host, &port, &object); if (hr != S_OK) return hr;

1 0

Liam Middlebrook : winevulkan: Generate typedefs for aliased structs.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: bdeae71bc129ac83c44753672d110b06a480c93c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdeae71bc129ac83c4475367… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Tue Mar 24 14:14:43 2020 -0700 winevulkan: Generate typedefs for aliased structs. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: James Jones <jajones(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 21 +++++- dlls/winevulkan/vulkan_thunks.h | 80 +++++++++++++++++++++++ include/wine/vulkan.h | 137 +++++++++++++++++++++++++++++++++------- 3 files changed, 214 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdeae71bc129ac83c447…

1 0

Jacek Caban : ntdll: Support device paths in LdrGetDllPath.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 1a05b7da6335772af50636a31be6d4f9f58ade16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a05b7da6335772af50636a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 14:15:36 2020 +0100 ntdll: Support device paths in LdrGetDllPath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48698 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 18 ++++++++++++++++++ dlls/ntdll/loader.c | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 7342a865af..0e45ad44ff 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2635,6 +2635,24 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( fooW, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); ok( ret == STATUS_INVALID_PARAMETER, "LdrGetDllPath failed %x\n", ret ); + lstrcpyW( buffer, L"\\\\?\\" ); + lstrcatW( buffer, dlldir ); + p = buffer + lstrlenW(buffer); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + ok( !memcmp( path, L"\\\\?\\", 4 * sizeof(WCHAR) ) && path_equal( path + 4, dlldir ), + "got %s expected \\\\?\\%s\n", wine_dbgstr_w(path), wine_dbgstr_w(dlldir)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"\\\\?\\c:\\test.dll", LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\'; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 85eb297680..1b641f1b9d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2204,7 +2204,7 @@ static NTSTATUS get_dll_load_path_search_flags( LPCWSTR module, DWORD flags, WCH if (flags & LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR) { DWORD type = RtlDetermineDosPathNameType_U( module ); - if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH) + if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH && type != DEVICE_PATH) return STATUS_INVALID_PARAMETER; mod_end = get_module_path_end( module ); len += (mod_end - module) + 1;

1 0