November 2009 - Wine-Commits

Henri Verbeet : d3d10: Add a D3D10GetGeometryShaderProfile() stub.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 274d21a443d14801c3df3c769e81ed9c028949e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274d21a443d14801c3df3c769… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 10:37:15 2009 +0100 d3d10: Add a D3D10GetGeometryShaderProfile() stub. --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 7 +++++++ include/d3d10shader.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 332ab38..26f714e 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -8,7 +8,7 @@ @ stub D3D10CreateStateBlock @ stub D3D10DisassembleEffect @ stub D3D10DisassembleShader -@ stub D3D10GetGeometryShaderProfile +@ stdcall D3D10GetGeometryShaderProfile(ptr) @ stub D3D10GetInputAndOutputSignatureBlob @ stub D3D10GetInputSignatureBlob @ stub D3D10GetOutputSignatureBlob diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 84ea2b4..6ccc254 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -248,3 +248,10 @@ LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) return "vs_4_0"; } + +LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device) +{ + FIXME("device %p stub!\n", device); + + return "gs_4_0"; +} diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 7a0a470..3aaf6fe 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -131,5 +131,6 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC } D3D10_SIGNATURE_PARAMETER_DESC; LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); +LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); #endif /* __WINE_D3D10SHADER_H */

1 0

Owen Rudge : comctl32: Add support for scrolling during marquee selection.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: e1f3edef3e491095dd73548b711bddf14ee73ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f3edef3e491095dd73548b7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 2 10:58:26 2009 -0600 comctl32: Add support for scrolling during marquee selection. --- dlls/comctl32/listview.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ba9bb3b..ae658bd 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -249,6 +249,7 @@ typedef struct tagLISTVIEW_INFO BOOL bRButtonDown; BOOL bDragging; BOOL bMarqueeSelect; /* marquee selection/highlight underway */ + BOOL bScrolling; RECT marqueeRect; /* absolute coordinates of marquee selection */ RECT marqueeDrawRect; /* relative coordinates for drawing marquee */ POINT marqueeOrigin; /* absolute coordinates of marquee click origin */ @@ -434,6 +435,7 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); static INT LISTVIEW_HitTest(const LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *, BOOL, BOOL); +static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *, INT, INT); /******** Text handling functions *************************************/ @@ -3595,6 +3597,11 @@ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, I return 0; } +#define SCROLL_LEFT 0x1 +#define SCROLL_RIGHT 0x2 +#define SCROLL_UP 0x4 +#define SCROLL_DOWN 0x8 + /*** * DESCRIPTION: * Utility routine to draw and highlight items within a marquee selection rectangle. @@ -3641,6 +3648,21 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, LPPOINT coords_ori /* Cancel out the old marquee rectangle and draw the new one */ LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeDrawRect); + /* Scroll by the appropriate distance if applicable - speed up scrolling as + the cursor is further away */ + + if ((scroll & SCROLL_LEFT) && (coords_orig->x <= 0)) + LISTVIEW_Scroll(infoPtr, coords_orig->x, 0); + + if ((scroll & SCROLL_RIGHT) && (coords_orig->x >= infoPtr->rcList.right)) + LISTVIEW_Scroll(infoPtr, (coords_orig->x - infoPtr->rcList.right), 0); + + if ((scroll & SCROLL_UP) && (coords_orig->y <= 0)) + LISTVIEW_Scroll(infoPtr, 0, coords_orig->y); + + if ((scroll & SCROLL_DOWN) && (coords_orig->y >= infoPtr->rcList.bottom)) + LISTVIEW_Scroll(infoPtr, 0, (coords_orig->y - infoPtr->rcList.bottom)); + /* Invert the items in the old marquee rectangle */ iterator_frameditems_absolute(&i, infoPtr, &infoPtr->marqueeRect); @@ -3694,6 +3716,80 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, LPPOINT coords_ori /*** * DESCRIPTION: + * Called when we are in a marquee selection that involves scrolling the listview (ie, + * the cursor is outside the bounds of the client area). This is a TIMERPROC. + * + * PARAMETER(S): + * [I] hwnd : Handle to the listview + * [I] uMsg : WM_TIMER (ignored) + * [I] idEvent : The timer ID interpreted as a pointer to a LISTVIEW_INFO struct + * [I] dwTimer : The elapsed time (ignored) + * + * RETURN: + * None. + */ +static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + LISTVIEW_INFO *infoPtr; + SCROLLINFO scrollInfo; + POINT coords_orig; + POINT coords_offs; + POINT offset; + INT scroll = 0; + + infoPtr = (LISTVIEW_INFO *) idEvent; + + if (!infoPtr) + return; + + /* Get the current cursor position and convert to client coordinates */ + GetCursorPos(&coords_orig); + ScreenToClient(hWnd, &coords_orig); + + /* Ensure coordinates are within client bounds */ + coords_offs.x = max(min(coords_orig.x, infoPtr->rcList.right), 0); + coords_offs.y = max(min(coords_orig.y, infoPtr->rcList.bottom), 0); + + /* Get offset */ + LISTVIEW_GetOrigin(infoPtr, &offset); + + /* Offset coordinates by the appropriate amount */ + coords_offs.x -= offset.x; + coords_offs.y -= offset.y; + + scrollInfo.cbSize = sizeof(SCROLLINFO); + scrollInfo.fMask = SIF_ALL; + + /* Work out in which directions we can scroll */ + if (GetScrollInfo(infoPtr->hwndSelf, SB_VERT, &scrollInfo)) + { + if (scrollInfo.nPos != scrollInfo.nMin) + scroll |= SCROLL_UP; + + if (((scrollInfo.nPage + scrollInfo.nPos) - 1) != scrollInfo.nMax) + scroll |= SCROLL_DOWN; + } + + if (GetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo)) + { + if (scrollInfo.nPos != scrollInfo.nMin) + scroll |= SCROLL_LEFT; + + if (((scrollInfo.nPage + scrollInfo.nPos) - 1) != scrollInfo.nMax) + scroll |= SCROLL_RIGHT; + } + + if (((coords_orig.x <= 0) && (scroll & SCROLL_LEFT)) || + ((coords_orig.y <= 0) && (scroll & SCROLL_UP)) || + ((coords_orig.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || + ((coords_orig.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) + { + LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, scroll); + } +} + +/*** + * DESCRIPTION: * Called whenever WM_MOUSEMOVE is received. * * PARAMETER(S): @@ -3739,6 +3835,24 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN coords_offs.x -= offset.x; coords_offs.y -= offset.y; + /* Enable the timer if we're going outside our bounds, in case the user doesn't + move the mouse again */ + + if ((x <= 0) || (y <= 0) || (x >= infoPtr->rcList.right) || + (y >= infoPtr->rcList.bottom)) + { + if (!infoPtr->bScrolling) + { + infoPtr->bScrolling = TRUE; + SetTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr, 1, LISTVIEW_ScrollTimer); + } + } + else + { + infoPtr->bScrolling = FALSE; + KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); + } + LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, 0); return 0; } @@ -9464,6 +9578,8 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr) SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); infoPtr->bMarqueeSelect = FALSE; + infoPtr->bScrolling = FALSE; + KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); } /* set window focus flag */ @@ -9545,6 +9661,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN infoPtr->ptClickPos = pt; infoPtr->bDragging = FALSE; infoPtr->bMarqueeSelect = FALSE; + infoPtr->bScrolling = FALSE; lvHitTestInfo.pt.x = x; lvHitTestInfo.pt.y = y; @@ -9683,6 +9800,7 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT infoPtr->bDragging = FALSE; infoPtr->bMarqueeSelect = FALSE; + infoPtr->bScrolling = FALSE; KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); return 0;

