April 2009 - Wine-commits - list.winehq.org

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

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 : 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: 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

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

Nicolas Le Cam : shell32/tests: Fix ITEMIDLIST format test on Win2k and below.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: fa010ad211b43be723866a36b8e2bddeb7ec9912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa010ad211b43be723866a36b… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Apr 9 01:30:31 2009 +0200 shell32/tests: Fix ITEMIDLIST format test on Win2k and below. On Win2k SHITEMID only contains FileStructA. This structure isn't padded like it is on WinXP and contains a supplementary CHAR* member at its end which contains the 8.3 filename if needed. --- dlls/shell32/tests/shlfolder.c | 46 ++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 5c30a7b..1d63778 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1376,11 +1376,11 @@ static void test_ITEMIDLIST_format(void) { HANDLE hFile; HRESULT hr; BOOL bResult; - WCHAR wszFile[3][17] = { { 'e','v','e','n','_',0 }, { 'o','d','d','_',0 }, + WCHAR wszFile[3][17] = { { 'e','v','e','n','_',0 }, { 'o','d','d','_',0 }, { 'l','o','n','g','e','r','_','t','h','a','n','.','8','_','3',0 } }; int i; - - if(!pSHGetSpecialFolderPathW) return; + + if (!pSHGetSpecialFolderPathW) return; bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); @@ -1417,9 +1417,9 @@ static void test_ITEMIDLIST_format(void) { CHAR szFile[MAX_PATH]; struct FileStructA *pFileStructA; WORD cbOffset; - + WideCharToMultiByte(CP_ACP, 0, wszFile[i], -1, szFile, MAX_PATH, NULL, NULL); - + hFile = CreateFileW(wszFile[i], GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_FLAG_WRITE_THROUGH, NULL); ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed! (%u)\n", GetLastError()); if (hFile == INVALID_HANDLE_VALUE) { @@ -1439,51 +1439,57 @@ static void test_ITEMIDLIST_format(void) { pFileStructA = (struct FileStructA *)pidlFile->mkid.abID; ok(pFileStructA->type == 0x32, "PIDLTYPE should be 0x32!\n"); ok(pFileStructA->dummy == 0x00, "Dummy Byte should be 0x00!\n"); - ok(pFileStructA->dwFileSize == 0, "Filesize should be zero!\n"); + ok(pFileStructA->dwFileSize == 0, "Filesize should be zero!\n"); - if (i < 2) /* First two file names are already in valid 8.3 format */ + if (i < 2) /* First two file names are already in valid 8.3 format */ ok(!strcmp(szFile, (CHAR*)&pidlFile->mkid.abID[12]), "Wrong file name!\n"); - else + else /* WinXP stores a derived 8.3 dos name (LONGER~1.8_3) here. We probably * can't implement this correctly, since unix filesystems don't support * this nasty short/long filename stuff. So we'll probably stay with our * current habbit of storing the long filename here, which seems to work * just fine. */ - todo_wine { ok(pidlFile->mkid.abID[18] == '~', "Should be derived 8.3 name!\n"); } + todo_wine + ok(pidlFile->mkid.abID[18] == '~' || + broken(pidlFile->mkid.abID[34] == '~'), /* Win2k */ + "Should be derived 8.3 name!\n"); if (i == 0) /* First file name has an even number of chars. No need for alignment. */ - ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0', - "Alignment byte, where there shouldn't be!\n"); - + ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0' || + broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 1), /* Win2k */ + "Alignment byte, where there shouldn't be!\n"); + if (i == 1) /* Second file name has an uneven number of chars => alignment byte */ - ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] == '\0', + ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] == '\0', "There should be an alignment byte, but isn't!\n"); /* The offset of the FileStructW member is stored as a WORD at the end of the pidl. */ cbOffset = *(WORD*)(((LPBYTE)pidlFile)+pidlFile->mkid.cb-sizeof(WORD)); - ok (cbOffset >= sizeof(struct FileStructA) && - cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW), + ok ((cbOffset >= sizeof(struct FileStructA) && + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) || + broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 1) || /* Win2k on short names */ + broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 12 + 1), /* Win2k on long names */ "Wrong offset value (%d) stored at the end of the PIDL\n", cbOffset); if (cbOffset >= sizeof(struct FileStructA) && - cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) { struct FileStructW *pFileStructW = (struct FileStructW *)(((LPBYTE)pidlFile)+cbOffset); - ok(pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen, + ok(pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen, "FileStructW's offset and length should add up to the PIDL's length!\n"); if (pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen) { /* Since we just created the file, time of creation, - * time of last access and time of last write access just be the same. - * These tests seem to fail sometimes (on WinXP), if the test is run again shortly + * time of last access and time of last write access just be the same. + * These tests seem to fail sometimes (on WinXP), if the test is run again shortly * after the first run. I do remember something with NTFS keeping the creation time * if a file is deleted and then created again within a couple of seconds or so. * Might be the reason. */ ok (pFileStructA->uFileDate == pFileStructW->uDate && pFileStructA->uFileTime == pFileStructW->uTime, "Last write time should match creation time!\n"); - + ok (pFileStructA->uFileDate == pFileStructW->uDate2 && pFileStructA->uFileTime == pFileStructW->uTime2, "Last write time should match last access time!\n");

