wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Alexandre Julliard : winebuild: Don' t include any Windows header to avoid data types dependencies.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: b374e7e36e8556d2fe2b86966a9236a791ee9996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b374e7e36e8556d2fe2b86966… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 20:58:43 2009 +0200 winebuild: Don't include any Windows header to avoid data types dependencies. --- tools/winebuild/build.h | 32 ++++++++++++++++++++++++++++++++ tools/winebuild/import.c | 2 -- tools/winebuild/main.c | 2 -- tools/winebuild/parser.c | 2 -- tools/winebuild/relay.c | 13 ++++++------- tools/winebuild/res16.c | 18 ++++++++---------- tools/winebuild/res32.c | 37 ++++++++++++++++++++----------------- tools/winebuild/spec16.c | 32 ++++++++++++++++++++++---------- tools/winebuild/spec32.c | 17 +++++++++++++---- tools/winebuild/utils.c | 2 -- 10 files changed, 101 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b374e7e36e8556d2fe2b8…

1 0

Alexandre Julliard : winebuild: Hardcode the stack frame offsets instead of using the data structures.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 89f6bc2ef498fed4b8cb7dd1ae29122f482d6cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f6bc2ef498fed4b8cb7dd1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 20:30:10 2009 +0200 winebuild: Hardcode the stack frame offsets instead of using the data structures. --- tools/winebuild/relay.c | 81 ++++++++++++++++++++-------------------------- 1 files changed, 35 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89f6bc2ef498fed4b8cb7…

1 0

Alexandre Julliard : winebuild: Hardcode the i386 register context offsets instead of using the data structure .
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: d71284f0b4d0d2fe5aa8fafef90877ca51f669b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71284f0b4d0d2fe5aa8fafef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 20:01:56 2009 +0200 winebuild: Hardcode the i386 register context offsets instead of using the data structure. --- tools/winebuild/relay.c | 174 +++++++++++++++++++++++------------------------ 1 files changed, 85 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d71284f0b4d0d2fe5aa8f…

1 0

