April 2012 - Wine-Commits - list.winehq.org

Stefan Leichter : atl80: New dll.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 887f009df63b134b3c1eb36e17b84cf3fc33b446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887f009df63b134b3c1eb36e1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 4 22:31:02 2012 +0200 atl80: New dll. --- configure | 1 + configure.ac | 1 + dlls/atl80/Makefile.in | 3 ++ dlls/atl80/atl80.spec | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 604bd9e..c4a49ee 100755 --- a/configure +++ b/configure @@ -14898,6 +14898,7 @@ wine_fn_config_dll apphelp enable_apphelp wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test +wine_fn_config_dll atl80 enable_atl80 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 implib,po diff --git a/configure.ac b/configure.ac index 6fed66c..cfa492c 100644 --- a/configure.ac +++ b/configure.ac @@ -2404,6 +2404,7 @@ WINE_CONFIG_DLL(apphelp) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) +WINE_CONFIG_DLL(atl80) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[implib,po]) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in new file mode 100644 index 0000000..d144f83 --- /dev/null +++ b/dlls/atl80/Makefile.in @@ -0,0 +1,3 @@ +MODULE = atl80.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec new file mode 100644 index 0000000..d2b0cff --- /dev/null +++ b/dlls/atl80/atl80.spec @@ -0,0 +1,56 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl.AtlUnmarshalPtr +15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject +16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit +17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects +18 stdcall AtlModuleRegisterServer(ptr long ptr) atl.AtlModuleRegisterServer +19 stdcall AtlModuleRegisterTypeLib(ptr wstr) atl.AtlModuleRegisterTypeLib +20 stdcall AtlModuleRevokeClassObjects(ptr) atl.AtlModuleRevokeClassObjects +21 stdcall AtlModuleTerm(ptr) atl.AtlModuleTerm +22 stdcall AtlModuleUnregisterServer(ptr ptr) atl.AtlModuleUnregisterServer +23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD +24 stub AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl.AtlInternalQueryInterface +34 stub AtlGetVersion +35 stub AtlAxDialogBoxW +36 stub AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl.AtlAxAttachControl +42 stdcall AtlAxWinInit() atl.AtlAxWinInit +43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData +44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl.AtlAxGetHost +49 stub AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl.AtlIPersistStreamInit_Save +52 stub AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stub AtlGetObjectSourceInterface +55 stub AtlModuleUnRegisterTypeLib +56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib +57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stub AtlCreateRegistrar +62 stub AltWinModuleRegisterClassExW +63 stub AltWinModuleRegisterClassExA +64 stub AltCallTermFunc +65 stub AltWinModuleInit +66 stub AltWinModuleTerm

1 0

