November 2006 - Wine-Commits

Mike McCormack : msi: Treat the SourceDir folder the same as TargetDir.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: 4e25188a2a1fde07f252e1cf3965390d00e45d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e25188a2a1fde07f252e1cf3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 22 15:13:32 2006 +0900 msi: Treat the SourceDir folder the same as TargetDir. --- dlls/msi/helpers.c | 5 ++++- dlls/msi/tests/package.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index e0ec6e6..b2968f1 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -231,12 +231,15 @@ LPWSTR resolve_folder(MSIPACKAGE *packag if (!name) return NULL; + if (!lstrcmpW(name,cszSourceDir)) + name = cszTargetDir; + f = get_loaded_folder( package, name ); if (!f) return NULL; /* special resolving for Target and Source root dir */ - if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) + if (!strcmpW(name,cszTargetDir)) { if (!f->ResolvedTarget && !f->Property) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d731ad2..68ef172 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2939,10 +2939,8 @@ static void test_prop_path(void) sz = sizeof buffer; buffer[0] = 0; r = MsiGetSourcePath(hpkg, "SourceDir", buffer, &sz ); - todo_wine { ok( r == ERROR_SUCCESS, "failed to get source path\n"); ok( !lstrcmpi(cwd, buffer), "SourceDir (%s) should be current dir (%s)\n", buffer, cwd); - } sz = sizeof buffer; buffer[0] = 0;

1 0

Mike McCormack : msi: Load all folders in one query, rather one per query.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: 7eb270265f143861553cbf64f23024f7b2b2221e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb270265f143861553cbf64f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 22 15:13:12 2006 +0900 msi: Load all folders in one query, rather one per query. --- dlls/msi/action.c | 177 +++++++++++++++++++++++++--------------------------- dlls/msi/helpers.c | 5 +- dlls/msi/msipriv.h | 2 +- 3 files changed, 88 insertions(+), 96 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c49d26d..668b49e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1439,6 +1439,89 @@ static UINT load_all_files(MSIPACKAGE *p return ERROR_SUCCESS; } +static UINT load_folder( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + static const WCHAR szDot[] = { '.',0 }; + static WCHAR szEmpty[] = { 0 }; + LPWSTR p, tgt_short, tgt_long, src_short, src_long; + MSIFOLDER *folder; + + folder = msi_alloc_zero( sizeof (MSIFOLDER) ); + if (!folder) + return ERROR_NOT_ENOUGH_MEMORY; + + folder->Directory = msi_dup_record_field( row, 1 ); + + TRACE("%s\n", debugstr_w(folder->Directory)); + + p = msi_dup_record_field(row, 3); + + /* split src and target dir */ + tgt_short = p; + src_short = folder_split_path( p, ':' ); + + /* split the long and short paths */ + tgt_long = folder_split_path( tgt_short, '|' ); + src_long = folder_split_path( src_short, '|' ); + + /* check for no-op dirs */ + if (!lstrcmpW(szDot, tgt_short)) + tgt_short = szEmpty; + if (!lstrcmpW(szDot, src_short)) + src_short = szEmpty; + + if (!tgt_long) + tgt_long = tgt_short; + + if (!src_short) { + src_short = tgt_short; + src_long = tgt_long; + } + + if (!src_long) + src_long = src_short; + + /* FIXME: use the target short path too */ + folder->TargetDefault = strdupW(tgt_long); + folder->SourceShortPath = strdupW(src_short); + folder->SourceLongPath = strdupW(src_long); + msi_free(p); + + TRACE("TargetDefault = %s\n",debugstr_w( folder->TargetDefault )); + TRACE("SourceLong = %s\n", debugstr_w( folder->SourceLongPath )); + TRACE("SourceShort = %s\n", debugstr_w( folder->SourceShortPath )); + + folder->Parent = msi_dup_record_field( row, 2 ); + + folder->Property = msi_dup_property( package, folder->Directory ); + + list_add_tail( &package->folders, &folder->entry ); + + TRACE("returning %p\n", folder); + + return ERROR_SUCCESS; +} + +static UINT load_all_folders( MSIPACKAGE *package ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R', 'O','M',' ', + '`','D','i','r','e','c','t','o','r','y','`',0 }; + MSIQUERY *view; + UINT r; + + if (!list_empty(&package->folders)) + return ERROR_SUCCESS; + + r = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_IterateRecords(view, NULL, load_folder, package); + msiobj_release(&view->hdr); + return r; +} /* * I am not doing any of the costing functionality yet. @@ -1468,6 +1551,7 @@ static UINT ACTION_CostInitialize(MSIPAC load_all_components( package ); load_all_features( package ); load_all_files( package ); + load_all_folders( package ); return ERROR_SUCCESS; } @@ -1504,98 +1588,6 @@ static UINT ACTION_FileCost(MSIPACKAGE * return ERROR_SUCCESS; } -static MSIFOLDER *load_folder( MSIPACKAGE *package, LPCWSTR dir ) -{ - static const WCHAR Query[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','D','i','r','e','c', 't','o','r','y','`',' ', - 'W','H','E','R','E',' ', '`', 'D','i','r','e','c','t', 'o','r','y','`', - ' ','=',' ','\'','%','s','\'', - 0}; - static const WCHAR szDot[] = { '.',0 }; - static WCHAR szEmpty[] = { 0 }; - LPWSTR p, tgt_short, tgt_long, src_short, src_long; - LPCWSTR parent; - MSIRECORD *row; - MSIFOLDER *folder; - - TRACE("Looking for dir %s\n",debugstr_w(dir)); - - folder = get_loaded_folder( package, dir ); - if (folder) - return folder; - - TRACE("Working to load %s\n",debugstr_w(dir)); - - row = MSI_QueryGetRecord(package->db, Query, dir); - if (!row) - return NULL; - - folder = msi_alloc_zero( sizeof (MSIFOLDER) ); - if (!folder) - return NULL; - - folder->Directory = strdupW(dir); - - p = msi_dup_record_field(row, 3); - - /* split src and target dir */ - tgt_short = p; - src_short = folder_split_path( p, ':' ); - - /* split the long and short paths */ - tgt_long = folder_split_path( tgt_short, '|' ); - src_long = folder_split_path( src_short, '|' ); - - /* check for no-op dirs */ - if (!lstrcmpW(szDot, tgt_short)) - tgt_short = szEmpty; - if (!lstrcmpW(szDot, src_short)) - src_short = szEmpty; - - if (!tgt_long) - tgt_long = tgt_short; - - if (!src_short) { - src_short = tgt_short; - src_long = tgt_long; - } - - if (!src_long) - src_long = src_short; - - /* FIXME: use the target short path too */ - folder->TargetDefault = strdupW(tgt_long); - folder->SourceShortPath = strdupW(src_short); - folder->SourceLongPath = strdupW(src_long); - msi_free(p); - - TRACE("TargetDefault = %s\n",debugstr_w( folder->TargetDefault )); - TRACE("SourceLong = %s\n", debugstr_w( folder->SourceLongPath )); - TRACE("SourceShort = %s\n", debugstr_w( folder->SourceShortPath )); - - parent = MSI_RecordGetString(row, 2); - if (parent) - { - folder->Parent = load_folder( package, parent ); - if ( folder->Parent ) - TRACE("loaded parent %p %s\n", folder->Parent, - debugstr_w(folder->Parent->Directory)); - else - ERR("failed to load parent folder %s\n", debugstr_w(parent)); - } - - folder->Property = msi_dup_property( package, dir ); - - msiobj_release(&row->hdr); - - list_add_tail( &package->folders, &folder->entry ); - - TRACE("%s returning %p\n",debugstr_w(dir),folder); - - return folder; -} - static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) { MSICOMPONENT *comp; @@ -1873,7 +1865,6 @@ static UINT ITERATE_CostFinalizeDirector /* This helper function now does ALL the work */ TRACE("Dir %s ...\n",debugstr_w(name)); - load_folder(package,name); path = resolve_folder(package,name,FALSE,TRUE,NULL); TRACE("resolves to %s\n",debugstr_w(path)); msi_free(path); diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 3da5a05..e0ec6e6 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -293,7 +293,7 @@ LPWSTR resolve_folder(MSIPACKAGE *packag if (!f->Parent) return path; - parent = f->Parent->Directory; + parent = f->Parent; TRACE(" ! Parent is %s\n", debugstr_w(parent)); @@ -496,6 +496,7 @@ void ACTION_free_package_structures( MSI MSIFOLDER *folder = LIST_ENTRY( item, MSIFOLDER, entry ); list_remove( &folder->entry ); + msi_free( folder->Parent ); msi_free( folder->Directory ); msi_free( folder->TargetDefault ); msi_free( folder->SourceLongPath ); @@ -509,7 +510,7 @@ void ACTION_free_package_structures( MSI LIST_FOR_EACH_SAFE( item, cursor, &package->components ) { MSICOMPONENT *comp = LIST_ENTRY( item, MSICOMPONENT, entry ); - + list_remove( &comp->entry ); msi_free( comp->Component ); msi_free( comp->ComponentId ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 23879a4..f6089da 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -318,6 +318,7 @@ typedef struct tagMSIFOLDER { struct list entry; LPWSTR Directory; + LPWSTR Parent; LPWSTR TargetDefault; LPWSTR SourceLongPath; LPWSTR SourceShortPath; @@ -325,7 +326,6 @@ typedef struct tagMSIFOLDER LPWSTR ResolvedTarget; LPWSTR ResolvedSource; LPWSTR Property; /* initially set property */ - struct tagMSIFOLDER *Parent; INT State; /* 0 = uninitialized */ /* 1 = existing */

1 0

Alex Villacís Lasso : kernel32: Restore C locale for LC_NUMERIC.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: cf0c21af47571559a0cb8f368cff98b99aa91156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0c21af47571559a0cb8f368… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Nov 21 17:07:10 2006 -0500 kernel32: Restore C locale for LC_NUMERIC. --- dlls/kernel32/locale.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 3eb8cf9..bc7db75 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2866,6 +2866,8 @@ void LOCALE_Init(void) TRACE( "ansi=%03d oem=%03d mac=%03d unix=%03d\n", ansi_cptable->info.codepage, oem_cptable->info.codepage, mac_cptable->info.codepage, unix_cp ); + + setlocale(LC_NUMERIC, "C"); /* FIXME: oleaut32 depends on this */ } static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName)

1 0

Markus Amsler : d3d: Remove AddRef from IWineD3DDevice_GetSwapChain.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: f84f687e6d3d8f432de2c5d9b2af13d2c5cedfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84f687e6d3d8f432de2c5d9b… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 20 10:48:16 2006 +0100 d3d: Remove AddRef from IWineD3DDevice_GetSwapChain. --- 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, 5 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index a4007ad..2ead3ed 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -219,7 +219,6 @@ 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 51cc16b..3f93aca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1608,7 +1608,6 @@ 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); } } @@ -1926,7 +1925,6 @@ 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 { @@ -5842,7 +5840,6 @@ 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; } @@ -5864,7 +5861,6 @@ 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); } @@ -6019,7 +6015,6 @@ 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; @@ -6488,7 +6483,6 @@ 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; } @@ -6597,7 +6591,6 @@ 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); } @@ -6903,9 +6896,6 @@ 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; @@ -7432,8 +7422,12 @@ 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; @@ -7585,7 +7579,6 @@ 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(); @@ -7740,7 +7733,6 @@ static void WINAPI IWineD3DDeviceImpl_Se if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == WINED3D_OK) { IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (WINED3DGAMMARAMP *)pRamp); - IWineD3DSwapChain_Release(swapchain); } return; } @@ -7753,7 +7745,6 @@ 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 b3ee4ce..42ad97c 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2329,7 +2329,6 @@ 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 84a838f..42e5d04 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -750,7 +750,6 @@ 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); @@ -1238,7 +1237,6 @@ 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 */ @@ -2704,7 +2702,6 @@ 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 4e8f97f..93cdbb4 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -294,7 +294,6 @@ 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

