June 2007 - Wine-commits - list.winehq.org

Francois Gouget : programs/cmd: Add missing '\n' to Wine trace.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: a2deafcc3fd7b6afdb964ea7258b78ba94661874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2deafcc3fd7b6afdb964ea72… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 6 10:44:04 2007 +0200 programs/cmd: Add missing '\n' to Wine trace. --- programs/cmd/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 4940140..d28421f 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -512,7 +512,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le fd = HeapReAlloc(GetProcessHeap(),0,fd,(entry_count+1)*sizeof(WIN32_FIND_DATA)); if (fd == NULL) { FindClose (hff); - WINE_ERR ("Out of memory"); + WINE_ERR("Out of memory\n"); errorlevel = 1; return parms->next; }

1 0

Dan Hipschman : list.h: Add macros for reverse iteration.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 6cf8e6bd77f6d3c98f39740ce9c789762a7eb52c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf8e6bd77f6d3c98f39740ce… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jun 5 18:48:21 2007 -0700 list.h: Add macros for reverse iteration. --- include/wine/list.h | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index dede5b4..b018a1f 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -196,6 +196,30 @@ static inline void list_move_head( struct list *dst, struct list *src ) (cursor) = (cursor2), \ (cursor2) = LIST_ENTRY((cursor)->field.next, type, field)) +/* iterate through the list in reverse order */ +#define LIST_FOR_EACH_REV(cursor,list) \ + for ((cursor) = (list)->prev; (cursor) != (list); (cursor) = (cursor)->prev) + +/* iterate through the list in reverse order, with safety against removal */ +#define LIST_FOR_EACH_SAFE_REV(cursor, cursor2, list) \ + for ((cursor) = (list)->prev, (cursor2) = (cursor)->prev; \ + (cursor) != (list); \ + (cursor) = (cursor2), (cursor2) = (cursor)->prev) + +/* iterate through the list in reverse order using a list entry */ +#define LIST_FOR_EACH_ENTRY_REV(elem, list, type, field) \ + for ((elem) = LIST_ENTRY((list)->prev, type, field); \ + &(elem)->field != (list); \ + (elem) = LIST_ENTRY((elem)->field.prev, type, field)) + +/* iterate through the list in reverse order using a list entry, with safety against removal */ +#define LIST_FOR_EACH_ENTRY_SAFE_REV(cursor, cursor2, list, type, field) \ + for ((cursor) = LIST_ENTRY((list)->prev, type, field), \ + (cursor2) = LIST_ENTRY((cursor)->field.prev, type, field); \ + &(cursor)->field != (list); \ + (cursor) = (cursor2), \ + (cursor2) = LIST_ENTRY((cursor)->field.prev, type, field)) + /* macros for statically initialized lists */ #define LIST_INIT(list) { &(list), &(list) }

1 0

