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

Michael Stefaniuc : wordpad: Remove untranslated resources from the Hungarian translation.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: 31f8cbd513f1ab5dc5e80369a53e867677ea45bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f8cbd513f1ab5dc5e80369a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 17 00:18:08 2010 +0200 wordpad: Remove untranslated resources from the Hungarian translation. --- programs/wordpad/Hu.rc | 148 ------------------------------------------------ 1 files changed, 0 insertions(+), 148 deletions(-) diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 3694062..5f5cb2f 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -105,151 +105,3 @@ BEGIN MENUITEM "&Paragraph..." ID_PARAFORMAT END END - -IDM_COLOR_POPUP MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Black", ID_COLOR_BLACK - MENUITEM "Maroon", ID_COLOR_MAROON - MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC - END -END - -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Date and time" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Available formats",-1,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY - PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 -END - -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "New" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "New document type",-1,3,2,100,15 - LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&OK",IDOK,97,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 -END - -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Paragraph format" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Indentation", -1, 10, 10, 120, 68 - LTEXT "Left", -1, 15, 22, 40, 13 - EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", -1, 15, 40, 40, 13 - EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", -1, 15, 58, 40, 13 - EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", -1, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 -END - -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabs" -FONT 8, "MS SHell DLg" -BEGIN - GROUPBOX "Tab stops", -1, 10, 10, 120, 90 - COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE - DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 -END - -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 -STYLE DS_SYSMODAL -Caption "" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Line wrapping", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Toolbars", -1, 150, 10, 120, 85 - CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 - LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" - STRING_TEXT_FILES_TXT, "Text documents (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)" - STRING_ALL_FILES, "All documents (*.*)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_ALIGN_LEFT, "Left" - STRING_ALIGN_RIGHT, "Right" - STRING_ALIGN_CENTER, "Center" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" - STRING_NEWFILE_TXT, "Text document" - STRING_NEWFILE_TXT_UNICODE, "Unicode text document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Options" - STRING_VIEWPROPS_TEXT, "Text" - STRING_VIEWPROPS_RICHTEXT, "Rich text" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "Print" - STRING_PREVIEW_NEXTPAGE, "Next page" - STRING_PREVIEW_PREVPAGE, "Previous page" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" - STRING_PREVIEW_CLOSE, "Close" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" -END

1 0

Michael Stefaniuc : wordpad: "Fix" two errors in the Chinese translations.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: fa2b3b1af273597bfe8cc2b5d5c64d02c940f5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2b3b1af273597bfe8cc2b5d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 17 00:17:30 2010 +0200 wordpad: "Fix" two errors in the Chinese translations. By removing two stale copies of an English STRINGTABLE resource. --- programs/wordpad/Zh.rc | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 6adb30a..135f00c 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -250,13 +250,6 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "关闭" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" END STRINGTABLE DISCARDABLE @@ -480,11 +473,6 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_UNITS_CM, "cm" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "儲存改動到 '%s'?" STRING_SEARCH_FINISHED, "檔案查找結束."

1 0

Detlef Riekenberg : winspool/tests: Handle the Windows bug in GetPrinterDataEx.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: 2cbb9a1ee5bca8c0e83d769391469c66aaf7b351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbb9a1ee5bca8c0e83d76939… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 17 00:38:24 2010 +0200 winspool/tests: Handle the Windows bug in GetPrinterDataEx. --- dlls/winspool.drv/tests/info.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b86d367..b81bde4 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2461,8 +2461,19 @@ static void test_GetPrinterDataEx(void) needed = 0xdeadbeef; SetLastError(0xdeadbeef); + /* vista and w2k8 have a bug in GetPrinterDataEx: + the current LastError value is returned as result */ res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); - ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeadbeef)) && + ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", + res, needed, len, len * sizeof(WCHAR)); + + needed = 0xdeadbeef; + SetLastError(0xdeaddead); + res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); + ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeaddead)) && + ((needed == len) || (needed == (len * sizeof(WCHAR)))), "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", res, needed, len, len * sizeof(WCHAR));

