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

Alexandre Julliard : imm32: Remove stray semicolon. Don' t try to load an invalid file.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 01d167be7c863c41e51deeace17ce7df044a9809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01d167be7c863c41e51deeace… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 1 23:17:21 2008 +0200 imm32: Remove stray semicolon. Don't try to load an invalid file. --- dlls/imm32/imm.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9173d1b..866c3e3 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -139,8 +139,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ptr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ImmHkl)); ptr->hkl = hkl; - ImmGetIMEFileNameW(hkl, filename, MAX_PATH); - ptr->hIME = LoadLibraryW(filename); + if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire); @@ -179,7 +178,7 @@ static void IMM_FreeAllImmHkl(void) { ImmHkl *ptr,*cursor2; - LIST_FOR_EACH_ENTRY_SAFE(ptr, cursor2, &ImmHklList, ImmHkl, entry); + LIST_FOR_EACH_ENTRY_SAFE(ptr, cursor2, &ImmHklList, ImmHkl, entry) { list_remove(&ptr->entry); if (ptr->hIME)

1 0

Stefan Dösinger : ddraw: Do not fail if D3D is not available.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 4066c2e2fdf70dbdd63e2663b6ecd7ad2ee24901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4066c2e2fdf70dbdd63e2663b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:09:26 2008 +0100 ddraw: Do not fail if D3D is not available. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f8c1a9b..eb020a6 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -949,8 +949,8 @@ static BOOL D3D1_createObjects(void) ddsd.dwWidth = 256; ddsd.dwHeight = 256; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); - ok(hr==DD_OK, "CreateSurface returned: %x\n", hr); if (!Surface1) { + skip("DDSCAPS_3DDEVICE surface not available\n"); return FALSE; }

1 0

Stefan Dösinger : wined3d: Refuse 3D initialization without opengl.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: a29a22932434c0c3768a5eb595ef50cd0f59b110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29a22932434c0c3768a5eb59… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:04:52 2008 +0100 wined3d: Refuse 3D initialization without opengl. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee27abf..57b6045 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2010,6 +2010,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR TRACE("(%p)->(%p,%p)\n", This, pPresentationParameters, D3DCB_CreateAdditionalSwapChain); if(This->d3d_initialized) return WINED3DERR_INVALIDCALL; + if(!This->adapter->opengl) return WINED3DERR_INVALIDCALL; /* TODO: Test if OpenGL is compiled in and loaded */

1 0

Rob Shearman : services: Fix memory leak of some data in the service record .
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 0b7a37acdcb883eaaf83073aef01834261d14e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7a37acdcb883eaaf83073ae… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:28 2008 +0100 services: Fix memory leak of some data in the service record. --- programs/services/services.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 80a0a2d..0177076 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -83,6 +83,8 @@ void free_service_entry(struct service_entry *entry) HeapFree(GetProcessHeap(), 0, entry->config.lpServiceStartName); HeapFree(GetProcessHeap(), 0, entry->config.lpDisplayName); HeapFree(GetProcessHeap(), 0, entry->description); + HeapFree(GetProcessHeap(), 0, entry->dependOnServices); + HeapFree(GetProcessHeap(), 0, entry->dependOnGroups); CloseHandle(entry->control_mutex); CloseHandle(entry->control_pipe); CloseHandle(entry->status_changed_event);

1 0

Stefan Dösinger : wined3d: Return a fake pixel format if gl is not loaded.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 8673be0bd7579eb6440fc2d0b1c60c93f3067c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8673be0bd7579eb6440fc2d0b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:04:34 2008 +0100 wined3d: Return a fake pixel format if gl is not loaded. --- dlls/wined3d/utils.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95abe20..d0285df 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -437,11 +437,16 @@ const StaticPixelFormatDesc *getFormatDescEntry(WINED3DFORMAT fmt, WineD3D_GL_In idx = getFmtIdx(WINED3DFMT_UNKNOWN); } if(glDesc) { - if(!gl_info) { - ERR("OpenGL pixel format information was requested, but no gl info structure passed\n"); - return NULL; + if(!gl_info->gl_formats) { + /* If we do not have gl format information, provide a dummy NULL format. This is an easy way to make + * all gl caps check return "unsupported" than catching the lack of gl all over the code. ANSI C requires + * static variables to be initialized to 0. + */ + static const GlPixelFormatDesc dummyFmt; + *glDesc = &dummyFmt; + } else { + *glDesc = &gl_info->gl_formats[idx]; } - *glDesc = &gl_info->gl_formats[idx]; } return &formats[idx]; }

1 0

Rob Shearman : advapi32: Remove some unused services functions.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 9d834fc180df2d126334a98bc1f4ea245434ebae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d834fc180df2d126334a98bc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:34 2008 +0100 advapi32: Remove some unused services functions. --- dlls/advapi32/service.c | 79 ----------------------------------------------- 1 files changed, 0 insertions(+), 79 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 0d13442..c95fcd9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -340,85 +340,6 @@ void __RPC_USER MACHINE_HANDLEW_unbind(MACHINE_HANDLEW MachineName, handle_t h) } /****************************************************************************** - * registry access functions and data - */ -static const WCHAR szDisplayName[] = { - 'D','i','s','p','l','a','y','N','a','m','e', 0 }; -static const WCHAR szType[] = {'T','y','p','e',0}; -static const WCHAR szStart[] = {'S','t','a','r','t',0}; -static const WCHAR szError[] = { - 'E','r','r','o','r','C','o','n','t','r','o','l', 0}; -static const WCHAR szImagePath[] = {'I','m','a','g','e','P','a','t','h',0}; -static const WCHAR szGroup[] = {'G','r','o','u','p',0}; -static const WCHAR szDependencies[] = { - 'D','e','p','e','n','d','e','n','c','i','e','s',0}; -static const WCHAR szDependOnService[] = { - 'D','e','p','e','n','d','O','n','S','e','r','v','i','c','e',0}; -static const WCHAR szObjectName[] = { - 'O','b','j','e','c','t','N','a','m','e',0}; -static const WCHAR szTag[] = { - 'T','a','g',0}; - -struct reg_value { - DWORD type; - DWORD size; - LPCWSTR name; - LPCVOID data; -}; - -static inline void service_set_value( struct reg_value *val, - DWORD type, LPCWSTR name, LPCVOID data, DWORD size ) -{ - val->name = name; - val->type = type; - val->data = data; - val->size = size; -} - -static inline void service_set_dword( struct reg_value *val, - LPCWSTR name, const DWORD *data ) -{ - service_set_value( val, REG_DWORD, name, data, sizeof (DWORD)); -} - -static inline void service_set_string( struct reg_value *val, - LPCWSTR name, LPCWSTR string ) -{ - DWORD len = (lstrlenW(string)+1) * sizeof (WCHAR); - service_set_value( val, REG_SZ, name, string, len ); -} - -static inline void service_set_multi_string( struct reg_value *val, - LPCWSTR name, LPCWSTR string ) -{ - DWORD len = 0; - - /* determine the length of a double null terminated multi string */ - do { - len += (lstrlenW( &string[ len ] )+1); - } while ( string[ len++ ] ); - - len *= sizeof (WCHAR); - service_set_value( val, REG_MULTI_SZ, name, string, len ); -} - -static inline LONG service_write_values( HKEY hKey, - const struct reg_value *val, int n ) -{ - LONG r = ERROR_SUCCESS; - int i; - - for( i=0; i<n; i++ ) - { - r = RegSetValueExW(hKey, val[i].name, 0, val[i].type, - (const BYTE*)val[i].data, val[i].size ); - if( r != ERROR_SUCCESS ) - break; - } - return r; -} - -/****************************************************************************** * Service IPC functions */ static LPWSTR service_get_pipe_name(void)

