May 2014 - Wine-commits - list.winehq.org

Piotr Caban : oleacc: Add IOleWindow interface stub to default client accessible object.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 8c808f3ee90966a86c0f9ca17e78b1fbe4662378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c808f3ee90966a86c0f9ca17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:13 2014 +0200 oleacc: Add IOleWindow interface stub to default client accessible object. --- dlls/oleacc/client.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/oleacc/tests/main.c | 5 ++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 8a48b36..8c3f011 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; + IOleWindow IOleWindow_iface; LONG ref; @@ -48,11 +49,16 @@ static HRESULT WINAPI Client_QueryInterface(IAccessible *iface, REFIID riid, voi IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IAccessible_AddRef(iface); - return S_OK; + }else if(IsEqualIID(riid, &IID_IOleWindow)) { + *ppv = &This->IOleWindow_iface; + }else { + WARN("no interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IAccessible_AddRef(iface); + return S_OK; } static ULONG WINAPI Client_AddRef(IAccessible *iface) @@ -439,6 +445,51 @@ static const IAccessibleVtbl ClientVtbl = { Client_put_accValue }; +static inline Client* impl_from_Client_OleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, Client, IOleWindow_iface); +} + +static HRESULT WINAPI Client_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_OleWindow_AddRef(IOleWindow *iface) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_OleWindow_Release(IOleWindow *iface) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +{ + Client *This = impl_from_Client_OleWindow(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + Client *This = impl_from_Client_OleWindow(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl ClientOleWindowVtbl = { + Client_OleWindow_QueryInterface, + Client_OleWindow_AddRef, + Client_OleWindow_Release, + Client_OleWindow_GetWindow, + Client_OleWindow_ContextSensitiveHelp +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -452,6 +503,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) return E_OUTOFMEMORY; client->IAccessible_iface.lpVtbl = &ClientVtbl; + client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; client->ref = 1; client->hwnd = hwnd; diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index d76dc79..3783d36 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -383,6 +383,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; + IOleWindow *ow; HWND chld, hwnd; HRESULT hr; VARIANT vid, v; @@ -404,6 +405,10 @@ static void test_default_client_accessible_object(void) hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); + hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + IOleWindow_Release(ow); + hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); ok(l == 1, "l = %d\n", l);

1 0

Piotr Caban : oleacc: Add IOleWindow interface stub to default window accessible object.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 69ab9da0da71e880bf8f7908f575009d0cd65cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ab9da0da71e880bf8f7908f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:24 2014 +0200 oleacc: Add IOleWindow interface stub to default window accessible object. --- dlls/oleacc/window.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 45c53fc..f8090b5 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; + IOleWindow IOleWindow_iface; LONG ref; } Window; @@ -46,11 +47,16 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IAccessible_AddRef(iface); - return S_OK; + }else if(IsEqualIID(riid, &IID_IOleWindow)) { + *ppv = &This->IOleWindow_iface; + }else { + WARN("no interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IAccessible_AddRef(iface); + return S_OK; } static ULONG WINAPI Window_AddRef(IAccessible *iface) @@ -295,6 +301,51 @@ static const IAccessibleVtbl WindowVtbl = { Window_put_accValue }; +static inline Window* impl_from_Window_OleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, Window, IOleWindow_iface); +} + +static HRESULT WINAPI Window_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_OleWindow_AddRef(IOleWindow *iface) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_OleWindow_Release(IOleWindow *iface) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +{ + Window *This = impl_from_Window_OleWindow(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + Window *This = impl_from_Window_OleWindow(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl WindowOleWindowVtbl = { + Window_OleWindow_QueryInterface, + Window_OleWindow_AddRef, + Window_OleWindow_Release, + Window_OleWindow_GetWindow, + Window_OleWindow_ContextSensitiveHelp +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -308,6 +359,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) return E_OUTOFMEMORY; window->IAccessible_iface.lpVtbl = &WindowVtbl; + window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->ref = 1; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj);

1 0

Piotr Caban : oleacc: Add IOleWindow:: GetWindow implementation in default client accessible object.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 25312a10d35e9b45c485dba78c9c36fb79abb32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=25312a10d35e9b45c485dba78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:37 2014 +0200 oleacc: Add IOleWindow::GetWindow implementation in default client accessible object. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 8c3f011..cc7b53a 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -471,8 +471,11 @@ static ULONG WINAPI Client_OleWindow_Release(IOleWindow *iface) static HRESULT WINAPI Client_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) { Client *This = impl_from_Client_OleWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI Client_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 3783d36..dde2786 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -384,7 +384,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; IOleWindow *ow; - HWND chld, hwnd; + HWND chld, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -407,6 +407,9 @@ static void test_default_client_accessible_object(void) hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Piotr Caban : oleacc: Add WindowFromAccessibleObject implementation.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 6bd87c6bdbd91fb16fc6db746544adbfe57aa896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd87c6bdbd91fb16fc6db746… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:43 2014 +0200 oleacc: Add WindowFromAccessibleObject implementation. --- dlls/oleacc/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- dlls/oleacc/tests/main.c | 3 +++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 37d2269..9d5320e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -295,6 +295,40 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, return CreateStdAccessibleObject(hwnd, dwObjectID, riid, ppvObject); } +HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) +{ + IDispatch *parent; + IOleWindow *ow; + HRESULT hres; + + TRACE("%p %p\n", acc, phwnd); + + IAccessible_AddRef(acc); + while(1) { + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + IAccessible_Release(acc); + return hres; + } + + hres = IAccessible_get_accParent(acc, &parent); + IAccessible_Release(acc); + if(FAILED(hres)) + return hres; + if(hres!=S_OK || !parent) { + *phwnd = NULL; + return hres; + } + + hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc); + IDispatch_Release(parent); + if(FAILED(hres)) + return hres; + } +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 679ba1a..caeb6d3 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -19,4 +19,4 @@ @ stub LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) @ stdcall ObjectFromLresult(long ptr long ptr) -@ stub WindowFromAccessibleObject +@ stdcall WindowFromAccessibleObject(ptr ptr) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index dde2786..dbe8706 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -410,6 +410,9 @@ static void test_default_client_accessible_object(void) hr = IOleWindow_GetWindow(ow, &hwnd2); ok(hr == S_OK, "got %x\n", hr); ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + hr = WindowFromAccessibleObject(acc, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Jacek Caban : ieframe/tests: Fixed tests on IE11.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 5cc72a4522aa16a3f5713cf8fcafc58f840f0739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc72a4522aa16a3f5713cf8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:12:58 2014 +0200 ieframe/tests: Fixed tests on IE11. --- dlls/ieframe/tests/webbrowser.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4bf7949..12b349f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -455,6 +455,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 140: /* TODO (Win7) */ case 144: /* TODO */ case 178: /* IE11 */ + case 179: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -699,15 +700,16 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const V_VT(flags)); ok(V_VARIANTREF(flags) != NULL, "V_VARIANTREF(flags) == NULL)\n"); if(V_VARIANTREF(flags)) { + int f; + ok(V_VT(V_VARIANTREF(flags)) == VT_I4, "V_VT(V_VARIANTREF(flags))=%d, expected VT_I4\n", V_VT(V_VARIANTREF(flags))); - if(is_first_load) { - ok(V_I4(V_VARIANTREF(flags)) == 0, "V_I4(V_VARIANTREF(flags)) = %x, expected 0\n", - V_I4(V_VARIANTREF(flags))); - }else { - ok((V_I4(V_VARIANTREF(flags)) & ~0x40) == 0, "V_I4(V_VARIANTREF(flags)) = %x, expected 0x40 or 0\n", - V_I4(V_VARIANTREF(flags))); - } + f = V_I4(V_VARIANTREF(flags)); + f &= ~0x100; /* IE11 sets this flag */ + if(is_first_load) + ok(!f, "flags = %x, expected 0\n", V_I4(V_VARIANTREF(flags))); + else + ok(!(f & ~0x40), "flags = %x, expected 0x40 or 0\n", V_I4(V_VARIANTREF(flags))); } ok(V_VT(frame) == (VT_BYREF|VT_VARIANT), "V_VT(frame)=%x, expected VT_BYREF|VT_VARIANT\n", @@ -2736,7 +2738,7 @@ static void test_download(DWORD flags) test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0)|DWL_FROM_GOFORWARD)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2780,6 +2782,8 @@ static void test_download(DWORD flags) if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); + else if(flags & DWL_FROM_GOFORWARD) + CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { CHECK_CALLED(Invoke_BEFORENAVIGATE2); @@ -2951,10 +2955,12 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) SET_EXPECT(Invoke_BEFORENAVIGATE2); SET_EXPECT(Invoke_COMMANDSTATECHANGE); + SET_EXPECT(Invoke_PROPERTYCHANGE); hres = IWebBrowser2_GoBack(wb); ok(hres == S_OK, "GoBack failed: %08x\n", hres); CHECK_CALLED(Invoke_BEFORENAVIGATE2); todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); + CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ } static void test_go_forward(IWebBrowser2 *wb, const char *forward_url)

