February 2014 - Wine-Commits

Dmitry Timoshkov : taskschd: Implement IRegisteredTask::get_Definition.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: d99d3014f50c14d620e09ab046249b17f7c87bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99d3014f50c14d620e09ab04… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:13:07 2014 +0900 taskschd: Implement IRegisteredTask::get_Definition. --- dlls/taskschd/regtask.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index b7eea52..eaf186a 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -189,8 +189,16 @@ static HRESULT WINAPI regtask_get_NextRunTime(IRegisteredTask *iface, DATE *date static HRESULT WINAPI regtask_get_Definition(IRegisteredTask *iface, ITaskDefinition **task) { - FIXME("%p,%p: stub\n", iface, task); - return E_NOTIMPL; + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + + TRACE("%p,%p\n", iface, task); + + if (!task) return E_POINTER; + + ITaskDefinition_AddRef(regtask->taskdef); + *task = regtask->taskdef; + + return S_OK; } static HRESULT WINAPI regtask_get_Xml(IRegisteredTask *iface, BSTR *xml)

1 0

Dmitry Timoshkov : taskschd: Make IRegistrationInfo a part of ITaskDefinition implementation.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 7d95758e6790b5cfe85e3ab90c7c95bce33111b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d95758e6790b5cfe85e3ab90… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:12:55 2014 +0900 taskschd: Make IRegistrationInfo a part of ITaskDefinition implementation. --- dlls/taskschd/task.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d51e4ae..0c96748 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -248,7 +248,7 @@ static const IRegistrationInfoVtbl RegistrationInfo_vtbl = RegistrationInfo_put_Source }; -HRESULT RegistrationInfo_create(IRegistrationInfo **obj) +static HRESULT RegistrationInfo_create(IRegistrationInfo **obj) { registration_info *reginfo; @@ -832,6 +832,7 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) typedef struct { ITaskDefinition ITaskDefinition_iface; + IRegistrationInfo *reginfo; ITaskSettings *taskset; LONG ref; } TaskDefinition; @@ -855,6 +856,8 @@ static ULONG WINAPI TaskDefinition_Release(ITaskDefinition *iface) if (!ref) { TRACE("destroying %p\n", iface); + if (taskdef->reginfo) + IRegistrationInfo_Release(taskdef->reginfo); if (taskdef->taskset) ITaskSettings_Release(taskdef->taskset); heap_free(taskdef); @@ -912,14 +915,40 @@ static HRESULT WINAPI TaskDefinition_Invoke(ITaskDefinition *iface, DISPID dispi static HRESULT WINAPI TaskDefinition_get_RegistrationInfo(ITaskDefinition *iface, IRegistrationInfo **info) { - FIXME("%p,%p: stub\n", iface, info); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_POINTER; + + if (!taskdef->reginfo) + { + hr = RegistrationInfo_create(&taskdef->reginfo); + if (hr != S_OK) return hr; + } + + IRegistrationInfo_AddRef(taskdef->reginfo); + *info = taskdef->reginfo; + + return S_OK; } static HRESULT WINAPI TaskDefinition_put_RegistrationInfo(ITaskDefinition *iface, IRegistrationInfo *info) { - FIXME("%p,%p: stub\n", iface, info); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_POINTER; + + if (taskdef->reginfo) + IRegistrationInfo_Release(taskdef->reginfo); + + IRegistrationInfo_AddRef(info); + taskdef->reginfo = info; + + return S_OK; } static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITriggerCollection **triggers)

1 0

Matteo Bruni : d3dx9: Allow loading float "FOURCC" DDS files.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: fa8a0dc7f61715a093a3b2e4453e843a4129476e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8a0dc7f61715a093a3b2e44… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 18 22:17:01 2014 +0100 d3dx9: Allow loading float "FOURCC" DDS files. --- dlls/d3dx9_36/surface.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 71c43bd..94301e8 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -153,7 +153,13 @@ static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) MAKEFOURCC('D','X','T','2'), MAKEFOURCC('D','X','T','3'), MAKEFOURCC('D','X','T','4'), - MAKEFOURCC('D','X','T','5') + MAKEFOURCC('D','X','T','5'), + D3DFMT_R16F, + D3DFMT_G16R16F, + D3DFMT_A16B16G16R16F, + D3DFMT_R32F, + D3DFMT_G32R32F, + D3DFMT_A32B32G32R32F, }; for (i = 0; i < sizeof(known_fourcc) / sizeof(known_fourcc[0]); i++)

