December 2006 - Wine-Commits

James Hawkins : msi: Enable cab compression and delete any resulting cabs using SHFileOperation .
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: be59fb4e6d227366d66192b92c231bd046cb1167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be59fb4e6d227366d66192b92… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 18 04:36:56 2006 -0600 msi: Enable cab compression and delete any resulting cabs using SHFileOperation. --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/install.c | 65 +++++++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 86278c0..df31296 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = msi.dll -IMPORTS = cabinet msi ole32 advapi32 kernel32 +IMPORTS = cabinet msi shell32 ole32 advapi32 kernel32 CTESTS = \ db.c \ diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index adc15bf..d044436 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -825,17 +825,11 @@ static void create_cc_test_files(void) get_temp_file, &cabParams, cab_context); ok(hfci != NULL, "Failed to create an FCI context\n"); - /* spews out hundreds of cab files. re-enable when cabinet.dll is fixed */ -#if 0 res = add_file(hfci, "maximus", tcompTYPE_MSZIP); ok(res, "Failed to add file maximus\n"); res = add_file(hfci, "augustus", tcompTYPE_MSZIP); - todo_wine - { - ok(res, "Failed to add file augustus\n"); - } -#endif + ok(res, "Failed to add file augustus\n"); res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); ok(res, "Failed to flush the cabinet\n"); @@ -850,6 +844,23 @@ static void create_cc_test_files(void) DeleteFile("caesar"); } +static void delete_cab_files(void) +{ + SHFILEOPSTRUCT shfl; + CHAR path[MAX_PATH]; + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\*.cab\0"); + + shfl.hwnd = NULL; + shfl.wFunc = FO_DELETE; + shfl.pFrom = (LPCSTR)path; + shfl.pTo = NULL; + shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT; + + SHFileOperation(&shfl); +} + static void test_continuouscabs(void) { UINT r; @@ -860,22 +871,16 @@ static void test_continuouscabs(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); todo_wine { ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - } - - todo_wine - { - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); } - ok(delete_pf("msitest", FALSE), "File not installed\n"); - DeleteFile("test1.cab"); - DeleteFile("test2.cab"); - DeleteFile("test3.cab"); + delete_cab_files(); DeleteFile(msifile); } @@ -902,13 +907,11 @@ static void test_caborder(void) ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); todo_wine { - ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); - ok(!delete_pf("msitest", FALSE), "File is installed\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); } - DeleteFile("test1.cab"); - DeleteFile("test2.cab"); - DeleteFile("test3.cab"); + delete_cab_files(); create_cab_file("test1.cab", MEDIA_SIZE, "imperator\0"); create_cab_file("test2.cab", MEDIA_SIZE, "maximus\0augustus\0"); @@ -921,12 +924,10 @@ static void test_caborder(void) ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); todo_wine { - ok(!delete_pf("msitest", FALSE), "File is installed\n"); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); } - DeleteFile("test1.cab"); - DeleteFile("test2.cab"); - DeleteFile("test3.cab"); + delete_cab_files(); DeleteFile(msifile); create_cc_test_files(); @@ -934,17 +935,15 @@ static void test_caborder(void) r = MsiInstallProductA(msifile, NULL); ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); - ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); todo_wine { + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - ok(!delete_pf("msitest", FALSE), "File is installed\n"); } - DeleteFile("test1.cab"); - DeleteFile("test2.cab"); - DeleteFile("test3.cab"); + delete_cab_files(); DeleteFile(msifile); create_cc_test_files(); @@ -952,17 +951,15 @@ static void test_caborder(void) r = MsiInstallProductA(msifile, NULL); ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); - ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); todo_wine { ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); ok(!delete_pf("msitest", FALSE), "File is installed\n"); } - DeleteFile("test1.cab"); - DeleteFile("test2.cab"); - DeleteFile("test3.cab"); + delete_cab_files(); DeleteFile("imperator"); DeleteFile("maximus"); DeleteFile("augustus");

1 0

