November 2006 - Wine-commits

Markus Amsler : Revert "d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.".
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: f5204b8afe4b42c09dd369239f0ca9b14c6fcff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5204b8afe4b42c09dd369239… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:33:40 2006 +0100 Revert "d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.". This reverts commit 18546a65e6e68427ed49c4ea5a601972fb8a4de0. --- dlls/d3d8/device.c | 1 + dlls/d3d9/device.c | 1 + dlls/wined3d/device.c | 4 ++++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2c9329f..0baa5ac 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -698,6 +698,7 @@ static HRESULT WINAPI IDirect3DDevice8 hr=IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface); if(hr == D3D_OK && pZStencilSurface != NULL){ IWineD3DResource_GetParent((IWineD3DResource *)pZStencilSurface,(IUnknown**)ppZStencilSurface); + IWineD3DResource_Release((IWineD3DResource *)pZStencilSurface); }else{ FIXME("Call to IWineD3DDevice_GetDepthStencilSurface failed\n"); *ppZStencilSurface = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 34a2e1c..9b31289 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -433,6 +433,7 @@ static HRESULT WINAPI IDirect3DDevice9 hr=IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface); if(hr == D3D_OK && pZStencilSurface != NULL){ IWineD3DResource_GetParent((IWineD3DResource *)pZStencilSurface,(IUnknown**)ppZStencilSurface); + IWineD3DResource_Release((IWineD3DResource *)pZStencilSurface); }else{ FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); *ppZStencilSurface = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 26e24c6..4ae70a5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6990,6 +6990,10 @@ static HRESULT WINAPI IWineD3DDeviceIm *ppZStencilSurface = This->depthStencilBuffer; TRACE("(%p) : zStencilSurface returning %p\n", This, *ppZStencilSurface); + if(*ppZStencilSurface != NULL) { + /* Note inc ref on returned surface */ + IWineD3DSurface_AddRef(*ppZStencilSurface); + } return WINED3D_OK; }

1 0

Markus Amsler : Revert "d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.".
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 3a270375d7125fbb22cb0f9f79deec1043a80594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a270375d7125fbb22cb0f9f7… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:33:23 2006 +0100 Revert "d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.". This reverts commit 16b1e046d8da9b716975c1c483c149ea3826b690. --- dlls/d3d8/device.c | 1 + dlls/d3d9/device.c | 1 + dlls/wined3d/device.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2b4b6dd..2da8063 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1487,6 +1487,7 @@ static HRESULT WINAPI IDirect3DDevice8Im rc = IWineD3DDevice_GetStreamSource(This->WineD3DDevice, StreamNumber, (IWineD3DVertexBuffer **)&retStream, 0 /* Offset in bytes */, pStride); if (rc == D3D_OK && NULL != retStream) { IWineD3DVertexBuffer_GetParent(retStream, (IUnknown **)pStream); + IWineD3DVertexBuffer_Release(retStream); }else{ FIXME("Call to GetStreamSource failed %p\n", pStride); *pStream = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d0a456a..62c79c1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -789,6 +789,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge rc = IWineD3DDevice_GetStreamSource(This->WineD3DDevice, StreamNumber, (IWineD3DVertexBuffer **)&retStream, OffsetInBytes, pStride); if (rc == D3D_OK && NULL != retStream) { IWineD3DVertexBuffer_GetParent(retStream, (IUnknown **)pStream); + IWineD3DVertexBuffer_Release(retStream); }else{ FIXME("Call to GetStreamSource failed %p %p\n", OffsetInBytes, pStride); *pStream = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 375d57e..616cf4c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2467,6 +2467,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } + IWineD3DVertexBuffer_AddRef(*pStream); /* We have created a new reference to the VB */ return WINED3D_OK; }

1 0