1 0

Luca Bennati : crypt32: Add Italian translation.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: 10a61681739f14119a4fdb243e6d3c7d85ed23bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a61681739f14119a4fdb243… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Jun 16 16:50:37 2010 +0200 crypt32: Add Italian translation. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_It.rc | 244 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10a61681739f14119a4fd…

1 0

Andrew Nguyen : setupapi: Avoid useless initializations in SetupIterateCabinetA/W.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 7057637ff060d423259d109fd42760bfcb8d8b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7057637ff060d423259d109fd… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 15 05:20:08 2010 -0500 setupapi: Avoid useless initializations in SetupIterateCabinetA/W. --- dlls/setupapi/setupcab.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index d879f9d..0dd2d86 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -563,13 +563,9 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", debugstr_a(CabinetFile), Reserved, MsgHandler, Context); - if (! LoadCABINETDll()) + if (!LoadCABINETDll()) return FALSE; - memset(&my_hsc, 0, sizeof(SC_HSC_A)); - pszCabinet[0] = '\0'; - pszCabPath[0] = '\0'; - fpnsize = strlen(CabinetFile); if (fpnsize >= MAX_PATH) { SetLastError(ERROR_BAD_PATHNAME); @@ -633,8 +629,6 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved, if (!CabinetFile) return FALSE; - memset(&my_hsc, 0, sizeof(SC_HSC_W)); - fpnsize = GetFullPathNameW(CabinetFile, MAX_PATH, pszCabPathW, &p); if (fpnsize > MAX_PATH) { SetLastError(ERROR_BAD_PATHNAME);

1 0

Andrew Nguyen : setupapi: Validate the cabinet filename parameter in SetupIterateCabinetA.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: bc21be89ab01f56fb9cd337759f45173ab73b28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc21be89ab01f56fb9cd33775… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 16 07:34:51 2010 -0500 setupapi: Validate the cabinet filename parameter in SetupIterateCabinetA. --- dlls/setupapi/setupcab.c | 9 ++- dlls/setupapi/tests/Makefile.in | 1 + dlls/setupapi/tests/setupcab.c | 121 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 0dd2d86..185fe17 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -555,17 +555,22 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, SC_HSC_A my_hsc; ERF erf; - CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p; + CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL; DWORD fpnsize; BOOL ret; - TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", debugstr_a(CabinetFile), Reserved, MsgHandler, Context); if (!LoadCABINETDll()) return FALSE; + if (!CabinetFile) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + fpnsize = strlen(CabinetFile); if (fpnsize >= MAX_PATH) { SetLastError(ERROR_BAD_PATHNAME); diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index ed3a4c0..332d8a0 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ misc.c \ parser.c \ query.c \ + setupcab.c \ stringtable.c @MAKE_TEST_RULES@ diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c new file mode 100644 index 0000000..6e211ce --- /dev/null +++ b/dlls/setupapi/tests/setupcab.c @@ -0,0 +1,121 @@ +/* + * Unit tests for SetupIterateCabinet + * + * Copyright 2007 Hans Leidekker + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" +#include "wine/test.h" + +static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size) +{ + HANDLE handle; + DWORD written; + + handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(handle, data, size, &written, NULL); + CloseHandle(handle); +} + +static UINT CALLBACK dummy_callbackA(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) +{ + ok(0, "Received unexpected notification (%p, %u, %lu, %lu)\n", Context, + Notification, Param1, Param2); + return 0; +} + +static void test_invalid_parametersA(void) +{ + BOOL ret; + char source[MAX_PATH], temp[MAX_PATH]; + int i; + + const struct + { + PCSTR CabinetFile; + PSP_FILE_CALLBACK MsgHandler; + DWORD expected_lasterror; + int todo_lasterror; + } invalid_parameters[] = + { + {NULL, NULL, ERROR_INVALID_PARAMETER}, + {NULL, dummy_callbackA, ERROR_INVALID_PARAMETER}, + {"c:\\nonexistent.cab", NULL, ERROR_FILE_NOT_FOUND}, + {"c:\\nonexistent.cab", dummy_callbackA, ERROR_FILE_NOT_FOUND}, + {source, NULL, ERROR_INVALID_DATA, 1}, + {source, dummy_callbackA, ERROR_INVALID_DATA, 1}, + }; + + GetTempPathA(sizeof(temp), temp); + GetTempFileNameA(temp, "doc", 0, source); + + create_source_fileA(source, NULL, 0); + + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetA(invalid_parameters[i].CabinetFile, 0, + invalid_parameters[i].MsgHandler, NULL); + ok(!ret, "[%d] Expected SetupIterateCabinetA to return 0, got %d\n", i, ret); + if (invalid_parameters[i].todo_lasterror) + { + todo_wine + ok(GetLastError() == invalid_parameters[i].expected_lasterror, + "[%d] Expected GetLastError() to return %u, got %u\n", + i, invalid_parameters[i].expected_lasterror, GetLastError()); + } + else + { + ok(GetLastError() == invalid_parameters[i].expected_lasterror, + "[%d] Expected GetLastError() to return %u, got %u\n", + i, invalid_parameters[i].expected_lasterror, GetLastError()); + } + } + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetA("", 0, NULL, NULL); + ok(!ret, "Expected SetupIterateCabinetA to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_FILE_NOT_FOUND, /* Win9x/NT4/Win2k */ + "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetA("", 0, dummy_callbackA, NULL); + ok(!ret, "Expected SetupIterateCabinetA to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_FILE_NOT_FOUND, /* Win9x/NT4/Win2k */ + "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n", + GetLastError()); + + DeleteFileA(source); +} + +START_TEST(setupcab) +{ + test_invalid_parametersA(); +}

