July 2010 - Wine-commits - list.winehq.org

Michael Stefaniuc : winefile: Add the Romanian translation.
by Alexandre Julliard 12 Jul '10

12 Jul '10

Module: wine Branch: master Commit: e8e58aa7e4d92f66d0bc1b63df843c4e232a9465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e58aa7e4d92f66d0bc1b63d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 12 12:53:33 2010 +0200 winefile: Add the Romanian translation. Translation by Claudia Cotună. --- programs/winefile/Makefile.in | 1 + programs/winefile/Ro.rc | 249 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 250 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8e58aa7e4d92f66d0bc1…

1 0

Michael Stefaniuc : taskmgr: Add the Romanian translation.
by Alexandre Julliard 12 Jul '10

12 Jul '10

Module: wine Branch: master Commit: 2837bc3796dcb30e110dca760a9d632ec98252e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2837bc3796dcb30e110dca760… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 12 15:26:42 2010 +0200 taskmgr: Add the Romanian translation. Translation by Claudia Cotună. --- programs/taskmgr/Makefile.in | 1 + programs/taskmgr/Ro.rc | 575 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 576 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2837bc3796dcb30e110dc…

1 0

Michael Stefaniuc : winhlp32: Remove an untranslated resource from multiple translations.
by Alexandre Julliard 12 Jul '10

12 Jul '10

