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

Thomas Mullaly : urlmon/tests: Added tests for CoInternetIsFeatureEnabled.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 99480b0dc8c55c72eec7e20065f7de2dcc69d974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99480b0dc8c55c72eec7e2006… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Apr 5 23:30:53 2011 -0400 urlmon/tests: Added tests for CoInternetIsFeatureEnabled. --- dlls/urlmon/tests/misc.c | 76 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 47ab4f8..446721a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -75,7 +75,7 @@ static HRESULT (WINAPI *pObtainUserAgentString)(DWORD, LPSTR, DWORD*); static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*); static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, DWORD); static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); - +static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static void test_CreateFormatEnum(void) { @@ -1475,6 +1475,78 @@ static void test_IsValidURL(void) IBindCtx_Release(bctx); } +static const struct { + INTERNETFEATURELIST feature; + DWORD get_flags; + HRESULT expected; + BOOL todo; +} default_feature_tests[] = { + {FEATURE_OBJECT_CACHING,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_ZONE_ELEVATION,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_MIME_HANDLING,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_MIME_SNIFFING,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_WINDOW_RESTRICTIONS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_WEBOC_POPUPMANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_BEHAVIORS,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_DISABLE_MK_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_LOCALMACHINE_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_SECURITYBAND,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_RESTRICT_ACTIVEXINSTALL,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_VALIDATE_NAVIGATE_URL,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_RESTRICT_FILEDOWNLOAD,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_ADDON_MANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_PROTOCOL_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_HTTP_USERNAME_PASSWORD_DISABLE,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_SAFE_BINDTOOBJECT,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_UNC_SAVEDFILECHECK,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_GET_URL_DOM_FILEPATH_UNENCODED,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_TABBED_BROWSING,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_SSLUX,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_DISABLE_NAVIGATION_SOUNDS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_DISABLE_LEGACY_COMPRESSION,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_FORCE_ADDR_AND_STATUS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_XMLHTTP,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_DISABLE_TELNET_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_FEEDS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_BLOCK_INPUT_PROMPTS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE} +}; + +static void test_internet_feature_defaults(void) { + HRESULT hres; + DWORD i; + + for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { + hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); + if(default_feature_tests[i].todo) { + todo_wine + ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, default_feature_tests[i].expected, i); + } else { + ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, default_feature_tests[i].expected, i); + } + } +} + +static void test_CoInternetIsFeatureEnabled(void) { + HRESULT hres; + + test_internet_feature_defaults(); + + hres = pCoInternetIsFeatureEnabled(FEATURE_ENTRY_COUNT, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == E_FAIL, "CoInternetIsFeatureEnabled returned %08x, expected E_FAIL\n", hres); +} + +static void test_internet_features(void) { + if(!pCoInternetIsFeatureEnabled) { + win_skip("Skipping internet feature tests, IE is too old\n"); + return; + } + + test_CoInternetIsFeatureEnabled(); +} + START_TEST(misc) { HMODULE hurlmon; @@ -1491,6 +1563,7 @@ START_TEST(misc) pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo"); pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption"); pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); + pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { @@ -1516,6 +1589,7 @@ START_TEST(misc) test_user_agent(); test_MkParseDisplayNameEx(); test_IsValidURL(); + test_internet_features(); OleUninitialize(); }

1 0

