January 2012 - Wine-commits

Francois Gouget : oleaut32/tests: Dynamically load some functions that are missing on early NT4 releases.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 8375c8e0036bea487f8835ed9d5c893a958bba7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8375c8e0036bea487f8835ed9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 10:03:06 2012 +0100 oleaut32/tests: Dynamically load some functions that are missing on early NT4 releases. --- dlls/oleaut32/tests/tmarshal.c | 41 ++++++++++------ dlls/oleaut32/tests/usrmarshal.c | 76 +++++++++++++++++++++-------- dlls/oleaut32/tests/varformat.c | 39 ++++++++------- dlls/oleaut32/tests/vartest.c | 98 ++++++++++++++++++++++--------------- 4 files changed, 161 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8375c8e0036bea487f883…

1 0

Nikolay Sivov : msxml3: Add a stub for IAuthenticate.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: da8618f3a9c14ad51d8587648057d87b2ae0929e URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8618f3a9c14ad51d8587648… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 21:14:23 2012 +0300 msxml3: Add a stub for IAuthenticate. --- dlls/msxml3/httprequest.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c3d5df9..79bf34d 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -2,7 +2,7 @@ * IXMLHTTPRequest implementation * * Copyright 2008 Alistair Leslie-Hughes - * Copyright 2010 Nikolay Sivov for CodeWeavers + * Copyright 2010-2012 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -149,6 +149,7 @@ struct BindStatusCallback { IBindStatusCallback IBindStatusCallback_iface; IHttpNegotiate IHttpNegotiate_iface; + IAuthenticate IAuthenticate_iface; LONG ref; IBinding *binding; @@ -171,6 +172,11 @@ static inline BindStatusCallback *impl_from_IHttpNegotiate( IHttpNegotiate *ifac return CONTAINING_RECORD(iface, BindStatusCallback, IHttpNegotiate_iface); } +static inline BindStatusCallback *impl_from_IAuthenticate( IAuthenticate *iface ) +{ + return CONTAINING_RECORD(iface, BindStatusCallback, IAuthenticate_iface); +} + static void BindStatusCallback_Detach(BindStatusCallback *bsc) { if (bsc) @@ -199,6 +205,10 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa { *ppv = &This->IHttpNegotiate_iface; } + else if (IsEqualGUID(&IID_IAuthenticate, riid)) + { + *ppv = &This->IAuthenticate_iface; + } else if (IsEqualGUID(&IID_IServiceProvider, riid) || IsEqualGUID(&IID_IBindStatusCallbackEx, riid) || IsEqualGUID(&IID_IInternetProtocol, riid) || @@ -534,6 +544,40 @@ static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = { BSCHttpNegotiate_OnResponse }; +static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, + REFIID riid, void **ppv) +{ + BindStatusCallback *This = impl_from_IAuthenticate(iface); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); +} + +static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) +{ + BindStatusCallback *This = impl_from_IAuthenticate(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); +} + +static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) +{ + BindStatusCallback *This = impl_from_IAuthenticate(iface); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); +} + +static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, + HWND *hwnd, LPWSTR *username, LPWSTR *password) +{ + BindStatusCallback *This = impl_from_IAuthenticate(iface); + FIXME("(%p)->(%p %p %p)\n", This, hwnd, username, password); + return E_NOTIMPL; +} + +static const IAuthenticateVtbl AuthenticateVtbl = { + Authenticate_QueryInterface, + Authenticate_AddRef, + Authenticate_Release, + Authenticate_Authenticate +}; + static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback **obj, const VARIANT *body) { BindStatusCallback *bsc; @@ -553,6 +597,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * bsc->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; bsc->IHttpNegotiate_iface.lpVtbl = &BSCHttpNegotiateVtbl; + bsc->IAuthenticate_iface.lpVtbl = &AuthenticateVtbl; bsc->ref = 1; bsc->request = This; bsc->binding = NULL;

1 0

Nikolay Sivov : msxml3: Remove wrong ERR(), some renames.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: ce61d9b86265d846a58e87ac3cbcffb8693fcf5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce61d9b86265d846a58e87ac3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 9 00:58:06 2012 +0300 msxml3: Remove wrong ERR(), some renames. --- dlls/msxml3/nodemap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index c075ac6..6fac505 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -245,7 +245,7 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - ERR("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), item); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), item); return This->funcs->remove_qualified_item(This->node, baseName, namespaceURI, item); } @@ -266,7 +266,7 @@ static HRESULT WINAPI xmlnodemap_reset( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("(%p: %d)\n", This, This->iterator); + TRACE("(%p)->(%d)\n", This, This->iterator); This->iterator = 0; @@ -282,7 +282,7 @@ static HRESULT WINAPI xmlnodemap__newEnum( return E_NOTIMPL; } -static const struct IXMLDOMNamedNodeMapVtbl xmlnodemap_vtbl = +static const struct IXMLDOMNamedNodeMapVtbl XMLDOMNamedNodeMapVtbl = { xmlnodemap_QueryInterface, xmlnodemap_AddRef, @@ -335,7 +335,7 @@ static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo( return IsEqualGUID(riid, &IID_IXMLDOMNamedNodeMap) ? S_OK : S_FALSE; } -static const struct ISupportErrorInfoVtbl support_error_vtbl = +static const struct ISupportErrorInfoVtbl SupportErrorInfoVtbl = { support_error_QueryInterface, support_error_AddRef, @@ -418,8 +418,8 @@ IXMLDOMNamedNodeMap *create_nodemap(xmlNodePtr node, const struct nodemap_funcs if ( !This ) return NULL; - This->IXMLDOMNamedNodeMap_iface.lpVtbl = &xmlnodemap_vtbl; - This->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; + This->IXMLDOMNamedNodeMap_iface.lpVtbl = &XMLDOMNamedNodeMapVtbl; + This->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; This->node = node; This->ref = 1; This->iterator = 0;

1 0

Nikolay Sivov : msxml3: Move put_dataType() test data to a table.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: d51dd8e405f22b8ca678e35111dee820ae4e538c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51dd8e405f22b8ca678e3511… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 19:12:33 2012 +0300 msxml3: Move put_dataType() test data to a table. --- dlls/msxml3/tests/domdoc.c | 391 ++++++++------------------------------------ 1 files changed, 71 insertions(+), 320 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d51dd8e405f22b8ca678e…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DMULTISAMPLE_TYPE typedef.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 9a8491045ee679bddb5d895a7f8531b3ed036daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8491045ee679bddb5d895a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 8 21:15:00 2012 +0100 wined3d: Get rid of the WINED3DMULTISAMPLE_TYPE typedef. --- dlls/d3d10core/device.c | 4 +- dlls/d3d10core/texture.c | 2 +- dlls/d3d8/device.c | 4 +- dlls/d3d8/directx.c | 3 +- dlls/d3d9/device.c | 4 +- dlls/ddraw/ddraw.c | 4 +- dlls/ddraw/surface.c | 2 +- dlls/dxgi/factory.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/surface.c | 6 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 53 +++++++++++++++++++-------------------- 17 files changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a8491045ee679bddb5d8…

1 0

Nikolay Sivov : comctl32: Fix TB_SETSTYLE behaviour and return value.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 54b6c76720c502097cc63dad9a42fbf772ff83d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b6c76720c502097cc63dad9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 7 21:27:38 2012 +0300 comctl32: Fix TB_SETSTYLE behaviour and return value. --- dlls/comctl32/tests/toolbar.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 9 +++---- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 8850b11..22ad75c 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -164,6 +164,7 @@ static void basic_test(void) TBBUTTON buttons[9]; HWND hToolbar; int i; + for (i=0; i<9; i++) MakeButton(buttons+i, 1000+i, TBSTYLE_CHECKGROUP, 0); MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); @@ -1633,6 +1634,54 @@ static void test_tooltip(void) DestroyWindow(hToolbar); } +static void test_get_set_style(void) +{ + TBBUTTON buttons[9]; + DWORD style, style2, ret; + HWND hToolbar; + int i; + + for (i=0; i<9; i++) + MakeButton(buttons+i, 1000+i, TBSTYLE_CHECKGROUP, 0); + MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); + MakeButton(buttons+6, 1006, TBSTYLE_SEP, 0); + + hToolbar = CreateToolbarEx(hMainWnd, + WS_VISIBLE | WS_CLIPCHILDREN | CCS_TOP | + WS_CHILD | TBSTYLE_LIST, + 100, + 0, NULL, 0, + buttons, sizeof(buttons)/sizeof(buttons[0]), + 0, 0, 20, 16, sizeof(TBBUTTON)); + ok(hToolbar != NULL, "Toolbar creation\n"); + SendMessage(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"test\000"); + + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + style2 = GetWindowLongA(hToolbar, GWL_STYLE); +todo_wine + ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); + + /* try to alter common window bits */ + style2 |= WS_BORDER; + ret = SendMessageA(hToolbar, TB_SETSTYLE, 0, style2); + ok(ret == 0, "got %d\n", ret); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + style2 = GetWindowLongA(hToolbar, GWL_STYLE); + ok((style != style2) && (style == (style2 | WS_BORDER)), + "got 0x%08x, expected 0x%08x\n", style, style2); + ok(style & WS_BORDER, "got 0x%08x\n", style); + + /* now styles are the same, alter window style */ + ret = SendMessageA(hToolbar, TB_SETSTYLE, 0, style2); + ok(ret == 0, "got %d\n", ret); + style2 |= WS_BORDER; + SetWindowLongA(hToolbar, GWL_STYLE, style2); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); + + DestroyWindow(hToolbar); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -1672,6 +1721,7 @@ START_TEST(toolbar) test_setrows(); test_getstring(); test_tooltip(); + test_get_set_style(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fba9bce..3868967 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4908,11 +4908,10 @@ TOOLBAR_SetState (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) static LRESULT -TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, LPARAM lParam) +TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) { - SetWindowLongW(infoPtr->hwndSelf, GWL_STYLE, lParam); - - return TRUE; + infoPtr->dwStyle = style; + return 0; } @@ -5155,7 +5154,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); LOGFONTW logFont; - TRACE("hwnd = %p\n", hwnd); + TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style); infoPtr->dwStyle = dwStyle; GetClientRect(hwnd, &infoPtr->client_rect);

