April 2008 - Wine-commits - list.winehq.org

Alexander Dorofeyev : ddraw/tests: Add viewport clearing tests.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: d8ae8a8780a4ec9ad6bc60884e80fde37f564ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ae8a8780a4ec9ad6bc60884… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 10 23:12:53 2008 +0300 ddraw/tests: Add viewport clearing tests. --- dlls/ddraw/tests/visual.c | 375 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 375 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8ae8a8780a4ec9ad6bc6…

1 0

Alexander Dorofeyev : ddraw: Temporarily activate viewport when clearing.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 44143a97c7b30f402112e93aa868ae4e0bb66f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44143a97c7b30f402112e93aa… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 10 23:12:13 2008 +0300 ddraw: Temporarily activate viewport when clearing. --- dlls/ddraw/viewport.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 90054ee..bb71955 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -667,6 +667,7 @@ IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); DWORD color = 0x00000000; HRESULT hr; + LPDIRECT3DVIEWPORT3 current_viewport; TRACE("(%p/%p)->(%08x,%p,%08x)\n", This, iface, dwCount, lpRects, dwFlags); if (This->active_device == NULL) { @@ -687,6 +688,10 @@ IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, } } + /* Need to temporarily activate viewport to clear it. Previously active one will be restored + afterwards. */ + This->activate(This, TRUE); + hr = IDirect3DDevice7_Clear(ICOM_INTERFACE(This->active_device, IDirect3DDevice7), dwCount, lpRects, @@ -694,6 +699,14 @@ IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, color, 1.0, 0x00000000); + + IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); + if(current_viewport) { + IDirect3DViewportImpl *vp = ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport); + vp->activate(vp, TRUE); + IDirect3DViewport3_Release(current_viewport); + } + LeaveCriticalSection(&ddraw_cs); return hr; } @@ -989,6 +1002,7 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, { ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); HRESULT hr; + LPDIRECT3DVIEWPORT3 current_viewport; TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x)\n", This, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil); EnterCriticalSection(&ddraw_cs); @@ -997,6 +1011,10 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, LeaveCriticalSection(&ddraw_cs); return D3DERR_VIEWPORTHASNODEVICE; } + /* Need to temporarily activate viewport to clear it. Previously active one will be restored + afterwards. */ + This->activate(This, TRUE); + hr = IDirect3DDevice7_Clear(ICOM_INTERFACE(This->active_device, IDirect3DDevice7), dwCount, lpRects, @@ -1004,6 +1022,12 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, dwColor, dvZ, dwStencil); + IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); + if(current_viewport) { + IDirect3DViewportImpl *vp = ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport); + vp->activate(vp, TRUE); + IDirect3DViewport3_Release(current_viewport); + } LeaveCriticalSection(&ddraw_cs); return hr; }

1 0

Alexander Dorofeyev : ddraw: Set active_device in AddViewport.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 3e237c6199847a62c4c9f4dac12eba6f136ff08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e237c6199847a62c4c9f4dac… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 10 23:11:52 2008 +0300 ddraw: Set active_device in AddViewport. --- dlls/ddraw/device.c | 2 ++ dlls/ddraw/viewport.c | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4e528af..9ff24f3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -817,6 +817,8 @@ IDirect3DDeviceImpl_3_AddViewport(IDirect3DDevice3 *iface, EnterCriticalSection(&ddraw_cs); vp->next = This->viewport_list; This->viewport_list = vp; + vp->active_device = This; /* Viewport must be usable for Clear() after AddViewport, + so set active_device here. */ LeaveCriticalSection(&ddraw_cs); return D3D_OK; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index c720a57..90054ee 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -312,10 +312,12 @@ IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface, This->viewports.vp1.dvMaxZ = 1.0; if (This->active_device) { - IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); - if (ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport) == This) - This->activate(This, FALSE); - if(current_viewport) IDirect3DViewport3_Release(current_viewport); + IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); + if (current_viewport) { + if (ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport) == This) + This->activate(This, FALSE); + IDirect3DViewport3_Release(current_viewport); + } } LeaveCriticalSection(&ddraw_cs); @@ -900,10 +902,12 @@ IDirect3DViewportImpl_SetViewport2(IDirect3DViewport3 *iface, memcpy(&(This->viewports.vp2), lpData, lpData->dwSize); if (This->active_device) { - IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); - if (ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport) == This) - This->activate(This, FALSE); - IDirect3DViewport3_Release(current_viewport); + IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); + if (current_viewport) { + if (ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport) == This) + This->activate(This, FALSE); + IDirect3DViewport3_Release(current_viewport); + } } LeaveCriticalSection(&ddraw_cs);