Thomas Mullaly : include: Updated INTERNETFEATURELIST enum and flags.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 342906d7b3fb8e13ff1ca4cd574d5437d69a4d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=342906d7b3fb8e13ff1ca4cd5… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Apr 5 23:09:18 2011 -0400 include: Updated INTERNETFEATURELIST enum and flags. --- include/urlmon.idl | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index cdcb4c8..2ea4063 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1511,13 +1511,27 @@ typedef enum _tagINTERNETFEATURELIST FEATURE_DISABLE_TELNET_PROTOCOL, FEATURE_FEEDS, FEATURE_BLOCK_INPUT_PROMPTS, - FEATURE_DOMSTORAGE, - FEATURE_XDOMAINREQUEST, - FEATURE_DATAURI, - FEATURE_AJAX_CONNECTIONSERVICES, FEATURE_ENTRY_COUNT } INTERNETFEATURELIST; +cpp_quote("#define SET_FEATURE_ON_THREAD 0x00000001") +cpp_quote("#define SET_FEATURE_ON_PROCESS 0x00000002") +cpp_quote("#define SET_FEATURE_IN_REGISTRY 0x00000004") +cpp_quote("#define SET_FEATURE_ON_THREAD_LOCALMACHINE 0x00000008") +cpp_quote("#define SET_FEATURE_ON_THREAD_INTRANET 0x00000010") +cpp_quote("#define SET_FEATURE_ON_THREAD_TRUSTED 0x00000020") +cpp_quote("#define SET_FEATURE_ON_THREAD_INTERNET 0x00000040") +cpp_quote("#define SET_FEATURE_ON_THREAD_RESTRICTED 0x00000080") + +cpp_quote("#define GET_FEATURE_FROM_THREAD 0x00000001") +cpp_quote("#define GET_FEATURE_FROM_PROCESS 0x00000002") +cpp_quote("#define GET_FEATURE_FROM_REGISTRY 0x00000004") +cpp_quote("#define GET_FEATURE_FROM_THREAD_LOCALMACHINE 0x00000008") +cpp_quote("#define GET_FEATURE_FROM_THREAD_INTRANET 0x00000010") +cpp_quote("#define GET_FEATURE_FROM_THREAD_TRUSTED 0x00000020") +cpp_quote("#define GET_FEATURE_FROM_THREAD_INTERNET 0x00000040") +cpp_quote("#define GET_FEATURE_FROM_THREAD_RESTRICTED 0x00000080") + typedef struct _tagPROTOCOLFILTERDATA { DWORD cbSize; IInternetProtocolSink *pProtocolSink;

1 0

Jörg Höhle : winmm: DriverCallback returns TRUE iff there is notification.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: a174713f82e7cdbf833257aeb23d6ef68ef0dbec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a174713f82e7cdbf833257aeb… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Mon Apr 11 14:57:30 2011 +0200 winmm: DriverCallback returns TRUE iff there is notification. --- dlls/winmm/driver.c | 25 ++++++++++++++++--------- dlls/winmm/tests/midi.c | 13 +++++++++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 8620fe6..feecc92 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -129,7 +129,7 @@ LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr) static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, LPARAM lParam1, LPARAM lParam2) { - LRESULT ret = 0; + LRESULT ret; TRACE("Before call32 proc=%p drvrID=%08lx hDrv=%p wMsg=%04x p1=%08lx p2=%08lx\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, lpDrv, msg, lParam1, lParam2); @@ -552,24 +552,28 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + BOOL ret = FALSE; TRACE("(%08lX, %s %04X, %p, %04X, %08lX, %08lX, %08lX)\n", dwCallBack, DRIVER_getCallback(uFlags), uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); + if (!dwCallBack) + return ret; switch (uFlags & DCB_TYPEMASK) { case DCB_NULL: - break; + /* Native returns FALSE = no notification, not TRUE */ + return ret; case DCB_WINDOW: - PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); + ret = PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_TASK: /* aka DCB_THREAD */ - PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); + ret = PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_FUNCTION: - if (dwCallBack) - ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); + ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); + ret = TRUE; break; case DCB_EVENT: - SetEvent((HANDLE)dwCallBack); + ret = SetEvent((HANDLE)dwCallBack); break; #if 0 /* FIXME: for now only usable in mmsystem.dll16 @@ -601,8 +605,11 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, WARN("Unknown callback type %d\n", uFlags & DCB_TYPEMASK); return FALSE; } - TRACE("Done\n"); - return TRUE; + if (ret) + TRACE("Done\n"); + else + WARN("Notification failure\n"); + return ret; } /****************************************************************** diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index e40e1d7..f02c4f0 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -325,6 +325,19 @@ static void test_midiOut_device(UINT udev, HWND hwnd) rc = midiOutClose(hm); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); test_notification(hwnd, "midiOutClose", MOM_CLOSE, 0); + + rc = midiOutOpen(&hm, udev, 0, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); + ok(!rc, "midiOutOpen(dev=%d) 0 CALLBACK_WINDOW rc=%s\n", udev, mmsys_error(rc)); + /* PostMessage(hwnd=0) redirects to PostThreadMessage(GetCurrentThreadId()) + * which PeekMessage((HWND)-1) queries. */ + test_notification((HWND)-1, "midiOutOpen WINDOW->THREAD", 0, WHATEVER); + test_notification(hwnd, "midiOutOpen WINDOW", 0, WHATEVER); + if (!rc) { + rc = midiOutClose(hm); + ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); + test_notification((HWND)-1, "midiOutClose WINDOW->THREAD", 0, WHATEVER); + test_notification(hwnd, "midiOutClose", 0, WHATEVER); + } test_notification(hwnd, "midiOut over", 0, WHATEVER); }

1 0

Thomas Mullaly : urlmon: Added basic implementation for CoInternet{Is/ Set}FeatureEnabled.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: b7694d8d7cf2216f1415ce5946e7e0b497432022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7694d8d7cf2216f1415ce594… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat Apr 9 11:59:35 2011 -0400 urlmon: Added basic implementation for CoInternet{Is/Set}FeatureEnabled. --- dlls/urlmon/internet.c | 296 +++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/misc.c | 70 +++++------ 2 files changed, 321 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7694d8d7cf2216f1415c…

1 0

Jörg Höhle : winmm: Audio drivers unconditionally invoke DriverCallback.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 75dbd1162eb0c1fd756475cdb11522f75926f54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75dbd1162eb0c1fd756475cdb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 8 09:28:58 2011 +0100 winmm: Audio drivers unconditionally invoke DriverCallback. --- dlls/winealsa.drv/wavein.c | 7 ++----- dlls/winealsa.drv/waveout.c | 7 ++----- dlls/winecoreaudio.drv/audio.c | 20 ++++++-------------- dlls/wineoss.drv/audio.c | 18 ++++++------------ 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 3a2fad8..67759a6 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -74,11 +74,8 @@ static void widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, DW case WIM_OPEN: case WIM_CLOSE: case WIM_DATA: - if (wwi->wFlags != DCB_NULL && - !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, (HDRVR)wwi->waveDesc.hWave, - wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { - WARN("can't notify client !\n"); - } + DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, (HDRVR)wwi->waveDesc.hWave, + wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 127e50e..9290778 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -75,11 +75,8 @@ static void wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, DW case WOM_OPEN: case WOM_CLOSE: case WOM_DONE: - if (wwo->wFlags != DCB_NULL && - !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave, - wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { - WARN("can't notify client !\n"); - } + DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave, + wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index faf4f54..43420b1 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -792,13 +792,9 @@ static void wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD_PTR dwP case WOM_OPEN: case WOM_CLOSE: case WOM_DONE: - if (wwo->wFlags != DCB_NULL && - !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, - (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, - dwParam1, dwParam2)) - { - WARN("can't notify client !\n"); - } + DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, + (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, + dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); @@ -1752,13 +1748,9 @@ static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWO case WIM_OPEN: case WIM_CLOSE: case WIM_DATA: - if (wwi->wFlags != DCB_NULL && - !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, - (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance, - dwParam1, dwParam2)) - { - WARN("can't notify client !\n"); - } + DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, + (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance, + dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 7e1ca43..0e27e21 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1444,12 +1444,9 @@ static void wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, DW case WOM_OPEN: case WOM_CLOSE: case WOM_DONE: - if (wwo->wFlags != DCB_NULL && - !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, - (HDRVR)wwo->waveDesc.hWave, wMsg, - wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { - WARN("can't notify client !\n"); - } + DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, + (HDRVR)wwo->waveDesc.hWave, wMsg, + wwo->waveDesc.dwInstance, dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); @@ -2478,12 +2475,9 @@ static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWO case WIM_OPEN: case WIM_CLOSE: case WIM_DATA: - if (wwi->wFlags != DCB_NULL && - !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, - (HDRVR)wwi->waveDesc.hWave, wMsg, - wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { - WARN("can't notify client !\n"); - } + DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, + (HDRVR)wwi->waveDesc.hWave, wMsg, + wwi->waveDesc.dwInstance, dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg);

1 0

Thomas Mullaly : urlmon: Added FeatureControl registry keys.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 6487dfa871a243ee4924941742adda2d5b419697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6487dfa871a243ee492494174… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Fri Apr 8 17:03:38 2011 -0400 urlmon: Added FeatureControl registry keys. --- dlls/urlmon/urlmon.rgs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.rgs b/dlls/urlmon/urlmon.rgs index fadb090..868baad 100644 --- a/dlls/urlmon/urlmon.rgs +++ b/dlls/urlmon/urlmon.rgs @@ -70,6 +70,54 @@ HKCU } } } + NoRemove 'Internet Explorer' + { + NoRemove Main + { + FeatureControl + } + } + } + } +} +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove 'Internet Explorer' + { + NoRemove Main + { + FeatureControl + { + FEATURE_OBJECT_CACHING + FEATURE_ZONE_ELEVATION + FEATURE_MIME_HANDLING + FEATURE_MIME_SNIFFING + FEATURE_WINDOW_RESTRICTIONS + FEATURE_WEBOC_POPUPMANAGEMENT + FEATURE_BEHAVIORS + FEATURE_DISABLE_MK_PROTOCOL + FEATURE_LOCALMACHINE_LOCKDOWN + FEATURE_SECURITYBAND + FEATURE_RESTRICT_ACTIVEXINSTALL + FEATURE_VALIDATE_NAVIGATE_URL + FEATURE_RESTRICT_FILEDOWNLOAD + FEATURE_ADDON_MANAGEMENT + FEATURE_PROTOCOL_LOCKDOWN + FEATURE_HTTP_USERNAME_PASSWORD_DISABLE + FEATURE_SAFE_BINDTOOBJECT + FEATURE_UNC_SAVEDFILECHECK + FEATURE_SSLUX + FEATURE_DISABLE_LEGACY_COMPRESSION + FEATURE_FORCE_ADDR_AND_STATUS + FEATURE_DISABLE_TELNET_PROTOCOL + FEATURE_FEEDS + } + } + } } } }