1 0

Alexandre Julliard : include: Update and document the TEB/ PEB offsets on 64-bit.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: b9b515749b1cc55197d2f0c88bdf64ad0971318d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b515749b1cc55197d2f0c88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 14:29:30 2009 +0200 include: Update and document the TEB/PEB offsets on 64-bit. --- include/winternl.h | 274 ++++++++++++++++++++++++++-------------------------- 1 files changed, 138 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9b515749b1cc55197d2f…

1 0

Alexandre Julliard : ntdll: Remove pthread_data from the ntdll_thread_data structure. Document the offsets for 64-bit.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 2a2fe959afd1e6bc0d28b088dc6791afc10626cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2fe959afd1e6bc0d28b088d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 14:41:12 2009 +0200 ntdll: Remove pthread_data from the ntdll_thread_data structure. Document the offsets for 64-bit. --- dlls/ntdll/ntdll_misc.h | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 61622b1..b626df8 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -188,15 +188,14 @@ struct debug_info /* thread private data, stored in NtCurrentTeb()->SystemReserved2 */ struct ntdll_thread_data { - DWORD fs; /* 1d4 TEB selector */ - DWORD gs; /* 1d8 libc selector; update winebuild if you move this! */ - struct debug_info *debug_info; /* 1dc info for debugstr functions */ - int request_fd; /* 1e0 fd for sending server requests */ - int reply_fd; /* 1e4 fd for receiving server replies */ - int wait_fd[2]; /* 1e8 fd for sleeping server requests */ - void *vm86_ptr; /* 1f0 data for vm86 mode */ - void *pthread_data; /* 1f4 private data for pthread emulation */ - pthread_t pthread_id; /* 1f8 pthread thread id */ + DWORD fs; /* 1d4/300 TEB selector */ + DWORD gs; /* 1d8/304 libc selector; update winebuild if you move this! */ + struct debug_info *debug_info; /* 1dc/308 info for debugstr functions */ + int request_fd; /* 1e0/310 fd for sending server requests */ + int reply_fd; /* 1e4/314 fd for receiving server replies */ + int wait_fd[2]; /* 1e8/318 fd for sleeping server requests */ + void *vm86_ptr; /* 1f0/320 data for vm86 mode */ + pthread_t pthread_id; /* 1f4/328 pthread thread id */ }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void)

1 0

Paul Vriens : secur32/tests: Document some crashes on Windows.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 825354afe603cf73d28009619d750724ad277a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=825354afe603cf73d28009619… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 9 14:44:23 2009 +0200 secur32/tests: Document some crashes on Windows. --- dlls/secur32/tests/secur32.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 6a4ae05..7e969bd 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -118,10 +118,20 @@ static void testGetUserNameExA(void) formats[i], GetLastError()); } + if (0) /* Crashes on Windows */ + rc = pGetUserNameExA(NameSamCompatible, NULL, NULL); + size = 0; rc = pGetUserNameExA(NameSamCompatible, NULL, &size); ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); ok(size != 0, "Expected size to be set to required size\n"); + + if (0) /* Crashes on Windows with big enough size */ + { + /* Returned size is already big enough */ + rc = pGetUserNameExA(NameSamCompatible, NULL, &size); + } + size = 0; rc = pGetUserNameExA(NameSamCompatible, name, &size); ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); @@ -156,10 +166,20 @@ static void testGetUserNameExW(void) formats[i], GetLastError()); } + if (0) /* Crashes on Windows */ + rc = pGetUserNameExW(NameSamCompatible, NULL, NULL); + size = 0; rc = pGetUserNameExW(NameSamCompatible, NULL, &size); ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError()); ok(size != 0, "Expected size to be set to required size\n"); + + if (0) /* Crashes on Windows with big enough size */ + { + /* Returned size is already big enough */ + rc = pGetUserNameExW(NameSamCompatible, NULL, &size); + } + size = 0; rc = pGetUserNameExW(NameSamCompatible, nameW, &size); ok(! rc && GetLastError() == ERROR_MORE_DATA, "Expected fail with ERROR_MORE_DATA, got %d with %u\n", rc, GetLastError());

1 0

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

09 Apr '09

