May 2010 - Wine-Commits - list.winehq.org

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

May 11, 2010

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: Add 64-bit to the table.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: docs Branch: master Commit: 5255b5f681661cb9f1bbf12da9685105dbf5c1b0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=5255b5f681661cb9f1bbf12da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:30 2010 +0200 winedev: Add 64-bit to the table. --- en/winedev-architecture.sgml | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index e7c0caf..efd60a0 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -94,6 +94,7 @@ <entry>DOS (.COM or .EXE)</entry> <entry>Win16 (NE)</entry> <entry>Win32 (PE)</entry> + <entry>Win64 (PE)</entry> <entry>Winelib</entry> </row> </thead> @@ -104,6 +105,7 @@ <entry>Cooperative</entry> <entry>Preemptive</entry> <entry>Preemptive</entry> + <entry>Preemptive</entry> </row> <row> <entry>Address space</entry> @@ -123,6 +125,10 @@ Each application has it's own address space. Requires MMU support from CPU. </entry> + <entry> + Each application has it's own address + space. Requires MMU support from CPU. + </entry> </row> <row> <entry>Windows API</entry> @@ -137,7 +143,10 @@ Will call the 32 bit Windows API. </entry> <entry> - Will call the 32 bit Windows API, and possibly + Will call the 64 bit Windows API. + </entry> + <entry> + Will call the 32/64 bit Windows API, and possibly also the Unix APIs. </entry> </row> @@ -160,6 +169,9 @@ 32 bit offsets (hence the 32 bit name). </entry> <entry> + Only available on AMD64 architectures. + </entry> + <entry> Flat model, with 32 bit addresses. </entry> </row> @@ -171,7 +183,10 @@ Available. </entry> <entry> - Available, but must use the Win32 APIs for + Available. + </entry> + <entry> + Available, but must use the Win32/64 APIs for threading and synchronization, not the Unix ones. </entry> </row>

1 0

André Hentschel : winedev: Tests should pass on WTB atm, not on Win9x.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: docs Branch: master Commit: 50ce09ade42f7c5a9a3a337e6b0d73ab34420669 URL: http://source.winehq.org/git/docs.git/?a=commit;h=50ce09ade42f7c5a9a3a337e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:35 2010 +0200 winedev: Tests should pass on WTB atm, not on Win9x. --- en/winedev-testing.sgml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 20e0b16..1fac42b 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -48,8 +48,7 @@ Writing conformance tests is also an easy way to discover bugs in Wine. Of course, before fixing the bugs discovered in this way, one must first make sure that the new tests do pass - successfully on at least one Windows 9x and one Windows NT - version. + successfully on at least the Wine Test Bot base VMs. </para> <para> Bugs discovered this way should also be easier to fix. Unlike

1 0

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

May 10, 2010

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

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

May 10, 2010

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

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

May 10, 2010

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

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

May 10, 2010

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

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

May 10, 2010

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

