February 2015 - Wine-Commits

Amine Khaldi : include: Complete and properly pack DNS_HEADER structure.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 3809c7a1bc8c35bed4850eb4761c62a38b3cb4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3809c7a1bc8c35bed4850eb47… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Feb 23 21:43:14 2015 +0100 include: Complete and properly pack DNS_HEADER structure. --- include/windns.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/include/windns.h b/include/windns.h index b8a3e09..fc2a49c 100644 --- a/include/windns.h +++ b/include/windns.h @@ -176,22 +176,26 @@ typedef struct _IP4_ARRAY IP4_ADDRESS AddrArray[1]; } IP4_ARRAY, *PIP4_ARRAY; +#include <pshpack1.h> typedef struct _DNS_HEADER { WORD Xid; - BYTE RecursionDesired; - BYTE Truncation; - BYTE Authoritative; - BYTE Opcode; - BYTE IsResponse; - BYTE ResponseCode; - BYTE Reserved; - BYTE RecursionAvailable; + BYTE RecursionDesired:1; + BYTE Truncation:1; + BYTE Authoritative:1; + BYTE Opcode:4; + BYTE IsResponse:1; + BYTE ResponseCode:4; + BYTE CheckingDisabled:1; + BYTE AuthenticatedData:1; + BYTE Reserved:1; + BYTE RecursionAvailable:1; WORD QuestionCount; WORD AnswerCount; WORD NameServerCount; WORD AdditionalCount; } DNS_HEADER, *PDNS_HEADER; +#include <poppack.h> typedef struct _DNS_MESSAGE_BUFFER {

1 0

Sebastian Lackner : shell32: Fix memory leak in ApplicationAssociationRegistration_QueryCurrentDefault.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: aba6a680680c493add66f969a3a39b28f3a39779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba6a680680c493add66f969a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 26 06:29:51 2015 +0100 shell32: Fix memory leak in ApplicationAssociationRegistration_QueryCurrentDefault. --- dlls/shell32/assoc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 528666e..686c323 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -916,6 +916,11 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, &keytype, *association, &size); if(ret == ERROR_SUCCESS) hr = S_OK; + else + { + CoTaskMemFree(*association); + *association = NULL; + } } else hr = E_OUTOFMEMORY; @@ -952,6 +957,11 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp ret = RegGetValueW(hkey, path, propid, RRF_RT_REG_SZ, &keytype, *association, &size); if(ret == ERROR_SUCCESS) hr = S_OK; + else + { + CoTaskMemFree(*association); + *association = NULL; + } } else hr = E_OUTOFMEMORY;

1 0