1 0

Jacek Caban : mshtml/tests: Fixed a few more IE11 test failures.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 810d8c71408686a2deabb9ac07a13a2790372c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=810d8c71408686a2deabb9ac0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:32:32 2014 +0200 mshtml/tests: Fixed a few more IE11 test failures. --- dlls/mshtml/tests/htmldoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 24c6cac..11015e7 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2983,6 +2983,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 143: /* TODO */ case 144: /* TODO */ case 178: + case 179: return E_NOTIMPL; default: @@ -3162,7 +3163,9 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(puArgErr != NULL, "puArgErr == NULL\n"); ok(V_VT(pVarResult) == 0, "V_VT(pVarResult)=%d, expected 0\n", V_VT(pVarResult)); ok(wFlags == DISPATCH_PROPERTYGET, "wFlags=%08x, expected DISPATCH_PROPERTYGET\n", wFlags); - test_readyState(NULL); + + if(dispIdMember != DISPID_AMBIENT_SILENT && dispIdMember != DISPID_AMBIENT_OFFLINEIFNOTCONNECTED) + test_readyState(NULL); switch(dispIdMember) { case DISPID_AMBIENT_USERMODE:

1 0

Jacek Caban : urlmon: Avoid ProtocolHandler being destroyed in Terminate call.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 54bf34f1e7cd916cfee8b4c383d7552296ae9a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bf34f1e7cd916cfee8b4c38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:56:51 2014 +0200 urlmon: Avoid ProtocolHandler being destroyed in Terminate call. --- dlls/urlmon/bindprot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 7f2bea1..1efb74c 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -698,6 +698,9 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD if(!This->reported_result) return E_FAIL; + /* This may get released in Terminate call. */ + IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); + IInternetProtocol_Terminate(This->protocol, 0); set_binding_sink(This, NULL, NULL); @@ -707,6 +710,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->bind_info = NULL; } + IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); return S_OK; }