1 0

Nikolay Sivov : comctl32: Store style bits provided with WM_CREATE.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 9188b58e4c29df998a8af83bba2254d34594c0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9188b58e4c29df998a8af83bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 7 21:36:12 2012 +0300 comctl32: Store style bits provided with WM_CREATE. --- dlls/comctl32/tests/toolbar.c | 1 - dlls/comctl32/toolbar.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 22ad75c..5049ef6 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1658,7 +1658,6 @@ static void test_get_set_style(void) style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); style2 = GetWindowLongA(hToolbar, GWL_STYLE); -todo_wine ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); /* try to alter common window bits */ diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 3868967..fa67eb8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5151,12 +5151,11 @@ static LRESULT TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0); - DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); LOGFONTW logFont; TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style); - infoPtr->dwStyle = dwStyle; + infoPtr->dwStyle = lpcs->style; GetClientRect(hwnd, &infoPtr->client_rect); infoPtr->bUnicode = infoPtr->hwndNotify && (NFR_UNICODE == SendMessageW(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_REQUERY)); @@ -5167,7 +5166,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) OpenThemeData (hwnd, themeClass); - TOOLBAR_CheckStyle (infoPtr, dwStyle); + TOOLBAR_CheckStyle (infoPtr, infoPtr->dwStyle); return 0; }

