December 2007 - Wine-commits

Rob Shearman : rpcss: Initialise some out-only parameters that aren' t initialised by the generated RPC code.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 8b8795136d21bb179858b2cf8180830b0d6da95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8795136d21bb179858b2cf8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 29 12:13:48 2007 +0000 rpcss: Initialise some out-only parameters that aren't initialised by the generated RPC code. --- programs/rpcss/irotp.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c index 7832ac7..21ede32 100644 --- a/programs/rpcss/irotp.c +++ b/programs/rpcss/irotp.c @@ -240,6 +240,8 @@ HRESULT IrotGetObject( WINE_TRACE("%p\n", moniker_data); + *cookie = 0; + EnterCriticalSection(&csRunningObjectTable); LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) @@ -304,6 +306,8 @@ HRESULT IrotGetTimeOfLastChange( WINE_TRACE("%p\n", moniker_data); + memset(time, 0, sizeof(*time)); + EnterCriticalSection(&csRunningObjectTable); LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) {

1 0

Rob Shearman : rpcrt4: Implement non-conformant string functions.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: eeeed91d923ee1beea54769100d06bb7423b7654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeeed91d923ee1beea5476910… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 29 12:16:01 2007 +0000 rpcrt4: Implement non-conformant string functions. --- dlls/rpcrt4/ndr_marshall.c | 196 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 190 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 60e057f..c517ff1 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -917,8 +917,45 @@ unsigned char * WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubM unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); - return NULL; + ULONG esize, size, maxsize; + + TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); + + maxsize = *(USHORT *)&pFormat[2]; + + if (*pFormat == RPC_FC_CSTRING) + { + ULONG i; + const char *str = (const char *)pMemory; + for (i = 0; i < maxsize && *str; i++, str++) + ; + TRACE("string=%s\n", debugstr_an(str, i)); + pStubMsg->ActualCount = i + 1; + esize = 1; + } + else if (*pFormat == RPC_FC_WSTRING) + { + ULONG i; + const WCHAR *str = (const WCHAR *)pMemory; + for (i = 0; i < maxsize && *str; i++, str++) + ; + TRACE("string=%s\n", debugstr_wn(str, i)); + pStubMsg->ActualCount = i + 1; + esize = 2; + } + else + { + ERR("Unhandled string type: %#x\n", *pFormat); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + pStubMsg->Offset = 0; + WriteVariance(pStubMsg); + + size = safe_multiply(esize, pStubMsg->ActualCount); + safe_copy_to_buffer(pStubMsg, pMemory, size); /* the string itself */ + + return NULL; } /*********************************************************************** @@ -929,8 +966,70 @@ unsigned char * WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStu PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - FIXME("stub\n"); + ULONG bufsize, memsize, esize, i, maxsize; + + TRACE("(pStubMsg == ^%p, *pMemory == ^%p, pFormat == ^%p, fMustAlloc == %u)\n", + pStubMsg, *ppMemory, pFormat, fMustAlloc); + + maxsize = *(USHORT *)&pFormat[2]; + + ReadVariance(pStubMsg, NULL, maxsize); + if (pStubMsg->Offset) + { + ERR("non-conformant strings can't have Offset (%d)\n", pStubMsg->Offset); + RpcRaiseException(RPC_S_INVALID_BOUND); + } + + if (*pFormat == RPC_FC_CSTRING) esize = 1; + else if (*pFormat == RPC_FC_WSTRING) esize = 2; + else + { + ERR("Unhandled string type: %#x\n", *pFormat); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + memsize = esize * maxsize; + bufsize = safe_multiply(esize, pStubMsg->ActualCount); + + if (bufsize < esize) + { + ERR("invalid string length of %d\n", pStubMsg->ActualCount); + RpcRaiseException(RPC_S_INVALID_BOUND); return NULL; + } + + /* verify the buffer is safe to access */ + if ((pStubMsg->Buffer + bufsize < pStubMsg->Buffer) || + (pStubMsg->Buffer + bufsize > pStubMsg->BufferEnd)) + { + ERR("bufsize 0x%x exceeded buffer end %p of buffer %p\n", bufsize, + pStubMsg->BufferEnd, pStubMsg->Buffer); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + return NULL; + } + + /* strings must always have null terminating bytes */ + for (i = bufsize - esize; i < bufsize; i++) + if (pStubMsg->Buffer[i] != 0) + { + ERR("string not null-terminated at byte position %d, data is 0x%x\n", + i, pStubMsg->Buffer[i]); + RpcRaiseException(RPC_S_INVALID_BOUND); + } + + if (fMustAlloc || !*ppMemory) + *ppMemory = NdrAllocate(pStubMsg, memsize); + + safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); + + if (*pFormat == RPC_FC_CSTRING) { + TRACE("string=%s\n", debugstr_an((char*)*ppMemory, pStubMsg->ActualCount)); + } + else if (*pFormat == RPC_FC_WSTRING) { + TRACE("string=%s\n", debugstr_wn((LPWSTR)*ppMemory, pStubMsg->ActualCount)); + } + + return NULL; } /*********************************************************************** @@ -940,7 +1039,41 @@ void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + ULONG esize, maxsize; + + TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); + + maxsize = *(USHORT *)&pFormat[2]; + + SizeVariance(pStubMsg); + + if (*pFormat == RPC_FC_CSTRING) + { + ULONG i; + const char *str = (const char *)pMemory; + for (i = 0; i < maxsize && *str; i++, str++) + ; + TRACE("string=%s\n", debugstr_an(str, i)); + pStubMsg->ActualCount = i + 1; + esize = 1; + } + else if (*pFormat == RPC_FC_WSTRING) + { + ULONG i; + const WCHAR *str = (const WCHAR *)pMemory; + for (i = 0; i < maxsize && *str; i++, str++) + ; + TRACE("string=%s\n", debugstr_wn(str, i)); + pStubMsg->ActualCount = i + 1; + esize = 2; + } + else + { + ERR("Unhandled string type: %#x\n", *pFormat); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + safe_buffer_length_increment(pStubMsg, safe_multiply(esize, pStubMsg->ActualCount)); } /*********************************************************************** @@ -949,8 +1082,59 @@ void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, ULONG WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - FIXME("stub\n"); - return 0; + ULONG bufsize, memsize, esize, i, maxsize; + + TRACE("(pStubMsg == ^%p, pFormat == ^%p)\n", pStubMsg, pFormat); + + maxsize = *(USHORT *)&pFormat[2]; + + ReadVariance(pStubMsg, NULL, maxsize); + + if (pStubMsg->Offset) + { + ERR("non-conformant strings can't have Offset (%d)\n", pStubMsg->Offset); + RpcRaiseException(RPC_S_INVALID_BOUND); + } + + if (*pFormat == RPC_FC_CSTRING) esize = 1; + else if (*pFormat == RPC_FC_WSTRING) esize = 2; + else + { + ERR("Unhandled string type: %#x\n", *pFormat); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + memsize = esize * maxsize; + bufsize = safe_multiply(esize, pStubMsg->ActualCount); + + /* strings must always have null terminating bytes */ + if (bufsize < esize) + { + ERR("invalid string length of %d\n", pStubMsg->ActualCount); + RpcRaiseException(RPC_S_INVALID_BOUND); + } + + /* verify the buffer is safe to access */ + if ((pStubMsg->Buffer + bufsize < pStubMsg->Buffer) || + (pStubMsg->Buffer + bufsize > pStubMsg->BufferEnd)) + { + ERR("bufsize 0x%x exceeded buffer end %p of buffer %p\n", bufsize, + pStubMsg->BufferEnd, pStubMsg->Buffer); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + for (i = bufsize - esize; i < bufsize; i++) + if (pStubMsg->Buffer[i] != 0) + { + ERR("string not null-terminated at byte position %d, data is 0x%x\n", + i, pStubMsg->Buffer[i]); + RpcRaiseException(RPC_S_INVALID_BOUND); + } + + safe_buffer_increment(pStubMsg, bufsize); + pStubMsg->MemorySize += memsize; + + return pStubMsg->MemorySize; } static inline void dump_pointer_attr(unsigned char attr)

