wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Misha Koshelev : msi: automation: Fix SummaryInfo:: Property get to conform to native.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 0c503defcff6fa6e7c4a1d630eefa44f6d924126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c503defcff6fa6e7c4a1d630… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 1 20:06:55 2007 -0500 msi: automation: Fix SummaryInfo::Property get to conform to native. --- dlls/msi/automation.c | 65 ++++++++++++++++++++---------------------- dlls/msi/tests/automation.c | 12 ++----- 2 files changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 95fb8c4..52474d4 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -764,17 +764,15 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( if (pid == PID_CODEPAGE || (pid >= PID_PAGECOUNT && pid <= PID_CHARCOUNT) || pid == PID_SECURITY) { - ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, - NULL, NULL, NULL); - if (ret != ERROR_SUCCESS) - return DISP_E_EXCEPTION; - - if (pid == PID_CODEPAGE) + if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, + NULL, NULL, NULL)) != ERROR_SUCCESS) + ERR("MsiSummaryInfoGetProperty returned %d\n", ret); + else if (type == VT_I2) { V_VT(pVarResult) = VT_I2; V_I2(pVarResult) = value; } - else + else if (type == VT_I4) { V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = value; @@ -785,44 +783,43 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( LPWSTR str; DWORD size = 0; - ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, NULL, - NULL, szEmpty, &size); - if (ret != ERROR_MORE_DATA) - return DISP_E_EXCEPTION; - - str = msi_alloc(++size * sizeof(WCHAR)); - if (!str) - return DISP_E_EXCEPTION; - - ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, NULL, - NULL, str, &size); - if (ret != ERROR_SUCCESS) + if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, NULL, + NULL, szEmpty, &size)) == ERROR_MORE_DATA) { + if (!(str = msi_alloc(++size * sizeof(WCHAR)))) + ERR("Out of memory\n"); + else if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, NULL, + NULL, str, &size)) == ERROR_SUCCESS) + { + V_VT(pVarResult) = VT_BSTR; + V_BSTR(pVarResult) = SysAllocString(str); + } msi_free(str); - return DISP_E_EXCEPTION; } - - V_VT(pVarResult) = VT_BSTR; - V_BSTR(pVarResult) = SysAllocString(str); - msi_free(str); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + ERR("MsiSummaryInfoGetProperty returned %d\n", ret); } else if (pid >= PID_EDITTIME && pid <= PID_LASTSAVE_DTM) { - FILETIME ft; + FILETIME ft, ftlocal; SYSTEMTIME st; DATE date; - ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, - &ft, NULL, NULL); - if (ret != ERROR_SUCCESS) - return DISP_E_EXCEPTION; - - FileTimeToSystemTime(&ft, &st); - SystemTimeToVariantTime(&st, &date); + if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, + &ft, NULL, NULL)) != ERROR_SUCCESS) + ERR("MsiSummaryInfoGetProperty returned %d\n", ret); + else if (type == VT_FILETIME) + { + FileTimeToLocalFileTime(&ft, &ftlocal); + FileTimeToSystemTime(&ftlocal, &st); + SystemTimeToVariantTime(&st, &date); - V_VT(pVarResult) = VT_DATE; - V_DATE(pVarResult) = date; + V_VT(pVarResult) = VT_DATE; + V_DATE(pVarResult) = date; + } } + else if (pid != PID_DICTIONARY && pid != PID_THUMBNAIL) + return DISP_E_EXCEPTION; } else return DISP_E_MEMBERNOTFOUND; break; diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 69cb9c6..5f6f667 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1289,7 +1289,7 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in else if (vt == VT_I4) ok(V_I4(&varresult) == entry->iValue, "SummaryInfo_Property (pid %d) I4 result expected to be %d, but was %d\n", entry->property, entry->iValue, V_I4(&varresult)); - else if (vt == VT_DATE) todo_wine + else if (vt == VT_DATE) { SYSTEMTIME st; FILETIME ft; @@ -1312,11 +1312,11 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in /* Invalid pids */ hr = SummaryInfo_PropertyGet(pSummaryInfo, -1, &varresult, VT_EMPTY); - todo_wine ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); ok_exception(hr, szPropertyException); hr = SummaryInfo_PropertyGet(pSummaryInfo, 1000, &varresult, VT_EMPTY); - todo_wine ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); ok_exception(hr, szPropertyException); /* Unsupported pids */ @@ -1327,21 +1327,17 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); /* Pids we have not set, one for each type */ - _invoke_todo_vtResult = 1; - hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CODEPAGE, &varresult, VT_EMPTY); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_TITLE, &varresult, VT_EMPTY); - todo_wine ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_EDITTIME, &varresult, VT_EMPTY); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CHARCOUNT, &varresult, VT_EMPTY); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); - - _invoke_todo_vtResult = 0; } static void test_Database(IDispatch *pDatabase)

