November 2008 - Wine-commits

Henri Verbeet : dxgi: Add a wined3d device to dxgi_device.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: a42b7568b9608349bc31fb466da218a48181cf61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42b7568b9608349bc31fb466… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 12:16:04 2008 +0100 dxgi: Add a wined3d device to dxgi_device. --- dlls/dxgi/device.c | 4 +++ dlls/dxgi/dxgi_main.c | 52 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dxgi/dxgi_private.h | 2 + 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index fddc535..7ccece6 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -73,6 +73,10 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IDXGIDevice *iface) if (!refcount) { if (This->child_layer) IUnknown_Release(This->child_layer); + EnterCriticalSection(&dxgi_cs); + IWineD3DDevice_Release(This->wined3d_device); + LeaveCriticalSection(&dxgi_cs); + IWineDXGIFactory_Release(This->factory); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index e12d11c..05476a5 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -166,6 +166,9 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I struct layer_get_size_args get_size_args; struct dxgi_device *dxgi_device; struct dxgi_device_layer d3d10_layer; + IWineDXGIAdapter *wine_adapter; + UINT adapter_ordinal; + IWineD3D *wined3d; void *layer_base; UINT device_size; DWORD count; @@ -217,6 +220,39 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I dxgi_device->vtbl = &dxgi_device_vtbl; dxgi_device->refcount = 1; + + hr = IDXGIFactory_QueryInterface(factory, &IID_IWineDXGIFactory, (void **)&dxgi_device->factory); + if (FAILED(hr)) + { + WARN("This is not the factory we're looking for, returning %#x\n", hr); + goto fail; + } + wined3d = IWineDXGIFactory_get_wined3d(dxgi_device->factory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)&wine_adapter); + if (FAILED(hr)) + { + WARN("This is not the adapter we're looking for, returning %#x\n", hr); + EnterCriticalSection(&dxgi_cs); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + goto fail; + } + adapter_ordinal = IWineDXGIAdapter_get_ordinal(wine_adapter); + IWineDXGIAdapter_Release(wine_adapter); + + FIXME("Ignoring adapter type\n"); + EnterCriticalSection(&dxgi_cs); + hr = IWineD3D_CreateDevice(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, NULL, + 0, &dxgi_device->wined3d_device, (IUnknown *)dxgi_device); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + if (FAILED(hr)) + { + WARN("Failed to create a WineD3D device, returning %#x\n", hr); + goto fail; + } + layer_base = dxgi_device + 1; hr = d3d10_layer.create(d3d10_layer.id, &layer_base, 0, @@ -224,14 +260,24 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I if (FAILED(hr)) { WARN("Failed to create device, returning %#x\n", hr); - HeapFree(GetProcessHeap(), 0, dxgi_device); - *device = NULL; - return hr; + goto fail; } *device = (IUnknown *)dxgi_device; return hr; + +fail: + if (dxgi_device->wined3d_device) + { + EnterCriticalSection(&dxgi_cs); + IWineD3DDevice_Release(dxgi_device->wined3d_device); + LeaveCriticalSection(&dxgi_cs); + } + if (dxgi_device->factory) IWineDXGIFactory_Release(dxgi_device->factory); + HeapFree(GetProcessHeap(), 0, dxgi_device); + *device = NULL; + return hr; } HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 7ebf2e2..95dab26 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -55,6 +55,8 @@ struct dxgi_device const struct IDXGIDeviceVtbl *vtbl; IUnknown *child_layer; LONG refcount; + IWineD3DDevice *wined3d_device; + IWineDXGIFactory *factory; }; /* IDXGIAdapter */

1 0