Markus Amsler : d3d: Remove AddRef from IWineD3DDevice_GetIndices.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: 5c4008719c60af52e9370023f09c7b86b7768e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4008719c60af52e9370023f… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 20 10:48:10 2006 +0100 d3d: Remove AddRef from IWineD3DDevice_GetIndices. --- dlls/d3d8/device.c | 1 - dlls/d3d9/device.c | 1 - dlls/wined3d/device.c | 2 -- 3 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2b4b6dd..99164e0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1311,7 +1311,6 @@ 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 d0a456a..8143981 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -833,7 +833,6 @@ 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 26d9c4b..51cc16b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3235,9 +3235,7 @@ 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 : d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: 16b1e046d8da9b716975c1c483c149ea3826b690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b1e046d8da9b716975c1c48… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 20 10:48:03 2006 +0100 d3d: Remove AddRef from IWineD3DDevice_GetStreamSource. --- dlls/d3d8/device.c | 1 - dlls/d3d9/device.c | 1 - dlls/wined3d/device.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2da8063..2b4b6dd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1487,7 +1487,6 @@ 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 62c79c1..d0a456a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -789,7 +789,6 @@ 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 9f9b5a9..26d9c4b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2458,7 +2458,6 @@ 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 : d3d: Remove AddRef from IWineD3DDevice_GetTexture.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: 274df6ef88fb16da6c61fc891db74042fec0bfc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274df6ef88fb16da6c61fc891… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 20 10:47:56 2006 +0100 d3d: Remove AddRef from IWineD3DDevice_GetTexture. --- dlls/d3d8/device.c | 1 - dlls/d3d9/device.c | 1 - dlls/ddraw/device.c | 1 - dlls/wined3d/device.c | 2 -- 4 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2c9329f..2da8063 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -963,7 +963,6 @@ static HRESULT WINAPI IDirect3DDevice8Im rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, (IWineD3DBaseTexture **)&retTexture); if (rc == D3D_OK && NULL != retTexture) { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); - IWineD3DBaseTexture_Release(retTexture); } else { FIXME("Call to get texture (%d) failed (%p)\n", Stage, retTexture); *ppTexture = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 34a2e1c..62c79c1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -595,7 +595,6 @@ static HRESULT WINAPI IDirect3DDevice9 rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, (IWineD3DBaseTexture **)&retTexture); if (rc == D3D_OK && NULL != retTexture) { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); - IWineD3DBaseTexture_Release(retTexture); }else{ FIXME("Call to get texture (%d) failed (%p)\n", Stage, retTexture); *ppTexture = NULL; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cfbbba9..11435cf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2130,7 +2130,6 @@ IDirect3DDeviceImpl_7_GetRenderState(IDi *Value = texImpl->Handle; IDirectDrawSurface7_Release(parent); } - IWineD3DBaseTexture_Release(tex); } return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9812c6f..9f9b5a9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5827,8 +5827,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } *ppTexture=This->stateBlock->textures[Stage]; - if (*ppTexture) - IWineD3DBaseTexture_AddRef(*ppTexture); return WINED3D_OK; }