1 0

Jörg Höhle : winmm: Trace DriverCallback once upon entry.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: e6a501bbd6286b05b37bf6183113b35f4a1e6c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a501bbd6286b05b37bf6183… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 29 20:51:15 2011 +0200 winmm: Trace DriverCallback once upon entry. --- dlls/winmm/driver.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 23338d2..8620fe6 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -531,34 +531,44 @@ LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv, } /************************************************************************** + * DRIVER_getCallback [internal] + */ +static const char* DRIVER_getCallback(DWORD uFlags) +{ + switch(uFlags & DCB_TYPEMASK) { + case DCB_NULL: return "null"; + case DCB_WINDOW: return "window"; + case DCB_TASK: return "task"; + case DCB_EVENT: return "event"; + case DCB_FUNCTION: return "32bit function"; + default: return "UNKNOWN"; + } +} + +/************************************************************************** * DriverCallback [WINMM.@] */ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%08lX, %04X, %p, %04X, %08lX, %08lX, %08lX)\n", - dwCallBack, uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); + TRACE("(%08lX, %s %04X, %p, %04X, %08lX, %08lX, %08lX)\n", + dwCallBack, DRIVER_getCallback(uFlags), uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); switch (uFlags & DCB_TYPEMASK) { case DCB_NULL: - TRACE("Null !\n"); break; case DCB_WINDOW: - TRACE("Window(%04lX) handle=%p!\n", dwCallBack, hDev); PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_TASK: /* aka DCB_THREAD */ - TRACE("Task(%04lx) !\n", dwCallBack); PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_FUNCTION: - TRACE("Function (32 bit) !\n"); if (dwCallBack) ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); break; case DCB_EVENT: - TRACE("Event(%08lx) !\n", dwCallBack); SetEvent((HANDLE)dwCallBack); break; #if 0