1 0

Alexander Dorofeyev : ddraw: Add possibility to ignore lights in viewport_activate.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 6a48e405db398e913981f6082f09c4cf4cb54669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a48e405db398e913981f6082… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 10 23:11:36 2008 +0300 ddraw: Add possibility to ignore lights in viewport_activate. Mostly NOP regarding existing functionality, but makes it possible to skip light activation when it's not needed (like when clearing). --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 2 +- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/viewport.c | 20 +++++++++++--------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index c10f981..e879143 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -540,7 +540,7 @@ struct IDirect3DViewportImpl } viewports; /* Activation function */ - void (*activate)(IDirect3DViewportImpl*); + void (*activate)(IDirect3DViewportImpl*, BOOL); /* Field used to chain viewports together */ IDirect3DViewportImpl *next; @@ -556,7 +556,7 @@ struct IDirect3DViewportImpl const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl; /* Helper functions */ -void viewport_activate(IDirect3DViewportImpl* This); +void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights); /***************************************************************************** * IDirect3DExecuteBuffer - Wraps to D3D7 diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f39b0b0..4e528af 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1763,7 +1763,7 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface, /* Activate this viewport */ This->current_viewport->active_device = This; - This->current_viewport->activate(This->current_viewport); + This->current_viewport->activate(This->current_viewport, FALSE); LeaveCriticalSection(&ddraw_cs); return D3D_OK; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index fe24fe3..09125e2 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -103,7 +103,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, /* Activate the viewport */ lpViewport->active_device = lpDevice; - lpViewport->activate(lpViewport); + lpViewport->activate(lpViewport, FALSE); TRACE("ExecuteData :\n"); if (TRACE_ON(d3d7)) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 3d78383..c720a57 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -54,16 +54,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7); * activates the viewport using IDirect3DDevice7::SetViewport * *****************************************************************************/ -void viewport_activate(IDirect3DViewportImpl* This) { +void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) { IDirect3DLightImpl* light; D3DVIEWPORT7 vp; - - /* Activate all the lights associated with this context */ - light = This->lights; - while (light != NULL) { - light->activate(light); - light = light->next; + if (!ignore_lights) { + /* Activate all the lights associated with this context */ + light = This->lights; + + while (light != NULL) { + light->activate(light); + light = light->next; + } } /* And copy the values in the structure used by the device */ @@ -312,7 +314,7 @@ IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface, if (This->active_device) { IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); if (ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport) == This) - This->activate(This); + This->activate(This, FALSE); if(current_viewport) IDirect3DViewport3_Release(current_viewport); } LeaveCriticalSection(&ddraw_cs); @@ -900,7 +902,7 @@ IDirect3DViewportImpl_SetViewport2(IDirect3DViewport3 *iface, if (This->active_device) { IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); if (ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport) == This) - This->activate(This); + This->activate(This, FALSE); IDirect3DViewport3_Release(current_viewport); } LeaveCriticalSection(&ddraw_cs);

1 0

