wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Thomas Mullaly : urlmon: Added FeatureControl registry keys.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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

Thomas Mullaly : urlmon/tests: Added tests for CoInternetSetFeatureEnabled.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: b83967ce6b5d98a2df61cd573f16f8cca1055f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83967ce6b5d98a2df61cd573… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Wed Apr 6 19:37:19 2011 -0400 urlmon/tests: Added tests for CoInternetSetFeatureEnabled. --- dlls/urlmon/tests/misc.c | 52 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 446721a..4811ab0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -76,6 +76,7 @@ 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 HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static void test_CreateFormatEnum(void) { @@ -1538,13 +1539,61 @@ static void test_CoInternetIsFeatureEnabled(void) { ok(hres == E_FAIL, "CoInternetIsFeatureEnabled returned %08x, expected E_FAIL\n", hres); } +static const struct { + INTERNETFEATURELIST feature; + DWORD set_flags; + BOOL enable; + HRESULT set_expected; + BOOL set_todo; + DWORD get_flags; + HRESULT get_expected; + BOOL get_todo; +} internet_feature_tests[] = { + {FEATURE_OBJECT_CACHING,SET_FEATURE_ON_PROCESS,FALSE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_WEBOC_POPUPMANAGEMENT,SET_FEATURE_ON_PROCESS,TRUE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_LOCALMACHINE_LOCKDOWN,SET_FEATURE_ON_PROCESS,TRUE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_OK,TRUE} +}; + +static void test_CoInternetSetFeatureEnabled(void) { + HRESULT hres; + DWORD i; + + hres = pCoInternetSetFeatureEnabled(FEATURE_ENTRY_COUNT,SET_FEATURE_ON_PROCESS,TRUE); + todo_wine + ok(hres == E_FAIL, "CoInternetSetFeatureEnabled returned %08x, expected E_FAIL\n", hres); + + for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) { + hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags, + internet_feature_tests[i].enable); + if(internet_feature_tests[i].set_todo) { + todo_wine + ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].set_expected, i); + } else { + ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].set_expected, i); + } + + hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags); + if(internet_feature_tests[i].get_todo) { + todo_wine + ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].get_expected, i); + } else { + ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].get_expected, i); + } + } +} + static void test_internet_features(void) { - if(!pCoInternetIsFeatureEnabled) { + if(!pCoInternetIsFeatureEnabled || !pCoInternetSetFeatureEnabled) { win_skip("Skipping internet feature tests, IE is too old\n"); return; } test_CoInternetIsFeatureEnabled(); + test_CoInternetSetFeatureEnabled(); } START_TEST(misc) @@ -1564,6 +1613,7 @@ START_TEST(misc) pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption"); pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); + pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) {

1 0

Thomas Mullaly : urlmon/tests: Added tests for CoInternetIsFeatureEnabled.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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 11 Apr '11

11 Apr '11

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: Audio drivers unconditionally invoke DriverCallback.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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

Jörg Höhle : winmm: DriverCallback returns TRUE iff there is notification.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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

Jörg Höhle : winmm: Trace DriverCallback once upon entry.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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

Alexandre Julliard : gdi32: Fix a compiler warning on 64-bit.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 7c06fef8b636a897923a559d07e11f17f66402d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c06fef8b636a897923a559d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 13:45:23 2011 +0200 gdi32: Fix a compiler warning on 64-bit. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 03a4cbd..b329b33 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3974,7 +3974,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l CHARSETINFO csi; DWORD n = 0; - if (TranslateCharsetInfo((DWORD*)charset, &csi, TCI_SRCCHARSET) && + if (TranslateCharsetInfo(ULongToPtr(charset), &csi, TCI_SRCCHARSET) && csi.fs.fsCsb[0] != 0) { list->element[n].mask = csi.fs.fsCsb[0]; list->element[n].charset = csi.ciCharset;

1 0

Huw Davies : gdi32/tests: Add PatBlt tests.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 16008856904bba4b6836e6a9b701da70be721712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16008856904bba4b6836e6a9b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 11 10:11:10 2011 +0100 gdi32/tests: Add PatBlt tests. --- dlls/gdi32/tests/dib.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d882da4..784f0dd 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -31,10 +31,52 @@ static HCRYPTPROV crypt_prov; +static const DWORD rop3[256] = +{ + 0x000042, 0x010289, 0x020C89, 0x0300AA, 0x040C88, 0x0500A9, 0x060865, 0x0702C5, + 0x080F08, 0x090245, 0x0A0329, 0x0B0B2A, 0x0C0324, 0x0D0B25, 0x0E08A5, 0x0F0001, + 0x100C85, 0x1100A6, 0x120868, 0x1302C8, 0x140869, 0x1502C9, 0x165CCA, 0x171D54, + 0x180D59, 0x191CC8, 0x1A06C5, 0x1B0768, 0x1C06CA, 0x1D0766, 0x1E01A5, 0x1F0385, + 0x200F09, 0x210248, 0x220326, 0x230B24, 0x240D55, 0x251CC5, 0x2606C8, 0x271868, + 0x280369, 0x2916CA, 0x2A0CC9, 0x2B1D58, 0x2C0784, 0x2D060A, 0x2E064A, 0x2F0E2A, + 0x30032A, 0x310B28, 0x320688, 0x330008, 0x3406C4, 0x351864, 0x3601A8, 0x370388, + 0x38078A, 0x390604, 0x3A0644, 0x3B0E24, 0x3C004A, 0x3D18A4, 0x3E1B24, 0x3F00EA, + 0x400F0A, 0x410249, 0x420D5D, 0x431CC4, 0x440328, 0x450B29, 0x4606C6, 0x47076A, + 0x480368, 0x4916C5, 0x4A0789, 0x4B0605, 0x4C0CC8, 0x4D1954, 0x4E0645, 0x4F0E25, + 0x500325, 0x510B26, 0x5206C9, 0x530764, 0x5408A9, 0x550009, 0x5601A9, 0x570389, + 0x580785, 0x590609, 0x5A0049, 0x5B18A9, 0x5C0649, 0x5D0E29, 0x5E1B29, 0x5F00E9, + 0x600365, 0x6116C6, 0x620786, 0x630608, 0x640788, 0x650606, 0x660046, 0x6718A8, + 0x6858A6, 0x690145, 0x6A01E9, 0x6B178A, 0x6C01E8, 0x6D1785, 0x6E1E28, 0x6F0C65, + 0x700CC5, 0x711D5C, 0x720648, 0x730E28, 0x740646, 0x750E26, 0x761B28, 0x7700E6, + 0x7801E5, 0x791786, 0x7A1E29, 0x7B0C68, 0x7C1E24, 0x7D0C69, 0x7E0955, 0x7F03C9, + 0x8003E9, 0x810975, 0x820C49, 0x831E04, 0x840C48, 0x851E05, 0x8617A6, 0x8701C5, + 0x8800C6, 0x891B08, 0x8A0E06, 0x8B0666, 0x8C0E08, 0x8D0668, 0x8E1D7C, 0x8F0CE5, + 0x900C45, 0x911E08, 0x9217A9, 0x9301C4, 0x9417AA, 0x9501C9, 0x960169, 0x97588A, + 0x981888, 0x990066, 0x9A0709, 0x9B07A8, 0x9C0704, 0x9D07A6, 0x9E16E6, 0x9F0345, + 0xA000C9, 0xA11B05, 0xA20E09, 0xA30669, 0xA41885, 0xA50065, 0xA60706, 0xA707A5, + 0xA803A9, 0xA90189, 0xAA0029, 0xAB0889, 0xAC0744, 0xAD06E9, 0xAE0B06, 0xAF0229, + 0xB00E05, 0xB10665, 0xB21974, 0xB30CE8, 0xB4070A, 0xB507A9, 0xB616E9, 0xB70348, + 0xB8074A, 0xB906E6, 0xBA0B09, 0xBB0226, 0xBC1CE4, 0xBD0D7D, 0xBE0269, 0xBF08C9, + 0xC000CA, 0xC11B04, 0xC21884, 0xC3006A, 0xC40E04, 0xC50664, 0xC60708, 0xC707AA, + 0xC803A8, 0xC90184, 0xCA0749, 0xCB06E4, 0xCC0020, 0xCD0888, 0xCE0B08, 0xCF0224, + 0xD00E0A, 0xD1066A, 0xD20705, 0xD307A4, 0xD41D78, 0xD50CE9, 0xD616EA, 0xD70349, + 0xD80745, 0xD906E8, 0xDA1CE9, 0xDB0D75, 0xDC0B04, 0xDD0228, 0xDE0268, 0xDF08C8, + 0xE003A5, 0xE10185, 0xE20746, 0xE306EA, 0xE40748, 0xE506E5, 0xE61CE8, 0xE70D79, + 0xE81D74, 0xE95CE6, 0xEA02E9, 0xEB0849, 0xEC02E8, 0xED0848, 0xEE0086, 0xEF0A08, + 0xF00021, 0xF10885, 0xF20B05, 0xF3022A, 0xF40B0A, 0xF50225, 0xF60265, 0xF708C5, + 0xF802E5, 0xF90845, 0xFA0089, 0xFB0A09, 0xFC008A, 0xFD0A0A, 0xFE02A9, 0xFF0062 +}; + +static inline BOOL rop_uses_src(DWORD rop) +{ + return (((rop & 0xcc0000) >> 2) != (rop & 0x330000)); +} + static const char *sha1_graphics_a8r8g8b8[] = { "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", "2426172d9e8fec27d9228088f382ef3c93717da9", + "17b2c177bdce5e94433574a928bda5c94a8cdfa5", NULL }; @@ -107,7 +149,8 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh { DWORD dib_size = get_dib_size(bmi); HPEN solid_pen, orig_pen; - INT i; + HBRUSH solid_brush, orig_brush; + INT i, y; memset(bits, 0xcc, dib_size); compare_hash(bmi, bits, sha1, "empty"); @@ -129,8 +172,31 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh LineTo(hdc, 170 + i * 3, 10); /* b -> t */ } compare_hash(bmi, bits, sha1, "h and v solid lines"); + memset(bits, 0xcc, dib_size); + + solid_brush = CreateSolidBrush(RGB(0x33, 0xaa, 0xff)); + orig_brush = SelectObject(hdc, solid_brush); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + ret = PatBlt(hdc, 10, y, 100, 10, rop3[i]); + + if(rop_uses_src(rop3[i])) + ok(ret == FALSE, "got TRUE for %x\n", rop3[i]); + else + { + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 20; + } + + } + compare_hash(bmi, bits, sha1, "solid patblt"); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); + DeleteObject(solid_brush); DeleteObject(solid_pen); }

