January 2020 - Wine-Devel - list.winehq.org

[PATCH 1/2] kernel32/tests: Remove GetLongPathName() workarounds.
by Nikolay Sivov Jan. 7, 2020

Jan. 7, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/path.c | 363 ++++++++++++++++--------------------- 1 file changed, 152 insertions(+), 211 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 71577793b0..94037d636c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -66,9 +66,6 @@ static const CHAR funny_chars[]="!@#$%^&*()=+{}[],?'`"; static const CHAR is_char_ok[] ="11111110111111111011"; -static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR,LPSTR,DWORD); -static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); - /* Present in Win2003+ */ static BOOL (WINAPI *pNeedCurrentDirectoryForExePathA)(LPCSTR); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); @@ -127,14 +124,11 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR * passfail->shortlen=-1;passfail->s2llen=-1;passfail->longlen=-1; passfail->shorterror=0;passfail->s2lerror=0;passfail->longerror=0; } -/* GetLongPathNameA is only supported on Win2k+ and Win98+ */ - if(pGetLongPathNameA) { - ok((len=pGetLongPathNameA(curdir,curdirlong,MAX_PATH)), - "%s: GetLongPathNameA failed\n",errstr); + + ok((len = GetLongPathNameA(curdir,curdirlong,MAX_PATH)), "%s: GetLongPathNameA failed\n", errstr); /*GetLongPathNameA can return a trailing '\\' but shouldn't do so here */ - ok(! HAS_TRAIL_SLASH_A(curdirlong), - "%s: GetLongPathNameA should not have a trailing \\\n",errstr); - } + ok(!HAS_TRAIL_SLASH_A(curdirlong), "%s: GetLongPathNameA should not have a trailing \\\n", errstr); + ok((len=GetShortPathNameA(curdir,curdirshort,MAX_PATH)), "%s: GetShortPathNameA failed\n",errstr); /*GetShortPathNameA can return a trailing '\\' but shouldn't do so here */ @@ -175,35 +169,38 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR * passfail->shortlen=len; passfail->shorterror=GetLastError(); } -/* Test GetLongPathNameA functionality - We test both conversion from GetFullPathNameA and from GetShortPathNameA -*/ - if(pGetLongPathNameA) { - if(len!=0) { - SetLastError(0); - len=pGetLongPathNameA(shortstr,tmpstr,MAX_PATH); - if(passfail==NULL) { - ok(len, - "%s: GetLongPathNameA failed during Short->Long conversion\n", errstr); - ok(lstrcmpiA(fullpathlong,tmpstr)==0, - "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr,tmpstr,fullpathlong); - } else { - passfail->s2llen=len; - passfail->s2lerror=GetLastError(); - } + + /* Test GetLongPathNameA functionality, both conversion from GetFullPathNameA and from GetShortPathNameA */ + if (len) + { + SetLastError(0); + len = GetLongPathNameA(shortstr, tmpstr, MAX_PATH); + if (!passfail) + { + ok(len, "%s: GetLongPathNameA failed during Short->Long conversion\n", errstr); + ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", errstr, + tmpstr, fullpathlong); + } + else + { + passfail->s2llen = len; + passfail->s2lerror = GetLastError(); + } } + SetLastError(0); - len=pGetLongPathNameA(fullpath,tmpstr,MAX_PATH); - if(passfail==NULL) { - ok(len, "%s: GetLongPathNameA failed\n",errstr); - ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr, tmpstr, fullpathlong); - } else { - passfail->longlen=len; - passfail->longerror=GetLastError(); + len = GetLongPathNameA(fullpath, tmpstr, MAX_PATH); + if (!passfail) + { + ok(len, "%s: GetLongPathNameA failed\n",errstr); + ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", + errstr, tmpstr, fullpathlong); + } + else + { + passfail->longlen = len; + passfail->longerror = GetLastError(); } - } } /* split path into leading directory, and 8.3 filename */ @@ -282,19 +279,18 @@ static void test_FunnyChars(CHAR *curdir,CHAR *curdir_short,CHAR *filename, INT "%s: GetShortPathA should have failed len=%d, error=%d\n", errstr,passfail.shortlen,passfail.shorterror); } - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - if(valid) { - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "%s: GetLongPathA returned %d and not %d\n", - errstr,passfail.longerror,ERROR_FILE_NOT_FOUND); - } else { - ok(passfail.longerror==ERROR_INVALID_NAME || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "%s: GetLongPathA returned %d and not %d or %d'\n", - errstr, passfail.longerror,ERROR_INVALID_NAME,ERROR_FILE_NOT_FOUND); + + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + if (valid) + { + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "%s: GetLongPathA unexpected error %d.\n", errstr, + passfail.longerror); + } + else + { + ok(passfail.longerror == ERROR_INVALID_NAME || passfail.longerror == ERROR_FILE_NOT_FOUND, + "%s: GetLongPathA unexpected error %d.\n", errstr, passfail.longerror); } - } } /* Routine to test that SetCurrentDirectory behaves as expected. */ @@ -612,6 +608,7 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) INT i; CHAR dir[MAX_PATH],eight[MAX_PATH],three[MAX_PATH]; SLpassfail passfail; + DWORD rc1, rc2; /* Get the short form of the current directory */ ok((len=GetShortPathNameA(curdir,curdir_short,MAX_PATH)), @@ -625,21 +622,17 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(longdir_short+(len-1),"\\")!=0, "GetShortPathNameA should not have a trailing \\\n"); - if (pGetLongPathNameA) { - DWORD rc1,rc2; - sprintf(tmpstr,"%s\\%s\\%s",curdir,LONGDIR,LONGFILE); - rc1=(*pGetLongPathNameA)(tmpstr,NULL,0); - rc2=(*pGetLongPathNameA)(curdir,NULL,0); - ok((rc1-strlen(tmpstr))==(rc2-strlen(curdir)), - "GetLongPathNameA: wrong return code, %d instead of %d\n", - rc1, lstrlenA(tmpstr)+1); - - sprintf(dir,"%c:",curDrive); - rc1=(*pGetLongPathNameA)(dir,tmpstr,sizeof(tmpstr)); - ok(strcmp(dir,tmpstr)==0, - "GetLongPathNameA: returned '%s' instead of '%s' (rc=%d)\n", - tmpstr,dir,rc1); - } + sprintf(tmpstr,"%s\\%s\\%s",curdir,LONGDIR,LONGFILE); + rc1 = GetLongPathNameA(tmpstr, NULL, 0); + rc2 = GetLongPathNameA(curdir, NULL, 0); + ok((rc1-strlen(tmpstr))==(rc2-strlen(curdir)), + "GetLongPathNameA: wrong return code, %d instead of %d\n", + rc1, lstrlenA(tmpstr)+1); + + sprintf(dir,"%c:",curDrive); + rc1= GetLongPathNameA(dir, tmpstr, sizeof(tmpstr)); + ok(!strcmp(dir,tmpstr), "GetLongPathNameA: returned '%s' instead of '%s' (rc=%d)\n", + tmpstr, dir, rc1); /* Check the cases where both file and directory exist first */ /* Start with a 8.3 directory, 8.3 filename */ @@ -670,11 +663,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0), "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n", passfail.shortlen,passfail.shorterror,tmpstr); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetlongPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - } + + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /* Now try a 8.3 directory, long file name */ test_ValidPathA(curdir,SHORTDIR,NONFILE_LONG,tmpstr,&passfail,"test6"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -682,11 +674,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) passfail.shorterror==ERROR_FILE_NOT_FOUND || !passfail.shorterror, "GetShortPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetlongPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /* Next is a long directory, 8.3 file */ test_ValidPathA(curdir,LONGDIR,NONFILE_SHORT,tmpstr,&passfail,"test7"); sprintf(tmpstr2,"%s\\%s",curdir_short,LONGDIR); @@ -698,11 +688,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0), "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n", passfail.shortlen,passfail.shorterror,tmpstr); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetlongPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /*Lastly a long directory, long file */ test_ValidPathA(curdir,LONGDIR,NONFILE_LONG,tmpstr,&passfail,"test8"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -710,11 +698,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) passfail.shorterror==ERROR_FILE_NOT_FOUND || !passfail.shorterror, "GetShortPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetlongPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /* Now try again with directories that don't exist */ /* 8.3 directory, 8.3 filename */ test_ValidPathA(curdir,NONDIR_SHORT,SHORTFILE,tmpstr,&passfail,"test9"); @@ -725,13 +711,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0), "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n", passfail.shortlen,passfail.shorterror,tmpstr); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_PATH_NOT_FOUND || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_PATH_NOT_FOUND || passfail.longerror == ERROR_FILE_NOT_FOUND, + "Unexpected error %d.\n", passfail.longerror); + /* Now try a 8.3 directory, long file name */ test_ValidPathA(curdir,NONDIR_SHORT,LONGFILE,tmpstr,&passfail,"test10"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -740,13 +723,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) !passfail.shorterror, "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", passfail.shorterror); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_PATH_NOT_FOUND || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_PATH_NOT_FOUND || passfail.longerror == ERROR_FILE_NOT_FOUND, + "Unexpected error %d.\n", passfail.longerror); + /* Next is a long directory, 8.3 file */ test_ValidPathA(curdir,NONDIR_LONG,SHORTFILE,tmpstr,&passfail,"test11"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -755,13 +735,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) !passfail.shorterror, "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", passfail.shorterror); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_PATH_NOT_FOUND || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_PATH_NOT_FOUND || passfail.longerror == ERROR_FILE_NOT_FOUND, + "Unexpected error %d.\n", passfail.longerror); + /*Lastly a long directory, long file */ test_ValidPathA(curdir,NONDIR_LONG,LONGFILE,tmpstr,&passfail,"test12"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -770,13 +747,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) !passfail.shorterror, "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", passfail.shorterror); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_PATH_NOT_FOUND || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_PATH_NOT_FOUND || passfail.longerror == ERROR_FILE_NOT_FOUND, + "Unexpected error %d.\n", passfail.longerror); + /* Next try directories ending with '\\' */ /* Existing Directories */ sprintf(tmpstr,"%s\\",SHORTDIR); @@ -793,12 +767,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) (passfail.shortlen==strlen(tmpstr2) && lstrcmpiA(tmpstr1,tmpstr2)==0), "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n", passfail.shortlen,passfail.shorterror,tmpstr); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + sprintf(tmpstr,"%s\\",NONDIR_LONG); test_ValidPathA(curdir,"",tmpstr,tmpstr1,&passfail,"test16"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -807,12 +778,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) !passfail.shorterror, "GetShortPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n", passfail.shorterror); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /* Test GetFullPathNameA with drive letters */ if( curDrive != NOT_A_VALID_DRIVE) { sprintf(tmpstr,"%c:",curdir[0]); @@ -863,26 +831,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"); - 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); - } + 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"); + 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"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, @@ -909,22 +876,17 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) /* Now try some relative paths */ ok(GetShortPathNameA(LONGDIR,tmpstr,MAX_PATH),"GetShortPathNameA failed\n"); test_SplitShortPathA(tmpstr,dir,eight,three); - if(pGetLongPathNameA) { - ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr1,LONGDIR)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,LONGDIR); - } + ok(GetLongPathNameA(tmpstr, tmpstr1, MAX_PATH), "GetLongPathNameA failed\n"); + ok(!lstrcmpiA(tmpstr1, LONGDIR), "GetLongPathNameA returned '%s' instead of '%s'\n", tmpstr1, LONGDIR); + sprintf(tmpstr,".\\%s",LONGDIR); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); test_SplitShortPathA(tmpstr1,dir,eight,three); ok(lstrcmpiA(dir,".")==0 || dir[0]=='\0', "GetShortPathNameA did not keep relative directory [%s]\n",tmpstr1); - if(pGetLongPathNameA) { - ok(pGetLongPathNameA(tmpstr1,tmpstr1,MAX_PATH),"GetLongPathNameA failed %s\n", - tmpstr); - ok(lstrcmpiA(tmpstr1,tmpstr)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } + ok(GetLongPathNameA(tmpstr1, tmpstr1, MAX_PATH), "GetLongPathNameA failed %s\n", tmpstr); + ok(!lstrcmpiA(tmpstr1, tmpstr), "GetLongPathNameA returned '%s' instead of '%s'\n", tmpstr1, tmpstr); + /* Check out Get*PathNameA on some funny characters */ for(i=0;i<lstrlenA(funny_chars);i++) { INT valid; @@ -966,17 +928,13 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - if (pGetLongPathNameA) { - sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); - ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr,tmpstr1)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); + ok(GetLongPathNameA(tmpstr, tmpstr1, MAX_PATH), "GetLongPathNameA failed\n"); + ok(!lstrcmpiA(tmpstr,tmpstr1), "GetLongPathNameA returned '%s' instead of '%s'\n", tmpstr1, tmpstr); - sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); - ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr,tmpstr1)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } + sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); + ok(GetLongPathNameA(tmpstr, tmpstr1, MAX_PATH), "GetLongPathNameA failed\n"); + ok(!lstrcmpiA(tmpstr,tmpstr1), "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); } static void test_GetTempPathA(char* tmp_dir) @@ -1202,15 +1160,12 @@ static void test_GetLongPathNameA(void) char temppath[MAX_PATH], temppath2[MAX_PATH]; HANDLE file; - if (!pGetLongPathNameA) - return; - GetTempPathA(MAX_PATH, tempfile); name = tempfile + strlen(tempfile); strcpy(name, "*"); SetLastError(0xdeadbeef); - length = pGetLongPathNameA(tempfile, temppath, MAX_PATH); + length = GetLongPathNameA(tempfile, temppath, MAX_PATH); ok(!length, "GetLongPathNameA should fail\n"); ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); @@ -1221,7 +1176,7 @@ static void test_GetLongPathNameA(void) /* Test a normal path with a small buffer size */ memset(temppath, 0, MAX_PATH); - length = pGetLongPathNameA(tempfile, temppath, 4); + length = GetLongPathNameA(tempfile, temppath, 4); /* We have a failure so length should be the minimum plus the terminating '0' */ ok(length >= strlen(tempfile) + 1, "Wrong length\n"); ok(temppath[0] == 0, "Buffer should not have been touched\n"); @@ -1235,7 +1190,7 @@ static void test_GetLongPathNameA(void) explength = length + 4; SetLastError(0xdeadbeef); - length = pGetLongPathNameA(temppath2, NULL, 0); + length = GetLongPathNameA(temppath2, NULL, 0); if (length == 0 && GetLastError() == ERROR_BAD_NET_NAME) { win_skip("UNC syntax tests don't work on Win98/WinMe\n"); @@ -1244,10 +1199,10 @@ static void test_GetLongPathNameA(void) } ok(length == explength, "Wrong length %d, expected %d\n", length, explength); - length = pGetLongPathNameA(temppath2, NULL, MAX_PATH); + length = GetLongPathNameA(temppath2, NULL, MAX_PATH); ok(length == explength, "Wrong length %d, expected %d\n", length, explength); - length = pGetLongPathNameA(temppath2, temppath, 4); + length = GetLongPathNameA(temppath2, temppath, 4); ok(length == explength, "Wrong length %d, expected %d\n", length, explength); ok(temppath[0] == 0, "Buffer should not have been touched\n"); @@ -1267,7 +1222,7 @@ static void test_GetLongPathNameA(void) /* Create a long syntax for reference */ memset(longpath, 0, MAX_PATH); - pGetLongPathNameA(tempfile, temppath, MAX_PATH); + GetLongPathNameA(tempfile, temppath, MAX_PATH); lstrcpyA(longpath, unc_prefix); longpath[lstrlenA(longpath)] = temppath[0]; lstrcatA(longpath, "$\\"); @@ -1275,7 +1230,7 @@ static void test_GetLongPathNameA(void) /* NULL test */ SetLastError(0xdeadbeef); - length = pGetLongPathNameA(unc_short, NULL, 0); + length = GetLongPathNameA(unc_short, NULL, 0); if (length == 0 && GetLastError() == ERROR_BAD_NETPATH) { /* Seen on Window XP Home */ @@ -1287,19 +1242,19 @@ static void test_GetLongPathNameA(void) todo_wine ok(length == explength, "Wrong length %d, expected %d\n", length, explength); - length = pGetLongPathNameA(unc_short, NULL, MAX_PATH); + length = GetLongPathNameA(unc_short, NULL, MAX_PATH); todo_wine ok(length == explength, "Wrong length %d, expected %d\n", length, explength); memset(unc_long, 0, MAX_PATH); - length = pGetLongPathNameA(unc_short, unc_long, lstrlenA(unc_short)); + length = GetLongPathNameA(unc_short, unc_long, lstrlenA(unc_short)); /* length will include terminating '0' on failure */ todo_wine ok(length == explength, "Wrong length %d, expected %d\n", length, explength); ok(unc_long[0] == 0, "Buffer should not have been touched\n"); memset(unc_long, 0, MAX_PATH); - length = pGetLongPathNameA(unc_short, unc_long, length); + length = GetLongPathNameA(unc_short, unc_long, length); /* length doesn't include terminating '0' on success */ explength--; todo_wine @@ -1324,11 +1279,8 @@ static void test_GetLongPathNameW(void) static const WCHAR backslash[] = { '\\', 0}; static const WCHAR letterX[] = { 'X', 0}; - if (!pGetLongPathNameW) - return; - SetLastError(0xdeadbeef); - length = pGetLongPathNameW(NULL,NULL,0); + length = GetLongPathNameW(NULL,NULL,0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetLongPathNameW is not implemented\n"); @@ -1339,7 +1291,7 @@ static void test_GetLongPathNameW(void) SetLastError(0xdeadbeef); empty[0]=0; - length = pGetLongPathNameW(empty,NULL,0); + length = GetLongPathNameW(empty,NULL,0); ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length); ok(GetLastError()==ERROR_PATH_NOT_FOUND,"GetLastError returned %d but expected ERROR_PATH_NOT_FOUND\n",GetLastError()); @@ -1366,14 +1318,14 @@ static void test_GetLongPathNameW(void) /* No prefix */ SetLastError(0xdeadbeef); - length = pGetLongPathNameW(shortpath + 4, NULL, 0); + length = GetLongPathNameW(shortpath + 4, NULL, 0); ok(length == 0, "Expected 0, got %d\n", length); todo_wine ok(GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); /* With prefix */ SetLastError(0xdeadbeef); - length = pGetLongPathNameW(shortpath, NULL, 0); + length = GetLongPathNameW(shortpath, NULL, 0); todo_wine { ok(length == 0, "Expected 0, got %d\n", length); @@ -1391,21 +1343,21 @@ static void test_GetLongPathNameW(void) /* No prefix */ SetLastError(0xdeadbeef); - length = pGetLongPathNameW(shortpath + 4, NULL, 0); + length = GetLongPathNameW(shortpath + 4, NULL, 0); todo_wine { ok(length == 0, "Expected 0, got %d\n", length); ok(GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); } /* With prefix */ - expanded = 4 + (pGetLongPathNameW(tempdir, NULL, 0) - 1) + lstrlenW(name) + 1 + lstrlenW(name) + 1; + expanded = 4 + (GetLongPathNameW(tempdir, NULL, 0) - 1) + lstrlenW(name) + 1 + lstrlenW(name) + 1; SetLastError(0xdeadbeef); - length = pGetLongPathNameW(shortpath, NULL, 0); + length = GetLongPathNameW(shortpath, NULL, 0); ok(length == expanded, "Expected %d, got %d\n", expanded, length); /* NULL buffer with length crashes on Windows */ if (0) - pGetLongPathNameW(shortpath, NULL, 20); + GetLongPathNameW(shortpath, NULL, 20); ok(DeleteFileW(shortpath), "Could not delete temporary file\n"); ok(RemoveDirectoryW(dirpath), "Could not delete temporary directory\n"); @@ -1738,16 +1690,13 @@ static void test_drive_letter_case(void) ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); - if (pGetLongPathNameA) - { - /* re-use the buffer returned by GetShortPathName */ - SetLastError(0xdeadbeef); - ret = pGetLongPathNameA(buf, buf, sizeof(buf)); - ok(ret, "GetLongPathNameA error %u\n", GetLastError()); - ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); - ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); - ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); - } + /* re-use the buffer returned by GetShortPathName */ + SetLastError(0xdeadbeef); + ret = GetLongPathNameA(buf, buf, sizeof(buf)); + ok(ret, "GetLongPathNameA error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); #undef is_upper_case_letter } @@ -2201,8 +2150,6 @@ static void init_pointers(void) HMODULE mod = GetModuleHandleA("kernel32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(mod, #f)) - MAKEFUNC(GetLongPathNameA); - MAKEFUNC(GetLongPathNameW); MAKEFUNC(NeedCurrentDirectoryForExePathA); MAKEFUNC(NeedCurrentDirectoryForExePathW); MAKEFUNC(SetSearchPathMode); @@ -2232,8 +2179,6 @@ static void test_relative_path(void) int ret; WCHAR curdir[MAX_PATH]; - if (!pGetLongPathNameA) return; - GetCurrentDirectoryW(MAX_PATH, curdir); GetTempPathA(MAX_PATH, path); ret = SetCurrentDirectoryA(path); @@ -2253,7 +2198,7 @@ static void test_relative_path(void) ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributes error %d\n", GetLastError()); strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA(".", buf, MAX_PATH); + ret = GetLongPathNameA(".", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2262,7 +2207,7 @@ static void test_relative_path(void) ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA("..", buf, MAX_PATH); + ret = GetLongPathNameA("..", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2271,7 +2216,7 @@ static void test_relative_path(void) ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA("..\\foo\\file", buf, MAX_PATH); + ret = GetLongPathNameA("..\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2280,7 +2225,7 @@ static void test_relative_path(void) ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); + ret = GetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2290,7 +2235,7 @@ static void test_relative_path(void) /* test double delimiters */ strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ret = GetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2751,10 +2696,6 @@ START_TEST(path) init_pointers(); /* Report only once */ - if (!pGetLongPathNameA) - win_skip("GetLongPathNameA is not available\n"); - if (!pGetLongPathNameW) - win_skip("GetLongPathNameW is not available\n"); if (!pActivateActCtx) win_skip("Activation contexts not supported, some tests will be skipped\n"); -- 2.24.1

2 2

[PATCH v2] webservices: Use sscanf to convert strings to doubles.
by Hans Leidekker Jan. 7, 2020

Jan. 7, 2020

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> v2: Cache the C locale object. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/listener.c | 5 ++ dlls/webservices/reader.c | 105 +++++++------------------ dlls/webservices/tests/reader.c | 3 + dlls/webservices/webservices_private.h | 2 + include/msvcrt/stdio.h | 1 + 5 files changed, 39 insertions(+), 77 deletions(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 6801465f84..9b32369fd4 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -49,6 +50,8 @@ void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } +_locale_t c_locale; + /****************************************************************** * DllMain (webservices.@) */ @@ -59,11 +62,13 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: webservices_instance = hinst; DisableThreadLibraryCalls( hinst ); + c_locale = _create_locale( LC_ALL, "C" ); break; case DLL_PROCESS_DETACH: if (reserved) break; if (winsock_loaded) WSACleanup(); + _free_locale( c_locale ); break; } return TRUE; diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 181739650e..b328bb779e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <assert.h> #include <float.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -3726,15 +3727,13 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) { + BOOL found_sign = FALSE, found_exponent = FALSE, found_digit = FALSE, found_decimal = FALSE; static const unsigned __int64 nan = 0xfff8000000000000; static const unsigned __int64 inf = 0x7ff0000000000000; static const unsigned __int64 inf_min = 0xfff0000000000000; - HRESULT hr = WS_E_INVALID_FORMAT; - const unsigned char *p = str, *q; - int sign = 1, exp_sign = 1, exp = 0, exp_tmp = 0, neg_exp, i, nb_digits, have_digits; - unsigned __int64 val = 0, tmp; - long double exp_val = 1.0, exp_mul = 10.0; - unsigned int fpword = _control87( 0, 0 ); + const char *p = (const char *)str; + double tmp; + ULONG i; while (len && read_isspace( *p )) { p++; len--; } while (len && read_isspace( p[len - 1] )) { len--; } @@ -3756,88 +3755,40 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) return S_OK; } - *ret = 0.0; - if (*p == '-') - { - sign = -1; - p++; len--; - } - else if (*p == '+') { p++; len--; }; - if (!len) return S_OK; - - _control87( _MCW_EM | _RC_NEAR | _PC_64, _MCW_EM | _MCW_RC | _MCW_PC ); - - q = p; - while (len && isdigit( *q )) { q++; len--; } - have_digits = nb_digits = q - p; - for (i = 0; i < nb_digits; i++) + for (i = 0; i < len; i++) { - tmp = val * 10 + p[i] - '0'; - if (val > MAX_UINT64 / 10 || tmp < val) + if (p[i] >= '0' && p[i] <= '9') { - for (; i < nb_digits; i++) exp++; - break; + found_digit = TRUE; + continue; } - val = tmp; - } - - if (len) - { - if (*q == '.') + if (!found_sign && !found_digit && (p[i] == '+' || p[i] == '-')) { - p = ++q; len--; - while (len && isdigit( *q )) { q++; len--; }; - have_digits |= nb_digits = q - p; - for (i = 0; i < nb_digits; i++) - { - tmp = val * 10 + p[i] - '0'; - if (val > MAX_UINT64 / 10 || tmp < val) break; - val = tmp; - exp--; - } + found_sign = TRUE; + continue; } - if (len > 1 && tolower(*q) == 'e') + if (!found_exponent && found_digit && (p[i] == 'e' || p[i] == 'E')) { - if (!have_digits) goto done; - p = ++q; len--; - if (*p == '-') - { - exp_sign = -1; - p++; len--; - } - else if (*p == '+') { p++; len--; }; - - q = p; - while (len && isdigit( *q )) { q++; len--; }; - nb_digits = q - p; - if (!nb_digits || len) goto done; - for (i = 0; i < nb_digits; i++) - { - if (exp_tmp > MAX_INT32 / 10 || (exp_tmp = exp_tmp * 10 + p[i] - '0') < 0) - exp_tmp = MAX_INT32; - } - exp_tmp *= exp_sign; - - if (exp < 0 && exp_tmp < 0 && exp + exp_tmp >= 0) exp = MIN_INT32; - else if (exp > 0 && exp_tmp > 0 && exp + exp_tmp < 0) exp = MAX_INT32; - else exp += exp_tmp; + found_exponent = found_decimal = TRUE; + found_digit = found_sign = FALSE; + continue; + } + if (!found_decimal && p[i] == '.') + { + found_decimal = TRUE; + continue; } + return WS_E_INVALID_FORMAT; } - if (!have_digits || len) goto done; - - if ((neg_exp = exp < 0)) exp = -exp; - for (; exp; exp >>= 1) + if (!found_digit && !found_exponent) { - if (exp & 1) exp_val *= exp_mul; - exp_mul *= exp_mul; + *ret = 0; + return S_OK; } - *ret = sign * (neg_exp ? val / exp_val : val * exp_val); - hr = S_OK; - -done: - _control87( fpword, _MCW_EM | _MCW_RC | _MCW_PC ); - return hr; + if (_snscanf_l( p, len, "%lf", c_locale, &tmp ) != 1) return WS_E_INVALID_FORMAT; + *ret = tmp; + return S_OK; } static HRESULT str_to_float( const unsigned char *str, ULONG len, float *ret ) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 70623052de..96eee2cf77 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3650,7 +3650,10 @@ static void test_double(void) {"<t>-0.0</t>", S_OK, 0x8000000000000000}, {"<t>+0.0</t>", S_OK, 0}, {"<t>-</t>", S_OK, 0}, + {"<t>-.</t>", S_OK, 0}, {"<t>+</t>", S_OK, 0}, + {"<t>+.</t>", S_OK, 0}, + {"<t>.</t>", S_OK, 0}, {"<t>.0</t>", S_OK, 0}, {"<t>0.</t>", S_OK, 0}, {"<t>0</t>", S_OK, 0}, diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b12032060f..6f2b90dad2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,6 +18,8 @@ #include "winhttp.h" +_locale_t c_locale DECLSPEC_HIDDEN; + #define STREAM_BUFSIZE 4096 struct xmlbuf diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 6d0aaeaa6c..fa81f3d536 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -191,6 +191,7 @@ int WINAPIV sprintf_s(char*,size_t,const char*,...); int WINAPIV _scprintf(const char *, ...); int WINAPIV sscanf(const char*,const char*,...); int WINAPIV sscanf_s(const char*,const char*,...); +int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); -- 2.20.1

