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

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

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

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

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

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

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

Stefan Leichter : odbccp32: Add ordinals to spec file.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: cbd765155255c910e4d690b411007aa072236842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd765155255c910e4d690b41… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Mar 13 22:34:45 2014 +0100 odbccp32: Add ordinals to spec file. --- dlls/odbccp32/odbccp32.spec | 114 +++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/dlls/odbccp32/odbccp32.spec b/dlls/odbccp32/odbccp32.spec index 3d85d75..c90d98e 100644 --- a/dlls/odbccp32/odbccp32.spec +++ b/dlls/odbccp32/odbccp32.spec @@ -1,57 +1,57 @@ -@ stdcall ODBCCPlApplet( long long ptr ptr) -@ stdcall SQLConfigDataSource(ptr long str str) -@ stdcall SQLConfigDataSourceW(ptr long wstr wstr) -@ stdcall SQLConfigDriver(ptr long str str ptr long ptr) -@ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) -@ stdcall SQLCreateDataSource(ptr str) -@ stub SQLCreateDataSourceEx -@ stub SQLCreateDataSourceExW -@ stdcall SQLCreateDataSourceW(ptr wstr) -@ stdcall SQLGetAvailableDrivers(str ptr long ptr) -@ stdcall SQLGetAvailableDriversW(wstr ptr long ptr) -@ stdcall SQLGetConfigMode(ptr) -@ stdcall SQLGetInstalledDrivers(str long ptr) -@ stdcall SQLGetInstalledDriversW(wstr long ptr) -@ stdcall SQLGetPrivateProfileString(str str str str long str) -@ stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr) -@ stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr) -@ stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr) -@ stdcall SQLInstallDriver(str str str long ptr) -@ stdcall SQLInstallDriverEx(str str str long ptr long ptr) -@ stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr) -@ stdcall SQLInstallDriverManager(ptr long ptr) -@ stdcall SQLInstallDriverManagerW(ptr long ptr) -@ stdcall SQLInstallDriverW(wstr wstr wstr long ptr) -@ stdcall SQLInstallODBC(ptr str str str) -@ stdcall SQLInstallODBCW(ptr wstr wstr wstr) -@ stdcall SQLInstallTranslator(str str str ptr long ptr long ptr) -@ stdcall SQLInstallTranslatorEx(str str ptr long ptr long ptr) -@ stdcall SQLInstallTranslatorExW(wstr wstr ptr long ptr long ptr) -@ stdcall SQLInstallTranslatorW(wstr wstr wstr ptr long ptr long ptr) -@ stdcall SQLInstallerError(long ptr ptr long ptr) -@ stdcall SQLInstallerErrorW(long ptr ptr long ptr) -@ stub SQLLoadDataSourcesListBox -@ stub SQLLoadDriverListBox -@ stdcall SQLManageDataSources(ptr) -@ stdcall SQLPostInstallerError(long ptr) -@ stdcall SQLPostInstallerErrorW(long ptr) -@ stdcall SQLReadFileDSN(str str str ptr long ptr) -@ stdcall SQLReadFileDSNW(wstr wstr wstr ptr long ptr) -@ stdcall SQLRemoveDSNFromIni(str) -@ stdcall SQLRemoveDSNFromIniW(wstr) -@ stdcall SQLRemoveDefaultDataSource() -@ stdcall SQLRemoveDriver(str long ptr) -@ stdcall SQLRemoveDriverManager(ptr) -@ stdcall SQLRemoveDriverW(wstr long ptr) -@ stdcall SQLRemoveTranslator(str ptr) -@ stdcall SQLRemoveTranslatorW(wstr ptr) -@ stdcall SQLSetConfigMode(long) -@ stdcall SQLValidDSN(str) -@ stdcall SQLValidDSNW(wstr) -@ stdcall SQLWriteDSNToIni(str str) -@ stdcall SQLWriteDSNToIniW(wstr wstr) -@ stdcall SQLWriteFileDSN(str str str str) -@ stdcall SQLWriteFileDSNW(wstr wstr wstr wstr) -@ stdcall SQLWritePrivateProfileString(str str str str) -@ stdcall SQLWritePrivateProfileStringW(wstr wstr wstr wstr) -@ stub SelectTransDlg +2 stdcall SQLInstallDriver(str str str long ptr) +3 stdcall SQLInstallDriverManager(ptr long ptr) +4 stdcall SQLGetInstalledDrivers(str long ptr) +5 stdcall SQLGetAvailableDrivers(str ptr long ptr) +6 stdcall SQLConfigDataSource(ptr long str str) +7 stdcall SQLRemoveDefaultDataSource() +8 stdcall SQLWriteDSNToIni(str str) +9 stdcall SQLRemoveDSNFromIni(str) +10 stdcall SQLInstallODBC(ptr str str str) +11 stdcall SQLManageDataSources(ptr) +12 stdcall SQLCreateDataSource(ptr str) +13 stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr) +14 stdcall SQLWritePrivateProfileString(str str str str) +15 stdcall SQLGetPrivateProfileString(str str str str long str) +16 stdcall SQLValidDSN(str) +17 stdcall SQLRemoveDriverManager(ptr) +18 stdcall SQLInstallTranslator(str str str ptr long ptr long ptr) +19 stdcall SQLRemoveTranslator(str ptr) +20 stdcall SQLRemoveDriver(str long ptr) +21 stdcall SQLConfigDriver(ptr long str str ptr long ptr) +22 stdcall SQLInstallerError(long ptr ptr long ptr) +23 stdcall SQLPostInstallerError(long ptr) +24 stdcall SQLReadFileDSN(str str str ptr long ptr) +25 stdcall SQLWriteFileDSN(str str str str) +26 stdcall SQLInstallDriverEx(str str str long ptr long ptr) +27 stdcall SQLGetConfigMode(ptr) +28 stdcall SQLSetConfigMode(long) +29 stdcall SQLInstallTranslatorEx(str str ptr long ptr long ptr) +30 stub SQLCreateDataSourceEx +101 stdcall ODBCCPlApplet( long long ptr ptr) +112 stub SelectTransDlg +202 stdcall SQLInstallDriverW(wstr wstr wstr long ptr) +203 stdcall SQLInstallDriverManagerW(ptr long ptr) +204 stdcall SQLGetInstalledDriversW(wstr long ptr) +205 stdcall SQLGetAvailableDriversW(wstr ptr long ptr) +206 stdcall SQLConfigDataSourceW(ptr long wstr wstr) +208 stdcall SQLWriteDSNToIniW(wstr wstr) +209 stdcall SQLRemoveDSNFromIniW(wstr) +210 stdcall SQLInstallODBCW(ptr wstr wstr wstr) +212 stdcall SQLCreateDataSourceW(ptr wstr) +213 stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr) +214 stdcall SQLWritePrivateProfileStringW(wstr wstr wstr wstr) +215 stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr) +216 stdcall SQLValidDSNW(wstr) +218 stdcall SQLInstallTranslatorW(wstr wstr wstr ptr long ptr long ptr) +219 stdcall SQLRemoveTranslatorW(wstr ptr) +220 stdcall SQLRemoveDriverW(wstr long ptr) +221 stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) +222 stdcall SQLInstallerErrorW(long ptr ptr long ptr) +223 stdcall SQLPostInstallerErrorW(long ptr) +224 stdcall SQLReadFileDSNW(wstr wstr wstr ptr long ptr) +225 stdcall SQLWriteFileDSNW(wstr wstr wstr wstr) +226 stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr) +229 stdcall SQLInstallTranslatorExW(wstr wstr ptr long ptr long ptr) +230 stub SQLCreateDataSourceExW +231 stub SQLLoadDriverListBox +232 stub SQLLoadDataSourcesListBox