Henri Verbeet : dxgi: Add an ordinal field to dxgi_adapter.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 20b042027c0c257c24d9f92426cfa7f1c7ae0dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b042027c0c257c24d9f9242… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 12:16:04 2008 +0100 dxgi: Add an ordinal field to dxgi_adapter. --- dlls/dxgi/adapter.c | 39 +++++++++++++++++++++++---------- dlls/dxgi/dxgi_private.h | 5 ++- dlls/dxgi/dxgi_private_interface.idl | 10 ++++++++ 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 1d6169f..54e5143 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -26,13 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDXGIObject) - || IsEqualGUID(riid, &IID_IDXGIAdapter)) + || IsEqualGUID(riid, &IID_IDXGIAdapter) + || IsEqualGUID(riid, &IID_IWineDXGIAdapter)) { IUnknown_AddRef(iface); *object = iface; @@ -45,7 +46,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter *iface return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IDXGIAdapter *iface) +static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface) { struct dxgi_adapter *This = (struct dxgi_adapter *)iface; ULONG refcount = InterlockedIncrement(&This->refcount); @@ -55,7 +56,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IDXGIAdapter *iface) return refcount; } -static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter *iface) +static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface) { struct dxgi_adapter *This = (struct dxgi_adapter *)iface; ULONG refcount = InterlockedDecrement(&This->refcount); @@ -72,7 +73,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter *iface) /* IDXGIObject methods */ -static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IWineDXGIAdapter *iface, REFGUID guid, UINT data_size, const void *data) { FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); @@ -80,7 +81,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter *iface return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IWineDXGIAdapter *iface, REFGUID guid, const IUnknown *object) { FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); @@ -88,7 +89,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapt return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IWineDXGIAdapter *iface, REFGUID guid, UINT *data_size, void *data) { FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); @@ -96,7 +97,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter *iface return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter *iface, REFIID riid, void **parent) +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, REFIID riid, void **parent) { FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); @@ -105,21 +106,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter *iface, REF /* IDXGIAdapter methods */ -static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IDXGIAdapter *iface, UINT output_idx, IDXGIOutput **output) +static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *iface, + UINT output_idx, IDXGIOutput **output) { FIXME("iface %p, output_idx %u, output %p stub!\n", iface, output_idx, output); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) { FIXME("iface %p, desc %p stub!\n", iface, desc); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter *iface, +static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAdapter *iface, REFGUID guid, LARGE_INTEGER *umd_version) { FIXME("iface %p, guid %s, umd_version %p stub!\n", iface, debugstr_guid(guid), umd_version); @@ -127,7 +129,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter return E_NOTIMPL; } -const struct IDXGIAdapterVtbl dxgi_adapter_vtbl = +/* IWineDXGIAdapter methods */ + +static UINT STDMETHODCALLTYPE dxgi_adapter_get_ordinal(IWineDXGIAdapter *iface) +{ + struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + + TRACE("iface %p, returning %u\n", iface, This->ordinal); + + return This->ordinal; +} + +const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { /* IUnknown methods */ dxgi_adapter_QueryInterface, @@ -142,4 +155,6 @@ const struct IDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_EnumOutputs, dxgi_adapter_GetDesc, dxgi_adapter_CheckInterfaceSupport, + /* IWineDXGIAdapter methods */ + dxgi_adapter_get_ordinal, }; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index ae44204..7ebf2e2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -58,11 +58,12 @@ struct dxgi_device }; /* IDXGIAdapter */ -extern const struct IDXGIAdapterVtbl dxgi_adapter_vtbl; +extern const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl; struct dxgi_adapter { - const struct IDXGIAdapterVtbl *vtbl; + const struct IWineDXGIAdapterVtbl *vtbl; LONG refcount; + UINT ordinal; }; /* IDXGISwapChain */ diff --git a/dlls/dxgi/dxgi_private_interface.idl b/dlls/dxgi/dxgi_private_interface.idl index bbdc25e..2bb8b43 100644 --- a/dlls/dxgi/dxgi_private_interface.idl +++ b/dlls/dxgi/dxgi_private_interface.idl @@ -27,3 +27,13 @@ interface IWineDXGIFactory : IDXGIFactory { struct IWineD3D *get_wined3d(); } + +[ + object, + local, + uuid(ab1de34c-2963-4ffd-8493-40f580e510e5) +] +interface IWineDXGIAdapter : IDXGIAdapter +{ + UINT get_ordinal(); +}

1 0

Henri Verbeet : d3d10core: Add a trace for D3D10CoreCreateDevice().
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 53b395f3b94cb5e9cec4770e7dce6dd65c0587be URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b395f3b94cb5e9cec4770e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 12:16:03 2008 +0100 d3d10core: Add a trace for D3D10CoreCreateDevice(). --- dlls/d3d10core/d3d10core_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 6bc14c6..9190ca3 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -112,6 +112,9 @@ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte HMODULE d3d10core; HRESULT hr; + TRACE("factory %p, adapter %p, flags %#x, unknown0 %#x, device %p\n", + factory, adapter, flags, unknown0, device); + d3d10core = GetModuleHandleA("d3d10core.dll"); hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, flags, unknown0, (void **)&dxgi_device); if (FAILED(hr))