Module: wine Branch: master Commit: fd9b574e4e4a42683e2a2e276c5e2d6311cbeb10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9b574e4e4a42683e2a2e276… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 14:09:54 2009 +0200 ddraw: Store the fvf in the ddraw buffer. WineD3D buffer FVFs will go away soon. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 34 ++++++---------------------------- dlls/ddraw/direct3d.c | 1 + dlls/ddraw/vertexbuffer.c | 8 +++----- 4 files changed, 11 insertions(+), 33 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f9bffd8..72dfff5 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -687,6 +687,7 @@ struct IDirect3DVertexBufferImpl /*** Storage for D3D7 specific things ***/ DWORD Caps; + DWORD fvf; }; /* The Vtables */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a6b42a2..37bb1ff 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4104,7 +4104,6 @@ IDirect3DDeviceImpl_7_DrawPrimitiveVB(IDirect3DDevice7 *iface, IDirect3DVertexBufferImpl *vb = (IDirect3DVertexBufferImpl *)D3DVertexBuf; HRESULT hr; DWORD stride; - WINED3DBUFFER_DESC Desc; TRACE("(%p)->(%08x,%p,%08x,%08x,%08x)\n", This, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags); @@ -4114,18 +4113,9 @@ IDirect3DDeviceImpl_7_DrawPrimitiveVB(IDirect3DDevice7 *iface, ERR("(%p) No Vertex buffer specified\n", This); return DDERR_INVALIDPARAMS; } + stride = get_flexible_vertex_size(vb->fvf); - /* Get the FVF of the vertex buffer, and its stride */ EnterCriticalSection(&ddraw_cs); - hr = IWineD3DBuffer_GetDesc(vb->wineD3DVertexBuffer, &Desc); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr = %08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } - stride = get_flexible_vertex_size(Desc.FVF); - hr = IWineD3DDevice_SetVertexDeclaration(This->wineD3DDevice, vb->wineD3DVertexDeclaration); if(FAILED(hr)) @@ -4229,32 +4219,20 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; IDirect3DVertexBufferImpl *vb = (IDirect3DVertexBufferImpl *)D3DVertexBuf; - DWORD stride; + DWORD stride = get_flexible_vertex_size(vb->fvf); WORD *LockedIndices; HRESULT hr; - WINED3DBUFFER_DESC Desc; TRACE("(%p)->(%08x,%p,%d,%d,%p,%d,%08x)\n", This, PrimitiveType, vb, StartVertex, NumVertices, Indices, IndexCount, Flags); /* Steps: - * 1) Calculate some things: stride, ... - * 2) Upload the Indices to the index buffer - * 3) Set the index source - * 4) Set the Vertex Buffer as the Stream source - * 5) Call IWineD3DDevice::DrawIndexedPrimitive + * 1) Upload the Indices to the index buffer + * 2) Set the index source + * 3) Set the Vertex Buffer as the Stream source + * 4) Call IWineD3DDevice::DrawIndexedPrimitive */ EnterCriticalSection(&ddraw_cs); - /* Get the FVF of the vertex buffer, and its stride */ - hr = IWineD3DBuffer_GetDesc(vb->wineD3DVertexBuffer, &Desc); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr = %08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } - stride = get_flexible_vertex_size(Desc.FVF); - TRACE("Vertex buffer FVF = %08x, stride=%d\n", Desc.FVF, stride); hr = IWineD3DDevice_SetVertexDeclaration(This->wineD3DDevice, vb->wineD3DVertexDeclaration); diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index abeb882..438b6ad 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1017,6 +1017,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface, object->Caps = Desc->dwCaps; object->ddraw = This; + object->fvf = Desc->dwFVF; EnterCriticalSection(&ddraw_cs); hr = IWineD3DDevice_CreateVertexBuffer(This->wineD3DDevice, diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 8157334..de94791 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -340,7 +340,6 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, IDirect3DDeviceImpl *D3D = (IDirect3DDeviceImpl *)D3DDevice; BOOL oldClip, doClip; HRESULT hr; - WINED3DBUFFER_DESC Desc; TRACE("(%p)->(%08x,%d,%d,%p,%d,%p,%08x)\n", This, VertexOp, DestIndex, Count, Src, SrcIndex, D3D, Flags); @@ -372,12 +371,11 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, doClip); } - IWineD3DBuffer_GetDesc(Src->wineD3DVertexBuffer, &Desc); IWineD3DDevice_SetStreamSource(D3D->wineD3DDevice, 0, /* Stream No */ Src->wineD3DVertexBuffer, 0, /* Offset */ - get_flexible_vertex_size(Desc.FVF)); + get_flexible_vertex_size(Src->fvf)); IWineD3DDevice_SetVertexDeclaration(D3D->wineD3DDevice, Src->wineD3DVertexDeclaration); hr = IWineD3DDevice_ProcessVertices(D3D->wineD3DDevice, @@ -452,8 +450,8 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, /* Now fill the Desc structure */ Desc->dwCaps = This->Caps; - Desc->dwFVF = WDesc.FVF; - Desc->dwNumVertices = WDesc.Size / get_flexible_vertex_size(WDesc.FVF); + Desc->dwFVF = This->fvf; + Desc->dwNumVertices = WDesc.Size / get_flexible_vertex_size(This->fvf); LeaveCriticalSection(&ddraw_cs); return D3D_OK;

1 0