Michael Stefaniuc : oleaut32: Avoid using long.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 0f82f68734c7e7f1f783252845e3aab432ac1bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f82f68734c7e7f1f78325284… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 10 10:38:45 2010 +0200 oleaut32: Avoid using long. --- dlls/oleaut32/typelib.c | 20 ++++++++++---------- dlls/oleaut32/vartype.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5792cc5..7a56e93 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1519,7 +1519,7 @@ static inline unsigned int MSFT_Tell(const TLBContext *pcx) return pcx->pos; } -static inline void MSFT_Seek(TLBContext *pcx, long where) +static inline void MSFT_Seek(TLBContext *pcx, LONG where) { if (where != DO_NOT_SEEK) { @@ -1527,7 +1527,7 @@ static inline void MSFT_Seek(TLBContext *pcx, long where) if (where > pcx->length) { /* FIXME */ - ERR("seek beyond end (%ld/%d)\n", where, pcx->length ); + ERR("seek beyond end (%d/%d)\n", where, pcx->length ); TLB_abort(); } pcx->pos = where; @@ -1535,9 +1535,9 @@ static inline void MSFT_Seek(TLBContext *pcx, long where) } /* read function */ -static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) +static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, LONG where ) { - TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08lx\n", + TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08x\n", pcx->pos, count, pcx->oStart, pcx->length, where); MSFT_Seek(pcx, where); @@ -1548,7 +1548,7 @@ static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) } static DWORD MSFT_ReadLEDWords(void *buffer, DWORD count, TLBContext *pcx, - long where ) + LONG where ) { DWORD ret; @@ -1559,7 +1559,7 @@ static DWORD MSFT_ReadLEDWords(void *buffer, DWORD count, TLBContext *pcx, } static DWORD MSFT_ReadLEWords(void *buffer, DWORD count, TLBContext *pcx, - long where ) + LONG where ) { DWORD ret; @@ -2714,7 +2714,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath if(index_str && *++index_str != '\0') { LPWSTR end_ptr; - long idx = strtolW(index_str, &end_ptr, 10); + LONG idx = strtolW(index_str, &end_ptr, 10); if(*end_ptr == '\0') { int str_len = index_str - pszFileName - 1; @@ -2834,7 +2834,7 @@ static ITypeLibImpl* TypeLibImpl_Constructor(void) static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) { TLBContext cx; - long lPSegDir; + LONG lPSegDir; MSFT_Header tlbHeader; MSFT_SegDir tlbSegDir; ITypeLibImpl * pTypeLibImpl; @@ -2867,14 +2867,14 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) lPSegDir = sizeof(tlbHeader) + (tlbHeader.nrtypeinfos)*4 + ((tlbHeader.varflags & HELPDLLFLAG)? 4 :0); /* now read the segment directory */ - TRACE("read segment directory (at %ld)\n",lPSegDir); + TRACE("read segment directory (at %d)\n",lPSegDir); MSFT_ReadLEDWords(&tlbSegDir, sizeof(tlbSegDir), &cx, lPSegDir); cx.pTblDir = &tlbSegDir; /* just check two entries */ if ( tlbSegDir.pTypeInfoTab.res0c != 0x0F || tlbSegDir.pImpInfo.res0c != 0x0F) { - ERR("cannot find the table directory, ptr=0x%lx\n",lPSegDir); + ERR("cannot find the table directory, ptr=0x%x\n",lPSegDir); HeapFree(GetProcessHeap(),0,pTypeLibImpl); return NULL; } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 33f6f90..1aa71fb 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5368,7 +5368,7 @@ typedef union { struct { - unsigned long m : 23; + unsigned int m : 23; unsigned int exp_bias : 8; unsigned int sign : 1; } i; @@ -5427,7 +5427,7 @@ typedef union { struct { - unsigned long m_lo : 32; /* 52 bits of precision */ + unsigned int m_lo : 32; /* 52 bits of precision */ unsigned int m_hi : 20; unsigned int exp_bias : 11; /* bias == 1023 */ unsigned int sign : 1;

1 0

Alexandre Julliard : comctl32: Apply the imagelist mask when alpha blending .
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 8ea1f3385a8035477c14997ac37ac511e5c9c7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea1f3385a8035477c14997ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 17:46:05 2010 +0200 comctl32: Apply the imagelist mask when alpha blending. --- dlls/comctl32/imagelist.c | 78 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 63f0ea0..a4dc2a9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -815,10 +815,7 @@ ImageList_InternalDragDraw (HDC hdc, INT x, INT y) imldp.rgbFg = CLR_DEFAULT; imldp.fStyle = ILD_NORMAL; imldp.fState = ILS_ALPHA; - imldp.Frame = 128; - - /* FIXME: instead of using the alpha blending, we should - * create a 50% mask, and draw it semitransparantly that way */ + imldp.Frame = 192; ImageList_DrawIndirect (&imldp); } @@ -1064,6 +1061,68 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, } +static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, + int src_x, int src_y, int cx, int cy, int alpha ) +{ + BLENDFUNCTION func; + BOOL ret = FALSE; + HDC hdc; + HBITMAP bmp = 0, mask = 0; + BITMAPINFO *info; + void *bits, *mask_bits; + unsigned int *ptr; + int i, j, has_alpha = 0; + + if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = cx; + info->bmiHeader.biHeight = cy; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = cx * cy * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(bmp = CreateDIBSection( himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; + SelectObject( hdc, bmp ); + BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); + + for (i = 0, ptr = bits; i < cx * cy; i++) if ((has_alpha = (ptr[i] & 0xff000000) != 0)) break; + + if (himl->hbmMask) + { + unsigned int width_bytes = (cx + 31) / 32 * 4; + /* generate alpha channel from the mask */ + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biSizeImage = width_bytes * cy; + if (!(mask = CreateDIBSection( himl->hdcMask, info, DIB_RGB_COLORS, &mask_bits, 0, 0 ))) + goto done; + SelectObject( hdc, mask ); + BitBlt( hdc, 0, 0, cx, cy, himl->hdcMask, src_x, src_y, SRCCOPY ); + SelectObject( hdc, bmp ); + for (i = 0, ptr = bits; i < cy; i++) + for (j = 0; j < cx; j++, ptr++) + if ((((BYTE *)mask_bits)[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr = 0; + else if (!has_alpha) *ptr |= 0xff000000; + } + + func.BlendOp = AC_SRC_OVER; + func.BlendFlags = 0; + func.SourceConstantAlpha = alpha; + func.AlphaFormat = AC_SRC_ALPHA; + ret = GdiAlphaBlend( dest_dc, dest_x, dest_y, cx, cy, hdc, 0, 0, cx, cy, func ); + +done: + DeleteDC( hdc ); + if (bmp) DeleteObject( bmp ); + if (mask) DeleteObject( mask ); + HeapFree( GetProcessHeap(), 0, info ); + return ret; +} + /************************************************************************* * ImageList_DrawIndirect [COMCTL32.@] * @@ -1141,17 +1200,12 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (fState & ILS_ALPHA) { - BLENDFUNCTION func; COLORREF colour; - func.BlendOp = AC_SRC_OVER; - func.BlendFlags = 0; - func.SourceConstantAlpha = pimldp->Frame; - func.AlphaFormat = AC_SRC_ALPHA; if (bIsTransparent) { - bResult = GdiAlphaBlend( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, - hImageListDC, pt.x, pt.y, cx, cy, func ); + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, pimldp->Frame ); goto end; } colour = pimldp->rgbBk; @@ -1160,7 +1214,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - GdiAlphaBlend( hImageDC, 0, 0, cx, cy, hImageListDC, pt.x, pt.y, cx, cy, func ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, pimldp->Frame ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end;

1 0