1 0

Andrew Nguyen : setupapi: Validate the cabinet filename parameter in SetupIterateCabinetW.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: debe525f3fa8a5e80994dc9fca46d88f6db49e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=debe525f3fa8a5e80994dc9fc… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 16 07:35:57 2010 -0500 setupapi: Validate the cabinet filename parameter in SetupIterateCabinetW. --- dlls/setupapi/setupcab.c | 8 ++- dlls/setupapi/tests/setupcab.c | 112 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 185fe17..4a54ae4 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -622,7 +622,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved, UINT len; SC_HSC_W my_hsc; ERF erf; - WCHAR pszCabPathW[MAX_PATH], *p; + WCHAR pszCabPathW[MAX_PATH], *p = NULL; DWORD fpnsize; BOOL ret; @@ -632,7 +632,11 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved, if (!LoadCABINETDll()) return FALSE; - if (!CabinetFile) return FALSE; + if (!CabinetFile) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } fpnsize = GetFullPathNameW(CabinetFile, MAX_PATH, pszCabPathW, &p); if (fpnsize > MAX_PATH) { diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 6e211ce..3c126c9 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -40,6 +40,17 @@ static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size) CloseHandle(handle); } +static void create_source_fileW(LPWSTR filename, const BYTE *data, DWORD size) +{ + HANDLE handle; + DWORD written; + + handle = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(handle, data, size, &written, NULL); + CloseHandle(handle); +} + static UINT CALLBACK dummy_callbackA(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) { @@ -48,6 +59,14 @@ static UINT CALLBACK dummy_callbackA(PVOID Context, UINT Notification, return 0; } +static UINT CALLBACK dummy_callbackW(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) +{ + ok(0, "Received unexpected notification (%p, %u, %lu, %lu)\n", Context, + Notification, Param1, Param2); + return 0; +} + static void test_invalid_parametersA(void) { BOOL ret; @@ -115,7 +134,100 @@ static void test_invalid_parametersA(void) DeleteFileA(source); } +static void test_invalid_parametersW(void) +{ + static const WCHAR nonexistentW[] = {'c',':','\\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0}; + static const WCHAR docW[] = {'d','o','c',0}; + static const WCHAR emptyW[] = {0}; + + BOOL ret; + WCHAR source[MAX_PATH], temp[MAX_PATH]; + int i; + + const struct + { + PCWSTR CabinetFile; + PSP_FILE_CALLBACK MsgHandler; + DWORD expected_lasterror; + int todo_lasterror; + } invalid_parameters[] = + { + {nonexistentW, NULL, ERROR_FILE_NOT_FOUND}, + {nonexistentW, dummy_callbackW, ERROR_FILE_NOT_FOUND}, + {source, NULL, ERROR_INVALID_DATA, 1}, + {source, dummy_callbackW, ERROR_INVALID_DATA, 1}, + }; + + ret = SetupIterateCabinetW(NULL, 0, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupIterateCabinetW is not available\n"); + return; + } + + GetTempPathW(sizeof(temp)/sizeof(WCHAR), temp); + GetTempFileNameW(temp, docW, 0, source); + + create_source_fileW(source, NULL, 0); + + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(invalid_parameters[i].CabinetFile, 0, + invalid_parameters[i].MsgHandler, NULL); + ok(!ret, "[%d] Expected SetupIterateCabinetW to return 0, got %d\n", i, ret); + if (invalid_parameters[i].todo_lasterror) + { + todo_wine + ok(GetLastError() == invalid_parameters[i].expected_lasterror, + "[%d] Expected GetLastError() to return %u, got %u\n", + i, invalid_parameters[i].expected_lasterror, GetLastError()); + } + else + { + ok(GetLastError() == invalid_parameters[i].expected_lasterror, + "[%d] Expected GetLastError() to return %u, got %u\n", + i, invalid_parameters[i].expected_lasterror, GetLastError()); + } + } + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(NULL, 0, NULL, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Vista/Win2k8 */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(NULL, 0, dummy_callbackW, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Vista/Win2k8 */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(emptyW, 0, NULL, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(emptyW, 0, dummy_callbackW, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n", + GetLastError()); + + DeleteFileW(source); +} + START_TEST(setupcab) { test_invalid_parametersA(); + test_invalid_parametersW(); }

1 0

Andrew Nguyen : setupapi/tests: Add simple enumeration tests for SetupIterateCabinetA.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: d0e93cd3ab9955c9b61a8e61498f0c769d829184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e93cd3ab9955c9b61a8e614… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 15 05:20:57 2010 -0500 setupapi/tests: Add simple enumeration tests for SetupIterateCabinetA. --- dlls/setupapi/tests/setupcab.c | 59 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 8a4dc9e..801d111 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -316,6 +316,63 @@ static void test_invalid_callbackW(void) DeleteFileW(source); } +static const char *expected_files[] = {"tristram", "wine", "shandy"}; + +static UINT CALLBACK simple_callbackA(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) +{ + static int index; + int *file_count = Context; + + switch (Notification) + { + case SPFILENOTIFY_CABINETINFO: + index = 0; + return NO_ERROR; + case SPFILENOTIFY_FILEINCABINET: + { + FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)Param1; + + (*file_count)++; + + if (index < sizeof(expected_files)/sizeof(char *)) + { + ok(!strcmp(expected_files[index], info->NameInCabinet), + "[%d] Expected file \"%s\", got \"%s\"\n", + index, expected_files[index], info->NameInCabinet); + index++; + return FILEOP_SKIP; + } + else + { + ok(0, "Unexpectedly enumerated more than number of files in cabinet, index = %d\n", index); + return FILEOP_ABORT; + } + } + default: + return NO_ERROR; + } +} + +static void test_simple_enumerationA(void) +{ + BOOL ret; + char source[MAX_PATH], temp[MAX_PATH]; + int enum_count = 0; + + GetTempPathA(sizeof(temp), temp); + GetTempFileNameA(temp, "doc", 0, source); + + create_source_fileA(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); + + ret = SetupIterateCabinetA(source, 0, simple_callbackA, &enum_count); + ok(ret == 1, "Expected SetupIterateCabinetA to return 1, got %d\n", ret); + ok(enum_count == sizeof(expected_files)/sizeof(char *), + "Unexpectedly enumerated %d files\n", enum_count); + + DeleteFileA(source); +} + START_TEST(setupcab) { test_invalid_parametersA(); @@ -327,4 +384,6 @@ START_TEST(setupcab) test_invalid_callbackA(); test_invalid_callbackW(); } + + test_simple_enumerationA(); }