1 0

Markus Amsler : d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: 18546a65e6e68427ed49c4ea5a601972fb8a4de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18546a65e6e68427ed49c4ea5… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 20 10:47:49 2006 +0100 d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface. --- dlls/d3d8/device.c | 1 - dlls/d3d9/device.c | 1 - dlls/wined3d/device.c | 4 ---- 3 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0baa5ac..2c9329f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -698,7 +698,6 @@ 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 9b31289..34a2e1c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -433,7 +433,6 @@ 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 a42d91c..9812c6f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6981,10 +6981,6 @@ 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 : d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: a7518f6f5494558e80ad125d0b42a46b4744d448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7518f6f5494558e80ad125d0… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 20 10:47:43 2006 +0100 d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget. --- dlls/d3d8/device.c | 1 - dlls/d3d9/device.c | 1 - dlls/wined3d/device.c | 4 +--- 3 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 429b918..0baa5ac 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -677,7 +677,6 @@ static HRESULT WINAPI IDirect3DDevice8 if (hr == D3D_OK && pRenderTarget != NULL) { IWineD3DResource_GetParent((IWineD3DResource *)pRenderTarget,(IUnknown**)ppRenderTarget); - IWineD3DResource_Release((IWineD3DResource *)pRenderTarget); } else { FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); *ppRenderTarget = NULL; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ed7b8d..9b31289 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -403,7 +403,6 @@ static HRESULT WINAPI IDirect3DDevice9 if (hr == D3D_OK && pRenderTarget != NULL) { IWineD3DResource_GetParent((IWineD3DResource *)pRenderTarget,(IUnknown**)ppRenderTarget); - IWineD3DResource_Release((IWineD3DResource *)pRenderTarget); } else { FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); *ppRenderTarget = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1815e26..a42d91c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6889,9 +6889,7 @@ static HRESULT WINAPI IWineD3DDeviceIm *ppRenderTarget = This->renderTarget; TRACE("(%p) : RenderTarget %d Index returning %p\n", This, RenderTargetIndex, *ppRenderTarget); - /* Note inc ref on returned surface */ - if(*ppRenderTarget != NULL) - IWineD3DSurface_AddRef(*ppRenderTarget); + return WINED3D_OK; }