H. Verbeet : wined3d: Get rid of the BaseVertexIndex parameter to IWineD3DDeviceImpl_SetIndices, use SetBaseVertexIndex instead.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 785771272ac9fda48fbf565fd100e7becda352e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785771272ac9fda48fbf565fd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 5 18:52:21 2007 +0200 wined3d: Get rid of the BaseVertexIndex parameter to IWineD3DDeviceImpl_SetIndices, use SetBaseVertexIndex instead. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 9 +++------ dlls/ddraw/surface.c | 2 +- dlls/wined3d/device.c | 14 +++----------- dlls/wined3d/stateblock.c | 6 ++++-- include/wine/wined3d_interface.h | 4 ++-- 7 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index da3280d..9b718a4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1444,9 +1444,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEV static HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, IDirect3DIndexBuffer8* pIndexData, UINT baseVertexIndex) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); + IWineD3DDevice_SetBaseVertexIndex(This->WineD3DDevice, baseVertexIndex); return IWineD3DDevice_SetIndices(This->WineD3DDevice, - NULL == pIndexData ? NULL : ((IDirect3DIndexBuffer8Impl *)pIndexData)->wineD3DIndexBuffer, - baseVertexIndex); + pIndexData ? ((IDirect3DIndexBuffer8Impl *)pIndexData)->wineD3DIndexBuffer : NULL); } static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, IDirect3DIndexBuffer8** ppIndexData,UINT* pBaseVertexIndex) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c42f456..436b2a1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -910,9 +910,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSourceFreq(LPDIRECT3DDEVIC static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9* pIndexData) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetIndices(This->WineD3DDevice, - pIndexData==NULL ? NULL:((IDirect3DIndexBuffer9Impl *)pIndexData)->wineD3DIndexBuffer, - 0); + return IWineD3DDevice_SetIndices(This->WineD3DDevice, + pIndexData ? ((IDirect3DIndexBuffer9Impl *)pIndexData)->wineD3DIndexBuffer : NULL); } static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9 **ppIndexData) { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 5f423a1..38c7677 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -288,9 +288,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) EnterCriticalSection(&ddraw_cs); /* Free the index buffer. */ - IWineD3DDevice_SetIndices(This->wineD3DDevice, - NULL, - 0); + IWineD3DDevice_SetIndices(This->wineD3DDevice, NULL); IWineD3DIndexBuffer_GetParent(This->indexbuffer, (IUnknown **) &IndexBufferParent); IParent_Release(IndexBufferParent); /* Once for the getParent */ @@ -3896,9 +3894,8 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, } /* Set the index stream */ - hr = IWineD3DDevice_SetIndices(This->wineD3DDevice, - This->indexbuffer, - StartVertex); + IWineD3DDevice_SetBaseVertexIndex(This->wineD3DDevice, StartVertex); + hr = IWineD3DDevice_SetIndices(This->wineD3DDevice, This->indexbuffer); /* Set the vertex stream source */ hr = IWineD3DDevice_SetStreamSource(This->wineD3DDevice, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2baac81..43c8448 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -311,7 +311,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface) TRACE("(%p) Destroying the render target, uninitializing D3D\n", This); /* Unset any index buffer, just to be sure */ - IWineD3DDevice_SetIndices(ddraw->wineD3DDevice, NULL, 0); + IWineD3DDevice_SetIndices(ddraw->wineD3DDevice, NULL); IWineD3DDevice_SetDepthStencilSurface(ddraw->wineD3DDevice, NULL); if(IWineD3DDevice_Uninit3D(ddraw->wineD3DDevice, D3D7CB_DestroyDepthStencilSurface, D3D7CB_DestroySwapChain) != D3D_OK) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 61e3888..afa34c5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2751,19 +2751,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetMaterial(IWineD3DDevice *iface, WINE /***** * Get / Set Indices *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_SetIndices(IWineD3DDevice *iface, IWineD3DIndexBuffer* pIndexData, - UINT BaseVertexIndex) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetIndices(IWineD3DDevice *iface, IWineD3DIndexBuffer* pIndexData) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DIndexBuffer *oldIdxs; - UINT oldBaseIndex = This->updateStateBlock->baseVertexIndex; - TRACE("(%p) : Setting to %p, base %d\n", This, pIndexData, BaseVertexIndex); + TRACE("(%p) : Setting to %p\n", This, pIndexData); oldIdxs = This->updateStateBlock->pIndexData; This->updateStateBlock->changed.indices = TRUE; This->updateStateBlock->set.indices = TRUE; This->updateStateBlock->pIndexData = pIndexData; - This->updateStateBlock->baseVertexIndex = BaseVertexIndex; /* Handle recording of state blocks */ if (This->isRecordingState) { @@ -2771,12 +2768,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetIndices(IWineD3DDevice *iface, IWine return WINED3D_OK; } - /* The base vertex index affects the stream sources, while - * The index buffer is a seperate index buffer state - */ - if(BaseVertexIndex != oldBaseIndex) { - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); - } if(oldIdxs != pIndexData) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); } @@ -2817,6 +2808,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetBaseVertexIndex(IWineD3DDevice *ifac TRACE("Recording... not performing anything\n"); return WINED3D_OK; } + /* The base vertex index affects the stream sources */ IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4213084..39051f1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -711,8 +711,10 @@ should really perform a delta so that only the changes get updated*/ IWineD3DDevice_SetTransform(pDevice, i, &This->transforms[i]); } - if (This->set.indices && This->changed.indices) - IWineD3DDevice_SetIndices(pDevice, This->pIndexData, This->baseVertexIndex); + if (This->set.indices && This->changed.indices) { + IWineD3DDevice_SetIndices(pDevice, This->pIndexData); + IWineD3DDevice_SetBaseVertexIndex(pDevice, This->baseVertexIndex); + } if (This->set.material && This->changed.material ) IWineD3DDevice_SetMaterial(pDevice, &This->material); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index c1bbd6b..abefdaf 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -403,7 +403,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(GetFVF)(THIS_ DWORD * pfvf) PURE; STDMETHOD_(void, SetGammaRamp)(THIS_ UINT iSwapChain, DWORD Flags, CONST WINED3DGAMMARAMP* pRamp) PURE; STDMETHOD_(void, GetGammaRamp)(THIS_ UINT iSwapChain, WINED3DGAMMARAMP* pRamp) PURE; - STDMETHOD(SetIndices)(THIS_ struct IWineD3DIndexBuffer * pIndexData,UINT BaseVertexIndex) PURE; + STDMETHOD(SetIndices)(THIS_ struct IWineD3DIndexBuffer * pIndexData) PURE; STDMETHOD(GetIndices)(THIS_ struct IWineD3DIndexBuffer ** ppIndexData,UINT * pBaseVertexIndex) PURE; STDMETHOD(SetBaseVertexIndex)(THIS_ UINT baseIndex); STDMETHOD(SetLight)(THIS_ DWORD Index,CONST WINED3DLIGHT * pLight) PURE; @@ -539,7 +539,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_GetDepthStencilSurface(p,a) (p)->lpVtbl->GetDepthStencilSurface(p,a) #define IWineD3DDevice_SetGammaRamp(p,a,b,c) (p)->lpVtbl->SetGammaRamp(p,a,b,c) #define IWineD3DDevice_GetGammaRamp(p,a,b) (p)->lpVtbl->GetGammaRamp(p,a,b) -#define IWineD3DDevice_SetIndices(p,a,b) (p)->lpVtbl->SetIndices(p,a,b) +#define IWineD3DDevice_SetIndices(p,a) (p)->lpVtbl->SetIndices(p,a) #define IWineD3DDevice_GetIndices(p,a,b) (p)->lpVtbl->GetIndices(p,a,b) #define IWineD3DDevice_SetBaseVertexIndex(p, a) (p)->lpVtbl->SetBaseVertexIndex(p, a) #define IWineD3DDevice_SetLight(p,a,b) (p)->lpVtbl->SetLight(p,a,b)