James Hawkins : msi: Run the install tests from a temporary directory.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: e1f76deedca0a331a86ced46089e7eab6d5237ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f76deedca0a331a86ced460… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 18 04:36:00 2006 -0600 msi: Run the install tests from a temporary directory. --- dlls/msi/tests/install.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3541ab2..adc15bf 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -973,18 +973,25 @@ static void test_caborder(void) START_TEST(install) { DWORD len; + char temp_path[MAX_PATH], prev_path[MAX_PATH]; - get_program_files_dir(PROG_FILES_DIR); + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPath(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + lstrcpyA(CURR_DIR, temp_path); len = lstrlenA(CURR_DIR); - if(len && (CURR_DIR[len-1] == '\\')) + if(len && (CURR_DIR[len - 1] == '\\')) CURR_DIR[len - 1] = 0; + get_program_files_dir(PROG_FILES_DIR); + test_MsiInstallProduct(); test_MsiSetComponentState(); test_packagecoltypes(); test_continuouscabs(); test_caborder(); + + SetCurrentDirectoryA(prev_path); }

1 0

Clinton Stimpson : usp10: Implement ScriptStringXtoCP.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: bdbab217c999a8a60b3dff3207b680f556a04fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbab217c999a8a60b3dff320… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Fri Dec 15 19:28:17 2006 -0700 usp10: Implement ScriptStringXtoCP. --- dlls/usp10/tests/usp10.c | 4 +- dlls/usp10/usp10.c | 49 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b522b88..5aa9631 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -829,7 +829,7 @@ static void test_ScriptStringXtoCP_CPtoX hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); - todo_wine ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", iTrailing, X); /* @@ -861,7 +861,7 @@ static void test_ScriptStringXtoCP_CPtoX hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); todo_wine ok(Cp - 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp - 1, Ch, X); - todo_wine ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", iTrailing, X); /* diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index feedc5b..14f6fe9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -585,12 +585,55 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_ */ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, int* piTrailing) { - FIXME("(%p), %d, (%p), (%p): stub\n", ssa, iX, piCh, piTrailing); - *piCh = 0; /* Set a reasonable value */ - *piTrailing = 0; + StringAnalysis* analysis = ssa; + int i; + int j; + int runningX = 0; + int runningCp = 0; + int width; + + TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); + + if(!ssa || !piCh || !piTrailing) + { + return 1; + } + + /* out of range */ + if(iX < 0) + { + *piCh = -1; + *piTrailing = TRUE; + return S_OK; + } + + for(i=0; i<analysis->numItems; i++) + { + for(j=0; j<analysis->glyphs[i].numGlyphs; j++) + { + width = analysis->glyphs[i].piAdvance[j]; + if(iX < (runningX + width)) + { + *piCh = runningCp; + if((iX - runningX) > width/2) + *piTrailing = TRUE; + else + *piTrailing = FALSE; + return S_OK; + } + runningX += width; + runningCp++; + } + } + + /* out of range */ + *piCh = analysis->pItem[analysis->numItems].iCharPos; + *piTrailing = FALSE; + return S_OK; } + /*********************************************************************** * ScriptStringFree (USP10.@) *

1 0

Clinton Stimpson : usp10: Implement ScriptStringCPtoX.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: e0829eb70f2bfba8ad7e2231058282cb14e818ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0829eb70f2bfba8ad7e22310… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Fri Dec 15 19:28:25 2006 -0700 usp10: Implement ScriptStringCPtoX. --- dlls/usp10/tests/usp10.c | 28 ++++++++++++---------------- dlls/usp10/usp10.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5aa9631..b291301 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -795,11 +795,8 @@ static void test_ScriptStringXtoCP_CPtoX ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - if(Cp == 0) - ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); - else - todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); - ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", iTrailing, X); fTrailing = TRUE; hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); @@ -812,11 +809,10 @@ static void test_ScriptStringXtoCP_CPtoX * one input to ScriptStringCPtoX. This means that the Cp to X position and back * again works */ - todo_wine ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, X); - ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, X); + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", iTrailing, X); } - /* * This test is to check that if the X position is just inside the trailing edge of the * character then iTrailing will indicate the trailing edge, ie. TRUE @@ -828,8 +824,8 @@ static void test_ScriptStringXtoCP_CPtoX X--; /* put X just inside the trailing edge */ hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - todo_wine ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); - ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); + ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", iTrailing, X); /* @@ -844,8 +840,8 @@ static void test_ScriptStringXtoCP_CPtoX X++; /* put X just outside the trailing edge */ hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - todo_wine ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, X); - ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, X); + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", iTrailing, X); /* @@ -860,8 +856,8 @@ static void test_ScriptStringXtoCP_CPtoX X--; /* put X just outside the leading edge */ hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); - todo_wine ok(Cp - 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp - 1, Ch, X); - ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + ok(Cp - 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp - 1, Ch, X); + ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", iTrailing, X); /* @@ -887,13 +883,13 @@ static void test_ScriptStringXtoCP_CPtoX fTrailing = FALSE; Cp = String_len + 1; hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); - todo_wine ok(hr == E_INVALIDARG, "ScriptStringCPtoX should return E_INVALIDARG not %08x\n", hr); + ok(hr == E_INVALIDARG, "ScriptStringCPtoX should return E_INVALIDARG not %08x\n", hr); hr = ScriptStringFree(&ssa); /* * ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail */ - todo_wine ok(hr == E_INVALIDARG, "ScriptStringFree should return E_INVALIDARG not %08x\n", hr); + ok(hr == E_INVALIDARG, "ScriptStringFree should return E_INVALIDARG not %08x\n", hr); } } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 14f6fe9..448153f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -574,9 +574,46 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_ST */ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int* pX) { - FIXME("(%p), %d, %d, (%p): stub\n", ssa, icp, fTrailing, pX); - *pX = 0; /* Set a reasonable value */ - return S_OK; + int i, j; + int runningX = 0; + int runningCp = 0; + StringAnalysis* analysis = ssa; + TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); + + if(!ssa || !pX) + { + return 1; + } + + /* icp out of range */ + if(icp < 0) + { + analysis->invalid = TRUE; + return E_INVALIDARG; + } + + for(i=0; i<analysis->numItems; i++) + { + for(j=0; j<analysis->glyphs[i].numGlyphs; j++) + { + if(runningCp == icp && fTrailing == FALSE) + { + *pX = runningX; + return S_OK; + } + runningX += analysis->glyphs[i].piAdvance[j]; + if(runningCp == icp && fTrailing == TRUE) + { + *pX = runningX; + return S_OK; + } + runningCp++; + } + } + + /* icp out of range */ + analysis->invalid = TRUE; + return E_INVALIDARG; } /***********************************************************************

1 0

Clinton Stimpson : usp10: Implement ScriptStringFree.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 857e330e77a7492b8c6830e897910ac332a62856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=857e330e77a7492b8c6830e89… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Fri Dec 15 19:28:11 2006 -0700 usp10: Implement ScriptStringFree. --- dlls/usp10/usp10.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ea5339b..feedc5b 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -595,8 +595,39 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_ * ScriptStringFree (USP10.@) * */ -HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) { - FIXME("(%p): stub\n",pssa); +HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) +{ + StringAnalysis* analysis; + BOOL invalid; + int i; + TRACE("(%p)\n",pssa); + + if(!pssa) + return E_INVALIDARG; + + analysis = *pssa; + if(!analysis) + return E_INVALIDARG; + + invalid = analysis->invalid; + + for(i=0; i<analysis->numItems; i++) + { + HeapFree(GetProcessHeap(), 0, analysis->glyphs[i].glyphs); + HeapFree(GetProcessHeap(), 0, analysis->glyphs[i].pwLogClust); + HeapFree(GetProcessHeap(), 0, analysis->glyphs[i].piAdvance); + HeapFree(GetProcessHeap(), 0, analysis->glyphs[i].psva); + HeapFree(GetProcessHeap(), 0, analysis->glyphs[i].pGoffset); + HeapFree(GetProcessHeap(), 0, analysis->glyphs[i].abc); + } + + HeapFree(GetProcessHeap(), 0, analysis->glyphs); + HeapFree(GetProcessHeap(), 0, analysis->pItem); + HeapFree(GetProcessHeap(), 0, analysis); + + if(invalid) + return E_INVALIDARG; + return S_OK; }