Morten Rønne : wininet/tests: Added more tests for urlcache, including a new flag in CacheEntryType.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: e0f93874c832f38a34b5d80a0c6f1d9da9746be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f93874c832f38a34b5d80a0… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sun Mar 25 18:45:33 2012 +0200 wininet/tests: Added more tests for urlcache, including a new flag in CacheEntryType. --- dlls/wininet/tests/urlcache.c | 80 ++++++++++++++++++++++++++++++++++------- include/wininet.h | 1 + 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index c37e791..3b4627c 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -347,6 +347,7 @@ static void test_urlcacheA(void) HANDLE hFile; BYTE zero_byte = 0; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; + LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo2; DWORD cbCacheEntryInfo; static const FILETIME filetime_zero; FILETIME now; @@ -361,7 +362,7 @@ static void test_urlcacheA(void) create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); - ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, NULL, NULL); + ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); cbCacheEntryInfo = 0; ret = GetUrlCacheEntryInfo(TEST_URL1, NULL, &cbCacheEntryInfo); @@ -381,9 +382,11 @@ static void test_urlcacheA(void) lpCacheEntryInfo->CacheEntryType); ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); - HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); - /* A subsequent commit with a different time/type doesn't change the type */ + /* Make sure there is a notable change in timestamps */ + Sleep(1000); + + /* A subsequent commit with a different time/type doesn't change most of the entry */ GetSystemTimeAsFileTime(&now); ret = CommitUrlCacheEntry(TEST_URL1, NULL, now, now, NORMAL_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), NULL, NULL); @@ -393,26 +396,41 @@ static void test_urlcacheA(void) ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); - ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo, &cbCacheEntryInfo); + lpCacheEntryInfo2 = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo2, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* but it does change the time.. */ todo_wine - ok(memcmp(&lpCacheEntryInfo->ExpireTime, &filetime_zero, sizeof(FILETIME)), + ok(memcmp(&lpCacheEntryInfo2->ExpireTime, &filetime_zero, sizeof(FILETIME)), "expected positive ExpireTime\n"); todo_wine - ok(memcmp(&lpCacheEntryInfo->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), + ok(memcmp(&lpCacheEntryInfo2->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected positive LastModifiedTime\n"); - ok(lpCacheEntryInfo->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || - broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), + ok(lpCacheEntryInfo2->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || + broken(lpCacheEntryInfo2->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", - lpCacheEntryInfo->CacheEntryType); + lpCacheEntryInfo2->CacheEntryType); /* and set the headers. */ todo_wine - ok(lpCacheEntryInfo->dwHeaderInfoSize == 19, - "expected headers size 19, got %d\n", - lpCacheEntryInfo->dwHeaderInfoSize); + ok(lpCacheEntryInfo2->dwHeaderInfoSize == 19, + "expected headers size 19, got %d\n", + lpCacheEntryInfo2->dwHeaderInfoSize); + /* Hit rate gets incremented by 1 */ + todo_wine + ok((lpCacheEntryInfo->dwHitRate + 1) == lpCacheEntryInfo2->dwHitRate, + "HitRate not incremented by one on commit\n"); + /* Last access time should be updated */ + todo_wine + ok(!(lpCacheEntryInfo->LastAccessTime.dwHighDateTime == lpCacheEntryInfo2->LastAccessTime.dwHighDateTime && + lpCacheEntryInfo->LastAccessTime.dwLowDateTime == lpCacheEntryInfo2->LastAccessTime.dwLowDateTime), + "Last accessed time was not updated by commit\n"); + /* File extension should be unset */ + todo_wine + ok(lpCacheEntryInfo2->lpszFileExtension == NULL, + "Fileextension isn't unset: %s\n", + lpCacheEntryInfo2->lpszFileExtension); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo2); ret = CommitUrlCacheEntry(TEST_URL, filenameA, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); @@ -560,6 +578,18 @@ static void test_urlcacheA(void) "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); check_file_exists(filenameA); } + + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + memset(lpCacheEntryInfo, 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + todo_wine + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + todo_wine + ok(lpCacheEntryInfo->CacheEntryType & DELETED_CACHE_ENTRY, + "CacheEntryType hasn't DELETED_CACHE_ENTRY set, (flags %08x)\n", + lpCacheEntryInfo->CacheEntryType); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pUnlockUrlCacheEntryFileA) { check_file_exists(filenameA); @@ -637,6 +667,7 @@ static void test_urlcacheA(void) ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); @@ -705,7 +736,30 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); + + /* Recommit of Url entry keeps dwExemptDelta */ + U(*lpCacheEntryInfo).dwExemptDelta = 8600; + ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo, + CACHE_ENTRY_EXEMPT_DELTA_FC); + ok(ret, "SetUrlCacheEntryInfo failed: %d\n", GetLastError()); + + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA1, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + create_and_write_file(filenameA1, &zero_byte, sizeof(zero_byte)); + + ret = CommitUrlCacheEntry(TEST_URL, filenameA1, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, + (LPBYTE)ok_header, strlen(ok_header), "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(U(*lpCacheEntryInfo).dwExemptDelta == 8600, + "expected dwExemptDelta 8600, got %d\n", + U(*lpCacheEntryInfo).dwExemptDelta); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pDeleteUrlCacheEntryA) { ret = pDeleteUrlCacheEntryA(TEST_URL); diff --git a/include/wininet.h b/include/wininet.h index 6db41ca..530a693 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1496,6 +1496,7 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define EDITED_CACHE_ENTRY 0x00000008 #define COOKIE_CACHE_ENTRY 0x00100000 #define URLHISTORY_CACHE_ENTRY 0x00200000 +#define DELETED_CACHE_ENTRY 0x00400000 #define TRACK_OFFLINE_CACHE_ENTRY 0x00000010 #define TRACK_ONLINE_CACHE_ENTRY 0x00000020 #define SPARSE_CACHE_ENTRY 0x00010000

1 0

Jacek Caban : mshtml: Added support for IDispatch-only ActiveX objects.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 8791ce15e9e6d327d3f0c1185aaa9aed67ce592d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8791ce15e9e6d327d3f0c1185… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:57:42 2012 +0200 mshtml: Added support for IDispatch-only ActiveX objects. --- dlls/mshtml/pluginhost.c | 47 ++++++++++++++++++++++--------------------- dlls/mshtml/tests/activex.c | 46 +++++++++++++++++++++++++++++++++-------- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 9309310..f059670 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -185,9 +185,9 @@ static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; IQuickActivate *quick_activate; + IOleObject *ole_obj = NULL; IOleCommandTarget *cmdtrg; IViewObjectEx *view_obj; - IOleObject *ole_obj; IDispatchEx *dispex; IDispatch *disp; RECT rect; @@ -223,29 +223,28 @@ static void activate_plugin(PluginHost *host) IQuickActivate_Release(quick_activate); if(FAILED(hres)) FIXME("QuickActivate failed: %08x\n", hres); - - load_plugin(host); }else { DWORD status = 0; hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); - if(FAILED(hres)) { - FIXME("Plugin does not support IOleObject\n"); - return; - } - - hres = IOleObject_GetMiscStatus(ole_obj, DVASPECT_CONTENT, &status); - TRACE("GetMiscStatus returned %08x %x\n", hres, status); + if(SUCCEEDED(hres)) { + hres = IOleObject_GetMiscStatus(ole_obj, DVASPECT_CONTENT, &status); + TRACE("GetMiscStatus returned %08x %x\n", hres, status); - hres = IOleObject_SetClientSite(ole_obj, &host->IOleClientSite_iface); - IOleObject_Release(ole_obj); - if(FAILED(hres)) { - FIXME("SetClientSite failed: %08x\n", hres); - return; + hres = IOleObject_SetClientSite(ole_obj, &host->IOleClientSite_iface); + IOleObject_Release(ole_obj); + if(FAILED(hres)) { + FIXME("SetClientSite failed: %08x\n", hres); + return; + } + }else { + TRACE("Plugin does not support IOleObject\n"); } + } - load_plugin(host); + load_plugin(host); + if(ole_obj) { hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IViewObjectEx, (void**)&view_obj); if(SUCCEEDED(hres)) { DWORD view_status = 0; @@ -288,11 +287,13 @@ static void activate_plugin(PluginHost *host) return; } - get_pos_rect(host, &rect); - hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); - IOleObject_Release(ole_obj); - if(FAILED(hres)) - WARN("DoVerb failed: %08x\n", hres); + if(ole_obj) { + get_pos_rect(host, &rect); + hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); + IOleObject_Release(ole_obj); + if(FAILED(hres)) + WARN("DoVerb failed: %08x\n", hres); + } if(host->ip_object) { HWND hwnd; @@ -390,7 +391,7 @@ HRESULT get_plugin_dispid(HTMLPluginContainer *plugin_container, WCHAR *name, DI }else if(plugin_container->props_len == plugin_container->props_size) { DISPID *new_props; - new_props = heap_realloc(plugin_container->props, plugin_container->props_size*2); + new_props = heap_realloc(plugin_container->props, plugin_container->props_size*2*sizeof(DISPID)); if(!new_props) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 0972392..feb178e 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -95,11 +95,13 @@ DEFINE_EXPECT(wrapped_func); enum { TEST_FLASH, - TEST_NOQUICKACT + TEST_NOQUICKACT, + TEST_DISPONLY }; static HWND container_hwnd, plugin_hwnd; static int plugin_behavior; +static BOOL no_quickact; #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7f6680746}" @@ -1204,24 +1206,24 @@ static void init_wrapped_iface(void) static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { - *ppv = &OleControl; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleControl; }else if(IsEqualGUID(riid, &IID_IQuickActivate)) { - *ppv = plugin_behavior == TEST_NOQUICKACT ? NULL : &QuickActivate; + *ppv = no_quickact ? NULL : &QuickActivate; }else if(IsEqualGUID(riid, &IID_IPersistPropertyBag)) { - *ppv = plugin_behavior == TEST_NOQUICKACT ? NULL : &PersistPropertyBag; + *ppv = no_quickact ? NULL : &PersistPropertyBag; }else if(IsEqualGUID(riid, &IID_IDispatch)) { *ppv = &Dispatch; }else if(IsEqualGUID(riid, &IID_IViewObject) || IsEqualGUID(riid, &IID_IViewObject2) || IsEqualGUID(riid, &IID_IViewObjectEx)) { - *ppv = &ViewObjectEx; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &ViewObjectEx; }else if(IsEqualGUID(riid, &IID_IOleObject)) { - *ppv = &OleObject; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleObject; }else if(IsEqualGUID(riid, &IID_ITestActiveX)) { CHECK_EXPECT(QI_ITestActiveX); *ppv = &wrapped_iface; }else if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) || IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { - *ppv = &OleInPlaceObjectWindowless; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleInPlaceObjectWindowless; }else { trace("QI %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -2081,11 +2083,18 @@ static void release_doc(IHTMLDocument2 *doc) } } +static void init_test(int behavior) +{ + plugin_behavior = behavior; + + no_quickact = behavior == TEST_NOQUICKACT || behavior == TEST_DISPONLY; +} + static void test_flash_ax(void) { IHTMLDocument2 *doc; - plugin_behavior = TEST_FLASH; + init_test(TEST_FLASH); /* * We pump messages until both document is loaded and plugin instance is created. @@ -2147,7 +2156,7 @@ static void test_noquickact_ax(void) { IHTMLDocument2 *doc; - plugin_behavior = TEST_NOQUICKACT; + init_test(TEST_NOQUICKACT); SET_EXPECT(CreateInstance); SET_EXPECT(FreezeEvents_TRUE); @@ -2188,6 +2197,23 @@ static void test_noquickact_ax(void) CHECK_CALLED(SetClientSite_NULL); } +static void test_nooleobj_ax(void) +{ + IHTMLDocument2 *doc; + + init_test(TEST_DISPONLY); + + SET_EXPECT(CreateInstance); + SET_EXPECT(Invoke_READYSTATE); + + doc = create_doc(object_ax_str, &called_CreateInstance); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(Invoke_READYSTATE); + + release_doc(doc); +} + static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProc(hwnd, msg, wParam, lParam); @@ -2305,6 +2331,8 @@ START_TEST(activex) test_flash_ax(); trace("Testing plugin without IQuickActivate iface...\n"); test_noquickact_ax(); + trace("Testing plugin with IDispatch iface only...\n"); + test_nooleobj_ax(); init_registry(FALSE); }else { skip("Could not register ActiveX\n");

1 0

Morten Rønne : wininet/tests: Fixed text errors in tests.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: fb81502a504145ae2e6831afaea3957612606fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb81502a504145ae2e6831afa… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sat Mar 31 12:38:32 2012 +0200 wininet/tests: Fixed text errors in tests. --- dlls/wininet/tests/urlcache.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index ed42395..c37e791 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -87,7 +87,7 @@ static void test_find_url_cache_entriesA(void) if (!ret) break; } - ok(found, "committed url cache entry not found during enumeration\n"); + ok(found, "Committed url cache entry not found during enumeration\n"); ret = FindCloseUrlCache(hEnumHandle); ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); @@ -494,7 +494,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -647,7 +647,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -657,7 +657,7 @@ static void test_urlcacheA(void) "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, - "expected dwExemptDelta 864000, got %d\n", + "expected dwExemptDelta 86400, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); if (pDeleteUrlCacheEntryA) @@ -679,7 +679,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -689,7 +689,7 @@ static void test_urlcacheA(void) "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, - "expected dwExemptDelta 864000, got %d\n", + "expected dwExemptDelta 86400, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); U(*lpCacheEntryInfo).dwExemptDelta = 0; ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo,