1 0

Rob Shearman : wininet: Send the correct callbacks during InternetReadFileExA calls.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: c16bb0718624cecde840f8a36d4681aec96d37e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16bb0718624cecde840f8a36… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 5 19:45:26 2007 +0100 wininet: Send the correct callbacks during InternetReadFileExA calls. --- dlls/wininet/internet.c | 11 +++++++++++ dlls/wininet/tests/http.c | 12 ++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 305392a..214f8ee 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1855,6 +1855,9 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu return FALSE; } + INTERNET_SendCallback(lpwh, lpwh->dwContext, + INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); + /* FIXME: IRF_ASYNC may not be the right thing to test here; * hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC is probably better */ if (dwFlags & IRF_ASYNC) @@ -1887,6 +1890,14 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu lpBuffersOut->dwBufferLength, &lpBuffersOut->dwBufferLength, !(dwFlags & IRF_NO_WAIT), FALSE); + if (retval) + { + DWORD dwBytesReceived = lpBuffersOut->dwBufferLength; + INTERNET_SendCallback(lpwh, lpwh->dwContext, + INTERNET_STATUS_RESPONSE_RECEIVED, &dwBytesReceived, + sizeof(dwBytesReceived)); + } + WININET_Release( lpwh ); TRACE("-- %s (bytes read: %d)\n", retval ? "TRUE": "FALSE", lpBuffersOut->dwBufferLength); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3cf5841..92ef629 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -34,6 +34,8 @@ #define TEST_URL "http://www.winehq.org/site/about" static HANDLE hCompleteEvent; +static BOOL bResponseReceived; +static BOOL bReceivingResponse; static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET ,INTERNET_STATUS_CALLBACK); static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); @@ -93,6 +95,7 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RECEIVING_RESPONSE %p %d\n", GetCurrentThreadId(), hInternet, dwContext, lpvStatusInformation,dwStatusInformationLength); + bReceivingResponse = TRUE; break; case INTERNET_STATUS_RESPONSE_RECEIVED: ok(dwStatusInformationLength == sizeof(DWORD), @@ -101,6 +104,7 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESPONSE_RECEIVED 0x%x %d\n", GetCurrentThreadId(), hInternet, dwContext, *(DWORD *)lpvStatusInformation,dwStatusInformationLength); + bResponseReceived = TRUE; break; case INTERNET_STATUS_CTL_RESPONSE_RECEIVED: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CTL_RESPONSE_RECEIVED %p %d\n", @@ -413,13 +417,17 @@ static void InternetReadFileExA_test(int flags) inetbuffers.dwOffsetHigh = 1234; inetbuffers.dwOffsetLow = 5678; + bReceivingResponse = FALSE; + bResponseReceived = FALSE; rc = InternetReadFileExA(hor, &inetbuffers, IRF_ASYNC | IRF_USE_CONTEXT, 0xcafebabe); if (!rc) { if (GetLastError() == ERROR_IO_PENDING) { trace("InternetReadFileEx -> PENDING\n"); + ok(bReceivingResponse, "INTERNET_STATUS_RECEIVING_RESPONSE should have been sent to callback function\n"); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(!bResponseReceived, "INTERNET_STATUS_RESPONSE_RECEIVED should not have been sent to callback function\n"); } else { @@ -428,7 +436,11 @@ static void InternetReadFileExA_test(int flags) } } else + { trace("InternetReadFileEx -> SUCCEEDED\n"); + ok(bReceivingResponse, "INTERNET_STATUS_RECEIVING_RESPONSE should have been sent to callback function\n"); + ok(bResponseReceived, "INTERNET_STATUS_RESPONSE_RECEIVED should have been sent to callback function\n"); + } trace("read %i bytes\n", inetbuffers.dwBufferLength); ((char *)inetbuffers.lpvBuffer)[inetbuffers.dwBufferLength] = '\0';