1 0

Clinton Stimpson : usp10: Implement ScriptStringAnalyse.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: b91eb5a11001b0f496bbcd47af775523bc5665df URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91eb5a11001b0f496bbcd47a… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Fri Dec 15 19:28:07 2006 -0700 usp10: Implement ScriptStringAnalyse. --- dlls/usp10/tests/usp10.c | 57 +++++++++++++++------------- dlls/usp10/usp10.c | 93 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 119 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91eb5a11001b0f496bbc…

1 0

Markus Amsler : d3d9: Handle volume container in d3d9.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: d80dc79280ce9db70e1801a2f05b30bee1021c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80dc79280ce9db70e1801a2f… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:18:05 2006 +0100 d3d9: Handle volume container in d3d9. --- dlls/d3d9/d3d9_private.h | 3 +++ dlls/d3d9/volume.c | 25 ++++--------------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 391f91e..58969e3 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -239,6 +239,9 @@ typedef struct IDirect3DVolume9Impl /* IDirect3DVolume9 fields */ IWineD3DVolume *wineD3DVolume; + /* The volume container */ + IUnknown *container; + /* If set forward refcounting to this object */ IUnknown *forwardReference; } IDirect3DVolume9Impl; diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index f9ce7fc..1a6f32d 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -111,35 +111,17 @@ static HRESULT WINAPI IDirect3DVolume9Im static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, REFIID riid, void** ppContainer) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - IWineD3DBase *wineD3DContainer = NULL; - IUnknown *wineD3DContainerParent = NULL; HRESULT res; TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); + if (!This->container) return E_NOINTERFACE; + if (!ppContainer) { ERR("Called without a valid ppContainer.\n"); } - /* Get the WineD3D container. */ - res = IWineD3DVolume_GetContainer(This->wineD3DVolume, &IID_IWineD3DBase, (void **)&wineD3DContainer); - if (res != D3D_OK) return res; - - if (!wineD3DContainer) { - ERR("IWineD3DSurface_GetContainer should never return NULL\n"); - } - - /* Get the parent */ - IWineD3DBase_GetParent(wineD3DContainer, &wineD3DContainerParent); - IUnknown_Release(wineD3DContainer); - - if (!wineD3DContainerParent) { - ERR("IWineD3DBase_GetParent should never return NULL\n"); - } - - /* Now, query the interface of the parent for the riid */ - res = IUnknown_QueryInterface(wineD3DContainerParent, riid, ppContainer); - IUnknown_Release(wineD3DContainerParent); + res = IUnknown_QueryInterface(This->container, riid, ppContainer); TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer); @@ -224,6 +206,7 @@ HRESULT WINAPI D3D9CB_CreateVolume(IUnkn *ppVolume = NULL; } else { *ppVolume = (IWineD3DVolume *)object->wineD3DVolume; + object->container = pSuperior; object->forwardReference = pSuperior; } TRACE("(%p) Created volume %p\n", This, *ppVolume);