1 0

Vincent Povirk : gdiplus: Account for negative height/ width in GdipDrawImagePointsRect.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 06555a96adf99364035bf824e1d1df4bde8e6ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06555a96adf99364035bf824e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 13 16:16:03 2014 -0500 gdiplus: Account for negative height/width in GdipDrawImagePointsRect. --- dlls/gdiplus/graphics.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1f01b82..a570192 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2781,6 +2781,30 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image debugstr_pointf(&points[2])); memcpy(ptf, points, 3 * sizeof(GpPointF)); + + /* Ensure source width/height is positive */ + if (srcwidth < 0) + { + GpPointF tmp = ptf[1]; + srcx = srcx + srcwidth; + srcwidth = -srcwidth; + ptf[2].X = ptf[2].X + ptf[1].X - ptf[0].X; + ptf[2].Y = ptf[2].Y + ptf[1].Y - ptf[0].Y; + ptf[1] = ptf[0]; + ptf[0] = tmp; + } + + if (srcheight < 0) + { + GpPointF tmp = ptf[2]; + srcy = srcy + srcheight; + srcheight = -srcheight; + ptf[1].X = ptf[1].X + ptf[2].X - ptf[0].X; + ptf[1].Y = ptf[1].Y + ptf[2].Y - ptf[0].Y; + ptf[2] = ptf[0]; + ptf[0] = tmp; + } + ptf[3].X = ptf[2].X + ptf[1].X - ptf[0].X; ptf[3].Y = ptf[2].Y + ptf[1].Y - ptf[0].Y; if (!srcwidth || !srcheight || ptf[3].X == ptf[0].X || ptf[3].Y == ptf[0].Y)