1 0

Rob Shearman : wininet: Implement NTLM support for proxy authentication.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: cb28969c2aef28be6e6aa750a5efa5d3530c2da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb28969c2aef28be6e6aa750a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 5 19:49:58 2007 +0100 wininet: Implement NTLM support for proxy authentication. --- dlls/wininet/http.c | 172 ++++++++++++++++++++--------------------------- dlls/wininet/internet.h | 1 + 2 files changed, 75 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb28969c2aef28be6e6aa…

1 0

Christian Costa : wineoss.drv: Mark every buffer being added.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 8023a80ec3184ed4f0a885bb74cbcd855e763e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8023a80ec3184ed4f0a885bb7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jun 5 22:01:44 2007 +0200 wineoss.drv: Mark every buffer being added. --- dlls/wineoss.drv/midi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index ffa7d86..7472b56 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -846,6 +846,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; EnterCriticalSection(&crit_sect); + lpMidiHdr->dwFlags |= MHDR_INQUEUE; if (MidiInDev[wDevID].lpQueueHdr == 0) { MidiInDev[wDevID].lpQueueHdr = lpMidiHdr; } else {

1 0

Kai Blin : ws2_32: Add mapping for STATUS_OBJECT_TYPE_MISMATCH to WSAENOTSOCK.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: f500591f3802912afd872b4a6c8c0b00b80076fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f500591f3802912afd872b4a6… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Jun 5 14:43:20 2007 +0200 ws2_32: Add mapping for STATUS_OBJECT_TYPE_MISMATCH to WSAENOTSOCK. --- dlls/ws2_32/socket.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f13ad2a..456be21 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -359,7 +359,8 @@ static inline DWORD NtStatusToWSAError( const DWORD status ) { case STATUS_SUCCESS: wserr = 0; break; case STATUS_PENDING: wserr = WSA_IO_PENDING; break; - case STATUS_INVALID_HANDLE: wserr = WSAENOTSOCK; break; /* WSAEBADF ? */ + case STATUS_OBJECT_TYPE_MISMATCH: wserr = WSAENOTSOCK; break; + case STATUS_INVALID_HANDLE: wserr = WSAEBADF; break; case STATUS_INVALID_PARAMETER: wserr = WSAEINVAL; break; case STATUS_PIPE_DISCONNECTED: wserr = WSAESHUTDOWN; break; case STATUS_CANCELLED: wserr = WSA_OPERATION_ABORTED; break;

1 0

Paul Vriens : wintrust/tests: Start of some crypt tests for wintrust.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 49a20d1af7fb9d3c02db8a51499dbf78a58230b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a20d1af7fb9d3c02db8a514… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 5 14:58:04 2007 +0200 wintrust/tests: Start of some crypt tests for wintrust. --- dlls/wintrust/tests/Makefile.in | 1 + dlls/wintrust/tests/crypt.c | 170 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 790b1af..50fadcc 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = wintrust.dll IMPORTS = user32 advapi32 kernel32 CTESTS = \ + crypt.c \ register.c @MAKE_TEST_RULES@ diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c new file mode 100644 index 0000000..a4f1b70 --- /dev/null +++ b/dlls/wintrust/tests/crypt.c @@ -0,0 +1,170 @@ +/* Unit test suite for wintrust crypt functions + * + * Copyright 2007 Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windows.h" +#include "mscat.h" + +#include "wine/test.h" + +static HMODULE hWintrust = 0; + +static BOOL (WINAPI * pCryptCATAdminAcquireContext)(HCATADMIN*, const GUID*, DWORD); +static BOOL (WINAPI * pCryptCATAdminReleaseContext)(HCATADMIN, DWORD); + +#define WINTRUST_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hWintrust, #func); \ + if(!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + } + +static BOOL InitFunctionPtrs(void) +{ + hWintrust = LoadLibraryA("wintrust.dll"); + + if(!hWintrust) + { + skip("Could not load wintrust.dll\n"); + return FALSE; + } + + WINTRUST_GET_PROC(CryptCATAdminAcquireContext) + WINTRUST_GET_PROC(CryptCATAdminReleaseContext) + + return TRUE; +} + +static void test_context(void) +{ + BOOL ret; + HCATADMIN hca; + static GUID dummy = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; + static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ + + if (!pCryptCATAdminAcquireContext || !pCryptCATAdminReleaseContext) + { + skip("CryptCATAdminAcquireContext and/or CryptCATAdminReleaseContext are not available\n"); + return; + } + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminAcquireContext(NULL, NULL, 0); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* NULL GUID */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS || + GetLastError() == 0xdeadbeef /* Vista */, + "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); + ok(hca != NULL, "Expected a context handle, got NULL\n"); + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(NULL, 0); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* Proper release */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(hca, 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected no change in last error, got %d\n", GetLastError()); + + /* Try to release a second time */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(hca, 0); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* NULL context handle and dummy GUID */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminAcquireContext(NULL, &dummy, 0); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* Correct context handle and dummy GUID */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS || + GetLastError() == 0xdeadbeef /* Vista */, + "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); + ok(hca != NULL, "Expected a context handle, got NULL\n"); + + ret = pCryptCATAdminReleaseContext(hca, 0); + ok(ret, "Expected success\n"); + + /* Correct context handle and GUID */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminAcquireContext(&hca, &unknown, 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS || + GetLastError() == 0xdeadbeef /* Vista */, + "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); + ok(hca != NULL, "Expected a context handle, got NULL\n"); + + ret = pCryptCATAdminReleaseContext(hca, 0); + ok(ret, "Expected success\n"); + + /* Flags not equal to 0 */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS || + GetLastError() == 0xdeadbeef /* Vista */, + "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); + ok(hca != NULL, "Expected a context handle, got NULL\n"); + + ret = pCryptCATAdminReleaseContext(hca, 0); + ok(ret, "Expected success\n"); +} + +START_TEST(crypt) +{ + if(!InitFunctionPtrs()) + return; + + test_context(); + + FreeLibrary(hWintrust); +}

