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

Jacek Caban : urlmon: Don't pass query part of URL to CreateUrlCacheEntryW.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: daca693f30b2c4c96e570a4523ccc4c8bfb07b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daca693f30b2c4c96e570a452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 6 04:01:13 2007 +0200 urlmon: Don't pass query part of URL to CreateUrlCacheEntryW. --- dlls/urlmon/umstream.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 4a49b77..cd5e153 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -49,32 +49,30 @@ HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, { IUMCacheStream* ucstr; HANDLE handle; - LPWSTR ext; - LPCWSTR c; - LPCWSTR eloc = 0; + DWORD size; + LPWSTR url, c, ext = NULL; HRESULT hr; - for (c = pszURL; *c && *c != '#' && *c != '?'; ++c) + size = (strlenW(pszURL)+1)*sizeof(WCHAR); + url = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(url, pszURL, size); + + for (c = url; *c && *c != '#' && *c != '?'; ++c) { if (*c == '.') - eloc = c + 1; - else if (*c == '/' || *c == '\\') - eloc = 0; + ext = c+1; + else if(*c == '/') + ext = NULL; } - if (!eloc) - eloc = c; - - ext = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (c - eloc + 1)); - memcpy(ext, eloc, sizeof(WCHAR) * (c - eloc)); - ext[c - eloc] = 0; + *c = 0; - if(!CreateUrlCacheEntryW(pszURL, dwSize, ext, pszFileName, 0)) + if(!CreateUrlCacheEntryW(url, dwSize, ext, pszFileName, 0)) hr = HRESULT_FROM_WIN32(GetLastError()); else hr = 0; - HeapFree(GetProcessHeap(), 0, ext); + HeapFree(GetProcessHeap(), 0, url); if (hr) return hr;

1 0

