August 2010 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw: Add a separate function for surface initialization.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 4378d4b31e97b90852401889dff246a4bc3adf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4378d4b31e97b90852401889d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 19 18:57:49 2010 +0200 ddraw: Add a separate function for surface initialization. --- dlls/ddraw/ddraw.c | 185 ++------------------------------------------ dlls/ddraw/ddraw_private.h | 9 +-- dlls/ddraw/surface.c | 167 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 171 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4378d4b31e97b90852401…

1 0

Henri Verbeet : ddraw: Add / improve TRACEs.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 20a42b4c98f499764f0f759769950dbf662321cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a42b4c98f499764f0f75976… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 19 18:57:50 2010 +0200 ddraw: Add / improve TRACEs. --- dlls/ddraw/clipper.c | 25 ++- dlls/ddraw/ddraw.c | 112 +++++---- dlls/ddraw/device.c | 598 +++++++++++++++++++++++++++----------------- dlls/ddraw/executebuffer.c | 122 +++++----- dlls/ddraw/light.c | 40 ++-- dlls/ddraw/main.c | 65 +++--- dlls/ddraw/material.c | 70 +++--- dlls/ddraw/palette.c | 22 +- dlls/ddraw/parent.c | 6 +- dlls/ddraw/surface.c | 157 +++++++----- dlls/ddraw/vertexbuffer.c | 78 +++--- dlls/ddraw/viewport.c | 78 ++++--- 12 files changed, 807 insertions(+), 566 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20a42b4c98f499764f0f7…

1 0

Jacek Caban : ntdll: IMAGE_REL_BASED_HIGH, IMAGE_REL_BASED_LOW and IMAGE_REL_BASED_HIGHLOW should be supported on win64 .
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 9713d62e89997eae0a9ebcc50f4e738b04cd2835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9713d62e89997eae0a9ebcc50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 20:07:01 2010 +0200 ntdll: IMAGE_REL_BASED_HIGH, IMAGE_REL_BASED_LOW and IMAGE_REL_BASED_HIGHLOW should be supported on win64. --- dlls/ntdll/loader.c | 3 +-- dlls/ntdll/tests/rtl.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4a2641b..79ae817 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2120,7 +2120,6 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count { case IMAGE_REL_BASED_ABSOLUTE: break; -#ifdef __i386__ case IMAGE_REL_BASED_HIGH: *(short *)((char *)page + offset) += HIWORD(delta); break; @@ -2130,7 +2129,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count case IMAGE_REL_BASED_HIGHLOW: *(int *)((char *)page + offset) += delta; break; -#elif defined(__x86_64__) +#ifdef __x86_64__ case IMAGE_REL_BASED_DIR64: *(INT_PTR *)((char *)page + offset) += delta; break; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 6e76a3c..8a83feb 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -72,6 +72,9 @@ static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,USHORT*,INT_PTR); + + #define LEN 16 static const char* src_src = "This is a test!"; /* 16 bytes long, incl NUL */ static ULONG src_aligned_block[4]; @@ -107,6 +110,7 @@ static void InitFunctionPtrs(void) pNtCurrentTeb = (void *)GetProcAddress(hntdll, "NtCurrentTeb"); pRtlGetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlGetThreadErrorMode"); pRtlSetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlSetThreadErrorMode"); + pLdrProcessRelocationBlock = (void *)GetProcAddress(hntdll, "LdrProcessRelocationBlock"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1094,6 +1098,37 @@ static void test_RtlThreadErrorMode(void) pRtlSetThreadErrorMode(oldmode, NULL); } +static void test_LdrProcessRelocationBlock(void) +{ + IMAGE_BASE_RELOCATION *ret; + USHORT reloc; + DWORD addr32; + SHORT addr16; + + if(!pLdrProcessRelocationBlock) { + win_skip("LdrProcessRelocationBlock not available\n"); + return; + } + + addr32 = 0x50005; + reloc = IMAGE_REL_BASED_HIGHLOW<<12; + ret = pLdrProcessRelocationBlock(&addr32, 1, &reloc, 0x500050); + ok((USHORT*)ret == &reloc+1, "ret = %p, expected %p\n", ret, &reloc+1); + ok(addr32 == 0x550055, "addr32 = %x, expected 0x550055\n", addr32); + + addr16 = 0x505; + reloc = IMAGE_REL_BASED_HIGH<<12; + ret = pLdrProcessRelocationBlock(&addr16, 1, &reloc, 0x500060); + ok((USHORT*)ret == &reloc+1, "ret = %p, expected %p\n", ret, &reloc+1); + ok(addr16 == 0x555, "addr16 = %x, expected 0x555\n", addr16); + + addr16 = 0x505; + reloc = IMAGE_REL_BASED_LOW<<12; + ret = pLdrProcessRelocationBlock(&addr16, 1, &reloc, 0x500060); + ok((USHORT*)ret == &reloc+1, "ret = %p, expected %p\n", ret, &reloc+1); + ok(addr16 == 0x565, "addr16 = %x, expected 0x565\n", addr16); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1114,4 +1149,5 @@ START_TEST(rtl) test_RtlAllocateAndInitializeSid(); test_RtlDeleteTimer(); test_RtlThreadErrorMode(); + test_LdrProcessRelocationBlock(); }

1 0

Juan Lang : shdocvw: Apply default scheme when none is present.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 158f5be8042e3d779e2582cae2978823c7f3e2dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=158f5be8042e3d779e2582cae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 19 12:08:12 2010 -0700 shdocvw: Apply default scheme when none is present. --- dlls/shdocvw/navigate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index e3f0af8..a160ee2 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -783,7 +783,8 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, DWORD size; size = sizeof(new_url)/sizeof(WCHAR); - hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME); + hres = UrlApplySchemeW(url, new_url, &size, + URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); if(FAILED(hres)) { WARN("UrlApplyScheme failed: %08x\n", hres); new_url[0] = 0;

1 0

Juan Lang : mshtml: Fix off by one error in setting status text.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 5f6b135668777305ccf955da4297c7c00651f6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6b135668777305ccf955da4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 19 11:25:46 2010 -0700 mshtml: Fix off by one error in setting status text. --- dlls/mshtml/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index d61c1f4..4aef475 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -114,7 +114,7 @@ void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg) DWORD len = lstrlenW(p) + lstrlenW(arg) - 1; LPWSTR buf = heap_alloc(len * sizeof(WCHAR)); - snprintfW(buf, len - 1, p, arg); + snprintfW(buf, len, p, arg); p = buf; }

