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

Misha Koshelev : urlmon/tests: Fix http_protocol tests to succeed on Win98.
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: e2726effe277aee519671c8e0f86e31d78d3b00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2726effe277aee519671c8e0… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jul 18 19:58:32 2007 -0500 urlmon/tests: Fix http_protocol tests to succeed on Win98. --- dlls/urlmon/tests/protocol.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 366a543..abcc1cc 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -54,6 +54,9 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + DEFINE_EXPECT(GetBindInfo); DEFINE_EXPECT(ReportProgress_MIMETYPEAVAILABLE); DEFINE_EXPECT(ReportProgress_DIRECTBIND); @@ -246,7 +249,7 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL { CHECK_EXPECT2(Switch); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); - SendMessageW(protocol_hwnd, WM_USER, 0, (LPARAM)pProtocolData); + SendMessage(protocol_hwnd, WM_USER, 0, (LPARAM)pProtocolData); return S_OK; } @@ -1066,7 +1069,8 @@ static BOOL http_protocol_start(LPCWSTR url, BOOL is_first) CHECK_CALLED(GetBindString_ACCEPT_MIMES); CHECK_CALLED(QueryService_HttpNegotiate); CHECK_CALLED(BeginningTransaction); - CHECK_CALLED(GetRootSecurityId); + /* GetRootSecurityId called on WinXP but not on Win98 */ + CLEAR_CALLED(GetRootSecurityId); return TRUE; } @@ -1125,7 +1129,7 @@ static void test_http_protocol_url(LPCWSTR url) SET_EXPECT(ReportResult); expect_hrResult = S_OK; - GetMessageW(&msg, NULL, 0, 0); + GetMessage(&msg, NULL, 0, 0); CHECK_CALLED(Switch); CHECK_CALLED(ReportResult); @@ -1179,7 +1183,7 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ok(hres == S_FALSE || hres == E_PENDING, "Read failed: %08x\n", hres); if(hres == S_FALSE) - PostMessageW(protocol_hwnd, WM_USER+1, 0, 0); + PostMessage(protocol_hwnd, WM_USER+1, 0, 0); if(!state) { state = 1; @@ -1198,19 +1202,17 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam static HWND create_protocol_window(void) { - static const WCHAR wszProtocolWindow[] = - {'P','r','o','t','o','c','o','l','W','i','n','d','o','w',0}; - static WNDCLASSEXW wndclass = { - sizeof(WNDCLASSEXW), + static WNDCLASSEX wndclass = { + sizeof(WNDCLASSEX), 0, wnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - wszProtocolWindow, + "ProtocolWindow", NULL }; - RegisterClassExW(&wndclass); - return CreateWindowW(wszProtocolWindow, wszProtocolWindow, + RegisterClassEx(&wndclass); + return CreateWindow("ProtocolWindow", "ProtocolWindow", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); }

1 0

Michael Stefaniuc : winhelp: Add missing case label "default". Found by Smatch (unreached code).
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: 016b8bbedd5590defc5c6755e5b92c55ceadc1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=016b8bbedd5590defc5c6755e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 18 22:22:07 2007 +0200 winhelp: Add missing case label "default". Found by Smatch (unreached code). --- programs/winhelp/winhelp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index c61b552..59810bc 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -440,7 +440,8 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) /* case HELP_PARTIALKEY: */ /* case HELP_MULTIKEY: */ /* case HELP_SETWINPOS: */ - WINE_FIXME("Unknown command (%x) for remote winhelp control\n", wh->command); + default: + WINE_FIXME("Unhandled command (%x) for remote winhelp control\n", wh->command); break; } }

1 0

