May 2010 - Wine-Commits - list.winehq.org

Hans Leidekker : sc: Implement the create and delete commands.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 5e9d2fc44ad90c8301e0369e3e60255a14a26f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9d2fc44ad90c8301e0369e3… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Mon May 3 12:57:22 2010 +0200 sc: Implement the create and delete commands. --- programs/sc/Makefile.in | 2 +- programs/sc/sc.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 181 insertions(+), 4 deletions(-) diff --git a/programs/sc/Makefile.in b/programs/sc/Makefile.in index 71a20cc..4d34f5a 100644 --- a/programs/sc/Makefile.in +++ b/programs/sc/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = sc.exe APPMODE = -mconsole -municode -IMPORTS = kernel32 +IMPORTS = advapi32 kernel32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = sc.c diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 6eb9c9e..1994fff 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -16,12 +16,189 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN + #include "wine/debug.h" +#include "wine/unicode.h" + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <windows.h> WINE_DEFAULT_DEBUG_CHANNEL(sc); -int wmain( int argc, WCHAR *argv[] ) +struct create_params +{ + const WCHAR *displayname; + const WCHAR *binpath; + const WCHAR *group; + const WCHAR *depend; + const WCHAR *obj; + const WCHAR *password; + DWORD type; + DWORD start; + DWORD error; + BOOL tag; +}; + +static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_params *cp ) +{ + static const WCHAR displaynameW[] = {'d','i','s','p','l','a','y','n','a','m','e','=',0}; + static const WCHAR typeW[] = {'t','y','p','e','=',0}; + static const WCHAR startW[] = {'s','t','a','r','t','=',0}; + static const WCHAR errorW[] = {'e','r','r','o','r','=',0}; + static const WCHAR binpathW[] = {'b','i','n','p','a','t','h','=',0}; + static const WCHAR groupW[] = {'g','r','o','u','p','=',0}; + static const WCHAR tagW[] = {'t','a','g','=',0}; + static const WCHAR dependW[] = {'d','e','p','e','n','d','=',0}; + static const WCHAR objW[] = {'o','b','j','=',0}; + static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d','=',0}; + unsigned int i; + + cp->displayname = NULL; + cp->type = SERVICE_WIN32_OWN_PROCESS; + cp->start = SERVICE_DEMAND_START; + cp->error = SERVICE_ERROR_NORMAL; + cp->binpath = NULL; + cp->group = NULL; + cp->tag = FALSE; + cp->depend = NULL; + cp->obj = NULL; + cp->password = NULL; + + for (i = 0; i < argc; i++) + { + if (!strcmpiW( argv[i], displaynameW ) && i < argc - 1) cp->displayname = argv[i + 1]; + if (!strcmpiW( argv[i], binpathW ) && i < argc - 1) cp->binpath = argv[i + 1]; + if (!strcmpiW( argv[i], groupW ) && i < argc - 1) cp->group = argv[i + 1]; + if (!strcmpiW( argv[i], dependW ) && i < argc - 1) cp->depend = argv[i + 1]; + if (!strcmpiW( argv[i], objW ) && i < argc - 1) cp->obj = argv[i + 1]; + if (!strcmpiW( argv[i], passwordW ) && i < argc - 1) cp->password = argv[i + 1]; + + if (!strcmpiW( argv[i], tagW ) && i < argc - 1) + { + static const WCHAR yesW[] = {'y','e','s',0}; + if (!strcmpiW( argv[i], yesW )) + { + WINE_FIXME("tag argument not supported\n"); + cp->tag = TRUE; + } + } + if (!strcmpiW( argv[i], typeW ) && i < argc - 1) + { + static const WCHAR ownW[] = {'o','w','n',0}; + static const WCHAR shareW[] = {'s','h','a','r','e',0}; + static const WCHAR kernelW[] = {'k','e','r','n','e','l',0}; + static const WCHAR filesysW[] = {'f','i','l','e','s','y','s',0}; + static const WCHAR recW[] = {'r','e','c',0}; + static const WCHAR interactW[] = {'i','n','t','e','r','a','c','t',0}; + + if (!strcmpiW( argv[i + 1], ownW )) cp->type = SERVICE_WIN32_OWN_PROCESS; + if (!strcmpiW( argv[i + 1], shareW )) cp->type = SERVICE_WIN32_SHARE_PROCESS; + if (!strcmpiW( argv[i + 1], kernelW )) cp->type = SERVICE_KERNEL_DRIVER; + if (!strcmpiW( argv[i + 1], filesysW )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; + if (!strcmpiW( argv[i + 1], recW )) cp->type = SERVICE_RECOGNIZER_DRIVER; + if (!strcmpiW( argv[i + 1], interactW )) cp->type |= SERVICE_INTERACTIVE_PROCESS; + } + if (!strcmpiW( argv[i], startW ) && i < argc - 1) + { + static const WCHAR bootW[] = {'b','o','o','t',0}; + static const WCHAR systemW[] = {'s','y','s','t','e','m',0}; + static const WCHAR autoW[] = {'a','u','t','o',0}; + static const WCHAR demandW[] = {'d','e','m','a','n','d',0}; + static const WCHAR disabledW[] = {'d','i','s','a','b','l','e','d',0}; + + if (!strcmpiW( argv[i + 1], bootW )) cp->start = SERVICE_BOOT_START; + if (!strcmpiW( argv[i + 1], systemW )) cp->start = SERVICE_SYSTEM_START; + if (!strcmpiW( argv[i + 1], autoW )) cp->start = SERVICE_AUTO_START; + if (!strcmpiW( argv[i + 1], demandW )) cp->start = SERVICE_DEMAND_START; + if (!strcmpiW( argv[i + 1], disabledW )) cp->start = SERVICE_DISABLED; + } + if (!strcmpiW( argv[i], errorW ) && i < argc - 1) + { + static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; + static const WCHAR severeW[] = {'s','e','v','e','r','e',0}; + static const WCHAR criticalW[] = {'c','r','i','t','i','c','a','l',0}; + static const WCHAR ignoreW[] = {'i','g','n','o','r','e',0}; + + if (!strcmpiW( argv[i + 1], normalW )) cp->error = SERVICE_ERROR_NORMAL; + if (!strcmpiW( argv[i + 1], severeW )) cp->error = SERVICE_ERROR_SEVERE; + if (!strcmpiW( argv[i + 1], criticalW )) cp->error = SERVICE_ERROR_CRITICAL; + if (!strcmpiW( argv[i + 1], ignoreW )) cp->error = SERVICE_ERROR_IGNORE; + } + } + if (!cp->binpath) return FALSE; + return TRUE; +} + +static void usage( void ) +{ + WINE_MESSAGE( "Usage: sc command servicename [parameter= value ...]\n" ); + exit( 1 ); +} + +int wmain( int argc, const WCHAR *argv[] ) { - WINE_FIXME("stub\n"); - return 1; + static const WCHAR createW[] = {'c','r','e','a','t','e',0}; + static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; + SC_HANDLE manager, service; + BOOL ret = FALSE; + + if (argc < 3) usage(); + + if (argv[2][0] == '\\' && argv[2][1] == '\\') + { + WINE_FIXME("server argument not supported\n"); + return 1; + } + + manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ); + if (!manager) + { + WINE_ERR("failed to open service manager\n"); + return 1; + } + + if (!strcmpiW( argv[1], createW )) + { + struct create_params cp; + + if (argc < 4) + { + CloseServiceHandle( manager ); + usage(); + } + if (!parse_create_params( argc - 3, argv + 3, &cp )) + { + WINE_WARN("failed to parse create parameters\n"); + CloseServiceHandle( manager ); + return 1; + } + service = CreateServiceW( manager, argv[2], cp.displayname, SERVICE_ALL_ACCESS, + cp.type, cp.start, cp.error, cp.binpath, cp.group, NULL, + cp.depend, cp.obj, cp.password ); + if (service) + { + CloseServiceHandle( service ); + ret = TRUE; + } + else WINE_TRACE("failed to create service %u\n", GetLastError()); + } + else if (!strcmpiW( argv[1], deleteW )) + { + service = OpenServiceW( manager, argv[2], DELETE ); + if (service) + { + ret = DeleteService( service ); + if (!ret) WINE_TRACE("failed to delete service %u\n", GetLastError()); + CloseServiceHandle( service ); + } + else WINE_TRACE("failed to open service %u\n", GetLastError()); + } + else + WINE_FIXME("command not supported\n"); + + CloseServiceHandle( manager ); + return !ret; }

