wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

André Hentschel : shlwapi/tests: Fix typo.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 503934a67d51787a28da99f6111ac007b7ed90c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503934a67d51787a28da99f61… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 02:41:20 2010 +0100 shlwapi/tests: Fix typo. --- dlls/shlwapi/tests/shreg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 11ebae9..4a68494 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -192,7 +192,7 @@ static void test_SHGetRegPath(void) ok( 0 == strcmp(sExpTestpath1, buf) , "Comparing (%s) with (%s) failed\n", buf, sExpTestpath1); } -static void test_SHQUeryValueEx(void) +static void test_SHQueryValueEx(void) { HKEY hKey; DWORD dwSize; @@ -464,7 +464,7 @@ START_TEST(shreg) pSHRegGetValueA=(SHRegGetValueA_func)GetProcAddress(hshlwapi,"SHRegGetValueA"); test_SHGetValue(); test_SHRegGetValue(); - test_SHQUeryValueEx(); + test_SHQueryValueEx(); test_SHGetRegPath(); test_SHCopyKey(); test_SHDeleteKey();

1 0

André Hentschel : msi/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 648025881f44e36440332e033be047184627bc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=648025881f44e36440332e033… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 02:40:43 2010 +0100 msi/tests: Don't test function directly when reporting GetLastError(). --- dlls/msi/tests/automation.c | 3 ++- dlls/msi/tests/install.c | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 49cdca3..46178b8 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2103,7 +2103,8 @@ static void test_Installer_RegistryValue(void) "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey,szThree,0,REG_BINARY, (const BYTE *)qw, 4), "RegSetValueExW failed\n"); - ok(SetEnvironmentVariableA("MSITEST", "Four"), "SetEnvironmentVariableA failed %d\n", GetLastError()); + bRet = SetEnvironmentVariableA("MSITEST", "Four"); + ok(bRet, "SetEnvironmentVariableA failed %d\n", GetLastError()); ok(!RegSetValueExW(hkey,szFour,0,REG_EXPAND_SZ, (const BYTE *)szExpand, sizeof(szExpand)), "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey,szFive,0,REG_MULTI_SZ, (const BYTE *)szFive, sizeof(szFive)), diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ad5a355..5461387 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5546,6 +5546,7 @@ static void process_pending_renames(HKEY hkey) for (src = buf; *src; src = dst + strlen(dst) + 1) { DWORD flags = MOVEFILE_COPY_ALLOWED; + BOOL fileret; dst = src + strlen(src) + 1; @@ -5573,10 +5574,14 @@ static void process_pending_renames(HKEY hkey) if (*dst) { if (dst[0] == '\\' && dst[1] == '?' && dst[2] == '?' && dst[3] == '\\') dst += 4; - ok(MoveFileExA(src, dst, flags), "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); + fileret = MoveFileExA(src, dst, flags); + ok(fileret, "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); } else - ok(DeleteFileA(src), "Failed to delete file %s (%u)\n", src, GetLastError()); + { + fileret = DeleteFileA(src); + ok(fileret, "Failed to delete file %s (%u)\n", src, GetLastError()); + } } ok(found, "Expected a 'msitest' entry\n");

1 0

André Hentschel : riched20/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: cea221caa039c6b77d2f288aa393c3d04ca2e617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea221caa039c6b77d2f288aa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 02:39:40 2010 +0100 riched20/tests: Don't test function directly when reporting GetLastError(). --- dlls/riched20/tests/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index efd2023..63b23e9 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7070,6 +7070,7 @@ static void test_dialogmode(void) START_TEST( editor ) { + BOOL ret; /* Must explicitly LoadLibrary(). The test has no references to functions in * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); @@ -7134,5 +7135,6 @@ START_TEST( editor ) } OleFlushClipboard(); - ok(FreeLibrary(hmoduleRichEdit) != 0, "error: %d\n", (int) GetLastError()); + ret = FreeLibrary(hmoduleRichEdit); + ok(ret, "error: %d\n", (int) GetLastError()); }

1 0

André Hentschel : urlmon/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 4ed08b9d249ea0714eb10ce1a9e6eac3ed2bd07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed08b9d249ea0714eb10ce1a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 02:38:36 2010 +0100 urlmon/tests: Don't test function directly when reporting GetLastError(). --- dlls/urlmon/tests/url.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 875294b..2c2acf7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1617,9 +1617,10 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW ok(pformatetc != NULL, "pformatetx == NULL\n"); if(pformatetc) { if (mime_type[0]) { + INT ret; clipfmt[0] = 0; - ok(GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1), - "GetClipboardFormatName failed, error %d\n", GetLastError()); + ret = GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1); + ok(ret, "GetClipboardFormatName failed, error %d\n", GetLastError()); ok(!lstrcmp(clipfmt, mime_type), "clipformat %x != mime_type, \"%s\" != \"%s\"\n", pformatetc->cfFormat, clipfmt, mime_type); } else {

1 0

André Hentschel : shlwapi/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: d037b4099568f9111b6b2ba62db3d19d43ac3486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d037b4099568f9111b6b2ba62… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 20:23:27 2010 +0100 shlwapi/tests: Don't test function directly when reporting GetLastError(). --- dlls/shlwapi/tests/istream.c | 31 ++++++++++++++++++------------- dlls/shlwapi/tests/ordinal.c | 23 +++++++++++++---------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 4a36b3a..f525d7c 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -281,12 +281,15 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); if (stream) { + BOOL delret; test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); ok(refcount == 0, "SHCreateStreamOnFileA: expected 0, got %d\n", refcount); - ok(DeleteFileA(test_file), "SHCreateStreamOnFileA: could not delete file '%s', got error %d\n", test_file, GetLastError()); + delret = DeleteFileA(test_file); + ok(delret, "SHCreateStreamOnFileA: could not delete file '%s', got error %d\n", + test_file, GetLastError()); } } @@ -388,14 +391,15 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); if (stream) { + BOOL delret; test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); ok(refcount == 0, "SHCreateStreamOnFileW: expected 0, got %d\n", refcount); - ok(DeleteFileA(test_fileA), - "SHCreateStreamOnFileW: could not delete the test file, got error %d\n", - GetLastError()); + delret = DeleteFileA(test_fileA); + ok(delret, "SHCreateStreamOnFileW: could not delete the test file, got error %d\n", + GetLastError()); } } @@ -409,6 +413,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) WCHAR test_file[MAX_PATH]; CHAR test_fileA[MAX_PATH]; static const CHAR testEx_txt[] = "\\testEx.txt"; + BOOL delret; trace("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); @@ -489,9 +494,9 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) refcount = IStream_Release(stream); ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); - ok(DeleteFileA(test_fileA), - "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", - GetLastError()); + delret = DeleteFileA(test_fileA); + ok(delret, "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", + GetLastError()); } stream = NULL; @@ -510,9 +515,9 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) refcount = IStream_Release(stream); ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); - ok(DeleteFileA(test_fileA), - "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", - GetLastError()); + delret = DeleteFileA(test_fileA); + ok(delret, "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", + GetLastError()); } stream = NULL; @@ -577,9 +582,9 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); } - ok(DeleteFileA(test_fileA), - "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", - GetLastError()); + delret = DeleteFileA(test_fileA); + ok(delret, "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", + GetLastError()); } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 07ed84b..1536e52 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -636,19 +636,19 @@ static void test_GetShellSecurityDescriptor(void) ok(psd!=NULL, "GetShellSecurityDescriptor failed\n"); if (psd!=NULL) { - BOOL bHasDacl = FALSE, bDefaulted; + BOOL bHasDacl = FALSE, bDefaulted, ret; PACL pAcl; DWORD dwRev; SECURITY_DESCRIPTOR_CONTROL control; ok(IsValidSecurityDescriptor(psd), "returned value is not valid SD\n"); - ok(GetSecurityDescriptorControl(psd, &control, &dwRev), - "GetSecurityDescriptorControl failed with error %u\n", GetLastError()); + ret = GetSecurityDescriptorControl(psd, &control, &dwRev); + ok(ret, "GetSecurityDescriptorControl failed with error %u\n", GetLastError()); ok(0 == (control & SE_SELF_RELATIVE), "SD should be absolute\n"); - ok(GetSecurityDescriptorDacl(psd, &bHasDacl, &pAcl, &bDefaulted), - "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + ret = GetSecurityDescriptorDacl(psd, &bHasDacl, &pAcl, &bDefaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); ok(bHasDacl, "SD has no DACL\n"); if (bHasDacl) @@ -662,28 +662,31 @@ static void test_GetShellSecurityDescriptor(void) ok(IsValidAcl(pAcl), "DACL is not valid\n"); - ok(GetAclInformation(pAcl, &asiSize, sizeof(asiSize), AclSizeInformation), - "GetAclInformation failed with error %u\n", GetLastError()); + ret = GetAclInformation(pAcl, &asiSize, sizeof(asiSize), AclSizeInformation); + ok(ret, "GetAclInformation failed with error %u\n", GetLastError()); ok(asiSize.AceCount == 3, "Incorrect number of ACEs: %d entries\n", asiSize.AceCount); if (asiSize.AceCount == 3) { ACCESS_ALLOWED_ACE *paaa; /* will use for DENIED too */ - ok(GetAce(pAcl, 0, (LPVOID*)&paaa), "GetAce failed with error %u\n", GetLastError()); + ret = GetAce(pAcl, 0, (LPVOID*)&paaa); + ok(ret, "GetAce failed with error %u\n", GetLastError()); ok(paaa->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, "Invalid ACE type %d\n", paaa->Header.AceType); ok(paaa->Header.AceFlags == 0, "Invalid ACE flags %x\n", paaa->Header.AceFlags); ok(paaa->Mask == GENERIC_ALL, "Invalid ACE mask %x\n", paaa->Mask); - ok(GetAce(pAcl, 1, (LPVOID*)&paaa), "GetAce failed with error %u\n", GetLastError()); + ret = GetAce(pAcl, 1, (LPVOID*)&paaa); + ok(ret, "GetAce failed with error %u\n", GetLastError()); ok(paaa->Header.AceType == ACCESS_DENIED_ACE_TYPE, "Invalid ACE type %d\n", paaa->Header.AceType); /* first one of two ACEs generated from inheritable entry - without inheritance */ ok(paaa->Header.AceFlags == 0, "Invalid ACE flags %x\n", paaa->Header.AceFlags); ok(paaa->Mask == GENERIC_WRITE, "Invalid ACE mask %x\n", paaa->Mask); - ok(GetAce(pAcl, 2, (LPVOID*)&paaa), "GetAce failed with error %u\n", GetLastError()); + ret = GetAce(pAcl, 2, (LPVOID*)&paaa); + ok(ret, "GetAce failed with error %u\n", GetLastError()); ok(paaa->Header.AceType == ACCESS_DENIED_ACE_TYPE, "Invalid ACE type %d\n", paaa->Header.AceType); /* second ACE - with inheritance */

1 0

André Hentschel : comdlg32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: a608fe9328acdb484d38f185064f8dd086e534c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a608fe9328acdb484d38f1850… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 19:41:39 2010 +0100 comdlg32/tests: Don't test function directly when reporting GetLastError(). --- dlls/comdlg32/tests/filedlg.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 24c663e..3b4a92f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -647,8 +647,10 @@ static void test_ok(void) char curdir[MAX_PATH]; int i; DWORD ret; + BOOL cdret; - ok(GetCurrentDirectoryA(sizeof(curdir), curdir) != 0, "Failed to get current dir err %d\n", GetLastError()); + cdret = GetCurrentDirectoryA(sizeof(curdir), curdir); + ok(cdret, "Failed to get current dir err %d\n", GetLastError()); if (!GetTempFileNameA(".", "txt", 0, tmpfilename)) { skip("Failed to create a temporary file name\n"); return; @@ -671,7 +673,8 @@ static void test_ok(void) ok(ret == ok_testcases[i].expclose, "testid %d: GetOpenFileName returned %#x\n", i, ret); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); - ok(SetCurrentDirectoryA(curdir), "Failed to restore current dir err %d\n", GetLastError()); + cdret = SetCurrentDirectoryA(curdir); + ok(cdret, "Failed to restore current dir err %d\n", GetLastError()); } ret = DeleteFileA( tmpfilename); ok( ret, "Failed to delete temporary file %s err %d\n", tmpfilename, GetLastError()); @@ -1057,8 +1060,10 @@ static void test_extension(void) char *filename_ptr; const char *test_file_name = "deadbeef"; DWORD ret; + BOOL cdret; - ok(GetCurrentDirectoryA(sizeof(curdir), curdir) != 0, "Failed to get current dir err %d\n", GetLastError()); + cdret = GetCurrentDirectoryA(sizeof(curdir), curdir); + ok(cdret, "Failed to get current dir err %d\n", GetLastError()); /* Ignore .* extension */ ofn.lStructSize = sizeof(ofn);

1 0

André Hentschel : shell32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: f0b9d9fce611d0a1552fbe64d374774784e8417c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b9d9fce611d0a1552fbe64d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 19:41:27 2010 +0100 shell32/tests: Don't test function directly when reporting GetLastError(). --- dlls/shell32/tests/shlfileop.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a58b4fd..810a745 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -820,6 +820,7 @@ static void test_copy(void) DWORD retval; LPSTR ptr; BOOL on_nt4 = FALSE; + BOOL ret; if (old_shell32) { @@ -973,16 +974,16 @@ static void test_copy(void) shfo.pTo = "test2.txt\0"; /* suppress the error-dialog in win9x here */ shfo.fFlags = FOF_NOERRORUI | FOF_NOCONFIRMATION | FOF_SILENT; - ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY), - "Failure to set file attributes (error %x)\n", GetLastError()); + ret = SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY); + ok(ret, "Failure to set file attributes (error %x)\n", GetLastError()); retval = CopyFileA(shfo.pFrom, shfo.pTo, FALSE); ok(!retval && GetLastError() == ERROR_ACCESS_DENIED, "CopyFileA should have fail with ERROR_ACCESS_DENIED\n"); retval = SHFileOperationA(&shfo); /* Does not work on Win95, Win95B, NT4WS and NT4SRV */ ok(!retval || broken(retval == DE_OPCANCELLED), "SHFileOperationA failed to copy (error %x)\n", retval); /* Set back normal attributes to make the file deletion succeed */ - ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL), - "Failure to set file attributes (error %x)\n", GetLastError()); + ret = SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL); + ok(ret, "Failure to set file attributes (error %x)\n", GetLastError()); shfo.fFlags = tmp_flags; /* try to copy files to a file */

1 0

André Hentschel : dsound/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 046bcb7c7e7fb799691342cad1ab9a4bfe13d0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046bcb7c7e7fb799691342cad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 19:41:17 2010 +0100 dsound/tests: Don't test function directly when reporting GetLastError(). --- dlls/dsound/tests/dsound.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 02d93fd..3b5a1bd 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1077,7 +1077,8 @@ START_TEST(dsound) { BOOL ret; - ok( FreeLibrary(hDsound), "FreeLibrary(1) returned %d\n", GetLastError()); + ret = FreeLibrary(hDsound); + ok( ret, "FreeLibrary(1) returned %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = FreeLibrary(hDsound); ok( ret ||

1 0

André Hentschel : setupapi/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: c7cb92f1f2d26ea2a626d7cc2d6c917da0c0eabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7cb92f1f2d26ea2a626d7cc2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 18:52:36 2010 +0100 setupapi/tests: Don't test function directly when reporting GetLastError(). --- dlls/setupapi/tests/devinst.c | 18 +++++++++--------- dlls/setupapi/tests/install.c | 15 +++++++++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 6177668..f1d3965 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -132,7 +132,7 @@ static BOOL remove_device(void) { HDEVINFO set; SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; - BOOL ret; + BOOL ret, retval; SetLastError(0xdeadbeef); set = pSetupDiGetClassDevsA(&guid, NULL, 0, 0); @@ -140,23 +140,23 @@ static BOOL remove_device(void) GetLastError()); SetLastError(0xdeadbeef); - ok(pSetupDiEnumDeviceInfo(set, 0, &devInfo), - "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); + ret = pSetupDiEnumDeviceInfo(set, 0, &devInfo); + ok(ret, "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); + retval = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); if(is_wow64) - todo_wine ok(!ret && GetLastError() == ERROR_IN_WOW64, + todo_wine ok(!retval && GetLastError() == ERROR_IN_WOW64, "SetupDiCallClassInstaller(DIF_REMOVE...) succeeded: %08x\n", GetLastError()); else - todo_wine ok(ret, + todo_wine ok(retval, "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ok(pSetupDiDestroyDeviceInfoList(set), - "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); + ret = pSetupDiDestroyDeviceInfoList(set); + ok(ret, "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); - return ret; + return retval; } /* RegDeleteTreeW from dlls/advapi32/registry.c */ diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index f5df3df..1c204b5 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -120,12 +120,14 @@ static void test_cmdline(void) { static const char infwithspaces[] = "test file.inf"; char path[MAX_PATH]; + BOOL ret; create_inf_file(inffile, cmdline_inf); sprintf(path, "%s\\%s", CURR_DIR, inffile); run_cmdline("DefaultInstall", 128, path); ok_registry(TRUE); - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); /* Test handling of spaces in path, unquoted and quoted */ create_inf_file(infwithspaces, cmdline_inf); @@ -138,7 +140,8 @@ static void test_cmdline(void) run_cmdline("DefaultInstall", 128, path); ok_registry(FALSE); - ok(DeleteFile(infwithspaces), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(infwithspaces); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } static const char *cmdline_inf_reg = "[Version]\n" @@ -153,6 +156,7 @@ static void test_registry(void) HKEY key; LONG res; char path[MAX_PATH]; + BOOL ret; /* First create a registry structure we would like to be deleted */ ok(!RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest", &key), @@ -176,7 +180,8 @@ static void test_registry(void) RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest"); RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); } - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } static void test_install_svc_from(void) @@ -724,6 +729,7 @@ START_TEST(install) /* Check if pInstallHinfSectionA sets last error or is a stub (as on WinXP) */ static const char *minimal_inf = "[Version]\nSignature=\"$Chicago$\"\n"; char cmdline[MAX_PATH*2]; + BOOL ret; create_inf_file(inffile, minimal_inf); sprintf(cmdline, "DefaultInstall 128 %s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); @@ -733,7 +739,8 @@ START_TEST(install) skip("InstallHinfSectionA is broken (stub)\n"); pInstallHinfSectionA = NULL; } - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } if (!pInstallHinfSectionW && !pInstallHinfSectionA) win_skip("InstallHinfSectionA and InstallHinfSectionW are not available\n");

1 0

Alexandre Julliard : wpp: Line and column numbers must start at one.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: b9b0bcbf3fb3adf05929880f3d6f94c170bafbd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b0bcbf3fb3adf05929880f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 13:08:43 2010 +0100 wpp: Line and column numbers must start at one. --- libs/wpp/wpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 582ad6f..41ac54f 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -168,8 +168,8 @@ int wpp_parse( const char *input, FILE *output ) int ret; pp_status.input = NULL; - pp_status.line_number = 0; - pp_status.char_number = 0; + pp_status.line_number = 1; + pp_status.char_number = 1; pp_status.state = 0; ret = pp_push_define_state();

1 0

← Newer
1
2
3
4
5
6
7
8
...
110
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010