1 0

Huw Davies : gdi32: Implement SelectBrush for solid brushes.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 44f530275afcdde9febc06bc110631c0d5a56f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f530275afcdde9febc06bc1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 11 10:00:28 2011 +0100 gdi32: Implement SelectBrush for solid brushes. --- dlls/gdi32/dibdrv/dc.c | 5 ++- dlls/gdi32/dibdrv/dibdrv.h | 13 +++++++ dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/dibdrv/objects.c | 83 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 6 +++ 5 files changed, 106 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 78248dd..9c2aca4 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -137,6 +137,7 @@ static INT CDECL dibdrv_SetROP2( PHYSDEV dev, INT rop ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); calc_and_xor_masks(rop, pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); + update_brush_rop(pdev, rop); return next->funcs->pSetROP2( next, rop ); } @@ -219,7 +220,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pScaleViewportExt */ NULL, /* pScaleWindowExt */ dibdrv_SelectBitmap, /* pSelectBitmap */ - NULL, /* pSelectBrush */ + dibdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ NULL, /* pSelectPalette */ @@ -228,7 +229,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetBitmapBits */ NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ - NULL, /* pSetDCBrushColor */ + dibdrv_SetDCBrushColor, /* pSetDCBrushColor */ dibdrv_SetDCPenColor, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index b7408ac..e62536f 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -19,7 +19,9 @@ */ extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; +extern COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) @@ -43,3 +45,14 @@ extern const primitive_funcs funcs_32 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; +extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; + +static inline BOOL defer_pen(dibdrv_physdev *pdev) +{ + return pdev->defer & (DEFER_FORMAT | DEFER_PEN); +} + +static inline BOOL defer_brush(dibdrv_physdev *pdev) +{ + return pdev->defer & (DEFER_FORMAT | DEFER_BRUSH); +} diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 1e0de2f..1b4ccb3 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -40,7 +40,7 @@ BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) LPtoDP(dev->hdc, pts, 2); - if(pdev->defer || !pdev->pen_line(pdev, pts, pts + 1)) + if(defer_pen(pdev) || !pdev->pen_line(pdev, pts, pts + 1)) return next->funcs->pLineTo( next, x, y ); return TRUE; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a26785a..4ebeee1 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -207,3 +207,86 @@ COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) return next->funcs->pSetDCPenColor( next, color ); } + +/********************************************************************** + * solid_brush + * + * Fill a number of rectangles with the solid brush + * FIXME: Should we insist l < r && t < b? Currently we assume this. + */ +static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) +{ + int i; + DC *dc = get_dibdrv_dc( &pdev->dev ); + + if(get_clip_region(dc)) return FALSE; + + for(i = 0; i < num; i++) /* simple clip to extents */ + { + if(rects[i].left < dc->vis_rect.left) rects[i].left = dc->vis_rect.left; + if(rects[i].top < dc->vis_rect.top) rects[i].top = dc->vis_rect.top; + if(rects[i].right > dc->vis_rect.right) rects[i].right = dc->vis_rect.right; + if(rects[i].bottom > dc->vis_rect.bottom) rects[i].bottom = dc->vis_rect.bottom; + } + + pdev->dib.funcs->solid_rects(&pdev->dib, num, rects, pdev->brush_and, pdev->brush_xor); + return TRUE; +} + +void update_brush_rop( dibdrv_physdev *pdev, INT rop ) +{ + if(pdev->brush_style == BS_SOLID) + calc_and_xor_masks(rop, pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); +} + +/*********************************************************************** + * dibdrv_SelectBrush + */ +HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectBrush ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + LOGBRUSH logbrush; + + TRACE("(%p, %p)\n", dev, hbrush); + + if (!GetObjectW( hbrush, sizeof(logbrush), &logbrush )) return 0; + + if (hbrush == GetStockObject( DC_BRUSH )) + logbrush.lbColor = GetDCBrushColor( dev->hdc ); + + pdev->brush_style = logbrush.lbStyle; + + pdev->defer |= DEFER_BRUSH; + + switch(logbrush.lbStyle) + { + case BS_SOLID: + pdev->brush_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logbrush.lbColor); + calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); + pdev->brush_rects = solid_brush; + pdev->defer &= ~DEFER_BRUSH; + break; + default: + break; + } + + return next->funcs->pSelectBrush( next, hbrush ); +} + +/*********************************************************************** + * dibdrv_SetDCBrushColor + */ +COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCBrushColor ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH )) + { + pdev->brush_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, color); + calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); + } + + return next->funcs->pSetDCBrushColor( next, color ); +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fc86b32..91f4acb 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -102,10 +102,16 @@ typedef struct dibdrv_physdev /* pen */ DWORD pen_color, pen_and, pen_xor; BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); + + /* brush */ + UINT brush_style; + DWORD brush_color, brush_and, brush_xor; + BOOL (* brush_rects)(struct dibdrv_physdev *pdev, int num, RECT *rects); } dibdrv_physdev; #define DEFER_FORMAT 1 #define DEFER_PEN 2 +#define DEFER_BRUSH 4 typedef struct tagDC_FUNCS {