1 0

Rob Shearman : rpcrt4: Add some tests for non-conformant strings.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 274dc73ba14a83de2b715e13486556d0b600df40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274dc73ba14a83de2b715e134… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 29 12:17:55 2007 +0000 rpcrt4: Add some tests for non-conformant strings. --- dlls/rpcrt4/tests/ndr_marshall.c | 170 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 170 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d930701..73e33a4 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1245,6 +1245,175 @@ todo_wine { HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); } +static void test_nonconformant_string(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + unsigned char *mem, *mem_orig; + unsigned char memsrc[10] = "This is"; + unsigned char memsrc2[10] = "This is a"; + + static const unsigned char fmtstr_nonconf_str[] = + { + 0x26, /* FC_CSTRING */ + 0x5c, /* FC_PAD */ + NdrFcShort( 0xa ), /* 10 */ + }; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr_nonconf_str; + + /* length < size */ + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + + NdrNonConformantStringBufferSize( &StubMsg, + (unsigned char *)memsrc, + fmtstr_nonconf_str ); + ok(StubMsg.BufferLength >= strlen((char *)memsrc) + 1 + 8, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrNonConformantStringMarshall( &StubMsg, (unsigned char *)memsrc, fmtstr_nonconf_str ); + ok(ptr == NULL, "ret %p\n", ptr); + ok(StubMsg.Buffer - StubMsg.BufferStart == strlen((char *)memsrc) + 1 + 8, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + ok(!memcmp(StubMsg.BufferStart + 8, memsrc, strlen((char *)memsrc) + 1), "incorrectly marshaled\n"); + + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.MemorySize = 0; + mem = NULL; + + /* Client */ + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 1); + todo_wine + ok(mem == mem_orig, "mem alloced\n"); + todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem != mem_orig, "mem not alloced\n"); + ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + NdrOleFree(mem); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 1); + todo_wine + ok(mem == mem_orig, "mem alloced\n"); + todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + HeapFree(GetProcessHeap(), 0, mem_orig); + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); + + /* length = size */ + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + + NdrNonConformantStringBufferSize( &StubMsg, + (unsigned char *)memsrc2, + fmtstr_nonconf_str ); + ok(StubMsg.BufferLength >= strlen((char *)memsrc2) + 1 + 8, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrNonConformantStringMarshall( &StubMsg, (unsigned char *)memsrc2, fmtstr_nonconf_str ); + ok(ptr == NULL, "ret %p\n", ptr); + ok(StubMsg.Buffer - StubMsg.BufferStart == strlen((char *)memsrc2) + 1 + 8, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + ok(!memcmp(StubMsg.BufferStart + 8, memsrc2, strlen((char *)memsrc2) + 1), "incorrectly marshaled\n"); + + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.MemorySize = 0; + mem = NULL; + + /* Client */ + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 1); + todo_wine + ok(mem == mem_orig, "mem alloced\n"); + todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem != mem_orig, "mem not alloced\n"); + ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + NdrOleFree(mem); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrNonConformantStringUnmarshall( &StubMsg, &mem, fmtstr_nonconf_str, 1); + todo_wine + ok(mem == mem_orig, "mem alloced\n"); + todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + HeapFree(GetProcessHeap(), 0, mem_orig); + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); +} + START_TEST( ndr_marshall ) { test_ndr_simple_type(); @@ -1255,4 +1424,5 @@ START_TEST( ndr_marshall ) test_ndr_allocate(); test_conformant_array(); test_conformant_string(); + test_nonconformant_string(); }

