wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Mikołaj Zalewski : wrc: verify-translation: Remove dumping of stringtables.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 748705155592b916c5e133fd386c74ae32550e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=748705155592b916c5e133fd3… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Mar 28 22:26:49 2008 +0100 wrc: verify-translation: Remove dumping of stringtables. --- tools/wrc/translation.c | 44 -------------------------------------------- 1 files changed, 0 insertions(+), 44 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 13dc509..12f3020 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -956,49 +956,6 @@ static int compare(resource_t *resource1, resource_t *resource2) { } } -static void dump_stringtable(resource_t *res) -{ - stringtable_t *stt = res->res.stt; - int j; - - printf("DUMP "); - assert((stt->idbase%16) == 0); - assert(stt->nentries == 16); - for (j = 0; j < stt->nentries; j++) - { - stt_entry_t *entry = &stt->entries[j]; - language_t *lang = stt->lvc.language; - string_t *newstr; - WCHAR *wstr; - int k; - - if (entry->str) - { - newstr = convert_string(entry->str, str_unicode, get_language_codepage(lang->id, lang->sub)); - printf("%02x%02x", newstr->size & 0xff, (newstr->size >> 8) & 0xff); - wstr = newstr->str.wstr; - for (k = 0; k < newstr->size; k++) - printf("%02x%02x", wstr[k] & 0xff, wstr[k] >> 8); - free_string(newstr); - } - else - printf("0000"); - } - putchar('\n'); -} - -static void dump(resource_t *res) -{ - switch (res->type) - { - case res_stt: - dump_stringtable(res); - return; - default: - break; - } -} - typedef struct resource_lang_node { language_t lang; @@ -1159,7 +1116,6 @@ void verify_translations(resource_t *top) { for (langnode = idnode->langs; langnode; langnode = langnode->next) { printf("EXIST %03x:%02x\n", langnode->lang.id, langnode->lang.sub); - dump(langnode->res); if (compare(langnode->res, mainres)) { printf("DIFF %03x:%02x\n", langnode->lang.id, langnode->lang.sub);

1 0

Mikołaj Zalewski : wrc: verify-translation: Compare all the controls of dialogs, not only the first one.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: c933dbf1b4462c175d69875bd8b95792847d13ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c933dbf1b4462c175d69875bd… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Mar 28 20:45:44 2008 +0100 wrc: verify-translation: Compare all the controls of dialogs, not only the first one. --- tools/wrc/translation.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index e46fab1..13dc509 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -1,5 +1,6 @@ /* * Copyright 2003 Vincent B�ron + * Copyright 2007, 2008 Mikolaj Zalewski * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -324,6 +325,7 @@ static int compare_control(control_t *control1, control_t *control2) { static int compare_dialog(dialog_t *dialog1, dialog_t *dialog2) { int different = 0; char *nameid = NULL; + control_t *ctrl1, *ctrl2; if(!different && ((dialog1->memopt != dialog2->memopt) || (dialog1->lvc.version != dialog2->lvc.version) || @@ -355,14 +357,22 @@ static int compare_dialog(dialog_t *dialog1, dialog_t *dialog2) { if(!different && strcmp(nameid, get_nameid_str(dialog2->dlgclass))) different = 1; free(nameid); - if(!different) - different = compare_control(dialog1->controls, dialog2->controls); + + ctrl1 = dialog1->controls; + ctrl2 = dialog2->controls; + while(!different && (ctrl1 || ctrl2)) + { + different = compare_control(ctrl1, ctrl2); + if (ctrl1) ctrl1 = ctrl1->next; + if (ctrl2) ctrl2 = ctrl2->next; + } return different; } static int compare_dialogex(dialogex_t *dialogex1, dialogex_t *dialogex2) { int different = 0; char *nameid = NULL; + control_t *ctrl1, *ctrl2; if(!different && ((dialogex1->memopt != dialogex2->memopt) || (dialogex1->lvc.version != dialogex2->lvc.version) || @@ -401,8 +411,15 @@ static int compare_dialogex(dialogex_t *dialogex1, dialogex_t *dialogex2) { if(!different && strcmp(nameid, get_nameid_str(dialogex2->dlgclass))) different = 1; free(nameid); - if(!different) - different = compare_control(dialogex1->controls, dialogex2->controls); + + ctrl1 = dialogex1->controls; + ctrl2 = dialogex2->controls; + while(!different && (ctrl1 || ctrl2)) + { + different = compare_control(ctrl1, ctrl2); + if (ctrl1) ctrl1 = ctrl1->next; + if (ctrl2) ctrl2 = ctrl2->next; + } return different; }

1 0

Alasdair Sinclair : fonts: Fix uninstall of TrueType fonts.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 6d3df49e7e22d046881d8b8e5742e76624624970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3df49e7e22d046881d8b8e5… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Sat Mar 29 15:33:05 2008 +0000 fonts: Fix uninstall of TrueType fonts. --- fonts/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 60353f8..2f07ade 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -184,7 +184,7 @@ install:: $(FONTS) $(INSTALLDIRS) for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(SRCDIR)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done uninstall:: - -cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS) + -cd $(DESTDIR)$(fontdir) && $(RM) $(BITMAP_FONTS) $(TRUETYPE_FONTS) -rmdir $(DESTDIR)$(fontdir) clean::

1 0

Alexandre Julliard : winex11: Ignore EnterNotify resulting from a pointer grab.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 35bec2ed19cc5ce5cc8d4dda0e04bd082e8be27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bec2ed19cc5ce5cc8d4dda0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 31 12:12:12 2008 +0200 winex11: Ignore EnterNotify resulting from a pointer grab. --- dlls/winex11.drv/mouse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8301386..8e8d5f5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1110,6 +1110,7 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (event->detail == NotifyVirtual || event->detail == NotifyNonlinearVirtual) return; + if (event->window == x11drv_thread_data()->grab_window) return; /* simulate a mouse motion event */ update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );

1 0

Jacek Caban : winex11: Add owned windows to the taskbar if it has WS_EX_APPWINDOW style.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 8c910077ae5ab90b93bdaec9d47575b582b41a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c910077ae5ab90b93bdaec9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 29 15:16:09 2008 +0000 winex11: Add owned windows to the taskbar if it has WS_EX_APPWINDOW style. --- dlls/winex11.drv/winpos.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index ad62236..13ec6f1 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -199,7 +199,7 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (GetWindow( data->hwnd, GW_OWNER )) + if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); xev.xclient.type = ClientMessage;

1 0

Rob Shearman : services: Fill in the functions between implemented functions in svcctl. idl so that it our remoting code is wire-compatible with NT.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 8529a3c404893ecbc710d4398cf43c6d1e36d650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8529a3c404893ecbc710d4398… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:08:27 2008 +0000 services: Fill in the functions between implemented functions in svcctl.idl so that it our remoting code is wire-compatible with NT. Add the necessary stubs for these in services.exe. --- include/wine/svcctl.idl | 78 ++++++++++++++++++++ programs/services/rpc.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 264 insertions(+), 0 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 4053524..443f6c9 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -113,6 +113,15 @@ cpp_quote("#endif") [out] SC_RPC_LOCK *phLock ); + /* Not compatible with Windows function 0x04 */ + DWORD svcctl_QueryServiceObjectSecurity(/* FIXME */); + + /* Not compatible with Windows function 0x05 */ + DWORD svcctl_SetServiceObjectSecurity(/* FIXME */); + + /* Not compatible with Windows function 0x06 */ + DWORD svcctl_QueryServiceStatus(/* FIXME */); + /* Compatible with Windows function 0x07 */ DWORD svcctl_SetServiceStatus( [in] SC_RPC_HANDLE hServiceStatus, @@ -124,6 +133,12 @@ cpp_quote("#endif") [in,out] SC_RPC_LOCK *phLock ); + /* Not compatible with Windows function 0x09 */ + DWORD svcctl_NotifyBootConfigStatus(/* FIXME */); + + /* Not compatible with Windows function 0x0a */ + DWORD svcctl_SCSetServiceBitsW(/* FIXME */); + /* Compatible with Windows function 0x0b */ DWORD svcctl_ChangeServiceConfigW( [in] SC_RPC_HANDLE hService, @@ -161,6 +176,12 @@ cpp_quote("#endif") [out] SC_RPC_HANDLE *phService ); + /* Not compatible with Windows function 0x0d */ + DWORD svcctl_EnumDependentServicesW(/* FIXME */); + + /* Not compatible with Windows function 0x0e */ + DWORD svcctl_EnumServicesStatusW(/* FIXME */); + /* Compatible with Windows function 0x0f */ DWORD svcctl_OpenSCManagerW( [in,unique] MACHINE_HANDLEW MachineName, @@ -182,6 +203,9 @@ cpp_quote("#endif") [in] SC_RPC_HANDLE hService, [out] QUERY_SERVICE_CONFIGW *config); + /* Not compatible with Windows function 0x12 */ + DWORD svcctl_QueryServiceLockStatusW(/* FIXME */); + /* Untested with Windows function 0x13 */ DWORD svcctl_StartServiceW( [in] SC_RPC_HANDLE hService, @@ -205,6 +229,60 @@ cpp_quote("#endif") [in] DWORD cchBufSize, [out] DWORD *cchLength); + /* Not compatible with Windows function 0x16 */ + DWORD svcctl_SCSetServiceBitsA(/* FIXME */); + + /* Not compatible with Windows function 0x17 */ + DWORD svcctl_ChangeServiceConfigA(/* FIXME */); + + /* Not compatible with Windows function 0x18 */ + DWORD svcctl_CreateServiceA(/* FIXME */); + + /* Not compatible with Windows function 0x19 */ + DWORD svcctl_EnumDependentServicesA(/* FIXME */); + + /* Not compatible with Windows function 0x1a */ + DWORD svcctl_EnumServicesStatusA(/* FIXME */); + + /* Not compatible with Windows function 0x1b */ + DWORD svcctl_OpenSCManagerA(/* FIXME */); + + /* Not compatible with Windows function 0x1c */ + DWORD svcctl_OpenServiceA(/* FIXME */); + + /* Not compatible with Windows function 0x1d */ + DWORD svcctl_QueryServiceConfigA(/* FIXME */); + + /* Not compatible with Windows function 0x1e */ + DWORD svcctl_QueryServiceLockStatusA(/* FIXME */); + + /* Not compatible with Windows function 0x1f */ + DWORD svcctl_StartServiceA(/* FIXME */); + + /* Not compatible with Windows function 0x20 */ + DWORD svcctl_GetServiceDisplayNameA(/* FIXME */); + + /* Not compatible with Windows function 0x21 */ + DWORD svcctl_GetServiceKeyNameA(/* FIXME */); + + /* Not compatible with Windows function 0x22 */ + DWORD svcctl_GetCurrentGroupStateW(/* FIXME */); + + /* Not compatible with Windows function 0x23 */ + DWORD svcctl_EnumServiceGroupW(/* FIXME */); + + /* Not compatible with Windows function 0x24 */ + DWORD svcctl_ChangeServiceConfig2A(/* FIXME */); + + /* Not compatible with Windows function 0x25 */ + DWORD svcctl_ChangeServiceConfig2W(/* FIXME */); + + /* Not compatible with Windows function 0x26 */ + DWORD svcctl_QueryServiceConfig2A(/* FIXME */); + + /* Not compatible with Windows function 0x27 */ + DWORD svcctl_QueryServiceConfig2W(/* FIXME */); + /* Untested with Windows function 0x28 */ DWORD svcctl_QueryServiceStatusEx( [in] SC_RPC_HANDLE hService, diff --git a/programs/services/rpc.c b/programs/services/rpc.c index b6f043b..63ce0d7 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1147,6 +1147,192 @@ DWORD svcctl_UnlockServiceDatabase( return ERROR_SUCCESS; } +DWORD svcctl_QueryServiceObjectSecurity( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_SetServiceObjectSecurity( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_QueryServiceStatus( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +DWORD svcctl_NotifyBootConfigStatus( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_SCSetServiceBitsW( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +DWORD svcctl_EnumDependentServicesW( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_EnumServicesStatusW( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +DWORD svcctl_QueryServiceLockStatusW( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_SCSetServiceBitsA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_ChangeServiceConfigA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_CreateServiceA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_EnumDependentServicesA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_EnumServicesStatusA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_OpenSCManagerA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_OpenServiceA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_QueryServiceConfigA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_QueryServiceLockStatusA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_StartServiceA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_GetServiceDisplayNameA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_GetServiceKeyNameA( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_GetCurrentGroupStateW( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_EnumServiceGroupW( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_ChangeServiceConfig2A( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_ChangeServiceConfig2W( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_QueryServiceConfig2A( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD svcctl_QueryServiceConfig2W( + void) +{ + WINE_FIXME("\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + DWORD RPC_MainLoop(void) { WCHAR transport[] = SVCCTL_TRANSPORT;

1 0

Rob Shearman : services: Introduce an scmdatabase object to store the root key of the services database .
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 809d714f243be1259b8b1553ee183c592620a3a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809d714f243be1259b8b1553e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:08:12 2008 +0000 services: Introduce an scmdatabase object to store the root key of the services database. Make the functions that deal with the service database more object-oriented. Add a finer-grained locking architecture. --- programs/services/rpc.c | 190 ++++++++++++++++++++++-------------------- programs/services/services.c | 186 +++++++++++++++++++++++++---------------- programs/services/services.h | 41 +++++++-- 3 files changed, 243 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=809d714f243be1259b8b1…

1 0

Rob Shearman : services: Move ControlService and StartServiceW from advapi32.dll to services.exe.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 9a6fc01d84f65e6ac3ba2bffad796ac655e99564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6fc01d84f65e6ac3ba2bffa… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:07:39 2008 +0000 services: Move ControlService and StartServiceW from advapi32.dll to services.exe. This also changes the architecture such that services.exe is the server end of the control pipe and the service is the client end. --- dlls/advapi32/service.c | 355 ++--------------------------------- include/wine/svcctl.idl | 27 +++ programs/services/rpc.c | 427 ++++++++++++++++++++++++++++++++++++++++++ programs/services/services.c | 4 + programs/services/services.h | 3 + 5 files changed, 477 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a6fc01d84f65e6ac3ba2…

1 0

Rob Shearman : services: Move LockServiceDatabase and UnlockServiceDatabase from advapi32. dll to services.exe.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 7afd9a977a84e80a02109351faa8d46182504c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afd9a977a84e80a02109351f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:06:43 2008 +0000 services: Move LockServiceDatabase and UnlockServiceDatabase from advapi32.dll to services.exe. --- dlls/advapi32/service.c | 34 ++++++++++++++++++++-------- include/wine/svcctl.idl | 12 ++++++++++ programs/services/rpc.c | 50 ++++++++++++++++++++++++++++++++++++++++++ programs/services/services.c | 14 +++++++++++ programs/services/services.h | 3 ++ 5 files changed, 103 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 20f7af5..0b29493 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -954,21 +954,26 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) */ SC_LOCK WINAPI LockServiceDatabase (SC_HANDLE hSCManager) { - HANDLE ret; + struct sc_manager *hscm; + SC_RPC_LOCK hLock; + DWORD err; TRACE("%p\n",hSCManager); - ret = CreateSemaphoreW( NULL, 1, 1, szSCMLock ); - if( ret && GetLastError() == ERROR_ALREADY_EXISTS ) + hscm = sc_handle_get_handle_data( hSCManager, SC_HTYPE_MANAGER ); + if (!hscm) { - CloseHandle( ret ); - ret = NULL; - SetLastError( ERROR_SERVICE_DATABASE_LOCKED ); + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; } - TRACE("returning %p\n", ret); - - return ret; + err = svcctl_LockServiceDatabase(hscm->hdr.server_handle, &hLock); + if (err != ERROR_SUCCESS) + { + SetLastError(err); + return NULL; + } + return hLock; } /****************************************************************************** @@ -976,9 +981,18 @@ SC_LOCK WINAPI LockServiceDatabase (SC_HANDLE hSCManager) */ BOOL WINAPI UnlockServiceDatabase (SC_LOCK ScLock) { + DWORD err; + SC_RPC_LOCK hRpcLock = ScLock; + TRACE("%p\n",ScLock); - return CloseHandle( ScLock ); + err = svcctl_UnlockServiceDatabase(&hRpcLock); + if (err != ERROR_SUCCESS) + { + SetLastError(err); + return FALSE; + } + return TRUE; } /****************************************************************************** diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index c0190e7..a629f6a 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -43,6 +43,7 @@ interface svcctl /* handle types */ typedef [handle] LPCWSTR MACHINE_HANDLEW; typedef [context_handle] void *SC_RPC_HANDLE; + typedef [context_handle] void *SC_RPC_LOCK; /* undocumented access rights */ cpp_quote("#define SERVICE_SET_STATUS 0x8000") @@ -86,12 +87,23 @@ cpp_quote("#endif") [in] SC_RPC_HANDLE hService ); + /* Compatible with Windows function 0x03 */ + DWORD svcctl_LockServiceDatabase( + [in] SC_RPC_HANDLE hSCManager, + [out] SC_RPC_LOCK *phLock + ); + /* Compatible with Windows function 0x07 */ DWORD svcctl_SetServiceStatus( [in] SC_RPC_HANDLE hServiceStatus, [in] LPSERVICE_STATUS lpServiceStatus ); + /* Compatible with Windows function 0x08 */ + DWORD svcctl_UnlockServiceDatabase( + [in,out] SC_RPC_LOCK *phLock + ); + /* Compatible with Windows function 0x0b */ DWORD svcctl_ChangeServiceConfigW( [in] SC_RPC_HANDLE hService, diff --git a/programs/services/rpc.c b/programs/services/rpc.c index f780f7e..0a59ed4 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -88,6 +88,11 @@ struct sc_service /* service handle */ struct service_entry *service_entry; }; +struct sc_lock +{ + char dummy; /* no state currently used */ +}; + /* Check if the given handle is of the required type and allows the requested access. */ static DWORD validate_context_handle(SC_RPC_HANDLE handle, DWORD type, DWORD needed_access, struct sc_handle **out_hdr) { @@ -654,6 +659,51 @@ DWORD svcctl_CloseServiceHandle( return ERROR_SUCCESS; } +static void SC_RPC_LOCK_destroy(SC_RPC_LOCK hLock) +{ + unlock_service_database(); + HeapFree(GetProcessHeap(), 0, hLock); +} + +void __RPC_USER SC_RPC_LOCK_rundown(SC_RPC_LOCK hLock) +{ + SC_RPC_LOCK_destroy(hLock); +} + +DWORD svcctl_LockServiceDatabase( + SC_RPC_HANDLE hSCManager, + SC_RPC_LOCK *phLock) +{ + struct sc_manager *manager; + DWORD err; + + WINE_TRACE("(%p, %p)\n", hSCManager, phLock); + + if ((err = validate_scm_handle(hSCManager, SC_MANAGER_LOCK, &manager)) != ERROR_SUCCESS) + return err; + + err = lock_service_database(); + if (err != ERROR_SUCCESS) + return err; + + *phLock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock)); + if (!*phLock) + return ERROR_NOT_ENOUGH_SERVER_MEMORY; + + return ERROR_SUCCESS; +} + +DWORD svcctl_UnlockServiceDatabase( + SC_RPC_LOCK *phLock) +{ + WINE_TRACE("(&%p)\n", *phLock); + + SC_RPC_LOCK_destroy(*phLock); + *phLock = NULL; + + return ERROR_SUCCESS; +} + DWORD RPC_MainLoop(void) { WCHAR transport[] = SVCCTL_TRANSPORT; diff --git a/programs/services/services.c b/programs/services/services.c index 2e22469..1962dc9 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -274,6 +274,20 @@ BOOL validate_service_config(struct service_entry *entry) return TRUE; } +static LONG service_lock = FALSE; + +DWORD lock_service_database(void) +{ + if (InterlockedCompareExchange(&service_lock, TRUE, FALSE)) + return ERROR_SERVICE_DATABASE_LOCKED; + return ERROR_SUCCESS; +} + +void unlock_service_database(void) +{ + InterlockedCompareExchange(&service_lock, FALSE, TRUE); +} + void lock_services(void) { EnterCriticalSection(&services_list_cs); diff --git a/programs/services/services.h b/programs/services/services.h index 30b120e..4c7c656 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -45,6 +45,9 @@ DWORD save_service_config(struct service_entry *entry); void free_service_entry(struct service_entry *entry); void release_service(struct service_entry *service); +DWORD lock_service_database(void); +void unlock_service_database(void); + void lock_services(void); void unlock_services(void);

1 0

Mikołaj Zalewski : services: Move ChangeServiceConfigW implementation from advapi32.dll to services.exe .
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 76d4eeebff5ee0fe6d56304cbcbe5294888b10a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d4eeebff5ee0fe6d56304cb… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Mar 15 19:11:12 2008 +0100 services: Move ChangeServiceConfigW implementation from advapi32.dll to services.exe. --- dlls/advapi32/service.c | 70 +++++++++---------------- dlls/advapi32/tests/service.c | 19 +++++++ include/wine/svcctl.idl | 17 ++++++ programs/services/rpc.c | 113 +++++++++++++++++++++++++++++++++++++++++ programs/services/services.c | 2 +- programs/services/services.h | 1 + 6 files changed, 177 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76d4eeebff5ee0fe6d563…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
101
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2008