December 2010 - Wine-Commits

Hwang YunSong : jscript: Update Korean resource.
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

Module: wine Branch: master Commit: 58260b2f7f6154fefcf73dd4517c82641f3ba89c URL: http://source.winehq.org/git/wine.git/?a=commit;h=58260b2f7f6154fefcf73dd45… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Dec 30 11:15:19 2010 +0900 jscript: Update Korean resource. --- dlls/jscript/jscript_Ko.rc | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/jscript_Ko.rc b/dlls/jscript/jscript_Ko.rc index 1b0cf99..9e6f9c6 100644 --- a/dlls/jscript/jscript_Ko.rc +++ b/dlls/jscript/jscript_Ko.rc @@ -28,25 +28,28 @@ STRINGTABLE { IDS_TO_PRIMITIVE "객페를 기본 형식으로 변환하는 중에 에러 발생" IDS_INVALID_CALL_ARG "올바르지 않은 프로시져 호출이나 인수" - IDS_CREATE_OBJ_ERROR "자동화 서버가 객체를 만들 수 없습니다" - IDS_NO_PROPERTY "객체는 이 속성이나 메소드를 지원하지 않습니다" - IDS_UNSUPPORTED_ACTION "객체는 이 행동을 지원하지 않습니다" + IDS_SUBSCRIPT_OUT_OF_RANGE "첨자가 범위를 벗어남" + IDS_CREATE_OBJ_ERROR "자동화 서버가 객체를 만들 수 없음" + IDS_NO_PROPERTY "객체는 이 속성이나 메소드를 지원하지 않음" + IDS_UNSUPPORTED_ACTION "객체는 이 행동을 지원하지 않음" IDS_ARG_NOT_OPT "인수는 옵션이 아닙니다" IDS_SYNTAX_ERROR "문법 에러" IDS_SEMICOLON "';' 가 필요합니다" IDS_LBRACKET "'(' 가 필요합니다" IDS_RBRACKET "')' 가 필요합니다" IDS_UNTERMINATED_STR "띁나지 않은 문자열 상수" + IDS_DISABLED_CC "조건부 컴파일이 설정되어 있음" IDS_NOT_FUNC "함수가 필요합니다" - IDS_NOT_DATE "'[객체]' 는 날짜 객체가 아닙니다" + IDS_NOT_DATE "'[객체]' 는 날짜 객체가 아님" IDS_NOT_NUM "숫자가 필요합니다" IDS_OBJECT_EXPECTED "객체가 필요합니다" IDS_ILLEGAL_ASSIGN "잘못된 할당" - IDS_UNDEFINED "'|' 는 정의되지 않았습니다" - IDS_NOT_BOOL "볼린 객제가 필요합니다" - IDS_JSCRIPT_EXPECTED "JScript 객체가 필요합니다" - IDS_REGEXP_SYNTAX_ERROR "정규 표현식에 문법에러가 있습니다" - IDS_URI_INVALID_CHAR "URI 는 올바르지 않은 문자를 포함해서 인코딩되었습니다" - IDS_INVALID_LENGTH "배열 길이는 반드시 한정된 양의 정수이어야 합니다" - IDS_ARRAY_EXPECTED "배열 객체가 필요합니다" + IDS_UNDEFINED "'|' 는 정의되지 않았음" + IDS_NOT_BOOL "볼린 객제가 필요함" + IDS_NOT_VBARRAY "VBArray 갹체가 필요함" + IDS_JSCRIPT_EXPECTED "JScript 객체가 필요함" + IDS_REGEXP_SYNTAX_ERROR "정규 표현식에 문법에러가 있음" + IDS_URI_INVALID_CHAR "URI 는 올바르지 않은 문자를 포함해서 인코딩되었음" + IDS_INVALID_LENGTH "배열 길이는 반드시 한정된 양의 정수이어야 함" + IDS_ARRAY_EXPECTED "배열 객체가 필요함" }

1 0

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

Dec. 30, 2010

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 : msi/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

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 : shlwapi/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

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 : shell32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

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

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

Dec. 30, 2010

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

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

Dec. 30, 2010

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 : wrc: Store location information in strings.
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

