October 2013 - Wine-Commits

Gerald Pfeifer : winefile: Remove redundant check in format_bytes().
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: f0392519916fb12f807a8e20299b426e6d43f866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0392519916fb12f807a8e202… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 15 22:34:59 2013 +0200 winefile: Remove redundant check in format_bytes(). --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 3b30255..4729436 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2658,7 +2658,7 @@ static void format_bytes(LPWSTR buffer, LONGLONG bytes) fBytes = ((float)bytes)/1048576.f+.5f; resid = IDS_UNIT_MB; } - else if (bytes >= 1024) /* 1 kB */ + else /* bytes >= 1024 */ /* 1 kB */ { fBytes = ((float)bytes)/1024.f+.5f; resid = IDS_UNIT_KB;

1 0

Andrew Eikum : oleaut32: For 64-bit, fallback on the win32 key if win64 key is empty for typelibs.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: a8ebda980122423008e47d728a776bb408536f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ebda980122423008e47d728… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 16 08:21:13 2013 -0500 oleaut32: For 64-bit, fallback on the win32 key if win64 key is empty for typelibs. --- dlls/oleaut32/tests/typelib.c | 145 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/tmarshal.c | 12 +++- 2 files changed, 153 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d5b78e0..c356ae0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1522,7 +1522,6 @@ if(use_midl_tlb) { } static void test_CreateTypeLib(SYSKIND sys) { - static const WCHAR stdoleW[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static OLECHAR typelibW[] = {'t','y','p','e','l','i','b',0}; static OLECHAR helpfileW[] = {'C',':','\\','b','o','g','u','s','.','h','l','p',0}; static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; @@ -1591,7 +1590,7 @@ static void test_CreateTypeLib(SYSKIND sys) { trace("CreateTypeLib tests\n"); - hres = LoadTypeLib(stdoleW, &stdole); + hres = LoadTypeLib(wszStdOle2, &stdole); ok(hres == S_OK, "got %08x\n", hres); hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IUnknown, &unknown); @@ -5053,6 +5052,147 @@ static void test_GetLibAttr(void) ITypeLib_Release(tl); } +HRESULT WINAPI uk_QueryInterface(IUnknown *obj, REFIID iid, void **out) +{ + return E_NOINTERFACE; +} + +ULONG WINAPI uk_AddRef(IUnknown *obj) +{ + return 2; +} + +ULONG WINAPI uk_Release(IUnknown *obj) +{ + return 1; +} + +IUnknownVtbl vt = { + uk_QueryInterface, + uk_AddRef, + uk_Release, +}; + +IUnknown uk = {&vt}; + +static void test_stub(void) +{ + HRESULT hr; + CLSID clsid; + IPSFactoryBuffer *factory; + IRpcStubBuffer *base_stub; + ITypeLib *stdole; + ICreateTypeLib2 *ctl; + ICreateTypeInfo *cti; + ITypeLib *tl; + ITypeInfo *unk, *ti; + HREFTYPE href; + char filenameA[MAX_PATH]; + WCHAR filenameW[MAX_PATH]; + HKEY hkey; + LONG lr; + + static const GUID libguid = {0x3b9ff02e,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; + static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; + static const GUID coclassguid = {0x3b9ff030,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; + static OLECHAR interfaceW[] = {'i','n','t','e','r','f','a','c','e',0}; + static OLECHAR classW[] = {'c','l','a','s','s',0}; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = LoadTypeLib(wszStdOle2, &stdole); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IUnknown, &unk); + ok(hr == S_OK, "got %08x\n", hr); + + GetTempFileNameA(".", "tlb", 0, filenameA); + MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filenameW, MAX_PATH); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &ctl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetGuid(ctl, &libguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetLcid(ctl, LOCALE_NEUTRAL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl, interfaceW, TKIND_INTERFACE, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(cti, &interfaceguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetTypeFlags(cti, TYPEFLAG_FOLEAUTOMATION); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(cti, unk, &href); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(cti, 0, href); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_QueryInterface(cti, &IID_ITypeInfo, (void**)&ti); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(cti); + ITypeInfo_Release(unk); + ITypeLib_Release(stdole); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl, classW, TKIND_COCLASS, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(cti, &coclassguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(cti, ti, &href); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(cti, 0, href); + ok(hr == S_OK, "got %08x\n", hr); + + ITypeInfo_Release(ti); + ICreateTypeInfo_Release(cti); + + hr = ICreateTypeLib2_SaveAllChanges(ctl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_QueryInterface(ctl, &IID_ITypeLib, (void**)&tl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = RegisterTypeLib(tl, filenameW, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + ITypeLib_Release(tl); + ok(0 == ICreateTypeLib2_Release(ctl), "Typelib still has references\n"); + + /* SYS_WIN32 typelibs should be registered only as 32-bit */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win64", 0, KEY_READ, &hkey); + ok(lr == ERROR_FILE_NOT_FOUND, "got wrong return code: %u\n", lr); + + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u\n", lr); + RegCloseKey(hkey); + + hr = CoGetPSClsid(&interfaceguid, &clsid); + ok(hr == S_OK, "got: %x\n", hr); + + hr = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, + &IID_IPSFactoryBuffer, (void **)&factory); + ok(hr == S_OK, "got: %x\n", hr); + + hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); + ok(hr == S_OK, "got: %x\n", hr); + + IPSFactoryBuffer_Release(factory); + + UnRegisterTypeLib(&libguid, 0, 0, 0, SYS_WIN32); + DeleteFileW(filenameW); + + CoUninitialize(); +} + START_TEST(typelib) { const char *filename; @@ -5091,4 +5231,5 @@ START_TEST(typelib) test_TypeInfo2_GetContainingTypeLib(); test_LoadRegTypeLib(); test_GetLibAttr(); + test_stub(); } diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 2324fbb..3856f32 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -303,8 +303,16 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win%u",tlguid,ver,(sizeof(void*) == 8) ? 64 : 32); tlfnlen = sizeof(tlfn); if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { - ERR("Could not get typelib fn?\n"); - return E_FAIL; +#ifdef _WIN64 + sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win32",tlguid,ver); + tlfnlen = sizeof(tlfn); + if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { +#endif + ERR("Could not get typelib fn?\n"); + return E_FAIL; +#ifdef _WIN64 + } +#endif } MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, sizeof(tlfnW) / sizeof(tlfnW[0])); hres = LoadTypeLib(tlfnW,&tl);

1 0

Andrew Eikum : oleaut32: Also register typelibs in the opposite registry mode.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: fbffa8935e8c2c392418e6d91fa5424fc157a25b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbffa8935e8c2c392418e6d91… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 16 08:21:10 2013 -0500 oleaut32: Also register typelibs in the opposite registry mode. --- dlls/oleaut32/tests/typelib.c | 6 ++ dlls/oleaut32/typelib.c | 105 ++++++++++++++++++++++++----------------- 2 files changed, 67 insertions(+), 44 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 4068f4a..d5b78e0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4084,6 +4084,7 @@ static void test_register_typelib(BOOL system_registration) { ITypeInfo *typeinfo; TYPEATTR *attr; + REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); hr = ITypeLib_GetTypeInfo(typelib, i, &typeinfo); ok(hr == S_OK, "got %08x\n", hr); @@ -4133,6 +4134,11 @@ static void test_register_typelib(BOOL system_registration) ok(ret == expect_ret, "%d: got %d\n", i, ret); if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + /* 32-bit typelibs should be registered into both registry bit modes */ + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); + ok(ret == expect_ret, "%d: got %d\n", i, ret); + if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c77bc62..a807eb3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -565,6 +565,57 @@ static const WCHAR HELPDIRW[] = {'H','E','L','P','D','I','R',0}; static const WCHAR ProxyStubClsidW[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d',0}; static const WCHAR ProxyStubClsid32W[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; +static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *tattr, DWORD flag) +{ + WCHAR keyName[60]; + HKEY key, subKey; + + static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + + get_interface_key( &tattr->guid, keyName ); + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, + KEY_WRITE | flag, NULL, &key, NULL) == ERROR_SUCCESS) + { + if (name) + RegSetValueExW(key, NULL, 0, REG_SZ, + (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); + + if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (const BYTE *)PSOA, sizeof PSOA); + RegCloseKey(subKey); + } + + if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (const BYTE *)PSOA, sizeof PSOA); + RegCloseKey(subKey); + } + + if (RegCreateKeyExW(key, TypeLibW, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) + { + WCHAR buffer[40]; + static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; + static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; + + StringFromGUID2(&libattr->guid, buffer, 40); + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (BYTE *)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); + sprintfW(buffer, fmtver, libattr->wMajorVerNum, libattr->wMinorVerNum); + RegSetValueExW(subKey, VersionW, 0, REG_SZ, + (BYTE*)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); + RegCloseKey(subKey); + } + + RegCloseKey(key); + } +} + /****************************************************************************** * RegisterTypeLib [OLEAUT32.163] * Adds information about a type library to the System Registry @@ -583,9 +634,6 @@ HRESULT WINAPI RegisterTypeLib( OLECHAR * szHelpDir) /* [in] dir to the helpfile for the library, may be NULL*/ { - static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; HRESULT res; TLIBATTR *attr; WCHAR keyName[60]; @@ -758,47 +806,16 @@ HRESULT WINAPI RegisterTypeLib( if ((kind == TKIND_INTERFACE && (tattr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || kind == TKIND_DISPATCH) { - /* register interface<->typelib coupling */ - get_interface_key( &tattr->guid, keyName ); - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) - { - if (name) - RegSetValueExW(key, NULL, 0, REG_SZ, - (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); - - if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); - RegCloseKey(subKey); - } - - if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); - RegCloseKey(subKey); - } - - if (RegCreateKeyExW(key, TypeLibW, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) - { - WCHAR buffer[40]; - static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; - static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; - - StringFromGUID2(&attr->guid, buffer, 40); - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (BYTE *)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); - sprintfW(buffer, fmtver, attr->wMajorVerNum, attr->wMinorVerNum); - RegSetValueExW(subKey, VersionW, 0, REG_SZ, - (BYTE*)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); - RegCloseKey(subKey); - } - - RegCloseKey(key); - } + BOOL is_wow64; + DWORD opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); + + /* register interface<->typelib coupling */ + TLB_register_interface(attr, name, tattr, 0); + + /* register TLBs into the opposite registry view, too */ + if(opposite == KEY_WOW64_32KEY || + (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)) + TLB_register_interface(attr, name, tattr, opposite); } ITypeInfo_ReleaseTypeAttr(tinfo, tattr);

1 0

Jacek Caban : crypt32: Removed no longer needed hCertStore setting.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 49b98891e50d59888e87cc99247c71e1858c80e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b98891e50d59888e87cc992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 16 15:10:04 2013 +0200 crypt32: Removed no longer needed hCertStore setting. --- dlls/crypt32/collectionstore.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index f90eae4..bc16026 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -255,8 +255,6 @@ static void *Collection_enumCert(WINECRYPT_CERTSTORE *store, void *pPrev) } } LeaveCriticalSection(&cs->cs); - if (ret) - ((PCERT_CONTEXT)ret)->hCertStore = store; TRACE("returning %p\n", ret); return ret; } @@ -329,8 +327,6 @@ static void *Collection_enumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) } } LeaveCriticalSection(&cs->cs); - if (ret) - ((PCRL_CONTEXT)ret)->hCertStore = store; TRACE("returning %p\n", ret); return ret; } @@ -402,8 +398,6 @@ static void *Collection_enumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) } } LeaveCriticalSection(&cs->cs); - if (ret) - ((PCTL_CONTEXT)ret)->hCertStore = store; TRACE("returning %p\n", ret); return ret; }

