wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Jeremy Newman : fix some typos
by Jeremy Newman 14 Mar '14

14 Mar '14

Module: website Branch: master Commit: 943697630c298bdb38c4fc445cfb13a94c6b924b URL: http://source.winehq.org/git/website.git/?a=commit;h=943697630c298bdb38c4fc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Mar 14 18:17:47 2014 -0500 fix some typos --- wwn/en/wn20140314_365.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wwn/en/wn20140314_365.xml b/wwn/en/wn20140314_365.xml index a8f09d6..7877796 100644 --- a/wwn/en/wn20140314_365.xml +++ b/wwn/en/wn20140314_365.xml @@ -10,7 +10,7 @@ Its main goal is to inform you of what's going on around Wine. Wine is an open s <person posts="9" size="11" who="julliard at winehq.org (Alexandre Julliard)" /> <person posts="7" size="9" who="jwhite at codeweavers.com (Jeremy White)" /> -<person posts="6" size="8" who="nerv at dawncrow.de (=?ISO-8859-1?Q?Andr=E9_Hentschel?=)" /> +<person posts="6" size="8" who="nerv at dawncrow.de (André Hentschel)" /> <person posts="6" size="7" who="nsivov at codeweavers.com (Nikolay Sivov)" /> <person posts="6" size="6" who="hverbeet at gmail.com (Henri Verbeet)" /> <person posts="5" size="18" who="elias.vds at gmail.com (Elias Vanderstuyft)" /> @@ -45,7 +45,7 @@ See <a href="http://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informat > Valve has open sourced their DirectX to OpenGL translator named <a href="//github.com/ValveSoftware/ToGL">ToGL</a>. -The media and even some developers wondered if this is usefull for Wine. Stefan DÖsinger had a quick look at the code and gave an answer: +The media and even some developers wondered if this is usefull for Wine. Stefan Dösinger had a quick look at the code and gave an answer: <quote> No, it's not. It is *very* limited. It doesn't even have stateblock @@ -69,8 +69,8 @@ though. posts="10" > -Jeremy White finally got annoyed enough by the remaining <a href="//test.winehq.org/data/">test failures</a> on Windows and pushes people to fix them. -This also had the fact that other developers were afraid to get shamed and also fixed test failures :) +Jeremy White finally got annoyed enough by the remaining <a href="//test.winehq.org/data/">test failures</a> on Windows and pushed people to fix them. +This also had the fact that other developers were afraid to get shamed and also fix test failures :) We already made good progress, but there are some strange behaviours of Windows, other hard to analyze failures and problems caused by <a href="http://wiki.winehq.org/WineTestBotVMs">the way</a> the WineTestBot works. @@ -79,7 +79,7 @@ It seems often enough we trigger corner cases in Qemu and upgraded raises even w But what is Wine testing on Windows you might ask, here is a short answer. Well, the Windows API is a huge set of functions, to replicate them we need to know how they work without disassembling them (and MSDN is mostly wrong). So we write tests. A test calls a function and checks e.g. the return value, if that value is not expected then this is a failure. -We run the tests on different Windows Versions and on Wine, that means the chance of getting a non-expected value is good :) +We run the tests on different Windows Versions and on Wine, that means the chance of getting a non-expected value is good.:) In the end the benefits of our test suite are:

1 0

André Hentschel : Add WWN 365
by Jeremy Newman 14 Mar '14

14 Mar '14

Module: website Branch: master Commit: e1a3d17ebf90ac2e0e2e1e77f05c366a00fc37d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=e1a3d17ebf90ac2e0e2e1e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 14 22:40:04 2014 +0100 Add WWN 365 --- news/de/2014031401.xml | 14 + news/en/2014031401.xml | 14 + wwn/en/wn20140314_365.xml | 889 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 917 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=e1a3d17ebf90ac2e0e…

1 0

