December 2007 - Wine-Commits

Jacek Caban : urlmon: Fixed protocol tests.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 0d869d539fe67166f27e42ba688f59742bcd1529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d869d539fe67166f27e42ba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:41:57 2007 +0100 urlmon: Fixed protocol tests. --- dlls/urlmon/bindprot.c | 2 +- dlls/urlmon/tests/protocol.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 13a3b0a..c2033fc 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -443,7 +443,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); - return S_OK; + return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); } static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 00335b3..8c85ad5 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -393,8 +393,6 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!*szStatusText, "wrong szStatusText\n"); - }else { - ok(szStatusText == NULL, "szStatusText != NULL\n"); } break; case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: @@ -460,7 +458,10 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR } SetEvent(event_complete); } + }else { + CHECK_EXPECT(ReportData); } + return S_OK; } @@ -736,9 +737,11 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, "ReportProgress(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE) failed: %08x\n", hres); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + SET_EXPECT(ReportData); hres = IInternetProtocolSink_ReportData(pOIProtSink, BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION, 13, 13); ok(hres == S_OK, "ReportData failed: %08x\n", hres); + CHECK_CALLED(ReportData); SET_EXPECT(ReportResult); hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL);

1 0

Jeremy White : wintab32: Do not offset the physical device id by the cursor number.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: ee0554b737b817c3009e33e764f976464590809f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0554b737b817c3009e33e76… Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Dec 23 10:55:25 2007 -0600 wintab32: Do not offset the physical device id by the cursor number. --- dlls/winex11.drv/wintab.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index f0ded3d..5f7beb3 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -1096,7 +1096,6 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) { DWORD id; id = tgtcursor->PHYSID; - id += (wCategory - WTI_CURSORS); rc = CopyTabletData(lpOutput,&id,sizeof(DWORD)); } break;

1 0

Alexander Dorofeyev : ole32: Fix wrong timeout check.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 188ef4e4f93c3610c7ddacacbcd0302228bdaf9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=188ef4e4f93c3610c7ddacacb… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Dec 24 02:23:06 2007 -0800 ole32: Fix wrong timeout check. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5339db2..6c837a1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3429,7 +3429,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, DWORD now = GetTickCount(); DWORD res; - if ((dwTimeout != INFINITE) && (start_time + dwTimeout >= now)) + if (now - start_time > dwTimeout) { hr = RPC_S_CALLPENDING; break;

1 0

Alistair Leslie-Hughes : msxml3: Fix memory leaks in tests.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 3b43ea73ef6961bf9e5e0054663adbbfbad2fe36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b43ea73ef6961bf9e5e00546… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 24 12:52:52 2007 +1100 msxml3: Fix memory leaks in tests. --- dlls/msxml3/tests/domdoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8b4f546..c226ad3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -750,6 +750,7 @@ todo_wine r = IXMLDOMNode_get_baseName( next, &str ); ok( r == S_FALSE, "get_baseName returned wrong code\n"); ok( str == NULL, "basename was wrong\n"); + SysFreeString(str); } else ok( FALSE, "no next\n"); @@ -840,6 +841,7 @@ todo_wine r = IXMLDOMNode_get_baseName( node, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); ok( lstrcmpW(str,szbs) == 0, "basename was wrong\n"); + SysFreeString(str); } else ok( FALSE, "no node\n");

1 0

Rob Shearman : widl: Fix the generation of temporary variables for declared arrays.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 7f3abe7757d799052bfb0dd2bd2e3260a8e7f18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3abe7757d799052bfb0dd2b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 22 01:40:05 2007 +0000 widl: Fix the generation of temporary variables for declared arrays. These need to include their array part so use var->type instead of var->ref->type. --- tools/widl/typegen.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d245c97..ea7e317 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3073,7 +3073,8 @@ void declare_stub_args( FILE *file, int indent, const func_t *func ) if (!in_attr && !var->type->size_is && !is_string) { print_file(file, indent, ""); - write_type_decl(file, var->type->ref, "_W%u", i++); + write_type_decl(file, var->type->declarray ? var->type : var->type->ref, + "_W%u", i++); fprintf(file, ";\n"); }

1 0

Andrew Talbot : msvcrt: Remove unneeded cast.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: edaa0fbc1391d1a575c53c6e075b32ee52e8e240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edaa0fbc1391d1a575c53c6e0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 17:05:36 2007 +0000 msvcrt: Remove unneeded cast. --- dlls/msvcrt/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8bacffa..b4ccdc0 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2223,7 +2223,7 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) } else j = MSVCRT__filbuf(file); if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) - || ((j != '\r') || (file->_cnt && ((char *)file->_ptr)[0] != '\n'))) + || ((j != '\r') || (file->_cnt && file->_ptr[0] != '\n'))) return j; } while(1); }

1 0

