July 2008 - Wine-Commits - list.winehq.org

James Hawkins : oleaut32: Fix a test that fails on all platforms up to and including win2k.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: d932fefb6115c0f56c79917739451b14fa4a1c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d932fefb6115c0f56c7991773… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jun 30 23:55:37 2008 -0500 oleaut32: Fix a test that fails on all platforms up to and including win2k. --- dlls/oleaut32/tests/olefont.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index cbf85e1..9f96fee 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -769,8 +769,9 @@ static void test_AddRefHfont(void) /* Decrement reference for destroyed hfnt1 */ hres = IFont_ReleaseHfont(ifnt2,hfnt1); - ok(hres == S_OK, - "IFont_AddRefHfont: (Release ref) Expected S_OK but got 0x%08x\n", + ok(hres == S_OK || + hres == S_FALSE, /* <= win2k */ + "IFont_AddRefHfont: (Release ref) Expected S_OK or S_FALSE but got 0x%08x\n", hres); /* Shows that releasing all IFONT's does clear the HFONT cache. */

1 0

Michael Karcher : winex11: Fix GetDIBits of 1 bit DDBs.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 8da833494ddfd48d6be1c7f8a7e38e81a8daaab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da833494ddfd48d6be1c7f8a… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jun 29 13:30:21 2008 +0200 winex11: Fix GetDIBits of 1 bit DDBs. 1 bpp DDBs seem to always carry an implicit palette of black and white, regardless of what the DC says. Based on a patch from Eric Pouech. --- dlls/gdi32/tests/bitmap.c | 5 +---- dlls/winex11.drv/dib.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 9a7213c..4c4abe0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1190,10 +1190,7 @@ static void test_GetDIBits_selected_DIB(UINT bpp) break; } } - if (bpp != 1) - ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp); - else - todo_wine ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp); + ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp); HeapFree(GetProcessHeap(), 0, bits2); DeleteDC(dc); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4b287ea..8988428 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4031,13 +4031,24 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, int bitmap_type; BOOL core_header; void* colorPtr; - - GetPaletteEntries( GetCurrentObject( physDev->hdc, OBJ_PAL ), 0, 256, palette ); + const PALETTEENTRY peBlack = {0,0,0,0}; + const PALETTEENTRY peWhite = {255,255,255,0}; if (!physBitmap) return 0; if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; bitmap_type = DIB_GetBitmapInfo( (BITMAPINFOHEADER*)info, &width, &tempHeight, &descr.infoBpp, &descr.compression); + + if (physDev->depth > 1) + { + GetPaletteEntries( GetCurrentObject( physDev->hdc, OBJ_PAL ), 0, 256, palette ); + } + else + { + palette[0] = peBlack; + palette[1] = peWhite; + } + if (bitmap_type == -1) { ERR("Invalid bitmap\n");

1 0

Michael Karcher : gdi32: Fix double->fixpoint conversion in freetype.c.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 3f64708818ffce26255fed1fb350acf0d4a45567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f64708818ffce26255fed1fb… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Mon Jun 30 00:23:07 2008 +0200 gdi32: Fix double->fixpoint conversion in freetype.c. --- dlls/gdi32/freetype.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 731b1c5..4fe468c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -803,15 +803,12 @@ static inline BOOL is_win9x(void) return GetVersion() & 0x80000000; } /* - This function builds an FT_Fixed from a float. It puts the integer part - in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed. - It fails if the integer part of the float number is greater than SHORT_MAX. + This function builds an FT_Fixed from a double. It fails if the absolute + value of the float number is greater than 32768. */ static inline FT_Fixed FT_FixedFromFloat(double f) { - short value = f; - unsigned short fract = (f - value) * 0xFFFF; - return (FT_Fixed)((long)value << 16 | (unsigned long)fract); + return f * 0x10000; } /*

1 0

Dylan Smith : richedit: Added missing DestroyWindow in a test.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 2a139746cc631f4ec291a89b4556af17266ce8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a139746cc631f4ec291a89b4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jun 28 03:00:46 2008 -0400 richedit: Added missing DestroyWindow in a test. --- dlls/riched20/tests/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 241c65b..50f8f02 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3862,6 +3862,7 @@ static void test_EM_StreamIn_Undo(void) "EM_STREAMIN with SFF_SELECTION and selection set " "should create an undo\n"); + DestroyWindow(hwndRichEdit); } static BOOL is_em_settextex_supported(HWND hwnd)

1 0

Francois Gouget : winex11: Load the XVidMode extension (libXxf86vm) when available.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: a49beb4c5c40a5eb8c194865a459e420e153a3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49beb4c5c40a5eb8c194865a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 26 14:02:17 2008 +0200 winex11: Load the XVidMode extension (libXxf86vm) when available. --- configure | 51 ++++++++++++--------- configure.ac | 10 +--- dlls/winex11.drv/x11drv_main.c | 4 +- dlls/winex11.drv/xvidmode.c | 97 ++++++++++++++++++++++++++++++++------- dlls/winex11.drv/xvidmode.h | 4 +- include/config.h.in | 6 +- 6 files changed, 118 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a49beb4c5c40a5eb8c194…

1 0

James Hawkins : wininet: Fix a failing test in win2k.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: ce823a8e47f8eba4ad9c958b647070a3a6b57e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce823a8e47f8eba4ad9c958b6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 01:00:51 2008 -0500 wininet: Fix a failing test in win2k. --- dlls/wininet/tests/internet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8eb7cc6..2c5f4e3 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -270,7 +270,8 @@ static void test_null(void) ok(hc == NULL, "connect failed\n"); hc = InternetOpenUrlW(hi, NULL, NULL, 0, 0, 0); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "wrong error\n"); ok(hc == NULL, "connect failed\n"); hc = InternetOpenUrlW(hi, szServer, NULL, 0, 0, 0);

1 0

James Hawkins : user32: Fix a few failing tests in win2k.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 13451c3b2a542556168002d5aa3c7bfcdc40a39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=13451c3b2a542556168002d5a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 00:53:30 2008 -0500 user32: Fix a few failing tests in win2k. --- dlls/user32/tests/dde.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index b9d8a87..f082314 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1979,15 +1979,23 @@ static void test_UnpackDDElParam(void) hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_ADVISE, (LPARAM)NULL, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); + ok(lo == 0 || + broken(lo == 0xdead), /* win2k */ + "Expected 0, got %08lx\n", lo); + ok(hi == 0 || + broken(hi == 0xbeef), /* win2k */ + "Expected 0, got %08lx\n", hi); lo = 0xdead; hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_ADVISE, 0xcafebabe, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); + ok(lo == 0 || + broken(lo == 0xdead), /* win2k */ + "Expected 0, got %08lx\n", lo); + ok(hi == 0 || + broken(hi == 0xbeef), /* win2k */ + "Expected 0, got %08lx\n", hi); hglobal = GlobalAlloc(GMEM_DDESHARE, 2); ptr = GlobalLock(hglobal); @@ -2013,8 +2021,12 @@ static void test_UnpackDDElParam(void) hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_ACK, 0xcafebabe, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); + ok(lo == 0 || + broken(lo == 0xdead), /* win2k */ + "Expected 0, got %08lx\n", lo); + ok(hi == 0 || + broken(hi == 0xbeef), /* win2k */ + "Expected 0, got %08lx\n", hi); lo = 0xdead; hi = 0xbeef; @@ -2027,8 +2039,12 @@ static void test_UnpackDDElParam(void) hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_DATA, 0xcafebabe, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); + ok(lo == 0 || + broken(lo == 0xdead), /* win2k */ + "Expected 0, got %08lx\n", lo); + ok(hi == 0 || + broken(hi == 0xbeef), /* win2k */ + "Expected 0, got %08lx\n", hi); lo = 0xdead; hi = 0xbeef; @@ -2048,8 +2064,12 @@ static void test_UnpackDDElParam(void) hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_POKE, 0xcafebabe, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); + ok(lo == 0 || + broken(lo == 0xdead), /* win2k */ + "Expected 0, got %08lx\n", lo); + ok(hi == 0 || + broken(hi == 0xbeef), /* win2k */ + "Expected 0, got %08lx\n", hi); lo = 0xdead; hi = 0xbeef;