1 0

Henri Verbeet : d3d10: Add a D3D10GetVertexShaderProfile() stub.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: f4f6324248543064ee4a7ca46a63c776486ff560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f6324248543064ee4a7ca46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 10:37:14 2009 +0100 d3d10: Add a D3D10GetVertexShaderProfile() stub. --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 7 +++++++ include/d3d10shader.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 0ea1d8f..332ab38 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -15,7 +15,7 @@ @ stub D3D10GetPixelShaderProfile @ stub D3D10GetShaderDebugInfo @ stub D3D10GetVersion -@ stub D3D10GetVertexShaderProfile +@ stdcall D3D10GetVertexShaderProfile(ptr) @ stub D3D10PreprocessShader @ stub D3D10ReflectShader @ stub D3D10RegisterLayers diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 5746fba..84ea2b4 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -241,3 +241,10 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return S_OK; } + +LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) +{ + FIXME("device %p stub!\n", device); + + return "vs_4_0"; +} diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 59221cc..7a0a470 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -130,4 +130,6 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC BYTE ReadWriteMask; } D3D10_SIGNATURE_PARAMETER_DESC; +LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); + #endif /* __WINE_D3D10SHADER_H */

1 0

Paul Vriens : advapi32: Add a input parameter check to ClearEventLog.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 5dafeacbd5b89d89c66bafbe3523278382158f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dafeacbd5b89d89c66bafbe3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 4 08:00:58 2009 +0100 advapi32: Add a input parameter check to ClearEventLog. --- dlls/advapi32/eventlog.c | 23 ++++++++++++++++++----- dlls/advapi32/tests/eventlog.c | 12 ------------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 4990112..af377ee 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -107,7 +107,7 @@ BOOL WINAPI BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) /****************************************************************************** * ClearEventLogA [ADVAPI32.@] * - * Clears the event log and/or saves the log to a backup file. + * Clears the event log and optionally saves the log to a backup file. * * PARAMS * hEvenLog [I] Handle to event log to clear. @@ -121,8 +121,14 @@ BOOL WINAPI BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) */ BOOL WINAPI ClearEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) { - FIXME("(%p,%s) stub\n", hEventLog, debugstr_a(lpBackupFileName)); - return TRUE; + LPWSTR backupW; + BOOL ret; + + backupW = SERV_dup(lpBackupFileName); + ret = ClearEventLogW(hEventLog, backupW); + HeapFree(GetProcessHeap(), 0, backupW); + + return ret; } /****************************************************************************** @@ -132,8 +138,15 @@ BOOL WINAPI ClearEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) */ BOOL WINAPI ClearEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) { - FIXME("(%p,%s) stub\n", hEventLog, debugstr_w(lpBackupFileName)); - return TRUE; + FIXME("(%p,%s) stub\n", hEventLog, debugstr_w(lpBackupFileName)); + + if (!hEventLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 99990a2..6bc9a24 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -508,22 +508,16 @@ static void test_clear(void) SetLastError(0xdeadbeef); ret = ClearEventLogA(NULL, NULL); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } /* Make a backup eventlog to work with */ create_backup(backup); SetLastError(0xdeadbeef); ret = ClearEventLogA(NULL, backup); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } handle = OpenBackupEventLogA(NULL, backup); todo_wine @@ -532,20 +526,14 @@ static void test_clear(void) /* A real eventlog would fail with ERROR_ALREADY_EXISTS */ SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, backup); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } /* Show that ClearEventLog only works for real eventlogs. */ SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } CloseEventLog(handle); DeleteFileA(backup);