1 0

Damjan Jovanovic : wine.desktop: Add Serbian translation.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: f5a5371733b1bbbee96bef985c6c14d9a2e388ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a5371733b1bbbee96bef985… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 04:32:53 2010 +0200 wine.desktop: Add Serbian translation. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index db4254d..e369af9 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -15,6 +15,7 @@ Name[it]=Wine Carica Programmi Windows Name[da]=Wine, Programstarter til Windows-programmer Name[nb]=Wine Programlaster for Windowsapplikasjoner Name[nn]=Wine Programlaster for Windowsapplikasjoner +Name[sr]=Wine - дизач Windows програма Exec=wine start /unix %f MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; NoDisplay=true

1 0

Rico Schüller : ddraw: Change return to break in PixelFormat_WineD3DtoDD().
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: cef28bb3a2c2f0b3bd921f42a60eb92a67ab19f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef28bb3a2c2f0b3bd921f42a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun May 2 19:35:25 2010 +0200 ddraw: Change return to break in PixelFormat_WineD3DtoDD(). --- dlls/ddraw/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 7641f51..ed8b480 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -182,7 +182,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u3.dwGBitMask = 0x00F0; DDPixelFormat->u4.dwBBitMask = 0x000F; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; - return; + break; /* How are Z buffer bit depth and Stencil buffer bit depth related? */ @@ -236,8 +236,8 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; DDPixelFormat->u4.dwStencilBitMask = 0x00000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; - break; + case WINED3DFMT_S1_UINT_D15_UNORM: DDPixelFormat->dwFlags = DDPF_ZBUFFER | DDPF_STENCILBUFFER; DDPixelFormat->dwFourCC = 0;

