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

Lei Zhang : wined3d: Various spelling fixes.
by Alexandre Julliard June 6, 2007

June 6, 2007

Module: wine Branch: master Commit: f00670df6135eba1cb162aac954765619ce5f605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00670df6135eba1cb162aac9… Author: Lei Zhang <thestig(a)fido.smo.corp.google.com> Date: Tue Jun 5 15:21:08 2007 -0700 wined3d: Various spelling fixes. --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4cb29ef..4cd4f0c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -457,7 +457,7 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { TRACE("(%p)Checking to see if the container is a base texture\n", This); if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { - TRACE("Passing to conatiner\n"); + TRACE("Passing to container\n"); IWineD3DBaseTexture_PreLoad(baseTexture); IWineD3DBaseTexture_Release(baseTexture); } else { @@ -570,7 +570,7 @@ void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor * /* TODO: think about moving this down to resource? */ const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - /* This should only be called for sysmem textures, it may be a good idea to extend this to all pools at some point in the futture */ + /* This should only be called for sysmem textures, it may be a good idea to extend this to all pools at some point in the future */ if (This->resource.pool != WINED3DPOOL_SYSTEMMEM) { FIXME(" (%p)Attempting to get system memory for a non-system memory texture\n", iface); } @@ -753,7 +753,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED This->lockCount++; /* MAXLOCKCOUNT is defined in wined3d_private.h */ if(This->lockCount > MAXLOCKCOUNT) { - TRACE("Surface is locked regularily, not freeing the system memory copy any more\n"); + TRACE("Surface is locked regularly, not freeing the system memory copy any more\n"); This->Flags |= SFLAG_DYNLOCK; } } @@ -855,7 +855,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED FIXME("Depth stencil locking not supported yet\n"); } else { /* This path is for normal surfaces, offscreen render targets and everything else that is in a gl texture */ - TRACE("locking an ordinarary surface\n"); + TRACE("locking an ordinary surface\n"); if (0 != This->glDescription.textureName) { /* Now I have to copy thing bits back */ @@ -2147,7 +2147,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch ERR("opening of %s failed with: %s\n", filename, strerror(errno)); return WINED3DERR_INVALIDCALL; } -/* Save the dat out to a TGA file because 1: it's an easy raw format, 2: it supports an alpha chanel*/ +/* Save the dat out to a TGA file because 1: it's an easy raw format, 2: it supports an alpha channel*/ TRACE("(%p) opened %s with format %s\n", This, filename, debug_d3dformat(This->resource.format)); /* TGA header */ fputc(0,f); @@ -2221,7 +2221,7 @@ extern HRESULT WINAPI IWineD3DSurfaceImpl_AddDirtyRect(IWineD3DSurface *iface, C This->dirtyRect.top, This->dirtyRect.right, This->dirtyRect.bottom); /* if the container is a basetexture then mark it dirty. */ if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { - TRACE("Passing to conatiner\n"); + TRACE("Passing to container\n"); IWineD3DBaseTexture_SetDirty(baseTexture, TRUE); IWineD3DBaseTexture_Release(baseTexture); } @@ -2246,11 +2246,11 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORM const PixelFormatDesc *formatEntry = getFormatDescEntry(format); if (This->resource.format != WINED3DFMT_UNKNOWN) { - FIXME("(%p) : The foramt of the surface must be WINED3DFORMAT_UNKNOWN\n", This); + FIXME("(%p) : The format of the surface must be WINED3DFORMAT_UNKNOWN\n", This); return WINED3DERR_INVALIDCALL; } - TRACE("(%p) : Setting texture foramt to (%d,%s)\n", This, format, debug_d3dformat(format)); + TRACE("(%p) : Setting texture format to (%d,%s)\n", This, format, debug_d3dformat(format)); if (format == WINED3DFMT_UNKNOWN) { This->resource.size = 0; } else if (format == WINED3DFMT_DXT1) { @@ -2420,10 +2420,10 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } else { UINT yoffset = Src->currentDesc.Height - srect->y1 + drect->y1 - 1; /* I have to process this row by row to swap the image, - * otherwise it would be upside down, so streching in y direction + * otherwise it would be upside down, so stretching in y direction * doesn't cost extra time * - * However, streching in x direction can be avoided if not necessary + * However, stretching in x direction can be avoided if not necessary */ for(row = drect->y1; row < drect->y2; row++) { if( (xrel - 1.0 < -eps) || (xrel - 1.0 > eps)) { @@ -2763,7 +2763,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * untouched. Therefore it's necessary to override the swap effect * and to set it back after the flip. * - * Windowed Direct3D < 7 apps do the same. The D3D7 sdk demso are nice + * Windowed Direct3D < 7 apps do the same. The D3D7 sdk demos are nice * testcases. */ @@ -2807,7 +2807,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); IWineD3DSurface_PreLoad((IWineD3DSurface *) This); - /* Make sure that the top pixel is always above the bottom pixel, and keep a seperate upside down flag + /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it */ if(SrcRect) { @@ -2919,7 +2919,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * * Just modify the color keying parameters in the surface and restore them afterwards * The surface keeps track of the color key last used to load the opengl surface. - * PreLoad will catch the change to the flags and color key and reload if neccessary. + * PreLoad will catch the change to the flags and color key and reload if necessary. */ if(Flags & WINEDDBLT_KEYSRC) { /* Use color key from surface */ @@ -3416,7 +3416,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { if ((This->pow2Width > GL_LIMITS(texture_size) || This->pow2Height > GL_LIMITS(texture_size)) && !(This->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { /* one of three options 1: Do the same as we do with nonpow 2 and scale the texture, (any texture ops would require the texture to be scaled which is potentially slow) - 2: Set the texture to the maxium size (bad idea) + 2: Set the texture to the maximum size (bad idea) 3: WARN and return WINED3DERR_NOTAVAILABLE; 4: Create the surface, but allow it to be used only for DirectDraw Blts. Some apps(e.g. Swat 3) create textures with a Height of 16 and a Width > 3000 and blt 16x16 letter areas from them to the render target. */

1 0

Alexander Nicolaysen Sørnes : wordpad: Fix potential buffer overflow.
by Alexandre Julliard June 6, 2007

June 6, 2007

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

Stefan Dösinger : d3d8: Hold the DLL lock in IDirect3D8 methods.
by Alexandre Julliard June 6, 2007

June 6, 2007

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

Dan Hipschman : widl: Replace get_name with a field reference.
by Alexandre Julliard June 6, 2007

June 6, 2007

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: Implement conformant structure handling.
by Alexandre Julliard June 6, 2007

June 6, 2007

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

Dan Hipschman : widl: Represent arrays with type_t.
by Alexandre Julliard June 6, 2007

June 6, 2007

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

Stefan Dösinger : d3d8: Add a dll global critical section.
by Alexandre Julliard June 6, 2007

June 6, 2007

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

Francois Gouget : winspool.drv: Fix the AddPortExA/W() export to match the implementation.
by Alexandre Julliard June 6, 2007

June 6, 2007

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

Francois Gouget : programs/cmd: Add missing '\n' to Wine trace.
by Alexandre Julliard June 6, 2007

June 6, 2007

Module: wine Branch: master Commit: a2deafcc3fd7b6afdb964ea7258b78ba94661874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2deafcc3fd7b6afdb964ea72… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 6 10:44:04 2007 +0200 programs/cmd: Add missing '\n' to Wine trace. --- programs/cmd/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 4940140..d28421f 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -512,7 +512,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le fd = HeapReAlloc(GetProcessHeap(),0,fd,(entry_count+1)*sizeof(WIN32_FIND_DATA)); if (fd == NULL) { FindClose (hff); - WINE_ERR ("Out of memory"); + WINE_ERR("Out of memory\n"); errorlevel = 1; return parms->next; }

1 0

Dan Hipschman : list.h: Add macros for reverse iteration.
by Alexandre Julliard June 6, 2007

June 6, 2007

Module: wine Branch: master Commit: 6cf8e6bd77f6d3c98f39740ce9c789762a7eb52c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf8e6bd77f6d3c98f39740ce… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jun 5 18:48:21 2007 -0700 list.h: Add macros for reverse iteration. --- include/wine/list.h | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index dede5b4..b018a1f 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -196,6 +196,30 @@ static inline void list_move_head( struct list *dst, struct list *src ) (cursor) = (cursor2), \ (cursor2) = LIST_ENTRY((cursor)->field.next, type, field)) +/* iterate through the list in reverse order */ +#define LIST_FOR_EACH_REV(cursor,list) \ + for ((cursor) = (list)->prev; (cursor) != (list); (cursor) = (cursor)->prev) + +/* iterate through the list in reverse order, with safety against removal */ +#define LIST_FOR_EACH_SAFE_REV(cursor, cursor2, list) \ + for ((cursor) = (list)->prev, (cursor2) = (cursor)->prev; \ + (cursor) != (list); \ + (cursor) = (cursor2), (cursor2) = (cursor)->prev) + +/* iterate through the list in reverse order using a list entry */ +#define LIST_FOR_EACH_ENTRY_REV(elem, list, type, field) \ + for ((elem) = LIST_ENTRY((list)->prev, type, field); \ + &(elem)->field != (list); \ + (elem) = LIST_ENTRY((elem)->field.prev, type, field)) + +/* iterate through the list in reverse order using a list entry, with safety against removal */ +#define LIST_FOR_EACH_ENTRY_SAFE_REV(cursor, cursor2, list, type, field) \ + for ((cursor) = LIST_ENTRY((list)->prev, type, field), \ + (cursor2) = LIST_ENTRY((cursor)->field.prev, type, field); \ + &(cursor)->field != (list); \ + (cursor) = (cursor2), \ + (cursor2) = LIST_ENTRY((cursor)->field.prev, type, field)) + /* macros for statically initialized lists */ #define LIST_INIT(list) { &(list), &(list) }

1 0