Markus Amsler : Revert "d3d: Remove AddRef from IWineD3DDevice_GetIndices." .
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 9dd81f64cba4be3349934e66cf12e04621527d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd81f64cba4be3349934e66c… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:33:18 2006 +0100 Revert "d3d: Remove AddRef from IWineD3DDevice_GetIndices.". This reverts commit 5c4008719c60af52e9370023f09c7b86b7768e85. --- dlls/d3d8/device.c | 1 + dlls/d3d9/device.c | 1 + dlls/wined3d/device.c | 2 ++ 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 99164e0..2b4b6dd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1311,6 +1311,7 @@ static HRESULT WINAPI IDirect3DDevice8Im rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp); if (D3D_OK == rc && NULL != retIndexData) { IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); + IWineD3DVertexBuffer_Release(retIndexData); } else { if(rc != D3D_OK) FIXME("Call to GetIndices failed\n"); *ppIndexData = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8143981..d0a456a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -833,6 +833,7 @@ static HRESULT WINAPI IDirect3DDevice9 rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp); if (rc == D3D_OK && NULL != retIndexData) { IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); + IWineD3DVertexBuffer_Release(retIndexData); }else{ if(rc != D3D_OK) FIXME("Call to GetIndices failed\n"); *ppIndexData = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 597fcac..375d57e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3244,7 +3244,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl *ppIndexData = This->stateBlock->pIndexData; + /* up ref count on ppindexdata */ if (*ppIndexData) { + IWineD3DIndexBuffer_AddRef(*ppIndexData); *pBaseVertexIndex = This->stateBlock->baseVertexIndex; TRACE("(%p) index data set to %p + %u\n", This, ppIndexData, This->stateBlock->baseVertexIndex); }else{

1 0

Markus Amsler : Revert "d3d: Remove AddRef from IWineD3DDevice_GetSwapChain .".
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: c40501db50ebb9a7a6dcd3014b3dad138c0fd3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40501db50ebb9a7a6dcd3014… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:33:11 2006 +0100 Revert "d3d: Remove AddRef from IWineD3DDevice_GetSwapChain.". This reverts commit f84f687e6d3d8f432de2c5d9b2af13d2c5cedfb2. --- dlls/d3d9/swapchain.c | 1 + dlls/wined3d/device.c | 19 ++++++++++++++----- dlls/wined3d/drawprim.c | 1 + dlls/wined3d/surface.c | 3 +++ dlls/wined3d/swapchain.c | 1 + 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 2ead3ed..a4007ad 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -219,6 +219,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge hrc = IWineD3DDevice_GetSwapChain(This->WineD3DDevice, iSwapChain, &swapchain); if (hrc == D3D_OK && NULL != swapchain) { IWineD3DSwapChain_GetParent(swapchain, (IUnknown **)pSwapChain); + IWineD3DSwapChain_Release(swapchain); } else { *pSwapChain = NULL; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57318d4..597fcac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1614,6 +1614,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* TODO: don't use Impl structures outside of create functions! (a context manager will replace the ->glCtx) */ /* and create a new context with the implicit swapchains context as the shared context */ object->glCtx = glXCreateContext(object->display, object->visInfo, ((IWineD3DSwapChainImpl *)implSwapChain)->glCtx, GL_TRUE); + IWineD3DSwapChain_Release(implSwapChain); } } @@ -1931,6 +1932,7 @@ static HRESULT WINAPI IWineD3DDeviceIm if(iSwapChain < This->NumberOfSwapChains) { *pSwapChain = This->swapchains[iSwapChain]; + IWineD3DSwapChain_AddRef(*pSwapChain); TRACE("(%p) returning %p\n", This, *pSwapChain); return WINED3D_OK; } else { @@ -5849,6 +5851,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapChain); if (hr == WINED3D_OK) { hr = IWineD3DSwapChain_GetBackBuffer(swapChain, BackBuffer, Type, ppBackBuffer); + IWineD3DSwapChain_Release(swapChain); } else { *ppBackBuffer = NULL; } @@ -5870,6 +5873,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, (IWineD3DSwapChain **)&swapChain); if (hr == WINED3D_OK) { hr = IWineD3DSwapChain_GetDisplayMode(swapChain, pMode); + IWineD3DSwapChain_Release(swapChain); } else { FIXME("(%p) Error getting display mode\n", This); } @@ -6024,6 +6028,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl_GetSwapChain(iface, i , (IWineD3DSwapChain **)&swapChain); TRACE("presentinng chain %d, %p\n", i, swapChain); IWineD3DSwapChain_Present(swapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); + IWineD3DSwapChain_Release(swapChain); } return WINED3D_OK; @@ -6492,6 +6497,7 @@ static HRESULT WINAPI IWineD3DDeviceIm hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, (IWineD3DSwapChain **)&swapChain); if(hr == WINED3D_OK) { hr = IWineD3DSwapChain_GetFrontBufferData(swapChain, pDestSurface); + IWineD3DSwapChain_Release(swapChain); } return hr; } @@ -6600,6 +6606,7 @@ static HRESULT WINAPI IWineD3DDeviceIm hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, (IWineD3DSwapChain **)&swapChain); if(hr == WINED3D_OK){ hr = IWineD3DSwapChain_GetRasterStatus(swapChain, pRasterStatus); + IWineD3DSwapChain_Release(swapChain); }else{ FIXME("(%p) IWineD3DSwapChain_GetRasterStatus returned in error\n", This); } @@ -6905,6 +6912,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl return hr; } + /* Make sure to release the swapchain */ + IWineD3DSwapChain_Release((IWineD3DSwapChain *) Swapchain); + if(FrontImpl && !(FrontImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) ) { ERR("Trying to set a front buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage\n"); return WINED3DERR_INVALIDCALL; @@ -7431,12 +7441,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDevice_GetSwapChain(iface, 0, &implicitSwapchain); IWineD3DSurface_GetContainer(RenderSurface, &IID_IWineD3DSwapChain, (void**) &renderSurfaceSwapchain); IWineD3DSurface_GetContainer(This->renderTarget, &IID_IWineD3DSwapChain, (void **)&currentSwapchain); - if (currentSwapchain == NULL) { + if (currentSwapchain == NULL) IWineD3DDevice_GetSwapChain(iface, 0, &currentSwapchain); - /* GetContainer currently AddRefs, but GetSwapChain doesn't. - * Like this the release code for both is the same. */ - IWineD3DDevice_AddRef(currentSwapchain); - } currentSwapchainImpl = (IWineD3DSwapChainImpl*) currentSwapchain; implicitSwapchainImpl = (IWineD3DSwapChainImpl*) implicitSwapchain; @@ -7588,6 +7594,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } if (cfgs != NULL) XFree(cfgs); + if (implicitSwapchain != NULL) IWineD3DSwapChain_Release(implicitSwapchain); if (currentSwapchain != NULL) IWineD3DSwapChain_Release(currentSwapchain); if (renderSurfaceSwapchain != NULL) IWineD3DSwapChain_Release(renderSurfaceSwapchain); LEAVE_GL(); @@ -7742,6 +7749,7 @@ static void WINAPI IWineD3DDeviceImpl_Se if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == WINED3D_OK) { IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (WINED3DGAMMARAMP *)pRamp); + IWineD3DSwapChain_Release(swapchain); } return; } @@ -7754,6 +7762,7 @@ static void WINAPI IWineD3DDeviceImpl_Ge if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == WINED3D_OK) { hrc =IWineD3DSwapChain_GetGammaRamp(swapchain, pRamp); + IWineD3DSwapChain_Release(swapchain); } return; } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 05e8f78..7dc33e0 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2156,6 +2156,7 @@ void drawPrimitive(IWineD3DDevice *iface IWineD3DDevice_GetSwapChain(iface, i, (IWineD3DSwapChain **) &swapchain); if(swapchain) { if(swapchain->backBuffer) ((IWineD3DSurfaceImpl *) swapchain->backBuffer[0])->Flags |= SFLAG_GLDIRTY; + IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 42e5d04..84a838f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -750,6 +750,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp notInContext = TRUE; /* TODO: check the contexts, to see if were shared with the current context */ } + IWineD3DSwapChain_Release((IWineD3DSwapChain *)implSwapChain); } if (swapchain != NULL) IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); if (targetSwapChain != NULL) IWineD3DSwapChain_Release((IWineD3DSwapChain *)targetSwapChain); @@ -1237,6 +1238,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp } else { FIXME("unsupported unlocking to Rendering surface surf@%p usage(%s)\n", This, debug_d3dusage(This->resource.usage)); } + IWineD3DSwapChain_Release((IWineD3DSwapChain *)implSwapChain); } else if (WINED3DUSAGE_DEPTHSTENCIL & This->resource.usage) { /* stencil surfaces */ @@ -2702,6 +2704,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOv TRACE("Calling GetSwapChain with mydevice = %p\n", myDevice); IWineD3DDevice_GetSwapChain((IWineD3DDevice *)myDevice, 0, (IWineD3DSwapChain **)&implSwapChain); + IWineD3DSwapChain_Release( (IWineD3DSwapChain *) implSwapChain ); if(implSwapChain->backBuffer && This == (IWineD3DSurfaceImpl*) implSwapChain->backBuffer[0]) { glDrawBuffer(GL_BACK); checkGLcall("glDrawBuffer(GL_BACK)"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 93cdbb4..4e8f97f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -294,6 +294,7 @@ static HRESULT WINAPI IWineD3DSwapChainI glXDestroyContext(oldDisplay, oldContext); /* Should this happen on an active context? seems a bad idea */ LEAVE_GL(); } + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapChainImpl); }