1 0

Misha Koshelev : msi/tests: automation: Add tests for SummaryInfo::Property , get.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: f2c10a530c9162ff9cd04cbc5a6d04f2dcd7187a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c10a530c9162ff9cd04cbc5… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 1 20:06:46 2007 -0500 msi/tests: automation: Add tests for SummaryInfo::Property, get. --- dlls/msi/tests/automation.c | 204 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 183 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2c10a530c9162ff9cd04…

1 0

Misha Koshelev : msi: automation: Database::SummaryInformation is a propget , not a method.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 68d4e65c5e549f6e37ded1ea9275cfb07b1bee73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d4e65c5e549f6e37ded1ea9… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 1 20:06:37 2007 -0500 msi: automation: Database::SummaryInformation is a propget, not a method. --- dlls/msi/automation.c | 2 +- dlls/msi/msiserver.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index c4d1ba2..95fb8c4 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1116,7 +1116,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( switch (dispIdMember) { case DISPID_DATABASE_SUMMARYINFORMATION: - if (wFlags & DISPATCH_METHOD) + if (wFlags & DISPATCH_PROPERTYGET) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 12045eb..fd268e1 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -190,7 +190,7 @@ library WindowsInstaller methods: [id(DISPID_DATABASE_OPENVIEW)] View* OpenView([in] BSTR Sql); - [id(DISPID_DATABASE_SUMMARYINFORMATION)] + [id(DISPID_DATABASE_SUMMARYINFORMATION), propget] SummaryInfo *SummaryInformation([in, optional, defaultvalue(0)] long UpdateCount); }

1 0

Misha Koshelev : msi: automation: Remove redundant VariantClear(pVarResult) .
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 1e6bcb028d179f15b862b4c3d1d03649f18fdf83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6bcb028d179f15b862b4c3d… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 1 20:06:28 2007 -0500 msi: automation: Remove redundant VariantClear(pVarResult). --- dlls/msi/automation.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 2bef67d..c4d1ba2 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -758,8 +758,6 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( static WCHAR szEmpty[] = {0}; - VariantClear(pVarResult); - hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; pid = V_I4(&varg0);

1 0

Misha Koshelev : msi: msiserver.idl: Maintain spacing as spaces, not tabs.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: e7d25cb4fdaf324f187ec1ebbb3cb730ef81c53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d25cb4fdaf324f187ec1ebb… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 1 20:06:06 2007 -0500 msi: msiserver.idl: Maintain spacing as spaces, not tabs. --- dlls/msi/msiserver.idl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index a626e8c..12045eb 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -67,9 +67,9 @@ library WindowsInstaller [in] VARIANT PackagePath, [in, optional, defaultvalue(0)] long Options); [id(DISPID_INSTALLER_OPENDATABASE)] - Database *OpenDatabase( - [in] BSTR DatabasePath, - [in] VARIANT OpenMode); + Database *OpenDatabase( + [in] BSTR DatabasePath, + [in] VARIANT OpenMode); [id(DISPID_INSTALLER_INSTALLPRODUCT)] void InstallProduct( [in] BSTR PackagePath,

1 0

Misha Koshelev : msi: automation: Add missing operand for evaluation.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 39ffa7d16fd1306541c77cb4146fa3e886a3d6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ffa7d16fd1306541c77cb41… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 1 20:05:57 2007 -0500 msi: automation: Add missing operand for evaluation. --- dlls/msi/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 06e6434..2bef67d 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -764,7 +764,7 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( if (FAILED(hr)) return hr; pid = V_I4(&varg0); - if (pid == PID_CODEPAGE || (pid >= PID_PAGECOUNT && pid <= PID_CHARCOUNT) || PID_SECURITY) + if (pid == PID_CODEPAGE || (pid >= PID_PAGECOUNT && pid <= PID_CHARCOUNT) || pid == PID_SECURITY) { ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, NULL, NULL, NULL);

1 0

Misha Koshelev : msi: automation: Remove duplicate error messages on unknown dispid.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: f850364efac585c310933e2c0aaef60b921d6cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f850364efac585c310933e2c0… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 1 20:05:40 2007 -0500 msi: automation: Remove duplicate error messages on unknown dispid. DISP_E_MEMBERNOTFOUND FIXME is already handled in AutomationObject_Invoke. --- dlls/msi/automation.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 6b1f6c2..06e6434 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -830,7 +830,6 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( break; default: - ERR("Member not found: %d\n", dispIdMember); return DISP_E_MEMBERNOTFOUND; } @@ -1849,7 +1848,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( break; default: - ERR("Member not found: %d\n", dispIdMember); return DISP_E_MEMBERNOTFOUND; }

1 0

H. Verbeet : d3d9: Add a test for calling DrawIndexedPrimitive with a NULL index buffer.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: b70bc73196fc1d54082966a1773c40544b28231f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70bc73196fc1d54082966a17… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Jun 2 15:54:55 2007 +0200 d3d9: Add a test for calling DrawIndexedPrimitive with a NULL index buffer. --- dlls/d3d9/tests/device.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 365b783..710ec46 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2,6 +2,7 @@ * Copyright (C) 2006 Vitaliy Margolen * Copyright (C) 2006 Chris Robinson * Copyright (C) 2006-2007 Stefan D�singer(For CodeWeavers) + * Copyright 2007 Henri Verbeet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1238,6 +1239,122 @@ cleanup: if(hwnd) DestroyWindow(hwnd); } +/* Test what happens when IDirect3DDevice9_DrawIndexedPrimitive is called without a valid index buffer set. */ +static void test_draw_indexed(void) +{ + static const struct { + float position[3]; + DWORD color; + } quad[] = { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000}, + }; + WORD indices[] = {0, 1, 2, 3, 0, 2}; + + static const D3DVERTEXELEMENT9 decl_elements[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, + D3DDECL_END() + }; + + IDirect3DVertexDeclaration9 *vertex_declaration = NULL; + IDirect3DVertexBuffer9 *vertex_buffer = NULL; + IDirect3DIndexBuffer9 *index_buffer = NULL; + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + HRESULT hr; + HWND hwnd; + void *ptr; + + hwnd = CreateWindow("static", "d3d9_test", + 0, 0, 0, 10, 10, 0, 0, 0, 0); + if (!hwnd) + { + skip("Failed to create window\n"); + return; + } + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + if (!d3d9) + { + skip("Failed to create IDirect3D9 object\n"); + goto cleanup; + } + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + if (FAILED(hr) || !device) + { + skip("Failed to create device\n"); + goto cleanup; + } + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, 0, D3DPOOL_DEFAULT, &vertex_buffer, NULL); + ok(SUCCEEDED(hr), "CreateVertexBuffer failed (0x%08x)\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Lock failed (0x%08x)\n", hr); + memcpy(ptr, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer9_Unlock(vertex_buffer); + ok(SUCCEEDED(hr), "Unlock failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vertex_buffer, 0, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &index_buffer, NULL); + ok(SUCCEEDED(hr), "CreateIndexBuffer failed (0x%08x)\n", hr); + hr = IDirect3DIndexBuffer9_Lock(index_buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Lock failed (0x%08x)\n", hr); + memcpy(ptr, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer9_Unlock(index_buffer); + ok(SUCCEEDED(hr), "Unlock failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState D3DRS_LIGHTING failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (0x%08x)\n", hr); + + /* NULL index buffer. Should fail */ + hr = IDirect3DDevice9_SetIndices(device, NULL); + ok(SUCCEEDED(hr), "SetIndices failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0 /* BaseVertexIndex */, 0 /* MinIndex */, + 4 /* NumVerts */, 0 /* StartIndex */, 2 /*PrimCount */); + ok(hr == D3DERR_INVALIDCALL, "DrawIndexedPrimitive returned 0x%08x, expected D3DERR_INVALIDCALL (0x%08x)\n", + hr, D3DERR_INVALIDCALL); + + /* Valid index buffer. Should succeed */ + hr = IDirect3DDevice9_SetIndices(device, index_buffer); + ok(SUCCEEDED(hr), "SetIndices failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0 /* BaseVertexIndex */, 0 /* MinIndex */, + 4 /* NumVerts */, 0 /* StartIndex */, 2 /*PrimCount */); + ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + IDirect3DVertexBuffer9_Release(vertex_buffer); + IDirect3DIndexBuffer9_Release(index_buffer); + IDirect3DVertexDeclaration9_Release(vertex_declaration); + +cleanup: + if (d3d9) IDirect3D9_Release(d3d9); + if (device) IDirect3DDevice9_Release(device); + if (hwnd) DestroyWindow(hwnd); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -1260,5 +1377,6 @@ START_TEST(device) test_scene(); test_limits(); test_depthstenciltest(); + test_draw_indexed(); } }

1 0

H. Verbeet : wined3d: Return WINED3DERR_INVALIDCALL in DrawIndexedPrimitive if no index buffer is set .
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 93dcfe350d8adb26703035343a619240443aa4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93dcfe350d8adb26703035343… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Jun 2 15:54:49 2007 +0200 wined3d: Return WINED3DERR_INVALIDCALL in DrawIndexedPrimitive if no index buffer is set. --- dlls/wined3d/device.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0b399d5..3ecf65c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4526,11 +4526,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * WINED3DINDEXBUFFER_DESC IdxBufDsc; GLuint vbo; + pIB = This->stateBlock->pIndexData; + if (!pIB) { + /* D3D9 returns D3DERR_INVALIDCALL when DrawIndexedPrimitive is called + * without an index buffer set. (The first time at least...) + * D3D8 simply dies, but I doubt it can do much harm to return + * D3DERR_INVALIDCALL there as well. */ + ERR("(%p) : Called without a valid index buffer set, returning WINED3DERR_INVALIDCALL\n", This); + return WINED3DERR_INVALIDCALL; + } + if(This->stateBlock->streamIsUP) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); This->stateBlock->streamIsUP = FALSE; } - pIB = This->stateBlock->pIndexData; vbo = ((IWineD3DIndexBufferImpl *) pIB)->vbo; TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, countP=%d\n", This,