1 0

Hans Leidekker : winhttp: Add support for retrieving the proxy automatic configuration URL on Mac OS X.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 50c710bd914ee7197f234472523f86cd6c651a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c710bd914ee7197f2344725… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:06:02 2014 +0200 winhttp: Add support for retrieving the proxy automatic configuration URL on Mac OS X. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/session.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 948e0ed..7fbe2a7 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -2,7 +2,7 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 -EXTRALIBS = $(SOCKET_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e773f05..f2ed72b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -23,6 +23,15 @@ #include <stdarg.h> #include <stdlib.h> +#ifdef HAVE_CORESERVICES_CORESERVICES_H +#define GetCurrentThread MacGetCurrentThread +#define LoadResource MacLoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource +#undef DPRINTF +#endif + #include "windef.h" #include "winbase.h" #ifndef __MINGW32__ @@ -1286,12 +1295,42 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) return ret; } +static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen ) +{ +#ifdef HAVE_CORESERVICES_CORESERVICES_H + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + const void *ref; + BOOL ret = FALSE; + + if (!settings) return FALSE; + + if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) + { + CFRelease( settings ); + return FALSE; + } + if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + { + TRACE( "returning %s\n", debugstr_a(buf) ); + ret = TRUE; + } + CFRelease( settings ); + return ret; +#else + FIXME( "no support on this platform\n" ); + return FALSE; +#endif +} + +#define INTERNET_MAX_URL_LENGTH 2084 + /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) { BOOL ret = FALSE; + char system_url[INTERNET_MAX_URL_LENGTH + 1]; TRACE("0x%08x, %p\n", flags, url); @@ -1300,6 +1339,14 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } + if (get_system_proxy_autoconfig_url( system_url, sizeof(system_url) )) + { + WCHAR *urlW; + + if (!(urlW = strdupAW( system_url ))) return FALSE; + *url = urlW; + return TRUE; + } if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) { static int fixme_shown;

1 0

Alexandre Julliard : advpack: Remove unnecessary DllMain implementation.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 0289ea0e43ad099db86642e1776313c8b5ac36c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0289ea0e43ad099db86642e17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:03 2014 +0200 advpack: Remove unnecessary DllMain implementation. --- dlls/advpack/advpack.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 296abb5..83dda08 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -208,19 +208,6 @@ HRESULT WINAPI CloseINFEngine(HINF hInf) } /*********************************************************************** - * DllMain (ADVPACK.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -} - -/*********************************************************************** * IsNTAdmin (ADVPACK.@) * * Checks if the user has admin privileges.

1 0

Alexandre Julliard : dciman32: Remove unnecessary DllMain implementation.
by Alexandre Julliard 15 May '14

15 May '14

Module: wine Branch: master Commit: 16352f0aeeb4a5429a9b9b78f75baa20cefd564d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16352f0aeeb4a5429a9b9b78f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:14 2014 +0200 dciman32: Remove unnecessary DllMain implementation. --- dlls/dciman32/dciman_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/dciman32/dciman_main.c b/dlls/dciman32/dciman_main.c index 2287c78..c693492 100644 --- a/dlls/dciman32/dciman_main.c +++ b/dlls/dciman32/dciman_main.c @@ -31,18 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dciman); /*********************************************************************** - * DllEntryPoint (DCIMAN32.@) - * - * DCIMAN32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - -/*********************************************************************** * DCIOpenProvider (DCIMAN32.@) */ HDC WINAPI

1 0