1 0

Alexandre Julliard : comdlg32: Moved prototypes to the header file and fixed declaration of FileOpenDlgInfosStr .
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 6367330fe819e513a9c958fd2224c448eca73aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6367330fe819e513a9c958fd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 15:15:46 2006 +0100 comdlg32: Moved prototypes to the header file and fixed declaration of FileOpenDlgInfosStr. --- dlls/comdlg32/filedlg.c | 4 ++-- dlls/comdlg32/filedlgbrowser.c | 13 ------------- dlls/comdlg32/filedlgbrowser.h | 11 +++++++++++ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 68887d2..4d1eb84 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -221,7 +221,7 @@ static void FILEDLG95_LOOKIN_Clean(HW static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName); IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); -LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName); +static LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName); /* Shell memory allocation */ static void *MemAlloc(UINT size); @@ -3391,7 +3391,7 @@ LPITEMIDLIST GetParentPidl(LPITEMIDLIST * returns the pidl of the file name relative to folder * NULL if an error occurred */ -LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName) +static LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName) { LPITEMIDLIST pidl = NULL; ULONG ulEaten; diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 8f33418..2ff2c81 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -78,19 +78,6 @@ static const IServiceProviderVtbl IShell static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv); -/************************************************************************** -* External Prototypes -*/ -extern const char *FileOpenDlgInfosStr; - -extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); -extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); -extern LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPCSTR lpcstrFileName); - -extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl); -extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); - - /* * Helper functions */ diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index 1725c45..2342d3d 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -156,4 +156,15 @@ BOOL IsPidlFolder (LPSHELLFOLDER psf, LP /* Functions used by the EDIT box */ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd); +/************************************************************************** +* External Prototypes +*/ +extern const char FileOpenDlgInfosStr[]; + +extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); +extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); + +extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl); +extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); + #endif /*SHBROWSER_H*/