1 0

Huw Davies : gdi32: Implement PatBlt.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 91ff1440184eb57fa7cdfc9b1ed998eeb32685d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ff1440184eb57fa7cdfc9b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 11 10:07:12 2011 +0100 gdi32: Implement PatBlt. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9c2aca4..d784c94 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -200,7 +200,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pOffsetViewportOrg */ NULL, /* pOffsetWindowOrg */ NULL, /* pPaintRgn */ - NULL, /* pPatBlt */ + dibdrv_PatBlt, /* pPatBlt */ NULL, /* pPie */ NULL, /* pPolyBezier */ NULL, /* pPolyBezierTo */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index e62536f..c6cdd62 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -19,6 +19,7 @@ */ extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWORD rop ) 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; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 1b4ccb3..7d0f2e9 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -25,6 +25,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) +{ + RECT rect; + + rect.left = left; + rect.top = top; + rect.right = right; + rect.bottom = bottom; + if (GetLayout( hdc ) & LAYOUT_RTL) + { + /* shift the rectangle so that the right border is included after mirroring */ + /* it would be more correct to do this after LPtoDP but that's not what Windows does */ + rect.left--; + rect.right--; + } + LPtoDP( hdc, (POINT *)&rect, 2 ); + if (rect.left > rect.right) + { + int tmp = rect.left; + rect.left = rect.right; + rect.right = tmp; + } + if (rect.top > rect.bottom) + { + int tmp = rect.top; + rect.top = rect.bottom; + rect.bottom = tmp; + } + return rect; +} + /*********************************************************************** * dibdrv_LineTo */ @@ -45,3 +76,42 @@ BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) return TRUE; } + +/*********************************************************************** + * get_rop2_from_rop + * + * Returns the binary rop that is equivalent to the provided ternary rop + * if the src bits are ignored. + */ +static inline INT get_rop2_from_rop(INT rop) +{ + return (((rop >> 18) & 0x0c) | ((rop >> 16) & 0x03)) + 1; +} + +/*********************************************************************** + * dibdrv_PatBlt + */ +BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWORD rop ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPatBlt ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + INT rop2 = get_rop2_from_rop(rop); + RECT rect = get_device_rect( dev->hdc, x, y, x + width, y + height ); + BOOL done; + + TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, x, y, width, height, rop); + + if(defer_brush(pdev)) + return next->funcs->pPatBlt( next, x, y, width, height, rop ); + + update_brush_rop( pdev, rop2 ); + + done = pdev->brush_rects( pdev, 1, &rect ); + + update_brush_rop( pdev, GetROP2(dev->hdc) ); + + if(!done) + return next->funcs->pPatBlt( next, x, y, width, height, rop ); + + return TRUE; +}

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011