1 0

Markus Amsler : d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.
by Alexandre Julliard Nov. 22, 2006

Nov. 22, 2006

Module: wine Branch: master Commit: 478a414e5820c56fb7bb65d0c41c831932ca26e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478a414e5820c56fb7bb65d0c… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 20 10:47:37 2006 +0100 d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer. --- dlls/d3d8/device.c | 1 - dlls/d3d8/swapchain.c | 1 - dlls/d3d9/device.c | 1 - dlls/d3d9/swapchain.c | 1 - dlls/ddraw/ddraw.c | 3 --- dlls/wined3d/swapchain.c | 2 -- 6 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e128930..429b918 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -295,7 +295,6 @@ static HRESULT WINAPI IDirect3DDevice8Im rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, 0, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); - IWineD3DSurface_Release(retSurface); } return rc; } diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index f5b75d8..9012b35 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -80,7 +80,6 @@ static HRESULT WINAPI IDirect3DSwapChain hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE )Type, &mySurface); if (hrc == D3D_OK && NULL != mySurface) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppBackBuffer); - IWineD3DSurface_Release(mySurface); } return hrc; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2ebb677..8ed7b8d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -205,7 +205,6 @@ static HRESULT WINAPI IDirect3DDevice9 rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, iSwapChain, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); - IWineD3DSurface_Release(retSurface); } return rc; } diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 0b06049..a4007ad 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -88,7 +88,6 @@ static HRESULT WINAPI IDirect3DSwapChain hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &mySurface); if (hrc == D3D_OK && NULL != mySurface) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppBackBuffer); - IWineD3DSurface_Release(mySurface); } /* Do not touch the **ppBackBuffer pointer otherwise! (see device test) */ return hrc; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 11de3ef..de3c704 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1212,9 +1212,6 @@ IDirectDrawImpl_GetGDISurface(IDirectDra return DDERR_NOTFOUND; } - /* GetBackBuffer AddRef()ed the surface, release it */ - IWineD3DSurface_Release(Surf); - IWineD3DSurface_GetParent(Surf, (IUnknown **) &ddsurf); IDirectDrawSurface7_Release(ddsurf); /* For the GetParent */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b9bf032..4e8f97f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -461,8 +461,6 @@ static HRESULT WINAPI IWineD3DSwapChainI *ppBackBuffer = This->backBuffer[iBackBuffer]; TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, iBackBuffer, Type, *ppBackBuffer); - /* Note inc ref on returned surface */ - if(*ppBackBuffer) IWineD3DSurface_AddRef(*ppBackBuffer); return WINED3D_OK; }

1 0