1 0

Alexandre Julliard : winecfg: Determine the current Windows version from the standard registry keys.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 8de125803422bc4d68de1eaef2114631b7799b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de125803422bc4d68de1eaef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 15:16:41 2006 +0100 winecfg: Determine the current Windows version from the standard registry keys. Also avoid setting the HKCU\Software\Wine version value when not needed. --- programs/winecfg/appdefaults.c | 72 ++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 17 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d3fb6e3..2330aee 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -27,6 +27,7 @@ #include <commdlg.h> #include <wine/debug.h> #include <stdio.h> +#include <stdlib.h> #include <assert.h> #include "winecfg.h" #include "resource.h" @@ -62,14 +63,48 @@ static const struct #define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0])) -static void update_comboboxes(HWND dialog) +static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; +static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; + +static int get_registry_version(void) { - int i; + int i, best = -1, platform, major, minor = 0; + char *p, *ver; + + if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL ))) + platform = VER_PLATFORM_WIN32_NT; + else if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL ))) + platform = VER_PLATFORM_WIN32_WINDOWS; + else + return -1; + + if ((p = strchr( ver, '.' ))) + { + char *str = p; + *str++ = 0; + if ((p = strchr( str, '.' ))) *p = 0; + minor = atoi(str); + } + major = atoi(ver); + + for (i = 0; i < NB_VERSIONS; i++) + { + if (win_versions[i].dwPlatformId != platform) continue; + if (win_versions[i].dwMajorVersion != major) continue; + best = i; + if (win_versions[i].dwMinorVersion == minor) return i; + } + return best; +} +static void update_comboboxes(HWND dialog) +{ + int i, ver; char *winver; - + /* retrieve the registry values */ winver = get_reg_key(config_key, keypath(""), "Version", ""); + ver = get_registry_version(); if (*winver == '\0') { @@ -81,7 +116,8 @@ static void update_comboboxes(HWND dialo SendDlgItemMessage (dialog, IDC_WINVER, CB_SETCURSEL, 0, 0); return; } - winver = strdupA("win2k"); + if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); + else winver = strdupA("win2k"); } WINE_TRACE("winver is %s\n", winver); @@ -336,22 +372,21 @@ static void on_winver_change(HWND dialog { int selection = SendDlgItemMessage(dialog, IDC_WINVER, CB_GETCURSEL, 0, 0); - if (!selection && current_app) - { - WINE_TRACE("default selected so removing current setting\n"); - set_reg_key(config_key, keypath(""), "Version", NULL); - } - else + if (current_app) { - if (current_app) selection--; - WINE_TRACE("setting Version key to value '%s'\n", win_versions[selection].szVersion); - set_reg_key(config_key, keypath(""), "Version", win_versions[selection].szVersion); + if (!selection) + { + WINE_TRACE("default selected so removing current setting\n"); + set_reg_key(config_key, keypath(""), "Version", NULL); + } + else + { + WINE_TRACE("setting Version key to value '%s'\n", win_versions[selection-1].szVersion); + set_reg_key(config_key, keypath(""), "Version", win_versions[selection-1].szVersion); + } } - /* global version only */ - if (!current_app) + else /* global version only */ { - static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; - static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; static const char szKeyWindNT[] = "System\\CurrentControlSet\\Control\\Windows"; static const char szKeyEnvNT[] = "System\\CurrentControlSet\\Control\\Session Manager\\Environment"; @@ -371,6 +406,7 @@ static void on_winver_change(HWND dialog set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyWindNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyEnvNT, "OS", NULL); + set_reg_key(config_key, keypath(""), "Version", NULL); break; case VER_PLATFORM_WIN32_NT: @@ -388,6 +424,7 @@ static void on_winver_change(HWND dialog set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", NULL); + set_reg_key(config_key, keypath(""), "Version", NULL); break; case VER_PLATFORM_WIN32s: @@ -399,6 +436,7 @@ static void on_winver_change(HWND dialog set_reg_key(HKEY_LOCAL_MACHINE, szKeyEnvNT, "OS", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", NULL); + set_reg_key(config_key, keypath(""), "Version", win_versions[selection].szVersion); break; } }