1 0

Lei Zhang : gdiplus: Add GdipCreatePen2 and test cases.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 003b5de4f2f08bf1d278ef0dd05cd6004f621afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=003b5de4f2f08bf1d278ef0dd… Author: Lei Zhang <thestig(a)google.com> Date: Fri Dec 28 13:08:09 2007 -0800 gdiplus: Add GdipCreatePen2 and test cases. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 12 ++++++++++-- dlls/gdiplus/tests/pen.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 796b7cb..1b9e427 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -121,7 +121,7 @@ @ stub GdipCreatePathGradientI @ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) -@ stub GdipCreatePen2 +@ stdcall GdipCreatePen2(ptr long long ptr) @ stub GdipCreateRegion @ stub GdipCreateRegionHrgn @ stub GdipCreateRegionPath diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 320f375..92d76d8 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -87,9 +87,17 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, REAL width, GpUnit unit, GpPen **pen) { + GpBrush *brush; + GdipCreateSolidFill(color, (GpSolidFill **)(&brush)); + return GdipCreatePen2(brush, width, unit, pen); +} + +GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit, + GpPen **pen) +{ GpPen *gp_pen; - if(!pen) + if(!pen || !brush) return InvalidParameter; gp_pen = GdipAlloc(sizeof(GpPen)); @@ -103,7 +111,7 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, REAL width, GpUnit unit, gp_pen->miterlimit = 10.0; gp_pen->dash = DashStyleSolid; gp_pen->offset = 0.0; - GdipCreateSolidFill(color, (GpSolidFill **)(&gp_pen->brush)); + gp_pen->brush = brush; if(!((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel))) { FIXME("UnitWorld, UnitPixel only supported units\n"); diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 33b73f9..ad484ce 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -62,6 +62,10 @@ static void test_constructor_destructor(void) GpStatus status; GpPen *pen = NULL; + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, NULL); + expect(InvalidParameter, status); + ok(pen == NULL, "Expected pen to be NULL\n"); + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, status); ok(pen != NULL, "Expected pen to be initialized\n"); @@ -73,6 +77,38 @@ static void test_constructor_destructor(void) expect(Ok, status); } +static void test_constructor_destructor2(void) +{ + GpStatus status; + GpPen *pen = NULL; + GpBrush *brush = NULL; + GpPointF points[2]; + + status = GdipCreatePen2(NULL, 10.0f, UnitPixel, &pen); + expect(InvalidParameter, status); + ok(pen == NULL, "Expected pen to be NULL\n"); + + points[0].X = 7.0; + points[0].Y = 11.0; + points[1].X = 13.0; + points[1].Y = 17.0; + + status = GdipCreateLineBrush(&points[0], &points[1], (ARGB)0xffff00ff, + (ARGB)0xff0000ff, WrapModeTile, (GpLineGradient **)&brush); + expect(Ok, status); + ok(brush != NULL, "Expected brush to be initialized\n"); + + status = GdipCreatePen2(brush, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + status = GdipDeletePen(pen); + expect(Ok, status); + + status = GdipDeleteBrush(brush); + expect(Ok, status); +} + static void test_brushfill(void) { GpStatus status; @@ -205,6 +241,7 @@ START_TEST(pen) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_constructor_destructor2(); test_brushfill(); test_dasharray();

1 0

Michael Stefaniuc : wininet: Fix typo in comparison with NULL. Found by Smatch.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: d152d5ceebcfacca2cc679c9bfaaa4975cf5cd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d152d5ceebcfacca2cc679c9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 29 01:04:58 2007 +0100 wininet: Fix typo in comparison with NULL. Found by Smatch. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ed3fbea..27d3b43 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3462,7 +3462,7 @@ static BOOL FTP_ParseDirectory(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR tmpafp = HeapReAlloc(GetProcessHeap(), 0, *lpafp, sizeof(FILEPROPERTIESW)*indexFilePropArray); - if (NULL == tmpafp) + if (NULL != tmpafp) *lpafp = tmpafp; } *dwfp = indexFilePropArray;

1 0

Jacek Caban : urlmon: More ReportProgress implementation.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 2afdc8f5919def80eefe871510e0b8bb7d87553c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afdc8f5919def80eefe87151… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 14:53:38 2007 +0100 urlmon: More ReportProgress implementation. --- dlls/urlmon/bindprot.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 936d078..f9cf389 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -453,12 +453,19 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin switch(ulStatusCode) { case BINDSTATUS_FINDINGRESOURCE: case BINDSTATUS_CONNECTING: + case BINDSTATUS_BEGINDOWNLOADDATA: case BINDSTATUS_SENDINGREQUEST: case BINDSTATUS_CACHEFILENAMEAVAILABLE: + case BINDSTATUS_DIRECTBIND: + case BINDSTATUS_MIMETYPEAVAILABLE: + if(!This->protocol_sink) + return S_OK; return IInternetProtocolSink_ReportProgress(This->protocol_sink, ulStatusCode, szStatusText); + case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - case BINDSTATUS_MIMETYPEAVAILABLE: + if(!This->protocol_sink) + return S_OK; return IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); default:

1 0

Jacek Caban : urlmon: Release protocol sink in Terminate.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: da6dbedbe911a5b82caffa53026388032307fb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6dbedbe911a5b82caffa530… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 14:54:22 2007 +0100 urlmon: Release protocol sink in Terminate. --- dlls/urlmon/bindprot.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index f9cf389..e3a432f 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -36,6 +36,8 @@ typedef struct { IServiceProvider *service_provider; LONG priority; + + BOOL reported_result; } BindProtocol; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) @@ -205,7 +207,18 @@ static HRESULT WINAPI BindProtocol_Terminate(IInternetProtocol *iface, DWORD dwO TRACE("(%p)->(%08x)\n", This, dwOptions); + if(!This->reported_result) + return E_FAIL; + IInternetProtocol_Terminate(This->protocol, 0); + + set_binding_sink(PROTOCOL(This), NULL); + + if(This->bind_info) { + IInternetBindInfo_Release(This->bind_info); + This->bind_info = NULL; + } + return S_OK; } @@ -440,6 +453,14 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface TRACE("(%p)->(%p)\n", This, pProtocolData); + TRACE("flags %x state %x data %p cb %u\n", pProtocolData->grfFlags, pProtocolData->dwState, + pProtocolData->pData, pProtocolData->cbData); + + if(!This->protocol_sink) { + IInternetProtocol_Continue(This->protocol, pProtocolData); + return S_OK; + } + return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); } @@ -482,6 +503,9 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + if(!This->protocol_sink) + return S_OK; + return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); } @@ -492,6 +516,11 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportResult(IInternetProtocolSink TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + if(!This->protocol_sink) + return E_FAIL; + + This->reported_result = TRUE; + return IInternetProtocolSink_ReportResult(This->protocol_sink, hrResult, dwError, szResult); }