1 0

Henri Verbeet : dxgi: Add some dxgi return codes.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: e2572c9762c7a713bc49c86c493f60a8c6175e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2572c9762c7a713bc49c86c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 12:16:03 2008 +0100 dxgi: Add some dxgi return codes. --- include/dxgi.idl | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 1f0c25e..b67674e 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -18,6 +18,32 @@ import "dxgitype.idl"; +const UINT _FACDXGI = 0x87a; + +cpp_quote("#define MAKE_DXGI_STATUS(x) MAKE_HRESULT(0, _FACDXGI, x)") +cpp_quote("#define DXGI_STATUS_OCCLUDED MAKE_DXGI_STATUS(1)") +cpp_quote("#define DXGI_STATUS_CLIPPED MAKE_DXGI_STATUS(2)") +cpp_quote("#define DXGI_STATUS_NO_REDIRECTION MAKE_DXGI_STATUS(4)") +cpp_quote("#define DXGI_STATUS_NO_DESKTOP_ACCESS MAKE_DXGI_STATUS(5)") +cpp_quote("#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6)") +cpp_quote("#define DXGI_STATUS_MODE_CHANGED MAKE_DXGI_STATUS(7)") +cpp_quote("#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS MAKE_DXGI_STATUS(8)") + +cpp_quote("#define MAKE_DXGI_HRESULT(x) MAKE_HRESULT(1, _FACDXGI, x)") +cpp_quote("#define DXGI_ERROR_INVALID_CALL MAKE_DXGI_HRESULT(1)") +cpp_quote("#define DXGI_ERROR_NOT_FOUND MAKE_DXGI_HRESULT(2)") +cpp_quote("#define DXGI_ERROR_MORE_DATA MAKE_DXGI_HRESULT(3)") +cpp_quote("#define DXGI_ERROR_UNSUPPORTED MAKE_DXGI_HRESULT(4)") +cpp_quote("#define DXGI_ERROR_DEVICE_REMOVED MAKE_DXGI_HRESULT(5)") +cpp_quote("#define DXGI_ERROR_DEVICE_HUNG MAKE_DXGI_HRESULT(6)") +cpp_quote("#define DXGI_ERROR_DEVICE_RESET MAKE_DXGI_HRESULT(7)") +cpp_quote("#define DXGI_ERROR_WAS_STILL_DRAWING MAKE_DXGI_HRESULT(10)") +cpp_quote("#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT MAKE_DXGI_HRESULT(11)") +cpp_quote("#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12)") +cpp_quote("#define DXGI_ERROR_DRIVER_INTERNAL_ERROR MAKE_DXGI_HRESULT(32)") +cpp_quote("#define DXGI_ERROR_NONEXCLUSIVE MAKE_DXGI_HRESULT(33)") +cpp_quote("#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE MAKE_DXGI_HRESULT(34)") + cpp_quote("#if 0") typedef HANDLE HMONITOR; typedef struct _LUID {

1 0

Henri Verbeet : dxgi: Add a IWineD3D field to dxgi_factory.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 479e3672c42de13e2420e501b9f6d6a56628a69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=479e3672c42de13e2420e501b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 12:16:04 2008 +0100 dxgi: Add a IWineD3D field to dxgi_factory. --- .gitignore | 1 + dlls/dxgi/Makefile.in | 4 ++- dlls/dxgi/dxgi_main.c | 10 +++++-- dlls/dxgi/dxgi_private.h | 13 +++++++- dlls/dxgi/dxgi_private_interface.idl | 29 ++++++++++++++++++++ dlls/dxgi/factory.c | 49 ++++++++++++++++++++++++--------- 6 files changed, 86 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=479e3672c42de13e2420e…

1 0

Dylan Smith : richedit: Removed useless lines in ME_GetDefaultCharFormat.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: df6e47e3a76ee37e8eef6234f47098aa30e87564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6e47e3a76ee37e8eef6234f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Nov 17 03:47:25 2008 -0500 richedit: Removed useless lines in ME_GetDefaultCharFormat. --- dlls/riched20/run.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index bb34ad8..133219d 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -872,8 +872,6 @@ static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHAR */ void ME_GetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) { - int nFrom, nTo; - ME_GetSelection(editor, &nFrom, &nTo); ME_CopyCharFormat(pFmt, &editor->pBuffer->pDefaultStyle->fmt); }