1 0

[PATCH] user32/tests: Fix a dialog test failure on Windows 10.
by Zebediah Figura Jan. 7, 2020

Jan. 7, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/dialog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b72f08816dd..2a7d71f67a2 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1984,6 +1984,8 @@ static void test_MessageBoxFontTest(void) ncMetrics.cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth); SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, 0, &ncMetrics, 0); + /* The height doesn't match on Windows 10 1709+. */ + ncMetrics.lfMessageFont.lfHeight = lfStaticFont.lfHeight; ok( !memcmp(&lfStaticFont, &ncMetrics.lfMessageFont, FIELD_OFFSET(LOGFONTW, lfFaceName)) && !lstrcmpW(lfStaticFont.lfFaceName, ncMetrics.lfMessageFont.lfFaceName), "dialog doesn't use message box font\n"); -- 2.24.1

1 0

[PATCH] user32/tests: Avoid testing that GDI handles are no longer valid.
by Zebediah Figura Jan. 6, 2020

Jan. 6, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/clipboard.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4436ece70d9..df23bb28946 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1397,7 +1397,6 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( CF_BITMAP, bitmap ); ok( h == bitmap, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - ok( !GetObjectType( bitmap_temp ), "expected free object %p\n", bitmap_temp ); h = SetClipboardData( CF_DSPBITMAP, bitmap2 ); ok( h == bitmap2, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); @@ -1605,9 +1604,6 @@ static void test_handles( HWND hwnd ) ok( is_freed( hmoveable ) || broken( !is_freed( hmoveable )), "expected freed mem %p\n", hmoveable ); ok( is_fixed( empty_fixed ), "expected fixed mem %p\n", empty_fixed ); ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed ); - ok( !GetObjectType( bitmap ), "expected freed handle %p\n", bitmap ); - ok( !GetObjectType( bitmap2 ), "expected freed handle %p\n", bitmap2 ); - ok( !GetObjectType( palette ), "expected freed handle %p\n", palette ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -1896,7 +1892,6 @@ static void test_data_handles(void) ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); - ok( !GetObjectType( bitmap ), "expected deleted %p\n", bitmap ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); -- 2.24.1