Alexander Dorofeyev : include/d3d.h: Fix method calling macros.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 7c8fa9c24f5d6d4e22dec148ffecefc9a4262a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8fa9c24f5d6d4e22dec148f… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 10 23:11:29 2008 +0300 include/d3d.h: Fix method calling macros. --- include/d3d.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 10e5239..7297755 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -833,8 +833,8 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) #define IDirect3DViewport3_DeleteLight(p,a) (p)->lpVtbl->DeleteLight(p,a) #define IDirect3DViewport3_NextLight(p,a,b,c) (p)->lpVtbl->NextLight(p,a,b,c) /*** IDirect3DViewport2 methods ***/ -#define IDirect3DViewport3_GetViewport3(p,a) (p)->lpVtbl->GetViewport2(p,a) -#define IDirect3DViewport3_SetViewport3(p,a) (p)->lpVtbl->SetViewport2(p,a) +#define IDirect3DViewport3_GetViewport2(p,a) (p)->lpVtbl->GetViewport2(p,a) +#define IDirect3DViewport3_SetViewport2(p,a) (p)->lpVtbl->SetViewport2(p,a) /*** IDirect3DViewport3 methods ***/ #define IDirect3DViewport3_SetBackgroundDepth2(p,a) (p)->lpVtbl->SetBackgroundDepth2(p,a) #define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) (p)->lpVtbl->GetBackgroundDepth2(p,a,b) @@ -859,8 +859,8 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) #define IDirect3DViewport3_DeleteLight(p,a) (p)->DeleteLight(a) #define IDirect3DViewport3_NextLight(p,a,b,c) (p)->NextLight(a,b,c) /*** IDirect3DViewport2 methods ***/ -#define IDirect3DViewport3_GetViewport3(p,a) (p)->GetViewport2(a) -#define IDirect3DViewport3_SetViewport3(p,a) (p)->SetViewport2(a) +#define IDirect3DViewport3_GetViewport2(p,a) (p)->GetViewport2(a) +#define IDirect3DViewport3_SetViewport2(p,a) (p)->SetViewport2(a) /*** IDirect3DViewport3 methods ***/ #define IDirect3DViewport3_SetBackgroundDepth2(p,a) (p)->SetBackgroundDepth2(a) #define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) (p)->GetBackgroundDepth2(a,b)

1 0