1 0

Alexandre Julliard : user32: Delay creation of the 55AA pattern brush until it's needed.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 209d1a86d26f6eca9b32dd2186c5e2b59fa117c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209d1a86d26f6eca9b32dd218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 16:07:53 2013 +0200 user32: Delay creation of the 55AA pattern brush until it's needed. --- dlls/user32/defwnd.c | 2 +- dlls/user32/nonclient.c | 2 +- dlls/user32/sysparams.c | 32 +++++++++++++++++++++++--------- dlls/user32/text.c | 2 +- dlls/user32/uitools.c | 4 ++-- dlls/user32/user_private.h | 2 +- 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 7a55844..eb64666 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -167,7 +167,7 @@ HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ) * look different from the window background. */ if (bk == GetSysColor(COLOR_WINDOW)) - return SYSCOLOR_55AABrush; + return SYSCOLOR_Get55AABrush(); UnrealizeObject( hb ); return hb; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index da9c6bd..6becd5f 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -289,7 +289,7 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, FillRect (hdc, &rc, GetSysColorBrush (COLOR_3DFACE)); if (uFlags & DC_ACTIVE) { - HBRUSH hbr = SelectObject (hdc, SYSCOLOR_55AABrush); + HBRUSH hbr = SelectObject (hdc, SYSCOLOR_Get55AABrush()); PatBlt (hdc, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, 0xFA0089); SelectObject (hdc, hbr); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7c05d00..bdfed38 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -242,12 +242,8 @@ static BOOL notify_change = TRUE; /* System parameters storage */ static RECT work_area; -static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; - static HKEY volatile_base_key; -HBRUSH SYSCOLOR_55AABrush = 0; - union sysparam_all_entry; struct sysparam_entry @@ -1346,11 +1342,6 @@ void SYSPARAMS_Init(void) { HKEY key; DWORD i, dispos; - HBITMAP h55AABitmap = CreateBitmap( 8, 8, 1, 1, wPattern55AA ); - - SYSCOLOR_55AABrush = CreatePatternBrush( h55AABitmap ); - __wine_make_gdi_object_system( SYSCOLOR_55AABrush, TRUE ); - DeleteObject( h55AABitmap ); /* this one must be non-volatile */ if (RegCreateKeyW( HKEY_CURRENT_USER, WINE_CURRENT_USER_REGKEY, &key )) @@ -2716,6 +2707,29 @@ HPEN SYSCOLOR_GetPen( INT index ) /*********************************************************************** + * SYSCOLOR_Get55AABrush + */ +HBRUSH SYSCOLOR_Get55AABrush(void) +{ + static const WORD pattern[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; + static HBRUSH brush_55aa; + + if (!brush_55aa) + { + HBITMAP bitmap = CreateBitmap( 8, 8, 1, 1, pattern ); + HBRUSH brush = CreatePatternBrush( bitmap ); + DeleteObject( bitmap ); + __wine_make_gdi_object_system( brush, TRUE ); + if (InterlockedCompareExchangePointer( (void **)&brush_55aa, brush, 0 )) + { + __wine_make_gdi_object_system( brush, FALSE ); + DeleteObject( brush ); + } + } + return brush_55aa; +} + +/*********************************************************************** * ChangeDisplaySettingsA (USER32.@) */ LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags ) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 12432b8..7bef476 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1240,7 +1240,7 @@ static BOOL TEXT_GrayString(HDC hdc, HBRUSH hb, GRAYSTRINGPROC fn, LPARAM lp, IN if(retval || len != -1) #endif { - hbsave = SelectObject(memdc, SYSCOLOR_55AABrush); + hbsave = SelectObject(memdc, SYSCOLOR_Get55AABrush()); PatBlt(memdc, 0, 0, cx, cy, 0x000A0329); SelectObject(memdc, hbsave); } diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 386801c..c11a1d3 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -649,7 +649,7 @@ static void UITOOLS_DrawCheckedRect( HDC dc, LPRECT rect ) FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); bg = SetBkColor(dc, RGB(255, 255, 255)); - hbsave = SelectObject(dc, SYSCOLOR_55AABrush); + hbsave = SelectObject(dc, SYSCOLOR_Get55AABrush()); PatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089); SelectObject(dc, hbsave); SetBkColor(dc, bg); @@ -1703,7 +1703,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp /* This state cause the image to be dithered */ if(flags & DSS_UNION) { - hbsave = SelectObject(memdc, SYSCOLOR_55AABrush); + hbsave = SelectObject(memdc, SYSCOLOR_Get55AABrush()); if(!hbsave) goto cleanup; tmp = PatBlt(memdc, 0, 0, cx, cy, 0x00FA0089); SelectObject(memdc, hbsave); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 5666412..0f86bdf 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -209,7 +209,6 @@ static inline BOOL is_broadcast( HWND hwnd ) } extern HMODULE user32_module DECLSPEC_HIDDEN; -extern HBRUSH SYSCOLOR_55AABrush DECLSPEC_HIDDEN; struct dce; struct tagWND; @@ -234,6 +233,7 @@ extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN; extern HPEN SYSCOLOR_GetPen( INT index ) DECLSPEC_HIDDEN; +extern HBRUSH SYSCOLOR_Get55AABrush(void) DECLSPEC_HIDDEN; extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; extern BOOL USER_IsExitingThread( DWORD tid ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Delay registration of the builtin classes until the first window is created .
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 7370a565436b404570b1b1c4ad58a320368fbd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7370a565436b404570b1b1c4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 20:34:07 2007 +0100 user32: Delay registration of the builtin classes until the first window is created. --- dlls/user32/class.c | 25 +++++++++++++++++++++++-- dlls/user32/user_main.c | 3 --- dlls/user32/win.c | 3 +++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index a66f0db..333cb76 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -64,6 +64,7 @@ typedef struct tagCLASS } CLASS; static struct list class_list = LIST_INIT( class_list ); +static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; #define CLASS_OTHER_PROCESS ((CLASS *)1) @@ -376,9 +377,9 @@ static void register_builtin( const struct builtin_class_descr *descr ) /*********************************************************************** - * CLASS_RegisterBuiltinClasses + * register_builtins */ -void CLASS_RegisterBuiltinClasses(void) +static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) { register_builtin( &DESKTOP_builtin_class ); register_builtin( &BUTTON_builtin_class ); @@ -393,6 +394,16 @@ void CLASS_RegisterBuiltinClasses(void) register_builtin( &MESSAGE_builtin_class ); register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); + return TRUE; +} + + +/*********************************************************************** + * CLASS_RegisterBuiltinClasses + */ +void CLASS_RegisterBuiltinClasses(void) +{ + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); } @@ -488,6 +499,8 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) CLASS *classPtr; HINSTANCE instance; + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || wc->hInstance == user32_module) /* we can't register a class for user32 */ { @@ -541,6 +554,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) CLASS *classPtr; HINSTANCE instance; + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || wc->hInstance == user32_module) /* we can't register a class for user32 */ { @@ -597,6 +612,8 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) { CLASS *classPtr = NULL; + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); @@ -1097,6 +1114,8 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) TRACE("%p %s %p\n", hInstance, debugstr_a(name), wc); + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + if (!wc) { SetLastError( ERROR_NOACCESS ); @@ -1148,6 +1167,8 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc TRACE("%p %s %p\n", hInstance, debugstr_w(name), wc); + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + if (!wc) { SetLastError( ERROR_NOACCESS ); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index c5b4714..e74ac19 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -278,9 +278,6 @@ static BOOL process_attach(void) /* Setup palette function pointers */ palette_init(); - /* Initialize built-in window classes */ - CLASS_RegisterBuiltinClasses(); - return TRUE; } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1b4d34b..d506fee 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1391,6 +1391,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } + CLASS_RegisterBuiltinClasses(); + /* Find the parent window */ parent = cs->hwndParent; @@ -1424,6 +1426,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, SetLastError(ERROR_TLW_WITH_WSCHILD); return 0; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } + /* are we creating the desktop or HWND_MESSAGE parent itself? */ if (className != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(className) || strcmpiW( className, messageW )))

1 0

Alexandre Julliard : explorer: Create the driver desktop window after the window handle is created.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 13149b67d3972c5babc8b5c368ffba85a5c5c2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13149b67d3972c5babc8b5c36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 12:13:50 2013 +0200 explorer: Create the driver desktop window after the window handle is created. --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/window.c | 19 ++++++++----------- dlls/winex11.drv/x11drv.h | 3 ++- programs/explorer/desktop.c | 32 +++++++++++++++++--------------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 39b9965..7a1bb92 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -171,6 +171,7 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) PropModeReplace, (unsigned char*)&x11drv_atom(_NET_WM_STATE_FULLSCREEN), 1); } + if (!create_desktop_win_data( win )) return FALSE; XFlush( display ); X11DRV_init_desktop( win, width, height ); return TRUE; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 17859f8..a76e80d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1651,16 +1651,19 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) /* initialize the desktop window id in the desktop manager process */ -static BOOL create_desktop_win_data( Display *display, HWND hwnd ) +BOOL create_desktop_win_data( Window win ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + Display *display = thread_data->display; struct x11drv_win_data *data; - if (!(data = alloc_win_data( display, hwnd ))) return FALSE; - data->whole_window = root_window; + if (!(data = alloc_win_data( display, GetDesktopWindow() ))) return FALSE; + data->whole_window = win; data->managed = TRUE; - SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); - set_initial_wm_hints( display, root_window ); + SetPropA( data->hwnd, whole_window_prop, (HANDLE)win ); + set_initial_wm_hints( display, win ); release_win_data( data ); + if (thread_data->clip_window) XReparentWindow( display, thread_data->clip_window, win, 0, 0 ); return TRUE; } @@ -1719,12 +1722,6 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) struct x11drv_thread_data *data = x11drv_init_thread_data(); XSetWindowAttributes attr; - if (root_window != DefaultRootWindow( gdi_display )) - { - /* the desktop win data can't be created lazily */ - if (!create_desktop_win_data( data->display, hwnd )) return FALSE; - } - /* create the cursor clipping window */ attr.override_redirect = TRUE; attr.event_mask = StructureNotifyMask | FocusChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3b235ca..98386ce 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -639,7 +639,8 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; -BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 49bbbe9..694f3f6 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -552,23 +552,15 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR static BOOL create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; - HDESK desktop; BOOL ret = FALSE; BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); - desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - if (!desktop) - { - WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); - ExitProcess( 1 ); - } /* magic: desktop "root" means use the root window */ if (graphics_driver && strcmpiW( name, rootW )) { create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); if (create_desktop_func) ret = create_desktop_func( width, height ); } - SetThreadDesktop( desktop ); return ret; } @@ -703,8 +695,8 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; + HDESK desktop = 0; MSG msg; HDC hdc; HWND hwnd, msg_hwnd; @@ -737,10 +729,15 @@ void manage_desktop( WCHAR *arg ) if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } - hdc = CreateDCW( displayW, NULL, NULL, NULL ); - graphics_driver = __wine_get_driver_module( hdc ); - - if (name && width && height) using_root = !create_desktop( name, width, height ); + if (name && width && height) + { + if (!(desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ))) + { + WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); + ExitProcess( 1 ); + } + SetThreadDesktop( desktop ); + } /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, @@ -750,13 +747,18 @@ void manage_desktop( WCHAR *arg ) msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); - DeleteDC( hdc ); - if (hwnd == GetDesktopWindow()) { HMODULE shell32; void (WINAPI *pShellDDEInit)( BOOL ); + if (desktop) + { + hdc = GetDC( hwnd ); + graphics_driver = __wine_get_driver_module( hdc ); + using_root = !create_desktop( name, width, height ); + ReleaseDC( hwnd, hdc ); + } SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name );