1 0

Andrew Eikum : ole32: Only fail on missing Implemented Categories key if we actually have categories to check .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: c22d776e7425ae8466f88bdbb56572c8a4f08859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22d776e7425ae8466f88bdbb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 30 18:03:05 2010 -0500 ole32: Only fail on missing Implemented Categories key if we actually have categories to check. --- dlls/ole32/comcat.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index b8060bd..fe0f7e5 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -232,18 +232,20 @@ static HRESULT COMCAT_IsClassOfCategories( LPCWSTR string; /* Check that every given category is implemented by class. */ - res = RegOpenKeyExW(key, impl_keyname, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) return S_FALSE; - for (string = categories->impl_strings; *string; string += 39) { - HKEY catkey; - res = RegOpenKeyExW(subkey, string, 0, 0, &catkey); - if (res != ERROR_SUCCESS) { - RegCloseKey(subkey); - return S_FALSE; + if (*categories->impl_strings) { + res = RegOpenKeyExW(key, impl_keyname, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) return S_FALSE; + for (string = categories->impl_strings; *string; string += 39) { + HKEY catkey; + res = RegOpenKeyExW(subkey, string, 0, 0, &catkey); + if (res != ERROR_SUCCESS) { + RegCloseKey(subkey); + return S_FALSE; + } + RegCloseKey(catkey); } - RegCloseKey(catkey); + RegCloseKey(subkey); } - RegCloseKey(subkey); /* Check that all categories required by class are given. */ res = RegOpenKeyExW(key, req_keyname, 0, KEY_READ, &subkey);

1 0

Austin English : msvcrt/tests: fix a couple typos.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: b581fc5b0b7c8239fda3649ef49dbdc7624ef041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b581fc5b0b7c8239fda3649ef… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 2 05:40:23 2010 -0500 msvcrt/tests: fix a couple typos. --- dlls/msvcrt/tests/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 4c4b7a9..a6847b4 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -77,7 +77,7 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "German"); todo_wine ok(!strcmp(ret, "German_Germany.1252"), "ret = %s\n", ret); - /* This test shows that _country_synonims table is incorrect */ + /* This test shows that _country_synonyms table is incorrect */ /* It translates "America" to "US" */ ret = setlocale(LC_ALL, "America"); ok(ret == NULL, "ret = %s\n", ret); @@ -108,7 +108,7 @@ static void test_crtGetStringTypeW(void) } if(!pmemcpy_s) { - win_skip("To old version of msvcrt.dll\n"); + win_skip("Too old version of msvcrt.dll\n"); return; }

1 0

Nikolay Sivov : ole32/ole2: If no effect action selected use ::DragLeave() instead of ::Drop().
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: f3ab3d971a793f7fa16d7ae3853a878d3c5546b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ab3d971a793f7fa16d7ae38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 12:56:47 2010 +0400 ole32/ole2: If no effect action selected use ::DragLeave() instead of ::Drop(). --- dlls/ole32/ole2.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b20be1d..2e4da53 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2196,7 +2196,7 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) * If we end-up over a target, drop the object in the target or * inform the target that the operation was cancelled. */ - if (trackerInfo->curDragTarget!=0) + if (trackerInfo->curDragTarget) { switch (trackerInfo->returnValue) { @@ -2205,14 +2205,16 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) * the drop target that we just dropped the object in it. */ case DRAGDROP_S_DROP: - { - IDropTarget_Drop(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); - break; - } + if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) + IDropTarget_Drop(trackerInfo->curDragTarget, + trackerInfo->dataObject, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + else + IDropTarget_DragLeave(trackerInfo->curDragTarget); + break; + /* * If the source told us that we should cancel, fool the drop * target by telling it that the mouse left it's window.

1 0

Nikolay Sivov : ole32/ole2: After IDropTarget::DragEnter() failure target doesn't count as valid.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 9c44ed8a6bc713d89f88ab20130b807db20639a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c44ed8a6bc713d89f88ab201… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 12:49:37 2010 +0400 ole32/ole2: After IDropTarget::DragEnter() failure target doesn't count as valid. --- dlls/ole32/ole2.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e21f0ac..b20be1d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2081,13 +2081,21 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) /* * If there is, notify it that we just dragged-in */ - if (trackerInfo->curDragTarget!=0) + if (trackerInfo->curDragTarget) { - IDropTarget_DragEnter(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); + hr = IDropTarget_DragEnter(trackerInfo->curDragTarget, + trackerInfo->dataObject, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + + /* failed DragEnter() means invalid target */ + if (hr != S_OK) + { + trackerInfo->curDragTargetHWND = 0; + trackerInfo->curTargetHWND = 0; + trackerInfo->curDragTarget = 0; + } } } else

1 0

Nikolay Sivov : ole32/tests: Additional test for RevokeDragDrop with destroyed window.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 071d16d62444f5695f511a46023e03394f7bdd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=071d16d62444f5695f511a460… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 03:01:36 2010 +0400 ole32/tests: Additional test for RevokeDragDrop with destroyed window. --- dlls/ole32/tests/dragdrop.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index ce60978..e098354 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -335,6 +335,23 @@ static void test_Register_Revoke(void) ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); DestroyWindow(hwnd); + + /* try to revoke with already destroyed window */ + OleInitialize(NULL); + + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + NULL, NULL, NULL); + + hr = RegisterDragDrop(hwnd, &DropTarget); + ok(hr == S_OK, "got 0x%08x\n", hr); + + DestroyWindow(hwnd); + + hr = RevokeDragDrop(hwnd); + ok(hr == DRAGDROP_E_INVALIDHWND, "got 0x%08x\n", hr); + + OleUninitialize(); } static void test_DoDragDrop(void)