2 1

[PATCH 1/5] shell32/tests: Remove workarounds for SHGetFolderLocation().
by Nikolay Sivov Jan. 6, 2020

Jan. 6, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 62 +++++++++++++--------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4ea2ef14cd..8161330b1e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -86,8 +86,6 @@ struct shellExpectedValues { static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); -static HRESULT (WINAPI *pSHGetFolderLocation)(HWND, int, HANDLE, DWORD, - LPITEMIDLIST *); static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); @@ -196,7 +194,6 @@ static void loadShell32(void) GET_PROC(DllGetVersion) GET_PROC(SHGetFolderPathA) GET_PROC(SHGetFolderPathEx) - GET_PROC(SHGetFolderLocation) GET_PROC(SHGetKnownFolderPath) GET_PROC(SHSetKnownFolderPath) GET_PROC(SHGetSpecialFolderPathA) @@ -1318,22 +1315,19 @@ static void test_parameters(void) char path[MAX_PATH]; HRESULT hr; - if (pSHGetFolderLocation) - { - /* check a bogus CSIDL: */ - pidl = NULL; - hr = pSHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); - ok(hr == E_INVALIDARG, "got 0x%08x, expected E_INVALIDARG\n", hr); - if (hr == S_OK) IMalloc_Free(pMalloc, pidl); + /* check a bogus CSIDL: */ + pidl = NULL; + hr = SHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); + ok(hr == E_INVALIDARG, "got 0x%08x, expected E_INVALIDARG\n", hr); + if (hr == S_OK) IMalloc_Free(pMalloc, pidl); - /* check a bogus user token: */ - pidl = NULL; - hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); - ok(hr == E_FAIL || hr == E_HANDLE, "got 0x%08x, expected E_FAIL or E_HANDLE\n", hr); - if (hr == S_OK) IMalloc_Free(pMalloc, pidl); + /* check a bogus user token: */ + pidl = NULL; + hr = SHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); + ok(hr == E_FAIL || hr == E_HANDLE, "got 0x%08x, expected E_FAIL or E_HANDLE\n", hr); + if (hr == S_OK) IMalloc_Free(pMalloc, pidl); - /* a NULL pidl pointer crashes, so don't test it */ - } + /* a NULL pidl pointer crashes, so don't test it */ if (pSHGetSpecialFolderLocation) { @@ -1381,11 +1375,8 @@ static BYTE testSHGetFolderLocation(int folder) HRESULT hr; BYTE ret = 0xff; - /* treat absence of function as success */ - if (!pSHGetFolderLocation) return TRUE; - pidl = NULL; - hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, folder, NULL, 0, &pidl); if (hr == S_OK) { if (pidl) @@ -1399,6 +1390,7 @@ static BYTE testSHGetFolderLocation(int folder) IMalloc_Free(pMalloc, pidl); } } + return ret; } @@ -1468,16 +1460,14 @@ static void test_ShellValues(const struct shellExpectedValues testEntries[], int j; BOOL foundTypeMatch = FALSE; - if (pSHGetFolderLocation) - { - type = testSHGetFolderLocation(testEntries[i].folder); - for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) - if (testEntries[i].types[j] == type) - foundTypeMatch = TRUE; - ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, - "%s has unexpected type %d (0x%02x)\n", - getFolderName(testEntries[i].folder), type, type); - } + type = testSHGetFolderLocation(testEntries[i].folder); + for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) + if (testEntries[i].types[j] == type) + foundTypeMatch = TRUE; + ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + "%s has unexpected type %d (0x%02x)\n", + getFolderName(testEntries[i].folder), type, type); + type = testSHGetSpecialFolderLocation(testEntries[i].folder); for (j = 0, foundTypeMatch = FALSE; !foundTypeMatch && j < testEntries[i].numTypes; j++) @@ -1533,11 +1523,10 @@ static void matchGUID(int folder, const GUID *guid, const GUID *guid_alt) LPITEMIDLIST pidl; HRESULT hr; - if (!pSHGetFolderLocation) return; if (!guid) return; pidl = NULL; - hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, folder, NULL, 0, &pidl); if (hr == S_OK) { LPITEMIDLIST pidlLast = pILFindLastID(pidl); @@ -1710,7 +1699,7 @@ static void doChild(const char *arg) "SHGetFolderPath returned 0x%08x, expected 0x80070002\n", hr); pidl = NULL; - hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, CSIDL_FAVORITES, NULL, 0, &pidl); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHGetFolderLocation returned 0x%08x\n", hr); if (hr == S_OK && pidl) IMalloc_Free(pMalloc, pidl); @@ -1780,7 +1769,6 @@ static void test_NonExistentPath(void) HKEY key; if (!pSHGetFolderPathA) return; - if (!pSHGetFolderLocation) return; if (!pSHGetSpecialFolderPathA) return; if (!pSHGetSpecialFolderLocation) return; if (!pSHFileOperationA) return; @@ -2993,10 +2981,6 @@ START_TEST(shellpath) doChild(myARGV[2]); else { - /* Report missing functions once */ - if (!pSHGetFolderLocation) - win_skip("SHGetFolderLocation is not available\n"); - /* first test various combinations of parameters: */ test_parameters(); -- 2.24.1