1 0

Juan Lang : rsaenh: Test exporting an RSA private key with the most significant bit set.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 812fdca9d66273be6ec4df6802fa8d8e8e1e6a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=812fdca9d66273be6ec4df680… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 3 10:22:54 2009 -0800 rsaenh: Test exporting an RSA private key with the most significant bit set. --- dlls/rsaenh/tests/rsaenh.c | 179 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 177 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=812fdca9d66273be6ec4d…

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10BlendState implementation.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: e3ac26d58cd985ccc670d7afb9710f7393267c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ac26d58cd985ccc670d7afb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 10:37:13 2009 +0100 d3d10core: Add a stub ID3D10BlendState implementation. --- dlls/d3d10core/d3d10core_private.h | 9 +++ dlls/d3d10core/device.c | 25 ++++++++- dlls/d3d10core/state.c | 111 ++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index e68754f..f4535ce 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -189,6 +189,15 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; +/* ID3D10BlendState */ +struct d3d10_blend_state +{ + const struct ID3D10BlendStateVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN; + /* ID3D10DepthStencilState */ struct d3d10_depthstencil_state { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index de623bc..b3da2ed 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -919,9 +919,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *iface, const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) { - FIXME("iface %p, desc %p, blend_state %p stub!\n", iface, desc, blend_state); + struct d3d10_blend_state *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 blend state object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_blend_state_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize blend state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created blend state %p.\n", object); + *blend_state = (ID3D10BlendState *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index e0468c3..2eaa652 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -26,6 +26,117 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); /* IUnknown methods */ +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10BlendState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +{ + struct d3d10_blend_state *This = (struct d3d10_blend_state *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +{ + struct d3d10_blend_state *This = (struct d3d10_blend_state *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10BlendState methods */ + +static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, + D3D10_BLEND_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = +{ + /* IUnknown methods */ + d3d10_blend_state_QueryInterface, + d3d10_blend_state_AddRef, + d3d10_blend_state_Release, + /* ID3D10DeviceChild methods */ + d3d10_blend_state_GetDevice, + d3d10_blend_state_GetPrivateData, + d3d10_blend_state_SetPrivateData, + d3d10_blend_state_SetPrivateDataInterface, + /* ID3D10BlendState methods */ + d3d10_blend_state_GetDesc, +}; + +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) +{ + state->vtbl = &d3d10_blend_state_vtbl; + state->refcount = 1; + + return S_OK; +} + +/* IUnknown methods */ + static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10DepthStencilState *iface, REFIID riid, void **object) {

1 0

Hans Leidekker : rpcrt4: Add a test for the ncalrpc protocol sequence.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 444307610ee6896c2c73c93a981f09a6d8064015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444307610ee6896c2c73c93a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 4 09:10:50 2009 +0100 rpcrt4: Add a test for the ncalrpc protocol sequence. --- dlls/rpcrt4/tests/server.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 34ef797..63614e3 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1291,6 +1291,20 @@ client(const char *test) ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } + else if (strcmp(test, "ncalrpc_basic") == 0) + { + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char guid[] = "00000000-4114-0704-2301-000000000000"; + unsigned char *binding; + + ok(RPC_S_OK == RpcStringBindingCompose(NULL, ncalrpc, NULL, guid, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBinding(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + + run_tests(); + + ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); + } else if (strcmp(test, "np_basic") == 0) { static unsigned char np[] = "ncacn_np"; @@ -1316,11 +1330,17 @@ server(void) static unsigned char port[] = PORT; static unsigned char np[] = "ncacn_np"; static unsigned char pipe[] = PIPE; - RPC_STATUS status, iptcp_status, np_status; + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char guid[] = "00000000-4114-0704-2301-000000000000"; + RPC_STATUS status, iptcp_status, np_status, ncalrpc_status; DWORD ret; iptcp_status = RpcServerUseProtseqEp(iptcp, 20, port, NULL); ok(iptcp_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_ip_tcp) failed with status %d\n", iptcp_status); + + ncalrpc_status = RpcServerUseProtseqEp(ncalrpc, 0, guid, NULL); + ok(ncalrpc_status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", ncalrpc_status); + np_status = RpcServerUseProtseqEp(np, 0, pipe, NULL); if (np_status == RPC_S_PROTSEQ_NOT_SUPPORTED) skip("Protocol sequence ncacn_np is not supported\n"); @@ -1347,6 +1367,11 @@ server(void) else skip("tcp_basic tests skipped due to earlier failure\n"); + if (ncalrpc_status == RPC_S_OK) + run_client("ncalrpc_basic"); + else + skip("ncalrpc_basic tests skipped due to earlier failure\n"); + if (np_status == RPC_S_OK) run_client("np_basic"); else

1 0

Hans Leidekker : rpcrt4: Correct spelling of RPC_C_QOS_IDENTITY_STATIC and RPC_C_QOS_IDENTITY_DYNAMIC .
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 4b33527f510e8a9f052c20b508ee30a47329f72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b33527f510e8a9f052c20b50… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 4 09:10:30 2009 +0100 rpcrt4: Correct spelling of RPC_C_QOS_IDENTITY_STATIC and RPC_C_QOS_IDENTITY_DYNAMIC. --- dlls/rpcrt4/rpc_transport.c | 2 +- include/rpcdce.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index cc43278..5d38b6e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -214,7 +214,7 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, dwFlags |= SECURITY_DELEGATION; break; } - if (Connection->QOS->qos->IdentityTracking == RPC_C_QOS_IDENTIFY_DYNAMIC) + if (Connection->QOS->qos->IdentityTracking == RPC_C_QOS_IDENTITY_DYNAMIC) dwFlags |= SECURITY_CONTEXT_TRACKING; } pipe = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL, diff --git a/include/rpcdce.h b/include/rpcdce.h index 465a835..5b714b5 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -158,8 +158,8 @@ typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_IMP_LEVEL_DELEGATE 4 /* values for RPC_SECURITY_QOS*::IdentityTracking */ -#define RPC_C_QOS_IDENTIFY_STATIC 0 -#define RPC_C_QOS_IDENTIFY_DYNAMIC 1 +#define RPC_C_QOS_IDENTITY_STATIC 0 +#define RPC_C_QOS_IDENTITY_DYNAMIC 1 /* flags for RPC_SECURITY_QOS*::Capabilities */ #define RPC_C_QOS_CAPABILITIES_DEFAULT 0x0

1 0

Paul Vriens : advapi32/tests: Add some tests for handling a backup file.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 9c3c49f472e8d174aa0cb779b1166f52ec2d78a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3c49f472e8d174aa0cb779b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 4 08:02:09 2009 +0100 advapi32/tests: Add some tests for handling a backup file. --- dlls/advapi32/tests/eventlog.c | 58 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 6bc9a24..3c932ea 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -164,6 +164,7 @@ static void test_count(void) HANDLE handle; BOOL ret; DWORD count; + const char backup[] = "backup.evt"; SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(NULL, NULL); @@ -190,6 +191,25 @@ static void test_count(void) ok(count != 0xdeadbeef, "Expected the number of records\n"); CloseEventLog(handle); + + /* Make a backup eventlog to work with */ + create_backup(backup); + + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); + + /* Does GetNumberOfEventLogRecords work with backup eventlogs? */ + count = 0xdeadbeef; + ret = GetNumberOfEventLogRecords(handle, &count); + todo_wine + { + ok(ret, "Expected succes\n"); + ok(count != 0xdeadbeef, "Expected the number of records\n"); + } + + CloseEventLog(handle); + DeleteFileA(backup); } static void test_oldest(void) @@ -197,6 +217,7 @@ static void test_oldest(void) HANDLE handle; BOOL ret; DWORD oldest; + const char backup[] = "backup.evt"; SetLastError(0xdeadbeef); ret = GetOldestEventLogRecord(NULL, NULL); @@ -223,6 +244,25 @@ static void test_oldest(void) ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); CloseEventLog(handle); + + /* Make a backup eventlog to work with */ + create_backup(backup); + + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); + + /* Does GetOldestEventLogRecord work with backup eventlogs? */ + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(handle, &oldest); + todo_wine + { + ok(ret, "Expected succes\n"); + ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); + } + + CloseEventLog(handle); + DeleteFileA(backup); } static void test_backup(void) @@ -230,6 +270,7 @@ static void test_backup(void) HANDLE handle; BOOL ret; const char backup[] = "backup.evt"; + const char backup2[] = "backup2.evt"; SetLastError(0xdeadbeef); ret = BackupEventLogA(NULL, NULL); @@ -251,7 +292,7 @@ static void test_backup(void) ret = BackupEventLogA(handle, backup); ok(ret, "Expected succes\n"); todo_wine - ok(GetFileAttributesA("backup.evt") != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); + ok(GetFileAttributesA(backup) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); /* Try to overwrite */ SetLastError(0xdeadbeef); @@ -263,7 +304,22 @@ static void test_backup(void) } CloseEventLog(handle); + + /* Can we make a backup of a backup? */ + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); + + ret = BackupEventLogA(handle, backup2); + todo_wine + { + ok(ret, "Expected succes\n"); + ok(GetFileAttributesA(backup2) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); + } + + CloseEventLog(handle); DeleteFileA(backup); + DeleteFileA(backup2); } static void test_read(void)