1 0

Paul Vriens : user32/tests: Run the tests again on Win95.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 1b50493ba674b48609ae3648f38bf27e5ee740ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b50493ba674b48609ae3648f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 1 21:18:13 2010 +0200 user32/tests: Run the tests again on Win95. --- dlls/user32/tests/edit.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9e4f336..9dd6fac 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,6 +38,15 @@ struct edit_notify { static struct edit_notify notifications; +static BOOL (WINAPI *pEndMenu) (void); + +static void init_function_pointers(void) +{ + HMODULE hdll = GetModuleHandleA("user32"); + + pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); +} + static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { static int num_ok_commands = 0; @@ -2099,7 +2108,7 @@ static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR if (hWnd != (HWND)lParam) { got_wm_capturechanged = 1; - EndMenu(); + pEndMenu(); } break; } @@ -2427,6 +2436,8 @@ static void test_dialogmode(void) START_TEST(edit) { + init_function_pointers(); + hinst = GetModuleHandleA(NULL); assert(RegisterWindowClasses()); @@ -2452,7 +2463,10 @@ START_TEST(edit) test_child_edit_wmkeydown(); test_fontsize(); test_dialogmode(); - test_contextmenu_focus(); + if (pEndMenu) + test_contextmenu_focus(); + else + win_skip("EndMenu is not available\n"); UnregisterWindowClasses(); }