1 0

Jacek Caban : urlmon: Added more binding tests.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 48017908adaf67e19a1aca1b384c629ab775f413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48017908adaf67e19a1aca1b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 14:54:48 2007 +0100 urlmon: Added more binding tests. --- dlls/urlmon/tests/protocol.c | 103 ++++++++++++++++++++++++++++++++---------- 1 files changed, 79 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48017908adaf67e19a1ac…

1 0

Andrew Talbot : msvfw32: Remove unneeded casts.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 8402f7a437cc194a12a9645981baf0cc005f8f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8402f7a437cc194a12a964598… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 17:21:45 2007 +0000 msvfw32: Remove unneeded casts. --- dlls/msvfw32/msvideo16.c | 4 ++-- dlls/msvfw32/msvideo_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c index 263f21b..221542c 100644 --- a/dlls/msvfw32/msvideo16.c +++ b/dlls/msvfw32/msvideo16.c @@ -693,7 +693,7 @@ static LRESULT CALLBACK IC_Callback3216(HIC hic, HDRVR hdrv, UINT msg, DWORD l args[2] = LOWORD(lp1); args[1] = HIWORD(lp2); args[0] = LOWORD(lp2); - WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret ); + WOWCallback16Ex( whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret ); switch (msg) { @@ -745,7 +745,7 @@ LRESULT VFWAPI ICSendMessage16(HIC16 hic, UINT16 msg, DWORD lParam1, DWORD lPara args[2] = LOWORD(lParam1); args[1] = HIWORD(lParam2); args[0] = LOWORD(lParam2); - WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &result ); + WOWCallback16Ex( whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &result ); ret = result; } else diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 85a08fa..1cad3bb 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -327,7 +327,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) if (driver && driver->proc) /* The driver has been registered at runtime with its driverproc */ - return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, (DRIVERPROC)driver->proc, (DWORD)NULL); + return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, driver->proc, 0); /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the * same layout as ICOPEN

