wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectCompilerFromResourceW().
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 34c70247906ca8fe965ced1e02c72f519e73eb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c70247906ca8fe965ced1e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:41 2013 +0200 d3dx9: Simplify D3DXCreateEffectCompilerFromResourceW(). --- dlls/d3dx9_36/effect.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2be1900..3c252e5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5704,26 +5704,19 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); - - resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + TRACE("srcmodule %p, srcresource %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n", + srcmodule, debugstr_w(srcresource), defines, include, flags, effectcompiler, parseerrors); - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceW(srcmodule, srcresource, (const WCHAR *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); } HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly)

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectCompilerFromResourceA().
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 1be05ff731aa2657d527d9e56441dadae4160eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be05ff731aa2657d527d9e56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:40 2013 +0200 d3dx9: Simplify D3DXCreateEffectCompilerFromResourceA(). --- dlls/d3dx9_36/effect.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c349acf..2be1900 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5684,26 +5684,19 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, const ch ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource)); - - resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + TRACE("srcmodule %p, srcresource %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n", + srcmodule, debugstr_a(srcresource), defines, include, flags, effectcompiler, parseerrors); - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceA(srcmodule, srcresource, (const char *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); } HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WCHAR *srcresource,

1 0

Henri Verbeet : wined3d: Introduce a separate function for cleaning up a wined3d_state structure.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: aee3c0faeb743b6f1b797f508a602fcb622e2e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee3c0faeb743b6f1b797f508… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:39 2013 +0200 wined3d: Introduce a separate function for cleaning up a wined3d_state structure. --- dlls/wined3d/stateblock.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3685a2e..8abd8e5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -588,6 +588,27 @@ void state_unbind_resources(struct wined3d_state *state) } } +static void state_cleanup(struct wined3d_state *state) +{ + unsigned int counter; + + state_unbind_resources(state); + + for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) + { + struct list *e1, *e2; + LIST_FOR_EACH_SAFE(e1, e2, &state->light_map[counter]) + { + struct wined3d_light_info *light = LIST_ENTRY(e1, struct wined3d_light_info, entry); + list_remove(&light->entry); + HeapFree(GetProcessHeap(), 0, light); + } + } + + HeapFree(GetProcessHeap(), 0, state->vs_consts_f); + HeapFree(GetProcessHeap(), 0, state->ps_consts_f); +} + ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { ULONG refcount = InterlockedDecrement(&stateblock->ref); @@ -596,24 +617,9 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { - int counter; - - state_unbind_resources(&stateblock->state); - - for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) - { - struct list *e1, *e2; - LIST_FOR_EACH_SAFE(e1, e2, &stateblock->state.light_map[counter]) - { - struct wined3d_light_info *light = LIST_ENTRY(e1, struct wined3d_light_info, entry); - list_remove(&light->entry); - HeapFree(GetProcessHeap(), 0, light); - } - } + state_cleanup(&stateblock->state); - HeapFree(GetProcessHeap(), 0, stateblock->state.vs_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->changed.vertexShaderConstantsF); - HeapFree(GetProcessHeap(), 0, stateblock->state.ps_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->changed.pixelShaderConstantsF); HeapFree(GetProcessHeap(), 0, stateblock->contained_vs_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->contained_ps_consts_f);

1 0

Henri Verbeet : wined3d: Make stateblock_unbind_resources() work with a wined3d_state structure instead.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 4e755d263f65b571e34c851c803b0216ed886af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e755d263f65b571e34c851c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:38 2013 +0200 wined3d: Make stateblock_unbind_resources() work with a wined3d_state structure instead. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 5 ++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0becf8..a0db7c7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1285,7 +1285,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (device->logo_surface) wined3d_surface_decref(device->logo_surface); - stateblock_unbind_resources(device->stateBlock); + state_unbind_resources(&device->stateBlock->state); /* Unload resources */ LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) @@ -4917,7 +4917,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } if (reset_state) - stateblock_unbind_resources(device->stateBlock); + state_unbind_resources(&device->stateBlock->state); if (device->fb.render_targets) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e6a867a..3685a2e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -467,9 +467,8 @@ ULONG CDECL wined3d_stateblock_incref(struct wined3d_stateblock *stateblock) return refcount; } -void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) +void state_unbind_resources(struct wined3d_state *state) { - struct wined3d_state *state = &stateblock->state; struct wined3d_vertex_declaration *decl; struct wined3d_sampler *sampler; struct wined3d_texture *texture; @@ -599,7 +598,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { int counter; - stateblock_unbind_resources(stateblock); + state_unbind_resources(&stateblock->state); for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a586f91..e0ceb7e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2446,7 +2446,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void stateblock_init_default_state(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; -void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; + +void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d

1 0

Henri Verbeet : wined3d: Replace the "updateStateBlock" wined3d_device field with a "update_state" field.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: f02a5f45d46cc58449504c41e6f08a061918c5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02a5f45d46cc58449504c41e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:37 2013 +0200 wined3d: Replace the "updateStateBlock" wined3d_device field with a "update_state" field. --- dlls/wined3d/device.c | 295 ++++++++++++++++++++-------------------- dlls/wined3d/stateblock.c | 8 +- dlls/wined3d/wined3d_private.h | 6 +- 3 files changed, 152 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f02a5f45d46cc58449504…

1 0

Frédéric Delanoy : winedev: Update wine multimedia chapter.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: docs Branch: master Commit: 45f6426a3413f0ae2d476f083f73e63acc5aa466 URL: http://source.winehq.org/git/docs.git/?a=commit;h=45f6426a3413f0ae2d476f083… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 22 19:05:41 2013 +0200 winedev: Update wine multimedia chapter. --- en/winedev-multimedia.sgml | 180 ++++++++++++++++++++++++-------------------- 1 files changed, 97 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=45f6426a3413f0ae2d476…

1 0

Frédéric Delanoy : makefiles: Don' t duplicate files lists in every makefile.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: docs Branch: master Commit: 244227520f2c883662397540914009bb6632ea76 URL: http://source.winehq.org/git/docs.git/?a=commit;h=244227520f2c8836623975409… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 20 22:34:45 2013 +0200 makefiles: Don't duplicate files lists in every makefile. --- Make.rules.in | 31 +++++++++++++++++++++++++++++++ en/Makefile.in | 30 ------------------------------ fr/Makefile.in | 16 ---------------- 3 files changed, 31 insertions(+), 46 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index fda8e81..7538144 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -16,6 +16,37 @@ DB2PS = @DB2PS@ DB2TXT = @DB2TXT@ PO4ADIR = $(TOPSRCDIR)/po4a PO4AENV = PERLLIB=$(PO4ADIR)/lib +SGMLDIR = $(TOPSRCDIR)/en + +WINEUSR_SRCS = \ + $(SGMLDIR)/wineusr-bugs.sgml \ + $(SGMLDIR)/wineusr-configuring.sgml \ + $(SGMLDIR)/wineusr-getting.sgml \ + $(SGMLDIR)/wineusr-glossary.sgml \ + $(SGMLDIR)/wineusr-introduction.sgml \ + $(SGMLDIR)/wineusr-running.sgml + +WINELIB_SRCS = \ + $(SGMLDIR)/winelib-bindlls.sgml \ + $(SGMLDIR)/winelib-intro.sgml \ + $(SGMLDIR)/winelib-mfc.sgml \ + $(SGMLDIR)/winelib-porting.sgml \ + $(SGMLDIR)/winelib-toolkit.sgml + +WINEDEV_SRCS = \ + $(SGMLDIR)/winedev-architecture.sgml \ + $(SGMLDIR)/winedev-ddraw.sgml \ + $(SGMLDIR)/winedev-debugger.sgml \ + $(SGMLDIR)/winedev-debugging.sgml \ + $(SGMLDIR)/winedev-documentation.sgml \ + $(SGMLDIR)/winedev-multimedia.sgml \ + $(SGMLDIR)/winedev-ole.sgml \ + $(SGMLDIR)/winedev-opengl.sgml \ + $(SGMLDIR)/winedev-testing.sgml \ + $(SGMLDIR)/winedev-coding.sgml \ + $(SGMLDIR)/winedev-kernel.sgml \ + $(SGMLDIR)/winedev-otherdebug.sgml \ + $(SGMLDIR)/winedev-windowing.sgml all: $(SUBDIRS) diff --git a/en/Makefile.in b/en/Makefile.in index 6d11868..50d7c6e 100644 --- a/en/Makefile.in +++ b/en/Makefile.in @@ -4,36 +4,6 @@ VPATH = @srcdir@ DOCLOCALE = en -WINEUSR_SRCS = \ - wineusr-bugs.sgml \ - wineusr-configuring.sgml \ - wineusr-getting.sgml \ - wineusr-glossary.sgml \ - wineusr-introduction.sgml \ - wineusr-running.sgml - -WINEDEV_SRCS = \ - winedev-architecture.sgml \ - winedev-ddraw.sgml \ - winedev-debugger.sgml \ - winedev-debugging.sgml \ - winedev-documentation.sgml \ - winedev-multimedia.sgml \ - winedev-ole.sgml \ - winedev-opengl.sgml \ - winedev-testing.sgml \ - winedev-coding.sgml \ - winedev-kernel.sgml \ - winedev-otherdebug.sgml \ - winedev-windowing.sgml - -WINELIB_SRCS = \ - winelib-bindlls.sgml \ - winelib-intro.sgml \ - winelib-mfc.sgml \ - winelib-porting.sgml \ - winelib-toolkit.sgml - ALLBOOKS = \ winedev-guide \ wineusr-guide \ diff --git a/fr/Makefile.in b/fr/Makefile.in index 4269ab4..2a5c670 100644 --- a/fr/Makefile.in +++ b/fr/Makefile.in @@ -3,24 +3,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ DOCLOCALE = fr -SGMLDIR = $(TOPSRCDIR)/en MIN_TRANS = 1 -WINEUSR_SRCS = \ - $(SGMLDIR)/wineusr-bugs.sgml \ - $(SGMLDIR)/wineusr-configuring.sgml \ - $(SGMLDIR)/wineusr-getting.sgml \ - $(SGMLDIR)/wineusr-glossary.sgml \ - $(SGMLDIR)/wineusr-introduction.sgml \ - $(SGMLDIR)/wineusr-running.sgml - -WINELIB_SRCS = \ - $(SGMLDIR)/winelib-bindlls.sgml \ - $(SGMLDIR)/winelib-intro.sgml \ - $(SGMLDIR)/winelib-mfc.sgml \ - $(SGMLDIR)/winelib-porting.sgml \ - $(SGMLDIR)/winelib-toolkit.sgml - ALLBOOKS = \ wineusr-guide \ winelib-guide

1 0

Alistair Leslie-Hughes : oledb32: Add IDataSourceLocator support.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 8f09d3470a6ff38b53499bff5764a278270db815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f09d3470a6ff38b53499bff5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 12:28:36 2013 +1000 oledb32: Add IDataSourceLocator support. --- dlls/oledb32/Makefile.in | 1 + dlls/oledb32/dslocator.c | 208 ++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/main.c | 6 + dlls/oledb32/oledb_private.h | 1 + 4 files changed, 216 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index b019bdb..0f4f36a 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = uuid oleaut32 ole32 user32 advapi32 C_SRCS = \ convert.c \ datainit.c \ + dslocator.c \ errorinfo.c \ main.c \ rowpos.c diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c new file mode 100644 index 0000000..dcc2fe3 --- /dev/null +++ b/dlls/oledb32/dslocator.c @@ -0,0 +1,208 @@ +/* Data Links + * + * Copyright 2013 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "oleauto.h" +#include "winerror.h" +#include "oledb.h" +#include "oledberr.h" +#include "msdasc.h" + +#include "oledb_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + + +typedef struct DSLocatorImpl +{ + IDataSourceLocator IDataSourceLocator_iface; + LONG ref; + +} DSLocatorImpl; + +static inline DSLocatorImpl *impl_from_IDataSourceLocator( IDataSourceLocator *iface ) +{ + return CONTAINING_RECORD(iface, DSLocatorImpl, IDataSourceLocator_iface); +} + + +static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID riid, void **ppvoid) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid),ppvoid); + + *ppvoid = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IDataSourceLocator)) + { + *ppvoid = &This->IDataSourceLocator_iface; + } + + if(*ppvoid) + { + IUnknown_AddRef( (IUnknown*)*ppvoid ); + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI dslocator_AddRef(IDataSourceLocator *iface) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + TRACE("(%p)->%u\n",This,This->ref); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI dslocator_Release(IDataSourceLocator *iface) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->%u\n",This,ref+1); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI dslocator_GetTypeInfoCount(IDataSourceLocator *iface, UINT *pctinfo) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dslocator_GetTypeInfo(IDataSourceLocator *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dslocator_GetIDsOfNames(IDataSourceLocator *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dslocator_Invoke(IDataSourceLocator *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, LONG *phwndParent) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + + FIXME("(%p)->(%p)\n",This, phwndParent); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, LONG phwndParent) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + + FIXME("(%p)->(%d)\n",This, phwndParent); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **ppADOConnection) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + + FIXME("(%p)->(%p)\n",This, ppADOConnection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dslocator_PromptEdit(IDataSourceLocator *iface, IDispatch **ppADOConnection, VARIANT_BOOL *success) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + + FIXME("(%p)->(%p %p)\n",This, ppADOConnection, success); + + return E_NOTIMPL; +} + +static const IDataSourceLocatorVtbl DSLocatorVtbl = +{ + dslocator_QueryInterface, + dslocator_AddRef, + dslocator_Release, + dslocator_GetTypeInfoCount, + dslocator_GetTypeInfo, + dslocator_GetIDsOfNames, + dslocator_Invoke, + dslocator_get_hWnd, + dslocator_put_hWnd, + dslocator_PromptNew, + dslocator_PromptEdit +}; + +HRESULT create_dslocator(IUnknown *outer, void **obj) +{ + DSLocatorImpl *This; + + TRACE("(%p, %p)\n", outer, obj); + + *obj = NULL; + + if(outer) return CLASS_E_NOAGGREGATION; + + This = heap_alloc(sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->IDataSourceLocator_iface.lpVtbl = &DSLocatorVtbl; + This->ref = 1; + + *obj = &This->IDataSourceLocator_iface; + + return S_OK; +} diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index d101316..48aa5a3 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -130,6 +130,7 @@ static cf oledb_convert_cf = { { &CF_Vtbl }, create_oledb_convert }; static cf oledb_datainit_cf = { { &CF_Vtbl }, create_data_init }; static cf oledb_errorinfo_cf = { { &CF_Vtbl }, create_error_info }; static cf oledb_rowpos_cf = { { &CF_Vtbl }, create_oledb_rowpos }; +static cf oledb_dslocator_cf = { { &CF_Vtbl }, create_dslocator }; /****************************************************************** * DllGetClassObject @@ -158,6 +159,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) *obj = &oledb_rowpos_cf; return S_OK; } + else if ( IsEqualCLSID (rclsid, &CLSID_DataLinks) ) + { + *obj = &oledb_dslocator_cf; + return S_OK; + } return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index c232464..1422b0b 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -21,6 +21,7 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; static inline void *heap_alloc(size_t len) {

1 0

Dmitry Timoshkov : server: Store full-sized completion information on the server side.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 0b4c9cb533efc72cb9a4a165ab0d8c5044c3fd08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4c9cb533efc72cb9a4a165a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 23 19:37:51 2013 +0900 server: Store full-sized completion information on the server side. --- dlls/ntdll/tests/file.c | 5 ----- include/wine/server_protocol.h | 11 +++++++---- server/async.c | 4 ++-- server/completion.c | 4 ++-- server/file.h | 4 ++-- server/protocol.def | 6 +++--- server/request.h | 14 +++++++------- server/trace.c | 6 +++--- 8 files changed, 26 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b4c9cb533efc72cb9a4a…

1 0

Stefan Dösinger : wined3d: Don' t lock the dst volume in device_update_volume.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: aa3a43f7698f7b0ac2e925e8da50fa9b1af77e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3a43f7698f7b0ac2e925e8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 23:22:47 2013 +0200 wined3d: Don't lock the dst volume in device_update_volume. --- dlls/wined3d/device.c | 27 +++++++++++++-------------- dlls/wined3d/volume.c | 36 +++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fddf4da..ce0e083 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4092,29 +4092,28 @@ static HRESULT device_update_volume(struct wined3d_device *device, struct wined3d_volume *src_volume, struct wined3d_volume *dst_volume) { struct wined3d_map_desc src; - struct wined3d_map_desc dst; HRESULT hr; + struct wined3d_bo_address data; + struct wined3d_context *context; TRACE("device %p, src_volume %p, dst_volume %p.\n", device, src_volume, dst_volume); - /* TODO: Implement direct loading into the gl volume instead of using - * memcpy and dirtification to improve loading performance. */ if (FAILED(hr = wined3d_volume_map(src_volume, &src, NULL, WINED3D_MAP_READONLY))) return hr; - if (FAILED(hr = wined3d_volume_map(dst_volume, &dst, NULL, WINED3D_MAP_DISCARD))) - { - wined3d_volume_unmap(src_volume); - return hr; - } - memcpy(dst.data, src.data, dst_volume->resource.size); + context = context_acquire(device, NULL); - hr = wined3d_volume_unmap(dst_volume); - if (FAILED(hr)) - wined3d_volume_unmap(src_volume); - else - hr = wined3d_volume_unmap(src_volume); + wined3d_volume_load(dst_volume, context, FALSE); + + data.buffer_object = 0; + data.addr = src.data; + wined3d_volume_upload_data(dst_volume, context, &data); + wined3d_volume_invalidate_location(dst_volume, ~WINED3D_LOCATION_TEXTURE_RGB); + + context_release(context); + + hr = wined3d_volume_unmap(src_volume); return hr; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index d95fd91..71b2937 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -69,7 +69,7 @@ static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, } /* Context activation is done by the caller. */ -static void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, +void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_bo_address *data) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -105,7 +105,7 @@ static void wined3d_volume_validate_location(struct wined3d_volume *volume, DWOR TRACE("new location flags are %s.\n", wined3d_debug_location(volume->locations)); } -static void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) +void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) { TRACE("Volume %p, clearing %s.\n", volume, wined3d_debug_location(location)); volume->locations &= ~location; @@ -132,10 +132,31 @@ static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); } +static DWORD volume_access_from_location(DWORD location) +{ + switch (location) + { + case WINED3D_LOCATION_DISCARDED: + return 0; + + case WINED3D_LOCATION_SYSMEM: + return WINED3D_RESOURCE_ACCESS_CPU; + + case WINED3D_LOCATION_TEXTURE_RGB: + return WINED3D_RESOURCE_ACCESS_GPU; + + default: + FIXME("Unhandled location %#x.\n", location); + return 0; + } +} + /* Context activation is done by the caller. */ static void wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) { + DWORD required_access = volume_access_from_location(location); + TRACE("Volume %p, loading %s, have %s.\n", volume, wined3d_debug_location(location), wined3d_debug_location(volume->locations)); @@ -145,14 +166,11 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, return; } - if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_GPU)) + if ((volume->resource.access_flags & required_access) != required_access) { - if (location & ~WINED3D_LOCATION_SYSMEM) - { - ERR("Trying to load a cpu-only access volume into %s.\n", - wined3d_debug_location(location)); - return; - } + ERR("Operation requires %#x access, but volume only has %#x.\n", + required_access, volume->resource.access_flags); + return; } switch (location) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bc84bf..71c50ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2077,6 +2077,9 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; +void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; +void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, + const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; struct wined3d_surface_dib {

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
47
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 August 2013