December 2015 - Wine-commits

Jeremy White : kernel32: Advance over the input buffer when stripping ./.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 440030b93848d1c41f532cac21320f75a8c67231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440030b93848d1c41f532cac2… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:08 2015 -0600 kernel32: Advance over the input buffer when stripping ./. This is the same fix for GetLongPathName that was contained in a fix for GetShortPathName in commit 9178d037d71e823f5d5eaa5008a3cdd574377bac. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 1 + dlls/kernel32/tests/path.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ff94227..ec14b35 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -349,6 +349,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen { tmplongpath[lp++] = *p++; tmplongpath[lp++] = *p++; + sp += 2; } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (shortpath + sp); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e90a260..4504603 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2138,9 +2138,7 @@ static void test_relative_path(void) strcpy(buf, "deadbeef"); ret = pGetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); - todo_wine ok(ret, "GetLongPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA(".\\..\\foo\\file", buf, MAX_PATH);

1 0

Jeremy White : kernel32/tests: Add tests for GetLongPathName using a slash delimiter.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 60836b41fa7cfc6505763a357d2296598edd5fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60836b41fa7cfc6505763a357… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:09 2015 -0600 kernel32/tests: Add tests for GetLongPathName using a slash delimiter. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 4504603..0e9415c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -858,6 +858,21 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(SHORTFILE,strptr)==0, "GetFullPathNameA returned part '%s' instead of '%s'\n",strptr,SHORTFILE); } + /* Don't Starve relies on GetLongPathName returning the passed in filename, + even if the actual file on disk has a different case or separator */ + if (pGetLongPathNameA) { + sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + /**/ sprintf(tmpstr,"%c:%s/%s",curdir[0],SHORTDIR,SHORTFILE); ok(GetFullPathNameA(tmpstr,MAX_PATH,tmpstr1,&strptr),"GetFullPathNameA failed\n");

1 0

Jeremy White : kernel32/tests: Add a test for GetShortPathName using a slash delimieter.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 17ddd0474f1a310ad6fe169fcee44c40fde92b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ddd0474f1a310ad6fe169fc… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:10 2015 -0600 kernel32/tests: Add a test for GetShortPathName using a slash delimieter. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0e9415c..63666c6 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -872,6 +872,11 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); } + sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); /**/ sprintf(tmpstr,"%c:%s/%s",curdir[0],SHORTDIR,SHORTFILE);

1 0

Jeremy White : kernel32: Preserve a '/' delimiter in GetLongPathName and GetShortPathName.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 9f3f918f2c0ff0c6117b3020623eeb430030ef23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3f918f2c0ff0c6117b30206… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:11 2015 -0600 kernel32: Preserve a '/' delimiter in GetLongPathName and GetShortPathName. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 12 ++++++------ dlls/kernel32/tests/path.c | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ec14b35..ae211cc 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -334,10 +334,10 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen /* check for path delimiters and reproduce them */ if (shortpath[sp] == '\\' || shortpath[sp] == '/') { - if (!lp || tmplongpath[lp-1] != '\\') + if (!lp || (tmplongpath[lp-1] != '\\' && tmplongpath[lp-1] != '/')) { - /* strip double "\\" */ - tmplongpath[lp++] = '\\'; + /* strip double delimiters */ + tmplongpath[lp++] = shortpath[sp]; } tmplongpath[lp] = 0; /* terminate string */ sp++; @@ -492,10 +492,10 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* check for path delimiters and reproduce them */ if (longpath[lp] == '\\' || longpath[lp] == '/') { - if (!sp || tmpshortpath[sp-1] != '\\') + if (!sp || (tmpshortpath[sp-1] != '\\' && tmpshortpath[sp-1] != '/')) { - /* strip double "\\" */ - tmpshortpath[sp] = '\\'; + /* strip double delimiters */ + tmpshortpath[sp] = longpath[lp]; sp++; } tmpshortpath[sp] = 0; /* terminate string */ diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 63666c6..37d14cc 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -863,18 +863,15 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) if (pGetLongPathNameA) { sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); } sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr);

1 0

Jeremy White : kernel32/tests: Test GetLongPathNameA when the file name case differs from the input.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: ee1260e0d2c50a7eec7d9e7444b8ff4d622bbad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1260e0d2c50a7eec7d9e744… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:12 2015 -0600 kernel32/tests: Test GetLongPathNameA when the file name case differs from the input. This shows that the original buffer is unmodified if the filename is long, but the actual file name is returned when the filename is short. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 37d14cc..9475aa0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -861,14 +861,25 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) /* Don't Starve relies on GetLongPathName returning the passed in filename, even if the actual file on disk has a different case or separator */ if (pGetLongPathNameA) { + int len = lstrlenA(LONGDIR) + 1; sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + tmpstr[len] = tolower(tmpstr[len]); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + len = lstrlenA(SHORTDIR) + 1; + tmpstr[len] = toupper(tmpstr[len]); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0 && lstrcmpA(tmpstr,tmpstr1) != 0, + "GetLongPathNameA returned '%s' instead of '%s/%s'\n",tmpstr1,SHORTDIR,SHORTFILE); } sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n");