Andrew Talbot : msi: Remove unneeded cast.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 15d6436295c9b41a8fff91d9c9bdae5f97c4e726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d6436295c9b41a8fff91d9c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 17:05:33 2007 +0000 msi: Remove unneeded cast. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 4cc5ed4..f56702d 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -585,7 +585,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, if (value!=NULL) { LPBYTE nd2; - TRACE("value %s, chunk %i size %i\n",debugstr_w((LPWSTR)value), + TRACE("value %s, chunk %i size %i\n",debugstr_w(value), chunk, size); if (size) nd2= msi_realloc(newdata,(size + chunk));

1 0

Eric Pouech : valgrind: Made Wine compliant will latest Valgrind macros ( the one removed from 3.3.0 and deprecated since 3.2.0).
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: aff968fb472efd773b2c84d081d5a38429a01ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff968fb472efd773b2c84d08… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 23 14:57:36 2007 +0100 valgrind: Made Wine compliant will latest Valgrind macros (the one removed from 3.3.0 and deprecated since 3.2.0). --- dlls/ntdll/heap.c | 16 ++++++++++++---- dlls/ntdll/signal_i386.c | 4 +++- loader/kthread.c | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0c80f83..198c5b1 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -140,7 +140,9 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, DWORD flags, LPCVOID block, BOOL qu static inline void mark_block_free( void *ptr, SIZE_T size ) { if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); -#ifdef VALGRIND_MAKE_NOACCESS +#if defined(VALGRIND_MAKE_MEM_NOACCESS) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); +#elif defined( VALGRIND_MAKE_NOACCESS) VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); #endif } @@ -148,7 +150,9 @@ static inline void mark_block_free( void *ptr, SIZE_T size ) /* mark a block of memory as initialized for debugging purposes */ static inline void mark_block_initialized( void *ptr, SIZE_T size ) { -#ifdef VALGRIND_MAKE_READABLE +#if defined(VALGRIND_MAKE_MEM_DEFINED) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size )); +#elif defined(VALGRIND_MAKE_READABLE) VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size )); #endif } @@ -156,13 +160,17 @@ static inline void mark_block_initialized( void *ptr, SIZE_T size ) /* mark a block of memory as uninitialized for debugging purposes */ static inline void mark_block_uninitialized( void *ptr, SIZE_T size ) { -#ifdef VALGRIND_MAKE_WRITABLE +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); +#elif defined(VALGRIND_MAKE_WRITABLE) VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); #endif if (TRACE_ON(heap) || WARN_ON(heap)) { memset( ptr, ARENA_INUSE_FILLER, size ); -#ifdef VALGRIND_MAKE_WRITABLE +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); +#elif defined(VALGRIND_MAKE_WRITABLE) /* make it uninitialized to valgrind again */ VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); #endif diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 993936e..f70544d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -936,7 +936,9 @@ static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func fun } stack--; /* push the stack_layout structure */ -#ifdef HAVE_VALGRIND_MEMCHECK_H +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack)); +#elif defined(VALGRIND_MAKE_WRITABLE) VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); #endif stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ diff --git a/loader/kthread.c b/loader/kthread.c index 2b64e27..efffd99 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -150,7 +150,7 @@ static inline void writejump( const char *symbol, void *dest ) *(int *)(addr+1) = (unsigned char *)dest - (addr + 5); mprotect((void*)((unsigned int)addr & ~(getpagesize()-1)), 5, PROT_READ|PROT_EXEC); -# ifdef HAVE_VALGRIND_MEMCHECK_H +# ifdef VALGRIND_DISCARD_TRANSLATIONS VALGRIND_DISCARD_TRANSLATIONS( addr, 5 ); # endif #endif /* __GLIBC__ && __i386__ */

1 0

Johannes Stezenbach : ws2_32: Set *res = NULL for error return from WS_getaddrinfo().
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: ca4d35fe4819957fa9a4aa4b73f255f2f836e3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4d35fe4819957fa9a4aa4b7… Author: Johannes Stezenbach <js(a)sig21.net> Date: Sat Dec 22 23:29:55 2007 +0100 ws2_32: Set *res = NULL for error return from WS_getaddrinfo(). --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 12024f5..f1ea825 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3480,6 +3480,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr freeaddrinfo(unixaires); } else { result = convert_eai_u2w(result); + *res = NULL; } return result;

1 0

Stefan Leichter : gdiplus: Partly implement GdipCreateFromHDC2
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: bfffb4f4616cb28dbc346ac058be5f630056cb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfffb4f4616cb28dbc346ac05… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Dec 23 10:56:32 2007 +0100 gdiplus: Partly implement GdipCreateFromHDC2 --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 607ac6a..796b7cb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -89,7 +89,7 @@ @ stub GdipCreateFontFromDC @ stdcall GdipCreateFontFromLogfontA(ptr ptr ptr) @ stdcall GdipCreateFontFromLogfontW(ptr ptr ptr) -@ stub GdipCreateFromHDC2 +@ stdcall GdipCreateFromHDC2(long long ptr) @ stdcall GdipCreateFromHDC(long ptr) @ stdcall GdipCreateFromHWND(long ptr) @ stub GdipCreateFromHWNDICM diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c69c0e5..65e7151 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -745,8 +745,18 @@ end: GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { + return GdipCreateFromHDC2(hdc, NULL, graphics); +} + +GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **graphics) +{ GpStatus retval; + if(hDevice != NULL) { + FIXME("Don't know how to hadle parameter hDevice\n"); + return NotImplemented; + } + if(hdc == NULL) return OutOfMemory; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 05ed742..caf3532 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -51,6 +51,7 @@ GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); +GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF*,GDIPCONST GpPointF*, ARGB,ARGB,GpWrapMode,GpLineGradient**);

1 0