wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Michael Karcher : winex11: Fix GetDIBits of 1 bit DDBs.
by Alexandre Julliard 01 Jul '08

01 Jul '08

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 palette of 1bpp DIB in GetDIBits.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: fd8746b43ce24e209dd22c0bb1a4fe3ea38720a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8746b43ce24e209dd22c0bb… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jun 29 13:30:01 2008 +0200 gdi32: Fix palette of 1bpp DIB in GetDIBits. Windows always generates a black/white palette for 1 bit DIBs generated from DDBs. Copying from the current palette only takes place for color DDBs (not explicitly mentioned in MSDN), and only if depth equal (MSDN states it, explicitly). --- dlls/gdi32/dib.c | 6 ++++-- dlls/gdi32/tests/bitmap.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 46be0f0..677cda5 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -705,8 +705,10 @@ INT WINAPI GetDIBits( for (i = 0; i < (1 << bpp); i++) ((WORD *)colorPtr)[i] = (WORD)i; } - else if(bpp >= bmp->bitmap.bmBitsPixel) { - /* Generate the color map from the selected palette */ + else if(bpp > 1 && bpp == bmp->bitmap.bmBitsPixel) { + /* For color DDBs in native depth (mono DDBs always have + a black/white palette): + Generate the color map from the selected palette */ PALETTEENTRY palEntry[256]; memset( palEntry, 0, sizeof(palEntry) ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 79f6003..9a7213c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1499,7 +1499,6 @@ static void test_GetDIBits(void) "expected bmiColors[0] 0,0,0,0 - got %x %x %x %x\n", bi->bmiColors[0].rgbRed, bi->bmiColors[0].rgbGreen, bi->bmiColors[0].rgbBlue, bi->bmiColors[0].rgbReserved); -todo_wine ok(bi->bmiColors[1].rgbRed == 0xff && bi->bmiColors[1].rgbGreen == 0xff && bi->bmiColors[1].rgbBlue == 0xff && bi->bmiColors[1].rgbReserved == 0, "expected bmiColors[0] 0xff,0xff,0xff,0 - got %x %x %x %x\n",

1 0

Michael Karcher : gdi32: Fix double->fixpoint conversion in freetype.c.
by Alexandre Julliard 01 Jul '08

01 Jul '08

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 01 Jul '08

01 Jul '08

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 01 Jul '08

01 Jul '08

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 01 Jul '08

01 Jul '08

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 01 Jul '08

01 Jul '08

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 01 Jul '08

01 Jul '08

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 01 Jul '08

01 Jul '08

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

James Hawkins : mshtml: Fix a test failure in win2k.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: d5158cc35de5d7d27f45818ce7b98ed07d5ba7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5158cc35de5d7d27f45818ce… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 00:01:06 2008 -0500 mshtml: Fix a test failure in win2k. --- dlls/mshtml/tests/protocol.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 9c09037..4e8b3d0 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -724,8 +724,9 @@ static void test_about_protocol(void) hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, QUERY_CAN_NAVIGATE, 0, buf, sizeof(buf), &size, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, - "QueryInfo returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER || + hres == E_FAIL, /* win2k */ + "QueryInfo returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER or E_FAIL\n", hres); size = 0xdeadbeef; memset(buf, '?', sizeof(buf));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2008