1 0

Stefan Leichter : atl80: Add stub for AtlCreateRegistrar.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 7bffd907908a18a16b34d16245c817ec0d605d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bffd907908a18a16b34d1624… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 4 22:31:02 2012 +0200 atl80: Add stub for AtlCreateRegistrar. --- dlls/atl80/Makefile.in | 2 ++ dlls/atl80/atl80.c | 31 +++++++++++++++++++++++++++++++ dlls/atl80/atl80.spec | 2 +- 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index d144f83..c310fdb 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,3 +1,5 @@ MODULE = atl80.dll +C_SRCS = atl80.c + @MAKE_DLL_RULES@ diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c new file mode 100644 index 0000000..ab1a5ab --- /dev/null +++ b/dlls/atl80/atl80.c @@ -0,0 +1,31 @@ +/* + * Copyright 2012 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "atliface.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl80); + +HRESULT WINAPI AtlCreateRegistrar(IRegistrar** ppReg) +{ + FIXME("(%p) stub\n", ppReg); + return E_NOTIMPL; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index d2b0cff..7035991 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -48,7 +48,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stub AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AltWinModuleRegisterClassExW 63 stub AltWinModuleRegisterClassExA 64 stub AltCallTermFunc

1 0

Aric Stewart : quartz: Add VMRFilterConfig9 to VMR9.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: eb4972017e5188500c8144ecac81f75eba02884f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4972017e5188500c8144eca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:38:07 2012 -0500 quartz: Add VMRFilterConfig9 to VMR9. --- dlls/quartz/vmr9.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 07e3428..b8b81c2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -53,12 +53,20 @@ typedef struct IUnknown IUnknown_inner; IAMFilterMiscFlags IAMFilterMiscFlags_iface; + IVMRFilterConfig9 IVMRFilterConfig9_iface; + IVMRSurfaceAllocatorEx9 *allocator; + IVMRImagePresenter9 *presenter; + BOOL allocator_is_ex; + + VMR9Mode mode; BITMAPINFOHEADER bmiheader; IUnknown * outer_unk; BOOL bUnkOuterValid; BOOL bAggregatable; + DWORD_PTR cookie; + RECT source_rect; RECT target_rect; LONG VideoWidth; @@ -95,6 +103,11 @@ static inline VMR9Impl *impl_from_IAMFilterMiscFlags( IAMFilterMiscFlags *iface) return CONTAINING_RECORD(iface, VMR9Impl, IAMFilterMiscFlags_iface); } +static inline VMR9Impl *impl_from_IVMRFilterConfig9( IVMRFilterConfig9 *iface) +{ + return CONTAINING_RECORD(iface, VMR9Impl, IVMRFilterConfig9_iface); +} + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -433,6 +446,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->baseControlVideo.IBasicVideo_iface; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_iface; + else if (IsEqualIID(riid, &IID_IVMRFilterConfig9)) + *ppv = &This->IVMRFilterConfig9_iface; else { HRESULT hr; @@ -494,6 +509,11 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) { TRACE("Destroying\n"); + if (This->allocator) + IVMRSurfaceAllocator9_Release(This->allocator); + if (This->presenter) + IVMRImagePresenter9_Release(This->presenter); + CoTaskMemFree(This); } return refCount; @@ -762,6 +782,137 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { AMFilterMiscFlags_GetMiscFlags }; +static HRESULT WINAPI VMR9FilterConfig_QueryInterface(IVMRFilterConfig9 *iface, REFIID riid, LPVOID * ppv) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI VMR9FilterConfig_AddRef(IVMRFilterConfig9 *iface) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI VMR9FilterConfig_Release(IVMRFilterConfig9 *iface) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI VMR9FilterConfig_SetImageCompositor(IVMRFilterConfig9 *iface, IVMRImageCompositor9 *compositor) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, compositor); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD max) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD *max) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD renderflags) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, renderflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_GetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD *renderflags) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, renderflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface, DWORD mode) +{ + HRESULT hr = S_OK; + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + TRACE("(%p/%p)->(%u)\n", iface, This, mode); + + EnterCriticalSection(&This->renderer.filter.csFilter); + if (This->mode) + { + LeaveCriticalSection(&This->renderer.filter.csFilter); + return VFW_E_WRONG_STATE; + } + + if (This->allocator) + IVMRSurfaceAllocator9_Release(This->allocator); + if (This->presenter) + IVMRImagePresenter9_Release(This->presenter); + + This->allocator = NULL; + This->presenter = NULL; + + switch (mode) + { + case VMR9Mode_Windowed: + case VMR9Mode_Windowless: + This->allocator = NULL; + This->presenter = NULL; + This->allocator_is_ex = 0; + This->cookie = ~0; + break; + case VMR9Mode_Renderless: + break; + default: + LeaveCriticalSection(&This->renderer.filter.csFilter); + return E_INVALIDARG; + } + + This->mode = mode; + LeaveCriticalSection(&This->renderer.filter.csFilter); + return hr; +} + +static HRESULT WINAPI VMR9FilterConfig_GetRenderingMode(IVMRFilterConfig9 *iface, DWORD *mode) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + TRACE("(%p/%p)->(%p) stub\n", iface, This, mode); + if (!mode) + return E_POINTER; + + if (This->mode) + *mode = This->mode; + else + *mode = VMR9Mode_Windowed; + + return S_OK; +} + +static const IVMRFilterConfig9Vtbl VMR9_FilterConfig_Vtbl = +{ + VMR9FilterConfig_QueryInterface, + VMR9FilterConfig_AddRef, + VMR9FilterConfig_Release, + VMR9FilterConfig_SetImageCompositor, + VMR9FilterConfig_SetNumberOfStreams, + VMR9FilterConfig_GetNumberOfStreams, + VMR9FilterConfig_SetRenderingPrefs, + VMR9FilterConfig_GetRenderingPrefs, + VMR9FilterConfig_SetRenderingMode, + VMR9FilterConfig_GetRenderingMode +}; + HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) { HRESULT hr; @@ -779,6 +930,11 @@ HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) pVMR9->IUnknown_inner.lpVtbl = &IInner_VTable; pVMR9->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + pVMR9->mode = 0; + pVMR9->allocator = NULL; + pVMR9->presenter = NULL; + pVMR9->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + hr = BaseRenderer_Init(&pVMR9->renderer, &VMR9_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); if (FAILED(hr)) goto fail;

1 0

Ken Thomases : Revert "gdi32: Load fonts from default Mac external font paths.".
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 272cf2a9730865dd5ca32689d62209a4b761e993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272cf2a9730865dd5ca32689d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 4 17:40:13 2012 -0500 Revert "gdi32: Load fonts from default Mac external font paths.". This reverts commit 85a71387dac1ca3ad47970800c8c01743681b528. --- dlls/gdi32/freetype.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 72b74be..ff8e784 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3403,7 +3403,6 @@ static void init_font_list(void) DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR windowsdir[MAX_PATH]; char *unixname; - const char *home; const char *data_dir; delete_external_font_keys(); @@ -3509,6 +3508,7 @@ static void init_font_list(void) ptr = valueA; while (ptr) { + const char* home; LPSTR next = strchr( ptr, ':' ); if (next) *next++ = 0; if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) && @@ -3529,21 +3529,6 @@ static void init_font_list(void) } RegCloseKey(hkey); } - -#ifdef __APPLE__ - /* Mac default font locations. */ - ReadFontDir( "/Library/Fonts", TRUE ); - ReadFontDir( "/Network/Library/Fonts", TRUE ); - ReadFontDir( "/System/Library/Fonts", TRUE ); - if ((home = getenv( "HOME" ))) - { - unixname = HeapAlloc( GetProcessHeap(), 0, strlen(home)+15 ); - strcpy( unixname, home ); - strcat( unixname, "/Library/Fonts" ); - ReadFontDir( unixname, TRUE); - HeapFree( GetProcessHeap(), 0, unixname ); - } -#endif } static BOOL move_to_front(const WCHAR *name)