1 0

Andrew Nguyen : setupapi/tests: Add tests to show that SetupIterateCabinet handles callback exceptions on newer Windows .
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: abf63710da2cdca9779fbb60fa38627625b1788b URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf63710da2cdca9779fbb60f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 15 05:20:45 2010 -0500 setupapi/tests: Add tests to show that SetupIterateCabinet handles callback exceptions on newer Windows. --- dlls/setupapi/tests/setupcab.c | 97 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 3c126c9..8a4dc9e 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -29,6 +29,19 @@ #include "setupapi.h" #include "wine/test.h" +static const BYTE comp_cab_zip_multi[] = { + 0x4d, 0x53, 0x43, 0x46, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, 0x38, 0xf0, 0x48, 0x20, 0x00, 0x74, 0x72, 0x69, 0x73, + 0x74, 0x72, 0x61, 0x6d, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, + 0x38, 0xf0, 0x48, 0x20, 0x00, 0x77, 0x69, 0x6e, 0x65, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xd1, 0x38, 0xf0, 0x48, 0x20, 0x00, 0x73, 0x68, 0x61, 0x6e, 0x64, 0x79, + 0x00, 0x67, 0x2c, 0x03, 0x85, 0x23, 0x00, 0x20, 0x00, 0x43, 0x4b, 0xcb, 0x49, 0x2c, 0x2d, 0x4a, + 0xcd, 0x4b, 0x4e, 0xe5, 0xe5, 0x2a, 0xcd, 0x4b, 0xce, 0xcf, 0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0x4e, + 0x4d, 0xe1, 0xe5, 0x2a, 0x2e, 0x49, 0x2d, 0xca, 0x03, 0x8a, 0x02, 0x00 +}; + static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size) { HANDLE handle; @@ -226,8 +239,92 @@ static void test_invalid_parametersW(void) DeleteFileW(source); } +static UINT CALLBACK crash_callbackA(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) +{ + *(volatile char*)0 = 2; + return 0; +} + +static UINT CALLBACK crash_callbackW(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) +{ + *(volatile char*)0 = 2; + return 0; +} + +static void test_invalid_callbackA(void) +{ + BOOL ret; + char source[MAX_PATH], temp[MAX_PATH]; + + GetTempPathA(sizeof(temp), temp); + GetTempFileNameA(temp, "doc", 0, source); + + create_source_fileA(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetA(source, 0, NULL, NULL); + ok(!ret, "Expected SetupIterateCabinetA to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_DATA, + "Expected GetLastError() to return ERROR_INVALID_DATA, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetA(source, 0, crash_callbackA, NULL); + ok(!ret, "Expected SetupIterateCabinetA to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_DATA, + "Expected GetLastError() to return ERROR_INVALID_DATA, got %u\n", + GetLastError()); + + DeleteFileA(source); +} + +static void test_invalid_callbackW(void) +{ + static const WCHAR docW[] = {'d','o','c',0}; + + BOOL ret; + WCHAR source[MAX_PATH], temp[MAX_PATH]; + + ret = SetupIterateCabinetW(NULL, 0, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupIterateCabinetW is not available\n"); + return; + } + + GetTempPathW(sizeof(temp)/sizeof(WCHAR), temp); + GetTempFileNameW(temp, docW, 0, source); + + create_source_fileW(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(source, 0, NULL, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_DATA, + "Expected GetLastError() to return ERROR_INVALID_DATA, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(source, 0, crash_callbackW, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_DATA, + "Expected GetLastError() to return ERROR_INVALID_DATA, got %u\n", + GetLastError()); + + DeleteFileW(source); +} + START_TEST(setupcab) { test_invalid_parametersA(); test_invalid_parametersW(); + + /* Tests crash on NT4/Win9x/Win2k and Wine. */ + if (0) + { + test_invalid_callbackA(); + test_invalid_callbackW(); + } }