David Quintana : shlwapi: SHInvokeCommand last parameter is a command ID, or 0 to use the default.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 2bb1059ad24942f0ea13d3e49042c8ea85c4cbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb1059ad24942f0ea13d3e49… Author: David Quintana <gigaherz(a)gmail.com> Date: Thu Mar 13 11:24:27 2014 +0100 shlwapi: SHInvokeCommand last parameter is a command ID, or 0 to use the default. --- dlls/shlwapi/ordinal.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index cc2c6a9..303c63a 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -60,7 +60,7 @@ extern HINSTANCE shlwapi_hInstance; extern DWORD SHLWAPI_ThreadRef_index; HRESULT WINAPI IUnknown_QueryService(IUnknown*,REFGUID,REFIID,LPVOID*); -HRESULT WINAPI SHInvokeCommand(HWND,IShellFolder*,LPCITEMIDLIST,BOOL); +HRESULT WINAPI SHInvokeCommand(HWND,IShellFolder*,LPCITEMIDLIST,DWORD); BOOL WINAPI SHAboutInfoW(LPWSTR,DWORD); /* @@ -2933,7 +2933,7 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl) { TRACE("%p %p %p\n", hWnd, lpFolder, lpApidl); - return SHInvokeCommand(hWnd, lpFolder, lpApidl, FALSE); + return SHInvokeCommand(hWnd, lpFolder, lpApidl, 0); } /************************************************************************* @@ -3481,19 +3481,19 @@ UINT WINAPI SHDefExtractIconWrapW(LPCWSTR pszIconFile, int iIndex, UINT uFlags, * hWnd [I] Window displaying the shell folder * lpFolder [I] IShellFolder interface * lpApidl [I] Id for the particular folder desired - * bInvokeDefault [I] Whether to invoke the default menu item + * dwCommandId [I] The command ID to invoke (0=invoke default) * * RETURNS * Success: S_OK. If bInvokeDefault is TRUE, the default menu action was * executed. * Failure: An HRESULT error code indicating the error. */ -HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl, BOOL bInvokeDefault) +HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl, DWORD dwCommandId) { IContextMenu *iContext; HRESULT hRet; - TRACE("(%p, %p, %p, %d)\n", hWnd, lpFolder, lpApidl, bInvokeDefault); + TRACE("(%p, %p, %p, %u)\n", hWnd, lpFolder, lpApidl, dwCommandId); if (!lpFolder) return E_FAIL; @@ -3507,16 +3507,16 @@ HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST if ((hMenu = CreatePopupMenu())) { HRESULT hQuery; - DWORD dwDefaultId = 0; /* Add the context menu entries to the popup */ hQuery = IContextMenu_QueryContextMenu(iContext, hMenu, 0, 1, 0x7FFF, - bInvokeDefault ? CMF_NORMAL : CMF_DEFAULTONLY); + dwCommandId ? CMF_NORMAL : CMF_DEFAULTONLY); if (SUCCEEDED(hQuery)) { - if (bInvokeDefault && - (dwDefaultId = GetMenuDefaultItem(hMenu, 0, 0)) != (UINT)-1) + if (!dwCommandId) + dwCommandId = GetMenuDefaultItem(hMenu, 0, 0); + if (dwCommandId != (UINT)-1) { CMINVOKECOMMANDINFO cmIci; /* Invoke the default item */ @@ -3524,8 +3524,8 @@ HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST cmIci.cbSize = sizeof(cmIci); cmIci.fMask = CMIC_MASK_ASYNCOK; cmIci.hwnd = hWnd; - cmIci.lpVerb = MAKEINTRESOURCEA(dwDefaultId); - cmIci.nShow = SW_SCROLLCHILDREN; + cmIci.lpVerb = MAKEINTRESOURCEA(dwCommandId); + cmIci.nShow = SW_SHOWNORMAL; hRet = IContextMenu_InvokeCommand(iContext, &cmIci); }

1 0

David Quintana : comctl32: Fix horizontal separators in vertical toolbars.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 5b0c2889778f7ae0135383b3548dee7a3251113a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0c2889778f7ae0135383b35… Author: David Quintana <gigaherz(a)gmail.com> Date: Thu Mar 13 11:23:06 2014 +0100 comctl32: Fix horizontal separators in vertical toolbars. --- dlls/comctl32/toolbar.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fb82961..e716bab 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -857,8 +857,11 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, /* empirical tests show that iBitmap can/will be non-zero */ /* when drawing the vertical bar... */ if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { - if (dwStyle & CCS_VERT) - TOOLBAR_DrawFlatHorizontalSeparator (&rc, hdc, infoPtr); + if (dwStyle & CCS_VERT) { + RECT rcsep = rc; + InflateRect(&rcsep, -infoPtr->szPadding.cx, -infoPtr->szPadding.cy); + TOOLBAR_DrawFlatHorizontalSeparator (&rcsep, hdc, infoPtr); + } else TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); } @@ -1676,7 +1679,7 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) if (btnPtr->fsStyle & BTNS_SEP) { if (infoPtr->dwStyle & CCS_VERT) { cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; - cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nWidth; + cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth; } else cx = (btnPtr->cx > 0) ? btnPtr->cx :

1 0

Stefan Dösinger : wined3d: Free old data after addrefing the new one.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 51c3203e492132728001cc6486075ef470d4edbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c3203e492132728001cc648… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 14 17:07:44 2014 +0100 wined3d: Free old data after addrefing the new one. --- include/wine/wined3d.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 74ff3d1..7bb37d6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2323,9 +2323,6 @@ static inline HRESULT wined3d_private_store_set_private_data(struct wined3d_priv if (!(d = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct wined3d_private_data, content.data[data_size])))) return E_OUTOFMEMORY; - old = wined3d_private_store_get_private_data(store, guid); - if (old) - wined3d_private_store_free_private_data(store, old); d->tag = *guid; d->flags = flags; @@ -2334,6 +2331,10 @@ static inline HRESULT wined3d_private_store_set_private_data(struct wined3d_priv memcpy(d->content.data, ptr, data_size); if (flags & WINED3DSPD_IUNKNOWN) IUnknown_AddRef(d->content.object); + + old = wined3d_private_store_get_private_data(store, guid); + if (old) + wined3d_private_store_free_private_data(store, old); list_add_tail(&store->content, &d->entry); return WINED3D_OK;

1 0

Stefan Dösinger : wined3d: Decouple private data from the resource structure.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 6a34d4b40fea64713728365c2326f70df952229f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a34d4b40fea64713728365c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 14 14:50:33 2014 +0100 wined3d: Decouple private data from the resource structure. --- dlls/wined3d/resource.c | 98 ++++++---------------------------------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 94 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 85 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6c3fd7a..782cc9f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -27,20 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -struct private_data -{ - struct list entry; - - GUID tag; - DWORD flags; /* DDSPD_* */ - DWORD size; - union - { - BYTE data[1]; - IUnknown *object; - } ptr; -}; - static DWORD resource_access_from_pool(enum wined3d_pool pool) { switch (pool) @@ -114,7 +100,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->parent = parent; resource->parent_ops = parent_ops; resource->resource_ops = resource_ops; - list_init(&resource->privateData); + wined3d_private_store_init(&resource->private_store); if (size) { @@ -149,9 +135,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void resource_cleanup(struct wined3d_resource *resource) { const struct wined3d *d3d = resource->device->wined3d; - struct private_data *data; - struct list *e1, *e2; - HRESULT hr; TRACE("Cleaning up resource %p.\n", resource); @@ -161,13 +144,7 @@ void resource_cleanup(struct wined3d_resource *resource) adapter_adjust_memory(resource->device->adapter, 0 - resource->size); } - LIST_FOR_EACH_SAFE(e1, e2, &resource->privateData) - { - data = LIST_ENTRY(e1, struct private_data, entry); - hr = wined3d_resource_free_private_data(resource, &data->tag); - if (FAILED(hr)) - ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); - } + wined3d_private_store_cleanup(&resource->private_store); wined3d_resource_free_sysmem(resource); @@ -183,69 +160,25 @@ void resource_unload(struct wined3d_resource *resource) resource, resource->type); } -static struct private_data *resource_find_private_data(const struct wined3d_resource *resource, REFGUID tag) -{ - struct private_data *data; - struct list *entry; - - TRACE("Searching for private data %s\n", debugstr_guid(tag)); - LIST_FOR_EACH(entry, &resource->privateData) - { - data = LIST_ENTRY(entry, struct private_data, entry); - if (IsEqualGUID(&data->tag, tag)) { - TRACE("Found %p\n", data); - return data; - } - } - TRACE("Not found\n"); - return NULL; -} - HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { - struct private_data *d; - const void *ptr = data; - TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", resource, debugstr_guid(guid), data, data_size, flags); - if (flags & WINED3DSPD_IUNKNOWN) - { - if (data_size != sizeof(IUnknown *)) - { - WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); - return WINED3DERR_INVALIDCALL; - } - ptr = &data; - } - - if (!(d = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct private_data, ptr.data[data_size])))) - return E_OUTOFMEMORY; - wined3d_resource_free_private_data(resource, guid); - - d->tag = *guid; - d->flags = flags; - d->size = data_size; - - memcpy(d->ptr.data, ptr, data_size); - if (flags & WINED3DSPD_IUNKNOWN) - IUnknown_AddRef(d->ptr.object); - list_add_tail(&resource->privateData, &d->entry); - - return WINED3D_OK; + return wined3d_private_store_set_private_data(&resource->private_store, guid, data, data_size, flags); } HRESULT CDECL wined3d_resource_get_private_data(const struct wined3d_resource *resource, REFGUID guid, void *data, DWORD *data_size) { - const struct private_data *d; + const struct wined3d_private_data *d; DWORD size_in; TRACE("resource %p, guid %s, data %p, data_size %p.\n", resource, debugstr_guid(guid), data, data_size); - d = resource_find_private_data(resource, guid); + d = wined3d_private_store_get_private_data(&resource->private_store, guid); if (!d) return WINED3DERR_NOTFOUND; @@ -258,35 +191,32 @@ HRESULT CDECL wined3d_resource_get_private_data(const struct wined3d_resource *r if (d->flags & WINED3DSPD_IUNKNOWN) { - *(IUnknown **)data = d->ptr.object; + *(IUnknown **)data = d->content.object; if (resource->device->wined3d->dxVersion != 7) { /* D3D8 and D3D9 addref the private data, DDraw does not. This * can't be handled in ddraw because it doesn't know if the * pointer returned is an IUnknown * or just a blob. */ - IUnknown_AddRef(d->ptr.object); + IUnknown_AddRef(d->content.object); } } else { - memcpy(data, d->ptr.data, d->size); + memcpy(data, d->content.data, d->size); } return WINED3D_OK; } + HRESULT CDECL wined3d_resource_free_private_data(struct wined3d_resource *resource, REFGUID guid) { - struct private_data *data; - + struct wined3d_private_data *entry; TRACE("resource %p, guid %s.\n", resource, debugstr_guid(guid)); - data = resource_find_private_data(resource, guid); - if (!data) return WINED3DERR_NOTFOUND; - - if (data->flags & WINED3DSPD_IUNKNOWN) - IUnknown_Release(data->ptr.object); - list_remove(&data->entry); - HeapFree(GetProcessHeap(), 0, data); + entry = wined3d_private_store_get_private_data(&resource->private_store, guid); + if (!entry) + return WINED3DERR_NOTFOUND; + wined3d_private_store_free_private_data(&resource->private_store, entry); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60088e8..ff31ebc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2006,8 +2006,8 @@ struct wined3d_resource UINT size; DWORD priority; void *heap_memory; - struct list privateData; struct list resource_list_entry; + struct wined3d_private_store private_store; void *parent; const struct wined3d_parent_ops *parent_ops; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3496c5d..74ff3d1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -26,6 +26,8 @@ #ifndef __WINE_WINED3D_H #define __WINE_WINED3D_H +#include "wine/list.h" + #define WINED3D_OK S_OK #define _FACWINED3D 0x876 @@ -1983,6 +1985,25 @@ struct wined3d_device_parent_ops struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain); }; +struct wined3d_private_store +{ + struct list content; +}; + +struct wined3d_private_data +{ + struct list entry; + + GUID tag; + DWORD flags; /* DDSPD_* */ + DWORD size; + union + { + BYTE data[1]; + IUnknown *object; + } content; +}; + typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resource); void __stdcall wined3d_mutex_lock(void); @@ -2245,6 +2266,79 @@ enum wined3d_query_type __cdecl wined3d_query_get_type(const struct wined3d_quer ULONG __cdecl wined3d_query_incref(struct wined3d_query *query); HRESULT __cdecl wined3d_query_issue(struct wined3d_query *query, DWORD flags); +static inline void wined3d_private_store_init(struct wined3d_private_store *store) +{ + list_init(&store->content); +} + +static inline struct wined3d_private_data *wined3d_private_store_get_private_data( + const struct wined3d_private_store *store, const GUID *tag) +{ + struct wined3d_private_data *data; + struct list *entry; + + LIST_FOR_EACH(entry, &store->content) + { + data = LIST_ENTRY(entry, struct wined3d_private_data, entry); + if (IsEqualGUID(&data->tag, tag)) + return data; + } + return NULL; +} + +static inline void wined3d_private_store_free_private_data(struct wined3d_private_store *store, + struct wined3d_private_data *entry) +{ + if (entry->flags & WINED3DSPD_IUNKNOWN) + IUnknown_Release(entry->content.object); + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); +} + +static inline void wined3d_private_store_cleanup(struct wined3d_private_store *store) +{ + struct wined3d_private_data *data; + struct list *e1, *e2; + + LIST_FOR_EACH_SAFE(e1, e2, &store->content) + { + data = LIST_ENTRY(e1, struct wined3d_private_data, entry); + wined3d_private_store_free_private_data(store, data); + } +} + +static inline HRESULT wined3d_private_store_set_private_data(struct wined3d_private_store *store, + const GUID *guid, const void *data, DWORD data_size, DWORD flags) +{ + struct wined3d_private_data *d, *old; + const void *ptr = data; + + if (flags & WINED3DSPD_IUNKNOWN) + { + if (data_size != sizeof(IUnknown *)) + return WINED3DERR_INVALIDCALL; + ptr = &data; + } + + if (!(d = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(struct wined3d_private_data, content.data[data_size])))) + return E_OUTOFMEMORY; + old = wined3d_private_store_get_private_data(store, guid); + if (old) + wined3d_private_store_free_private_data(store, old); + + d->tag = *guid; + d->flags = flags; + d->size = data_size; + + memcpy(d->content.data, ptr, data_size); + if (flags & WINED3DSPD_IUNKNOWN) + IUnknown_AddRef(d->content.object); + list_add_tail(&store->content, &d->entry); + + return WINED3D_OK; +} + HRESULT __cdecl wined3d_resource_free_private_data(struct wined3d_resource *resource, REFGUID guid); void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc);

1 0

Akihiro Sagawa : version: Don' t convert binary version resource to ANSI texts.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 05b3d7b69bf183ef879dc42bd11c65923025a910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b3d7b69bf183ef879dc42bd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 14 22:13:18 2014 +0900 version: Don't convert binary version resource to ANSI texts. --- dlls/version/tests/info.c | 14 +++++++------- dlls/version/version.c | 15 ++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index b747547..107cfac 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -508,7 +508,7 @@ static void test_VerQueryValueA(void) SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, "StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; @@ -516,7 +516,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, "\\StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; @@ -524,7 +524,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; @@ -532,7 +532,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); sprintf(buf, "\\StringFileInfo\\%08x", translation); @@ -541,7 +541,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++) @@ -609,9 +609,9 @@ static void test_extra_block(void) w = 0xdeadbeef; ret = VerQueryValueA(ver, "WineTest\\Binary", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); + ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); -todo_wine ok(memcmp(p, &w, sizeof(w)) == 0, "got 0x%08x, expected 0x%08x\n", *(PULONG)p, w); + ok(memcmp(p, &w, sizeof(w)) == 0, "got 0x%08x, expected 0x%08x\n", *(PULONG)p, w); p = (char *)0xdeadbeef; len = 0xdeadbeef; diff --git a/dlls/version/version.c b/dlls/version/version.c index d5d8452..9bc6ad1 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -567,7 +567,7 @@ typedef struct { WORD wLength; WORD wValueLength; - WORD wType; + WORD wType; /* 1:Text, 0:Binary */ WCHAR szKey[1]; #if 0 /* variable length structure */ /* DWORD aligned */ @@ -887,7 +887,7 @@ static BOOL VersionInfo16_QueryValue( const VS_VERSION_INFO_STRUCT16 *info, LPCS * Gets a value from a 32-bit PE resource */ static BOOL VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCWSTR lpSubBlock, - LPVOID *lplpBuffer, UINT *puLen ) + LPVOID *lplpBuffer, UINT *puLen, BOOL *pbText ) { TRACE("lpSubBlock : (%s)\n", debugstr_w(lpSubBlock)); @@ -923,6 +923,8 @@ static BOOL VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCW *lplpBuffer = VersionInfo32_Value( info ); if (puLen) *puLen = info->wValueLength; + if (pbText) + *pbText = info->wType; return TRUE; } @@ -934,7 +936,6 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, LPVOID *lplpBuffer, PUINT puLen ) { static const char rootA[] = "\\"; - static const char varfileinfoA[] = "\\VarFileInfo\\Translation"; const VS_VERSION_INFO_STRUCT16 *info = pBlock; TRACE("(%p,%s,%p,%p)\n", @@ -948,7 +949,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, if ( !VersionInfoIs16( info ) ) { - BOOL ret; + BOOL ret, isText; INT len; LPWSTR lpSubBlockW; @@ -960,11 +961,11 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, lpSubBlockW, len); - ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen); + ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen, &isText); HeapFree(GetProcessHeap(), 0, lpSubBlockW); - if (ret && strcasecmp( lpSubBlock, rootA ) && strcasecmp( lpSubBlock, varfileinfoA )) + if (ret && isText) { /* Set lpBuffer so it points to the 'empty' area where we store * the converted strings @@ -1040,7 +1041,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, return ret; } - return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen); + return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL); }

1 0

Akihiro Sagawa : version/tests: Add more VerQueryValueA tests.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 66933d71ee66bdb1502e35ba3a1a1d6310d9acb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66933d71ee66bdb1502e35ba3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 14 22:13:16 2014 +0900 version/tests: Add more VerQueryValueA tests. --- dlls/version/tests/info.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e66c9ee..b747547 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -574,10 +574,61 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); HeapFree(GetProcessHeap(), 0, ver); } +static void test_extra_block(void) +{ + WORD extra_block[] = { + 72, 0, 0, 'W', 'i', 'n', 'e', 'T', 'e', 's', 't', '\0', + 24, 4, 0, 'B', 'i', 'n', 'a', 'r', 'y', '\0', 0xbeef, 0xdead, + 24, 4, 1, 'T', 'e', 'x', 't', '\0', 'B', '-', ')', '\0', + }; + char buf[MAX_PATH]; + UINT len, ret; + ULONG w; + char *ver, *p; + WORD *length; + + ret = GetModuleFileNameA(NULL, buf, sizeof(buf)); + ok(ret, "GetModuleFileNameA failed\n"); + + len = GetFileVersionInfoSizeA(buf, NULL); + ok(len, "GetFileVersionInfoSizeA(%s) error %u\n", buf, GetLastError()); + + ver = HeapAlloc(GetProcessHeap(), 0, len + sizeof(extra_block) * 2); + ok(ver != NULL, "Can't allocate memory\n"); + + ret = GetFileVersionInfoA(buf, 0, len, ver); + ok(ret, "GetFileVersionInfoA error %u\n", GetLastError()); + + /* forge the string table, as windres dislike an extra block */ + length = (WORD *)ver; /* see VS_VERSION_INFO_STRUCT32 for details */ + memcpy(ver + *length, extra_block, sizeof(extra_block)); + *length += sizeof(extra_block); + + p = (char *)0xdeadbeef; + len = 0xdeadbeef; + w = 0xdeadbeef; + ret = VerQueryValueA(ver, "WineTest\\Binary", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); +todo_wine ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); + ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); +todo_wine ok(memcmp(p, &w, sizeof(w)) == 0, "got 0x%08x, expected 0x%08x\n", *(PULONG)p, w); + + p = (char *)0xdeadbeef; + len = 0xdeadbeef; + ret = VerQueryValueA(ver, "WineTest\\Text", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); + ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); + ok(strcmp(p, "B-)") == 0, "got '%s', expected '%s'\n", p, "B-)"); + + HeapFree(GetProcessHeap(), 0, ver); +} + START_TEST(info) { test_info_size(); test_info(); test_32bit_win(); test_VerQueryValueA(); + test_extra_block(); }