Rob Shearman : widl: Support non-default calling conventions for non-object functions.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: e4b0266b27298ca611b3727e879bbbecc73fc208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b0266b27298ca611b3727e8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 11 11:02:01 2008 +0100 widl: Support non-default calling conventions for non-object functions. --- tools/widl/client.c | 2 ++ tools/widl/header.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 0796ba4..7e1e70b 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -102,6 +102,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) const var_t* explicit_generic_handle_var = NULL; const var_t* context_handle_var = NULL; int has_full_pointer = is_full_pointer_function(func); + const char *callconv = get_attrp(def->type->attrs, ATTR_CALLCONV); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -131,6 +132,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) write_type_decl_left(client, get_func_return_type(func)); if (needs_space_after(get_func_return_type(func))) fprintf(client, " "); + if (callconv) fprintf(client, "%s ", callconv); write_prefix_name(client, prefix_client, def); fprintf(client, "(\n"); indent++; diff --git a/tools/widl/header.c b/tools/widl/header.c index 03e5a50..dcc3480 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -879,10 +879,12 @@ void write_locals(FILE *fp, const type_t *iface, int body) static void write_function_proto(const type_t *iface, const func_t *fun, const char *prefix) { var_t *def = fun->def; + const char *callconv = get_attrp(def->type->attrs, ATTR_CALLCONV); /* FIXME: do we need to handle call_as? */ write_type_decl_left(header, get_func_return_type(fun)); fprintf(header, " "); + if (callconv) fprintf(header, "%s ", callconv); write_prefix_name(header, prefix, def); fprintf(header, "(\n"); if (fun->args)

1 0

Rob Shearman : widl: Support non-default calling conventions for object methods.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 5483ea9e87e00361a09ed65997162b87c1f1d3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5483ea9e87e00361a09ed6599… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 11 11:01:36 2008 +0100 widl: Support non-default calling conventions for object methods. --- tools/widl/header.c | 12 +++++++++--- tools/widl/proxy.c | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a568bb4..03e5a50 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -729,10 +729,12 @@ static void write_cpp_method_def(const type_t *iface) { var_t *def = cur->def; if (!is_callas(def->attrs)) { + const char *callconv = get_attrp(def->type->attrs, ATTR_CALLCONV); + if (!callconv) callconv = ""; indent(header, 0); fprintf(header, "virtual "); write_type_decl_left(header, get_func_return_type(cur)); - fprintf(header, " STDMETHODCALLTYPE "); + fprintf(header, " %s ", callconv); write_name(header, def); fprintf(header, "(\n"); write_args(header, cur->args, iface->name, 2, TRUE); @@ -755,9 +757,11 @@ static void do_write_c_method_def(const type_t *iface, const char *name) { const var_t *def = cur->def; if (!is_callas(def->attrs)) { + const char *callconv = get_attrp(def->type->attrs, ATTR_CALLCONV); + if (!callconv) callconv = ""; indent(header, 0); write_type_decl_left(header, get_func_return_type(cur)); - fprintf(header, " (STDMETHODCALLTYPE *"); + fprintf(header, " (%s *", callconv); write_name(header, def); fprintf(header, ")(\n"); write_args(header, cur->args, name, 1, TRUE); @@ -787,9 +791,11 @@ static void write_method_proto(const type_t *iface) const var_t *def = cur->def; if (!is_local(def->attrs)) { + const char *callconv = get_attrp(def->type->attrs, ATTR_CALLCONV); + if (!callconv) callconv = ""; /* proxy prototype */ write_type_decl_left(header, get_func_return_type(cur)); - fprintf(header, " CALLBACK %s_", iface->name); + fprintf(header, " %s %s_", callconv, iface->name); write_name(header, def); fprintf(header, "_Proxy(\n"); write_args(header, cur->args, iface->name, 1, TRUE); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index a9710b2..e0864f8 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -253,10 +253,12 @@ static void gen_proxy(type_t *iface, const func_t *cur, int idx, var_t *def = cur->def; int has_ret = !is_void(get_func_return_type(cur)); int has_full_pointer = is_full_pointer_function(cur); + const char *callconv = get_attrp(def->type->attrs, ATTR_CALLCONV); + if (!callconv) callconv = ""; indent = 0; write_type_decl_left(proxy, get_func_return_type(cur)); - print_proxy( " STDMETHODCALLTYPE %s_", iface->name); + print_proxy( " %s %s_", callconv, iface->name); write_name(proxy, def); print_proxy( "_Proxy(\n"); write_args(proxy, cur->args, iface->name, 1, TRUE);

1 0

Rob Shearman : advapi32: Add exception handling around all service RPC calls.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: fe7e786ace4683769e0deb0061dc69504cf0a341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7e786ace4683769e0deb006… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 11 11:01:09 2008 +0100 advapi32: Add exception handling around all service RPC calls. --- dlls/advapi32/service.c | 190 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 166 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 78d057d..dc44e6f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -38,6 +38,8 @@ #include "svcctl.h" +#include "wine/exception.h" + WINE_DEFAULT_DEBUG_CHANNEL(service); static const WCHAR szLocalSystem[] = {'L','o','c','a','l','S','y','s','t','e','m',0}; @@ -279,6 +281,24 @@ void __RPC_USER MACHINE_HANDLEW_unbind(MACHINE_HANDLEW MachineName, handle_t h) RpcBindingFree(&h); } +static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) +{ + return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode); +} + +static DWORD map_exception_code(DWORD exception_code) +{ + switch (exception_code) + { + case RPC_X_NULL_REF_POINTER: + case RPC_X_ENUM_VALUE_OUT_OF_RANGE: + case RPC_X_BYTE_COUNT_TOO_SMALL: + return ERROR_INVALID_PARAMETER; + default: + return exception_code; + } +} + /****************************************************************************** * Service IPC functions */ @@ -661,7 +681,15 @@ SC_LOCK WINAPI LockServiceDatabase (SC_HANDLE hSCManager) return NULL; } - err = svcctl_LockServiceDatabase(hscm->hdr.server_handle, &hLock); + __TRY + { + err = svcctl_LockServiceDatabase(hscm->hdr.server_handle, &hLock); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) { SetLastError(err); @@ -680,7 +708,15 @@ BOOL WINAPI UnlockServiceDatabase (SC_LOCK ScLock) TRACE("%p\n",ScLock); - err = svcctl_UnlockServiceDatabase(&hRpcLock); + __TRY + { + err = svcctl_UnlockServiceDatabase(&hRpcLock); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) { SetLastError(err); @@ -715,7 +751,15 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) return FALSE; } - err = svcctl_SetServiceStatus( hsvc->hdr.server_handle, lpStatus ); + __TRY + { + err = svcctl_SetServiceStatus( hsvc->hdr.server_handle, lpStatus ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) { SetLastError(err); @@ -778,7 +822,15 @@ SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, if (!manager) return NULL; - r = svcctl_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, &manager->hdr.server_handle); + __TRY + { + r = svcctl_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, &manager->hdr.server_handle); + } + __EXCEPT(rpc_filter) + { + r = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (r!=ERROR_SUCCESS) goto error; @@ -836,7 +888,15 @@ BOOL WINAPI ControlService( SC_HANDLE hService, DWORD dwControl, return FALSE; } - err = svcctl_ControlService(hsvc->hdr.server_handle, dwControl, lpServiceStatus); + __TRY + { + err = svcctl_ControlService(hsvc->hdr.server_handle, dwControl, lpServiceStatus); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) { SetLastError(err); @@ -872,7 +932,15 @@ CloseServiceHandle( SC_HANDLE hSCObject ) } obj = (struct sc_handle *)hSCObject; - err = svcctl_CloseServiceHandle(&obj->server_handle); + __TRY + { + err = svcctl_CloseServiceHandle(&obj->server_handle); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY sc_handle_free( obj ); if (err != ERROR_SUCCESS) @@ -957,7 +1025,15 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, hscm->hdr.ref_count++; hsvc->scm = hscm; - err = svcctl_OpenServiceW(hscm->hdr.server_handle, lpServiceName, dwDesiredAccess, &hsvc->hdr.server_handle); + __TRY + { + err = svcctl_OpenServiceW(hscm->hdr.server_handle, lpServiceName, dwDesiredAccess, &hsvc->hdr.server_handle); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) { @@ -1031,11 +1107,19 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, hsvc->scm = hscm; hscm->hdr.ref_count++; - err = svcctl_CreateServiceW(hscm->hdr.server_handle, lpServiceName, - lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (LPBYTE)lpDependencies, - multisz_cb(lpDependencies), lpServiceStartName, (LPBYTE)lpPassword, passwdlen, - &hsvc->hdr.server_handle); + __TRY + { + err = svcctl_CreateServiceW(hscm->hdr.server_handle, lpServiceName, + lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (LPBYTE)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (LPBYTE)lpPassword, passwdlen, + &hsvc->hdr.server_handle); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) { @@ -1124,7 +1208,15 @@ BOOL WINAPI DeleteService( SC_HANDLE hService ) return FALSE; } - err = svcctl_DeleteService(hsvc->hdr.server_handle); + __TRY + { + err = svcctl_DeleteService(hsvc->hdr.server_handle); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != 0) { SetLastError(err); @@ -1210,7 +1302,15 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, return FALSE; } - err = svcctl_StartServiceW(hsvc->hdr.server_handle, dwNumServiceArgs, lpServiceArgVectors); + __TRY + { + err = svcctl_StartServiceW(hsvc->hdr.server_handle, dwNumServiceArgs, lpServiceArgVectors); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) { SetLastError(err); @@ -1276,7 +1376,15 @@ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE hService, SC_STATUS_TYPE InfoLevel, return FALSE; } - err = svcctl_QueryServiceStatusEx(hsvc->hdr.server_handle, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + __TRY + { + err = svcctl_QueryServiceStatusEx(hsvc->hdr.server_handle, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) { SetLastError(err); @@ -1402,7 +1510,17 @@ QueryServiceConfigW( SC_HANDLE hService, memset(&config, 0, sizeof(config)); - if ((err = svcctl_QueryServiceConfigW(hsvc->hdr.server_handle, &config)) != 0) + __TRY + { + err = svcctl_QueryServiceConfigW(hsvc->hdr.server_handle, &config); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY + + if (err != ERROR_SUCCESS) { TRACE("services.exe: error %u\n", err); SetLastError(err); @@ -1700,8 +1818,16 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, return FALSE; } - err = svcctl_GetServiceKeyNameW(hscm->hdr.server_handle, - lpDisplayName, lpServiceName, lpServiceName ? *lpcchBuffer : 0, lpcchBuffer); + __TRY + { + err = svcctl_GetServiceKeyNameW(hscm->hdr.server_handle, + lpDisplayName, lpServiceName, lpServiceName ? *lpcchBuffer : 0, lpcchBuffer); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err) SetLastError(err); @@ -1804,8 +1930,16 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return FALSE; } - err = svcctl_GetServiceDisplayNameW(hscm->hdr.server_handle, - lpServiceName, lpDisplayName, lpDisplayName ? *lpcchBuffer : 0, lpcchBuffer); + __TRY + { + err = svcctl_GetServiceDisplayNameW(hscm->hdr.server_handle, + lpServiceName, lpDisplayName, lpDisplayName ? *lpcchBuffer : 0, lpcchBuffer); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err) SetLastError(err); @@ -1839,10 +1973,18 @@ BOOL WINAPI ChangeServiceConfigW( SC_HANDLE hService, DWORD dwServiceType, cb_pwd = lpPassword ? (strlenW(lpPassword) + 1)*sizeof(WCHAR) : 0; - err = svcctl_ChangeServiceConfigW(hsvc->hdr.server_handle, dwServiceType, - dwStartType, dwErrorControl, lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, - (const BYTE *)lpDependencies, multisz_cb(lpDependencies), lpServiceStartName, - (const BYTE *)lpPassword, cb_pwd, lpDisplayName); + __TRY + { + err = svcctl_ChangeServiceConfigW(hsvc->hdr.server_handle, dwServiceType, + dwStartType, dwErrorControl, lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, + (const BYTE *)lpDependencies, multisz_cb(lpDependencies), lpServiceStartName, + (const BYTE *)lpPassword, cb_pwd, lpDisplayName); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY if (err != ERROR_SUCCESS) SetLastError(err);

1 0

Rob Shearman : ole32: Use I_RpcExceptionFilter instead of custom exception filter for RPC calls.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: aa83f5a5aa5ffab8bbc25b8fb76e1dcdb5ae8a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa83f5a5aa5ffab8bbc25b8fb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 11 11:00:46 2008 +0100 ole32: Use I_RpcExceptionFilter instead of custom exception filter for RPC calls. --- dlls/ole32/moniker.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 6a1c1e9..413d110 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -56,14 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) { - switch (eptr->ExceptionRecord->ExceptionCode) - { - case EXCEPTION_ACCESS_VIOLATION: - case EXCEPTION_ILLEGAL_INSTRUCTION: - return EXCEPTION_CONTINUE_SEARCH; - default: - return EXCEPTION_EXECUTE_HANDLER; - } + return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode); } /* define the structure of the running object table elements */

1 0

Rob Shearman : services: Automatically start boot-start, system-start and auto-start services when services.exe is started, instead of in wineboot.exe.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 5a35bd4971b363905491d00a4cbb152a84d27b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a35bd4971b363905491d00a4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 11 11:00:11 2008 +0100 services: Automatically start boot-start, system-start and auto-start services when services.exe is started, instead of in wineboot.exe. --- programs/services/rpc.c | 230 +--------------------------------- programs/services/services.c | 288 ++++++++++++++++++++++++++++++++++++++++++ programs/services/services.h | 1 + programs/wineboot/wineboot.c | 50 +------- 4 files changed, 291 insertions(+), 278 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a35bd4971b363905491d…

1 0