1 0

Andrew Nguyen : kernel32: Reject a format string with insertions if no variadic arguments are passed to FormatMessageA /W.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: f2c91f0d3c7203a4394eded89a54759e765aa8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c91f0d3c7203a4394eded89… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat May 1 03:40:46 2010 -0500 kernel32: Reject a format string with insertions if no variadic arguments are passed to FormatMessageA/W. --- dlls/kernel32/format_msg.c | 7 ++++ dlls/kernel32/tests/format_msg.c | 64 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 302a78d..b1befb3 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -296,6 +296,13 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr case '6':case '7':case '8':case '9': if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) goto ignore_inserts; + else if (((dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->args) || + (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->list)) + { + SetLastError(ERROR_INVALID_PARAMETER); + HeapFree(GetProcessHeap(), 0, target); + return NULL; + } insertnr = *f-'0'; switch (f[1]) { case '0':case '1':case '2':case '3': diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 25be3ac..1c4dd76 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -180,6 +180,27 @@ static void test_message_from_string_wide(void) ok(r==0, "succeeded: r=%d\n", r); ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); + /* insertion with no variadic arguments */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + error = GetLastError(); + ok(!memcmp(out, init_buf, sizeof(init_buf)), + "Expected the buffer to be unchanged\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, fmt_1, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + error = GetLastError(); + ok(!memcmp(out, init_buf, sizeof(init_buf)), + "Expected the buffer to be unchanged\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); + /* using the format feature */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1s, 0, 0, out, sizeof(out)/sizeof(WCHAR), test); @@ -483,6 +504,35 @@ static void test_message_from_string(void) ok(GetLastError()==ERROR_INVALID_PARAMETER, "last error %u\n", GetLastError()); + /* insertion with no variadic arguments */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "%1", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!memcmp(out, init_buf, sizeof(init_buf)) || + broken(!strcmp("%1", out)), /* Win9x */ + "Expected the buffer to be untouched\n"); + ok(r==0 || + broken(r==2), /* Win9x */ + "succeeded: r=%d\n", r); + ok(GetLastError()==ERROR_INVALID_PARAMETER || + broken(GetLastError()==0xdeadbeef), /* Win9x */ + "last error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, "%1", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!memcmp(out, init_buf, sizeof(init_buf)) || + broken(!strcmp("%1", out)), /* Win9x */ + "Expected the buffer to be untouched\n"); + ok(r==0 || + broken(r==2), /* Win9x */ + "succeeded: r=%d\n", r); + ok(GetLastError()==ERROR_INVALID_PARAMETER || + broken(GetLastError()==0xdeadbeef), /* Win9x */ + "last error %u\n", GetLastError()); + /* using the format feature */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, 0, out, sizeof(out)/sizeof(CHAR), "test"); @@ -1340,6 +1390,20 @@ static void test_message_from_hmodule(void) MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); + /* Test a message string with an insertion without passing any variadic arguments. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 193 /* ERROR_BAD_EXE_FORMAT */, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 0 || + broken(ret != 0), /* Win9x */ + "FormatMessageA returned non-zero\n"); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_ARGUMENT_ARRAY, h, 193 /* ERROR_BAD_EXE_FORMAT */, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 0 || + broken(ret != 0), /* Win9x */ + "FormatMessageA returned non-zero\n"); + /*Test nonexistent messageID with varying language ID's Note: FormatMessageW behaves the same*/ SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044,

1 0