1 0

James Hawkins : shell32: Fix a test that fails in win2k.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 824d631cf3520061c44c97965028d5f0ef402069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=824d631cf3520061c44c97965… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 00:48:38 2008 -0500 shell32: Fix a test that fails in win2k. --- dlls/shell32/tests/shfldr_special.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 9e64d30..ef2f0fd 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -43,6 +43,7 @@ static void test_parse_for_entire_network(void) LPITEMIDLIST pidl; DWORD attr = ~0; DWORD expected_attr; + DWORD alter_attr; hr = SHGetDesktopFolder(&psfDesktop); ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); @@ -52,8 +53,11 @@ static void test_parse_for_entire_network(void) todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_STORAGEANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK; + alter_attr = (expected_attr & (~SFGAO_STORAGEANCESTOR)) | SFGAO_STREAM; todo_wine - ok(attr == expected_attr, "attr should be 0x%x, not 0x%x\n", expected_attr, attr); + ok(attr == expected_attr || + attr == alter_attr, /* win2k */ + "attr should be 0x%x or 0x%x, not 0x%x\n", expected_attr, alter_attr, attr); ILFree(pidl); }

1 0

James Hawkins : setupapi: Fix a test that is failing in multiple platforms.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: c0e89107c55aac07298b2aa41ce906b0f9421549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e89107c55aac07298b2aa41… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 00:39:33 2008 -0500 setupapi: Fix a test that is failing in multiple platforms. --- dlls/setupapi/tests/query.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 87f1673..5283bf0 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -149,7 +149,11 @@ static void test_SetupGetInfInformation(void) SetLastError(0xbeefcafe); ret = SetupGetInfInformationA(NULL, INFINFO_INF_SPEC_IS_HINF, NULL, 0, &size); ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, + ok(GetLastError() == ERROR_INVALID_HANDLE || + broken(GetLastError() == ERROR_BAD_PATHNAME) || /* win95 */ + broken(GetLastError() == ERROR_FILE_NOT_FOUND) || /* win98 */ + broken(GetLastError() == ERROR_PATH_NOT_FOUND) || /* NT4 */ + broken(GetLastError() == ERROR_INVALID_NAME), /* win2k */ "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(size == 0xdeadbeef, "Expected size to remain unchanged\n");

1 0

Alexander Dorofeyev : quartz: Improve variant handling in FilterMapper_EnumMatchingFilters.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 9778faee0b62c09586d73e30f8640887e1c4d17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9778faee0b62c09586d73e30f… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:07:24 2008 +0300 quartz: Improve variant handling in FilterMapper_EnumMatchingFilters. Adds VariantClear and removes unnecessary variant type assignment that may cause heap corruption. --- dlls/quartz/filtermapper.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index c4b925c..ef603d8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1257,7 +1257,6 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( int len; VariantInit(&var); - V_VT(&var) = VT_BSTR; hrSub = IMoniker_BindToStorage(IMon, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat); @@ -1267,6 +1266,8 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( if (SUCCEEDED(hrSub)) hrSub = CLSIDFromString(V_UNION(&var, bstrVal), &clsid); + VariantClear(&var); + if (SUCCEEDED(hrSub)) hrSub = IPropertyBag_Read(pPropBagCat, wszFriendlyName, &var, NULL); @@ -1287,6 +1288,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( if (pPropBagCat) IPropertyBag_Release(pPropBagCat); IMoniker_Release(IMon); + VariantClear(&var); } /* In case of release all resources */

1 0