Alexander Nicolaysen Sørnes : wordpad: Fix potential buffer overflow.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: ad57c70a6cc37bfa05630a6e76509a26fe658ee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad57c70a6cc37bfa05630a6e7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jun 5 23:08:29 2007 +0200 wordpad: Fix potential buffer overflow. --- programs/wordpad/wordpad.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 5a9f7fd..6efc15d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -133,15 +133,28 @@ static WCHAR wszFileName[MAX_PATH]; static void set_caption(LPCWSTR wszNewFileName) { - static const WCHAR wszSeparator[] = {' ','-',' ','\0'}; - WCHAR wszCaption[MAX_PATH]; + static const WCHAR wszSeparator[] = {' ','-',' '}; if(wszNewFileName) { - lstrcpyW(wszCaption, wszNewFileName); - lstrcatW(wszCaption, wszSeparator); - lstrcatW(wszCaption, wszAppTitle); + WCHAR *wszCaption; + SIZE_T length = 0; + + wszCaption = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + lstrlenW(wszNewFileName)*sizeof(WCHAR)+sizeof(wszSeparator)+sizeof(wszAppTitle)); + + if(!wszCaption) + return; + + memcpy(wszCaption, wszNewFileName, lstrlenW(wszNewFileName)*sizeof(WCHAR)); + length += lstrlenW(wszNewFileName); + memcpy(wszCaption + length, wszSeparator, sizeof(wszSeparator)); + length += sizeof(wszSeparator) / sizeof(WCHAR); + memcpy(wszCaption + length, wszAppTitle, sizeof(wszAppTitle)); + SetWindowTextW(hMainWnd, wszCaption); + + HeapFree(GetProcessHeap(), 0, wszCaption); } else { SetWindowTextW(hMainWnd, wszAppTitle);

1 0

Dan Hipschman : widl: Replace get_name with a field reference.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: f5baddf88a4061507f470c45c90b2fc374bd5175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5baddf88a4061507f470c45c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jun 5 18:49:12 2007 -0700 widl: Replace get_name with a field reference. --- tools/widl/header.c | 17 ++++++----------- tools/widl/header.h | 1 - tools/widl/proxy.c | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 4f5b6b5..6f4a7ba 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -141,11 +141,6 @@ void write_prefix_name(FILE *h, const char *prefix, const var_t *v) write_name(h, v); } -const char* get_name(const var_t *v) -{ - return v->name; -} - void write_array(FILE *h, array_dims_t *dims, int field) { expr_t *v; @@ -170,7 +165,7 @@ static void write_field(FILE *h, var_t *v) if (v->type) { indent(h, 0); write_type(h, v->type); - if (get_name(v)) + if (v->name) fprintf(h, " %s", v->name); else { /* not all C/C++ compilers support anonymous structs and unions */ @@ -210,7 +205,7 @@ static void write_enums(FILE *h, var_list_t *enums) if (!enums) return; LIST_FOR_EACH_ENTRY( v, enums, var_t, entry ) { - if (get_name(v)) { + if (v->name) { indent(h, 0); write_name(h, v); if (v->eval) { @@ -444,7 +439,7 @@ void write_expr(FILE *h, const expr_t *e, int brackets) void write_constdef(const var_t *v) { - fprintf(header, "#define %s (", get_name(v)); + fprintf(header, "#define %s (", v->name); write_expr(header, v->eval, 0); fprintf(header, ")\n\n"); } @@ -453,7 +448,7 @@ void write_externdef(const var_t *v) { fprintf(header, "extern const "); write_type(header, v->type); - if (get_name(v)) + if (v->name) fprintf(header, " %s", v->name); fprintf(header, ";\n\n"); } @@ -688,7 +683,7 @@ static void write_method_proto(const type_t *iface) if (cas) { const func_t *m; LIST_FOR_EACH_ENTRY( m, iface->funcs, const func_t, entry ) - if (!strcmp(get_name(m->def), cas->name)) break; + if (!strcmp(m->def->name, cas->name)) break; if (&m->entry != iface->funcs) { const var_t *mdef = m->def; /* proxy prototype - use local prototype */ @@ -707,7 +702,7 @@ static void write_method_proto(const type_t *iface) fprintf(header, ");\n"); } else { - parser_warning("invalid call_as attribute (%s -> %s)\n", get_name(def), cas->name); + parser_warning("invalid call_as attribute (%s -> %s)\n", def->name, cas->name); } } } diff --git a/tools/widl/header.h b/tools/widl/header.h index 57ae6b4..dd5c1ea 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -32,7 +32,6 @@ extern int is_conformant_array( const array_dims_t *array ); extern int is_non_void(const expr_list_t *list); extern void write_name(FILE *h, const var_t *v); extern void write_prefix_name(FILE *h, const char *prefix, const var_t *v); -extern const char* get_name(const var_t *v); extern void write_type(FILE *h, type_t *t); extern int is_object(const attr_list_t *list); extern int is_local(const attr_list_t *list); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 9cc61c2..9066d87 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -507,7 +507,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) if (cname) { const func_t *m; LIST_FOR_EACH_ENTRY( m, iface->funcs, const func_t, entry ) - if (!strcmp(get_name(m->def), cname)) + if (!strcmp(m->def->name, cname)) { idx = m->idx; break;

1 0

Dan Hipschman : widl: Represent arrays with type_t.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 978b4d4f4e7acb119b1acd59091bfb96bdfd1dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978b4d4f4e7acb119b1acd590… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jun 5 18:50:31 2007 -0700 widl: Represent arrays with type_t. --- dlls/rpcrt4/tests/server.c | 84 +++++- dlls/rpcrt4/tests/server.idl | 4 + tools/widl/client.c | 7 +- tools/widl/header.c | 122 ++++----- tools/widl/header.h | 19 +- tools/widl/parser.y | 162 +++++++++-- tools/widl/proxy.c | 6 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 667 ++++++++++++++++-------------------------- tools/widl/typegen.h | 1 + tools/widl/typelib.c | 18 ++ tools/widl/widltypes.h | 5 +- tools/widl/write_msft.c | 79 +++--- 13 files changed, 612 insertions(+), 564 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=978b4d4f4e7acb119b1ac…

1 0

Dan Hipschman : widl: Implement conformant structure handling.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 8f689ee023220264790802b625238ce7525b445a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f689ee023220264790802b62… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jun 5 18:52:24 2007 -0700 widl: Implement conformant structure handling. --- dlls/rpcrt4/tests/server.c | 17 +++ dlls/rpcrt4/tests/server.idl | 9 ++ tools/widl/typegen.c | 247 +++++++++++++----------------------------- 3 files changed, 100 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f689ee02322026479080…

1 0

Stefan Dösinger : d3d8: Add a dll global critical section.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 193ccecaee9b4cf825009d05d48210c5cf8d0dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=193ccecaee9b4cf825009d05d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue May 22 23:57:30 2007 +0200 d3d8: Add a dll global critical section. --- dlls/d3d8/d3d8_main.c | 18 ++++++++++++++++-- dlls/d3d8/d3d8_private.h | 3 +++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 4abd940..4922b10 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -24,6 +24,15 @@ #include "d3d8_private.h" #include "wine/debug.h" +static CRITICAL_SECTION_DEBUG d3d8_cs_debug = +{ + 0, 0, &d3d8_cs, + { &d3d8_cs_debug.ProcessLocksList, + &d3d8_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": d3d8_cs") } +}; +CRITICAL_SECTION d3d8_cs = { &d3d8_cs_debug, -1, 0, 0, 0, 0 }; + WINE_DEFAULT_DEBUG_CHANNEL(d3d8); HRESULT WINAPI D3D8GetSWInfo(void) { @@ -36,13 +45,18 @@ void WINAPI DebugSetMute(void) { } IDirect3D8* WINAPI Direct3DCreate8(UINT SDKVersion) { - IDirect3D8Impl* object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D8Impl)); + IDirect3D8Impl* object; + TRACE("SDKVersion = %x\n", SDKVersion); + + EnterCriticalSection(&d3d8_cs); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D8Impl)); object->lpVtbl = &Direct3D8_Vtbl; object->ref = 1; object->WineD3D = WineDirect3DCreate(SDKVersion, 8, (IUnknown *)object); - TRACE("SDKVersion = %x, Created Direct3D object @ %p, WineObj @ %p\n", SDKVersion, object, object->WineD3D); + TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); + LeaveCriticalSection(&d3d8_cs); return (IDirect3D8*) object; } diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f41b7ed..3182427 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -123,6 +123,9 @@ typedef struct IDirect3DVertexShaderDeclarationImpl IDirect3DVertexShaderDeclara /* Advance declaration of structures to satisfy compiler */ typedef struct IDirect3DVertexShader8Impl IDirect3DVertexShader8Impl; +/* Global critical section */ +extern CRITICAL_SECTION d3d8_cs; + /* =========================================================================== The interfactes themselves =========================================================================== */

1 0

Stefan Dösinger : d3d8: Hold the DLL lock in IDirect3D8 methods.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 4f14c4700e21bf03419a17807a9ea6e53070878a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f14c4700e21bf03419a17807… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed May 23 00:33:42 2007 +0200 d3d8: Hold the DLL lock in IDirect3D8 methods. --- dlls/d3d8/directx.c | 93 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 81 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index e05d647..62d833a 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -81,19 +81,34 @@ static ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) { /* IDirect3D8 Interface follow: */ static HRESULT WINAPI IDirect3D8Impl_RegisterSoftwareDevice (LPDIRECT3D8 iface, void* pInitializeFunction) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_RegisterSoftwareDevice(This->WineD3D, pInitializeFunction); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, pInitializeFunction); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_RegisterSoftwareDevice(This->WineD3D, pInitializeFunction); + LeaveCriticalSection(&d3d8_cs); + return hr; } static UINT WINAPI IDirect3D8Impl_GetAdapterCount (LPDIRECT3D8 iface) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_GetAdapterCount(This->WineD3D); + HRESULT hr; + TRACE("(%p)\n", This); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_GetAdapterCount(This->WineD3D); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier (LPDIRECT3D8 iface, UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER8* pIdentifier) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; WINED3DADAPTER_IDENTIFIER adapter_id; + HRESULT hr; + TRACE("(%p)->(%d,%08x, %p\n", This, Adapter, Flags, pIdentifier); + EnterCriticalSection(&d3d8_cs); /* dx8 and dx9 have different structures to be filled in, with incompatible layouts so pass in pointers to the places to be filled via an internal structure */ @@ -108,55 +123,98 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier (LPDIRECT3D8 i adapter_id.DeviceIdentifier = &pIdentifier->DeviceIdentifier; adapter_id.WHQLLevel = &pIdentifier->WHQLLevel; - return IWineD3D_GetAdapterIdentifier(This->WineD3D, Adapter, Flags, &adapter_id); + hr = IWineD3D_GetAdapterIdentifier(This->WineD3D, Adapter, Flags, &adapter_id); + LeaveCriticalSection(&d3d8_cs); + return hr; } static UINT WINAPI IDirect3D8Impl_GetAdapterModeCount (LPDIRECT3D8 iface,UINT Adapter) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_GetAdapterModeCount(This->WineD3D, Adapter, 0 /* format */); + HRESULT hr; + TRACE("(%p)->(%d)\n", This, Adapter); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_GetAdapterModeCount(This->WineD3D, Adapter, 0 /* format */); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3D8Impl_EnumAdapterModes (LPDIRECT3D8 iface, UINT Adapter, UINT Mode, D3DDISPLAYMODE* pMode) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - /* FIXME: USe a constant WINED3DFOTMAT_ANY, or something similar */ - return IWineD3D_EnumAdapterModes(This->WineD3D, Adapter, 0 /* format */, Mode, (WINED3DDISPLAYMODE *) pMode); + HRESULT hr; + TRACE("(%p)->(%d, %d, %p)\n", This, Adapter, Mode, pMode); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_EnumAdapterModes(This->WineD3D, Adapter, WINED3DFMT_UNKNOWN, Mode, (WINED3DDISPLAYMODE *) pMode); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3D8Impl_GetAdapterDisplayMode (LPDIRECT3D8 iface, UINT Adapter, D3DDISPLAYMODE* pMode) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_GetAdapterDisplayMode(This->WineD3D, Adapter, (WINED3DDISPLAYMODE *) pMode); + HRESULT hr; + TRACE("(%p)->(%d,%p)\n", This, Adapter, pMode); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_GetAdapterDisplayMode(This->WineD3D, Adapter, (WINED3DDISPLAYMODE *) pMode); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3D8Impl_CheckDeviceType (LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE CheckType, D3DFORMAT DisplayFormat, D3DFORMAT BackBufferFormat, BOOL Windowed) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_CheckDeviceType(This->WineD3D, Adapter, CheckType, DisplayFormat, + HRESULT hr; + TRACE("(%p)->(%d, %d, %d, %d, %s)\n", This, Adapter, CheckType, DisplayFormat, BackBufferFormat, Windowed ? "true" : "false"); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_CheckDeviceType(This->WineD3D, Adapter, CheckType, DisplayFormat, BackBufferFormat, Windowed); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat (LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_CheckDeviceFormat(This->WineD3D, Adapter, DeviceType, AdapterFormat, + HRESULT hr; + TRACE("(%p)->(%d, %d, %d, %08x, %d, %d)\n", This, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_CheckDeviceFormat(This->WineD3D, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_CheckDeviceMultiSampleType(This->WineD3D, Adapter, DeviceType, SurfaceFormat, + HRESULT hr; + TRACE("(%p)-<(%d, %d, %d, %s, %d)\n", This, Adapter, DeviceType, SurfaceFormat, Windowed ? "true" : "false", MultiSampleType); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_CheckDeviceMultiSampleType(This->WineD3D, Adapter, DeviceType, SurfaceFormat, Windowed, (WINED3DMULTISAMPLE_TYPE) MultiSampleType, NULL); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_CheckDepthStencilMatch(This->WineD3D, Adapter, DeviceType, AdapterFormat, + HRESULT hr; + TRACE("(%p)-<(%d, %d, %d, %d, %d)\n", This, Adapter, DeviceType, AdapterFormat, RenderTargetFormat, DepthStencilFormat); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3D_CheckDepthStencilMatch(This->WineD3D, Adapter, DeviceType, AdapterFormat, RenderTargetFormat, DepthStencilFormat); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS8* pCaps) { @@ -174,7 +232,9 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Ada return D3DERR_INVALIDCALL; /*well this is what MSDN says to return*/ } D3D8CAPSTOWINECAPS(pCaps, pWineCaps) + EnterCriticalSection(&d3d8_cs); hrc = IWineD3D_GetDeviceCaps(This->WineD3D, Adapter, DeviceType, pWineCaps); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, pWineCaps); /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ @@ -191,7 +251,13 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Ada static HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT Adapter) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; - return IWineD3D_GetAdapterMonitor(This->WineD3D, Adapter); + HMONITOR ret; + TRACE("(%p)->(%d)\n", This, Adapter); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3D_GetAdapterMonitor(This->WineD3D, Adapter); + LeaveCriticalSection(&d3d8_cs); + return ret; } /* Internal function called back during the CreateDevice to create a render target */ @@ -352,11 +418,13 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte *ppReturnedDeviceInterface = (IDirect3DDevice8 *)object; /* Allocate an associated WineD3DDevice object */ + EnterCriticalSection(&d3d8_cs); hr =IWineD3D_CreateDevice(This->WineD3D, Adapter, DeviceType, hFocusWindow, BehaviourFlags, &object->WineD3DDevice, (IUnknown *)object); if (hr != D3D_OK) { HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; + LeaveCriticalSection(&d3d8_cs); return hr; } @@ -382,6 +450,7 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte } hr = IWineD3DDevice_Init3D(object->WineD3DDevice, &localParameters, D3D8CB_CreateAdditionalSwapChain); + LeaveCriticalSection(&d3d8_cs); pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight;

1 0

Michael Stefaniuc : psapi: GetPerformanceInfo() calls down to the wrong ntdll function. Found by sparse.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 9e4883e2b8f077f82f97059da31930d1e979635a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4883e2b8f077f82f97059da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 6 01:09:08 2007 +0200 psapi: GetPerformanceInfo() calls down to the wrong ntdll function. Found by sparse. --- dlls/psapi/psapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 0313475..cadc876 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -483,7 +483,7 @@ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) TRACE( "(%p, %d)\n", info, size ); - status = NtQueryInformationProcess( GetCurrentProcess(), SystemPerformanceInformation, info, size, NULL ); + status = NtQuerySystemInformation( SystemPerformanceInformation, info, size, NULL ); if (status) {

1 0

Michael Stefaniuc : psapi: GetWsChanges() calls down to the wrong ntdll function. Found by sparse.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 42be36f61b8d012064970ebf1d5077d20ca87009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42be36f61b8d012064970ebf1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 6 01:08:46 2007 +0200 psapi: GetWsChanges() calls down to the wrong ntdll function. Found by sparse. --- dlls/psapi/psapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index cadc876..7b1588b 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -561,7 +561,7 @@ BOOL WINAPI GetWsChanges( HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, TRACE( "(%p, %p, %d)\n", process, watchinfo, size ); - status = NtQueryVirtualMemory( process, NULL, ProcessWorkingSetWatch, watchinfo, size, NULL ); + status = NtQueryInformationProcess( process, ProcessWorkingSetWatch, watchinfo, size, NULL ); if (status) {

1 0

Francois Gouget : winspool.drv: Fix the AddPortExA/W() export to match the implementation.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: f7d314e5a453acf319cc16c474538ac9d1f26990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d314e5a453acf319cc16c47… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 6 10:44:16 2007 +0200 winspool.drv: Fix the AddPortExA/W() export to match the implementation. --- dlls/winspool.drv/winspool.drv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index cf965f6..ba48563 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -46,8 +46,8 @@ @ stdcall AddMonitorA(str long ptr) @ stdcall AddMonitorW(wstr long ptr) @ stdcall AddPortA(str ptr str) -@ stdcall AddPortExA(ptr str long ptr str) -@ stdcall AddPortExW(ptr wstr long ptr wstr) +@ stdcall AddPortExA(str long ptr str) +@ stdcall AddPortExW(wstr long ptr wstr) @ stdcall AddPortW(wstr long wstr) @ stdcall AddPrintProcessorA(str str str str) @ stdcall AddPrintProcessorW(wstr wstr wstr wstr)

1 0