1 0

Andrew Nguyen : setupapi/tests: Add simple enumeration tests for SetupIterateCabinetW.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 813024d4923c633da5e755ff993d0e3662365a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=813024d4923c633da5e755ff9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 15 05:21:07 2010 -0500 setupapi/tests: Add simple enumeration tests for SetupIterateCabinetW. --- dlls/setupapi/tests/setupcab.c | 73 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 801d111..47a9ab9 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -42,6 +42,8 @@ static const BYTE comp_cab_zip_multi[] = { 0x4d, 0xe1, 0xe5, 0x2a, 0x2e, 0x49, 0x2d, 0xca, 0x03, 0x8a, 0x02, 0x00 }; +static const WCHAR docW[] = {'d','o','c',0}; + static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size) { HANDLE handle; @@ -150,7 +152,6 @@ static void test_invalid_parametersA(void) static void test_invalid_parametersW(void) { static const WCHAR nonexistentW[] = {'c',':','\\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0}; - static const WCHAR docW[] = {'d','o','c',0}; static const WCHAR emptyW[] = {0}; BOOL ret; @@ -282,8 +283,6 @@ static void test_invalid_callbackA(void) static void test_invalid_callbackW(void) { - static const WCHAR docW[] = {'d','o','c',0}; - BOOL ret; WCHAR source[MAX_PATH], temp[MAX_PATH]; @@ -373,6 +372,73 @@ static void test_simple_enumerationA(void) DeleteFileA(source); } +static const WCHAR tristramW[] = {'t','r','i','s','t','r','a','m',0}; +static const WCHAR wineW[] = {'w','i','n','e',0}; +static const WCHAR shandyW[] = {'s','h','a','n','d','y',0}; +static const WCHAR *expected_filesW[] = {tristramW, wineW, shandyW}; + +static UINT CALLBACK simple_callbackW(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) +{ + static int index; + int *file_count = Context; + + switch (Notification) + { + case SPFILENOTIFY_CABINETINFO: + index = 0; + return NO_ERROR; + case SPFILENOTIFY_FILEINCABINET: + { + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)Param1; + + (*file_count)++; + + if (index < sizeof(expected_filesW)/sizeof(WCHAR *)) + { + ok(!lstrcmpW(expected_filesW[index], info->NameInCabinet), + "[%d] Expected file %s, got %s\n", + index, wine_dbgstr_w(expected_filesW[index]), wine_dbgstr_w(info->NameInCabinet)); + index++; + return FILEOP_SKIP; + } + else + { + ok(0, "Unexpectedly enumerated more than number of files in cabinet, index = %d\n", index); + return FILEOP_ABORT; + } + } + default: + return NO_ERROR; + } +} + +static void test_simple_enumerationW(void) +{ + BOOL ret; + WCHAR source[MAX_PATH], temp[MAX_PATH]; + int enum_count = 0; + + ret = SetupIterateCabinetW(NULL, 0, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupIterateCabinetW is not available\n"); + return; + } + + GetTempPathW(sizeof(temp)/sizeof(WCHAR), temp); + GetTempFileNameW(temp, docW, 0, source); + + create_source_fileW(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); + + ret = SetupIterateCabinetW(source, 0, simple_callbackW, &enum_count); + ok(ret == 1, "Expected SetupIterateCabinetW to return 1, got %d\n", ret); + ok(enum_count == sizeof(expected_files)/sizeof(WCHAR *), + "Unexpectedly enumerated %d files\n", enum_count); + + DeleteFileW(source); +} + START_TEST(setupcab) { test_invalid_parametersA(); @@ -386,4 +452,5 @@ START_TEST(setupcab) } test_simple_enumerationA(); + test_simple_enumerationW(); }

1 0