wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Piotr Caban : msvcrt: Fixed setlocale tests on Win8.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 8304bf4dfce272cf350a19f7b4eff2998f8f6305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8304bf4dfce272cf350a19f7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 15:07:16 2013 +0100 msvcrt: Fixed setlocale tests on Win8. --- dlls/msvcrt/tests/locale.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index fba2462..3bb7fdc 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -116,12 +116,14 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "chinese-simplified"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_People's Republic of China.936")) || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); @@ -135,6 +137,7 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "cht");

1 0

Huw Davies : riched20: Simplify adding the undo items when joining paragraphs.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: ca46d22bca76d48cae00a0292eeab0988a02be8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca46d22bca76d48cae00a0292… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 25 13:56:29 2013 +0000 riched20: Simplify adding the undo items when joining paragraphs. --- dlls/riched20/para.c | 79 ++++++++++++++++++++++++++----------------------- 1 files changed, 42 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index ffa816d..cef364e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -322,7 +322,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, BOOL keepFirstParaFormat) { - ME_DisplayItem *pNext, *pFirstRunInNext, *pRun, *pTmp; + ME_DisplayItem *pNext, *pFirstRunInNext, *pRun, *pTmp, *pCell = NULL; int i, shift; ME_UndoItem *undo = NULL; int end_len; @@ -353,20 +353,6 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_PrevRun(&startCur.pPara, &startCur.pRun); ME_SetCharFormat(editor, &startCur, &endCur, &fmt); - undo = ME_AddUndoItem(editor, diUndoSplitParagraph, pNext); - if (undo) - { - undo->nStart = pNext->member.para.nCharOfs - end_len; - undo->eol_str = pRun->member.run.strText; - pRun->member.run.strText = NULL; /* Avoid freeing the string */ - } - if (!keepFirstParaFormat) - { - ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); - *tp->member.para.pFmt = *pNext->member.para.pFmt; - tp->member.para.border = pNext->member.para.border; - } - if (!editor->bEmulateVersion10) { /* v4.1 */ /* Table cell/row properties are always moved over from the removed para. */ tp->member.para.nFlags = pNext->member.para.nFlags; @@ -374,35 +360,54 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, /* Remove cell boundary if it is between the end paragraph run and the next * paragraph display item. */ - pTmp = pRun->next; - while (pTmp != pNext) { + for (pTmp = pRun->next; pTmp != pNext; pTmp = pTmp->next) + { if (pTmp->type == diCell) { - ME_Cell *pCell = &pTmp->member.cell; - if (undo) - { - assert(!(undo->di.member.para.nFlags & MEPF_ROWEND)); - if (!(undo->di.member.para.nFlags & MEPF_ROWSTART)) - undo->di.member.para.nFlags |= MEPF_CELL; - undo->di.member.para.pCell = ALLOC_OBJ(ME_DisplayItem); - *undo->di.member.para.pCell = *pTmp; - undo->di.member.para.pCell->next = NULL; - undo->di.member.para.pCell->prev = NULL; - undo->di.member.para.pCell->member.cell.next_cell = NULL; - undo->di.member.para.pCell->member.cell.prev_cell = NULL; - } - ME_Remove(pTmp); - if (pCell->prev_cell) - pCell->prev_cell->member.cell.next_cell = pCell->next_cell; - if (pCell->next_cell) - pCell->next_cell->member.cell.prev_cell = pCell->prev_cell; - ME_DestroyDisplayItem(pTmp); + pCell = pTmp; break; } - pTmp = pTmp->next; } } + undo = ME_AddUndoItem(editor, diUndoSplitParagraph, pNext); + if (undo) + { + undo->nStart = pNext->member.para.nCharOfs - end_len; + undo->eol_str = pRun->member.run.strText; + pRun->member.run.strText = NULL; /* Avoid freeing the string */ + + if (pCell) + { + assert(!(undo->di.member.para.nFlags & MEPF_ROWEND)); + if (!(undo->di.member.para.nFlags & MEPF_ROWSTART)) + undo->di.member.para.nFlags |= MEPF_CELL; + undo->di.member.para.pCell = ALLOC_OBJ(ME_DisplayItem); + *undo->di.member.para.pCell = *pCell; + undo->di.member.para.pCell->next = NULL; + undo->di.member.para.pCell->prev = NULL; + undo->di.member.para.pCell->member.cell.next_cell = NULL; + undo->di.member.para.pCell->member.cell.prev_cell = NULL; + } + } + + if (pCell) + { + ME_Remove( pCell ); + if (pCell->member.cell.prev_cell) + pCell->member.cell.prev_cell->member.cell.next_cell = pCell->member.cell.next_cell; + if (pCell->member.cell.next_cell) + pCell->member.cell.next_cell->member.cell.prev_cell = pCell->member.cell.prev_cell; + ME_DestroyDisplayItem( pCell ); + } + + if (!keepFirstParaFormat) + { + ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); + *tp->member.para.pFmt = *pNext->member.para.pFmt; + tp->member.para.border = pNext->member.para.border; + } + shift = pNext->member.para.nCharOfs - tp->member.para.nCharOfs - end_len; pFirstRunInNext = ME_FindItemFwd(pNext, diRunOrParagraph);