1 0

Dmitry Timoshkov : taskschd: Implement IRegisteredTask::get_Xml.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: ab8d8dd1dc820ffccf47cb15b4f7338676ee3a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8d8dd1dc820ffccf47cb15b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:13:11 2014 +0900 taskschd: Implement IRegisteredTask::get_Xml. --- dlls/taskschd/regtask.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index eaf186a..8201304 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -203,8 +203,13 @@ static HRESULT WINAPI regtask_get_Definition(IRegisteredTask *iface, ITaskDefini static HRESULT WINAPI regtask_get_Xml(IRegisteredTask *iface, BSTR *xml) { - FIXME("%p,%p: stub\n", iface, xml); - return E_NOTIMPL; + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + + TRACE("%p,%p\n", iface, xml); + + if (!xml) return E_POINTER; + + return ITaskDefinition_get_XmlText(regtask->taskdef, xml); } static HRESULT WINAPI regtask_GetSecurityDescriptor(IRegisteredTask *iface, LONG info, BSTR *sddl)

1 0

Jacek Caban : wmp: Added more tests.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: a818e9a6c915cf92a313730914699b759b54dfea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a818e9a6c915cf92a31373091… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:02:13 2014 +0100 wmp: Added more tests. --- dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/oleobj.c | 304 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 291 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a818e9a6c915cf92a3137…

1 0

Jacek Caban : wmp: Added IOleInPlaceObject::GetWindow implementaiton.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: bea155e491d1449d88633c3a15ec3157f3883200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea155e491d1449d88633c3a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:02:03 2014 +0100 wmp: Added IOleInPlaceObject::GetWindow implementaiton. --- dlls/wmp/oleobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index d82cb41..1e50a45 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -553,8 +553,11 @@ static ULONG WINAPI OleInPlaceObjectWindowless_Release(IOleInPlaceObjectWindowle static HRESULT WINAPI OleInPlaceObjectWindowless_GetWindow(IOleInPlaceObjectWindowless *iface, HWND *phwnd) { WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->hwnd; + return This->hwnd ? S_OK : E_UNEXPECTED; } static HRESULT WINAPI OleInPlaceObjectWindowless_ContextSensitiveHelp(IOleInPlaceObjectWindowless *iface,

1 0

Jacek Caban : wmp: Added DoVerb(OLEIVERB_INPLACEACTIVATE) implementation.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 79fc46ddbb7c89c7c25a4c5a893f4f92cccdb1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=79fc46ddbb7c89c7c25a4c5a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:01:45 2014 +0100 wmp: Added DoVerb(OLEIVERB_INPLACEACTIVATE) implementation. --- dlls/wmp/Makefile.in | 1 + dlls/wmp/oleobj.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/wmp_main.c | 5 +- dlls/wmp/wmp_private.h | 5 ++ 4 files changed, 197 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index a4d07c1..a82cc36 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,4 +1,5 @@ MODULE = wmp.dll +IMPORTS = user32 gdi32 C_SRCS = \ oleobj.c \ diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index a6daabb..7074bd6 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -23,11 +23,189 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); +static HWND get_container_hwnd(WindowsMediaPlayer *This) +{ + IOleWindow *ole_window; + HWND hwnd = NULL; + HRESULT hres; + + /* IOleInPlaceSite (which inherits from IOleWindow) is prefered. */ + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ole_window); + if(FAILED(hres)) { + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleWindow, (void**)&ole_window); + if(FAILED(hres)) { + IOleContainer *container = NULL; + + hres = IOleClientSite_GetContainer(This->client_site, &container); + if(SUCCEEDED(hres)) { + hres = IOleContainer_QueryInterface(container, &IID_IOleWindow, (void**)&ole_window); + IOleContainer_Release(container); + } + } + } + + if(FAILED(hres)) + return NULL; + + hres = IOleWindow_GetWindow(ole_window, &hwnd); + IOleWindow_Release(ole_window); + if(FAILED(hres)) + return NULL; + + TRACE("Got window %p\n", hwnd); + return hwnd; +} + +static LRESULT WINAPI wmp_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + case WM_PAINT: { + PAINTSTRUCT ps; + HFONT font; + RECT rect; + HDC hdc; + + TRACE("WM_PAINT\n"); + + GetClientRect(hwnd, &rect); + hdc = BeginPaint(hwnd, &ps); + + SelectObject(hdc, GetStockObject(DC_BRUSH)); + SetDCBrushColor(hdc, RGB(255,0,0)); + SetBkColor(hdc, RGB(255,0,0)); + + font = CreateFontA(25,0,0,0,400,0,0,0,ANSI_CHARSET,0,0,DEFAULT_QUALITY,DEFAULT_PITCH,NULL); + SelectObject(hdc, font); + + Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom); + DrawTextA(hdc, "FIXME: WMP", -1, &rect, DT_CENTER | DT_SINGLELINE | DT_VCENTER); + + DeleteObject(font); + EndPaint(hwnd, &ps); + break; + } + } + + return DefWindowProcW(hwnd, msg, wParam, lParam); + +} + +static ATOM wmp_class; + +static BOOL WINAPI register_wmp_class(INIT_ONCE *once, void *param, void **context) +{ + /* It seems that native uses ATL for this. We use a fake name to make tests happy. */ + static const WCHAR atl_wmpW[] = {'A','T','L',':','W','M','P',0}; + + static WNDCLASSEXW wndclass = { + sizeof(wndclass), CS_DBLCLKS, wmp_wnd_proc, 0, 0, + NULL, NULL, NULL, NULL, NULL, + atl_wmpW, NULL + }; + + wndclass.hInstance = wmp_instance; + wmp_class = RegisterClassExW(&wndclass); + return TRUE; +} + +void unregister_wmp_class(void) +{ + if(wmp_class) + UnregisterClassW(MAKEINTRESOURCEW(wmp_class), wmp_instance); +} + +static HWND create_wmp_window(WindowsMediaPlayer *wmp, const RECT *posrect) +{ + static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&class_init_once, register_wmp_class, NULL, NULL); + if(!wmp_class) + return NULL; + + return CreateWindowExW(0, MAKEINTRESOURCEW(wmp_class), NULL, WS_CLIPCHILDREN|WS_CLIPSIBLINGS|WS_VISIBLE|WS_CHILD, + posrect->left, posrect->top, posrect->right-posrect->left, posrect->bottom-posrect->top, + get_container_hwnd(wmp), NULL, wmp_instance, NULL); +} + +static HRESULT activate_inplace(WindowsMediaPlayer *This) +{ + IOleInPlaceSiteWindowless *ipsite_windowless; + IOleInPlaceSiteEx *ipsiteex = NULL; + IOleInPlaceSite *ipsite; + IOleInPlaceUIWindow *ip_window = NULL; + IOleInPlaceFrame *ip_frame = NULL; + RECT posrect = {0}, cliprect = {0}; + OLEINPLACEFRAMEINFO frameinfo = { sizeof(frameinfo) }; + HRESULT hres; + + if(This->hwnd) { + FIXME("Already activated\n"); + return E_UNEXPECTED; + } + + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSiteWindowless, (void**)&ipsite_windowless); + if(SUCCEEDED(hres)) { + hres = IOleInPlaceSiteWindowless_CanWindowlessActivate(ipsite_windowless); + IOleInPlaceSiteWindowless_Release(ipsite_windowless); + if(hres == S_OK) + FIXME("Windowless activation not supported\n"); + ipsiteex = (IOleInPlaceSiteEx*)ipsite_windowless; + }else { + IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSiteEx, (void**)&ipsiteex); + } + + if(ipsiteex) { + BOOL redraw = FALSE; /* Not really used. */ + IOleInPlaceSiteEx_OnInPlaceActivateEx(ipsiteex, &redraw, 0); + ipsite = (IOleInPlaceSite*)ipsiteex; + }else { + IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ipsite); + if(FAILED(hres)) { + FIXME("No IOleInPlaceSite instance\n"); + return hres; + } + + IOleInPlaceSite_OnInPlaceActivate(ipsite); + } + + hres = IOleInPlaceSite_GetWindowContext(ipsite, &ip_frame, &ip_window, &posrect, &cliprect, &frameinfo); + IOleInPlaceSite_Release(ipsite); + if(FAILED(hres)) { + FIXME("GetWindowContext failed: %08x\n", hres); + return hres; + } + + This->hwnd = create_wmp_window(This, &posrect); + if(!This->hwnd) + return E_FAIL; + + IOleClientSite_ShowObject(This->client_site); + return S_OK; +} + +static void deactivate_window(WindowsMediaPlayer *This) +{ + IOleInPlaceSite *ip_site; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ip_site); + if(SUCCEEDED(hres)) { + IOleInPlaceSite_OnInPlaceDeactivate(ip_site); + IOleInPlaceSite_Release(ip_site); + } + + DestroyWindow(This->hwnd); + This->hwnd = NULL; +} + static void release_client_site(WindowsMediaPlayer *This) { if(!This->client_site) return; + if(This->hwnd) + deactivate_window(This); + IOleClientSite_Release(This->client_site); This->client_site = NULL; } @@ -206,7 +384,15 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); + + switch(iVerb) { + case OLEIVERB_INPLACEACTIVATE: + TRACE("(%p)->(OLEIVERB_INPLACEACTIVATE)\n", This); + return activate_inplace(This); + default: + FIXME("Unsupported iVerb %d\n", iVerb); + } + return E_NOTIMPL; } diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 995c08e..29b096f 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); -static HINSTANCE wmp_instance; +HINSTANCE wmp_instance; static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { @@ -89,6 +89,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); wmp_instance = hInstDLL; break; + case DLL_PROCESS_DETACH: + unregister_wmp_class(); + break; } return TRUE; diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 8f1a85a..11d4c22 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -33,12 +33,17 @@ struct WindowsMediaPlayer { LONG ref; IOleClientSite *client_site; + HWND hwnd; }; void init_player_ifaces(WindowsMediaPlayer*) DECLSPEC_HIDDEN; HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +void unregister_wmp_class(void) DECLSPEC_HIDDEN; + +extern HINSTANCE wmp_instance; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Bruno Jesus : ws2_32: Fix conversion of address in GetAddrInfoW.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 5782bac2a049b93e2446a8466635489327100b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5782bac2a049b93e2446a8466… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Feb 18 01:24:09 2014 -0300 ws2_32: Fix conversion of address in GetAddrInfoW. --- dlls/ws2_32/socket.c | 4 +- dlls/ws2_32/tests/sock.c | 96 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 80 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a9ac79d..2a2c809 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5612,13 +5612,13 @@ static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) } if (ai->ai_addr) { - if (!(ret->ai_addr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct WS_sockaddr)))) + if (!(ret->ai_addr = HeapAlloc(GetProcessHeap(), 0, ai->ai_addrlen))) { HeapFree(GetProcessHeap(), 0, ret->ai_canonname); HeapFree(GetProcessHeap(), 0, ret); return NULL; } - memcpy(ret->ai_addr, ai->ai_addr, sizeof(struct WS_sockaddr)); + memcpy(ret->ai_addr, ai->ai_addr, ai->ai_addrlen); } return ret; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e146548..31db63a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -349,6 +349,62 @@ static void check_so_opentype (void) ok ( tmp == 0, "check_so_opentype: wrong startup value of SO_OPENTYPE: %d\n", tmp ); } +static void compare_addrinfo (ADDRINFO *a, ADDRINFO *b) +{ + for (; a && b ; a = a->ai_next, b = b->ai_next) + { + ok(a->ai_flags == b->ai_flags, + "Wrong flags %d != %d\n", a->ai_flags, b->ai_flags); + ok(a->ai_family == b->ai_family, + "Wrong family %d != %d\n", a->ai_family, b->ai_family); + ok(a->ai_socktype == b->ai_socktype, + "Wrong socktype %d != %d\n", a->ai_socktype, b->ai_socktype); + ok(a->ai_protocol == b->ai_protocol, + "Wrong protocol %d != %d\n", a->ai_protocol, b->ai_protocol); + ok(a->ai_addrlen == b->ai_addrlen, + "Wrong addrlen %lu != %lu\n", a->ai_addrlen, b->ai_addrlen); + ok(!memcmp(a->ai_addr, b->ai_addr, min(a->ai_addrlen, b->ai_addrlen)), + "Wrong address data\n"); + if (a->ai_canonname && b->ai_canonname) + { + ok(!strcmp(a->ai_canonname, b->ai_canonname), "Wrong canonical name '%s' != '%s'\n", + a->ai_canonname, b->ai_canonname); + } + else + ok(!a->ai_canonname && !b->ai_canonname, "Expected both names absent (%p != %p)\n", + a->ai_canonname, b->ai_canonname); + } + ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b); +} + +static void compare_addrinfow (ADDRINFOW *a, ADDRINFOW *b) +{ + for (; a && b ; a = a->ai_next, b = b->ai_next) + { + ok(a->ai_flags == b->ai_flags, + "Wrong flags %d != %d\n", a->ai_flags, b->ai_flags); + ok(a->ai_family == b->ai_family, + "Wrong family %d != %d\n", a->ai_family, b->ai_family); + ok(a->ai_socktype == b->ai_socktype, + "Wrong socktype %d != %d\n", a->ai_socktype, b->ai_socktype); + ok(a->ai_protocol == b->ai_protocol, + "Wrong protocol %d != %d\n", a->ai_protocol, b->ai_protocol); + ok(a->ai_addrlen == b->ai_addrlen, + "Wrong addrlen %lu != %lu\n", a->ai_addrlen, b->ai_addrlen); + ok(!memcmp(a->ai_addr, b->ai_addr, min(a->ai_addrlen, b->ai_addrlen)), + "Wrong address data\n"); + if (a->ai_canonname && b->ai_canonname) + { + ok(!lstrcmpW(a->ai_canonname, b->ai_canonname), "Wrong canonical name '%s' != '%s'\n", + wine_dbgstr_w(a->ai_canonname), wine_dbgstr_w(b->ai_canonname)); + } + else + ok(!a->ai_canonname && !b->ai_canonname, "Expected both names absent (%p != %p)\n", + a->ai_canonname, b->ai_canonname); + } + ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b); +} + /**************** Server utility functions ***************/ /* @@ -5375,7 +5431,7 @@ static void test_GetAddrInfoW(void) {'n','x','d','o','m','a','i','n','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR zero[] = {'0',0}; int i, ret; - ADDRINFOW *result, *p, hint; + ADDRINFOW *result, *result2, *p, hint; if (!pGetAddrInfoW || !pFreeAddrInfoW) { @@ -5399,25 +5455,27 @@ static void test_GetAddrInfoW(void) ret = pGetAddrInfoW(NULL, zero, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); - pFreeAddrInfoW(result); - result = NULL; - ret = pGetAddrInfoW(NULL, empty, NULL, &result); + result2 = NULL; + ret = pGetAddrInfoW(NULL, empty, NULL, &result2); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); - ok(result != NULL, "GetAddrInfoW failed\n"); + ok(result2 != NULL, "GetAddrInfoW failed\n"); + compare_addrinfow(result, result2); pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); result = NULL; ret = pGetAddrInfoW(empty, zero, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); - pFreeAddrInfoW(result); - result = NULL; - ret = pGetAddrInfoW(empty, empty, NULL, &result); + result2 = NULL; + ret = pGetAddrInfoW(empty, empty, NULL, &result2); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); - ok(result != NULL, "GetAddrInfoW failed\n"); + ok(result2 != NULL, "GetAddrInfoW failed\n"); + compare_addrinfow(result, result2); pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); result = NULL; ret = pGetAddrInfoW(localhost, NULL, NULL, &result); @@ -5514,7 +5572,7 @@ static void test_GetAddrInfoW(void) static void test_getaddrinfo(void) { int i, ret; - ADDRINFOA *result, *p, hint; + ADDRINFOA *result, *result2, *p, hint; if (!pgetaddrinfo || !pfreeaddrinfo) { @@ -5538,25 +5596,27 @@ static void test_getaddrinfo(void) ret = pgetaddrinfo(NULL, "0", NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); - pfreeaddrinfo(result); - result = NULL; - ret = pgetaddrinfo(NULL, "", NULL, &result); + result2 = NULL; + ret = pgetaddrinfo(NULL, "", NULL, &result2); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); - ok(result != NULL, "getaddrinfo failed\n"); + ok(result2 != NULL, "getaddrinfo failed\n"); + compare_addrinfo(result, result2); pfreeaddrinfo(result); + pfreeaddrinfo(result2); result = NULL; ret = pgetaddrinfo("", "0", NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); - pfreeaddrinfo(result); - result = NULL; - ret = pgetaddrinfo("", "", NULL, &result); + result2 = NULL; + ret = pgetaddrinfo("", "", NULL, &result2); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); - ok(result != NULL, "getaddrinfo failed\n"); + ok(result2 != NULL, "getaddrinfo failed\n"); + compare_addrinfo(result, result2); pfreeaddrinfo(result); + pfreeaddrinfo(result2); result = NULL; ret = pgetaddrinfo("localhost", NULL, NULL, &result);

1 0

Matteo Bruni : d3dx9/tests: Use a valid version tag for the "empty" shader.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 772d660e280d7664f03a040aafe2cab7eba11066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772d660e280d7664f03a040aa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 18 22:17:03 2014 +0100 d3dx9/tests: Use a valid version tag for the "empty" shader. --- dlls/d3dx9_36/tests/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 363dd4e..74ada6e 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -27,7 +27,7 @@ static const DWORD shader_zero[] = {0x0}; static const DWORD shader_invalid[] = {0xeeee0100}; -static const DWORD shader_empty[] = {0xfffeffff, 0x0000ffff}; +static const DWORD shader_empty[] = {0xfffe0200, 0x0000ffff}; static const DWORD simple_fx[] = {0x46580000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff};

1 0

Matteo Bruni : d3dx9: Add some more float pixel formats.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 596bb77862dff8868fa191f6aefcdfe48dd054f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=596bb77862dff8868fa191f6a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 18 22:17:00 2014 +0100 d3dx9: Add some more float pixel formats. --- dlls/d3dx9_36/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index ea75dfa..bba8514 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -81,7 +81,11 @@ static const struct pixel_format_desc formats[] = {D3DFMT_DXT3, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_DXT4, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_DXT5, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_R16F, { 0, 16, 0, 0}, { 0, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGBF16, NULL, NULL }, + {D3DFMT_G16R16F, { 0, 16, 16, 0}, { 0, 0, 16, 0}, 4, 1, 1, 4, FORMAT_ARGBF16, NULL, NULL }, {D3DFMT_A16B16G16R16F, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGBF16, NULL, NULL }, + {D3DFMT_R32F, { 0, 32, 0, 0}, { 0, 0, 0, 0}, 4, 1, 1, 4, FORMAT_ARGBF, NULL, NULL }, + {D3DFMT_G32R32F, { 0, 32, 32, 0}, { 0, 0, 32, 0}, 8, 1, 1, 8, FORMAT_ARGBF, NULL, NULL }, {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96, 0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF, NULL, NULL }, {D3DFMT_P8, { 8, 8, 8, 8}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_INDEX, NULL, index_to_rgba}, /* marks last element */

1 0