Module: wine Branch: master Commit: a569032d7609419b487680d847df4794c2b68061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a569032d7609419b487680d84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 12 16:15:11 2010 +0200 winhlp32: Remove an untranslated resource from multiple translations. --- programs/winhlp32/Bg.rc | 1 - programs/winhlp32/Cs.rc | 1 - programs/winhlp32/Da.rc | 1 - programs/winhlp32/Eo.rc | 1 - programs/winhlp32/Fi.rc | 1 - programs/winhlp32/Hu.rc | 1 - programs/winhlp32/Sk.rc | 1 - programs/winhlp32/Tr.rc | 1 - programs/winhlp32/Wa.rc | 1 - 9 files changed, 0 insertions(+), 9 deletions(-) diff --git a/programs/winhlp32/Bg.rc b/programs/winhlp32/Bg.rc index e6d3143..de00593 100644 --- a/programs/winhlp32/Bg.rc +++ b/programs/winhlp32/Bg.rc @@ -83,5 +83,4 @@ STID_ALL_FILES, " STID_HELP_FILES_HLP, "�� (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Cs.rc b/programs/winhlp32/Cs.rc index a8f8db3..cab3455 100644 --- a/programs/winhlp32/Cs.rc +++ b/programs/winhlp32/Cs.rc @@ -88,5 +88,4 @@ STID_ALL_FILES, "V STID_HELP_FILES_HLP, "Soubory n�pov�dy (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc index 20e3331..f0026c4 100644 --- a/programs/winhlp32/Da.rc +++ b/programs/winhlp32/Da.rc @@ -106,7 +106,6 @@ STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)" STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?" STID_NO_RICHEDIT "Kan ikke finde en 'richedit' implementering... Afbryder" -STID_PSH_INDEX, "Help topics: " } CONTEXT_MENU MENU diff --git a/programs/winhlp32/Eo.rc b/programs/winhlp32/Eo.rc index adf288d..f91f2d5 100644 --- a/programs/winhlp32/Eo.rc +++ b/programs/winhlp32/Eo.rc @@ -86,5 +86,4 @@ STID_ALL_FILES, "Tutaj dosieroj (*.*)" STID_HELP_FILES_HLP, "Helpaj dosieroj (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Fi.rc b/programs/winhlp32/Fi.rc index 5585619..3079d30 100644 --- a/programs/winhlp32/Fi.rc +++ b/programs/winhlp32/Fi.rc @@ -86,5 +86,4 @@ STID_ALL_FILES, "Kaikki tiedostot (*.*)" STID_HELP_FILES_HLP, "Ohjetiedostot (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Hu.rc b/programs/winhlp32/Hu.rc index ef3a1ee..1213337 100644 --- a/programs/winhlp32/Hu.rc +++ b/programs/winhlp32/Hu.rc @@ -86,5 +86,4 @@ STID_ALL_FILES, "Minden f STID_HELP_FILES_HLP, "S�g� f�jlok (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Sk.rc b/programs/winhlp32/Sk.rc index 1b45e1f..174596d 100644 --- a/programs/winhlp32/Sk.rc +++ b/programs/winhlp32/Sk.rc @@ -81,5 +81,4 @@ STID_ALL_FILES, "V STID_HELP_FILES_HLP, "S�bory pomoci (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Tr.rc b/programs/winhlp32/Tr.rc index 876f33c..cb36619 100644 --- a/programs/winhlp32/Tr.rc +++ b/programs/winhlp32/Tr.rc @@ -83,5 +83,4 @@ STID_ALL_FILES, "T STID_HELP_FILES_HLP, "Yard�m dosyalar� (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } diff --git a/programs/winhlp32/Wa.rc b/programs/winhlp32/Wa.rc index f19ac84..3de5eb6 100644 --- a/programs/winhlp32/Wa.rc +++ b/programs/winhlp32/Wa.rc @@ -88,7 +88,6 @@ STID_ALL_FILES, "Tos les fitch STID_HELP_FILES_HLP, "Fitch�s d' aide (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " } #endif /* LANG_WALON */

1 0

Michael Stefaniuc : uninstaller: Update the Czech translation.
by Alexandre Julliard 12 Jul '10

12 Jul '10

Module: wine Branch: master Commit: 509e35d05fd099f1a5720095758ea635cdd2681b URL: http://source.winehq.org/git/wine.git/?a=commit;h=509e35d05fd099f1a57200957… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 12 16:43:54 2010 +0200 uninstaller: Update the Czech translation. Translation by Radek Vokal. --- programs/uninstaller/Cs.rc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/uninstaller/Cs.rc b/programs/uninstaller/Cs.rc index ed73cd3..f6ee8cc 100644 --- a/programs/uninstaller/Cs.rc +++ b/programs/uninstaller/Cs.rc @@ -1,5 +1,4 @@ -/* Hey, Emacs, open this file with -*- coding: cp1250 -*- - * +/* * Uninstaller (Czech Resources) * * @@ -22,9 +21,9 @@ LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL -/* Czech strings in CP1250 */ - +#pragma code_page(65001) STRINGTABLE DISCARDABLE { - IDS_APPNAME, "Deinstal�tor" + IDS_APPNAME, "Deinstalátor" + IDS_UNINSTALLFAILED, "Spuštění příkazu %s selhalo, možná příčína je chybějící aplikace.\nPřejete si odstranit instalační záznam z registru?" }

1 0

Alexandre Julliard : Wine release 1.2-rc7
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: website Branch: master Commit: 53628f587d46ed6bdc9019b1443892f4b3333e30 URL: http://source.winehq.org/git/website.git/?a=commit;h=53628f587d46ed6bdc9019… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 18:53:27 2010 +0200 Wine release 1.2-rc7 --- news/en/2010070901.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2010070901.xml b/news/en/2010070901.xml new file mode 100644 index 0000000..fb480fe --- /dev/null +++ b/news/en/2010070901.xml @@ -0,0 +1,13 @@ +<news> +<date>July 9, 2010</date> +<title>Wine 1.2-rc7 Released</title> +<body> + The Wine development release 1.2-rc7 is now available. Barring any last minute problems, this should be the last release candidate before the final 1.2. Please give it a good testing. + <a href="{$root}/announce/1.2-rc7">What's new</a> in this release: +<ul> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc7.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.2-rc7.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 1cd170fd2e0e7df5083e7c66f8422783c57ed256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd170fd2e0e7df5083e7c66f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 18:44:34 2010 +0200 Release 1.2-rc7. --- ANNOUNCE | 424 +++++++++++++++++++++++-------------------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 171 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cd170fd2e0e7df5083e7…

1 0

Tag wine-1.2-rc7 : Alexandre Julliard : Release 1.2-rc7
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: refs/tags/wine-1.2-rc7 Tag: f343087634ed8fe1a67b072ddbe0c720180a4ed1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=f343087634ed8fe1a67b072ddbe0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 18:44:35 2010 +0200 Release 1.2-rc7

1 0

Andrew Nguyen : msi/tests: Fix a source test comment.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 9c850c9f8ac8c2a1f099a8554b2901f23ad37bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c850c9f8ac8c2a1f099a8554… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:10:43 2010 -0500 msi/tests: Fix a source test comment. --- dlls/msi/tests/source.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index fbf93fe..44721d5 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1479,7 +1479,7 @@ static void test_MsiSourceListEnumSources(void) ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value); ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size); - /* szUserSid is non-NULL */ + /* szUserSid is NULL */ size = MAX_PATH; lstrcpyA(value, "aaa"); r = pMsiSourceListEnumSourcesA(prodcode, NULL,

1 0

Andrew Nguyen : msi/tests: Skip some source tests if a required product key cannot be created.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 93f92d51a488749ec0dba06ff5fcd90d09472449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f92d51a488749ec0dba06ff… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:10:55 2010 -0500 msi/tests: Skip some source tests if a required product key cannot be created. --- dlls/msi/tests/source.c | 91 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 78 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 44721d5..1563c44 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -896,7 +896,11 @@ static void test_MsiSourceListAddSourceEx(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* product key exists */ r = pMsiSourceListAddSourceExA(prodcode, usersid, @@ -952,6 +956,7 @@ static void test_MsiSourceListAddSourceEx(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: /* szUserSid must be NULL for MSIINSTALLCONTEXT_MACHINE */ r = pMsiSourceListAddSourceExA(prodcode, usersid, MSIINSTALLCONTEXT_MACHINE, @@ -967,7 +972,12 @@ static void test_MsiSourceListAddSourceEx(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* product key exists */ r = pMsiSourceListAddSourceExA(prodcode, NULL, @@ -1358,7 +1368,11 @@ static void test_MsiSourceListEnumSources(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ size = MAX_PATH; @@ -1469,6 +1483,7 @@ static void test_MsiSourceListEnumSources(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: /* szUserSid is non-NULL */ size = MAX_PATH; lstrcpyA(value, "aaa"); @@ -1493,7 +1508,12 @@ static void test_MsiSourceListEnumSources(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* user product key exists */ size = MAX_PATH; @@ -1938,7 +1958,11 @@ static void test_MsiSourceListSetInfo(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ r = pMsiSourceListSetInfoA(prodcode, NULL, @@ -1971,11 +1995,17 @@ static void test_MsiSourceListSetInfo(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* user product key exists */ r = pMsiSourceListSetInfoA(prodcode, NULL, @@ -2234,7 +2264,11 @@ static void test_MsiSourceListAddMediaDisk(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ r = pMsiSourceListAddMediaDiskA(prodcode, usersid, @@ -2268,11 +2302,17 @@ static void test_MsiSourceListAddMediaDisk(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* machine product key exists */ r = pMsiSourceListAddMediaDiskA(prodcode, NULL, @@ -2939,7 +2979,11 @@ static void test_MsiSourceListEnumMediaDisks(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED, @@ -3017,11 +3061,17 @@ static void test_MsiSourceListEnumMediaDisks(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* machine product key exists */ r = pMsiSourceListEnumMediaDisksA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, @@ -3201,7 +3251,11 @@ static void test_MsiSourceListAddSource(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto userunmanaged_tests; + } /* user product key exists */ r = pMsiSourceListAddSourceA(prodcode, username, 0, "source"); @@ -3292,6 +3346,7 @@ static void test_MsiSourceListAddSource(void) /* MSIINSTALLCONTEXT_USERUNMANAGED */ +userunmanaged_tests: r = pMsiSourceListAddSourceA(prodcode, username, 0, "source"); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); @@ -3299,7 +3354,11 @@ static void test_MsiSourceListAddSource(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + goto machine_tests; + } /* user product key exists */ r = pMsiSourceListAddSourceA(prodcode, username, 0, "source"); @@ -3328,6 +3387,7 @@ static void test_MsiSourceListAddSource(void) /* MSIINSTALLCONTEXT_MACHINE */ +machine_tests: r = pMsiSourceListAddSourceA(prodcode, NULL, 0, "source"); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); @@ -3335,7 +3395,12 @@ static void test_MsiSourceListAddSource(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if (res != ERROR_SUCCESS) + { + skip("Product key creation failed with error code %u\n", res); + LocalFree(usersid); + return; + } /* machine product key exists */ r = pMsiSourceListAddSourceA(prodcode, NULL, 0, "source");

1 0

Marcus Meissner : ntdll: Handle error cases in om test (Coverity).
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: c7bbf3652e703397a769f953150b6673c16e28ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bbf3652e703397a769f9531… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jul 9 13:09:53 2010 +0200 ntdll: Handle error cases in om test (Coverity). --- dlls/ntdll/tests/om.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 24339bb..c6a3cbf 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -419,9 +419,12 @@ static void test_directory(void) memset( buffer, 0xaa, sizeof(buffer) ); status = pNtQuerySymbolicLinkObject( dir, &str, &len ); ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + if (status != STATUS_SUCCESS) + goto error; full_len = str.Length + sizeof(WCHAR); ok( len == full_len, "bad length %u/%u\n", len, full_len ); - ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + if (len == full_len) + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); str.MaximumLength = str.Length; len = 0xdeadbeef; @@ -441,6 +444,7 @@ static void test_directory(void) ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); ok( len == full_len, "bad length %u/%u\n", len, full_len ); +error: pNtClose(dir); }

1 0