October 2006 - Wine-Commits

Stefan Dösinger : ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTUREHANDLE.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: e92d7cbf2b3058caa010f483ce7d3c5a2df7225c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e92d7cbf2b3058caa010f483c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Oct 15 00:01:23 2006 +0200 ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTUREHANDLE. --- dlls/ddraw/device.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 1401499..09d2ca9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2094,16 +2094,53 @@ IDirect3DDeviceImpl_7_GetRenderState(IDi DWORD *Value) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); + HRESULT hr; TRACE("(%p)->(%08x,%p): Relay\n", This, RenderStateType, Value); if(!Value) return DDERR_INVALIDPARAMS; - /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */ + switch(RenderStateType) + { + case D3DRENDERSTATE_TEXTUREHANDLE: + { + /* This state is wrapped to SetTexture in SetRenderState, so + * it has to be wrapped to GetTexture here + */ + IWineD3DBaseTexture *tex = NULL; + *Value = 0; + + hr = IWineD3DDevice_GetTexture(This->wineD3DDevice, + 0, + &tex); + + if(hr == WINED3D_OK && tex) + { + IDirectDrawSurface7 *parent = NULL; + hr = IWineD3DBaseTexture_GetParent(tex, + (IUnknown **) &parent); + if(parent) + { + /* The parent of the texture is the IDirectDrawSurface7 interface + * of the ddraw surface + */ + IDirectDrawSurfaceImpl *texImpl = ICOM_OBJECT(IDirectDrawSurfaceImpl, + IDirectDrawSurface7, + parent); + *Value = texImpl->Handle; + IDirectDrawSurface7_Release(parent); + } + IWineD3DBaseTexture_Release(tex); + } + return hr; + } - return IWineD3DDevice_GetRenderState(This->wineD3DDevice, - RenderStateType, - Value); + default: + /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */ + return IWineD3DDevice_GetRenderState(This->wineD3DDevice, + RenderStateType, + Value); + } } static HRESULT WINAPI

1 0

