wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

André Hentschel : winedev: We have a stable release.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: da71254ced4b0162533d75fbcaa28ee36addde7b URL: http://source.winehq.org/git/docs.git/?a=commit;h=da71254ced4b0162533d75fbc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:26 2010 +0200 winedev: We have a stable release. --- en/winedev-architecture.sgml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 92290f5..e7c0caf 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -5,13 +5,6 @@ <sect1 id="basic-overview"> <title>Wine Overview</title> - <para> - With the fundamental architecture of Wine stabilizing, and - people starting to think that we might soon be ready to - actually release this thing, it may be time to take a look at - how Wine actually works and operates. - </para> - <sect2> <title>Foreword</title> <para>

1 0

André Hentschel : winedev: Start the list smarter.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: c03ad604a455217fac2c2efa1e3e7b83962dd153 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c03ad604a455217fac2c2efa1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:20 2010 +0200 winedev: Start the list smarter. --- en/winedev-architecture.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index d946f7d..92290f5 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -547,7 +547,7 @@ </para> <para> Once an application module wants to import a DLL, Wine - will look at: + will look: <itemizedlist> <listitem> <para>

1 0

André Hentschel : winedev: Fix a typo.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: 08fcaf1c4eb71c403d5203e7d2d044b924c4e114 URL: http://source.winehq.org/git/docs.git/?a=commit;h=08fcaf1c4eb71c403d5203e7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:10 2010 +0200 winedev: Fix a typo. --- en/winedev-architecture.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 09c4f96..d946f7d 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -207,7 +207,7 @@ <para> <command>winevdm</command> is the Wine process dedicated to running the Win16 processes. Note that several instances of this process could - exist, has Windows has support for different VDM (Virtual Dos + exist, as Windows has support for different VDM (Virtual Dos Machines) in order to have Win16 processes running in different address spaces. Wine also uses the same architecture to run DOS programs (in this case, the DOS emulation is provided by a Wine only

1 0