1 0

Markus Amsler : d3d9: Handle surface container in d3d9.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 467b1dd3ad0b6034f042901dc5ef15d3bfc4ea5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=467b1dd3ad0b6034f042901dc… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:17:51 2006 +0100 d3d9: Handle surface container in d3d9. --- dlls/d3d9/d3d9_private.h | 3 +++ dlls/d3d9/device.c | 1 + dlls/d3d9/directx.c | 2 ++ dlls/d3d9/surface.c | 24 +++--------------------- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 9799104..391f91e 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -310,6 +310,9 @@ typedef struct IDirect3DSurface9Impl /* Parent reference */ LPDIRECT3DDEVICE9 parentDevice; + /* The surface container */ + IUnknown *container; + /* If set forward refcounting to this object */ IUnknown *forwardReference; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f89694f..06534e7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1013,6 +1013,7 @@ HRESULT WINAPI D3D9CB_CreateSurface(IUnk if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; + d3dSurface->container = pSuperior; IUnknown_Release(d3dSurface->parentDevice); d3dSurface->parentDevice = NULL; d3dSurface->forwardReference = pSuperior; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 899463a..1d68e42 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -189,6 +189,7 @@ HRESULT WINAPI D3D9CB_CreateRenderTarget if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; + d3dSurface->container = pSuperior; d3dSurface->isImplicit = TRUE; /* Implicit surfaces are created with an refcount of 0 */ IUnknown_Release((IUnknown *)d3dSurface); @@ -285,6 +286,7 @@ HRESULT WINAPI D3D9CB_CreateDepthStencil (IDirect3DSurface9 **)&d3dSurface, pSharedHandle); if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; + d3dSurface->container = device; d3dSurface->isImplicit = TRUE; /* Implicit surfaces are created with an refcount of 0 */ IUnknown_Release((IUnknown *)d3dSurface); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 250204a..a9a93b4 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -139,35 +139,17 @@ static D3DRESOURCETYPE WINAPI IDirect3DS /* IDirect3DSurface9 Interface follow: */ static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 iface, REFIID riid, void** ppContainer) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; - IWineD3DBase *wineD3DContainer = NULL; - IUnknown *wineD3DContainerParent = NULL; HRESULT res; TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); + if (!This->container) return E_NOINTERFACE; + if (!ppContainer) { ERR("Called without a valid ppContainer\n"); } - /* Get the WineD3D container. */ - res = IWineD3DSurface_GetContainer(This->wineD3DSurface, &IID_IWineD3DBase, (void **)&wineD3DContainer); - if (res != D3D_OK) return res; - - if (!wineD3DContainer) { - ERR("IWineD3DSurface_GetContainer should never return NULL\n"); - } - - /* Get the parent */ - IWineD3DBase_GetParent(wineD3DContainer, &wineD3DContainerParent); - IUnknown_Release(wineD3DContainer); - - if (!wineD3DContainerParent) { - ERR("IWineD3DBase_GetParent should never return NULL\n"); - } - - /* Now, query the interface of the parent for the riid */ - res = IUnknown_QueryInterface(wineD3DContainerParent, riid, ppContainer); - IUnknown_Release(wineD3DContainerParent); + res = IUnknown_QueryInterface(This->container, riid, ppContainer); TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer);