Aric Stewart : imm32: Use thread data from target HWND.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 455ca1adb08a87c01a7b044171c909176d8895cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=455ca1adb08a87c01a7b04417… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 25 11:45:22 2015 -0600 imm32: Use thread data from target HWND. --- dlls/imm32/imm.c | 39 +++++++++++++++++++++++++++++---------- dlls/imm32/tests/imm32.c | 21 ++++++++++++++------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index db5939c..2b3804e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -246,6 +246,21 @@ static IMMThreadData* IMM_GetThreadData(DWORD id) return data; } +static IMMThreadData* IMM_GetThreadDataForWindow(HWND hwnd) +{ + DWORD process; + DWORD thread = 0; + + if (hwnd) + { + thread = GetWindowThreadProcessId(hwnd, &process); + if (process != GetCurrentProcessId()) + return NULL; + } + + return IMM_GetThreadData(thread); +} + static BOOL IMM_IsDefaultContext(HIMC imc) { InputContextData *data = get_imc_data(imc); @@ -478,21 +493,21 @@ static InputContextData* get_imc_data(HIMC hIMC) return data; } -static IMMThreadData* IMM_GetInitializedThreadData(void) +static IMMThreadData* IMM_GetInitializedThreadData(HWND hWnd) { - IMMThreadData* thread_data = IMM_GetThreadData(0); + IMMThreadData* thread_data = IMM_GetThreadDataForWindow(hWnd); if (!thread_data) return NULL; - if (!thread_data->defaultContext) + if (!thread_data->defaultContext && thread_data->threadID == GetCurrentThreadId()) { HIMC defaultContext; LeaveCriticalSection(&threaddata_cs); defaultContext = ImmCreateContext(); if (defaultContext) ((InputContextData*)defaultContext)->threadDefault = TRUE; - thread_data = IMM_GetThreadData(0); + thread_data = IMM_GetThreadDataForWindow(hWnd); if (!thread_data) { IMM_DestroyContext(defaultContext); @@ -528,7 +543,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && data->IMC.hWnd == hWnd) return hIMC; - thread_data = IMM_GetInitializedThreadData(); + thread_data = IMM_GetInitializedThreadData(hWnd); if (!thread_data) return NULL; @@ -603,7 +618,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) TRACE("(%p, %p, 0x%x):\n", hWnd, hIMC, dwFlags); - thread_data = IMM_GetInitializedThreadData(); + thread_data = IMM_GetInitializedThreadData(hWnd); if (!thread_data) return FALSE; @@ -1470,7 +1485,7 @@ HIMC WINAPI ImmGetContext(HWND hWnd) return NULL; } - thread_data = IMM_GetInitializedThreadData(); + thread_data = IMM_GetInitializedThreadData(hWnd); if (!thread_data) return NULL; @@ -1595,18 +1610,21 @@ BOOL WINAPI ImmGetConversionStatus( HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { HWND ret, new = NULL; - IMMThreadData* thread_data = IMM_GetThreadData(0); + IMMThreadData* thread_data = IMM_GetThreadDataForWindow(hWnd); if (!thread_data) return NULL; - if (thread_data->hwndDefault == NULL) + if (thread_data->hwndDefault == NULL && thread_data->threadID == GetCurrentThreadId()) { /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); new = CreateWindowExW( WS_EX_TOOLWINDOW, szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); - thread_data = IMM_GetThreadData(0); + thread_data = IMM_GetThreadDataForWindow(hWnd); if (!thread_data) + { + DestroyWindow(new); return NULL; + } /* See if anyone beat us */ if (thread_data->hwndDefault == NULL) { @@ -1622,6 +1640,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { DestroyWindow(new); } + TRACE("Default is %p\n",ret); return ret; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d434648..34e82c6 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -425,15 +425,17 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) HWND hwnd2; COMPOSITIONFORM cf; POINT pt; + MSG msg; + igc_threadinfo *info= (igc_threadinfo*)lpParam; info->hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); h1 = ImmGetContext(hwnd); - todo_wine ok(info->himc == h1, "hwnd context changed in new thread\n"); + ok(info->himc == h1, "hwnd context changed in new thread\n"); h2 = ImmGetContext(info->hwnd); - todo_wine ok(h2 != h1, "new hwnd in new thread should have different context\n"); + ok(h2 != h1, "new hwnd in new thread should have different context\n"); info->himc = h2; ImmReleaseContext(hwnd,h1); @@ -452,7 +454,12 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) ImmSetStatusWindowPos(h1, &pt); SetEvent(info->event); - Sleep(INFINITE); + + while(GetMessageW(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } return 1; } @@ -477,8 +484,8 @@ static void test_ImmThreads(void) otherHimc = ImmGetContext(threadinfo.hwnd); - todo_wine ok(himc != otherHimc, "Windows from other threads should have different himc\n"); - todo_wine ok(otherHimc == threadinfo.himc, "Context from other thread should not change in main thread\n"); + ok(himc != otherHimc, "Windows from other threads should have different himc\n"); + ok(otherHimc == threadinfo.himc, "Context from other thread should not change in main thread\n"); if (0) /* FIXME: Causes wine to hang */ { @@ -566,7 +573,7 @@ static void test_ImmThreads(void) ok (rc == 1, "ImmGetCandidateWindow should succeed\n"); rc = ImmGetCandidateWindow(otherHimc, 0, &cdf); - todo_wine ok (rc == 0, "ImmGetCandidateWindow should fail\n"); + ok (rc == 0, "ImmGetCandidateWindow should fail\n"); rc = ImmSetCandidateWindow(otherHimc, &cdf); todo_wine ok (rc == 0, "ImmSetCandidateWindow should fail\n"); @@ -577,7 +584,7 @@ static void test_ImmThreads(void) TerminateThread(hThread, 1); himc = ImmGetContext(GetDesktopWindow()); - todo_wine ok(himc == NULL, "Should not be able to get himc from other process window\n"); + ok(himc == NULL, "Should not be able to get himc from other process window\n"); } static void test_ImmIsUIMessage(void)

1 0