1 0

Vincent Povirk : gdiplus: Fix an overzealous optimization.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 9a5375989d43a08a6cf276e08b8deff9d2a9fffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5375989d43a08a6cf276e08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 13 16:18:50 2014 -0500 gdiplus: Fix an overzealous optimization. --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a570192..d16c6c1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2807,7 +2807,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image ptf[3].X = ptf[2].X + ptf[1].X - ptf[0].X; ptf[3].Y = ptf[2].Y + ptf[1].Y - ptf[0].Y; - if (!srcwidth || !srcheight || ptf[3].X == ptf[0].X || ptf[3].Y == ptf[0].Y) + if (!srcwidth || !srcheight || (ptf[3].X == ptf[0].X && ptf[3].Y == ptf[0].Y)) return Ok; transform_and_round_points(graphics, pti, ptf, 4);

1 0

Michael Stefaniuc : dswave: DirectSoundWave doesn' t support COM aggregation.
by Alexandre Julliard 14 Mar '14

14 Mar '14

Module: wine Branch: master Commit: 2fe960537348416e57bad53a69863d5e20c812f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe960537348416e57bad53a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 13 23:45:16 2014 +0100 dswave: DirectSoundWave doesn't support COM aggregation. --- dlls/dswave/dswave.c | 3 ++- dlls/dswave/dswave_main.c | 13 +++++++++---- dlls/dswave/dswave_private.h | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index f6fbe07..d0850f7 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -723,7 +723,8 @@ static const IPersistStreamVtbl DirectMusicWave_PersistStream_Vtbl = { /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ppobj) +{ IDirectMusicWaveImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveImpl)); diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 36eb266..a9be90c 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -71,12 +71,17 @@ static ULONG WINAPI WaveCF_Release(IClassFactory * iface) return 1; /* non-heap based object */ } -static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *pOuter, REFIID riid, - void **ppobj) +static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *outer_unk, REFIID riid, + void **ret_iface) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); + TRACE ("(%p, %s, %p)\n", outer_unk, debugstr_dmguid(riid), ret_iface); - return DMUSIC_CreateDirectMusicWaveImpl (riid, ppobj, pOuter); + if (outer_unk) { + *ret_iface = NULL; + return CLASS_E_NOAGGREGATION; + } + + return create_dswave(riid, ret_iface); } static HRESULT WINAPI WaveCF_LockServer(IClassFactory * iface, BOOL dolock) diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 6f402d7..ae9e346 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -48,7 +48,7 @@ typedef struct IDirectMusicWaveImpl IDirectMusicWaveImpl; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ret_iface) DECLSPEC_HIDDEN; /*****************************************************************************

1 0