December 2007 - Wine-Commits

James Hawkins : msi: Free the user sid string.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: e62b8c9b99313d5cdd44824230ba1107e14d7506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62b8c9b99313d5cdd4482423… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 11 21:45:51 2007 -0600 msi: Free the user sid string. --- dlls/msi/registry.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index beaecae..834eda0 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -760,6 +760,7 @@ UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent) sprintfW(keypath, szUserDataComp_fmt, usersid, comp); + msi_free(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); }

1 0

James Hawkins : msi: Properly release the record.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 80894d1c522d715fe1e874643361ea568af99b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=80894d1c522d715fe1e874643… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 11 21:46:32 2007 -0600 msi: Properly release the record. --- dlls/msi/package.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 04633f2..1286641 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -123,15 +123,16 @@ UINT msi_clone_properties(MSIPACKAGE *package) break; rc = MSI_DatabaseOpenViewW(package->db, Insert, &view2); - if (rc!= ERROR_SUCCESS) + if (rc != ERROR_SUCCESS) + { + msiobj_release(&row->hdr); continue; + } - rc = MSI_ViewExecute(view2, row); + MSI_ViewExecute(view2, row); MSI_ViewClose(view2); msiobj_release(&view2->hdr); - - if (rc == ERROR_SUCCESS) - msiobj_release(&row->hdr); + msiobj_release(&row->hdr); } MSI_ViewClose(view);

1 0

James Hawkins : msi: Free the deformatted string.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: f919a24eb27093c1ed85ebc5d375198967cef3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f919a24eb27093c1ed85ebc5d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 11 21:45:08 2007 -0600 msi: Free the deformatted string. --- dlls/msi/custom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 269aa3a..cf1e60b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -317,6 +317,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL case 23: /* installs another package in the source tree */ deformat_string(package,target,&deformated); rc = HANDLE_CustomType23(package,source,deformated,type,action); + msi_free(deformated); break; case 50: /*EXE file specified by a property value */ rc = HANDLE_CustomType50(package,source,target,type,action);

1 0

James Hawkins : msi: Free the cabinet string on error.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: d51ed8bd937fd70ac15de6f68e1576ed38bac450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51ed8bd937fd70ac15de6f68… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 11 21:47:08 2007 -0600 msi: Free the cabinet string on error. --- dlls/msi/files.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8d5321c..442c73a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -327,6 +327,7 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) rc = msi_media_get_disk_info(data->package, mi); if (rc != ERROR_SUCCESS) { + msi_free(cab); ERR("Failed to get next cabinet information: %d\n", rc); return -1; }

1 0

Alexandru Balut : wine.inf: Fix the type of some values in HKLM, System\CurrentControlSet\Control\Session Manager\Environment.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 586970365736da41cfac8d9cfc85b38962c91202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=586970365736da41cfac8d9cf… Author: Alexandru Balut <alexandru.balut(a)gmail.com> Date: Wed Dec 12 02:42:15 2007 +0100 wine.inf: Fix the type of some values in HKLM, System\CurrentControlSet\Control\Session Manager\Environment. --- tools/wine.inf | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 92946f7..ed9bc97 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -254,16 +254,16 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc [Environment] HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"APPDATA",,"%16410%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\cmd.exe" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"LOCALAPPDATA",,"%16412%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",2,"%11%;%10%" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020000,"%11%;%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TEMP",,"%10%\temp" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TMP",,"%10%\temp" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TEMP",0x00020000,"%10%\temp" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TMP",0x00020000,"%10%\temp" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"USERPROFILE",,"%53%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"windir",,"%10%" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"windir",0x00020000,"%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"winsysdir",,"%11%" [Fonts] @@ -2648,6 +2648,12 @@ HKLM,"%Services%\Spooler","ImagePath",,"spoolsv.exe" HKLM,"%Services%\Spooler","ObjectName",,"LocalSystem" HKLM,"%Services%\Spooler","Start",0x10001,2 HKLM,"%Services%\Spooler","Type",0x10001,0x110 +HKLM,"%Services%\MountMgr","Description",,"Device mounting service." +HKLM,"%Services%\MountMgr","DisplayName",,"Mount Manager" +HKLM,"%Services%\MountMgr","ErrorControl",0x10001,1 +HKLM,"%Services%\MountMgr","ImagePath",,"mountmgr.sys" +HKLM,"%Services%\MountMgr","Start",0x10001,2 +HKLM,"%Services%\MountMgr","Type",0x10001,1 HKLM,"%Services%\VxD\MSTCP",,,"" [VersionInfo]