1 0

Piotr Caban : msvcrt: Added N flag support to fopen.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 7654d95462cb1c1d921d0344144f5a9c50d9af3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7654d95462cb1c1d921d03441… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 11:39:05 2013 +0100 msvcrt: Added N flag support to fopen. --- dlls/msvcrt/file.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ccfff83..d80a99a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1312,6 +1312,9 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st case 'n': *stream_flags &= ~MSVCRT__IOCOMMIT; break; + case 'N': + *open_flags |= MSVCRT__O_NOINHERIT; + break; case '+': case ' ': case 'a':

1 0

Piotr Caban : msvcrt: Ignore S and R flags in fopen.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: ab4b4d34c3245821bae35de7d22ac24dfab35f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4b4d34c3245821bae35de7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 11:38:48 2013 +0100 msvcrt: Ignore S and R flags in fopen. --- dlls/msvcrt/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8a63b51..ccfff83 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1317,6 +1317,10 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st case 'a': case 'w': break; + case 'S': + case 'R': + FIXME("ignoring cache optimization flag: %c\n", mode[-1]); + break; default: MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL); return -1;

1 0

Jacek Caban : d3dcompiler.h: Added D3DCOMPILER_DLL macro.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: e3c13943d49a1edfe16bdf1dcea7b86ddea6e311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c13943d49a1edfe16bdf1dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 11:25:03 2013 +0100 d3dcompiler.h: Added D3DCOMPILER_DLL macro. --- include/d3dcompiler.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 047c1ea..7ce83be 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -25,6 +25,17 @@ extern "C" { #endif +#if defined(__GNUC__) +#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; +#elif defined(_MSV_VER) +#define D3DCOMPILER_DLL_W L"d3dcompiler_43.dll" +#else +static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; +#endif + +#define D3DCOMPILER_DLL_A "d3dcompiler_43.dll" +#define D3DCOMPILER_DLL WINELIB_NAME_AW(D3DCOMPILER_DLL_) + #define D3DCOMPILE_DEBUG 0x00000001 #define D3DCOMPILE_SKIP_VALIDATION 0x00000002 #define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004

1 0

Stefan Dösinger : d3d9/tests: Add simple DrawRectPatch tests.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: ddc868c4a01624a601244a8d1c42989db3bae936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc868c4a01624a601244a8d1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 22 23:01:31 2013 +0100 d3d9/tests: Add simple DrawRectPatch tests. --- dlls/d3d9/tests/device.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cabdec5..ba8a3ef 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6122,6 +6122,118 @@ static void test_swvp_buffer(void) DestroyWindow(window); } +static void test_rtpatch(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + UINT refcount; + HWND window; + HRESULT hr; + IDirect3DVertexBuffer9 *buffer; + IDirect3DVertexDeclaration9 *decl; + static const unsigned int bufsize = 16; + struct + { + float x, y, z; + } *data; + D3DRECTPATCH_INFO patch; + static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; + UINT handle = 0x1234; + D3DCAPS9 caps; + + /* Position input, this generates tesselated positions, but do not generate normals + * or texture coordinates. The d3d documentation isn't clear on how to do this */ + static const D3DVERTEXELEMENT9 decl_elements[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) + { + /* The draw methods return the same values, but the patch handle support + * is different on the refrast, which is the only d3d implementation + * known to support tri/rect patches */ + skip("Device supports patches, skipping unsupported patch test\n"); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); + ok(SUCCEEDED(hr), "Failed to create vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, + D3DPOOL_MANAGED, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, (void **)&data, 0); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + memset(data, 0, bufsize * sizeof(*data)); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*data)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + patch.StartVertexOffsetWidth = 0; + patch.StartVertexOffsetHeight = 0; + patch.Width = 4; + patch.Height = 4; + patch.Stride = 4; + patch.Basis = D3DBASIS_BEZIER; + patch.Degree = D3DDEGREE_CUBIC; + hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, &patch); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, &patch); + ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DeletePatch(device, handle); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + hr = IDirect3DDevice9_DeletePatch(device, 0); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + hr = IDirect3DDevice9_DeletePatch(device, 0x1235); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + + IDirect3DVertexDeclaration9_Release(decl); + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6209,6 +6321,7 @@ START_TEST(device) test_surface_lockrect_blocks(); test_set_palette(); test_swvp_buffer(); + test_rtpatch(); } out:

1 0

Stefan Dösinger : d3d8/tests: Add simple DrawRectPatch tests.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 0badb01ce150064fa06507860fa506093d74ff06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0badb01ce150064fa06507860… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 22 23:01:31 2013 +0100 d3d8/tests: Add simple DrawRectPatch tests. --- dlls/d3d8/tests/device.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ca34b81..fbc2d19 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4624,6 +4624,120 @@ static void test_swvp_buffer(void) DestroyWindow(window); } +static void test_rtpatch(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + UINT refcount; + HWND window; + HRESULT hr; + IDirect3DVertexBuffer8 *buffer; + DWORD shader; + static const unsigned int bufsize = 16; + struct + { + float x, y, z; + } *data; + D3DRECTPATCH_INFO patch; + static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; + UINT handle = 0x1234; + D3DCAPS8 caps; + + /* Position input, this generates tesselated positions, but do not generate normals + * or texture coordinates. The d3d documentation isn't clear on how to do this */ + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ + D3DVSD_END() + }; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create d3d8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) + { + /* The draw methods return the same values, but the patch handle support + * is different on the refrast, which is the only d3d implementation + * known to support tri/rect patches */ + skip("Device supports patches, skipping unsupported patch test\n"); + IDirect3DDevice8_Release(device); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, NULL, &shader, 0); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, + D3DPOOL_MANAGED, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, (BYTE **)&data, 0); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + memset(data, 0, bufsize * sizeof(*data)); + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*data)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + patch.StartVertexOffsetWidth = 0; + patch.StartVertexOffsetHeight = 0; + patch.Width = 4; + patch.Height = 4; + patch.Stride = 4; + patch.Basis = D3DBASIS_BEZIER; + patch.Order = D3DORDER_CUBIC; + hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, &patch); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, &patch); + ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DeletePatch(device, handle); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + hr = IDirect3DDevice8_DeletePatch(device, 0); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + hr = IDirect3DDevice8_DeletePatch(device, 0x1235); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + + IDirect3DDevice8_DeleteVertexShader(device, shader); + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -4699,6 +4813,7 @@ START_TEST(device) test_surface_lockrect_blocks(); test_set_palette(); test_swvp_buffer(); + test_rtpatch(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : wined3d: Remove draw_primitive_strided.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 1a3f741643c5d3b88e951a09bd9f19850acf466a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3f741643c5d3b88e951a09b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 24 00:39:13 2013 +0100 wined3d: Remove draw_primitive_strided. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 135 +--------------------------------------- dlls/wined3d/drawprim.c | 15 ++--- dlls/wined3d/wined3d.spec | 2 - dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 5 -- 6 files changed, 9 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a3f741643c5d3b88e951…

1 0

Stefan Dösinger : d3d: Remove high level patch support .
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 149a85c2e7b5b11daf8efcd169f6980350c955e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=149a85c2e7b5b11daf8efcd16… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 24 00:39:12 2013 +0100 d3d: Remove high level patch support. No Windows driver ever exposed this, and no game uses this. The only application that used this feature is a DirectX 8 SDK sample. --- dlls/d3d8/device.c | 38 +---- dlls/d3d9/device.c | 38 +---- dlls/wined3d/device.c | 149 --------------- dlls/wined3d/directx.c | 3 +- dlls/wined3d/drawprim.c | 400 ---------------------------------------- dlls/wined3d/wined3d.spec | 3 - dlls/wined3d/wined3d_private.h | 21 -- include/wine/wined3d.h | 5 - 8 files changed, 13 insertions(+), 644 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=149a85c2e7b5b11daf8ef…

1 0

Stefan Dösinger : ddraw: Implement DrawIndexedPrimitiveStrided with regular draws.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: d7e5189cc25f40ca2630f39b663b6497dcffe33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e5189cc25f40ca2630f39b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 24 00:39:11 2013 +0100 ddraw: Implement DrawIndexedPrimitiveStrided with regular draws. --- dlls/ddraw/device.c | 109 ++++++++++++++++++++++---------------------------- 1 files changed, 48 insertions(+), 61 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index faf7146..5d30994 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3968,79 +3968,66 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, WORD *Indices, DWORD IndexCount, DWORD Flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - struct wined3d_strided_data wined3d_strided; - DWORD i; HRESULT hr; + UINT vtx_dst_stride = get_flexible_vertex_size(VertexType); + UINT vtx_dst_size = VertexCount * vtx_dst_stride; + UINT vb_pos, align; + UINT idx_size = IndexCount * sizeof(WORD); + UINT ib_pos; + BYTE *dst_data; TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); - memset(&wined3d_strided, 0, sizeof(wined3d_strided)); - /* Get the strided data right. the wined3d structure is a bit bigger - * Watch out: The contents of the strided data are determined by the fvf, - * not by the members set in D3DDrawPrimStrideData. So it's valid - * to have diffuse.lpvData set to 0xdeadbeef if the diffuse flag is - * not set in the fvf. */ - if (VertexType & D3DFVF_POSITION_MASK) - { - wined3d_strided.position.format = WINED3DFMT_R32G32B32_FLOAT; - wined3d_strided.position.data = D3DDrawPrimStrideData->position.lpvData; - wined3d_strided.position.stride = D3DDrawPrimStrideData->position.dwStride; - if (VertexType & D3DFVF_XYZRHW) - { - wined3d_strided.position.format = WINED3DFMT_R32G32B32A32_FLOAT; - wined3d_strided.position_transformed = TRUE; - } - else - { - wined3d_strided.position_transformed = FALSE; - } - } + wined3d_mutex_lock(); - if (VertexType & D3DFVF_NORMAL) - { - wined3d_strided.normal.format = WINED3DFMT_R32G32B32_FLOAT; - wined3d_strided.normal.data = D3DDrawPrimStrideData->normal.lpvData; - wined3d_strided.normal.stride = D3DDrawPrimStrideData->normal.dwStride; - } + hr = d3d_device_prepare_vertex_buffer(device, vtx_dst_size); + if (FAILED(hr)) + goto done; - if (VertexType & D3DFVF_DIFFUSE) - { - wined3d_strided.diffuse.format = WINED3DFMT_B8G8R8A8_UNORM; - wined3d_strided.diffuse.data = D3DDrawPrimStrideData->diffuse.lpvData; - wined3d_strided.diffuse.stride = D3DDrawPrimStrideData->diffuse.dwStride; - } + vb_pos = device->vertex_buffer_pos; + align = vb_pos % vtx_dst_stride; + if (align) align = vtx_dst_stride - align; + if (vb_pos + vtx_dst_size + align > device->vertex_buffer_size) + vb_pos = 0; + else + vb_pos += align; - if (VertexType & D3DFVF_SPECULAR) - { - wined3d_strided.specular.format = WINED3DFMT_B8G8R8A8_UNORM; - wined3d_strided.specular.data = D3DDrawPrimStrideData->specular.lpvData; - wined3d_strided.specular.stride = D3DDrawPrimStrideData->specular.dwStride; - } + hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_dst_size, &dst_data, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); + if (FAILED(hr)) + goto done; + pack_strided_data(dst_data, VertexCount, D3DDrawPrimStrideData, VertexType); + wined3d_buffer_unmap(device->vertex_buffer); + device->vertex_buffer_pos = vb_pos + vtx_dst_size; - for (i = 0; i < GET_TEXCOUNT_FROM_FVF(VertexType); ++i) - { - switch (GET_TEXCOORD_SIZE_FROM_FVF(VertexType, i)) - { - case 1: wined3d_strided.tex_coords[i].format = WINED3DFMT_R32_FLOAT; break; - case 2: wined3d_strided.tex_coords[i].format = WINED3DFMT_R32G32_FLOAT; break; - case 3: wined3d_strided.tex_coords[i].format = WINED3DFMT_R32G32B32_FLOAT; break; - case 4: wined3d_strided.tex_coords[i].format = WINED3DFMT_R32G32B32A32_FLOAT; break; - default: ERR("Unexpected texture coordinate size %d\n", - GET_TEXCOORD_SIZE_FROM_FVF(VertexType, i)); - } - wined3d_strided.tex_coords[i].data = D3DDrawPrimStrideData->textureCoords[i].lpvData; - wined3d_strided.tex_coords[i].stride = D3DDrawPrimStrideData->textureCoords[i].dwStride; - } + hr = d3d_device_prepare_index_buffer(device, idx_size); + if (FAILED(hr)) + goto done; + ib_pos = device->index_buffer_pos; + if (device->index_buffer_size - idx_size < ib_pos) + ib_pos = 0; - /* WineD3D doesn't need the FVF here */ - wined3d_mutex_lock(); + hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &dst_data, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); + if (FAILED(hr)) + goto done; + memcpy(dst_data, Indices, idx_size); + wined3d_buffer_unmap(device->index_buffer); + device->index_buffer_pos = ib_pos + idx_size; + + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vtx_dst_stride); + if (FAILED(hr)) + goto done; + wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vtx_dst_stride); + + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, VertexType)); wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); - wined3d_device_set_base_vertex_index(device->wined3d_device, 0); - hr = wined3d_device_draw_indexed_primitive_strided(device->wined3d_device, - IndexCount, &wined3d_strided, VertexCount, Indices, WINED3DFMT_R16_UINT); - wined3d_mutex_unlock(); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), IndexCount); +done: + wined3d_mutex_unlock(); return hr; }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
74
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 January 2013