1 0

Stefan Dösinger : wined3d: Create a fake non-gl adapter.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 9e831a873300e30340e8fb9446060be9ad55d6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e831a873300e30340e8fb944… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:04:17 2008 +0100 wined3d: Create a fake non-gl adapter. --- dlls/wined3d/directx.c | 38 +++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a30955c..6baf8d3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3676,7 +3676,7 @@ BOOL InitAdapters(void) { /* No need to hold any lock. The calling library makes sure only one thread calls * wined3d simultaneously */ - if(numAdapters > 0) return TRUE; + if(numAdapters > 0) return Adapters[0].opengl; TRACE("Initializing adapters\n"); @@ -3686,7 +3686,7 @@ BOOL InitAdapters(void) { mod_gl = LoadLibraryA("opengl32.dll"); if(!mod_gl) { ERR("Can't load opengl32.dll!\n"); - return FALSE; + goto nogl_adapter; } #else #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); @@ -3702,7 +3702,7 @@ BOOL InitAdapters(void) { if(!pwglGetProcAddress) { ERR("Unable to load wglGetProcAddress!\n"); - return FALSE; + goto nogl_adapter; } /* Dynamically load all GL core functions */ @@ -3728,32 +3728,28 @@ BOOL InitAdapters(void) { if (!WineD3D_CreateFakeGLContext()) { ERR("Failed to get a gl context for default adapter\n"); - HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext(); - return FALSE; + goto nogl_adapter; } ret = IWineD3DImpl_FillGLCaps(&Adapters[0].gl_info); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); - HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext(); - return FALSE; + goto nogl_adapter; } ret = initPixelFormats(&Adapters[0].gl_info); if(!ret) { ERR("Failed to init gl formats\n"); - HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext(); - return FALSE; + goto nogl_adapter; } hdc = pwglGetCurrentDC(); if(!hdc) { ERR("Failed to get gl HDC\n"); - HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext(); - return FALSE; + goto nogl_adapter; } Adapters[0].driver = "Display"; @@ -3826,11 +3822,31 @@ attributes. */ select_shader_max_constants(ps_selected_mode, vs_selected_mode, &Adapters[0].gl_info); fillGLAttribFuncs(&Adapters[0].gl_info); init_type_lookup(&Adapters[0].gl_info); + Adapters[0].opengl = TRUE; } numAdapters = 1; TRACE("%d adapters successfully initialized\n", numAdapters); return TRUE; + +nogl_adapter: + /* Initialize an adapter for ddraw-only memory counting */ + memset(Adapters, 0, sizeof(Adapters)); + Adapters[0].num = 0; + Adapters[0].opengl = FALSE; + Adapters[0].monitorPoint.x = -1; + Adapters[0].monitorPoint.y = -1; + + Adapters[0].driver = "Display"; + Adapters[0].description = "WineD3D DirectDraw Emulation"; + if(wined3d_settings.emulated_textureram) { + Adapters[0].TextureRam = wined3d_settings.emulated_textureram; + } else { + Adapters[0].TextureRam = 8 * 1024 * 1024; /* This is plenty for a DDraw-only card */ + } + + numAdapters = 1; + return FALSE; } #undef PUSH1 #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0abeb1d..c3f4910 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -682,6 +682,7 @@ typedef struct GLPixelFormatDesc GLPixelFormatDesc; struct WineD3DAdapter { UINT num; + BOOL opengl; POINT monitorPoint; WineD3D_GL_Info gl_info; const char *driver;

1 0

Rob Shearman : rpcrt4: Add a reference to the binding object in I_RpcNegotiateTransferSyntax and release the reference in I_RpcFreeBuffer .
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 8aeb2858e44627c2002b9a20483a2a9c78a2aa3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aeb2858e44627c2002b9a204… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:15 2008 +0100 rpcrt4: Add a reference to the binding object in I_RpcNegotiateTransferSyntax and release the reference in I_RpcFreeBuffer. This is needed because a context binding handle could be released on unmarshall, but it still needs to stay valid until the binding handle is no longer being used. Re-use the previously unused RPCRT4_ExportBinding function as RPCRT4_AddRefBinding and rename RPCRT4_DestroyBinding to RPCRT4_ReleaseBinding to show that it's purpose is to release a reference count and destroy if necessary, not always destroy. --- dlls/rpcrt4/rpc_binding.c | 14 ++++++-------- dlls/rpcrt4/rpc_binding.h | 4 ++-- dlls/rpcrt4/rpc_message.c | 4 ++++ dlls/rpcrt4/rpc_transport.c | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 7293032..d670a88 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -249,14 +249,12 @@ RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection) return RPC_S_OK; } -RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding) +void RPCRT4_AddRefBinding(RpcBinding* Binding) { - InterlockedIncrement(&OldBinding->refs); - *Binding = OldBinding; - return RPC_S_OK; + InterlockedIncrement(&Binding->refs); } -RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding) +RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding) { if (InterlockedDecrement(&Binding->refs)) return RPC_S_OK; @@ -661,7 +659,7 @@ RPC_STATUS WINAPI RpcBindingFree( RPC_BINDING_HANDLE* Binding ) { RPC_STATUS status; TRACE("(%p) = %p\n", Binding, *Binding); - status = RPCRT4_DestroyBinding(*Binding); + status = RPCRT4_ReleaseBinding(*Binding); if (status == RPC_S_OK) *Binding = 0; return status; } @@ -741,7 +739,7 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingA( RPC_CSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) *Binding = (RPC_BINDING_HANDLE)bind; else - RPCRT4_DestroyBinding(bind); + RPCRT4_ReleaseBinding(bind); return ret; } @@ -780,7 +778,7 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( RPC_WSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) *Binding = (RPC_BINDING_HANDLE)bind; else - RPCRT4_DestroyBinding(bind); + RPCRT4_ReleaseBinding(bind); return ret; } diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index e169a65..3251df2 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -145,8 +145,8 @@ RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* Old RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint); RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid); RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection); -RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding); -RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding); +void RPCRT4_AddRefBinding(RpcBinding* Binding); +RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding); RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId); RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection); diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index bc33c87..3b1e68d 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1017,7 +1017,10 @@ RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) &cif->InterfaceId); if (status == RPC_S_OK) + { pMsg->ReservedForRuntime = conn; + RPCRT4_AddRefBinding(bind); + } } return status; @@ -1114,6 +1117,7 @@ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { RpcConnection *conn = pMsg->ReservedForRuntime; RPCRT4_CloseBinding(bind, conn); + RPCRT4_ReleaseBinding(bind); pMsg->ReservedForRuntime = NULL; } I_RpcFree(pMsg->Buffer); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 822807b..8bca0fe 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1551,7 +1551,7 @@ RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection) if (Connection->QOS) RpcQualityOfService_Release(Connection->QOS); /* server-only */ - if (Connection->server_binding) RPCRT4_DestroyBinding(Connection->server_binding); + if (Connection->server_binding) RPCRT4_ReleaseBinding(Connection->server_binding); HeapFree(GetProcessHeap(), 0, Connection); return RPC_S_OK;

1 0

Rob Shearman : rpcrt4: Improve trace in RPCRT4_find_interface to print the interface identifier data as well as the object guid .
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: c7f9b9347fdf7a073329d9b3fada993c2ea74717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f9b9347fdf7a073329d9b3f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:06 2008 +0100 rpcrt4: Improve trace in RPCRT4_find_interface to print the interface identifier data as well as the object guid. --- dlls/rpcrt4/rpc_server.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 40e9e7e..f93d264 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -138,7 +138,9 @@ static RpcServerInterface* RPCRT4_find_interface(UUID* object, } LeaveCriticalSection(&server_cs); if (&cif->entry == &server_interfaces) cif = NULL; - TRACE("returning %p for %s\n", cif, debugstr_guid(object)); + TRACE("returning %p for object %s, if_id { %d.%d %s }\n", cif, + debugstr_guid(object), if_id->SyntaxVersion.MajorVersion, + if_id->SyntaxVersion.MinorVersion, debugstr_guid(&if_id->SyntaxGUID)); return cif; }

1 0

Alexandre Julliard : ntdll: Add a guard page at the bottom of the stack and raise a stack overflow exception when hit .
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: cc33f6c8a5df21589efa7ce26f8b13715e698008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc33f6c8a5df21589efa7ce26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 1 17:40:37 2008 +0200 ntdll: Add a guard page at the bottom of the stack and raise a stack overflow exception when hit. --- dlls/ntdll/signal_i386.c | 46 ++++++++++++++++++++++++++++++++++++---------- dlls/ntdll/virtual.c | 4 +++- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7920d0a..d9c6aba 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1026,6 +1026,7 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s DWORD ebp; DWORD eip; } *stack = stack_ptr; + DWORD exception_code = 0; /* stack sanity checks */ @@ -1040,22 +1041,37 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s } if (stack - 1 > stack || /* check for overflow in subtraction */ - (char *)(stack - 1) < (char *)NtCurrentTeb()->Tib.StackLimit || + (char *)stack <= (char *)NtCurrentTeb()->DeallocationStack || (char *)stack > (char *)NtCurrentTeb()->Tib.StackBase) { - UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)stack; - if (diff < 4096) + WARN( "exception outside of stack limits in thread %04x eip %08x esp %08x stack %p-%p\n", + GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), + (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, + NtCurrentTeb()->Tib.StackBase ); + } + else if ((char *)(stack - 1) < (char *)NtCurrentTeb()->DeallocationStack + 4096) + { + /* stack overflow on last page, unrecoverable */ + UINT diff = (char *)NtCurrentTeb()->DeallocationStack + 4096 - (char *)(stack - 1); + WINE_ERR( "stack overflow %u bytes in thread %04x eip %08x esp %08x stack %p-%p-%p\n", + diff, GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), + (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->DeallocationStack, + NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); + server_abort_thread(1); + } + else if ((char *)(stack - 1) < (char *)NtCurrentTeb()->Tib.StackLimit) + { + /* stack access below stack limit, may be recoverable */ + if (virtual_handle_stack_fault( stack - 1 )) exception_code = EXCEPTION_STACK_OVERFLOW; + else { - WINE_ERR( "stack overflow %u bytes in thread %04x eip %08x esp %08x stack %p-%p\n", + UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)(stack - 1); + WINE_ERR( "stack overflow %u bytes in thread %04x eip %08x esp %08x stack %p-%p-%p\n", diff, GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), - (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, - NtCurrentTeb()->Tib.StackBase ); + (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->DeallocationStack, + NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); server_abort_thread(1); } - else WARN( "exception outside of stack limits in thread %04x eip %08x esp %08x stack %p-%p\n", - GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), - (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, - NtCurrentTeb()->Tib.StackBase ); } stack--; /* push the stack_layout structure */ @@ -1069,6 +1085,7 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s stack->context_ptr = &stack->context; stack->rec.ExceptionRecord = NULL; + stack->rec.ExceptionCode = exception_code; stack->rec.ExceptionFlags = EXCEPTION_CONTINUABLE; stack->rec.ExceptionAddress = (LPVOID)EIP_sig(sigcontext); stack->rec.NumberParameters = 0; @@ -1280,9 +1297,18 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) (char *)siginfo->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && (char *)siginfo->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && virtual_handle_stack_fault( siginfo->si_addr )) + { + /* check if this was the last guard page */ + if ((char *)siginfo->si_addr < (char *)NtCurrentTeb()->DeallocationStack + 2*4096) + { + rec = setup_exception_record( context, stack, fs, gs, raise_segv_exception ); + rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; + } return; + } rec = setup_exception_record( context, stack, fs, gs, raise_segv_exception ); + if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; switch(get_trap_code(context)) { diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5e4327b..a5b299d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1303,11 +1303,13 @@ NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T size ) /* setup no access guard page */ VIRTUAL_SetProt( view, view->base, page_size, VPROT_COMMITTED ); + VIRTUAL_SetProt( view, (char *)view->base + page_size, page_size, + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_GUARD ); /* note: limit is lower than base since the stack grows down */ NtCurrentTeb()->DeallocationStack = view->base; NtCurrentTeb()->Tib.StackBase = (char *)view->base + view->size; - NtCurrentTeb()->Tib.StackLimit = (char *)view->base + page_size; + NtCurrentTeb()->Tib.StackLimit = (char *)view->base + 2 * page_size; done: server_leave_uninterrupted_section( &csVirtual, &sigset );

1 0