1 0

Hans Leidekker : kernel32: Return failure from GetModuleHandleEx if the module handle pointer is NULL .
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: e8a95bf68379a5245a9e26c9a291e25dac212644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a95bf68379a5245a9e26c9a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:15:50 2012 +0200 kernel32: Return failure from GetModuleHandleEx if the module handle pointer is NULL. --- dlls/kernel32/module.c | 8 ++++++- dlls/kernel32/tests/module.c | 48 +++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 7d4d93b..739392f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -508,6 +508,12 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) HMODULE ret; ULONG magic; + if (!module) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + /* if we are messing with the refcount, grab the loader lock */ if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) @@ -542,7 +548,7 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) LdrUnlockLoaderLock( 0, magic ); - if (module) *module = ret; + *module = ret; return (status == STATUS_SUCCESS); } diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 70940f5..30da85f 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -518,14 +518,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( 0, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( 0, "kernel32", NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -545,14 +545,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( 0, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( 0, kernel32W, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -572,14 +572,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -598,14 +598,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -626,14 +626,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -653,14 +653,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef;

1 0

Igor Paliychuk : po: Update Ukrainian translation.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 9c1591ee54ad074edfd96c2480593284cefd344b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1591ee54ad074edfd96c248… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Wed Apr 4 18:44:07 2012 +0300 po: Update Ukrainian translation. --- po/uk.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/uk.po b/po/uk.po index 06b12bc..6acf133 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9842,12 +9842,12 @@ msgstr "Ви впевнені?" #: cmd.rc:307 xcopy.rc:40 msgctxt "Yes key" msgid "Y" -msgstr "" +msgstr "Т" #: cmd.rc:308 xcopy.rc:41 msgctxt "No key" msgid "N" -msgstr "" +msgstr "Н" #: cmd.rc:309 msgid "File association missing for extension %1\n" @@ -9916,7 +9916,7 @@ msgstr "Не можу викликати мітку пакету за межам #: cmd.rc:327 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "" +msgstr "В" #: cmd.rc:328 msgid "Delete %1?" @@ -9984,11 +9984,11 @@ msgstr "Том в приводі %1!c! не має мітки.\n" #: cmd.rc:343 msgid " (Yes|No)" -msgstr "" +msgstr " (Так|Ні)" #: cmd.rc:344 msgid " (Yes|No|All)" -msgstr "" +msgstr " (Так|Ні|Всі)" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -13973,15 +13973,15 @@ msgid "" "(F - File, D - Directory)\n" msgstr "" "'%1' є файлом чи директорією?\n" -"(F - Файл, D - Директорія)\n" +"(Ф - Файл, Д - Директорія)\n" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "" +msgstr "%1? (Так|Ні)\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Переписати %1? (Yes|No|All)\n" +msgstr "Переписати %1? (Так|Ні|Всі)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" @@ -13994,12 +13994,12 @@ msgstr "Помилка читання '%1'\n" #: xcopy.rc:43 msgctxt "File key" msgid "F" -msgstr "" +msgstr "Ф" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "" +msgstr "Д" #: xcopy.rc:77 msgid ""

1 0

Daniel Jelinski : comctl32/tests: Added tests for treeview TVM_HITTEST message.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: cd8609597a9822e7fe2c6870fbfcabfea7bef58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8609597a9822e7fe2c6870f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Apr 2 22:30:04 2012 +0200 comctl32/tests: Added tests for treeview TVM_HITTEST message. --- dlls/comctl32/tests/treeview.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 61a3ce6..2246c79 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1788,6 +1788,47 @@ static void test_TVM_GETNEXTITEM(void) DestroyWindow(hTree); } +static void test_TVM_HITTEST(void) +{ + HWND hTree; + LRESULT ret; + RECT rc; + TVHITTESTINFO ht; + + hTree = create_treeview_control(0); + fill_tree(hTree); + + *(HTREEITEM*)&rc = hRoot; + ret = SendMessage(hTree, TVM_GETITEMRECT, TRUE, (LPARAM)&rc); + expect(TRUE, (BOOL)ret); + + ht.pt.x = rc.left-1; + ht.pt.y = rc.top; + + ret = SendMessage(hTree, TVM_HITTEST, 0, (LPARAM)&ht); + ok((HTREEITEM)ret == hRoot, "got %p, expected %p\n", (HTREEITEM)ret, hRoot); + ok(ht.hItem == hRoot, "got %p, expected %p\n", ht.hItem, hRoot); + ok(ht.flags == TVHT_ONITEMBUTTON, "got %d, expected %d\n", ht.flags, TVHT_ONITEMBUTTON); + + ret = SendMessageA(hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot); + expect(TRUE, (BOOL)ret); + + *(HTREEITEM*)&rc = hChild; + ret = SendMessage(hTree, TVM_GETITEMRECT, TRUE, (LPARAM)&rc); + expect(TRUE, (BOOL)ret); + + ht.pt.x = rc.left-1; + ht.pt.y = rc.top; + + ret = SendMessage(hTree, TVM_HITTEST, 0, (LPARAM)&ht); + ok((HTREEITEM)ret == hChild, "got %p, expected %p\n", (HTREEITEM)ret, hChild); + ok(ht.hItem == hChild, "got %p, expected %p\n", ht.hItem, hChild); + /* Wine returns item button here, but this item has no button */ + todo_wine ok(ht.flags == TVHT_ONITEMINDENT, "got %d, expected %d\n", ht.flags, TVHT_ONITEMINDENT); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1859,6 +1900,7 @@ START_TEST(treeview) test_htreeitem_layout(); test_TVS_CHECKBOXES(); test_TVM_GETNEXTITEM(); + test_TVM_HITTEST(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0