1 0

Henri Verbeet : d3d9/tests: Use a separate device for multisample_get_rtdata_test().
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 0ee5fae92944b17b1b6f9bd494a7d7b02bf6a84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee5fae92944b17b1b6f9bd49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 14 10:25:05 2014 +0100 d3d9/tests: Use a separate device for multisample_get_rtdata_test(). --- dlls/d3d9/tests/visual.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7f5f923..069642b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13496,21 +13496,29 @@ static void update_surface_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(src_tex); } -static void multisample_get_rtdata_test(IDirect3DDevice9 *device) +static void multisample_get_rtdata_test(void) { IDirect3DSurface9 *original_ds, *original_rt, *rt, *readback; - IDirect3D9 *d3d9; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; HRESULT hr; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - IDirect3D9_Release(d3d9); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { - skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n"); - return; + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping tests.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; } hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, @@ -13544,6 +13552,11 @@ static void multisample_get_rtdata_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(original_rt); IDirect3DSurface9_Release(readback); IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void multisampled_depth_buffer_test(void) @@ -15562,11 +15575,11 @@ START_TEST(visual) depth_bounds_test(device_ptr); srgbwrite_format_test(device_ptr); update_surface_test(device_ptr); - multisample_get_rtdata_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + multisample_get_rtdata_test(); zenable_test(); fog_special_test(); volume_srgb_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for zenable_test().
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: af63977750b224893ff210572cfa925cefc5f2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=af63977750b224893ff210572… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 14 10:25:04 2014 +0100 d3d9/tests: Use a separate device for zenable_test(). --- dlls/d3d9/tests/visual.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7771ea7..7f5f923 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14333,7 +14333,7 @@ static void resz_test(void) IDirect3D9_Release(d3d); } -static void zenable_test(IDirect3DDevice9 *device) +static void zenable_test(void) { static const struct { @@ -14347,12 +14347,26 @@ static void zenable_test(IDirect3DDevice9 *device) {{640.0f, 480.0f, 1.5f, 1.0f}, 0xff00ff00}, {{640.0f, 0.0f, 1.5f, 1.0f}, 0xff00ff00}, }; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; UINT x, y; UINT i, j; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); @@ -14462,6 +14476,12 @@ static void zenable_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps); IDirect3DVertexShader9_Release(vs); } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void fog_special_test(void) @@ -15543,11 +15563,11 @@ START_TEST(visual) srgbwrite_format_test(device_ptr); update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); - zenable_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + zenable_test(); fog_special_test(); volume_srgb_test(); volume_dxt5_test();

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014