March 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Unload resources on Uninit3D().
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 24a4503d6133de126c4e34911baf3b79d81e0bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a4503d6133de126c4e34911… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 13:54:34 2009 +0100 wined3d: Unload resources on Uninit3D(). This should prevent destroying GL objects without a GL context. Eg. when a ddraw surface has a GL texture and is released after a call to Uninit3D(). --- dlls/wined3d/device.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f1840f..a64083c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2568,6 +2568,13 @@ err_out: return hr; } +static HRESULT WINAPI device_unload_resource(IWineD3DResource *resource, void *ctx) +{ + IWineD3DResource_UnLoad(resource); + IWineD3DResource_Release(resource); + return WINED3D_OK; +} + static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroyDepthStencilSurface, D3DCB_DESTROYSWAPCHAINFN D3DCB_DestroySwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; int sampler; @@ -2583,6 +2590,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D if(This->logo_surface) IWineD3DSurface_Release(This->logo_surface); + /* Unload resources */ + IWineD3DDevice_EnumResources(iface, device_unload_resource, NULL); + TRACE("Deleting high order patches\n"); for(i = 0; i < PATCHMAP_SIZE; i++) { struct list *e1, *e2;

1 0

Henri Verbeet : wined3d: Compare the actual formats.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 89721c2173bbf184ee45d8665323ddad3ef9f324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89721c2173bbf184ee45d8665… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:15 2009 +0100 wined3d: Compare the actual formats. --- dlls/wined3d/surface_base.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 941d537..401f983 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1105,7 +1105,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D dEntry = This->resource.format_desc; if (Src) { - if(This->resource.format_desc != Src->resource.format_desc) + if (This->resource.format_desc->format != Src->resource.format_desc->format) { Src = surface_convert_format(Src, dEntry->format); if(!Src) { @@ -1676,7 +1676,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst FIXME("trans arg not supported when a FOURCC surface is involved\n"); if (dstx || dsty) FIXME("offset for destination surface is not supported\n"); - if (Src->resource.format_desc != This->resource.format_desc) + if (Src->resource.format_desc->format != This->resource.format_desc->format) { FIXME("FOURCC->FOURCC copy only supported for the same type of surface\n"); ret = WINED3DERR_WRONGTEXTUREFORMAT;

1 0

Henri Verbeet : wined3d: Set the currently active context to NULL when it' s destroyed.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 1f4e7b27ed73214a764e33b9bf2df193b17d57ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4e7b27ed73214a764e33b9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 08:30:15 2009 +0100 wined3d: Set the currently active context to NULL when it's destroyed. This should make us crash when trying to use the "currently active" context after it has been destroyed, rather than messing around with freed memory. --- dlls/wined3d/context.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4ae7c3d..c7db25a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1010,6 +1010,12 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { LEAVE_GL(); + if (This->activeContext == context) + { + This->activeContext = NULL; + TRACE("Destroying the active context.\n"); + } + /* Cleanup the GL context */ pwglMakeCurrent(NULL, NULL); if(context->isPBuffer) {

1 0

Aric Stewart : kernel32: Report unixfs instead of ntfs for unknown filesystem type.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 8044c11ecfca09e2b643feccb95a4d8f645ba656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8044c11ecfca09e2b643feccb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 17 07:40:42 2009 -0500 kernel32: Report unixfs instead of ntfs for unknown filesystem type. This avoids programs such as the .Net2.0 installer trying to do ntfs specific functions on the disk. --- dlls/kernel32/volume.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index d30ae10..9addeab 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -511,8 +511,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, static const WCHAR audiocdW[] = {'A','u','d','i','o',' ','C','D',0}; static const WCHAR fatW[] = {'F','A','T',0}; static const WCHAR fat32W[] = {'F','A','T','3','2',0}; - static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0}; + static const WCHAR unixfsW[] = {'U','N','I','X','F','S',0}; WCHAR device[] = {'\\','\\','.','\\','A',':',0}; HANDLE handle; @@ -613,7 +613,7 @@ fill_fs_info: /* now fill in the information that depends on the file system ty if (flags) *flags = FILE_CASE_PRESERVED_NAMES; /* FIXME */ break; default: - if (fsname) lstrcpynW( fsname, ntfsW, fsname_len ); + if (fsname) lstrcpynW( fsname, unixfsW, fsname_len ); if (filename_len) *filename_len = 255; if (flags) *flags = FILE_CASE_PRESERVED_NAMES; break;

1 0

Hwang YunSong(황윤성) : mshtml: Updated Korean resource.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: d496a49084b3b5fcf657361eba47d0b089df4ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d496a49084b3b5fcf657361eb… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Mar 16 10:10:34 2009 +0900 mshtml: Updated Korean resource. --- dlls/mshtml/Ko.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index 9a0bcb5..efad007 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -54,3 +54,14 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "Ȯ��", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ȯ��", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Aric Stewart : propsys: Stub for PSUnregisterPropertySchema.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 6979c4142f75303e7a31e049d5324e419db4cf1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6979c4142f75303e7a31e049d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 19 09:46:45 2009 -0500 propsys: Stub for PSUnregisterPropertySchema. Needed for IE8 install. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 5fa0d96..1848b47 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -92,7 +92,7 @@ @ stdcall PSRegisterPropertySchema(wstr) @ stub PSSetPropertyValue @ stub PSStringFromPropertyKey -@ stub PSUnregisterPropertySchema +@ stdcall PSUnregisterPropertySchema(wstr) @ stdcall PropVariantChangeType(ptr ptr long long) @ stub PropVariantCompareEx @ stub PropVariantGetBooleanElem diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ccdf3ed..c5bcab7 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -54,3 +54,10 @@ HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) return E_NOTIMPL; } + +HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR pszPath) +{ + FIXME("stub\n"); + + return E_NOTIMPL; +}

1 0

Rein Klazes : user32/tests: In sysparams.c disable some Get/ Set border tests for now. These may permanently change desktop settings of the testers.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 3aec62dcf6ef3032749732fcca425d6e26deec93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aec62dcf6ef3032749732fcc… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Mar 19 10:45:46 2009 +0100 user32/tests: In sysparams.c disable some Get/Set border tests for now. These may permanently change desktop settings of the testers. --- dlls/user32/tests/sysparams.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 05f728d..d7adfa4 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -734,6 +734,11 @@ static void test_SPI_SETBORDER( void ) /* 6 */ rc=SystemParametersInfoA( SPI_GETBORDER, 0, &old_border, 0 ); if (!test_error_msg(rc,"SPI_{GET,SET}BORDER")) return; + /* FIXME: include new PaddedBorderWidth parameter */ + if( old_border != ncmsave.iBorderWidth){ + win_skip( "Can not reliable restore border width yet\n"); + return; + } /* This will restore sane values if the test hang previous run. */ if ( old_border == 7 || old_border == 20 ) old_border = 1; @@ -1346,7 +1351,7 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ } #define TEST_NONCLIENTMETRICS_REG( ncm) \ -test_reg_metric2( SPI_SETBORDER_REGKEY2, SPI_SETBORDER_REGKEY, SPI_SETBORDER_VALNAME, (ncm).iBorderWidth);\ +/*FIXME: test_reg_metric2( SPI_SETBORDER_REGKEY2, SPI_SETBORDER_REGKEY, SPI_SETBORDER_VALNAME, (ncm).iBorderWidth);*/\ test_reg_metric( SPI_METRIC_REGKEY, SPI_SCROLLWIDTH_VALNAME, (ncm).iScrollWidth);\ test_reg_metric( SPI_METRIC_REGKEY, SPI_SCROLLHEIGHT_VALNAME, (ncm).iScrollHeight);\ /*FIXME: test_reg_metric( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, (ncm).iCaptionWidth);*/\

1 0

Paul Vriens : urlmon/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: ad5e68e8a15953a09e41564f8f01ee9f9aa585fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5e68e8a15953a09e41564f8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 19 11:16:28 2009 +0100 urlmon/tests: Fix a test failure on Vista and higher. --- dlls/urlmon/tests/protocol.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index c9c42e8..6044c31 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1854,7 +1854,9 @@ static void test_gopher_protocol(void) trace("Testing gopher protocol...\n"); hres = CoGetClassObject(&CLSID_GopherProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK || + hres == REGDB_E_CLASSNOTREG, /* Gopher protocol has been removed as of Vista */ + "CoGetClassObject failed: %08x\n", hres); if(FAILED(hres)) return;

1 0

Nicolas Le Cam : shell32/tests: Fix a test on Win2k platform and above.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 5fc199263e4d94ac843c45ca60622ab40cf286c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc199263e4d94ac843c45ca6… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Mar 17 22:40:45 2009 +0100 shell32/tests: Fix a test on Win2k platform and above. --- dlls/shell32/tests/appbar.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 5d15fcd..51bea2b 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -340,14 +340,12 @@ static void test_setpos(void) test_window_rects(1, 2); /* remove the other windows */ - SetWindowLongPtr(windows[1].hwnd, GWLP_USERDATA, 0); abd.hWnd = windows[1].hwnd; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[1].registered = FALSE; DestroyWindow(windows[1].hwnd); - SetWindowLongPtr(windows[2].hwnd, GWLP_USERDATA, 0); abd.hWnd = windows[2].hwnd; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret);

1 0

Nicolas Le Cam : schannel/tests: Fix test on Win2k.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: da2e0441257479365c0508f2397491cd94e2ba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2e0441257479365c0508f23… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Mar 14 14:22:51 2009 +0100 schannel/tests: Fix test on Win2k. --- dlls/schannel/tests/main.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index ddfffc4..d05275f 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -57,20 +57,26 @@ static void testInitialize(void) /* SpLsaModeInitialize does not care about the LSA version. */ status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(cTables == 2, "cTables: %d\n", cTables); + ok(cTables == 2 || + broken(cTables == 1), /* Win2k */ + "cTables: %d\n", cTables); ok(pTables2 != NULL,"pTables: %p\n", pTables2); /* We can call it as many times we want. */ status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(cTables == 2, "cTables: %d\n", cTables); + ok(cTables == 2 || + broken(cTables == 1), /* Win2k */ + "cTables: %d\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); /* It will always return the same pointer. */ ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(cTables == 2, "cTables: %d\n", cTables); + ok(cTables == 2 || + broken(cTables == 1), /* Win2k */ + "cTables: %d\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); @@ -96,7 +102,9 @@ static void testInitialize(void) &pUserTables, &cUserTables); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%x\n", Version); - ok(cUserTables == 2, "cUserTables: %d\n", cUserTables); + ok(cUserTables == 2 || + broken(cUserTables == 4), /* Win2k */ + "cUserTables: %d\n", cUserTables); ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables); /* Initializing user again */ @@ -153,7 +161,12 @@ static void testGetInfo(void) "cbMaxToken: 0x%x\n", PackageInfo.cbMaxToken); - /* Second package: SChannel */ + /* Second package */ + if (cTables == 1) + { + win_skip("Second package missing\n"); + return; + } pTables = getNextSecPkgTable(pTables, Version); if (!pTables) return;

1 0