Alexandre Julliard : imm32: Remove redundant IsWindow calls.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: c731ed30acb08fe6414230f376e629589e42eab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c731ed30acb08fe6414230f37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 22:52:56 2015 +0900 imm32: Remove redundant IsWindow calls. --- dlls/imm32/imm.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 1fc553d..c4b44e4 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -588,23 +588,9 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (!hIMC) return old; - if (IsWindow(data->IMC.hWnd)) - { - /* - * Post a message that your context is switching - */ - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); - } - + SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); data->IMC.hWnd = hWnd; - - if (IsWindow(data->IMC.hWnd)) - { - /* - * Post a message that your context is switching - */ - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); - } + SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); return old; } @@ -2185,13 +2171,11 @@ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) InputContextData *data = get_imc_data(hIMC); TRACE("%p %ld %ld\n", hIMC, wParam, wParam); - if (!data) - SetLastError(ERROR_INVALID_HANDLE); - if (data && IsWindow(data->IMC.hWnd)) - return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); + if (data) return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); - return 0; + SetLastError(ERROR_INVALID_HANDLE); + return 0; } /*********************************************************************** @@ -2203,13 +2187,10 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) TRACE("%p %ld %ld\n", hIMC, wParam, wParam); - if (!data) - SetLastError(ERROR_INVALID_HANDLE); - - if (data && IsWindow(data->IMC.hWnd)) - return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); + if (data) return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); - return 0; + SetLastError(ERROR_INVALID_HANDLE); + return 0; } /***********************************************************************

1 0

Jacek Caban : urlmon: Added IInternetBindInfo implementation to BindStatusCallback object.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 168e915c918a38f29c4323fb24e84de56c81d5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=168e915c918a38f29c4323fb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 26 11:00:27 2015 +0100 urlmon: Added IInternetBindInfo implementation to BindStatusCallback object. --- dlls/urlmon/bindctx.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/url.c | 11 +++++++++ 2 files changed, 73 insertions(+) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index b2d2776..d8bba1b 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -29,6 +29,7 @@ extern IID IID_IBindStatusCallbackHolder; typedef struct { IBindStatusCallbackEx IBindStatusCallbackEx_iface; + IInternetBindInfo IInternetBindInfo_iface; IServiceProvider IServiceProvider_iface; IHttpNegotiate2 IHttpNegotiate2_iface; IAuthenticate IAuthenticate_iface; @@ -126,6 +127,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallbackEx *i }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { TRACE("(%p)->(IID_IAuthenticate, %p)\n", This, ppv); *ppv = &This->IAuthenticate_iface; + }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { + TRACE("(%p)->(IID_IInternetBindInfo, %p)\n", This, ppv); + *ppv = &This->IInternetBindInfo_iface; } if(*ppv) { @@ -497,6 +501,63 @@ static const IAuthenticateVtbl BSCAuthenticateVtbl = { BSCAuthenticate_Authenticate }; +static inline BindStatusCallback *impl_from_IInternetBindInfo(IInternetBindInfo *iface) +{ + return CONTAINING_RECORD(iface, BindStatusCallback, IInternetBindInfo_iface); +} + +static HRESULT WINAPI BSCInternetBindInfo_QueryInterface(IInternetBindInfo *iface, REFIID riid, void **ppv) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_QueryInterface(&This->IBindStatusCallbackEx_iface, riid, ppv); +} + +static ULONG WINAPI BSCInternetBindInfo_AddRef(IInternetBindInfo *iface) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_AddRef(&This->IBindStatusCallbackEx_iface); +} + +static ULONG WINAPI BSCInternetBindInfo_Release(IInternetBindInfo *iface) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_Release(&This->IBindStatusCallbackEx_iface); +} + +static HRESULT WINAPI BSCInternetBindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *bindf, BINDINFO *bindinfo) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + FIXME("(%p)->(%p %p)\n", This, bindf, bindinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI BSCInternetBindInfo_GetBindString(IInternetBindInfo *iface, ULONG string_type, + WCHAR **strs, ULONG cnt, ULONG *fetched) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + IInternetBindInfo *bind_info; + HRESULT hres; + + TRACE("(%p)->(%d %p %d %p)\n", This, string_type, strs, cnt, fetched); + + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IInternetBindInfo, (void**)&bind_info); + if(FAILED(hres)) + return hres; + + hres = IInternetBindInfo_GetBindString(bind_info, string_type, strs, cnt, fetched); + + IInternetBindInfo_Release(bind_info); + return hres; +} + +static IInternetBindInfoVtbl BSCInternetBindInfoVtbl = { + BSCInternetBindInfo_QueryInterface, + BSCInternetBindInfo_AddRef, + BSCInternetBindInfo_Release, + BSCInternetBindInfo_GetBindInfo, + BSCInternetBindInfo_GetBindString +}; + static void set_callback(BindStatusCallback *This, IBindStatusCallback *bsc) { IServiceProvider *serv_prov; @@ -523,6 +584,7 @@ HRESULT wrap_callback(IBindStatusCallback *bsc, IBindStatusCallback **ret_iface) return E_OUTOFMEMORY; ret->IBindStatusCallbackEx_iface.lpVtbl = &BindStatusCallbackExVtbl; + ret->IInternetBindInfo_iface.lpVtbl = &BSCInternetBindInfoVtbl; ret->IServiceProvider_iface.lpVtbl = &BSCServiceProviderVtbl; ret->IHttpNegotiate2_iface.lpVtbl = &BSCHttpNegotiateVtbl; ret->IAuthenticate_iface.lpVtbl = &BSCAuthenticateVtbl; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ab564f7..dd3a52d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2564,6 +2564,7 @@ static BOOL test_bscholder(IBindStatusCallback *holder) IHttpNegotiate *http_negotiate, *http_negotiate_serv; IHttpNegotiate2 *http_negotiate2, *http_negotiate2_serv; IAuthenticate *authenticate, *authenticate_serv; + IInternetBindInfo *bind_info; IInternetProtocol *protocol; BINDINFO bindinfo = {sizeof(bindinfo)}; BOOL ret = TRUE; @@ -2678,6 +2679,16 @@ static BOOL test_bscholder(IBindStatusCallback *holder) IAuthenticate_Release(authenticate); IAuthenticate_Release(authenticate_serv); + hres = IBindStatusCallback_QueryInterface(holder, &IID_IInternetBindInfo, (void**)&bind_info); + ok(hres == S_OK || broken(hres == E_NOINTERFACE /* win2k */), "Could not get IInternetBindInfo interface: %08x\n", hres); + + if(SUCCEEDED(hres)) { + hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_USER_AGENT, &wstr, 1, &dw); + ok(hres == E_NOINTERFACE, "GetBindString(BINDSTRING_USER_AGENT) failed: %08x\n", hres); + + IInternetBindInfo_Release(bind_info); + } + SET_EXPECT(OnStopBinding); hres = IBindStatusCallback_OnStopBinding(holder, S_OK, NULL); ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres);