1 0

Igor Paliychuk : po: Update Ukrainian translation.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: ef1ad5f374125a3607f6428be5222813ce335546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1ad5f374125a3607f6428be… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Sat Apr 9 15:45:00 2011 +0300 po: Update Ukrainian translation. --- po/uk.po | 127 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 53 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef1ad5f374125a3607f64…

1 0

Austin English : vcomp: Add stub dll.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: dd2159c6e3fe9579ad14748e0f3dbe31fe447809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2159c6e3fe9579ad14748e0… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 8 18:03:47 2011 +0000 vcomp: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/vcomp/Makefile.in | 6 +++ dlls/vcomp/main.c | 48 ++++++++++++++++++++ dlls/vcomp/vcomp.spec | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 168 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7a31847..76ecd55 100755 --- a/configure +++ b/configure @@ -15372,6 +15372,7 @@ wine_fn_config_test dlls/usp10/tests usp10_test wine_fn_config_lib uuid wine_fn_config_dll uxtheme enable_uxtheme implib wine_fn_config_test dlls/uxtheme/tests uxtheme_test +wine_fn_config_dll vcomp enable_vcomp wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 82b1783..21c8d85 100644 --- a/configure.ac +++ b/configure.ac @@ -2815,6 +2815,7 @@ WINE_CONFIG_TEST(dlls/usp10/tests) WINE_CONFIG_LIB(uuid) WINE_CONFIG_DLL(uxtheme,,[implib]) WINE_CONFIG_TEST(dlls/uxtheme/tests) +WINE_CONFIG_DLL(vcomp) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) diff --git a/dlls/vcomp/Makefile.in b/dlls/vcomp/Makefile.in new file mode 100644 index 0000000..d256526 --- /dev/null +++ b/dlls/vcomp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = vcomp.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c new file mode 100644 index 0000000..0a3c4f5 --- /dev/null +++ b/dlls/vcomp/main.c @@ -0,0 +1,48 @@ +/* + * + * vcomp implementation + * + * Copyright 2011 Austin English + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec new file mode 100644 index 0000000..cd5a964 --- /dev/null +++ b/dlls/vcomp/vcomp.spec @@ -0,0 +1,112 @@ +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ stub _vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ stub _vcomp_atomic_add_r4 +@ stub _vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ stub _vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ stub _vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ stub _vcomp_atomic_div_r4 +@ stub _vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ stub _vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ stub _vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ stub _vcomp_atomic_mul_r4 +@ stub _vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ stub _vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ stub _vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ stub _vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ stub _vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ stub _vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ stub _vcomp_atomic_sub_r4 +@ stub _vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ stub _vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ stub _vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ stub _vcomp_enter_critsect +@ stub _vcomp_flush +@ stub _vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ stub _vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ stub _vcomp_for_static_end +@ stub _vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ stub _vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ stub _vcomp_fork +@ stub _vcomp_get_thread_num +@ stub _vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ stub _vcomp_master_begin +@ stub _vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ stub _vcomp_sections_init +@ stub _vcomp_sections_next +@ stub _vcomp_set_num_threads +@ stub _vcomp_single_begin +@ stub _vcomp_single_end +@ stub omp_destroy_lock +@ stub omp_destroy_nest_lock +@ stub omp_get_dynamic +@ stub omp_get_max_threads +@ stub omp_get_nested +@ stub omp_get_num_procs +@ stub omp_get_num_threads +@ stub omp_get_thread_num +@ stub omp_get_wtick +@ stub omp_get_wtime +@ stub omp_in_parallel +@ stub omp_init_lock +@ stub omp_init_nest_lock +@ stub omp_set_dynamic +@ stub omp_set_lock +@ stub omp_set_nest_lock +@ stub omp_set_nested +@ stub omp_set_num_threads +@ stub omp_test_lock +@ stub omp_test_nest_lock +@ stub omp_unset_lock +@ stub omp_unset_nest_lock

1 0