1 0

Kai Blin : ws2_32: Implement SO_EXCLUSIVEADDRUSE for setsockopt.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: e521ee2cee4b78df85a25eb6e56dffbf94a93eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e521ee2cee4b78df85a25eb6e… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Nov 30 13:27:02 2006 +0100 ws2_32: Implement SO_EXCLUSIVEADDRUSE for setsockopt. --- dlls/ws2_32/socket.c | 9 +++++++++ include/winsock.h | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5b940c3..eed2c67 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2729,6 +2729,15 @@ int WINAPI WS_setsockopt(SOCKET s, int l return 0; } + /* SO_EXCLUSIVEADDRUSE stops applications from binding to a port that is + * already used. This never works on Unix systems, so just ignore this + * setting*/ + if ( level == WS_SOL_SOCKET && optname == WS_SO_EXCLUSIVEADDRUSE ) + { + TRACE("Ignoring SO_EXCLUSIVEADDRUSE\n"); + return 0; + } + #ifdef HAVE_IPX if(level == NSPROTO_IPX) { diff --git a/include/winsock.h b/include/winsock.h index 9d5165b..d31c84d 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -663,6 +663,7 @@ typedef struct WS(WSAData) #define SO_DEBUG 0x0001 #define SO_ACCEPTCONN 0x0002 #define SO_REUSEADDR 0x0004 +#define SO_EXCLUSIVEADDRUSE ((u_int)(~SO_REUSEADDR)) #define SO_KEEPALIVE 0x0008 #define SO_DONTROUTE 0x0010 #define SO_BROADCAST 0x0020 @@ -696,6 +697,7 @@ typedef struct WS(WSAData) #define WS_SO_DEBUG 0x0001 #define WS_SO_ACCEPTCONN 0x0002 #define WS_SO_REUSEADDR 0x0004 +#define WS_SO_EXCLUSIVEADDRUSE ((WS_u_int)(~WS_SO_REUSEADDR)) #define WS_SO_KEEPALIVE 0x0008 #define WS_SO_DONTROUTE 0x0010 #define WS_SO_BROADCAST 0x0020