Andrey Turkin : oleaut32: Implement ICreateTypeInfo2::SetCustData method.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 658209b57164da96919500468114a6a7eb0bf7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=658209b57164da96919500468… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun May 9 23:33:24 2010 +0400 oleaut32: Implement ICreateTypeInfo2::SetCustData method. --- dlls/oleaut32/tests/typelib.c | 77 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 12 +++++-- 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index cf8c8cb..f0f577a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -975,6 +975,7 @@ static void test_CreateTypeLib(void) { static OLECHAR typelibW[] = {'t','y','p','e','l','i','b',0}; static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; static OLECHAR interface2W[] = {'i','n','t','e','r','f','a','c','e','2',0}; + static OLECHAR interface3W[] = {'i','n','t','e','r','f','a','c','e','3',0}; static OLECHAR dualW[] = {'d','u','a','l',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; @@ -984,13 +985,16 @@ static void test_CreateTypeLib(void) { static OLECHAR param2W[] = {'p','a','r','a','m','2',0}; static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; + static const GUID custguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x70}}; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *createtl; ICreateTypeInfo *createti; + ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; + ITypeInfo2 *ti2; FUNCDESC funcdesc; ELEMDESC elemdesc[5]; PARAMDESCEX paramdescex; @@ -1001,6 +1005,7 @@ static void test_CreateTypeLib(void) { BSTR name, docstring, helpfile; DWORD helpcontext; int impltypeflags; + VARIANT cust_data; HRESULT hres; trace("CreateTypeLib tests\n"); @@ -1281,6 +1286,78 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo_Release(createti); + VariantInit(&cust_data); + + hres = ICreateTypeLib_CreateTypeInfo(createtl, interface3W, TKIND_INTERFACE, &createti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void**)&createti2); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo2_QueryInterface(createti2, &IID_ITypeInfo2, (void**)&ti2); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo2_GetCustData(ti2, NULL, NULL); + todo_wine + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ITypeInfo2_GetCustData(ti2, &custguid, NULL); + todo_wine + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); + todo_wine + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo2_SetCustData(createti2, NULL, NULL); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, NULL); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, &cust_data); + ok(hres == DISP_E_BADVARTYPE, "got %08x\n", hres); + + V_VT(&cust_data) = VT_UI4; + V_I4(&cust_data) = 0xdeadbeef; + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + V_I4(&cust_data) = 0; + V_VT(&cust_data) = VT_EMPTY; + + hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); + todo_wine + ok(hres == S_OK, "got %08x\n", hres); + + todo_wine + ok(V_VT(&cust_data) == VT_UI4, "got %d\n", V_VT(&cust_data)); + todo_wine + ok(V_I4(&cust_data) == 0xdeadbeef, "got 0x%08x\n", V_I4(&cust_data)); + + V_VT(&cust_data) = VT_UI4; + V_I4(&cust_data) = 12345678; + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + V_I4(&cust_data) = 0; + V_VT(&cust_data) = VT_EMPTY; + + hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); + todo_wine + ok(hres == S_OK, "got %08x\n", hres); + + todo_wine + ok(V_VT(&cust_data) == VT_UI4, "got %d\n", V_VT(&cust_data)); + todo_wine + ok(V_I4(&cust_data) == 12345678, "got 0x%08x\n", V_I4(&cust_data)); + + ITypeInfo2_Release(ti2); + ICreateTypeInfo2_Release(createti2); + ICreateTypeInfo_Release(createti); + hres = ICreateTypeLib_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index f798979..22a3a23 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -890,7 +890,7 @@ static HRESULT ctl2_set_custdata( if (guidoffset == -1) return E_OUTOFMEMORY; dataoffset = ctl2_alloc_custdata(This, pVarVal); if (dataoffset == -1) return E_OUTOFMEMORY; - if (dataoffset == -2) return E_INVALIDARG; + if (dataoffset == -2) return DISP_E_BADVARTYPE; custoffset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATAGUID, 12, 0); if (custoffset == -1) return E_OUTOFMEMORY; @@ -2709,8 +2709,14 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData( REFGUID guid, /* [I] The GUID used as a key to retrieve the custom data. */ VARIANT* pVarVal) /* [I] The custom data. */ { - FIXME("(%p,%s,%p), stub!\n", iface, debugstr_guid(guid), pVarVal); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + + TRACE("(%p,%s,%p)!\n", iface, debugstr_guid(guid), pVarVal); + + if (!pVarVal) + return E_INVALIDARG; + + return ctl2_set_custdata(This->typelib, guid, pVarVal, &This->typeinfo->oCustData); } /******************************************************************************

1 0

Andrey Turkin : oleaut32: Add handling of some more VARIANT types in typelibs.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: cb9a6af538d31b3de90c8dfbf851abcb06cb28db URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9a6af538d31b3de90c8dfbf… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun May 9 23:31:31 2010 +0400 oleaut32: Add handling of some more VARIANT types in typelibs. --- dlls/oleaut32/typelib2.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a93e5a4..f798979 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -814,11 +814,41 @@ static int ctl2_alloc_custdata( switch (V_VT(pVarVal)) { case VT_UI4: + case VT_I4: + case VT_R4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: offset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATA, 8, 0); if (offset == -1) return offset; - *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = VT_UI4; - *((unsigned int *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); + *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = V_VT(pVarVal); + *((DWORD *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); + break; + + case VT_BSTR: { + /* Construct the data */ + UINT cp = CP_ACP; + int stringlen = SysStringLen(V_BSTR(pVarVal)); + int len = 0; + if (stringlen > 0) { + GetLocaleInfoA(This->typelib_header.lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (LPSTR)&cp, sizeof(cp)); + len = WideCharToMultiByte(cp, 0, V_BSTR(pVarVal), SysStringLen(V_BSTR(pVarVal)), NULL, 0, NULL, NULL); + if (!len) + return -1; + } + + offset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATA, (6 + len + 3) & ~0x3, 0); + if (offset == -1) return offset; + + *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = V_VT(pVarVal); + *((DWORD *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = (DWORD)len; + if (stringlen > 0) { + WideCharToMultiByte(cp, 0, V_BSTR(pVarVal), SysStringLen(V_BSTR(pVarVal)), + &This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6], len, NULL, NULL); + } + } break; default:

1 0