Module: wine Branch: master Commit: df45a347acc7f352df5ccef529f14601fc1fa806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df45a347acc7f352df5ccef52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 13:08:30 2010 +0100 wrc: Store location information in strings. --- tools/wrc/genres.c | 6 ++++++ tools/wrc/newstruc.c | 1 + tools/wrc/utils.c | 2 ++ tools/wrc/wrc.h | 12 ++++++++++++ tools/wrc/wrctypes.h | 8 ++++++++ 5 files changed, 29 insertions(+), 0 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 3d40180..6b2d7ed 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -312,11 +312,17 @@ static void put_string(res_t *res, const string_t *str, enum str_e type, int ist if (str->type == str_char) { if (!check_unicode_conversion( str, newstr, codepage )) + { + print_location( &str->loc ); error( "String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead\n", str->str.cstr, codepage ); + } if (check_valid_utf8( str, codepage )) + { + print_location( &str->loc ); warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.\n", str->str.cstr, codepage ); + } } if (!isterm) put_word(res, newstr->size); for(cnt = 0; cnt < newstr->size; cnt++) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index c157cb4..4651617 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -166,6 +166,7 @@ string_t *new_string(void) { string_t *ret = xmalloc( sizeof(*ret) ); memset( ret, 0, sizeof(*ret) ); + set_location( &ret->loc ); return ret; } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5adebba..397c252 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -271,6 +271,8 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) string_t *ret = xmalloc(sizeof(*ret)); int res; + ret->loc = str->loc; + if (!codepage && str->type != type) parser_error( "Current language is Unicode only, cannot convert string" ); diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 0283546..4b90fd1 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -59,4 +59,16 @@ extern language_t *currentlanguage; void verify_translations(resource_t *top); void write_resfile(char *outname, resource_t *top); +static inline void set_location( location_t *loc ) +{ + loc->file = input_name; + loc->line = line_number; + loc->col = char_number; +} + +static inline void print_location( const location_t *loc ) +{ + if (loc->file) fprintf(stderr, "%s:%d:%d: ", loc->file, loc->line, loc->col ); +} + #endif diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h index 5644d9d..4df9279 100644 --- a/tools/wrc/wrctypes.h +++ b/tools/wrc/wrctypes.h @@ -83,6 +83,13 @@ #define BYTESWAP_WORD(w) ((WORD)(((WORD)WRC_LOBYTE(w) << 8) + (WORD)WRC_HIBYTE(w))) #define BYTESWAP_DWORD(d) ((DWORD)(((DWORD)BYTESWAP_WORD(WRC_LOWORD(d)) << 16) + ((DWORD)BYTESWAP_WORD(WRC_HIWORD(d))))) +typedef struct +{ + const char *file; + int line; + int col; +} location_t; + /* Binary resource structure */ #define RES_BLOCKSIZE 512 @@ -103,6 +110,7 @@ typedef struct string { char *cstr; WCHAR *wstr; } str; + location_t loc; } string_t; /* Resources are identified either by name or by number */

1 0

Alexandre Julliard : wrc: Explicitly define structure creation functions instead of playing with macros .
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

Module: wine Branch: master Commit: d0a6c806a9d1e55838afec2e2da521996f675ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a6c806a9d1e55838afec2e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 12:30:36 2010 +0100 wrc: Explicitly define structure creation functions instead of playing with macros. --- tools/wrc/newstruc.c | 155 +++++++++++++++++++++++++++++++++++++++++++------- tools/wrc/newstruc.h | 49 ++++++---------- 2 files changed, 153 insertions(+), 51 deletions(-) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 603eb0c..c157cb4 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -45,31 +45,144 @@ typedef struct } BITMAPOS2HEADER; #include <poppack.h> -/* Generate new_* functions that have no parameters (NOTE: no ';') */ -__NEW_STRUCT_FUNC(dialog) -__NEW_STRUCT_FUNC(name_id) -__NEW_STRUCT_FUNC(menu) -__NEW_STRUCT_FUNC(menu_item) -__NEW_STRUCT_FUNC(control) -__NEW_STRUCT_FUNC(icon) -__NEW_STRUCT_FUNC(cursor) -__NEW_STRUCT_FUNC(versioninfo) -__NEW_STRUCT_FUNC(ver_value) -__NEW_STRUCT_FUNC(ver_block) -__NEW_STRUCT_FUNC(stt_entry) -__NEW_STRUCT_FUNC(accelerator) -__NEW_STRUCT_FUNC(event) -__NEW_STRUCT_FUNC(raw_data) -__NEW_STRUCT_FUNC(lvc) -__NEW_STRUCT_FUNC(res_count) -__NEW_STRUCT_FUNC(string) -__NEW_STRUCT_FUNC(toolbar_item) -__NEW_STRUCT_FUNC(ani_any) - /* New instances for all types of structures */ /* Very inefficient (in size), but very functional :-] * Especially for type-checking. */ + +dialog_t *new_dialog(void) +{ + dialog_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +name_id_t *new_name_id(void) +{ + name_id_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +menu_t *new_menu(void) +{ + menu_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +menu_item_t *new_menu_item(void) +{ + menu_item_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +control_t *new_control(void) +{ + control_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +icon_t *new_icon(void) +{ + icon_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +cursor_t *new_cursor(void) +{ + cursor_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +versioninfo_t *new_versioninfo(void) +{ + versioninfo_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ver_value_t *new_ver_value(void) +{ + ver_value_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ver_block_t *new_ver_block(void) +{ + ver_block_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +stt_entry_t *new_stt_entry(void) +{ + stt_entry_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +accelerator_t *new_accelerator(void) +{ + accelerator_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +event_t *new_event(void) +{ + event_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +raw_data_t *new_raw_data(void) +{ + raw_data_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +lvc_t *new_lvc(void) +{ + lvc_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +res_count_t *new_res_count(void) +{ + res_count_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +string_t *new_string(void) +{ + string_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +toolbar_item_t *new_toolbar_item(void) +{ + toolbar_item_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ani_any_t *new_ani_any(void) +{ + ani_any_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + resource_t *new_resource(enum res_e t, void *res, int memopt, language_t *lan) { resource_t *r = xmalloc(sizeof(resource_t)); diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h index 3bd4c29..c7a74eb 100644 --- a/tools/wrc/newstruc.h +++ b/tools/wrc/newstruc.h @@ -23,36 +23,25 @@ #include "wrctypes.h" -#define __NEW_STRUCT_FUNC(p) \ - p##_t *new_##p(void)\ - {\ - p##_t * ret = xmalloc(sizeof(*ret)); \ - memset( ret, 0, sizeof(*ret) ); \ - return ret; \ - } - -#define __NEW_STRUCT_PROTO(p) p##_t *new_##p(void) - -__NEW_STRUCT_PROTO(dialog); -__NEW_STRUCT_PROTO(name_id); -__NEW_STRUCT_PROTO(menu); -__NEW_STRUCT_PROTO(menu_item); -__NEW_STRUCT_PROTO(control); -__NEW_STRUCT_PROTO(icon); -__NEW_STRUCT_PROTO(cursor); -__NEW_STRUCT_PROTO(versioninfo); -__NEW_STRUCT_PROTO(ver_value); -__NEW_STRUCT_PROTO(ver_block); -__NEW_STRUCT_PROTO(stt_entry); -__NEW_STRUCT_PROTO(accelerator); -__NEW_STRUCT_PROTO(event); -__NEW_STRUCT_PROTO(raw_data); -__NEW_STRUCT_PROTO(lvc); -__NEW_STRUCT_PROTO(res_count); -__NEW_STRUCT_PROTO(string); -__NEW_STRUCT_PROTO(toolbar_item); -__NEW_STRUCT_PROTO(ani_any); - +dialog_t *new_dialog(void); +name_id_t *new_name_id(void); +menu_t *new_menu(void); +menu_item_t *new_menu_item(void); +control_t *new_control(void); +icon_t *new_icon(void); +cursor_t *new_cursor(void); +versioninfo_t *new_versioninfo(void); +ver_value_t *new_ver_value(void); +ver_block_t *new_ver_block(void); +stt_entry_t *new_stt_entry(void); +accelerator_t *new_accelerator(void); +event_t *new_event(void); +raw_data_t *new_raw_data(void); +lvc_t *new_lvc(void); +res_count_t *new_res_count(void); +string_t *new_string(void); +toolbar_item_t *new_toolbar_item(void); +ani_any_t *new_ani_any(void); resource_t *new_resource(enum res_e t, void *res, int memopt, language_t *lan); version_t *new_version(DWORD v); characts_t *new_characts(DWORD c);

1 0

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

Dec. 30, 2010

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