1 0

Michael Stefaniuc : winedos: Fix printf format warnings introduced by the TEB change in thread.h.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 5c06fb0bb1aff89a8d3b1b2f3ed5a3b19974b965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c06fb0bb1aff89a8d3b1b2f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 5 16:02:50 2007 +0200 winedos: Fix printf format warnings introduced by the TEB change in thread.h. --- dlls/winedos/int31.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 4bf16a9..5fa46c6 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -1347,21 +1347,21 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) break; case 0x0900: /* Get and Disable Virtual Interrupt State */ - TRACE( "Get and Disable Virtual Interrupt State: %ld\n", + TRACE( "Get and Disable Virtual Interrupt State: %d\n", NtCurrentTeb()->dpmi_vif ); SET_AL( context, NtCurrentTeb()->dpmi_vif ? 1 : 0 ); NtCurrentTeb()->dpmi_vif = 0; break; case 0x0901: /* Get and Enable Virtual Interrupt State */ - TRACE( "Get and Enable Virtual Interrupt State: %ld\n", + TRACE( "Get and Enable Virtual Interrupt State: %d\n", NtCurrentTeb()->dpmi_vif ); SET_AL( context, NtCurrentTeb()->dpmi_vif ? 1 : 0 ); NtCurrentTeb()->dpmi_vif = 1; break; case 0x0902: /* Get Virtual Interrupt State */ - TRACE( "Get Virtual Interrupt State: %ld\n", + TRACE( "Get Virtual Interrupt State: %d\n", NtCurrentTeb()->dpmi_vif ); SET_AL( context, NtCurrentTeb()->dpmi_vif ? 1 : 0 ); break;

1 0

Stefan Leichter : winspool.drv: Replace WINSPOOL_SHDeleteKeyW with RegDeleteTreeW.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 06b64a1a2ec163b7a03a7515f0efa16db24e0c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b64a1a2ec163b7a03a7515f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Jun 5 18:47:17 2007 +0200 winspool.drv: Replace WINSPOOL_SHDeleteKeyW with RegDeleteTreeW. --- dlls/winspool.drv/info.c | 58 ++------------------------------------------- 1 files changed, 3 insertions(+), 55 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 162f6c3..3086d00 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -246,58 +246,6 @@ static const WCHAR default_doc_title[] = {'L','o','c','a','l',' ','D','o','w','n 'D','o','c','u','m','e','n','t',0}; -/***************************************************************************** - * WINSPOOL_SHRegDeleteKey - * - * Recursively delete subkeys. - * Cut & paste from shlwapi. - * - */ -static DWORD WINSPOOL_SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0, dwMaxSubkeyLen = 0, dwSize, i; - WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = 0; - - 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 = HeapAlloc(GetProcessHeap(), 0, 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 = WINSPOOL_SHDeleteKeyW(hSubKey, lpszName); - } - - if (lpszName != szNameBuf) - HeapFree(GetProcessHeap(), 0, lpszName); /* Free buffer if allocated */ - } - } - - RegCloseKey(hSubKey); - if(!dwRet) - dwRet = RegDeleteKeyW(hKey, lpszSubKey); - } - return dwRet; -} - - /****************************************************************** * validate the user-supplied printing-environment [internal] * @@ -2323,7 +2271,7 @@ BOOL WINAPI DeleteMonitorW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorNa } /* change this, when advapi32.dll/RegDeleteTree is implemented */ - if(WINSPOOL_SHDeleteKeyW(hroot, pMonitorName) == ERROR_SUCCESS) { + if(RegDeleteTreeW(hroot, pMonitorName) == ERROR_SUCCESS) { TRACE("monitor %s deleted\n", debugstr_w(pMonitorName)); RegCloseKey(hroot); return TRUE; @@ -3044,7 +2992,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) return FALSE; } if(RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { - WINSPOOL_SHDeleteKeyW(hkeyPrinters, lpNameW); + RegDeleteTreeW(hkeyPrinters, lpNameW); RegCloseKey(hkeyPrinters); } WriteProfileStringW(devicesW, lpNameW, NULL); @@ -6432,7 +6380,7 @@ BOOL WINAPI DeletePrinterDriverExW( LPWSTR pName, LPWSTR pEnvironment, return FALSE; } - if(WINSPOOL_SHDeleteKeyW(hkey_drivers, pDriverName) == ERROR_SUCCESS) + if(RegDeleteTreeW(hkey_drivers, pDriverName) == ERROR_SUCCESS) ret = TRUE; RegCloseKey(hkey_drivers);

1 0