1 0

Stefan Leichter : crypt32: Replace CRYPT_RecurseDeleteKey with RegDeleteTreeW.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 374267e127889ffd4cd4c5c440cb7703bd4ca6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=374267e127889ffd4cd4c5c44… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jun 1 22:49:49 2007 +0200 crypt32: Replace CRYPT_RecurseDeleteKey with RegDeleteTreeW. --- dlls/crypt32/store.c | 59 ++----------------------------------------------- 1 files changed, 3 insertions(+), 56 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 30143fe..b2be152 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1367,59 +1367,6 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, return ret; } -/* Copied from shlwapi's SHDeleteKeyW, and reformatted to match this file. */ -static DWORD CRYPT_RecurseDeleteKey(HKEY hKey, LPCWSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0, dwMaxSubkeyLen = 0, dwSize, i; - WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s)\n", hKey, debugstr_w(lpszSubKey)); - - dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if (!dwRet) - { - /* Find how many subkeys there are */ - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount, - &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); - if (!dwRet) - { - dwMaxSubkeyLen++; - if (dwMaxSubkeyLen > sizeof(szNameBuf)/sizeof(WCHAR)) - { - /* Name too big: alloc a buffer for it */ - lpszName = CryptMemAlloc(dwMaxSubkeyLen*sizeof(WCHAR)); - } - - if (!lpszName) - dwRet = ERROR_NOT_ENOUGH_MEMORY; - else - { - /* Recursively delete all the subkeys */ - for (i = 0; i < dwKeyCount && !dwRet; i++) - { - dwSize = dwMaxSubkeyLen; - dwRet = RegEnumKeyExW(hSubKey, i, lpszName, &dwSize, NULL, - NULL, NULL, NULL); - if (!dwRet) - dwRet = CRYPT_RecurseDeleteKey(hSubKey, lpszName); - } - - if (lpszName != szNameBuf) - { - /* Free buffer if allocated */ - CryptMemFree(lpszName); - } - } - } - - RegCloseKey(hSubKey); - if (!dwRet) - dwRet = RegDeleteKeyW(hKey, lpszSubKey); - } - return dwRet; -} - static void *regProvFuncs[] = { CRYPT_RegCloseStore, NULL, /* CERT_STORE_PROV_READ_CERT_FUNC */ @@ -1446,12 +1393,12 @@ static WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, if (dwFlags & CERT_STORE_DELETE_FLAG) { - DWORD rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CertsW); + DWORD rc = RegDeleteTreeW((HKEY)pvPara, CertsW); if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS) - rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CRLsW); + rc = RegDeleteTreeW((HKEY)pvPara, CRLsW); if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS) - rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CTLsW); + rc = RegDeleteTreeW((HKEY)pvPara, CTLsW); if (rc == ERROR_NO_MORE_ITEMS) rc = ERROR_SUCCESS; SetLastError(rc);

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
86
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 June 2007