2 5

[PATCH 1/3] wininet/tests: Don't test that the URL cache is used for persistent cookies.
by Zebediah Figura Jan. 6, 2020

Jan. 6, 2020

This seems to be an implementation detail, which is no longer true in Windows 1709+. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Enumerating cache entries still yields the cookie, but the local path is a file "deprecated.cookie" which states: "Cookies are no longer stored in files. Please use Internet*Cookie* APIs to access cookies." dlls/wininet/tests/internet.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 13b29309888..b94c0647e20 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -376,7 +376,6 @@ static void test_complicated_cookie(void) BOOL ret; CHAR buffer[1024]; - CHAR user[256]; WCHAR wbuf[1024]; static const WCHAR testing_example_comW[] = @@ -530,25 +529,16 @@ static void test_complicated_cookie(void) ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - len = sizeof(user); - ret = GetUserNameA(user, &len); - ok(ret, "GetUserName failed with error %d\n", GetLastError()); - for(; len>0; len--) - user[len-1] = tolower(user[len-1]); - - sprintf(buffer, "Cookie:%s(a)testing.example.com/", user); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError()); + len = sizeof(buffer); + ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); + ok(ret, "got error %u\n", GetLastError()); + ok(len == 24, "got len %u\n", len); + ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); - /* try setting cookie for different domain */ ret = InternetSetCookieA("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com"); ok(!ret, "InternetSetCookie succeeded\n"); -- 2.24.1