1 0

Stefan Dösinger : gdi32: Test bitmap depths.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: d5d8a5be48ce40e8f91a6d1b1d2ea2f5c0d1e0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d8a5be48ce40e8f91a6d1b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 7 16:42:32 2007 +0100 gdi32: Test bitmap depths. --- dlls/gdi32/bitmap.c | 13 ++++++++++ dlls/gdi32/tests/bitmap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/bitmap.c | 1 - 3 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index e882442..3355541 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -263,6 +263,19 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return NULL; } + /* Windows only uses 1, 4, 8, 16, 24 and 32 bpp */ + if(bm.bmBitsPixel == 1) bm.bmBitsPixel = 1; + else if(bm.bmBitsPixel <= 4) bm.bmBitsPixel = 4; + else if(bm.bmBitsPixel <= 8) bm.bmBitsPixel = 8; + else if(bm.bmBitsPixel <= 16) bm.bmBitsPixel = 16; + else if(bm.bmBitsPixel <= 24) bm.bmBitsPixel = 24; + else if(bm.bmBitsPixel <= 32) bm.bmBitsPixel = 32; + else { + WARN("Invalid bmBitsPixel %d, returning ERROR_INVALID_PARAMETER\n", bm.bmBitsPixel); + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + /* Windows ignores the provided bm.bmWidthBytes */ bm.bmWidthBytes = BITMAP_GetWidthBytes( bm.bmWidth, bm.bmBitsPixel ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 49dbb4e..7183e31 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1557,6 +1557,8 @@ static void test_select_object(void) HBITMAP hbm, hbm_old; INT planes, bpp, i; DWORD depths[] = {8, 15, 16, 24, 32}; + BITMAP bm; + DWORD bytes; hdc = GetDC(0); ok(hdc != 0, "GetDC(0) failed\n"); @@ -1617,6 +1619,21 @@ static void test_select_object(void) } } + memset(&bm, 0xAA, sizeof(bm)); + bytes = GetObject(hbm, sizeof(bm), &bm); + ok(bytes == sizeof(bm), "GetObject returned %d\n", bytes); + ok(bm.bmType == 0, "wrong bmType %d\n", bm.bmType); + ok(bm.bmWidth == 10, "wrong bmWidth %d\n", bm.bmWidth); + ok(bm.bmHeight == 10, "wrong bmHeight %d\n", bm.bmHeight); + ok(bm.bmWidthBytes == BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel), "wrong bmWidthBytes %d\n", bm.bmWidthBytes); + ok(bm.bmPlanes == planes, "wrong bmPlanes %u\n", bm.bmPlanes); + if(depths[i] == 15) { + ok(bm.bmBitsPixel == 16, "wrong bmBitsPixel %d(15 bpp special)\n", bm.bmBitsPixel); + } else { + ok(bm.bmBitsPixel == depths[i], "wrong bmBitsPixel %d\n", bm.bmBitsPixel); + } + ok(!bm.bmBits, "wrong bmBits %p\n", bm.bmBits); + DeleteObject(hbm); } @@ -1658,6 +1675,7 @@ static void test_CreateBitmap(void) BITMAP bmp; HDC screenDC = GetDC(0); HDC hdc = CreateCompatibleDC(screenDC); + UINT i, expect; /* all of these are the stock monochrome bitmap */ HBITMAP bm = CreateCompatibleBitmap(hdc, 0, 0); @@ -1716,6 +1734,42 @@ static void test_CreateBitmap(void) ok(bm != 0, "CreateBitmapIndirect error %u\n", GetLastError()); test_mono_1x1_bmp(bm); DeleteObject(bm); + + /* Test how the bmBitsPixel field is treated */ + for(i = 1; i <= 33; i++) { + bmp.bmType = 0; + bmp.bmWidth = 1; + bmp.bmHeight = 1; + bmp.bmWidthBytes = 28; + bmp.bmPlanes = 1; + bmp.bmBitsPixel = i; + bmp.bmBits = NULL; + bm = CreateBitmapIndirect(&bmp); + if(i > 32) { + DWORD error = GetLastError(); + ok(bm == 0, "CreateBitmapIndirect for %d bpp succeeded\n", i); + ok(error == ERROR_INVALID_PARAMETER, "Got error %d, expected ERROR_INVALID_PARAMETER\n", error); + continue; + } + ok(bm != 0, "CreateBitmapIndirect error %u\n", GetLastError()); + GetObject(bm, sizeof(bmp), &bmp); + if(i == 1) { + expect = 1; + } else if(i <= 4) { + expect = 4; + } else if(i <= 8) { + expect = 8; + } else if(i <= 16) { + expect = 16; + } else if(i <= 24) { + expect = 24; + } else if(i <= 32) { + expect = 32; + } + ok(bmp.bmBitsPixel == expect, "CreateBitmapIndirect for a %d bpp bitmap created a %d bpp bitmap, expected %d\n", + i, bmp.bmBitsPixel, expect); + DeleteObject(bm); + } } static void test_bitmapinfoheadersize(void) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index e1a26d4..98514d3 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -126,7 +126,6 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit (bitmap.bmBitsPixel == screen_depth) || (bitmap.bmBitsPixel == 24 && screen_depth == 32) || /* FIXME: Not compatible */ (bitmap.bmBitsPixel == 32 && screen_depth == 24) || /* FIXME: Not compatible */ - (bitmap.bmBitsPixel == 15 && screen_depth == 16) || /* Confirmed by tests */ (bitmap.bmBitsPixel == 16 && screen_depth == 15))) /* TODO: Confirm this */ { ERR("Trying to make bitmap with planes=%d, bpp=%d\n",

1 0

Jacek Caban : shdocvw: Return S_OK in IOleObject::SetHostNames.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: be11c75729d1327428e3116e6f31b57b117e2169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be11c75729d1327428e3116e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 02:01:11 2007 +0100 shdocvw: Return S_OK in IOleObject::SetHostNames. --- dlls/shdocvw/oleobject.c | 7 +++++-- dlls/shdocvw/tests/webbrowser.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 81ade7b..7ff1b22 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -355,8 +355,11 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont LPCOLESTR szContainerObj) { WebBrowser *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%s, %s)\n", This, debugstr_w(szContainerApp), debugstr_w(szContainerObj)); - return E_NOTIMPL; + + TRACE("(%p)->(%s, %s)\n", This, debugstr_w(szContainerApp), debugstr_w(szContainerObj)); + + /* We have nothing to do here. */ + return S_OK; } static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 9908df8..4205a03 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1019,6 +1019,16 @@ static void test_GetMiscStatus(IOleObject *oleobj) } } +static void test_SetHostNames(IOleObject *oleobj) +{ + HRESULT hres; + + static const WCHAR test_appW[] = {'t','e','s','t',' ','a','p','p',0}; + + hres = IOleObject_SetHostNames(oleobj, test_appW, (void*)0xdeadbeef); + ok(hres == S_OK, "SetHostNames failed: %08x\n", hres); +} + static void test_ClientSite(IUnknown *unk, IOleClientSite *client) { IOleObject *oleobj; @@ -1032,6 +1042,7 @@ static void test_ClientSite(IUnknown *unk, IOleClientSite *client) return; test_GetMiscStatus(oleobj); + test_SetHostNames(oleobj); hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); ok(hres == S_OK, "QueryInterface(IID_OleInPlaceObject) failed: %08x\n", hres); @@ -1071,6 +1082,8 @@ static void test_ClientSite(IUnknown *unk, IOleClientSite *client) shell_embedding_hwnd = hwnd; + test_SetHostNames(oleobj); + IOleInPlaceObject_Release(inplace); IOleObject_Release(oleobj); }

1 0

Alex Villacís Lasso : riched32: Fix regression in WM_GETTEXTLENGTH on richedit 1.0 emulation.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: ae7b2c914b813ad818c6a90b65dc6ce81cda3832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7b2c914b813ad818c6a90b6… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Dec 11 16:02:54 2007 -0500 riched32: Fix regression in WM_GETTEXTLENGTH on richedit 1.0 emulation. --- dlls/riched20/editor.c | 2 +- dlls/riched32/tests/editor.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 10aaaa9..394ffe5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1999,7 +1999,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { GETTEXTLENGTHEX how; - how.flags = GTL_CLOSE | GTL_USECRLF | GTL_NUMCHARS; + how.flags = GTL_CLOSE | (editor->bEmulateVersion10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; how.codepage = unicode ? 1200 : CP_ACP; return ME_GetTextLengthEx(editor, &how); } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 77c86e7..4b86e23 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -108,6 +108,29 @@ static void test_WM_SETTEXT() DestroyWindow(hwndRichEdit); } +static void test_WM_GETTEXTLENGTH(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + static const char text3[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; + static const char text4[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + int result; + + /* Test for WM_GETTEXTLENGTH */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text3); + result = SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == strlen(text3), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, strlen(text3)); + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text4); + result = SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == strlen(text4), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, strlen(text4)); + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -119,6 +142,7 @@ START_TEST( editor ) ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); test_WM_SETTEXT(); + test_WM_GETTEXTLENGTH(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Kirill K. Smirnov : winhelp: Change font charset from ANSI to DEFAULT.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 16cc13341fac382dc017522ccb498a356040d977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16cc13341fac382dc017522cc… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Tue Dec 11 23:57:36 2007 +0300 winhelp: Change font charset from ANSI to DEFAULT. --- programs/winhelp/hlpfile.c | 2 +- programs/winhelp/winhelp.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index cd14193..2aafaf6 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1270,7 +1270,7 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile) hlpfile->fonts[i].LogFont.lfItalic = (flag & 2) ? TRUE : FALSE; hlpfile->fonts[i].LogFont.lfUnderline = (flag & 4) ? TRUE : FALSE; hlpfile->fonts[i].LogFont.lfStrikeOut = (flag & 8) ? TRUE : FALSE; - hlpfile->fonts[i].LogFont.lfCharSet = ANSI_CHARSET; + hlpfile->fonts[i].LogFont.lfCharSet = DEFAULT_CHARSET; hlpfile->fonts[i].LogFont.lfOutPrecision = OUT_DEFAULT_PRECIS; hlpfile->fonts[i].LogFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; hlpfile->fonts[i].LogFont.lfQuality = DEFAULT_QUALITY; diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index fa0014a..83c6517 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1841,13 +1841,13 @@ static void WINHELP_InitFonts(HWND hWnd) { WINHELP_WINDOW *win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); LOGFONT logfontlist[] = { - {-10, 0, 0, 0, 400, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"}, - {-12, 0, 0, 0, 700, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"}, - {-12, 0, 0, 0, 700, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"}, - {-12, 0, 0, 0, 400, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"}, - {-12, 0, 0, 0, 700, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"}, - {-10, 0, 0, 0, 700, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"}, - { -8, 0, 0, 0, 400, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"}}; + {-10, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}, + {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}, + {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}, + {-12, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}, + {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}, + {-10, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}, + { -8, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}}; #define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist)) static HFONT fonts[FONTS_LEN];

1 0

Stefan Dösinger : gdi32, winex11drv: Add a test for compatible bitmap depths.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: aa390e840b025c41524439093fb268f259b1190c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa390e840b025c41524439093… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 7 16:12:26 2007 +0100 gdi32, winex11drv: Add a test for compatible bitmap depths. --- dlls/gdi32/tests/bitmap.c | 36 +++++++++++++++++++++++++----------- dlls/winex11.drv/bitmap.c | 8 ++++---- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 6f87e29..49dbb4e 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1555,7 +1555,8 @@ static void test_select_object(void) { HDC hdc; HBITMAP hbm, hbm_old; - INT planes, bpp; + INT planes, bpp, i; + DWORD depths[] = {8, 15, 16, 24, 32}; hdc = GetDC(0); ok(hdc != 0, "GetDC(0) failed\n"); @@ -1594,17 +1595,30 @@ static void test_select_object(void) DeleteObject(hbm); - /* test a color bitmap that doesn't match the dc's bpp */ - planes = GetDeviceCaps(hdc, PLANES); - bpp = GetDeviceCaps(hdc, BITSPIXEL) == 24 ? 8 : 24; - - hbm = CreateBitmap(10, 10, planes, bpp, NULL); - ok(hbm != 0, "CreateBitmap failed\n"); - - hbm_old = SelectObject(hdc, hbm); - ok(hbm_old == 0, "SelectObject should fail\n"); + for(i = 0; i < sizeof(depths)/sizeof(depths[0]); i++) { + /* test a color bitmap to dc bpp matching */ + planes = GetDeviceCaps(hdc, PLANES); + bpp = GetDeviceCaps(hdc, BITSPIXEL); + + hbm = CreateBitmap(10, 10, planes, depths[i], NULL); + ok(hbm != 0, "CreateBitmap failed\n"); + + hbm_old = SelectObject(hdc, hbm); + if(depths[i] == bpp || + (bpp == 16 && depths[i] == 15) /* 16 and 15 bpp are compatible */ + ) { + ok(hbm_old != 0, "SelectObject failed, BITSPIXEL: %d, created depth: %d\n", bpp, depths[i]); + SelectObject(hdc, hbm_old); + } else { + if(bpp == 24 && depths[i] == 32) { + todo_wine ok(hbm_old == 0, "SelectObject should fail. BITSPIXELS: %d, created depth: %d\n", bpp, depths[i]); + } else { + ok(hbm_old == 0, "SelectObject should fail. BITSPIXELS: %d, created depth: %d\n", bpp, depths[i]); + } + } - DeleteObject(hbm); + DeleteObject(hbm); + } DeleteDC(hdc); } diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 6d4180b..e1a26d4 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -124,10 +124,10 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit /* check if bpp is compatible with screen depth */ if (!((bitmap.bmBitsPixel == 1) || (bitmap.bmBitsPixel == screen_depth) || - (bitmap.bmBitsPixel == 24 && screen_depth == 32) || - (bitmap.bmBitsPixel == 32 && screen_depth == 24) || - (bitmap.bmBitsPixel == 15 && screen_depth == 16) || - (bitmap.bmBitsPixel == 16 && screen_depth == 15))) + (bitmap.bmBitsPixel == 24 && screen_depth == 32) || /* FIXME: Not compatible */ + (bitmap.bmBitsPixel == 32 && screen_depth == 24) || /* FIXME: Not compatible */ + (bitmap.bmBitsPixel == 15 && screen_depth == 16) || /* Confirmed by tests */ + (bitmap.bmBitsPixel == 16 && screen_depth == 15))) /* TODO: Confirm this */ { ERR("Trying to make bitmap with planes=%d, bpp=%d\n", bitmap.bmPlanes, bitmap.bmBitsPixel);

1 0