1 0

Alexandre Julliard : user32: Fix FindWindow to not match an empty class name.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 025daaf0e8c62d0f53a1af04824ed83f183d628c URL: http://source.winehq.org/git/wine.git/?a=commit;h=025daaf0e8c62d0f53a1af048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 17 14:14:05 2008 +0100 user32: Fix FindWindow to not match an empty class name. --- dlls/user32/win.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2fc00c4..730b2c2 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -223,6 +223,10 @@ static HWND *list_window_children( HDESK desktop, HWND hwnd, LPCWSTR class, DWOR { HWND *list; int size = 128; + ATOM atom = get_int_atom_value( class ); + + /* empty class is not the same as NULL class */ + if (!atom && class && !class[0]) return NULL; for (;;) { @@ -235,8 +239,8 @@ static HWND *list_window_children( HDESK desktop, HWND hwnd, LPCWSTR class, DWOR req->desktop = desktop; req->parent = hwnd; req->tid = tid; - if (!(req->atom = get_int_atom_value( class )) && class) - wine_server_add_data( req, class, strlenW(class)*sizeof(WCHAR) ); + req->atom = atom; + if (!atom && class) wine_server_add_data( req, class, strlenW(class)*sizeof(WCHAR) ); wine_server_set_reply( req, list, (size-1) * sizeof(HWND) ); if (!wine_server_call( req )) count = reply->count; }

1 0

Vincent Povirk : gdiplus: Fix GdipFlattenPath for already-flat paths and add a test.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: eddc1275885a8495d8506fffbd5407953e234c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddc1275885a8495d8506fffb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 14 16:57:30 2008 -0600 gdiplus: Fix GdipFlattenPath for already-flat paths and add a test. --- dlls/gdiplus/graphicspath.c | 5 ++--- dlls/gdiplus/tests/graphicspath.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 9318e1a..22b27e4 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -984,17 +984,16 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes /* always add line points and start points */ if((type == PathPointTypeStart) || (type == PathPointTypeLine)){ - type = (path->pathdata.Types[i] & ~PathPointTypeBezier) | PathPointTypeLine; - if(!add_path_list_node(node, pt.X, pt.Y, type)) + if(!add_path_list_node(node, pt.X, pt.Y, path->pathdata.Types[i])) goto memout; node = node->next; + ++i; continue; } /* Bezier curve always stored as 4 points */ if((path->pathdata.Types[i-1] & PathPointTypePathTypeMask) != PathPointTypeStart){ - type = (path->pathdata.Types[i] & ~PathPointTypeBezier) | PathPointTypeLine; if(!add_path_list_node(node, pt.X, pt.Y, type)) goto memout; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 7a5fbc2..168c4b5 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -914,6 +914,11 @@ static path_test_t flattenellipse_path[] = { {100.0,25.0, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 1} /*24*/ }; +static path_test_t flattenline_path[] = { + {5.0, 10.0,PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 100.0, PathPointTypeLine, 0, 0} /*1*/ + }; + static path_test_t flattenarc_path[] = { {100.0, 25.0,PathPointTypeStart, 0, 0}, /*0*/ {99.0, 30.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -966,6 +971,14 @@ static void test_flatten(void) status = GdipResetPath(path); expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 100.0); + expect(Ok, status); + status = GdipFlattenPath(path, NULL, 1.0); + expect(Ok, status); + ok_path(path, flattenline_path, sizeof(flattenline_path)/sizeof(path_test_t), FALSE); + + status = GdipResetPath(path); + expect(Ok, status); status = GdipAddPathArc(path, 0.0, 0.0, 100.0, 50.0, 0.0, 90.0); expect(Ok, status); status = GdipFlattenPath(path, NULL, 1.0);

1 0

Christian Costa : d3dxof: Allow '-' in names.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 630e2fff91beae54a073b3b430de4c1fdf8bcd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630e2fff91beae54a073b3b43… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 16 19:42:38 2008 +0100 d3dxof: Allow '-' in names. --- dlls/d3dxof/d3dxof.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 25d4834..5630284 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -239,7 +239,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV { lpdxflm = (LPDXFILELOADMEMORY)pvSource; - FIXME("Source in memory at %p with size %d\n", lpdxflm->lpMemory, lpdxflm->dSize); + TRACE("Source in memory at %p with size %d\n", lpdxflm->lpMemory, lpdxflm->dSize); memcpy(header, (char*)lpdxflm->lpMemory, 16); } @@ -606,7 +606,7 @@ static BOOL is_name(parse_buffer* buf) BOOL error = 0; while (!is_separator(c = *(buf->buffer+pos))) { - if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')) || (c == '_'))) + if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')) || (c == '_') || (c == '-'))) error = 1; tmp[pos++] = c; }