Michael Stefaniuc : dlls: Remove unreachable break after return/break. Found by Smatch.
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: 02933a11dec29d3e7d17e21de49661184a95b2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02933a11dec29d3e7d17e21de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 01:12:52 2007 +0200 dlls: Remove unreachable break after return/break. Found by Smatch. --- dlls/comctl32/ipaddress.c | 1 - dlls/msi/cond.y | 1 - dlls/sane.ds/ui.c | 1 - dlls/user32/tests/win.c | 1 - dlls/winex11.drv/init.c | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index cdc3e94..76e4101 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -546,7 +546,6 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_ENABLE: return IPADDRESS_Enable (infoPtr, (BOOL)wParam); - break; case WM_PAINT: return IPADDRESS_Paint (infoPtr, (HDC)wParam); diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 8612ffe..9f1a74c 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -597,7 +597,6 @@ static int COND_GetOne( struct cond_str *str, COND_input *cond ) case '%': rc = COND_PERCENT; break; case ' ': rc = COND_SPACE; break; case '=': rc = COND_EQ; break; - break; case '~': case '<': diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index fe5270a..18fd8de 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -982,7 +982,6 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return InitializeDialog(hwndDlg); case WM_HSCROLL: return ProcessScroll(hwndDlg, wParam, lParam); - break; case WM_NOTIFY: { LPPSHNOTIFY psn = (LPPSHNOTIFY)lParam; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index df20302..dc179f1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3326,7 +3326,6 @@ static LRESULT WINAPI redraw_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LP return 1; } return 0; - break; } return DefWindowProc(hwnd, msg, wparam, lparam); } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index b773f9a..4bb44f2 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -431,7 +431,6 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID return TRUE; } return FALSE; - break; } } break;

1 0

Michael Stefaniuc : programs: Remove unreachable break after return/break. Found by Smatch.
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: 9a522589fb1d4d4112f60f724143ad63c9fb0c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a522589fb1d4d4112f60f724… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 01:13:13 2007 +0200 programs: Remove unreachable break after return/break. Found by Smatch. --- programs/notepad/dialog.c | 2 -- programs/regedit/framewnd.c | 1 - programs/regedit/listview.c | 1 - programs/taskmgr/taskmgr.c | 1 - programs/winedbg/be_i386.c | 1 - programs/winedbg/gdbproxy.c | 1 - programs/wordpad/wordpad.c | 1 - 7 files changed, 0 insertions(+), 8 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index c5cfc3c..ad1e9a4 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -188,10 +188,8 @@ BOOL DoCloseFile(void) case IDNO: break; case IDCANCEL: return(FALSE); - break; default: return(FALSE); - break; } /* switch */ } /* if */ diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 2b17cc1..a2d94bf 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -735,7 +735,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) StartValueRename(g_pChildWnd->hListWnd); } break; - break; case ID_REGISTRY_PRINTERSETUP: /*PRINTDLG pd;*/ /*PrintDlg(&pd);*/ diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 52c2b0c..0e4b52b 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -446,7 +446,6 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR } default: return CallWindowProc(g_orgListWndProc, hWnd, message, wParam, lParam); - break; } return 0; } diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index d59bd19..89b02a3 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -978,7 +978,6 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) pRC->bottom = pRC->top + nMinimumHeight; } return TRUE; - break; case WM_SIZE: /* Handle the window sizing in it's own function */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 2a51ec7..fe8b087 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -63,7 +63,6 @@ static void* be_i386_linearize(HANDLE hThread, const ADDRESS64* addr) return (void*)((le.HighWord.Bits.BaseHi << 24) + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow + (DWORD)addr->Offset); - break; case AddrModeFlat: return (void*)(DWORD)addr->Offset; } diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 9b1e9bc..4f83c72 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2154,7 +2154,6 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl case -1: /* error in parent... */ fprintf(stderr, "Cannot create gdb\n"); return FALSE; - break; default: /* in parent... success */ break; case 0: /* in child... and alive */ diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index be61b1b..0b11da2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -287,7 +287,6 @@ static BOOL prompt_save_changes(void) { case IDNO: return TRUE; - break; case IDYES: if(wszFileName[0])

1 0

Michael Stefaniuc : tools: Remove unreachable break after return/break. Found by Smatch.
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: 483d213eca2b4b7c049dde216f54fb578626c623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d213eca2b4b7c049dde216… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 01:13:24 2007 +0200 tools: Remove unreachable break after return/break. Found by Smatch. --- tools/winedump/msc.c | 1 - tools/winedump/msmangle.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index e7e1100..42878f2 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -501,7 +501,6 @@ static void do_field(const unsigned char* start, const unsigned char* end) default: printf(">>> Unsupported field-id %x\n", fieldtype->generic.id); dump_data((const void*)fieldtype, 0x30, "\t"); - return; break; } } diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index fc3f12b..d9d99ef 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -228,7 +228,6 @@ int symbol_demangle (parsed_symbol *sym) FREE_CT (ct); free (function_name); return 0; - break; case '6' : /* compiler generated static */ case '7' : /* compiler generated static */ @@ -247,7 +246,6 @@ int symbol_demangle (parsed_symbol *sym) } free (function_name); return -1; - break; /* Functions */

