wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Andrew Talbot : d3dcompiler_43: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 80e4d899edd168f873a23a0e55e23ce0ac562d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e4d899edd168f873a23a0e5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 1 15:48:30 2013 +0000 d3dcompiler_43: Avoid signed-unsigned integer comparisons. --- dlls/d3dcompiler_43/bytecodewriter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index d10f6bc..17289d2 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -609,7 +609,7 @@ static void write_declarations(struct bc_writer *This, } static void write_const(struct constant **consts, int num, DWORD opcode, DWORD reg_type, struct bytecode_buffer *buffer, BOOL len) { - DWORD i; + int i; DWORD instr_def = opcode; const DWORD reg = (1<<31) | ((reg_type << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) |

1 0

Andrew Talbot : comctl32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 23fde785eeeb5b5e0451f810d260909e742462eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fde785eeeb5b5e0451f810d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:31 2012 +0000 comctl32: Avoid signed-unsigned integer comparisons. --- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/monthcal.c | 6 ++++-- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/status.c | 10 ++++++---- dlls/comctl32/updown.c | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 6142ba7..3eb7724 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2235,7 +2235,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) void *image_bits, *mask_bits = NULL; ILHEAD ilHead; HIMAGELIST himl; - int i; + unsigned int i; TRACE("%p\n", pstm); diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index f27eee3..ef2ad68 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1076,7 +1076,8 @@ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc, /* months before first calendar month and after last calendar month */ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - INT mask, length, index; + INT mask, index; + UINT length; SYSTEMTIME st_max, st; if (infoPtr->dwStyle & MCS_NOTRAILINGDATES) return; @@ -1116,7 +1117,8 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - INT i, j, length; + INT i, j; + UINT length; RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 0ae69ef..4e26c33 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1124,7 +1124,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) * or infoPtr->uNumBands if none */ static int next_visible(const REBAR_INFO *infoPtr, int i) { - int n; + unsigned int n; for (n = i + 1; n < infoPtr->uNumBands; n++) if (!HIDDENBAND(REBAR_GetBand(infoPtr, n))) break; diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 19d671d..c4efedb 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -285,7 +285,6 @@ STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPA static LRESULT STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) { - int i; RECT rect; HBRUSH hbrBk; HFONT hOldFont; @@ -319,6 +318,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) if (infoPtr->simple) { STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0); } else { + unsigned int i; + for (i = 0; i < infoPtr->numParts; i++) { STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i); } @@ -336,7 +337,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) static int STATUSBAR_InternalHitTest(const STATUS_INFO *infoPtr, const POINT *pt) { - int i; + unsigned int i; + if (infoPtr->simple) return 255; @@ -352,7 +354,7 @@ STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr) { STATUSWINDOWPART *part; RECT rect, *r; - int i; + UINT i; /* get our window size */ GetClientRect (infoPtr->Self, &rect); @@ -883,7 +885,7 @@ STATUSBAR_Simple (STATUS_INFO *infoPtr, BOOL simple) static LRESULT STATUSBAR_WMDestroy (STATUS_INFO *infoPtr) { - int i; + unsigned int i; TRACE("\n"); for (i = 0; i < infoPtr->numParts; i++) { diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 2c5fc60..390f829 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -1026,10 +1026,10 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L if (TRACE_ON(updown)) { - INT i; + UINT i; for (i = 0; i < wParam; i++) - TRACE("%d: nSec %u nInc %u\n", i, + TRACE("%u: nSec %u nInc %u\n", i, infoPtr->AccelVect[i].nSec, infoPtr->AccelVect[i].nInc); }

1 0

Andrew Talbot : advapi32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: a377563b00b0ac1bb7d9f788cb000a4335e6725d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a377563b00b0ac1bb7d9f788c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:26 2012 +0000 advapi32: Avoid signed-unsigned integer comparisons. --- dlls/advapi32/eventlog.c | 4 ++-- dlls/advapi32/security.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 38c533a..0922fff 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -651,7 +651,7 @@ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD d { LPWSTR *wideStrArray; UNICODE_STRING str; - int i; + UINT i; BOOL ret; FIXME("(%p,0x%04x,0x%04x,0x%08x,%p,0x%04x,0x%08x,%p,%p): stub\n", hEventLog, @@ -684,7 +684,7 @@ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD d BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCWSTR *lpStrings, LPVOID lpRawData ) { - int i; + UINT i; FIXME("(%p,0x%04x,0x%04x,0x%08x,%p,0x%04x,0x%08x,%p,%p): stub\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData); diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d857591..5a74783 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4785,7 +4785,7 @@ static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) static BOOL DumpAcl(PACL pacl, WCHAR **pwptr, ULONG *plen, BOOL protected, BOOL autoInheritReq, BOOL autoInherited) { WORD count; - int i; + UINT i; if (protected) DumpString(SDDL_PROTECTED, -1, pwptr, plen);

1 0

Andrew Talbot : cabinet: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: d03b13c5349bf6034b729b95922d20aecb776cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03b13c5349bf6034b729b959… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:29 2012 +0000 cabinet: Avoid signed-unsigned integer comparisons. --- dlls/cabinet/fdi.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index fb675fc..33734e7 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2041,7 +2041,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* outlen=0 means this block was the last contiguous part of a split block, continued in the next cabinet */ if (outlen == 0) { - int pathlen, filenamelen, i; + int pathlen, filenamelen; INT_PTR cabhf; char fullpath[MAX_PATH], userpath[256]; FDINOTIFICATION fdin; @@ -2056,6 +2056,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* set up the next decomp_state... */ if (!(cab->next)) { + unsigned int i; + if (!cab->mii.hasnext) return DECR_INPUT; if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state))))) @@ -2695,13 +2697,13 @@ BOOL __cdecl FDICopy( /* find the folder for this file if necc. */ if (filehf) { - int i2; - fol = CAB(firstfol); if ((file->index & cffileCONTINUED_TO_NEXT) == cffileCONTINUED_TO_NEXT) { /* pick the last folder */ while (fol->next) fol = fol->next; } else { + unsigned int i2; + for (i2 = 0; (i2 < file->index); i2++) if (fol->next) /* bug resistance, should always be true */ fol = fol->next;

1 0

Andrew Eikum : winmm: Don't map the device if WAVE_FORMAT_DIRECT is given.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 93348b21f7fb4946d46d2006a9f8075e5fbfc0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=93348b21f7fb4946d46d2006a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 28 15:37:39 2012 -0600 winmm: Don't map the device if WAVE_FORMAT_DIRECT is given. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 207b6ca..ec230c9 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1137,7 +1137,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, AC_BUFLEN, 0, device->orig_fmt, &device->parent->session); if(FAILED(hr)){ - if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT){ + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT && !(info->flags & WAVE_FORMAT_DIRECT)){ ret = WINMM_MapDevice(device, is_out); if(ret != MMSYSERR_NOERROR || info->flags & WAVE_FORMAT_QUERY) goto error;

1 0

Hans Leidekker : winhttp/tests: Accept another error from WinHttpGetProxyForUrl.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 8d0551b98d8161b0664eeb78fae2cfcf50f3ccb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0551b98d8161b0664eeb78f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:05:57 2013 +0100 winhttp/tests: Accept another error from WinHttpGetProxyForUrl. --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 05e7804..132551c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2697,7 +2697,8 @@ static void test_WinHttpGetProxyForUrl(void) SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); error = GetLastError(); - if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED || + error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); else { trace("Proxy.AccessType=%u\n", info.dwAccessType);

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateRasterizerState().
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 8e9f0af2a91bc68fb26aa2192a99e7626f6fa2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9f0af2a91bc68fb26aa2192… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:28 2013 +0100 d3d10core/tests: Add a small test for ID3D10Device_CreateRasterizerState(). --- dlls/d3d10core/tests/device.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b045c50..1ed99a0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -719,6 +719,49 @@ static void test_create_depthstencil_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_rasterizer_state(void) +{ + ID3D10RasterizerState *rast_state1, *rast_state2; + D3D10_RASTERIZER_DESC rast_desc; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreateRasterizerState(device, NULL, &rast_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + rast_desc.FillMode = D3D10_FILL_SOLID; + rast_desc.CullMode = D3D10_CULL_BACK; + rast_desc.FrontCounterClockwise = FALSE; + rast_desc.DepthBias = 0; + rast_desc.DepthBiasClamp = 0.0f; + rast_desc.SlopeScaledDepthBias = 0.0f; + rast_desc.DepthClipEnable = TRUE; + rast_desc.ScissorEnable = FALSE; + rast_desc.MultisampleEnable = FALSE; + rast_desc.AntialiasedLineEnable = FALSE; + + hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state1); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state2); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ok(rast_state1 == rast_state2, "Got different rasterizer state objects.\n"); + + refcount = ID3D10RasterizerState_Release(rast_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D10RasterizerState_Release(rast_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -731,4 +774,5 @@ START_TEST(device) test_create_sampler_state(); test_create_blend_state(); test_create_depthstencil_state(); + test_create_rasterizer_state(); }

1 0

Henri Verbeet : d3d10core: Only create unique rasterizer state objects.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 5d38662235aa5d89e0b3754fbbc8c2df36838367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d38662235aa5d89e0b3754fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:27 2013 +0100 d3d10core: Only create unique rasterizer state objects. --- dlls/d3d10core/d3d10core_private.h | 5 +++- dlls/d3d10core/device.c | 42 +++++++++++++++++++++++++++++++++++- dlls/d3d10core/state.c | 19 ++++++++++++---- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ede3b7a..a859642 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -248,10 +248,12 @@ struct d3d10_rasterizer_state ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; + struct d3d10_device *device; D3D10_RASTERIZER_DESC desc; + struct wine_rb_entry entry; }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device, const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; @@ -294,6 +296,7 @@ struct d3d10_device struct wine_rb_tree blend_states; struct wine_rb_tree depthstencil_states; + struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; struct d3d10_blend_state *blend_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3542d53..4783781 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -82,6 +82,7 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) if (device->wined3d_device) wined3d_device_decref(device->wined3d_device); wine_rb_destroy(&device->sampler_states, NULL, NULL); + wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->depthstencil_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); } @@ -1475,7 +1476,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device *iface, const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_rasterizer_state *object; + struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); @@ -1483,6 +1486,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device if (!desc) return E_INVALIDARG; + if ((entry = wine_rb_get(&device->rasterizer_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_rasterizer_state, entry); + + TRACE("Returning existing rasterizer state %p.\n", object); + *rasterizer_state = &object->ID3D10RasterizerState_iface; + ID3D10RasterizerState_AddRef(*rasterizer_state); + + return S_OK; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1490,7 +1505,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_rasterizer_state_init(object, desc))) + if (FAILED(hr = d3d10_rasterizer_state_init(object, device, desc))) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -2020,6 +2035,22 @@ static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = d3d10_depthstencil_state_compare, }; +static int d3d10_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const D3D10_RASTERIZER_DESC *ka = key; + const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_rasterizer_state, entry)->desc; + + return memcmp(ka, kb, sizeof(*ka)); +} + +static const struct wine_rb_functions d3d10_rasterizer_state_rb_ops = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_rasterizer_state_compare, +}; + HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; @@ -2043,9 +2074,18 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) return E_FAIL; } + if (wine_rb_init(&device->rasterizer_states, &d3d10_rasterizer_state_rb_ops) == -1) + { + WARN("Failed to initialize rasterizer state rbtree.\n"); + wine_rb_destroy(&device->depthstencil_states, NULL, NULL); + wine_rb_destroy(&device->blend_states, NULL, NULL); + return E_FAIL; + } + if (wine_rb_init(&device->sampler_states, &d3d10_sampler_state_rb_ops) == -1) { WARN("Failed to initialize sampler state rbtree.\n"); + wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->depthstencil_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); return E_FAIL; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index f49875d..f0d162b 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -341,14 +341,15 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + wine_rb_remove(&state->device->rasterizer_states, &state->desc); + HeapFree(GetProcessHeap(), 0, state); } return refcount; @@ -414,12 +415,20 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, const D3D10_RASTERIZER_DESC *desc) +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device, + const D3D10_RASTERIZER_DESC *desc) { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; + state->device = device; state->desc = *desc; + if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) + { + ERR("Failed to insert rasterizer state entry.\n"); + return E_FAIL; + } + return S_OK; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_GetDesc().
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 4f9814c5368cdbf4d3d745a34158e59a1f38defa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9814c5368cdbf4d3d745a34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:26 2013 +0100 d3d10core: Implement d3d10_rasterizer_state_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 5 ++++- dlls/d3d10core/device.c | 6 ++++-- dlls/d3d10core/state.c | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index b5ba293..ede3b7a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -247,9 +247,12 @@ struct d3d10_rasterizer_state { ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; + + D3D10_RASTERIZER_DESC desc; }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, + const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bcf49da..3542d53 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1480,6 +1480,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); + if (!desc) + return E_INVALIDARG; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1487,8 +1490,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device return E_OUTOFMEMORY; } - hr = d3d10_rasterizer_state_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_rasterizer_state_init(object, desc))) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index b2aebdc..f49875d 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -392,7 +392,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerState *iface, D3D10_RASTERIZER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = @@ -410,10 +414,11 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, const D3D10_RASTERIZER_DESC *desc) { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; + state->desc = *desc; return S_OK; }

1 0

Henri Verbeet : ddraw: Avoid LPD3DRECT.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 8f32358b0d7618eef2ead5a16a70b3a219f06706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f32358b0d7618eef2ead5a16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:25 2013 +0100 ddraw: Avoid LPD3DRECT. --- include/d3d.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 6dbf3d8..33fbd50 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -661,7 +661,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -729,7 +729,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -805,7 +805,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -815,7 +815,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) /*** IDirect3DViewport3 methods ***/ STDMETHOD(SetBackgroundDepth2)(THIS_ IDirectDrawSurface4 *surface) PURE; STDMETHOD(GetBackgroundDepth2)(THIS_ IDirectDrawSurface4 **surface, BOOL *valid) PURE; - STDMETHOD(Clear2)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,DWORD dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; + STDMETHOD(Clear2)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, DWORD color, D3DVALUE z, DWORD stencil) PURE; }; #undef INTERFACE @@ -1303,7 +1303,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(GetDirect3D)(THIS_ IDirect3D7 **d3d) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,D3DCOLOR dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) PURE; STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE;

1 0

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