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

Stefan Dösinger : ddraw: Materials in the execute buffer are handles.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: c58b2f228386194476f95524270a8862d77f07e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58b2f228386194476f955242… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 1 01:01:50 2007 +0200 ddraw: Materials in the execute buffer are handles. --- dlls/ddraw/executebuffer.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 9dbff68..ceb5605 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -246,14 +246,19 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, if (!ci->u1.dlstLightStateType && (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) ERR("Unexpected Light State Type\n"); else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) { - IDirect3DMaterialImpl *mat = (IDirect3DMaterialImpl *) ci->u2.dwArg[0]; - - if (mat != NULL) { - mat->activate(mat); - } else { - FIXME(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n"); - } + DWORD matHandle = ci->u2.dwArg[0]; + + if(!matHandle) { + FIXME(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n"); + } else if(matHandle >= lpDevice->numHandles) { + WARN("Material handle %d is invalid\n", matHandle); + } else if(lpDevice->Handles[matHandle - 1].type != DDrawHandle_Material) { + WARN("Handle %d is not a material handle\n", matHandle); + } else { + IDirect3DMaterialImpl *mat = (IDirect3DMaterialImpl *) lpDevice->Handles[matHandle - 1].ptr; + mat->activate(mat); } + } else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) { switch (ci->u2.dwArg[0]) { case D3DCOLOR_MONO:

1 0

Stefan Dösinger : ddraw: D3DOP_BRANCHFORWARD includes the current instruction size.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: 5fa4de27bc780cdc54e5e20ca8ec825b7a069510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa4de27bc780cdc54e5e20ca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 1 13:53:29 2007 +0200 ddraw: D3DOP_BRANCHFORWARD includes the current instruction size. Native D3DRM puts a branchforward with offset 0 at the beginning of each execute buffer. With the old code this used to get stuck in an endless loop. This patch adds a test that shows that such a branchforward terminates properly. --- dlls/ddraw/executebuffer.c | 2 - dlls/ddraw/surface.c | 3 +- dlls/ddraw/tests/d3d.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index ceb5605..fa51c39 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -519,13 +519,11 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, if (!ci->bNegate) { TRACE(" Branch to %d\n", ci->dwOffset); instr = (char*)current + ci->dwOffset; - break; } } else { if (ci->bNegate) { TRACE(" Branch to %d\n", ci->dwOffset); instr = (char*)current + ci->dwOffset; - break; } } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 39ed549..1d61530 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -110,7 +110,8 @@ IDirectDrawSurfaceImpl_QueryInterface(IDirectDrawSurface7 *iface, return S_OK; } else if( IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) || - IsEqualGUID(riid, &IID_IDirect3DHALDevice) ) + IsEqualGUID(riid, &IID_IDirect3DHALDevice)|| + IsEqualGUID(riid, &IID_IDirect3DRGBDevice) ) { IDirect3DDevice7 *d3d; diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0c69b42..b9d79da 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -818,6 +818,115 @@ static void CapsTest(void) IDirectDraw_Release(dd1); } +static void ExecutebufferTest(void) +{ + IDirect3DDevice *dev1 = NULL; + IDirectDraw *dd; + IDirect3D *d3d; + IDirectDrawSurface *dds; + IDirect3DExecuteBuffer *exebuf; + IDirect3DViewport *vp; + HRESULT hr; + DDSURFACEDESC ddsd; + D3DEXECUTEBUFFERDESC desc; + D3DVIEWPORT vp_data; + D3DINSTRUCTION *instr; + D3DBRANCH *branch; + unsigned int idx = 0; + + /* An IDirect3DDevice cannot be queryInterfaced from an IDirect3DDevice7 on windows */ + hr = DirectDrawCreate(NULL, &dd, NULL); + ok(hr==DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreate returned: %x\n", hr); + if (!dd) { + trace("DirectDrawCreate() failed with an error %x\n", hr); + return; + } + + hr = IDirectDraw_SetCooperativeLevel(dd, NULL, DDSCL_NORMAL); + ok(hr==DD_OK, "SetCooperativeLevel returned: %x\n", hr); + + hr = IDirectDraw_QueryInterface(dd, &IID_IDirect3D, (void**) &d3d); + ok(hr==DD_OK, "QueryInterface returned: %x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + ddsd.dwWidth = 256; + ddsd.dwHeight = 256; + hr = IDirectDraw_CreateSurface(dd, &ddsd, &dds, NULL); + ok(hr==DD_OK, "CreateSurface returned: %x\n", hr); + + dev1 = NULL; + hr = IDirectDrawSurface_QueryInterface(dds, &IID_IDirect3DRGBDevice, (void **) &dev1); + ok(hr==D3D_OK || hr==DDERR_NOPALETTEATTACHED || hr==E_OUTOFMEMORY, "CreateDevice returned: %x\n", hr); + if(!dev1) return; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + desc.dwCaps = D3DDEBCAPS_VIDEOMEMORY; + desc.dwBufferSize = 128; + desc.lpData = NULL; + hr = IDirect3DDevice_CreateExecuteBuffer(dev1, &desc, &exebuf, NULL); + ok(hr == D3D_OK, "IDirect3DDevice_CreateExecuteBuffer failed: %08x\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + + hr = IDirect3DExecuteBuffer_Lock(exebuf, &desc); + ok(hr == D3D_OK, "IDirect3DExecuteBuffer_Lock failed: %08x\n", hr); + instr = desc.lpData; + instr[idx].bOpcode = D3DOP_BRANCHFORWARD; + instr[idx].bSize = sizeof(*branch); + instr[idx].wCount = 1; + idx++; + branch = (D3DBRANCH *) &instr[idx]; + branch->dwMask = 0x0; + branch->dwValue = 1; + branch->bNegate = TRUE; + branch->dwOffset = 0; + idx += (sizeof(*branch) / sizeof(*instr)); + instr[idx].bOpcode = D3DOP_EXIT; + instr[idx].bSize = 0; + instr[idx].bSize = 0; + hr = IDirect3DExecuteBuffer_Unlock(exebuf); + ok(hr == D3D_OK, "IDirect3DExecuteBuffer_Unlock failed: %08x\n", hr); + + hr = IDirect3D_CreateViewport(d3d, &vp, NULL); + ok(hr == D3D_OK, "IDirect3D_CreateViewport failed: %08x\n", hr); + hr = IDirect3DViewport_Initialize(vp, d3d); + ok(hr == DDERR_ALREADYINITIALIZED, "IDirect3DViewport_Initialize returned %08x\n", hr); + hr = IDirect3DDevice_AddViewport(dev1, vp); + ok(hr == D3D_OK, "IDirect3DDevice_AddViewport returned %08x\n", hr); + vp_data.dwSize = sizeof(vp_data); + vp_data.dwX = 0; + vp_data.dwY = 0; + vp_data.dwWidth = 256; + vp_data.dwHeight = 256; + vp_data.dvScaleX = 1; + vp_data.dvScaleY = 1; + vp_data.dvMaxX = 256; + vp_data.dvMaxY = 256; + vp_data.dvMinZ = 0; + vp_data.dvMaxZ = 1; + hr = IDirect3DViewport_SetViewport(vp, &vp_data); + ok(hr == D3D_OK, "IDirect3DViewport_SetViewport returned %08x\n", hr); + + hr = IDirect3DDevice_Execute(dev1, exebuf, vp, D3DEXECUTE_CLIPPED); + ok(hr == D3D_OK, "IDirect3DDevice_Execute returned %08x\n", hr); + + hr = IDirect3DDevice_DeleteViewport(dev1, vp); + ok(hr == D3D_OK, "IDirect3DDevice_AddViewport returned %08x\n", hr); + IDirect3DViewport_Release(vp); + IDirect3DExecuteBuffer_Release(exebuf); + IDirect3DDevice_Release(dev1); + IDirectDrawSurface_Release(dds); + IDirect3D_Release(d3d); + IDirectDraw_Release(dd); + return; +} + START_TEST(d3d) { init_function_pointers(); @@ -837,4 +946,5 @@ START_TEST(d3d) LimitTest(); CapsTest(); ReleaseDirect3D(); + ExecutebufferTest(); }

1 0

Stefan Dösinger : ddraw: Read the world matrix correctly.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: 125b9b7dcfbe87f7e1818ea0fdf57ce1e791528f URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b9b7dcfbe87f7e1818ea0f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 1 20:22:15 2007 +0200 ddraw: Read the world matrix correctly. --- dlls/ddraw/executebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index fa51c39..ff0bbdb 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -339,7 +339,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, (WINED3DMATRIX*) &proj_mat); IWineD3DDevice_GetTransform(lpDevice->wineD3DDevice, - D3DTRANSFORMSTATE_WORLD, + WINED3DTS_WORLDMATRIX(0), (WINED3DMATRIX*) &world_mat); for (i = 0; i < count; i++) {

1 0

Stefan Dösinger : ddraw: Implement IDirect3DViewport3: :TransformVertices.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: e4bf7ab578351e764e4fa3a83a7e4a1856935f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bf7ab578351e764e4fa3a83… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 1 20:23:02 2007 +0200 ddraw: Implement IDirect3DViewport3::TransformVertices. --- dlls/ddraw/tests/d3d.c | 283 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/viewport.c | 139 +++++++++++++++++++++++- 2 files changed, 413 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4bf7ab578351e764e4fa…

1 0

Andrew Talbot : ole32: Constify some variables.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: 67d667b82823a948371e70abe13a6dd43aabfd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d667b82823a948371e70abe… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jul 4 20:12:48 2007 +0100 ole32: Constify some variables. --- dlls/ole32/stg_bigblockfile.c | 2 +- dlls/ole32/stg_prop.c | 4 ++-- dlls/ole32/storage.c | 4 ++-- dlls/ole32/storage32.c | 26 +++++++++++++------------- dlls/ole32/storage32.h | 19 +++++++++---------- 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 4f22207..aa48a9d 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -920,7 +920,7 @@ HRESULT BIGBLOCKFILE_ReadAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, } HRESULT BIGBLOCKFILE_WriteAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, - void* buffer, const ULONG size, ULONG* bytesRead) + const void* buffer, ULONG size, ULONG* bytesRead) { if (This->fileBased) return ImplBIGBLOCKFILE_WriteAt(This,offset,buffer,size,bytesRead); diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 45c760e..f2c96ee 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1617,7 +1617,7 @@ end: } static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, - DWORD propNum, DWORD propid, PROPVARIANT *var, DWORD *sectionOffset) + DWORD propNum, DWORD propid, const PROPVARIANT *var, DWORD *sectionOffset) { HRESULT hr; LARGE_INTEGER seek; @@ -1717,7 +1717,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, FILETIME temp; StorageUtl_WriteULargeInteger((BYTE *)&temp, 0, - (ULARGE_INTEGER *)&var->u.filetime); + (const ULARGE_INTEGER *)&var->u.filetime); hr = IStream_Write(This->stm, &temp, sizeof(FILETIME), &count); bytesWritten = count; break; diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index b2b89ff..febdc12 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -552,7 +552,7 @@ STORAGE_get_small_block(stream_access16 *str,int blocknr,BYTE *sblock) { * STORAGE_put_small_block [INTERNAL] */ static BOOL -STORAGE_put_small_block(stream_access16 *str,int blocknr,BYTE *sblock) { +STORAGE_put_small_block(stream_access16 *str,int blocknr,const BYTE *sblock) { BYTE block[BIGSIZE]; int bigblocknr; struct storage_pps_entry root; @@ -654,7 +654,7 @@ STORAGE_get_pps_entry(stream_access16*str,int n,struct storage_pps_entry *pstde) * STORAGE_put_pps_entry [Internal] */ static int -STORAGE_put_pps_entry(stream_access16*str,int n,struct storage_pps_entry *pstde) { +STORAGE_put_pps_entry(stream_access16*str,int n,const struct storage_pps_entry *pstde) { int blocknr; BYTE block[BIGSIZE]; struct storage_pps_entry *stde = (struct storage_pps_entry*)(((LPBYTE)block)+128*(n&3)); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bda5bdc..f787faa 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -91,7 +91,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct(StorageImpl* ancestorS DWORD openFlags, ULONG rootTropertyIndex); static void StorageImpl_Destroy(StorageBaseImpl* iface); static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer); -static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer); +static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer); static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock); static HRESULT StorageImpl_LoadFileHeader(StorageImpl* This); static void StorageImpl_SaveFileHeader(StorageImpl* This); @@ -279,7 +279,7 @@ static HRESULT StorageImpl_ReadAt(StorageImpl* This, static HRESULT StorageImpl_WriteAt(StorageImpl* This, ULARGE_INTEGER offset, - void* buffer, + const void* buffer, const ULONG size, ULONG* bytesWritten) { @@ -3373,9 +3373,9 @@ BOOL StorageImpl_ReadProperty( * Write the specified property into the property chain */ BOOL StorageImpl_WriteProperty( - StorageImpl* This, - ULONG index, - StgProperty* buffer) + StorageImpl* This, + ULONG index, + const StgProperty* buffer) { BYTE currentProperty[PROPSET_BLOCK_SIZE]; ULARGE_INTEGER offsetInPropSet; @@ -3492,9 +3492,9 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( } static BOOL StorageImpl_WriteBigBlock( - StorageImpl* This, - ULONG blockIndex, - void* buffer) + StorageImpl* This, + ULONG blockIndex, + const void* buffer) { ULARGE_INTEGER ulOffset; DWORD wrote; @@ -4337,9 +4337,9 @@ void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value) } void StorageUtl_CopyPropertyToSTATSTG( - STATSTG* destination, - StgProperty* source, - int statFlags) + STATSTG* destination, + const StgProperty* source, + int statFlags) { /* * The copy of the string occurs only when the flag is not set @@ -6864,7 +6864,7 @@ static HRESULT OLECONVERT_SaveOLE10(OLECONVERT_OLESTREAM_DATA *pData, LPOLESTREA * * */ -static void OLECONVERT_GetOLE20FromOLE10(LPSTORAGE pDestStorage, BYTE *pBuffer, DWORD nBufferLength) +static void OLECONVERT_GetOLE20FromOLE10(LPSTORAGE pDestStorage, const BYTE *pBuffer, DWORD nBufferLength) { HRESULT hRes; HANDLE hFile; @@ -7414,7 +7414,7 @@ static void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX, * Might need to verify the data and return appropriate error message * */ -static void OLECONVERT_CreateOle10NativeStream(LPSTORAGE pStorage, BYTE *pData, DWORD dwDataLength) +static void OLECONVERT_CreateOle10NativeStream(LPSTORAGE pStorage, const BYTE *pData, DWORD dwDataLength) { HRESULT hRes; IStream *pStream; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 6892996..76db895 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -189,7 +189,7 @@ void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize) HRESULT BIGBLOCKFILE_ReadAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, void* buffer, ULONG size, ULONG* bytesRead); HRESULT BIGBLOCKFILE_WriteAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, - void* buffer, const ULONG size, ULONG* bytesRead); + const void* buffer, ULONG size, ULONG* bytesRead); /************************************************************************* * Ole Convert support @@ -311,14 +311,14 @@ struct StorageImpl }; BOOL StorageImpl_ReadProperty( - StorageImpl* This, - ULONG index, - StgProperty* buffer); + StorageImpl* This, + ULONG index, + StgProperty* buffer); BOOL StorageImpl_WriteProperty( - StorageImpl* This, - ULONG index, - StgProperty* buffer); + StorageImpl* This, + ULONG index, + const StgProperty* buffer); BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( StorageImpl* This, @@ -423,9 +423,8 @@ void StorageUtl_WriteULargeInteger(BYTE* buffer, ULONG offset, const ULARGE_INTEGER *value); void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value); void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value); -void StorageUtl_CopyPropertyToSTATSTG(STATSTG* destination, - StgProperty* source, - int statFlags); +void StorageUtl_CopyPropertyToSTATSTG(STATSTG* destination, const StgProperty* source, + int statFlags); /**************************************************************************** * BlockChainStream definitions.

1 0

Andrew Talbot : winelib: Cast-qual warnings fix.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: c208c3b90b0c64e2c34804faaabd9cb9bacc27d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c208c3b90b0c64e2c34804faa… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jul 4 20:53:40 2007 +0100 winelib: Cast-qual warnings fix. --- include/wine/unicode.h | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 1240f8e..27d7cee 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -245,7 +245,7 @@ WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ); WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ) { - do { if (*str == ch) return (WCHAR *)str; } while (*str++); + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); return NULL; } @@ -253,14 +253,14 @@ WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ); WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; - do { if (*str == ch) ret = (WCHAR *)str; } while (*str++); + do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); return ret; } WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ); WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { - for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str; + for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; return NULL; } @@ -300,16 +300,17 @@ WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ); WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)ptr; + for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)(ULONG_PTR)ptr; return NULL; } WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ); WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { - const WCHAR *end, *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = ptr; - return (WCHAR *)ret; + const WCHAR *end; + WCHAR *ret = NULL; + for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; + return ret; } WINE_UNICODE_INLINE long int atolW( const WCHAR *str );

1 0

Misha Koshelev : gdi32: Slightly simplify result handling in PolyDraw.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: def420262bd63f97720af921a4967540182ea7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=def420262bd63f97720af921a… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jul 4 14:40:24 2007 -0500 gdi32: Slightly simplify result handling in PolyDraw. --- dlls/gdi32/painting.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 3e84f60..4a8b8c9 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -823,7 +823,7 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, DWORD cCount) { DC *dc; - BOOL result; + BOOL result = FALSE; POINT lastmove; unsigned int i; @@ -841,10 +841,8 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, if( lpbTypes[i] != PT_MOVETO && lpbTypes[i] & PT_BEZIERTO ) { - if( cCount < i+3 ){ - result = FALSE; - goto end; - } + if( cCount < i+3 ) + goto end; else i += 2; } @@ -869,10 +867,8 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, PolyBezierTo( hdc, &lppt[i], 3 ); i += 2; } - else{ - result = FALSE; - goto end; - } + else + goto end; if( lpbTypes[i] & PT_CLOSEFIGURE ) {

1 0

Julio E. Gonzalez P : ntdll: Add PYT and PYST time zones.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: 5b98738c4d3723398045568712b8963e4999b5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b98738c4d372339804556871… Author: Julio E. Gonzalez P <jegp(a)netvision.com.py> Date: Wed Jul 4 20:52:29 2007 -0400 ntdll: Add PYT and PYST time zones. --- dlls/ntdll/time.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 1159a89..08e09b0 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -168,6 +168,12 @@ static const struct tagTZ_INFO TZ_INFO[] = {"BRST", {'B','r','a','z','i','l','i','a','n',' ','S','u','m','m','e','r', ' ','T','i','m','e','\0'}, 120, 1}, + {"PYT", + {'P','a','r','a','g','u','a','y','a','n',' ', + 'S','t','a','n','d','a','r','d',' ','T','i','m','e','\0'}, 240, 0}, + {"PYST", + {'P','a','r','a','g','u','a','y','a','n',' ','S','u','m','m','e','r', + ' ','T','i','m','e','\0'}, 180, 1}, {"ART", {'S','A',' ','E','a','s','t','e','r','n',' ','S','t','a','n','d','a','r', 'd',' ','T','i','m','e','\0'}, 180, 0},

1 0

Rob Shearman : rpcrt4: Translate between NCA and RPC status codes.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: 9c77d7ac1fd75ad2c093bdcd0e5bf2aa91690811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c77d7ac1fd75ad2c093bdcd0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jul 5 12:46:59 2007 +0100 rpcrt4: Translate between NCA and RPC status codes. --- dlls/rpcrt4/ncastatus.h | 66 ++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpc_message.c | 73 +++++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/rpc_message.h | 4 ++ dlls/rpcrt4/rpc_server.c | 10 ++++-- 4 files changed, 147 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c77d7ac1fd75ad2c093b…

1 0

Stefan Dösinger : ddraw: Fix an incorrect iface-> impl cast.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: c0cc4d42199fdbd895ddde30912d1bac0261db28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cc4d42199fdbd895ddde309… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 1 00:50:35 2007 +0200 ddraw: Fix an incorrect iface->impl cast. --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 38c7677..5c21bf9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -589,7 +589,7 @@ Thunk_IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice *iface, IDirect3DTexture *D3DTex1, IDirect3DTexture *D3DTex2) { - ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice2, iface); + ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice, iface); IDirectDrawSurfaceImpl *surf1 = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirect3DTexture, D3DTex1); IDirectDrawSurfaceImpl *surf2 = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirect3DTexture, D3DTex2); TRACE_(ddraw_thunk)("(%p)->(%p,%p) thunking to IDirect3DDevice2 interface.\n", This, surf1, surf2);

1 0