1 0

Andrew Eikum : advapi32: Stub EventActivityIdControl.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 8140bdc752125249c1a5adae618f964941c177f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8140bdc752125249c1a5adae6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 25 14:27:15 2015 -0600 advapi32: Stub EventActivityIdControl. Used by the Office 2013 live installer. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 40ae014..322360d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -269,7 +269,7 @@ # @ stub EventAccessControl # @ stub EventAccessQuery # @ stub EventAccessRemove -# @ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 988060f..bebb08b 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -908,6 +908,16 @@ BOOLEAN WINAPI EventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ke } /****************************************************************************** + * EventActivityIdControl [ADVAPI32.@] + * + */ +ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid) +{ + FIXME("0x%x, %p: stub\n", code, guid); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EventWrite [ADVAPI32.@] */ ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG count, diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 5b0b069..130f285 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -38,7 +38,7 @@ @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) advapi32.EqualPrefixSid @ stdcall EqualSid(ptr ptr) advapi32.EqualSid -@ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) advapi32.EventActivityIdControl @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled @ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index 901f74c..a498097 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) advapi32.EventActivityIdControl @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled @ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister

1 0

Matteo Bruni : wined3d: Remove ARB_/EXT_TEXTURE_ENV_ADD.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 67d2b52c27841228897c738a7417f7ad22a44830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d2b52c27841228897c738a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:18 2015 +0100 wined3d: Remove ARB_/EXT_TEXTURE_ENV_ADD. --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_gl.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5fa9355..4ca13f4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -145,7 +145,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP }, - {"GL_ARB_texture_env_add", ARB_TEXTURE_ENV_ADD }, {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, @@ -192,7 +191,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture3D", EXT_TEXTURE3D }, {"GL_EXT_texture_compression_rgtc", EXT_TEXTURE_COMPRESSION_RGTC }, {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC }, - {"GL_EXT_texture_env_add", EXT_TEXTURE_ENV_ADD }, {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3f06601..48d25b0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -81,7 +81,6 @@ enum wined3d_gl_extension ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_COMPRESSION_RGTC, ARB_TEXTURE_CUBE_MAP, - ARB_TEXTURE_ENV_ADD, ARB_TEXTURE_ENV_COMBINE, ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, @@ -126,7 +125,6 @@ enum wined3d_gl_extension EXT_TEXTURE3D, EXT_TEXTURE_COMPRESSION_RGTC, EXT_TEXTURE_COMPRESSION_S3TC, - EXT_TEXTURE_ENV_ADD, EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC,

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_GetPrivateData().
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 43452192745f49961eef998b51dbc96c465b0b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43452192745f49961eef998b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:33 2015 +0100 d3d10core: Implement d3d10_vertex_shader_GetPrivateData(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index bb0e596..8010828 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -200,10 +200,12 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader * static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface,

1 0

Jacek Caban : appwiz.cpl: Use custom user agent string for addon downloader.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 66514fd7135cd672b832f78eda54e994bbb1bdc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66514fd7135cd672b832f78ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 25 19:35:12 2015 +0100 appwiz.cpl: Use custom user agent string for addon downloader. --- dlls/appwiz.cpl/Makefile.in | 2 +- dlls/appwiz.cpl/addons.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 1cf7b0e..a8341fa 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,5 +1,5 @@ MODULE = appwiz.cpl -IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 user32 comdlg32 +IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 DELAYIMPORTS = msi C_SRCS = \ diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 7fce9cb..9fbb386 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -415,6 +415,8 @@ static enum install_res install_from_cache(void) return res; } +static IInternetBindInfo InstallCallbackBindInfo; + static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { @@ -423,6 +425,12 @@ static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, return S_OK; } + if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { + TRACE("IID_IInternetBindInfo\n"); + *ppv = &InstallCallbackBindInfo; + return S_OK; + } + return E_INVALIDARG; } @@ -564,6 +572,59 @@ static const IBindStatusCallbackVtbl InstallCallbackVtbl = { static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; +static HRESULT WINAPI InstallCallbackBindInfo_QueryInterface(IInternetBindInfo *iface, REFIID riid, void **ppv) +{ + return IBindStatusCallback_QueryInterface(&InstallCallback, riid, ppv); +} + +static ULONG WINAPI InstallCallbackBindInfo_AddRef(IInternetBindInfo *iface) +{ + return 2; +} + +static ULONG WINAPI InstallCallbackBindInfo_Release(IInternetBindInfo *iface) +{ + return 1; +} + +static HRESULT WINAPI InstallCallbackBindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *bindf, BINDINFO *bindinfo) +{ + ERR("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallbackBindInfo_GetBindString(IInternetBindInfo *iface, ULONG string_type, + WCHAR **strs, ULONG cnt, ULONG *fetched) +{ + static const WCHAR wine_addon_downloaderW[] = + {'W','i','n','e',' ','A','d','d','o','n',' ','D','o','w','n','l','o','a','d','e','r',0}; + + switch(string_type) { + case BINDSTRING_USER_AGENT: + TRACE("BINDSTRING_USER_AGENT\n"); + + *strs = CoTaskMemAlloc(sizeof(wine_addon_downloaderW)); + if(!*strs) + return E_OUTOFMEMORY; + + memcpy(*strs, wine_addon_downloaderW, sizeof(wine_addon_downloaderW)); + *fetched = 1; + return S_OK; + } + + return E_NOTIMPL; +} + +static const IInternetBindInfoVtbl InstallCallbackBindInfoVtbl = { + InstallCallbackBindInfo_QueryInterface, + InstallCallbackBindInfo_AddRef, + InstallCallbackBindInfo_Release, + InstallCallbackBindInfo_GetBindInfo, + InstallCallbackBindInfo_GetBindString +}; + +static IInternetBindInfo InstallCallbackBindInfo = { &InstallCallbackBindInfoVtbl }; + static void append_url_params( WCHAR *url ) { static const WCHAR arch_formatW[] = {'?','a','r','c','h','='};

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: wine Branch: master Commit: 1fdd692ebd237dd45f5f7dbb383f90cb61318c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdd692ebd237dd45f5f7dbb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 25 15:34:16 2015 +0100 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 88 ++++++++++++++++++------------------- dlls/msvcp110/msvcp110.spec | 84 +++++++++++++++++------------------ dlls/msvcp120/msvcp120.spec | 84 +++++++++++++++++------------------ dlls/msvcp120_app/msvcp120_app.spec | 84 +++++++++++++++++------------------ dlls/msvcp70/msvcp70.spec | 76 ++++++++++++++++---------------- dlls/msvcp71/msvcp71.spec | 80 ++++++++++++++++----------------- dlls/msvcp80/msvcp80.spec | 84 +++++++++++++++++------------------ 7 files changed, 290 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fdd692ebd237dd45f5f7…

1 0