1 0

H. Verbeet : wined3d: glXSwapBuffers needs a GLX context.
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: 27853950807a4725f0997d85127d2f092a170627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27853950807a4725f0997d851… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jul 19 00:20:15 2007 +0200 wined3d: glXSwapBuffers needs a GLX context. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d776b4e..059120d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -153,7 +153,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO ENTER_GL(); - /* Does glXSwapBuffers need a glx context? I don't think so. Blt will activate its own context if needed */ + ActivateContext(This->wineD3DDevice, This->wineD3DDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ if(This->wineD3DDevice->bCursorVisible && This->wineD3DDevice->cursorTexture) {

1 0

Michael Stefaniuc : ntdll: Don' t produce unreachable code during conditional compilation. Found by Smatch.
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: 0f14b3a574153866cbbb46f7355de2c5b7cefcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f14b3a574153866cbbb46f73… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 18 22:21:49 2007 +0200 ntdll: Don't produce unreachable code during conditional compilation. Found by Smatch. --- dlls/ntdll/cdrom.c | 3 ++- dlls/ntdll/serial.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index e245aad..269c41f 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1036,9 +1036,10 @@ static NTSTATUS CDROM_Verify(int dev, int fd) return STATUS_SUCCESS; else return STATUS_NO_MEDIA_IN_DEVICE; -#endif +#else FIXME("not implemented for non-linux\n"); return STATUS_NOT_SUPPORTED; +#endif } /****************************************************************** diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 4e8a445..6b2e764 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -493,9 +493,10 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) port.c_cflag |= B38400; } break; -#endif /* Don't have linux/serial.h or lack TIOCSSERIAL */ +#else /* Don't have linux/serial.h or lack TIOCSSERIAL */ ERR("baudrate %d\n", sbr->BaudRate); return STATUS_NOT_SUPPORTED; +#endif /* Don't have linux/serial.h or lack TIOCSSERIAL */ } #elif !defined(__EMX__) switch (sbr->BaudRate) @@ -911,9 +912,10 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) } TRACE("TIOCGICOUNT err %s\n", strerror(errno)); return FILE_GetNtStatus(); -#endif +#else memset(irq_info,0, sizeof(serial_irq_info)); return STATUS_NOT_IMPLEMENTED; +#endif }

1 0

Detlef Riekenberg : spoolss: Add a stub for ImpersonatePrinterClient.
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: dac8676895c5455e94766679823c80ee9a52bdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dac8676895c5455e947666798… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 18 22:11:03 2007 +0200 spoolss: Add a stub for ImpersonatePrinterClient. --- dlls/spoolss/spoolss.spec | 2 +- dlls/spoolss/spoolss_main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index ff6018e..4afa9bf 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -72,7 +72,7 @@ @ stub GetPrinterDriverExW @ stub GetPrinterDriverW @ stub GetPrinterW -@ stub ImpersonatePrinterClient +@ stdcall ImpersonatePrinterClient(long) @ stub InitializeRouter @ stub IsLocalCall @ stub IsNamedPipeRpcCall diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index d7237aa..c368fe5 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -143,6 +143,19 @@ BOOL WINAPI DllFreeSplStr(LPWSTR pwstr) return HeapFree(GetProcessHeap(), 0, pwstr); } + +/****************************************************************** + * ImpersonatePrinterClient [SPOOLSS.@] + */ +BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken) +{ + FIXME("(%p) stub\n", hToken); + return TRUE; +} + +/****************************************************************** + * RevertToPrinterSelf [SPOOLSS.@] + */ HANDLE WINAPI RevertToPrinterSelf(void) { FIXME("() stub\n");

1 0

Paul Vriens : advapi32/service: Cleanup (long lines and a typo).
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: a80e952ac039b8d44e8f47f4a6b23c8a62871bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80e952ac039b8d44e8f47f4a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 18 16:24:45 2007 +0200 advapi32/service: Cleanup (long lines and a typo). --- dlls/advapi32/tests/service.c | 42 ++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4013988..ff38d79 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -203,7 +203,9 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - /* Open the Service Control Manager with minimal rights for creation (verified with 'SC_MANAGER_ALL_ACCESS &~ SC_MANAGER_CREATE_SERVICE') */ + /* Open the Service Control Manager with minimal rights for creation + * (Verified with 'SC_MANAGER_ALL_ACCESS &~ SC_MANAGER_CREATE_SERVICE') + */ CloseServiceHandle(scm_handle); SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CREATE_SERVICE); @@ -231,15 +233,20 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %d\n", GetLastError()); - /* Valid call (as we will see later) except for the empty binary name (to proof it's indeed an ERROR_INVALID_PARAMETER */ + /* Valid call (as we will see later) except for the empty binary name (to proof it's indeed + * an ERROR_INVALID_PARAMETER) + */ SetLastError(0xdeadbeef); - svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, empty, NULL, NULL, NULL, NULL, NULL); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, SERVICE_WIN32_OWN_PROCESS, + SERVICE_DISABLED, 0, empty, NULL, NULL, NULL, NULL, NULL); ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Windows checks if the 'service type', 'access type' and the combination of them are valid, so let's test that */ - /* Illegal (service-type, which is used as a mask can't have a mix. Except the one with SERVICE_INTERACTIVE_PROCESS which is tested below) */ + /* Illegal (service-type, which is used as a mask can't have a mix. Except the one with + * SERVICE_INTERACTIVE_PROCESS which will be tested below in a valid call) + */ SetLastError(0xdeadbeef); svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); @@ -263,17 +270,19 @@ static void test_create_delete_svc(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Illegal (start-type is not a mask and should only be one of the possibilities) - * Remark : 'OR'-ing them could result in a valid possibility (but doesn't make sense as it's most likely not the wanted start-type) + * Remark : 'OR'-ing them could result in a valid possibility (but doesn't make sense as + * it's most likely not the wanted start-type) */ SetLastError(0xdeadbeef); - svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START | SERVICE_DISABLED, - 0, pathname, NULL, NULL, NULL, NULL, NULL); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS, + SERVICE_AUTO_START | SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* Illegal (SERVICE_BOOT_START and SERVICE_SYSTEM_START or only allowed for driver services) */ + /* Illegal (SERVICE_BOOT_START and SERVICE_SYSTEM_START are only allowed for driver services) */ SetLastError(0xdeadbeef); - svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_BOOT_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, SERVICE_WIN32_OWN_PROCESS, + SERVICE_BOOT_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -284,15 +293,17 @@ static void test_create_delete_svc(void) spooler_exists = TRUE; CloseServiceHandle(svc_handle1); SetLastError(0xdeadbeef); - svc_handle1 = CreateServiceA(scm_handle, spooler, NULL, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); + svc_handle1 = CreateServiceA(scm_handle, spooler, NULL, 0, SERVICE_WIN32_OWN_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_EXISTS, "Expected ERROR_SERVICE_EXISTS, got %d\n", GetLastError()); } else skip("Spooler service doesn't exist\n"); - /* To find an existing displayname we check the 'Spooler' service. Although the registry doesn't show DisplayName on NT4, this call - * will return a displayname which is equal to the servicename and can't be used as well for a new displayname. + /* To find an existing displayname we check the 'Spooler' service. Although the registry + * doesn't show DisplayName on NT4, this call will return a displayname which is equal + * to the servicename and can't be used as well for a new displayname. */ if (spooler_exists) { @@ -302,12 +313,13 @@ static void test_create_delete_svc(void) skip("Could not retrieve a displayname for the Spooler service\n"); else { - svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, - pathname, NULL, NULL, NULL, NULL, NULL); + svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); todo_wine { ok(!svc_handle1, "Expected failure\n"); - ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, + "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); } } }