2 4

[PATCH 4/5] ws2_32/tests: some IP_HDRINCL tests pass on FreeBSD
by Damjan Jovanovic Jan. 6, 2020

Jan. 6, 2020

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-)

3 2

[PATCH v5 1/2] gdi32/tests: Separate and expand tests for GetClipBox().
by Zebediah Figura Jan. 6, 2020

Jan. 6, 2020

Fixes test failures on multi-monitor machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdi32/tests/dc.c | 102 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9739b8f61d..7a945ac45f 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -429,9 +429,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetClipBox( hdc, &rect ); - todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC) - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, @@ -1569,6 +1566,104 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +static void test_clip_box(void) +{ + DEVMODEA scale_mode = {.dmSize = sizeof(DEVMODEA)}; + HBITMAP bitmap = CreateBitmap(10, 10, 1, 1, NULL); + HDC dc, desktop_dc, printer_dc; + RECT rect, expect, screen_rect; + int type, screen_type; + + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); + scale_mode.dmFields |= DM_SCALE; + scale_mode.u1.s1.dmScale = 200; + + SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); + screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + + dc = CreateDCA("DISPLAY", NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateDCA("DISPLAY", NULL, NULL, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + ResetDCA(dc, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateCompatibleDC(NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + SelectObject(dc, bitmap); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 10, 10); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + desktop_dc = GetDC(0); + type = GetClipBox(desktop_dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + + dc = CreateEnhMetaFileA(desktop_dc, NULL, NULL, NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + if (type != ERROR) + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + ReleaseDC(0, desktop_dc); + + dc = CreateMetaFileA(NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + ok(type == ERROR, "wrong region type %d\n", type); + DeleteMetaFile(CloseMetaFile(dc)); + + if ((printer_dc = create_printer_dc(100, FALSE))) + { + type = GetClipBox(printer_dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + + dc = CreateCompatibleDC(printer_dc); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateEnhMetaFileA(printer_dc, NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + DeleteDC(printer_dc); + } + + DeleteObject(bitmap); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1585,4 +1680,5 @@ START_TEST(dc) test_gamma(); test_printer_dc(); test_pscript_printer_dc(); + test_clip_box(); } -- 2.24.1

2 3

[PATCH] dmime/tests: Destroy the performance on an error path (Valgrind)
by Michael Stefaniuc Jan. 6, 2020

Jan. 6, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36272 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4c340252aa..e6a3fe2271 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -96,8 +96,10 @@ static HRESULT test_InitAudio(void) dsound = NULL; hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); - if(hr != S_OK) + if (hr != S_OK) { + IDirectMusicPerformance8_Release(performance); return hr; + } port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); -- 2.24.1

1 0

[PATCH resend] webservices: Use sscanf to convert strings to doubles.
by Erich E. Hoover Jan. 6, 2020

Jan. 6, 2020

This removes the last "long double" instance impacted by commit 0e183cc3c0d3b6f89f79047cdd71c389afc75073. Thanks go again to Piotr for his help. Next time I'll remember to wait for the VMs to update ;) Best, Erich

3 4