1 0

Andrew Talbot : ntdll: Remove unneeded casts.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 1ebe82af65943bdafe8dfcfc613b60677f41c765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebe82af65943bdafe8dfcfc6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 17:21:48 2007 +0000 ntdll: Remove unneeded casts. --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/heap.c | 4 ++-- dlls/ntdll/reg.c | 2 +- dlls/ntdll/relay.c | 2 +- dlls/ntdll/sec.c | 4 ++-- dlls/ntdll/threadpool.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 90626db..3c0d549 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -209,7 +209,7 @@ static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) HANDLE sem; if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0; if (!(ret = (HANDLE)interlocked_cmpxchg_ptr( (PVOID *)&crit->LockSemaphore, - (PVOID)sem, 0 ))) + sem, 0 ))) ret = sem; else NtClose(sem); /* somebody beat us to it */ diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 198c5b1..57ae2cb 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1621,8 +1621,8 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr ) ptr = entry->lpData; LIST_FOR_EACH_ENTRY( sub, &heapPtr->subheap_list, SUBHEAP, entry ) { - if (((char *)ptr >= (char *)sub->base) && - ((char *)ptr < (char *)sub->base + sub->size)) + if ((ptr >= (char *)sub->base) && + (ptr < (char *)sub->base + sub->size)) { currentheap = sub; break; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 8b724ec..a095ee3 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -833,7 +833,7 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyPath( IN OUT PUNICODE_STRING KeyPath) KeyPath->Buffer = (PWCHAR)((LPBYTE)buf + sizeof(pathW)); status = RtlConvertSidToUnicodeString(KeyPath, ((TOKEN_USER *)buffer)->User.Sid, FALSE); - KeyPath->Buffer = (PWCHAR)buf; + KeyPath->Buffer = buf; KeyPath->Length += sizeof(pathW); KeyPath->MaximumLength += sizeof(pathW); } diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 2f819c4..f9679a6 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -526,7 +526,7 @@ void RELAY_SetupDLL( HMODULE module ) /* patch the functions in the export table to point to the relay thunks */ funcs = (DWORD *)((char *)module + exports->AddressOfFunctions); - entry_point_rva = (const char *)descr->entry_point_base - (const char *)module; + entry_point_rva = descr->entry_point_base - (const char *)module; for (i = 0; i < exports->NumberOfFunctions; i++, funcs++) { if (!descr->entry_point_offsets[i]) continue; /* not a normal function */ diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index fd5ed7a..5a1fe89 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -66,8 +66,8 @@ static BOOLEAN copy_acl(DWORD nDestinationAclLength, PACL pDestinationAcl, PACL if (!pSourceAcl || !RtlValidAcl(pSourceAcl)) return FALSE; - - size = ((ACL *)pSourceAcl)->AclSize; + + size = pSourceAcl->AclSize; if (nDestinationAclLength < size) return FALSE; diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 147667b..f73f707 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -148,7 +148,7 @@ static NTSTATUS add_work_item_to_queue(struct work_item *work_item) { HANDLE sem; status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, LONG_MAX); - if (interlocked_cmpxchg_ptr( (PVOID *)&work_item_event, (PVOID)sem, 0 )) + if (interlocked_cmpxchg_ptr( (PVOID *)&work_item_event, sem, 0 )) NtClose(sem); /* somebody beat us to it */ } else

1 0