1 0

Markus Amsler : Revert "d3d: Fix partially applied patch: Remove AddRef from GetDirect3D.".
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 0bff261cfaf283ef52295913a9ac75e1b71b2c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bff261cfaf283ef52295913a… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Thu Nov 30 13:32:58 2006 +0100 Revert "d3d: Fix partially applied patch: Remove AddRef from GetDirect3D.". Removing COM in d3d is not feasible as long as we use inheritance. So stick to the COM refcount rules. This reverts commit 3fd8fe089c5337c76c55c4beb74c53576f51776e. --- 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 caac5a1..57318d4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2305,6 +2305,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; *ppD3D= This->wineD3D; TRACE("(%p) : wineD3D returning %p\n", This, *ppD3D); + IWineD3D_AddRef(*ppD3D); return WINED3D_OK; }

1 0

Kai Blin : ws2_32: SO_DONTROUTE is ignored on windows, fix comment and downgrade FIXME to TRACE.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 516a575a869b512e19d92490471769ef4565fa6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=516a575a869b512e19d924904… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Nov 30 12:31:40 2006 +0100 ws2_32: SO_DONTROUTE is ignored on windows, fix comment and downgrade FIXME to TRACE. --- dlls/ws2_32/socket.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 50443de..5b940c3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2722,12 +2722,10 @@ int WINAPI WS_setsockopt(SOCKET s, int l } /* For some reason the game GrandPrixLegends does set SO_DONTROUTE on its - * socket. This will either not happen under windows or it is ignored in - * windows (but it works in linux and therefore prevents the game from - * finding games outside the current network) */ + * socket. According to MSDN, this option is silently ignored.*/ if ( level==WS_SOL_SOCKET && optname==WS_SO_DONTROUTE ) { - FIXME("Does windows ignore SO_DONTROUTE?\n"); + TRACE("Ignoring SO_DONTROUTE.\n"); return 0; }

1 0

Eric Pouech : dbghelp: Get rid of long int issues on 64bit platforms.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 8e7b2e0fd71b571b17f7dec07a06748f533a3628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7b2e0fd71b571b17f7dec07… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 22:04:27 2006 +0100 dbghelp: Get rid of long int issues on 64bit platforms. --- dlls/dbghelp/Makefile.in | 1 - dlls/dbghelp/coff.c | 8 +++--- dlls/dbghelp/dbghelp.c | 6 ++-- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/elf_module.c | 6 ++-- dlls/dbghelp/image.c | 2 +- dlls/dbghelp/memory.c | 2 +- dlls/dbghelp/minidump.c | 8 +++--- dlls/dbghelp/module.c | 10 ++++---- dlls/dbghelp/msc.c | 20 ++++++++-------- dlls/dbghelp/path.c | 10 ++++---- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/stack.c | 52 +++++++++++++++++++++++++------------------- dlls/dbghelp/symbol.c | 22 +++++++++--------- 14 files changed, 78 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e7b2e0fd71b571b17f7d…

1 0