1 0

Paul Vriens : advapi32/service: Check for duplicate displayname.
by Alexandre Julliard 19 Jul '07

19 Jul '07

Module: wine Branch: master Commit: f8f6340a692afc199f171edd03fd295fe3fb0a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f6340a692afc199f171edd0… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 18 20:17:35 2007 +0200 advapi32/service: Check for duplicate displayname. --- dlls/advapi32/service.c | 55 +++++++++++++++++++++++++++++++++++++--- dlls/advapi32/tests/service.c | 10 ------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3fbd242..76f8290 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1309,6 +1309,9 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, struct reg_value val[10]; int n = 0; DWORD new_mask = dwDesiredAccess; + DWORD index = 0; + WCHAR buffer[MAX_PATH]; + BOOL displayname_exists = FALSE; TRACE("%p %s %s\n", hSCManager, debugstr_w(lpServiceName), debugstr_w(lpDisplayName)); @@ -1385,15 +1388,57 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; } + /* Loop through the registry to check if the service already exists and to + * check if we can use the given displayname. + * FIXME: Should we use EnumServicesStatusEx? + */ + len = sizeof(buffer); + while (RegEnumKeyExW(hscm->hkey, index, buffer, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + HKEY service_key; + + /* The service already exists, so bail out */ + if(!lstrcmpiW(lpServiceName, buffer)) + { + SetLastError(ERROR_SERVICE_EXISTS); + return NULL; + } + + /* The given displayname matches the found servicename. We don't bail out + * as servicename is checked before a duplicate displayname + */ + if(!lstrcmpiW(lpDisplayName, buffer)) + displayname_exists = TRUE; + + if (RegOpenKeyExW(hscm->hkey, buffer, 0, KEY_READ, &service_key) == ERROR_SUCCESS) + { + WCHAR name[MAX_PATH]; + DWORD size = sizeof(name); + + if (RegQueryValueExW(service_key, szDisplayName, NULL, NULL, (LPBYTE)name, &size) == ERROR_SUCCESS) + { + /* The given displayname matches the found displayname */ + if (!lstrcmpiW(lpDisplayName, name)) + displayname_exists = TRUE; + } + RegCloseKey(service_key); + } + index++; + len = sizeof(buffer); + } + + if (lpDisplayName && displayname_exists) + { + SetLastError(ERROR_DUPLICATE_SERVICE_NAME); + return NULL; + } + r = RegCreateKeyExW(hscm->hkey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dp); if (r!=ERROR_SUCCESS) - return NULL; - - if (dp != REG_CREATED_NEW_KEY) { - SetLastError(ERROR_SERVICE_EXISTS); - goto error; + /* FIXME: Should we set an error? */ + return NULL; } if( lpDisplayName ) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index ff38d79..0547686 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -315,24 +315,14 @@ static void test_create_delete_svc(void) { svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - todo_wine - { ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); - } } } else skip("Could not retrieve a displayname (Spooler service doesn't exist)\n"); - /* FIXME: Remove this when Wine is fixed */ - if (svc_handle1) - { - DeleteService(svc_handle1); - CloseServiceHandle(svc_handle1); - } - CloseServiceHandle(scm_handle); }

1 0