1 0

Henri Verbeet : usp10: Pass the correct buffer size to lstrcpynA() in load_GSUB_feature().
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 7200f91c067debffb6ad10c463dd53f3f0498e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7200f91c067debffb6ad10c46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 19 18:57:43 2010 +0200 usp10: Pass the correct buffer size to lstrcpynA() in load_GSUB_feature(). --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index df84b1f..cc0a3c0 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -780,7 +780,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc else psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature)); - lstrcpynA(psc->features[psc->feature_count - 1].tag,feat,4); + lstrcpynA(psc->features[psc->feature_count - 1].tag, feat, 5); psc->features[psc->feature_count - 1].feature = feature; return feature; }

1 0

Henri Verbeet : ddraw: Add a separate function for device initialization.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: a60c49398667fcffa98d76214ce491f2a0ee288d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60c49398667fcffa98d76214… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 19 18:57:44 2010 +0200 ddraw: Add a separate function for device initialization. --- dlls/ddraw/ddraw.c | 109 +-------------------------------------- dlls/ddraw/ddraw_private.h | 8 +-- dlls/ddraw/device.c | 124 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 123 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a60c49398667fcffa98d7…

1 0

Henri Verbeet : ddraw: Add a separate function for execute buffer initialization.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 584cb331a9f7b40f72a96cdd7f21b78bd2812c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584cb331a9f7b40f72a96cdd7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 19 18:57:45 2010 +0200 ddraw: Add a separate function for execute buffer initialization. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 44 +++++++------------------------------------- dlls/ddraw/executebuffer.c | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 5ed1676..bfca885 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -614,8 +614,8 @@ struct IDirect3DExecuteBufferImpl BOOL need_free; }; -/* The VTable */ -extern const IDirect3DExecuteBufferVtbl IDirect3DExecuteBuffer_Vtbl DECLSPEC_HIDDEN; +HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, + IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN; /* The execute function */ void IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 931b204..d674e82 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -712,6 +712,8 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, { IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DExecuteBufferImpl* object; + HRESULT hr; + TRACE("(%p)->(%p,%p,%p)!\n", This, Desc, ExecuteBuffer, UnkOuter); if(UnkOuter) @@ -725,46 +727,14 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DExecuteBuffer_Vtbl; - object->ref = 1; - object->d3ddev = This; - - /* Initializes memory */ - memcpy(&object->desc, Desc, Desc->dwSize); - - /* No buffer given */ - if ((object->desc.dwFlags & D3DDEB_LPDATA) == 0) - object->desc.lpData = NULL; - - /* No buffer size given */ - if ((object->desc.dwFlags & D3DDEB_BUFSIZE) == 0) - object->desc.dwBufferSize = 0; - - /* Create buffer if asked */ - if ((object->desc.lpData == NULL) && (object->desc.dwBufferSize > 0)) - { - object->need_free = TRUE; - object->desc.lpData = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,object->desc.dwBufferSize); - if(!object->desc.lpData) - { - ERR("Out of memory when allocating the execute buffer data\n"); - HeapFree(GetProcessHeap(), 0, object); - return DDERR_OUTOFMEMORY; - } - } - else + hr = d3d_execute_buffer_init(object, This, Desc); + if (FAILED(hr)) { - object->need_free = FALSE; + WARN("Failed to initialize execute buffer, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; } - /* No vertices for the moment */ - object->vertex_data = NULL; - - object->desc.dwFlags |= D3DDEB_LPDATA; - - object->indices = NULL; - object->nb_indices = 0; - *ExecuteBuffer = (IDirect3DExecuteBuffer *)object; TRACE(" Returning IDirect3DExecuteBuffer at %p, implementation is at %p\n", *ExecuteBuffer, object); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 9f08976..b637022 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -825,7 +825,7 @@ IDirect3DExecuteBufferImpl_Optimize(IDirect3DExecuteBuffer *iface, return DDERR_UNSUPPORTED; /* Unchecked */ } -const IDirect3DExecuteBufferVtbl IDirect3DExecuteBuffer_Vtbl = +static const struct IDirect3DExecuteBufferVtbl d3d_execute_buffer_vtbl = { IDirect3DExecuteBufferImpl_QueryInterface, IDirect3DExecuteBufferImpl_AddRef, @@ -838,3 +838,38 @@ const IDirect3DExecuteBufferVtbl IDirect3DExecuteBuffer_Vtbl = IDirect3DExecuteBufferImpl_Validate, IDirect3DExecuteBufferImpl_Optimize, }; + +HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, + IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) +{ + execute_buffer->lpVtbl = &d3d_execute_buffer_vtbl; + execute_buffer->ref = 1; + execute_buffer->d3ddev = device; + + /* Initializes memory */ + memcpy(&execute_buffer->desc, desc, desc->dwSize); + + /* No buffer given */ + if (!(execute_buffer->desc.dwFlags & D3DDEB_LPDATA)) + execute_buffer->desc.lpData = NULL; + + /* No buffer size given */ + if (!(execute_buffer->desc.dwFlags & D3DDEB_BUFSIZE)) + execute_buffer->desc.dwBufferSize = 0; + + /* Create buffer if asked */ + if (!execute_buffer->desc.lpData && execute_buffer->desc.dwBufferSize) + { + execute_buffer->need_free = TRUE; + execute_buffer->desc.lpData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, execute_buffer->desc.dwBufferSize); + if (!execute_buffer->desc.lpData) + { + ERR("Failed to allocate execute buffer data.\n"); + return DDERR_OUTOFMEMORY; + } + } + + execute_buffer->desc.dwFlags |= D3DDEB_LPDATA; + + return D3D_OK; +}

1 0

Henri Verbeet : ddraw: Add a separate function for palette initialization.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: e2021722fc24870d1004898d63e8b5f95be6a60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2021722fc24870d1004898d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 19 18:57:46 2010 +0200 ddraw: Add a separate function for palette initialization. --- dlls/ddraw/ddraw.c | 15 ++++++--------- dlls/ddraw/ddraw_private.h | 4 +++- dlls/ddraw/palette.c | 24 +++++++++++++++++++++++- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 920a365..c8cebcb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3952,7 +3952,8 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags, { IDirectDrawImpl *This = (IDirectDrawImpl *)iface; IDirectDrawPaletteImpl *object; - HRESULT hr = DDERR_GENERIC; + HRESULT hr; + TRACE("(%p)->(%x,%p,%p,%p)\n", This, Flags, ColorTable, Palette, pUnkOuter); EnterCriticalSection(&ddraw_cs); @@ -3979,20 +3980,16 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags, return E_OUTOFMEMORY; } - object->lpVtbl = &IDirectDrawPalette_Vtbl; - object->ref = 1; - - hr = IWineD3DDevice_CreatePalette(This->wineD3DDevice, Flags, - ColorTable, &object->wineD3DPalette, (IUnknown *)object); - if(hr != DD_OK) + hr = ddraw_palette_init(object, This, Flags, ColorTable); + if (FAILED(hr)) { + WARN("Failed to initialize palette, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); LeaveCriticalSection(&ddraw_cs); return hr; } - IDirectDraw7_AddRef(iface); - object->ifaceToRelease = (IUnknown *) iface; + TRACE("Created palette %p.\n", object); *Palette = (IDirectDrawPalette *)object; LeaveCriticalSection(&ddraw_cs); return DD_OK; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index bfca885..6be5016 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -477,7 +477,9 @@ struct IDirectDrawPaletteImpl /* IDirectDrawPalette fields */ IUnknown *ifaceToRelease; }; -extern const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl DECLSPEC_HIDDEN; + +HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, + IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) DECLSPEC_HIDDEN; /****************************************************************************** * DirectDraw ClassFactory implementation - incomplete diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 2937ec6..7b9dcc2 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -240,7 +240,7 @@ IDirectDrawPaletteImpl_GetEntries(IDirectDrawPalette *iface, return hr; } -const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl = +static const struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = { /*** IUnknown ***/ IDirectDrawPaletteImpl_QueryInterface, @@ -252,3 +252,25 @@ const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl = IDirectDrawPaletteImpl_Initialize, IDirectDrawPaletteImpl_SetEntries }; + +HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, + IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) +{ + HRESULT hr; + + palette->lpVtbl = &ddraw_palette_vtbl; + palette->ref = 1; + + hr = IWineD3DDevice_CreatePalette(ddraw->wineD3DDevice, flags, + entries, &palette->wineD3DPalette, (IUnknown *)palette); + if (FAILED(hr)) + { + WARN("Failed to create wined3d palette, hr %#x.\n", hr); + return hr; + } + + palette->ifaceToRelease = (IUnknown *)ddraw; + IUnknown_AddRef(palette->ifaceToRelease); + + return DD_OK; +}

1 0

Henri Verbeet : ddraw: Add a separate function for vertex buffer initialization.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 0e955daed2616e2212ca735e19e10bbb8834d035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e955daed2616e2212ca735e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 19 18:57:47 2010 +0200 ddraw: Add a separate function for vertex buffer initialization. --- dlls/ddraw/ddraw.c | 40 ++------------------------------ dlls/ddraw/ddraw_private.h | 5 +-- dlls/ddraw/vertexbuffer.c | 54 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c8cebcb..13d9366 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4739,9 +4739,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFERDESC *desc, IDirect3DVertexBuffer7 **vertex_buffer, DWORD flags) { - IDirectDrawImpl *ddraw = ddraw_from_d3d7(iface); IDirect3DVertexBufferImpl *object; - DWORD usage; HRESULT hr; TRACE("iface %p, desc %p, vertex_buffer %p, flags %#x.\n", @@ -4763,49 +4761,17 @@ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFER return DDERR_OUTOFMEMORY; } - object->ref = 1; - object->lpVtbl = &IDirect3DVertexBuffer7_Vtbl; - object->IDirect3DVertexBuffer_vtbl = &IDirect3DVertexBuffer1_Vtbl; - - object->ddraw = ddraw; - object->Caps = desc->dwCaps; - object->fvf = desc->dwFVF; - - usage = desc->dwCaps & D3DVBCAPS_WRITEONLY ? WINED3DUSAGE_WRITEONLY : 0; - usage |= WINED3DUSAGE_STATICDECL; - - EnterCriticalSection(&ddraw_cs); - - hr = IWineD3DDevice_CreateVertexBuffer(ddraw->wineD3DDevice, - get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices, - usage, desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT, - &object->wineD3DVertexBuffer, (IUnknown *)object, &ddraw_null_wined3d_parent_ops); + hr = d3d_vertex_buffer_init(object, ddraw_from_d3d7(iface), desc); if (FAILED(hr)) { - WARN("Failed to create wined3d vertex buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - LeaveCriticalSection(&ddraw_cs); - if (hr == WINED3DERR_INVALIDCALL) - return DDERR_INVALIDPARAMS; - else - return hr; - } - - object->wineD3DVertexDeclaration = ddraw_find_decl(ddraw, desc->dwFVF); - if (!object->wineD3DVertexDeclaration) - { - ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); - IWineD3DBuffer_Release(object->wineD3DVertexBuffer); + WARN("Failed to initialize vertex buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; + return hr; } - IWineD3DVertexDeclaration_AddRef(object->wineD3DVertexDeclaration); TRACE("Created vertex buffer %p.\n", object); *vertex_buffer = (IDirect3DVertexBuffer7 *)object; - LeaveCriticalSection(&ddraw_cs); return D3D_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6be5016..2b9105b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -643,9 +643,8 @@ struct IDirect3DVertexBufferImpl DWORD fvf; }; -/* The Vtables */ -extern const IDirect3DVertexBuffer7Vtbl IDirect3DVertexBuffer7_Vtbl DECLSPEC_HIDDEN; -extern const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl DECLSPEC_HIDDEN; +HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer, + IDirectDrawImpl *ddraw, D3DVERTEXBUFFERDESC *desc) DECLSPEC_HIDDEN; static inline IDirect3DVertexBufferImpl *vb_from_vb1(IDirect3DVertexBuffer *iface) { diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index fc02660..c25aad5 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -553,7 +553,7 @@ IDirect3DVertexBufferImpl_ProcessVerticesStrided(IDirect3DVertexBuffer7 *iface, * The VTables *****************************************************************************/ -const IDirect3DVertexBuffer7Vtbl IDirect3DVertexBuffer7_Vtbl = +static const struct IDirect3DVertexBuffer7Vtbl d3d_vertex_buffer7_vtbl = { /*** IUnknown Methods ***/ IDirect3DVertexBufferImpl_QueryInterface, @@ -569,7 +569,7 @@ const IDirect3DVertexBuffer7Vtbl IDirect3DVertexBuffer7_Vtbl = IDirect3DVertexBufferImpl_ProcessVerticesStrided }; -const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl = +static const struct IDirect3DVertexBufferVtbl d3d_vertex_buffer1_vtbl = { /*** IUnknown Methods ***/ Thunk_IDirect3DVertexBufferImpl_1_QueryInterface, @@ -582,3 +582,53 @@ const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl = Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc, Thunk_IDirect3DVertexBufferImpl_1_Optimize }; + +HRESULT d3d_vertex_buffer_init(IDirect3DVertexBufferImpl *buffer, + IDirectDrawImpl *ddraw, D3DVERTEXBUFFERDESC *desc) +{ + DWORD usage; + HRESULT hr; + + buffer->lpVtbl = &d3d_vertex_buffer7_vtbl; + buffer->IDirect3DVertexBuffer_vtbl = &d3d_vertex_buffer1_vtbl; + buffer->ref = 1; + + buffer->ddraw = ddraw; + buffer->Caps = desc->dwCaps; + buffer->fvf = desc->dwFVF; + + usage = desc->dwCaps & D3DVBCAPS_WRITEONLY ? WINED3DUSAGE_WRITEONLY : 0; + usage |= WINED3DUSAGE_STATICDECL; + + EnterCriticalSection(&ddraw_cs); + + hr = IWineD3DDevice_CreateVertexBuffer(ddraw->wineD3DDevice, + get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices, + usage, desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT, + &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &ddraw_null_wined3d_parent_ops); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex buffer, hr %#x.\n", hr); + LeaveCriticalSection(&ddraw_cs); + + if (hr == WINED3DERR_INVALIDCALL) + return DDERR_INVALIDPARAMS; + else + return hr; + } + + buffer->wineD3DVertexDeclaration = ddraw_find_decl(ddraw, desc->dwFVF); + if (!buffer->wineD3DVertexDeclaration) + { + ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); + IWineD3DBuffer_Release(buffer->wineD3DVertexBuffer); + LeaveCriticalSection(&ddraw_cs); + + return DDERR_INVALIDPARAMS; + } + IWineD3DVertexDeclaration_AddRef(buffer->wineD3DVertexDeclaration); + + LeaveCriticalSection(&ddraw_cs); + + return D3D_OK; +}

1 0