1 0

Jeremy White : kernel32: Revise GetLongPathNameA to avoid overriding the input on long names.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 7dea64279ee9b80a44c2eca9ed72b1ce57f64fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dea64279ee9b80a44c2eca9e… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:13 2015 -0600 kernel32: Revise GetLongPathNameA to avoid overriding the input on long names. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 10 ++++++++-- dlls/kernel32/tests/path.c | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ae211cc..b12c71e 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -292,6 +292,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen BOOL unixabsolute; WIN32_FIND_DATAW wfd; HANDLE goit; + BOOL is_legal_8dot3; if (!shortpath) { @@ -365,7 +366,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen } } - /* Check if the file exists and use the existing file name */ + /* Check if the file exists */ goit = FindFirstFileW(tmplongpath, &wfd); if (goit == INVALID_HANDLE_VALUE) { @@ -374,7 +375,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen return 0; } FindClose(goit); - strcpyW(tmplongpath + lp, wfd.cFileName); + + is_legal_8dot3 = FALSE; + CheckNameLegalDOS8Dot3W(tmplongpath + lp, NULL, 0, NULL, &is_legal_8dot3); + /* Use the existing file name if it's a short name */ + if (is_legal_8dot3) + strcpyW(tmplongpath + lp, wfd.cFileName); lp += strlenW(tmplongpath + lp); sp += tmplen; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 9475aa0..830c93d 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -868,7 +868,6 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); tmpstr[len] = tolower(tmpstr[len]); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE);

1 0

André Hentschel : version: Remove dead assignments ( Clang).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: ded403c4f315e08c61a0cd7e6f41650af452da39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded403c4f315e08c61a0cd7e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:13 2015 +0100 version: Remove dead assignments (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index b2b0b08..43f5c18 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1199,7 +1199,6 @@ DWORD WINAPI VerFindFileA( GetSystemDirectoryA(systemDir, sizeof(systemDir)); curDir = ""; - destDir = ""; if(flags & VFFF_ISSHAREDFILE) { @@ -1296,7 +1295,6 @@ DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, GetSystemDirectoryW(systemDir, sizeof(systemDir)/sizeof(WCHAR)); curDir = &emptyW; - destDir = &emptyW; if(flags & VFFF_ISSHAREDFILE) {

1 0

André Hentschel : services: Fix access adjustment by reordering code (Clang).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 67e5e8edf6aee9599cde3d037f443257fd07f5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e5e8edf6aee9599cde3d037… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:16 2015 +0100 services: Fix access adjustment by reordering code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 89a8c91..dd44965 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -352,12 +352,13 @@ static DWORD create_handle_for_service(struct service_entry *entry, DWORD dwDesi return ERROR_NOT_ENOUGH_SERVER_MEMORY; } + if (dwDesiredAccess & MAXIMUM_ALLOWED) + dwDesiredAccess |= SERVICE_ALL_ACCESS; + service->hdr.type = SC_HTYPE_SERVICE; service->hdr.access = dwDesiredAccess; RtlMapGenericMask(&service->hdr.access, &g_svc_generic); service->service_entry = entry; - if (dwDesiredAccess & MAXIMUM_ALLOWED) - dwDesiredAccess |= SERVICE_ALL_ACCESS; *phService = &service->hdr; return ERROR_SUCCESS;

1 0

André Hentschel : setupapi: Remove dead code (Clang).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 9edfb14c6be13f599aafe5e300986f10e6fb999d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9edfb14c6be13f599aafe5e30… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:18 2015 +0100 setupapi: Remove dead code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index d57f8e1..d2e2a1d 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -126,11 +126,9 @@ static void concat_W( WCHAR *buffer, const WCHAR *src1, const WCHAR *src2, const if (buffer[-1] != '\\') *buffer++ = '\\'; if (src3) while (*src3 == '\\') src3++; } + if (src3) - { strcpyW( buffer, src3 ); - buffer += strlenW(buffer ); - } }

1 0

Austin English : hal: Add READ_PORT_ULONG stub.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 3e16c3343ad6cf3e0ab076343dd651f5bbc73750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e16c3343ad6cf3e0ab076343… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 22 19:35:00 2015 -0600 hal: Add READ_PORT_ULONG stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 6 ++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 96bc895..bca688e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -155,3 +155,9 @@ KIRQL WINAPI KeGetCurrentIrql(VOID) FIXME( " stub!\n"); return 0; } + +ULONG WINAPI READ_PORT_ULONG(ULONG *port) +{ + FIXME("(%p) stub!\n", port); + return 0; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 3046c65..02f778c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -82,7 +82,7 @@ @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT @ stub READ_PORT_UCHAR -@ stub READ_PORT_ULONG +@ stdcall READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG

1 0