1 0

Markus Amsler : d3d8: Handle volume container in d3d8.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 87083c9d71a8b562da6b6f7b6954480618ac4332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87083c9d71a8b562da6b6f7b6… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:17:45 2006 +0100 d3d8: Handle volume container in d3d8. --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/volume.c | 25 ++++--------------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index be27401..fe642a6 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -200,6 +200,9 @@ struct IDirect3DVolume8Impl /* IDirect3DVolume8 fields */ IWineD3DVolume *wineD3DVolume; + /* The volume container */ + IUnknown *container; + /* If set forward refcounting to this object */ IUnknown *forwardReference; }; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 0eba97a..205c66a 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -111,35 +111,17 @@ static HRESULT WINAPI IDirect3DVolume8Im static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID riid, void **ppContainer) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - IWineD3DBase *wineD3DContainer = NULL; - IUnknown *wineD3DContainerParent = NULL; HRESULT res; TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); + if (!This->container) return E_NOINTERFACE; + if (!ppContainer) { ERR("Called without a valid ppContainer.\n"); } - /* Get the WineD3D container. */ - res = IWineD3DVolume_GetContainer(This->wineD3DVolume, &IID_IWineD3DBase, (void **)&wineD3DContainer); - if (res != D3D_OK) return res; - - if (!wineD3DContainer) { - ERR("IWineD3DSurface_GetContainer should never return NULL\n"); - } - - /* Get the parent */ - IWineD3DBase_GetParent(wineD3DContainer, &wineD3DContainerParent); - IUnknown_Release(wineD3DContainer); - - if (!wineD3DContainerParent) { - ERR("IWineD3DBase_GetParent should never return NULL\n"); - } - - /* Now, query the interface of the parent for the riid */ - res = IUnknown_QueryInterface(wineD3DContainerParent, riid, ppContainer); - IUnknown_Release(wineD3DContainerParent); + res = IUnknown_QueryInterface(This->container, riid, ppContainer); TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer); @@ -223,6 +205,7 @@ HRESULT WINAPI D3D8CB_CreateVolume(IUnkn *ppVolume = NULL; } else { *ppVolume = (IWineD3DVolume *)object->wineD3DVolume; + object->container = pSuperior; object->forwardReference = pSuperior; } TRACE("(%p) Created volume %p\n", This, *ppVolume);

1 0