1 0

Christian Costa : d3dxof: Fix data buffer limit check. Increase size of input and data buffers.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: b67bbc92efe7ab06a627bcabb938a4c6b6ebf938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67bbc92efe7ab06a627bcabb… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 16 19:44:51 2008 +0100 d3dxof: Fix data buffer limit check. Increase size of input and data buffers. --- dlls/d3dxof/d3dxof.c | 20 ++++++++++---------- dlls/d3dxof/d3dxof_private.h | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5630284..fc01a74 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -80,8 +80,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); #define CLSIDFMT "<%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X>" -#define MAX_INPUT_SIZE 1000000 -#define MAX_DATA_SIZE 100000 +#define MAX_INPUT_SIZE 2000000 +#define MAX_DATA_SIZE 200000 static const struct IDirectXFileVtbl IDirectXFile_Vtbl; static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; @@ -1858,9 +1858,9 @@ static BOOL parse_object_members_list(parse_buffer * buf) last_dword = *(DWORD*)buf->value; TRACE("%s = %d\n", pt->members[i].name, *(DWORD*)buf->value); /* Assume larger size */ - if ((buf->cur_pdata - buf->pxo->pdata + 4) > MAX_DATA_SIZE) + if ((buf->cur_pdata - buf->pdata + 4) > MAX_DATA_SIZE) { - WARN("Buffer too small\n"); + FIXME("Buffer too small\n"); return FALSE; } if (pt->members[i].type == TOKEN_WORD) @@ -1884,9 +1884,9 @@ static BOOL parse_object_members_list(parse_buffer * buf) get_TOKEN(buf); TRACE("%s = %f\n", pt->members[i].name, *(float*)buf->value); /* Assume larger size */ - if ((buf->cur_pdata - buf->pxo->pdata + 4) > MAX_DATA_SIZE) + if ((buf->cur_pdata - buf->pdata + 4) > MAX_DATA_SIZE) { - WARN("Buffer too small\n"); + FIXME("Buffer too small\n"); return FALSE; } if (pt->members[i].type == TOKEN_FLOAT) @@ -1905,9 +1905,9 @@ static BOOL parse_object_members_list(parse_buffer * buf) get_TOKEN(buf); TRACE("%s = %s\n", pt->members[i].name, (char*)buf->value); /* Assume larger size */ - if ((buf->cur_pdata - buf->pxo->pdata + 4) > MAX_DATA_SIZE) + if ((buf->cur_pdata - buf->pdata + 4) > MAX_DATA_SIZE) { - WARN("Buffer too small\n"); + FIXME("Buffer too small\n"); return FALSE; } if (pt->members[i].type == TOKEN_LPSTR) @@ -1915,7 +1915,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) int len = strlen((char*)buf->value) + 1; if ((buf->cur_pstrings - buf->pstrings + len) > MAX_STRINGS_BUFFER) { - WARN("Buffer too small %p %p %d\n", buf->cur_pstrings, buf->pstrings, len); + FIXME("Buffer too small %p %p %d\n", buf->cur_pstrings, buf->pstrings, len); return FALSE; } strcpy((char*)buf->cur_pstrings, (char*)buf->value); @@ -2124,7 +2124,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE WARN("Out of memory\n"); return DXFILEERR_BADALLOC; } - This->buf.cur_pdata = pdata; + This->buf.cur_pdata = This->buf.pdata = pdata; pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); if (!pstrings) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 80f67a2..1789dc7 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -135,6 +135,7 @@ typedef struct { xobject* pxo; xtemplate* pxt[MAX_SUBOBJECTS]; ULONG level; + LPBYTE pdata; LPBYTE pstrings; } parse_buffer;

1 0