Gerald Pfeifer : shlwapi: Remove variable retval which is not really used from GetAcceptLanguagesW.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: be6fa3900dc490c28f9328ce60432b23012fae69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6fa3900dc490c28f9328ce6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 18:18:48 2010 +0200 shlwapi: Remove variable retval which is not really used from GetAcceptLanguagesW. --- dlls/shlwapi/ordinal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 332bdb6..22851d9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -484,7 +484,6 @@ HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen) DWORD mystrlen, mytype; DWORD len; HKEY mykey; - HRESULT retval; LCID mylcid; WCHAR *mystr; LONG lres; @@ -512,7 +511,7 @@ HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen) /* Did not find a value in the registry or the user buffer is too small */ mylcid = GetUserDefaultLCID(); - retval = LcidToRfc1766W(mylcid, mystr, mystrlen); + LcidToRfc1766W(mylcid, mystr, mystrlen); len = lstrlenW(mystr); memcpy( langbuf, mystr, min(*buflen, len+1)*sizeof(WCHAR) );

1 0

Gerald Pfeifer : winmm/tests: Remove two unused variables (and dead code) from check_position.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: eab579dfcba032c7ae11d36c29a3d98e308458ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab579dfcba032c7ae11d36c2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 14:12:05 2010 +0200 winmm/tests: Remove two unused variables (and dead code) from check_position. --- dlls/winmm/tests/wave.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 03f4af4..77a4cc1 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -482,14 +482,9 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, LPWAVEFORMATEX pwfx ) { MMTIME mmtime; - DWORD samples; - double duration; MMRESULT rc; DWORD returned; - samples=bytes/(pwfx->wBitsPerSample/8*pwfx->nChannels); - duration=((double)samples)/pwfx->nSamplesPerSec; - mmtime.wType = TIME_BYTES; rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR,

1 0

Gerald Pfeifer : user32/tests: Remove variable atom which is not really used from test_Expose.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 173a813e6a80d32249633b297d02f54826e0f56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=173a813e6a80d32249633b297… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 14:09:05 2010 +0200 user32/tests: Remove variable atom which is not really used from test_Expose. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eab16e7..8f0f42d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5187,14 +5187,14 @@ static LRESULT CALLBACK TestExposedRegion_WndProc(HWND hwnd, UINT msg, WPARAM wP static void test_Expose(void) { - ATOM atom; WNDCLASSA cls; HWND mw; + memset(&cls, 0, sizeof(WNDCLASSA)); cls.lpfnWndProc = TestExposedRegion_WndProc; cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszClassName = "TestExposeClass"; - atom = RegisterClassA(&cls); + RegisterClassA(&cls); mw = CreateWindowA("TestExposeClass", "MainWindow", WS_VISIBLE|WS_OVERLAPPEDWINDOW, 0, 0, 200, 100, NULL, NULL, 0, NULL);

1 0

Huw Davies : oleaut32: Set the font to dirty when loading a new data.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 9d6a10a43aa10e21c53123935d6bd12c654546a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6a10a43aa10e21c53123935… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 10 15:01:03 2010 +0100 oleaut32: Set the font to dirty when loading a new data. --- dlls/oleaut32/olefont.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index df7de87..3c8c91f 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1836,9 +1836,10 @@ static HRESULT WINAPI OLEFontImpl_Load( MultiByteToWideChar( CP_ACP, 0, readBuffer, bStringSize, this->description.lpstrName, len ); this->description.lpstrName[len] = 0; - /* Ensure use of this font causes a new one to be created @@@@ */ + /* Ensure use of this font causes a new one to be created */ dec_int_ref(this->gdiFont); this->gdiFont = 0; + this->dirty = TRUE; return S_OK; }

1 0

Wolfram Sang : user32: Honor bfOffBits in BITMAP_Load.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: f76a3b965c5c5440e2302b86e6b705d590cd23d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76a3b965c5c5440e2302b86e… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Mon May 10 03:36:27 2010 +0200 user32: Honor bfOffBits in BITMAP_Load. --- dlls/user32/cursoricon.c | 5 ++- dlls/user32/tests/cursoricon.c | 61 ++++++++++++++++++++++++++++----------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9d7788d..96827c2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2394,7 +2394,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, char *bits; LONG width, height, new_width, new_height; WORD bpp_dummy; - DWORD compr_dummy; + DWORD compr_dummy, offbits = 0; INT bm_type; HDC screen_mem_dc = NULL; @@ -2424,6 +2424,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, UnmapViewOfFile( ptr ); return 0; } + offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } size = bitmap_info_size(info, DIB_RGB_COLORS); @@ -2466,7 +2467,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (!(screen_mem_dc = CreateCompatibleDC( screen_dc ))) goto end; - bits = (char *)info + size; + bits = (char *)info + (offbits ? offbits : size); if (loadflags & LR_CREATEDIBSECTION) { diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 21e0dca..e68eaac 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -225,6 +225,14 @@ static void test_child_process(void) SendMessage(child, WM_USER+1, 0, (LPARAM) cursor); } +static BOOL color_match(COLORREF a, COLORREF b) +{ + /* 5-bit accuracy is a sufficient test. This will match as long as + * colors are never truncated to less that 3x5-bit accuracy i.e. + * palettized. */ + return (a & 0x00F8F8F8) == (b & 0x00F8F8F8); +} + static void test_CopyImage_Check(HBITMAP bitmap, UINT flags, INT copyWidth, INT copyHeight, INT expectedWidth, INT expectedHeight, WORD expectedDepth, BOOL dibExpected) { @@ -698,13 +706,14 @@ static const unsigned char pngimage[285] = { 0xe7,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 }; -/* 1x1 pixel bmp */ -static const unsigned char bmpimage[66] = { -0x42,0x4d,0x42,0x00,0x00,0x00,0xDE,0xAD,0xBE,0xEF,0x3e,0x00,0x00,0x00,0x28,0x00, +/* 1x1 pixel bmp with gap between palette and bitmap. Correct bitmap contains only + zeroes, gap is 0xFF. */ +static const unsigned char bmpimage[70] = { +0x42,0x4d,0x46,0x00,0x00,0x00,0xDE,0xAD,0xBE,0xEF,0x42,0x00,0x00,0x00,0x28,0x00, 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, -0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, -0x00,0x00 +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0x55,0x55,0x55,0x00,0xFF,0xFF, +0xFF,0xFF,0x00,0x00,0x00,0x00 }; /* 2x2 pixel gif */ @@ -714,6 +723,29 @@ static const unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +static void test_LoadImageBitmap(HBITMAP hbm) +{ + BITMAP bm; + BITMAPINFO bmi; + DWORD ret, pixel = 0; + HDC hdc = GetDC(NULL); + + ret = GetObject(hbm, sizeof(bm), &bm); + ok(ret == sizeof(bm), "GetObject returned %d\n", ret); + + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount= 24; + bmi.bmiHeader.biCompression= BI_RGB; + ret = GetDIBits(hdc, hbm, 0, bm.bmHeight, &pixel, &bmi, DIB_RGB_COLORS); + ok(ret == bm.bmHeight, "%d lines were converted, not %d\n", ret, bm.bmHeight); + + ok(color_match(pixel, 0x00ffffff), "Pixel is 0x%08x\n", pixel); +} + static void test_LoadImageFile(const unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { @@ -758,15 +790,18 @@ static void test_LoadImageFile(const unsigned char * image_data, /* Load as bitmap. Should succeed if bmp, fail for everything else */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); - if (expect_success) - ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); - else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); error = GetLastError(); ok(error == 0 || error == 0xdeadbeef, /* Win9x, WinMe */ "Last error: %u\n", error); - if (handle != NULL) DeleteObject(handle); + if (expect_success) { + ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); + if (handle != NULL) test_LoadImageBitmap(handle); + } + else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); + + if (handle != NULL) DeleteObject(handle); DeleteFileA(filename); } @@ -994,14 +1029,6 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp, return CreateIconIndirect(&iconInfo); } -static BOOL color_match(COLORREF a, COLORREF b) -{ - /* 5-bit accuracy is a sufficient test. This will match, so long as - * colors are never truncated to less that 3x5-bit accuracy i.e. - * paletized. */ - return (a & 0x00F8F8F8) == (b & 0x00F8F8F8); -} - static void check_alpha_draw(HDC hdc, BOOL drawiconex, BOOL alpha, int bpp, int line) { HICON hicon;

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
96
Older →

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 May 2010