Alexandre Julliard : include: The magic HKEY_* handles should be sign-extended on 64-bit.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 5534cde72c0b187e71827fdbcd893c1e4d6ca4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5534cde72c0b187e71827fdbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 18:30:07 2009 +0200 include: The magic HKEY_* handles should be sign-extended on 64-bit. --- include/winreg.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/winreg.h b/include/winreg.h index c024369..e532459 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -25,13 +25,13 @@ extern "C" { #endif /* defined(__cplusplus) */ -#define HKEY_CLASSES_ROOT ((HKEY) 0x80000000) -#define HKEY_CURRENT_USER ((HKEY) 0x80000001) -#define HKEY_LOCAL_MACHINE ((HKEY) 0x80000002) -#define HKEY_USERS ((HKEY) 0x80000003) -#define HKEY_PERFORMANCE_DATA ((HKEY) 0x80000004) -#define HKEY_CURRENT_CONFIG ((HKEY) 0x80000005) -#define HKEY_DYN_DATA ((HKEY) 0x80000006) +#define HKEY_CLASSES_ROOT ((HKEY)(LONG_PTR)(LONG)0x80000000) +#define HKEY_CURRENT_USER ((HKEY)(LONG_PTR)(LONG)0x80000001) +#define HKEY_LOCAL_MACHINE ((HKEY)(LONG_PTR)(LONG)0x80000002) +#define HKEY_USERS ((HKEY)(LONG_PTR)(LONG)0x80000003) +#define HKEY_PERFORMANCE_DATA ((HKEY)(LONG_PTR)(LONG)0x80000004) +#define HKEY_CURRENT_CONFIG ((HKEY)(LONG_PTR)(LONG)0x80000005) +#define HKEY_DYN_DATA ((HKEY)(LONG_PTR)(LONG)0x80000006) /* * registry provider structs

1 0

Andreas.Rosenberg : advapi32/tests: Added a test to verify result of LookupAccountSid.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: f212579ae9a1b770ebd34cec20f95e1977bb57f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f212579ae9a1b770ebd34cec2… Author: Andreas.Rosenberg <andreas.rosenberg(a)apis.de> Date: Thu Apr 9 11:26:51 2009 +0200 advapi32/tests: Added a test to verify result of LookupAccountSid. --- dlls/advapi32/tests/security.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 544b217..ac848bb 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1410,8 +1410,8 @@ static void test_CreateWellKnownSid(void) static void test_LookupAccountSid(void) { SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; - CHAR accountA[MAX_PATH], domainA[MAX_PATH]; - DWORD acc_sizeA, dom_sizeA; + CHAR accountA[MAX_PATH], domainA[MAX_PATH], usernameA[MAX_PATH]; + DWORD acc_sizeA, dom_sizeA, user_sizeA; DWORD real_acc_sizeA, real_dom_sizeA; WCHAR accountW[MAX_PATH], domainW[MAX_PATH]; DWORD acc_sizeW, dom_sizeW; @@ -1419,10 +1419,12 @@ static void test_LookupAccountSid(void) PSID pUsersSid = NULL; SID_NAME_USE use; BOOL ret; - DWORD size; + DWORD size,cbti = 0; MAX_SID max_sid; CHAR *str_sidA; int i; + HANDLE hToken; + PTOKEN_USER ptiUser = NULL; /* native windows crashes if account size, domain size, or name use is NULL */ @@ -1581,6 +1583,26 @@ static void test_LookupAccountSid(void) FreeSid(pUsersSid); + /* Test LookupAccountSid with Sid retrieved from token information. + This assumes this process is running under the account of the current user.*/ + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &hToken); + ret = GetTokenInformation(hToken, TokenUser, NULL, 0, &cbti); + ptiUser = (PTOKEN_USER) HeapAlloc(GetProcessHeap(), 0, cbti); + if (GetTokenInformation(hToken, TokenUser, ptiUser, cbti, &cbti)) + { + acc_sizeA = dom_sizeA = MAX_PATH; + ret = LookupAccountSidA(NULL, ptiUser->User.Sid, accountA, &acc_sizeA, domainA, &dom_sizeA, &use); + ok(ret, "LookupAccountSidA() Expected TRUE, got FALSE\n"); + user_sizeA = MAX_PATH; + ret = GetUserNameA(usernameA , &user_sizeA); + ok(ret, "GetUserNameA() Expected TRUE, got FALSE\n"); + todo_wine + { + ok(lstrcmpA(usernameA, accountA) == 0, "LookupAccountSidA() Expected account name: %s got: %s\n", usernameA, accountA ); + } + } + HeapFree(GetProcessHeap(), 0, ptiUser); + if (pCreateWellKnownSid && pConvertSidToStringSidA) { trace("Well Known SIDs:\n");

1 0

Christian Costa : mciqtz32: Implement MCI_STATUS.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 5ab983e979e0b63c1bd3d8455d46ed4b97069024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab983e979e0b63c1bd3d8455… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Apr 8 23:22:50 2009 +0200 mciqtz32: Implement MCI_STATUS. --- dlls/mciqtz32/mciqtz.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 874b876..0cd973b 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -336,6 +336,84 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa return 0; } +/*************************************************************************** + * MCIQTZ_mciStatus [internal] + */ +static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (!(dwFlags & MCI_STATUS_ITEM)) { + WARN("No status item specified\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + switch (lpParms->dwItem) { + case MCI_STATUS_LENGTH: + FIXME("MCI_STATUS_LENGTH not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_POSITION: + { + HRESULT hr; + REFTIME curpos; + IMediaPosition* pmpos; + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaPosition, (LPVOID*)&pmpos); + if (FAILED(hr)) { + FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + hr = IMediaPosition_get_CurrentPosition(pmpos, &curpos); + if (FAILED(hr)) { + FIXME("Cannot get position (hr = %x)\n", hr); + IMediaPosition_Release(pmpos); + return MCIERR_INTERNAL; + } + + IMediaPosition_Release(pmpos); + lpParms->dwReturn = curpos / 10000; + + break; + } + case MCI_STATUS_NUMBER_OF_TRACKS: + FIXME("MCI_STATUS_NUMBER_OF_TRACKS not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_MODE: + FIXME("MCI_STATUS_MODE not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_MEDIA_PRESENT: + FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_TIME_FORMAT: + FIXME("MCI_STATUS_TIME_FORMAT not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_READY: + FIXME("MCI_STATUS_READY not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_CURRENT_TRACK: + FIXME("MCI_STATUS_CURRENT_TRACK not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + default: + FIXME("Unknown command %08X\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); + + return 0; +} + /*======================================================================* * MCI QTZ entry points * *======================================================================*/ @@ -371,12 +449,12 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); + case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_RECORD: case MCI_STOP: case MCI_SET: case MCI_PAUSE: case MCI_RESUME: - case MCI_STATUS: case MCI_GETDEVCAPS: case MCI_INFO: case MCI_PUT:

1 0

Stefan Dösinger : d3d: Remove the format from index buffers.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: cb1c9dcda9267b2826ecfaf061dd557957a0b5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1c9dcda9267b2826ecfaf06… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 10:50:31 2009 +0200 d3d: Remove the format from index buffers. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 7 +++++-- dlls/d3d8/indexbuffer.c | 2 +- dlls/d3d8/vertexbuffer.c | 2 +- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 7 ++++--- dlls/d3d9/indexbuffer.c | 5 +++-- dlls/d3d9/vertexbuffer.c | 2 +- dlls/ddraw/device.c | 5 +++-- dlls/ddraw/direct3d.c | 2 +- dlls/ddraw/surface.c | 2 +- dlls/wined3d/buffer.c | 1 - dlls/wined3d/device.c | 15 +++++++-------- dlls/wined3d/stateblock.c | 13 +++++++++---- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 5 ++--- 16 files changed, 42 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb1c9dcda9267b2826ecf…

1 0

Stefan Dösinger : wined3d: Remove the buffer fvf.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: f0efa9741353b9a7871eab17508404ffafb5fb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0efa9741353b9a7871eab175… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 14:16:59 2009 +0200 wined3d: Remove the buffer fvf. --- dlls/d3d8/device.c | 7 +++++-- dlls/d3d9/device.c | 3 ++- dlls/d3d9/vertexbuffer.c | 4 +++- dlls/ddraw/vertexbuffer.c | 3 ++- dlls/wined3d/buffer.c | 5 ++++- dlls/wined3d/device.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 3 --- include/wine/wined3d.idl | 4 ++-- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 352018f..057d895 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -737,7 +737,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 object->lpVtbl = &Direct3DVertexBuffer8_Vtbl; object->ref = 1; EnterCriticalSection(&d3d8_cs); - hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, + 0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL, + (IUnknown *)object); LeaveCriticalSection(&d3d8_cs); object->fvf = FVF; @@ -1662,10 +1664,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVI static HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 iface, UINT SrcStartIndex,UINT DestIndex,UINT VertexCount,IDirect3DVertexBuffer8* pDestBuffer,DWORD Flags) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; + IDirect3DVertexBuffer8Impl *dest = (IDirect3DVertexBuffer8Impl *) pDestBuffer; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, ((IDirect3DVertexBuffer8Impl *)pDestBuffer)->wineD3DVertexBuffer, NULL, Flags); + hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, dest->wineD3DVertexBuffer, NULL, Flags, dest->fvf); LeaveCriticalSection(&d3d8_cs); return hr; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0d335fc..bfbfe97 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1449,10 +1449,11 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(LPDIRECT3DDEVICE9EX IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DVertexDeclaration9Impl *Decl = (IDirect3DVertexDeclaration9Impl *) pVertexDecl; HRESULT hr; + IDirect3DVertexBuffer9Impl *dest = (IDirect3DVertexBuffer9Impl *) pDestBuffer; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, ((IDirect3DVertexBuffer9Impl *)pDestBuffer)->wineD3DVertexBuffer, Decl ? Decl->wineD3DVertexDeclaration : NULL, Flags); + hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, dest->wineD3DVertexBuffer, Decl ? Decl->wineD3DVertexDeclaration : NULL, Flags, dest->fvf); LeaveCriticalSection(&d3d9_cs); return hr; } diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d13ebef..71a9ca7 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -247,7 +247,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9EX iface object->ref = 1; object->fvf = FVF; EnterCriticalSection(&d3d9_cs); - hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), pSharedHandle, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, + 0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), + pSharedHandle, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); if (hrc != D3D_OK) { diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index de94791..df7528b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -384,7 +384,8 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, Count, This->wineD3DVertexBuffer, NULL /* Output vdecl */, - Flags); + Flags, + This->fvf); /* Restore the states if needed */ if(doClip != oldClip) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1945474..0c53c23 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -317,11 +317,15 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) * processing, FLOAT4 POSITIONT with fixed function, and FLOAT16 if * GL_NV_half_float is not supported. * + * Note for d3d8 and d3d9: * The vertex buffer FVF doesn't help with finding them, we have to use * the decoded vertex declaration and pick the things that concern the * current buffer. A problem with this is that this can change between * draws, so we have to validate the information and reprocess the buffer * if it changes, and avoid false positives for performance reasons. + * WineD3D doesn't even know the vertex buffer any more, it is managed + * by the client libraries and passed to SetStreamSource and ProcessVertices + * as needed. * * We have to distinguish between vertex shaders and fixed function to * pick the way we access the strided vertex information. @@ -938,7 +942,6 @@ static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBU desc->Usage = This->resource.usage; desc->Pool = This->resource.pool; desc->Size = This->resource.size; - desc->FVF = This->fvf; return WINED3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0fcf59..fc968db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -552,8 +552,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("(%p) : Size=%d, Usage=0x%08x, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); *ppVertexBuffer = (IWineD3DBuffer *)object; - object->fvf = FVF; - /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2). * @@ -4506,11 +4504,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShaderConstantF( #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, - const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD dwFlags) + const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD dwFlags, + DWORD DestFVF) { char *dest_ptr, *dest_conv = NULL, *dest_conv_addr = NULL; unsigned int i; - DWORD DestFVF = dest->fvf; WINED3DVIEWPORT vp; WINED3DMATRIX mat, proj_mat, view_mat, world_mat; BOOL doClip; @@ -4866,7 +4864,8 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn #undef copy_and_next static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, UINT SrcStartIndex, UINT DestIndex, - UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD Flags) + UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD Flags, + DWORD DestFVF) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_stream_info stream_info; @@ -4912,7 +4911,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, } return process_vertices_strided(This, DestIndex, VertexCount, &stream_info, - (struct wined3d_buffer *)pDestBuffer, Flags); + (struct wined3d_buffer *)pDestBuffer, Flags, DestFVF); } /***** diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 59944a4..4076912 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,9 +2095,6 @@ struct wined3d_buffer UINT dirty_end; LONG lock_count; - /* legacy vertex buffers */ - DWORD fvf; - /* conversion stuff */ UINT conversion_count; UINT draw_count; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b33b8ca..f6e5ef5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1869,7 +1869,6 @@ typedef struct _WINED3DBUFFER_DESC DWORD Usage; WINED3DPOOL Pool; UINT Size; - DWORD FVF; } WINED3DBUFFER_DESC; typedef struct glDescriptor @@ -3349,7 +3348,8 @@ interface IWineD3DDevice : IWineD3DBase [in] UINT vertex_count, [in] IWineD3DBuffer *dest_buffer, [in] IWineD3DVertexDeclaration *declaration, - [in] DWORD flags + [in] DWORD flags, + [in] DWORD DestFVF ); HRESULT BeginStateBlock( );

1 0

Stefan Dösinger : d3d9: Store the FVF in the d3d9 vertex buffer.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 77e6dcca02080c065fa1d68d2cf6077b882e0cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e6dcca02080c065fa1d68d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 10:48:42 2009 +0200 d3d9: Store the FVF in the d3d9 vertex buffer. --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/vertexbuffer.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8436b1d..9338f97 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -329,6 +329,8 @@ typedef struct IDirect3DVertexBuffer9Impl /* Parent reference */ LPDIRECT3DDEVICE9EX parentDevice; + + DWORD fvf; } IDirect3DVertexBuffer9Impl; /* --------------------- */ diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 63cac92..d13ebef 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -197,8 +197,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 pDesc->Usage = desc.Usage; pDesc->Pool = desc.Pool; pDesc->Size = desc.Size; - pDesc->FVF = desc.FVF; pDesc->Type = D3DRTYPE_VERTEXBUFFER; + pDesc->FVF = This->fvf; } @@ -245,6 +245,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9EX iface object->lpVtbl = &Direct3DVertexBuffer9_Vtbl; object->ref = 1; + object->fvf = FVF; EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), pSharedHandle, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs);

1 0

Stefan Dösinger : d3d8: Store the fvf in the d3d8 vertex buffer.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: ff16f3067716b39b3a7f6112d409f8d006fdb568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff16f3067716b39b3a7f6112d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 14:10:29 2009 +0200 d3d8: Store the fvf in the d3d8 vertex buffer. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 1 + dlls/d3d8/vertexbuffer.c | 2 +- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 1464588..01a475e 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -326,6 +326,8 @@ struct IDirect3DVertexBuffer8Impl /* Parent reference */ LPDIRECT3DDEVICE8 parentDevice; + + DWORD fvf; }; /* --------------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 42c6c81..352018f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -739,6 +739,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 EnterCriticalSection(&d3d8_cs); hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL, (IUnknown *)object); LeaveCriticalSection(&d3d8_cs); + object->fvf = FVF; if (D3D_OK != hrc) { diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index bcbb47f..569efa2 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -194,7 +194,7 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8 pDesc->Usage = desc.Usage; pDesc->Pool = desc.Pool; pDesc->Size = desc.Size; - pDesc->FVF = desc.FVF; + pDesc->FVF = This->fvf; pDesc->Format = d3dformat_from_wined3dformat(desc.Format); }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
67
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 April 2009