1 0

Alexandre Julliard : explorer: Set the final size of the desktop window only after it has been created.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 1f9c541b58360559f2f8a6db9d876ada4dcc2b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f9c541b58360559f2f8a6db9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 12:01:32 2013 +0200 explorer: Set the final size of the desktop window only after it has been created. --- programs/explorer/desktop.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 5503787..49bbbe9 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -744,10 +744,7 @@ void manage_desktop( WCHAR *arg ) /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), - GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), - 0, 0, 0, NULL ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, NULL ); /* create the HWND_MESSAGE parent */ msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, @@ -763,7 +760,9 @@ void manage_desktop( WCHAR *arg ) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); - ShowWindow( hwnd, SW_SHOW ); + SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings( hwnd );

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 623230b3ccc0591eef2791fa846c216d22a653cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=623230b3ccc0591eef2791fa8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Oct 16 11:29:52 2013 +0300 readme: Update Finnish translation. --- documentation/README.fi | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 780cf43..15b8302 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -52,6 +52,7 @@ Tietoa NetBSD:lle: Tietoa Mac OS X:lle: Winen onnistuneeseen kääntämiseen x86:lla tarvitaan Xcode 2.4 tai uudempi. + Mac-ajuri vaatii OS X 10.6:n tai uudemman, ja sitä ei käännetä 10.5:ssä. Tuetut tiedostojärjestelmät:

1 0

Dmitry Timoshkov : gdi32/tests: Fix pen tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: f81c2e1caf598df5661ba20f7ee41181750c9dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f81c2e1caf598df5661ba20f7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:31:49 2013 +0900 gdi32/tests: Fix pen tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/pen.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f81c2e1caf598df5661ba…

1 0