1 0

Nikolay Sivov : comctl32: Remove redundant parameter from a helper.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: e3688c2f9aef7b6e48aab5391db77af263ef9211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3688c2f9aef7b6e48aab5391… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 7 21:39:14 2012 +0300 comctl32: Remove redundant parameter from a helper. --- dlls/comctl32/toolbar.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fa67eb8..bd35533 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -329,9 +329,9 @@ TOOLBAR_ButtonHasString(const TBUTTON_INFO *btnPtr) * function should be null. */ static void -TOOLBAR_CheckStyle (const TOOLBAR_INFO *infoPtr, DWORD dwStyle) +TOOLBAR_CheckStyle (const TOOLBAR_INFO *infoPtr) { - if (dwStyle & TBSTYLE_REGISTERDROP) + if (infoPtr->dwStyle & TBSTYLE_REGISTERDROP) FIXME("[%p] TBSTYLE_REGISTERDROP not implemented\n", infoPtr->hwndSelf); } @@ -5166,7 +5166,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) OpenThemeData (hwnd, themeClass); - TOOLBAR_CheckStyle (infoPtr, infoPtr->dwStyle); + TOOLBAR_CheckStyle (infoPtr); return 0; } @@ -6368,11 +6368,10 @@ TOOLBAR_StyleChanged (TOOLBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpSty else infoPtr->dwDTFlags = DT_CENTER | DT_END_ELLIPSIS; - TOOLBAR_CheckStyle (infoPtr, lpStyle->styleNew); - TRACE("new style 0x%08x\n", lpStyle->styleNew); infoPtr->dwStyle = lpStyle->styleNew; + TOOLBAR_CheckStyle (infoPtr); if ((dwOldStyle ^ lpStyle->styleNew) & (TBSTYLE_WRAPABLE | CCS_VERT)) TOOLBAR_LayoutToolbar(infoPtr);

1 0

Francois Gouget : msvcp60: Add a trailing '\n' to a couple of TRACE() messages.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 5ff7ecaae0fb4bb7ff1043f5737b5dc818f4acc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff7ecaae0fb4bb7ff1043f57… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:27:32 2012 +0100 msvcp60: Add a trailing '\n' to a couple of TRACE() messages. --- dlls/msvcp60/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 5b9eeb5..96e7134 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -269,7 +269,7 @@ MSVCP_size_t __cdecl basic_string_char__Pdif(const char *i1, const char *i2) /* ?_Psum@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@CAPEBDPEBD_K(a)Z */ char* __cdecl basic_string_char__Psum(char *iter, MSVCP_size_t add) { - TRACE("(%p %lu)", iter, add); + TRACE("(%p %lu)\n", iter, add); return iter ? iter+add : iter; } @@ -1965,7 +1965,7 @@ MSVCP_size_t __cdecl basic_string_wchar__Pdif(const wchar_t *i1, const wchar_t * /* ?_Psum@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@CAPEBGPEBG_K(a)Z */ wchar_t* __cdecl basic_string_wchar__Psum(wchar_t *iter, MSVCP_size_t add) { - TRACE("(%p %lu)", iter, add); + TRACE("(%p %lu)\n", iter, add); return iter ? iter+add : iter; }

1 0

Francois Gouget : oleview: Mark a couple of button labels as not needing translation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

1 0