Markus Amsler : d3d8: Handle surface container in d3d8.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 053185814694b7163b19d9941a133cbb87b3dc61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053185814694b7163b19d9941… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:17:38 2006 +0100 d3d8: Handle surface container in d3d8. --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/device.c | 1 + dlls/d3d8/directx.c | 2 ++ dlls/d3d8/surface.c | 39 ++++----------------------------------- dlls/d3d8/tests/device.c | 4 ++-- 5 files changed, 12 insertions(+), 37 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index fd07053..be27401 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -253,6 +253,9 @@ struct IDirect3DSurface8Impl /* Parent reference */ LPDIRECT3DDEVICE8 parentDevice; + /* The surface container */ + IUnknown *container; + /* If set forward refcounting to this object */ IUnknown *forwardReference; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 78c469b..3faf807 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1624,6 +1624,7 @@ HRESULT WINAPI D3D8CB_CreateSurface(IUnk if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; + d3dSurface->container = pSuperior; IUnknown_Release(d3dSurface->parentDevice); d3dSurface->parentDevice = NULL; d3dSurface->forwardReference = pSuperior; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 410107e..c3d0679 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -200,6 +200,7 @@ HRESULT WINAPI D3D8CB_CreateRenderTarget if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; + d3dSurface->container = device; d3dSurface->isImplicit = TRUE; /* Implicit surfaces are created with an refcount of 0 */ IUnknown_Release((IUnknown *)d3dSurface); @@ -299,6 +300,7 @@ HRESULT WINAPI D3D8CB_CreateDepthStencil (D3DFORMAT)Format, MultiSample, (IDirect3DSurface8 **)&d3dSurface); if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; + d3dSurface->container = device; d3dSurface->isImplicit = TRUE; /* Implicit surfaces are created with an refcount of 0 */ IUnknown_Release((IUnknown *)d3dSurface); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index d834460..93ea2f5 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -113,45 +113,14 @@ static HRESULT WINAPI IDirect3DSurface8I static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 iface, REFIID riid, void **ppContainer) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; HRESULT res; - IUnknown *IWineContainer = NULL; TRACE("(%p) Relay\n", This); - /* The container returned from IWineD3DSurface_GetContainer is either an IWineD3DDevice, - one of the subclasses of IWineD3DBaseTexture or an IWineD3DSwapChain */ - /* Get the IUnknown container. */ - res = IWineD3DSurface_GetContainer(This->wineD3DSurface, &IID_IUnknown, (void **)&IWineContainer); - if (res == D3D_OK && IWineContainer != NULL) { - - /* Now find out what kind of container it is (so that we can get its parent)*/ - IUnknown *IUnknownParent = NULL; - IUnknown *myContainer = NULL; - if (D3D_OK == IUnknown_QueryInterface(IWineContainer, &IID_IWineD3DDevice, (void **)&myContainer)) { - IWineD3DDevice_GetParent((IWineD3DDevice *)IWineContainer, &IUnknownParent); - IUnknown_Release(myContainer); - } else - if (D3D_OK == IUnknown_QueryInterface(IWineContainer, &IID_IWineD3DBaseTexture, (void **)&myContainer)) { - IWineD3DBaseTexture_GetParent((IWineD3DBaseTexture *)IWineContainer, &IUnknownParent); - IUnknown_Release(myContainer); - } else - if (D3D_OK == IUnknown_QueryInterface(IWineContainer, &IID_IWineD3DSwapChain, (void **)&myContainer)) { - IWineD3DSwapChain_GetParent((IWineD3DSwapChain *)IWineContainer, &IUnknownParent); - IUnknown_Release(myContainer); - } else { - FIXME("Container is of unknown interface\n"); - } - /* Tidy up.. */ - IUnknown_Release((IWineD3DDevice *)IWineContainer); - - /* Now, query the interface of the parent for the riid */ - if (IUnknownParent != NULL) { - res = IUnknown_QueryInterface(IUnknownParent, riid, ppContainer); - /* Tidy up.. */ - IUnknown_Release(IUnknownParent); - } - } + if (!This->container) return E_NOINTERFACE; + + res = IUnknown_QueryInterface(This->container, riid, ppContainer); - TRACE("(%p) : returning %p\n", This, *ppContainer); + TRACE("(%p) : returning %p\n", This, *ppContainer); return res; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1ad56b7..2d3b376 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -332,7 +332,7 @@ static void test_refcount(void) CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); if(pRenderTarget) { - todo_wine CHECK_SURFACE_CONTAINER( pRenderTarget, IID_IDirect3DDevice8, pDevice); + CHECK_SURFACE_CONTAINER( pRenderTarget, IID_IDirect3DDevice8, pDevice); CHECK_REFCOUNT( pRenderTarget, 1); CHECK_ADDREF_REFCOUNT(pRenderTarget, 2); @@ -496,7 +496,7 @@ static void test_refcount(void) CHECK_REFCOUNT( pSwapChain, 1); if(pBackBuffer) { - todo_wine CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DDevice8, pDevice); + CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DDevice8, pDevice); CHECK_REFCOUNT( pBackBuffer, 1); CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); CHECK_REFCOUNT( pDevice, --refcount);

1 0