1 0

Juan Lang : crypt32: Add stub for CertAddCertificateLinkToStore.
by Alexandre Julliard Nov. 4, 2009

Nov. 4, 2009

Module: wine Branch: master Commit: 9364d7a928bae2e2b2854a1c62383c4cb526792f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9364d7a928bae2e2b2854a1c6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 16:16:46 2009 -0800 crypt32: Add stub for CertAddCertificateLinkToStore. --- dlls/crypt32/cert.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c87b07c..208f3fc 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -71,6 +71,15 @@ BOOL WINAPI CertAddEncodedCertificateToStore(HCERTSTORE hCertStore, return ret; } +BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppCertContext) +{ + FIXME("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, + ppCertContext); + return FALSE; +} + PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, const BYTE *pbCertEncoded, DWORD cbCertEncoded) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index c144ea9..ef5d6e6 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -1,6 +1,7 @@ @ stdcall CertAddCRLContextToStore(ptr ptr long ptr) @ stdcall CertAddCTLContextToStore(ptr ptr long ptr) @ stdcall CertAddCertificateContextToStore(ptr ptr long ptr) +@ stdcall CertAddCertificateLinkToStore(ptr ptr long ptr) @ stdcall CertAddEncodedCRLToStore(ptr long ptr long long ptr) @ stdcall CertAddEncodedCTLToStore(ptr long ptr long long ptr) @ stdcall CertAddEncodedCertificateToStore(ptr long ptr long long ptr)

1 0