Stefan Dösinger : ddraw: Use real handles for state blocks.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 1c86290bd57c8169eca1b6d45e06be7ad79e8a90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c86290bd57c8169eca1b6d45… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 14 23:58:42 2006 +0200 ddraw: Use real handles for state blocks. --- dlls/ddraw/ddraw_private.h | 3 +- dlls/ddraw/device.c | 80 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 72 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7181997..aaa61a9 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -273,7 +273,8 @@ typedef enum DDrawHandle_Unknown = 0, DDrawHandle_Texture = 1, DDrawHandle_Material = 2, - DDrawHandle_Matrix = 3 + DDrawHandle_Matrix = 3, + DDrawHandle_StateBlock = 4 } DDrawHandleTypes; struct HandleEntry diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 5774374..1401499 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -352,6 +352,15 @@ IDirect3DDeviceImpl_7_Release(IDirect3DD } break; + case DDrawHandle_StateBlock: + { + /* No fixme here because this might happen because of sloppy apps */ + WARN("Leftover stateblock handle %d, deleting\n", i + 1); + IDirect3DDevice7_DeleteStateBlock(ICOM_INTERFACE(This, IDirect3DDevice7), + i + 1); + } + break; + default: FIXME("Unknown handle %d not unset properly\n", i + 1); } @@ -4255,8 +4264,7 @@ IDirect3DDeviceImpl_7_BeginStateBlock(ID * IDirect3DDevice7::EndStateBlock * * Stops recording to a state block and returns the created stateblock - * handle. The d3d7 stateblock handles are the interface pointers of the - * IWineD3DStateBlock interface + * handle. * * Version 7 * @@ -4278,10 +4286,20 @@ IDirect3DDeviceImpl_7_EndStateBlock(IDir TRACE("(%p)->(%p): Relay!\n", This, BlockHandle); if(!BlockHandle) + { + WARN("BlockHandle == NULL, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; + } + *BlockHandle = IDirect3DDeviceImpl_CreateHandle(This); + if(!*BlockHandle) + { + ERR("Cannot get a handle number for the stateblock\n"); + return DDERR_OUTOFMEMORY; + } + This->Handles[*BlockHandle - 1].type = DDrawHandle_StateBlock; hr = IWineD3DDevice_EndStateBlock(This->wineD3DDevice, - (IWineD3DStateBlock **) BlockHandle); + (IWineD3DStateBlock **) &This->Handles[*BlockHandle - 1].ptr); return hr_ddraw_from_wined3d(hr); } @@ -4339,10 +4357,18 @@ IDirect3DDeviceImpl_7_ApplyStateBlock(ID HRESULT hr; TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle); - if(!BlockHandle) + if(!BlockHandle || BlockHandle > This->numHandles) + { + WARN("Out of range handle %d, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); + return D3DERR_INVALIDSTATEBLOCK; + } + if(This->Handles[BlockHandle - 1].type != DDrawHandle_StateBlock) + { + WARN("Handle %d is not a stateblock, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); return D3DERR_INVALIDSTATEBLOCK; + } - hr = IWineD3DStateBlock_Apply((IWineD3DStateBlock *) BlockHandle); + hr = IWineD3DStateBlock_Apply((IWineD3DStateBlock *) This->Handles[BlockHandle - 1].ptr); return hr_ddraw_from_wined3d(hr); } @@ -4370,10 +4396,18 @@ IDirect3DDeviceImpl_7_CaptureStateBlock( HRESULT hr; TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle); - if(BlockHandle == 0) + if(BlockHandle == 0 || BlockHandle > This->numHandles) + { + WARN("Out of range handle %d, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); return D3DERR_INVALIDSTATEBLOCK; + } + if(This->Handles[BlockHandle - 1].type != DDrawHandle_StateBlock) + { + WARN("Handle %d is not a stateblock, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); + return D3DERR_INVALIDSTATEBLOCK; + } - hr = IWineD3DStateBlock_Capture((IWineD3DStateBlock *) BlockHandle); + hr = IWineD3DStateBlock_Capture((IWineD3DStateBlock *) This->Handles[BlockHandle - 1].ptr); return hr_ddraw_from_wined3d(hr); } @@ -4397,12 +4431,27 @@ IDirect3DDeviceImpl_7_DeleteStateBlock(I DWORD BlockHandle) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); + ULONG ref; TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle); - if(BlockHandle == 0) + if(BlockHandle == 0 || BlockHandle > This->numHandles) + { + WARN("Out of range handle %d, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); return D3DERR_INVALIDSTATEBLOCK; + } + if(This->Handles[BlockHandle - 1].type != DDrawHandle_StateBlock) + { + WARN("Handle %d is not a stateblock, returning D3DERR_INVALIDSTATEBLOCK\n", BlockHandle); + return D3DERR_INVALIDSTATEBLOCK; + } - IWineD3DStateBlock_Release((IWineD3DStateBlock *) BlockHandle); + ref = IWineD3DStateBlock_Release((IWineD3DStateBlock *) This->Handles[BlockHandle - 1].ptr); + if(ref) + { + ERR("Something is still holding the stateblock %p(Handle %d). Ref = %d\n", This->Handles[BlockHandle - 1].ptr, BlockHandle, ref); + } + This->Handles[BlockHandle - 1].ptr = NULL; + This->Handles[BlockHandle - 1].type = DDrawHandle_Unknown; return D3D_OK; } @@ -4433,12 +4482,23 @@ IDirect3DDeviceImpl_7_CreateStateBlock(I TRACE("(%p)->(%08x,%p)!\n", This, Type, BlockHandle); if(!BlockHandle) + { + WARN("BlockHandle == NULL, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; + } + + *BlockHandle = IDirect3DDeviceImpl_CreateHandle(This); + if(!*BlockHandle) + { + ERR("Cannot get a handle number for the stateblock\n"); + return DDERR_OUTOFMEMORY; + } + This->Handles[*BlockHandle - 1].type = DDrawHandle_StateBlock; /* The D3DSTATEBLOCKTYPE enum is fine here */ hr = IWineD3DDevice_CreateStateBlock(This->wineD3DDevice, Type, - (IWineD3DStateBlock **) BlockHandle, + (IWineD3DStateBlock **) &This->Handles[*BlockHandle - 1].ptr, NULL /* Parent, hope that works */); return hr_ddraw_from_wined3d(hr); }

1 0

Stefan Dösinger : ddraw: Make the surface list a standard wine list.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 2e5628df3fba1c3991b9f3bbf3bf88a19238e827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5628df3fba1c3991b9f3bbf… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 14 21:57:09 2006 +0200 ddraw: Make the surface list a standard wine list. --- dlls/ddraw/ddraw.c | 27 +++++++++++---------------- dlls/ddraw/ddraw_private.h | 11 +++++------ dlls/ddraw/main.c | 2 ++ dlls/ddraw/surface.c | 10 +--------- 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fc80517..11de3ef 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1904,12 +1904,7 @@ IDirectDrawImpl_CreateNewSurface(IDirect /* Increase the surface counter, and attach the surface */ InterlockedIncrement(&This->surfaces); - if(This->surface_list) - { - This->surface_list->prev = *ppSurf; - } - (*ppSurf)->next = This->surface_list; - This->surface_list = *ppSurf; + list_add_head(&This->surface_list, &(*ppSurf)->surface_list_entry); /* Here we could store all created surfaces in the DirectDrawImpl structure, * But this could also be delegated to WineDDraw, as it keeps track of all its @@ -2375,23 +2370,20 @@ IDirectDrawImpl_CreateSurface(IDirectDra if( (This->ImplType == SURFACE_OPENGL) && !(This->d3d_initialized) && desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE) ) { - IDirectDrawSurfaceImpl *target = This->surface_list; + IDirectDrawSurfaceImpl *target = object, *surface; + struct list *entry; /* Search for the primary to use as render target */ - while(target) + LIST_FOR_EACH(entry, &This->surface_list) { - if(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + surface = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); + if(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { /* found */ + target = surface; TRACE("Using primary %p as render target\n", target); break; } - target = target->next; - } - /* If it's not found, use the just created DDSCAPS_3DDEVICE surface */ - if(!target) - { - target = object; } TRACE("(%p) Attaching a D3DDevice, rendertarget = %p\n", This, target); @@ -2601,6 +2593,7 @@ IDirectDrawImpl_EnumSurfaces(IDirectDraw IDirectDrawSurfaceImpl *surf; BOOL all, nomatch; DDSURFACEDESC2 desc; + struct list *entry, *entry2; all = Flags & DDENUMSURFACES_ALL; nomatch = Flags & DDENUMSURFACES_NOMATCH; @@ -2610,8 +2603,10 @@ IDirectDrawImpl_EnumSurfaces(IDirectDraw if(!Callback) return DDERR_INVALIDPARAMS; - for(surf = This->surface_list; surf; surf = surf->next) + /* Use the _SAFE enumeration, the app may destroy enumerated surfaces */ + LIST_FOR_EACH_SAFE(entry, entry2, &This->surface_list) { + surf = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); if (all || (nomatch != IDirectDrawImpl_DDSD_Match(DDSD, &surf->surface_desc))) { desc = surf->surface_desc; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f70da21..7181997 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -130,10 +130,6 @@ struct IDirectDrawImpl /* The surface type to request */ WINED3DSURFTYPE ImplType; - /* The surface list - can't relay this to WineD3D - * because of IParent - */ - IDirectDrawSurfaceImpl *surface_list; /* Our private window class */ char classname[32]; @@ -145,6 +141,10 @@ struct IDirectDrawImpl /* For the dll unload cleanup code */ struct list ddraw_list_entry; + /* The surface list - can't relay this to WineD3D + * because of IParent + */ + struct list surface_list; LONG surfaces; }; @@ -233,8 +233,7 @@ struct IDirectDrawSurfaceImpl IDirectDrawClipperImpl *clipper; /* For the ddraw surface list */ - IDirectDrawSurfaceImpl *next; - IDirectDrawSurfaceImpl *prev; + struct list surface_list_entry; DWORD Handle; }; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 8865fe5..eec98f1 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -315,6 +315,8 @@ #undef BLIT_CAPS #undef CKEY_CAPS #undef FX_CAPS + list_init(&This->surface_list); + EnterCriticalSection(&ddraw_list_cs); list_add_head(&global_ddraw_list, &This->ddraw_list_entry); LeaveCriticalSection(&ddraw_list_cs); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0ce28da..d7940bd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -238,15 +238,7 @@ static void IDirectDrawSurfaceImpl_Destr /* Reduce the ddraw surface count */ InterlockedDecrement(&This->ddraw->surfaces); - if(This->prev) - This->prev->next = This->next; - else - { - assert(This->ddraw->surface_list == This); - This->ddraw->surface_list = This->next; - } - if(This->next) - This->next->prev = This->prev; + list_remove(&This->surface_list_entry); HeapFree(GetProcessHeap(), 0, This); }

1 0

Roderick Colenbrander : wgl: Move wglShareLists to gdi32.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 92e6e46ca95f7c20bd04864d35d9604bf8e26fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e6e46ca95f7c20bd04864d3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 14 22:49:09 2006 +0200 wgl: Move wglShareLists to gdi32. --- dlls/gdi/driver.c | 1 + dlls/gdi/gdi_private.h | 1 + dlls/gdi/opengl.c | 24 ++++++++++++++++++++++++ dlls/opengl32/opengl32.spec | 2 +- dlls/opengl32/wgl.c | 10 ---------- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c index db2086c..f5900e2 100644 --- a/dlls/gdi/driver.c +++ b/dlls/gdi/driver.c @@ -198,6 +198,7 @@ #define GET_FUNC(name) driver->funcs.p## /* OpenGL32 */ GET_FUNC(wglCreateContext); GET_FUNC(wglMakeCurrent); + GET_FUNC(wglShareLists); GET_FUNC(wglUseFontBitmapsA); GET_FUNC(wglUseFontBitmapsW); #undef GET_FUNC diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi/gdi_private.h index 02a1348..ec3454c 100644 --- a/dlls/gdi/gdi_private.h +++ b/dlls/gdi/gdi_private.h @@ -186,6 +186,7 @@ typedef struct tagDC_FUNCS /* OpenGL32 */ HGLRC (*pwglCreateContext)(PHYSDEV); BOOL (*pwglMakeCurrent)(PHYSDEV, HGLRC); + BOOL (*pwglShareLists)(HGLRC hglrc1, HGLRC hglrc2); BOOL (*pwglUseFontBitmapsA)(PHYSDEV, DWORD, DWORD, DWORD); BOOL (*pwglUseFontBitmapsW)(PHYSDEV, DWORD, DWORD, DWORD); } DC_FUNCTIONS; diff --git a/dlls/gdi/opengl.c b/dlls/gdi/opengl.c index 95e09c6..375ff9b 100644 --- a/dlls/gdi/opengl.c +++ b/dlls/gdi/opengl.c @@ -136,6 +136,30 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLR } /*********************************************************************** + * wglShareLists (OPENGL32.@) + */ +BOOL WINAPI wglShareLists(HGLRC hglrc1, HGLRC hglrc2) +{ + DC *dc; + BOOL ret = FALSE; + OPENGL_Context ctx = (OPENGL_Context)hglrc1; + + TRACE("hglrc1: (%p); hglrc: (%p)\n", hglrc1, hglrc2); + if(ctx == NULL) + return FALSE; + + /* Retrieve the HDC associated with the context to access the display driver */ + dc = DC_GetDCPtr(ctx->hdc); + if (!dc) return FALSE; + + if (!dc->funcs->pwglShareLists) FIXME(" :stub\n"); + else ret = dc->funcs->pwglShareLists(hglrc1, hglrc2); + + GDI_ReleaseObj(ctx->hdc); + return ret; +} + +/*********************************************************************** * wglUseFontBitmapsA (OPENGL32.@) */ BOOL WINAPI wglUseFontBitmapsA(HDC hdc, DWORD first, DWORD count, DWORD listBase) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 611234c..a2cee0b 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -391,7 +391,7 @@ @ stdcall wglRealizeLayerPalette(long long long) @ stdcall wglSetLayerPaletteEntries(long long long long ptr) @ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat -@ stdcall wglShareLists(long long) +@ stdcall wglShareLists(long long) gdi32.wglShareLists @ stdcall wglSwapBuffers(long) gdi32.SwapBuffers @ stdcall wglSwapLayerBuffers(long long) @ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6d38721..b4cecd2 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -49,7 +49,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); typedef struct wine_wgl_s { BOOL WINAPI (*p_wglDeleteContext)(HGLRC hglrc); PROC WINAPI (*p_wglGetProcAddress)(LPCSTR lpszProc); - BOOL WINAPI (*p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); void WINAPI (*p_wglGetIntegerv)(GLenum pname, GLint* params); } wine_wgl_t; @@ -281,14 +280,6 @@ int WINAPI wglSetLayerPaletteEntries(HDC } /*********************************************************************** - * wglShareLists (OPENGL32.@) - */ -BOOL WINAPI wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { - TRACE("(%p, %p)\n", hglrc1, hglrc2); - return wine_wgl.p_wglShareLists(hglrc1, hglrc2); -} - -/*********************************************************************** * wglSwapLayerBuffers (OPENGL32.@) */ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, @@ -633,7 +624,6 @@ static BOOL process_attach(void) /* Load WGL function pointers from winex11.drv */ wine_wgl.p_wglDeleteContext = (void *)GetProcAddress(mod, "wglDeleteContext"); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod, "wglGetProcAddress"); - wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod, "wglShareLists"); /* Interal WGL function */ wine_wgl.p_wglGetIntegerv = (void *)GetProcAddress(mod, "wglGetIntegerv");

1 0

Roderick Colenbrander : wgl: Move wglGetCurrentDC to gdi32.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 8c32dd77a3c50b6030e85bb92b47312f0cabb1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c32dd77a3c50b6030e85bb92… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 14 22:11:33 2006 +0200 wgl: Move wglGetCurrentDC to gdi32. --- dlls/gdi/gdi32.spec | 1 + dlls/gdi/opengl.c | 21 +++++++++++++++++++++ dlls/opengl32/opengl32.spec | 2 +- dlls/opengl32/wgl.c | 10 ---------- dlls/winex11.drv/opengl.c | 29 +---------------------------- dlls/winex11.drv/winex11.drv.spec | 1 - 6 files changed, 24 insertions(+), 40 deletions(-) diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index 75b5496..e494c72 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -500,6 +500,7 @@ # Wine extensions: OpenGL support # @ stdcall wglCreateContext(long) @ stdcall wglGetCurrentContext() +@ stdcall wglGetCurrentDC() @ stdcall wglMakeCurrent(long long) @ stdcall wglUseFontBitmapsA(long long long long) @ stdcall wglUseFontBitmapsW(long long long long) diff --git a/dlls/gdi/opengl.c b/dlls/gdi/opengl.c index 5203e46..95e09c6 100644 --- a/dlls/gdi/opengl.c +++ b/dlls/gdi/opengl.c @@ -41,6 +41,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); static HDC default_hdc = 0; +typedef struct opengl_context +{ + HDC hdc; +} *OPENGL_Context; + /* We route all wgl functions from opengl32.dll through gdi32.dll to * the display driver. Various wgl calls have a hDC as one of their parameters. * Using DC_GetDCPtr we get access to the functions exported by the driver. @@ -85,6 +90,22 @@ HGLRC WINAPI wglGetCurrentContext(void) } /*********************************************************************** + * wglGetCurrentDC (OPENGL32.@) + */ +HDC WINAPI wglGetCurrentDC(void) +{ + OPENGL_Context ctx = (OPENGL_Context)wglGetCurrentContext(); + + TRACE(" found context: %p\n", ctx); + if(ctx == NULL) + return NULL; + + /* Retrieve the current DC from the active context */ + TRACE(" returning hdc: %p\n", ctx->hdc); + return ctx->hdc; +} + +/*********************************************************************** * wglMakeCurrent (OPENGL32.@) */ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 180beb1..611234c 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -382,7 +382,7 @@ @ stdcall wglDescribeLayerPlane(long long long long ptr) @ stdcall wglDescribePixelFormat(long long long ptr) gdi32.DescribePixelFormat @ stdcall wglGetCurrentContext() gdi32.wglGetCurrentContext -@ stdcall wglGetCurrentDC() +@ stdcall wglGetCurrentDC() gdi32.wglGetCurrentDC @ stub wglGetDefaultProcAddress @ stdcall wglGetLayerPaletteEntries(long long long long ptr) @ stdcall wglGetPixelFormat(long) gdi32.GetPixelFormat diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 52e5a55..6d38721 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -48,7 +48,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); typedef struct wine_wgl_s { BOOL WINAPI (*p_wglDeleteContext)(HGLRC hglrc); - HDC WINAPI (*p_wglGetCurrentDC)(void); PROC WINAPI (*p_wglGetProcAddress)(LPCSTR lpszProc); BOOL WINAPI (*p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); @@ -172,14 +171,6 @@ BOOL WINAPI wglDescribeLayerPlane(HDC hd } /*********************************************************************** - * wglGetCurrentDC (OPENGL32.@) - */ -HDC WINAPI wglGetCurrentDC(void) { - TRACE("\n"); - return wine_wgl.p_wglGetCurrentDC(); -} - -/*********************************************************************** * wglGetLayerPaletteEntries (OPENGL32.@) */ int WINAPI wglGetLayerPaletteEntries(HDC hdc, @@ -641,7 +632,6 @@ static BOOL process_attach(void) /* Load WGL function pointers from winex11.drv */ wine_wgl.p_wglDeleteContext = (void *)GetProcAddress(mod, "wglDeleteContext"); - wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod, "wglGetCurrentDC"); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod, "wglGetProcAddress"); wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod, "wglShareLists"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a81816f..bdd08c4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1272,27 +1272,6 @@ BOOL WINAPI X11DRV_wglDeleteContext(HGLR return ret; } -/* OpenGL32 wglGetCurrentDC */ -HDC WINAPI X11DRV_wglGetCurrentDC(void) { - GLXContext gl_ctx; - Wine_GLContext *ret; - - TRACE("()\n"); - - wine_tsx11_lock(); - gl_ctx = pglXGetCurrentContext(); - ret = get_context_from_GLXContext(gl_ctx); - wine_tsx11_unlock(); - - if (ret) { - TRACE(" returning %p (GL context %p - Wine context %p)\n", ret->hdc, gl_ctx, ret); - return ret->hdc; - } else { - TRACE(" no Wine context found for GLX context %p\n", gl_ctx); - return 0; - } -} - /* OpenGL32 wglGetCurrentReadDCARB */ static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) { @@ -2353,7 +2332,7 @@ static GLboolean WINAPI X11DRV_wglBindTe object->render_ctx = wglCreateContext(object->render_hdc); do_init = 1; } - object->prev_hdc = X11DRV_wglGetCurrentDC(); + object->prev_hdc = wglGetCurrentDC(); object->prev_ctx = wglGetCurrentContext(); /* FIXME: This is routed through gdi32.dll to winex11.drv, replace this with GLX calls */ wglMakeCurrent(object->render_hdc, object->render_ctx); @@ -2784,12 +2763,6 @@ BOOL WINAPI X11DRV_wglDeleteContext(HGLR return FALSE; } -/* OpenGL32 wglGetCurrentDC */ -HDC WINAPI X11DRV_wglGetCurrentDC(void) { - ERR_(opengl)("No OpenGL support compiled in.\n"); - return 0; -} - /* OpenGL32: wglGetProcAddress */ PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc) { ERR_(opengl)("No OpenGL support compiled in.\n"); diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 4cfc0f9..9b3b0a5 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -131,7 +131,6 @@ # XIM # OpenGL @ cdecl wglCreateContext(long) X11DRV_wglCreateContext @ cdecl wglDeleteContext(long) X11DRV_wglDeleteContext -@ cdecl wglGetCurrentDC() X11DRV_wglGetCurrentDC @ cdecl wglGetIntegerv(long ptr) X11DRV_wglGetIntegerv @ cdecl wglGetProcAddress(ptr) X11DRV_wglGetProcAddress @ cdecl wglMakeCurrent(long long) X11DRV_wglMakeCurrent

1 0

Roderick Colenbrander : wgl: Move wglGetCurrentContext to gdi32.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: ad7bc71c0c45f7f627c52695e3b0b8fba74a9020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7bc71c0c45f7f627c52695e… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 14 12:56:07 2006 +0200 wgl: Move wglGetCurrentContext to gdi32. --- dlls/gdi/gdi32.spec | 1 + dlls/gdi/opengl.c | 12 ++++++++++++ dlls/opengl32/opengl32.spec | 2 +- dlls/opengl32/wgl.c | 10 ---------- dlls/winex11.drv/opengl.c | 27 +++------------------------ dlls/winex11.drv/winex11.drv.spec | 1 - 6 files changed, 17 insertions(+), 36 deletions(-) diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index b1883a7..75b5496 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -499,6 +499,7 @@ ######################################## # Wine extensions: OpenGL support # @ stdcall wglCreateContext(long) +@ stdcall wglGetCurrentContext() @ stdcall wglMakeCurrent(long long) @ stdcall wglUseFontBitmapsA(long long long long) @ stdcall wglUseFontBitmapsW(long long long long) diff --git a/dlls/gdi/opengl.c b/dlls/gdi/opengl.c index 75a8e6d..5203e46 100644 --- a/dlls/gdi/opengl.c +++ b/dlls/gdi/opengl.c @@ -31,6 +31,8 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winerror.h" +#include "winternl.h" +#include "winnt.h" #include "gdi.h" #include "gdi_private.h" #include "wine/debug.h" @@ -73,6 +75,16 @@ HGLRC WINAPI wglCreateContext(HDC hdc) } /*********************************************************************** + * wglGetCurrentContext (OPENGL32.@) + */ +HGLRC WINAPI wglGetCurrentContext(void) +{ + HGLRC ret = NtCurrentTeb()->glContext; + TRACE(" returning %p\n", ret); + return ret; +} + +/*********************************************************************** * wglMakeCurrent (OPENGL32.@) */ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 7fb060c..180beb1 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -381,7 +381,7 @@ @ stdcall wglDeleteContext(long) @ stdcall wglDescribeLayerPlane(long long long long ptr) @ stdcall wglDescribePixelFormat(long long long ptr) gdi32.DescribePixelFormat -@ stdcall wglGetCurrentContext() +@ stdcall wglGetCurrentContext() gdi32.wglGetCurrentContext @ stdcall wglGetCurrentDC() @ stub wglGetDefaultProcAddress @ stdcall wglGetLayerPaletteEntries(long long long long ptr) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1c3973c..52e5a55 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -48,7 +48,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); typedef struct wine_wgl_s { BOOL WINAPI (*p_wglDeleteContext)(HGLRC hglrc); - HGLRC WINAPI (*p_wglGetCurrentContext)(void); HDC WINAPI (*p_wglGetCurrentDC)(void); PROC WINAPI (*p_wglGetProcAddress)(LPCSTR lpszProc); BOOL WINAPI (*p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); @@ -173,14 +172,6 @@ BOOL WINAPI wglDescribeLayerPlane(HDC hd } /*********************************************************************** - * wglGetCurrentContext (OPENGL32.@) - */ -HGLRC WINAPI wglGetCurrentContext(void) { - TRACE("\n"); - return wine_wgl.p_wglGetCurrentContext(); -} - -/*********************************************************************** * wglGetCurrentDC (OPENGL32.@) */ HDC WINAPI wglGetCurrentDC(void) { @@ -650,7 +641,6 @@ static BOOL process_attach(void) /* Load WGL function pointers from winex11.drv */ wine_wgl.p_wglDeleteContext = (void *)GetProcAddress(mod, "wglDeleteContext"); - wine_wgl.p_wglGetCurrentContext = (void *)GetProcAddress(mod, "wglGetCurrentContext"); wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod, "wglGetCurrentDC"); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod, "wglGetProcAddress"); wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod, "wglShareLists"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 490a08e..a81816f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1272,23 +1272,6 @@ BOOL WINAPI X11DRV_wglDeleteContext(HGLR return ret; } -/* OpenGL32 wglGetCurrentContext() */ -HGLRC WINAPI X11DRV_wglGetCurrentContext(void) { - GLXContext gl_ctx; - Wine_GLContext *ret; - - TRACE("()\n"); - - wine_tsx11_lock(); - gl_ctx = pglXGetCurrentContext(); - ret = get_context_from_GLXContext(gl_ctx); - wine_tsx11_unlock(); - - TRACE(" returning %p (GL context %p)\n", ret, gl_ctx); - - return (HGLRC)ret; -} - /* OpenGL32 wglGetCurrentDC */ HDC WINAPI X11DRV_wglGetCurrentDC(void) { GLXContext gl_ctx; @@ -1417,6 +1400,7 @@ static BOOL WINAPI X11DRV_wglMakeContext wine_tsx11_lock(); if (hglrc == NULL) { ret = pglXMakeCurrent(gdi_display, None, NULL); + NtCurrentTeb()->glContext = NULL; } else { if (NULL == pglXMakeContextCurrent) { ret = FALSE; @@ -1430,6 +1414,7 @@ static BOOL WINAPI X11DRV_wglMakeContext TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } ret = pglXMakeContextCurrent(ctx->display, d_draw, d_read, ctx->ctx); + NtCurrentTeb()->glContext = ctx; } } wine_tsx11_unlock(); @@ -2369,7 +2354,7 @@ static GLboolean WINAPI X11DRV_wglBindTe do_init = 1; } object->prev_hdc = X11DRV_wglGetCurrentDC(); - object->prev_ctx = X11DRV_wglGetCurrentContext(); + object->prev_ctx = wglGetCurrentContext(); /* FIXME: This is routed through gdi32.dll to winex11.drv, replace this with GLX calls */ wglMakeCurrent(object->render_hdc, object->render_ctx); /* @@ -2799,12 +2784,6 @@ BOOL WINAPI X11DRV_wglDeleteContext(HGLR return FALSE; } -/* OpenGL32 wglGetCurrentContext() */ -HGLRC WINAPI X11DRV_wglGetCurrentContext(void) { - ERR_(opengl)("No OpenGL support compiled in.\n"); - return NULL; -} - /* OpenGL32 wglGetCurrentDC */ HDC WINAPI X11DRV_wglGetCurrentDC(void) { ERR_(opengl)("No OpenGL support compiled in.\n"); diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 4e4dcbf..4cfc0f9 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -131,7 +131,6 @@ # XIM # OpenGL @ cdecl wglCreateContext(long) X11DRV_wglCreateContext @ cdecl wglDeleteContext(long) X11DRV_wglDeleteContext -@ cdecl wglGetCurrentContext() X11DRV_wglGetCurrentContext @ cdecl wglGetCurrentDC() X11DRV_wglGetCurrentDC @ cdecl wglGetIntegerv(long ptr) X11DRV_wglGetIntegerv @ cdecl wglGetProcAddress(ptr) X11DRV_wglGetProcAddress

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: ef998ea6cbf5d846ed7502f65a3a8a0cd61b9223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef998ea6cbf5d846ed7502f65… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 15 17:05:01 2006 +0200 Assorted spelling fixes. --- dlls/advapi32/tests/registry.c | 4 ++-- dlls/cabinet/cabinet_main.c | 2 +- dlls/kernel32/heap.c | 2 +- dlls/mscms/mscms_priv.h | 2 +- dlls/msg711.acm/msg711.c | 2 +- dlls/ole32/compobj.c | 2 +- dlls/ole32/errorinfo.c | 2 +- dlls/ole32/marshal.c | 2 +- dlls/ole32/ole2.c | 4 ++-- dlls/ole32/tests/storage32.c | 2 +- dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/ungif.c | 6 +++--- dlls/oleaut32/variant.c | 2 +- dlls/shell32/shlview.c | 2 +- dlls/wined3d/basetexture.c | 6 +++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- dlls/winmm/message16.c | 2 +- tools/wmc/mcy.y | 2 +- tools/wrc/genres.c | 2 +- 22 files changed, 29 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef998ea6cbf5d846ed750…

1 0

Alexandre Julliard : urlmon: Create a message window for each binding to make sure they are cleaned up properly .
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: d3d3aba3a3cebd6bae24e73c3377181be4393c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d3aba3a3cebd6bae24e73c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 11:32:17 2006 +0200 urlmon: Create a message window for each binding to make sure they are cleaned up properly. --- dlls/urlmon/binding.c | 14 +++++--------- dlls/urlmon/urlmon_main.c | 4 ---- dlls/urlmon/urlmon_main.h | 2 -- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 84e4186..d2b3ca9 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -250,19 +250,13 @@ static HWND get_notif_hwnd(void) wndclass.hInstance = URLMON_hInstance; wnd_class = RegisterClassExW(&wndclass); + if (!wnd_class && GetLastError() == ERROR_CLASS_ALREADY_EXISTS) + wnd_class = 1; } - if(!urlmon_tls) - urlmon_tls = TlsAlloc(); - - hwnd = TlsGetValue(urlmon_tls); - if(hwnd) - return hwnd; - - hwnd = CreateWindowExW(0, MAKEINTATOMW(wnd_class), + hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, URLMON_hInstance, NULL); - TlsSetValue(urlmon_tls, hwnd); TRACE("hwnd = %p\n", hwnd); @@ -691,6 +685,8 @@ static ULONG WINAPI Binding_Release(IBin TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if (This->notif_hwnd) + DestroyWindow( This->notif_hwnd ); if(This->callback) IBindStatusCallback_Release(This->callback); if(This->protocol) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index f7e281e..b083871 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -43,8 +43,6 @@ LONG URLMON_refCount = 0; HINSTANCE URLMON_hInstance = 0; static HMODULE hCabinet = NULL; -DWORD urlmon_tls = 0; - static void init_session(BOOL); /*********************************************************************** @@ -62,8 +60,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, break; case DLL_PROCESS_DETACH: - if(urlmon_tls) - TlsFree(urlmon_tls); if (hCabinet) FreeLibrary(hCabinet); hCabinet = NULL; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 240fdfe..4e6e214 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -59,6 +59,4 @@ HRESULT get_protocol_handler(LPCWSTR url HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); -extern DWORD urlmon_tls; - #endif /* __WINE_URLMON_MAIN_H */

1 0

Francois Gouget : msi: Remove spaces before '\n's.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 0b2015053112fb57ef918002440ed055bc0c2138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b2015053112fb57ef9180024… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 15 17:19:54 2006 +0200 msi: Remove spaces before '\n's. --- dlls/msi/table.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 61ff217..22b5a71 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1659,7 +1659,7 @@ static MSIRECORD *msi_get_transform_reco if( !rec ) return rec; - TRACE("row -> \n"); + TRACE("row ->\n"); for( i=0; i<tv->num_cols; i++ ) { UINT n = bytes_per_column( &columns[i] ); @@ -1936,12 +1936,12 @@ static UINT msi_table_load_transform( MS ERR("no matching row to transform\n"); else if ( mask ) { - TRACE("modifying row [%d]: \n", row); + TRACE("modifying row [%d]:\n", row); msi_table_modify_row( tv, rec, row, mask ); } else { - TRACE("deleting row [%d]: \n", row); + TRACE("deleting row [%d]:\n", row); msi_delete_row( tv, row ); } }

1 0

Francois Gouget : oleview: U(x) must be defined after winnt. h has had a chance to define NONAMELESSUNION. Fixes the compilation with gcc 2.95.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 70066c1640dabf2651ed48dc608e85f0a5c07fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70066c1640dabf2651ed48dc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 15 17:07:00 2006 +0200 oleview: U(x) must be defined after winnt.h has had a chance to define NONAMELESSUNION. Fixes the compilation with gcc 2.95. --- programs/oleview/main.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index 3bac011..90f184d 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -20,17 +20,17 @@ #define COBJMACROS +#include <windows.h> +#include <winreg.h> +#include <commctrl.h> +#include <unknwn.h> + #ifdef NONAMELESSUNION # define U(x) (x).u #else # define U(x) (x) #endif -#include <windows.h> -#include <winreg.h> -#include <commctrl.h> -#include <unknwn.h> - #include "resource.h" #define MAX_LOAD_STRING 256

1 0