December 2008 - Wine-Commits

Alexandre Julliard : browseui: Make a function static.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 13fa728219680edeb70ce37700b6dd9306e806e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fa728219680edeb70ce3770… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:46:34 2008 +0100 browseui: Make a function static. --- dlls/browseui/progressdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 307ca28..120f072 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -115,7 +115,7 @@ static void set_progress_marquee(ProgressDialog *This) GetWindowLongW(hProgress, GWL_STYLE)|PBS_MARQUEE); } -void update_dialog(ProgressDialog *This, DWORD dwUpdate) +static void update_dialog(ProgressDialog *This, DWORD dwUpdate) { WCHAR empty[] = {0};

1 0

Alexandre Julliard : Avoid including time.h before winsock.h in tests.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: a840b6a7f8cfd19d85c950cec8dee11f42603ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a840b6a7f8cfd19d85c950cec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:28:17 2008 +0100 Avoid including time.h before winsock.h in tests. --- dlls/kernel32/tests/pipe.c | 1 - dlls/oleaut32/tests/olefont.c | 1 - dlls/oleaut32/tests/olepicture.c | 1 - dlls/oleaut32/tests/safearray.c | 1 - dlls/oleaut32/tests/varformat.c | 1 - dlls/oleaut32/tests/vartest.c | 1 - 6 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a68a813..a4b6853 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -21,7 +21,6 @@ #include <assert.h> #include <stdarg.h> #include <stdio.h> -#include <time.h> #include <windef.h> #include <winbase.h> diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 6b98768..cce1777 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -24,7 +24,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #define COBJMACROS diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 3f44696..f81c419 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #define COBJMACROS diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 969d696..0a03141 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #define COBJMACROS #include "wine/test.h" diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 12d65b6..b8de8e2 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 21eeb3f..61225e4 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : ntdll: Implemented RtlCaptureContext.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 31a641aa5942939b4fd79801bccd8bc16cb08fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a641aa5942939b4fd79801b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:23:13 2008 +0100 ntdll: Implemented RtlCaptureContext. --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/exception.c | 24 ++++++++++++++++++++++-- dlls/ntdll/ntdll.spec | 2 +- include/winnt.h | 2 ++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 808635d..8100b92 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -920,7 +920,7 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) -# @ stub RtlCaptureContext ( -> ntdll.RtlCaptureContext) +@ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext # @ stub RtlCaptureStackBackTrace ( -> ntdll.RtlCaptureStackBackTrace) @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 8aa906e..0c8ecda 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -381,6 +381,26 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL } /*********************************************************************** + * RtlCaptureContext (NTDLL.@) + */ +void WINAPI __regs_RtlCaptureContext( CONTEXT *context_out, CONTEXT *context_in ) +{ + *context_out = *context_in; +} + +/**********************************************************************/ + +#ifdef DEFINE_REGS_ENTRYPOINT +DEFINE_REGS_ENTRYPOINT( RtlCaptureContext, 4, 4 ) +#else +void WINAPI RtlCaptureContext( CONTEXT *context_out ) +{ + memset( context_out, 0, sizeof(*context_out) ); +} +#endif + + +/*********************************************************************** * RtlRaiseException (NTDLL.@) */ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) @@ -405,7 +425,7 @@ DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 4, 4 ) void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) { CONTEXT context; - memset( &context, 0, sizeof(context) ); + RtlCaptureContext( &context ); __regs_RtlRaiseException( rec, &context ); } #endif @@ -498,7 +518,7 @@ void WINAPI RtlUnwind( PVOID pEndFrame, PVOID unusedEip, PEXCEPTION_RECORD pRecord, PVOID returnEax ) { CONTEXT context; - memset( &context, 0, sizeof(context) ); + RtlCaptureContext( &context ); __regs_RtlUnwind( pEndFrame, unusedEip, pRecord, returnEax, &context ); } #endif diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 006b1fe..c94f2fb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -433,7 +433,7 @@ # @ stub RtlAssert2 @ stdcall RtlAssert(ptr ptr long long) # @ stub RtlCancelTimer -# @ stub RtlCaptureContext +@ stdcall -register RtlCaptureContext(ptr) @ stub RtlCaptureStackBackTrace # @ stub RtlCaptureStackContext @ stdcall RtlCharToInteger(ptr long ptr) diff --git a/include/winnt.h b/include/winnt.h index 90c4d3b..d8a5019 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1454,6 +1454,8 @@ typedef struct _CONTEXT typedef CONTEXT *PCONTEXT; +NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); + /* * Language IDs */

1 0

Ricardo Filipe : iccvid: Remove dead stores (llvm/clang).
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 3182a363350fc48a46e5eb2e3f04a5c2618105f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3182a363350fc48a46e5eb2e3… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Dec 3 03:43:44 2008 +0000 iccvid: Remove dead stores (llvm/clang). --- dlls/iccvid/iccvid.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 19faf1d..77328ea 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -390,13 +390,13 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, unsigned long x, y, y_bottom, frame_flags, strips, cv_width, cv_height, cnum, strip_id, chunk_id, x0, y0, x1, y1, ci, flag, mask; long len, top_size, chunk_size; - unsigned char *frm_ptr, *frm_end; + unsigned char *frm_ptr; unsigned int i, cur_strip; int d0, d1, d2, d3, frm_stride, bpp = 3; fn_cvid_v1 cvid_v1 = cvid_v1_24; fn_cvid_v4 cvid_v4 = cvid_v4_24; - x = y = 0; + y = 0; y_bottom = 0; in_buffer = buf; @@ -431,7 +431,6 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, frm_stride = width * bpp; frm_ptr = frame; - frm_end = frm_ptr + width * height * bpp; if(len != size) {

1 0

Ricardo Filipe : crypt32: Remove dead code (llvm/clang).
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: a582b389aaf97fc52225ee940ce7c483d82645dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a582b389aaf97fc52225ee940… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Dec 3 03:30:03 2008 +0000 crypt32: Remove dead code (llvm/clang). --- dlls/crypt32/object.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index df5e509..825dad5 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1723,12 +1723,11 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType, pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size))) { static const WCHAR numFmt[] = { '%','d',0 }; - static const WCHAR commaSep[] = { ',',' ',0 }; static const WCHAR colon[] = { ':',0 }; static BOOL stringsLoaded = FALSE; DWORD bytesNeeded = sizeof(WCHAR); /* space for NULL terminator */ BOOL haveAnEntry = FALSE; - LPCWSTR headingSep, distPointSep, nameSep; + LPCWSTR headingSep, nameSep; WCHAR distPointNum[11]; DWORD i; @@ -1751,13 +1750,11 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType, if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) { headingSep = crlf; - distPointSep = crlf; nameSep = colonCrlf; } else { headingSep = colonSep; - distPointSep = commaSep; nameSep = colon; }

1 0

Vincent Povirk : gdiplus: Implement GdipGetRegionHRgn for combined regions.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 28a71b3da3ab98f039cccaf13ea835ca3376eac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a71b3da3ab98f039cccaf13… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 24 17:20:00 2008 -0600 gdiplus: Implement GdipGetRegionHRgn for combined regions. --- dlls/gdiplus/region.c | 92 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/region.c | 49 +++++++++++++++++++++++ 2 files changed, 141 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 509c7ce..d28292c 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -841,6 +841,98 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap return stat; } + case CombineModeIntersect: + case CombineModeUnion: + case CombineModeXor: + case CombineModeExclude: + case CombineModeComplement: + { + HRGN left, right; + GpStatus stat; + int ret; + + stat = get_region_hrgn(element->elementdata.combine.left, graphics, &left); + if (stat != Ok) + { + *hrgn = NULL; + return stat; + } + + if (left == NULL) + { + /* existing region is infinite */ + switch (element->type) + { + case CombineModeIntersect: + return get_region_hrgn(element->elementdata.combine.right, graphics, hrgn); + case CombineModeXor: case CombineModeExclude: + FIXME("cannot exclude from an infinite region\n"); + /* fall-through */ + case CombineModeUnion: case CombineModeComplement: + *hrgn = NULL; + return Ok; + } + } + + stat = get_region_hrgn(element->elementdata.combine.right, graphics, &right); + if (stat != Ok) + { + DeleteObject(left); + *hrgn = NULL; + return stat; + } + + if (right == NULL) + { + /* new region is infinite */ + switch (element->type) + { + case CombineModeIntersect: + *hrgn = left; + return Ok; + case CombineModeXor: case CombineModeComplement: + FIXME("cannot exclude from an infinite region\n"); + /* fall-through */ + case CombineModeUnion: case CombineModeExclude: + DeleteObject(left); + *hrgn = NULL; + return Ok; + } + } + + switch (element->type) + { + case CombineModeIntersect: + ret = CombineRgn(left, left, right, RGN_AND); + break; + case CombineModeUnion: + ret = CombineRgn(left, left, right, RGN_OR); + break; + case CombineModeXor: + ret = CombineRgn(left, left, right, RGN_XOR); + break; + case CombineModeExclude: + ret = CombineRgn(left, left, right, RGN_DIFF); + break; + case CombineModeComplement: + ret = CombineRgn(left, right, left, RGN_DIFF); + break; + default: + ret = ERROR; + } + + DeleteObject(right); + + if (ret == ERROR) + { + DeleteObject(left); + *hrgn = NULL; + return GenericError; + } + + *hrgn = left; + return Ok; + } default: FIXME("GdipGetRegionHRgn unimplemented for region type=%x\n", element->type); *hrgn = NULL; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 34024be..15363f2 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -806,6 +806,10 @@ static void test_gethrgn(void) static const RECT test_rect = {10, 11, 20, 21}; static const GpRectF test_rectF = {10.0, 11.0, 10.0, 10.0}; static const RECT scaled_rect = {20, 22, 40, 42}; + static const RECT test_rect2 = {10, 21, 20, 31}; + static const GpRectF test_rect2F = {10.0, 21.0, 10.0, 10.0}; + static const RECT test_rect3 = {10, 11, 20, 31}; + static const GpRectF test_rect3F = {10.0, 11.0, 10.0, 20.0}; status = GdipCreateFromHDC(hdc, &graphics); ok(status == Ok, "status %08x\n", status); @@ -867,6 +871,51 @@ static void test_gethrgn(void) verify_region(hrgn, &scaled_rect); DeleteObject(hrgn); + status = GdipSetInfinite(region); + ok(status == Ok, "status %08x\n", status); + status = GdipCombineRegionRect(region, &test_rectF, CombineModeIntersect); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region, NULL, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &test_rect); + DeleteObject(hrgn); + + status = GdipCombineRegionRect(region, &test_rectF, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipCombineRegionRect(region, &test_rect2F, CombineModeUnion); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region, NULL, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &test_rect3); + DeleteObject(hrgn); + + status = GdipCombineRegionRect(region, &test_rect3F, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipCombineRegionRect(region, &test_rect2F, CombineModeXor); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region, NULL, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &test_rect); + DeleteObject(hrgn); + + status = GdipCombineRegionRect(region, &test_rect3F, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipCombineRegionRect(region, &test_rectF, CombineModeExclude); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region, NULL, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &test_rect2); + DeleteObject(hrgn); + + status = GdipCombineRegionRect(region, &test_rectF, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipCombineRegionRect(region, &test_rect3F, CombineModeComplement); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region, NULL, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &test_rect2); + DeleteObject(hrgn); + status = GdipDeletePath(path); ok(status == Ok, "status %08x\n", status); status = GdipDeleteRegion(region);

1 0

Kirill K. Smirnov : winecfg/audio: Properly terminate an empty list of drivers.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 95366238a0b63e83226d89ebd864059b34a48e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95366238a0b63e83226d89ebd… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Dec 4 11:51:12 2008 +0300 winecfg/audio: Properly terminate an empty list of drivers. --- programs/winecfg/audio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 78f9f57..8e966a5 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -533,8 +533,10 @@ static void findAudioDrivers(void) if (numFound) { loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER)); - } else - loadedAudioDrv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AUDIO_DRIVER)); + } else { + loadedAudioDrv = HeapAlloc(GetProcessHeap(), 0, sizeof(AUDIO_DRIVER)); + CopyMemory(&loadedAudioDrv[0], pAudioDrv, sizeof(AUDIO_DRIVER)); + } } /* check local copy of registry string for unloadable drivers */

1 0

Alexandre Julliard : quartz: Use FIELD_OFFSET instead of casting a pointer to int.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 18bf17e828c8b4d866ef3fe595034e304c109e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18bf17e828c8b4d866ef3fe59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:14:58 2008 +0100 quartz: Use FIELD_OFFSET instead of casting a pointer to int. --- dlls/quartz/memallocator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index ae25459..58c9b6c 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -55,7 +55,7 @@ typedef struct BaseMemAllocator static const IMemAllocatorVtbl BaseMemAllocator_VTable; static const IMediaSample2Vtbl StdMediaSample2_VTable; -#define AM_SAMPLE2_PROP_SIZE_WRITABLE (unsigned int)(&((AM_SAMPLE2_PROPERTIES *)0)->pbBuffer) +#define AM_SAMPLE2_PROP_SIZE_WRITABLE FIELD_OFFSET(AM_SAMPLE2_PROPERTIES, pbBuffer) #define INVALID_MEDIA_TIME (((ULONGLONG)0x7fffffff << 32) | 0xffffffff)

1 0

Alexandre Julliard : ntdll/tests: Use the correct prototype for RtlAllocateHeap/RtlReAllocateHeap.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 2e83689b77bd5c6604e03401e018a870b6db35c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e83689b77bd5c6604e03401e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:14:17 2008 +0100 ntdll/tests: Use the correct prototype for RtlAllocateHeap/RtlReAllocateHeap. --- dlls/ntdll/tests/reg.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 1525bb1..0e25c06 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -134,11 +134,11 @@ static NTSTATUS (WINAPI * pNtSetValueKey)( PHKEY, const PUNICODE_STRING, ULONG, ULONG, const PVOID, ULONG ); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); static NTSTATUS (WINAPI * pRtlCreateUnicodeString)( PUNICODE_STRING, LPCWSTR); -static NTSTATUS (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); +static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); static NTSTATUS (WINAPI * pRtlAppendUnicodeToString)(PUNICODE_STRING, PCWSTR); static NTSTATUS (WINAPI * pRtlUnicodeStringToAnsiString)(PSTRING, PUNICODE_STRING, BOOL); static NTSTATUS (WINAPI * pRtlFreeHeap)(PVOID, ULONG, PVOID); -static NTSTATUS (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); +static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*); @@ -200,7 +200,7 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN { ValueNameLength = lstrlenW(ValueName); - ValName = (LPSTR)pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); + ValName = pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); WideCharToMultiByte(0, 0, ValueName, ValueNameLength+1,ValName, ValueNameLength, 0, 0); @@ -213,12 +213,12 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN { case REG_NONE: trace("ValueType: REG_NONE\n"); - trace("ValueData: %d\n", (int)ValueData); + trace("ValueData: %p\n", ValueData); break; case REG_BINARY: trace("ValueType: REG_BINARY\n"); - trace("ValueData: %d\n", (int)ValueData); + trace("ValueData: %p\n", ValueData); break; case REG_SZ: @@ -238,7 +238,7 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN case REG_DWORD: trace("ValueType: REG_DWORD\n"); - trace("ValueData: %d\n", (int)ValueData); + trace("ValueData: %p\n", ValueData); break; }; trace("ValueLength: %d\n", (int)ValueLength); @@ -295,7 +295,7 @@ static void test_RtlQueryRegistryValues(void) PRTL_QUERY_REGISTRY_TABLE QueryTable = NULL; RelativeTo = RTL_REGISTRY_ABSOLUTE;/*Only using absolute - no need to test all relativeto variables*/ - QueryTable = (PRTL_QUERY_REGISTRY_TABLE)pRtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_QUERY_REGISTRY_TABLE)*26); + QueryTable = pRtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_QUERY_REGISTRY_TABLE)*26); pRtlZeroMemory( QueryTable, sizeof(RTL_QUERY_REGISTRY_TABLE) * 26); @@ -601,7 +601,7 @@ START_TEST(reg) if(!InitFunctionPtrs()) return; pRtlFormatCurrentUserKeyPath(&winetestpath); - winetestpath.Buffer = (PWSTR)pRtlReAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, winetestpath.Buffer, + winetestpath.Buffer = pRtlReAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, winetestpath.Buffer, winetestpath.MaximumLength + sizeof(winetest)*sizeof(WCHAR)); winetestpath.MaximumLength = winetestpath.MaximumLength + sizeof(winetest)*sizeof(WCHAR);

1 0

Alexandre Julliard : comctl32/tests: Avoid handle casts in traces.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: acdcb19cbb322eda88c801b3dee414f1e563a437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdcb19cbb322eda88c801b3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:12:29 2008 +0100 comctl32/tests: Avoid handle casts in traces. --- dlls/comctl32/tests/header.c | 6 +++--- dlls/comctl32/tests/tooltips.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index e6a2524..c0ff7cd 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -984,13 +984,13 @@ static void test_hdm_imageMessages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_SETIMAGELIST, 0, (LPARAM) hImageList); - ok(hImageListRetVal == NULL, "Expected NULL, got %d\n", (int) hImageListRetVal); + ok(hImageListRetVal == NULL, "Expected NULL, got %p\n", hImageListRetVal); hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_GETIMAGELIST, 0, 0); - ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %d\n", (int) hImageListRetVal); + ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %p\n", hImageListRetVal); hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_CREATEDRAGIMAGE, 0, 0); - ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %d\n", (int) hImageListRetVal); + ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %p\n", hImageListRetVal); ok_sequence(sequences, HEADER_SEQ_INDEX, imageMessages_seq, "imageMessages sequence testing", FALSE); diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index b3f28fd..4c708a0 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -101,8 +101,8 @@ static LRESULT CALLBACK CustomDrawWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP case WM_NOTIFY: if (((NMHDR *)lParam)->code == NM_CUSTOMDRAW) { NMTTCUSTOMDRAW *ttcd = (NMTTCUSTOMDRAW*) lParam; - ok(ttcd->nmcd.hdr.hwndFrom == g_hwnd, "Unexpected hwnd source %x (%x)\n", - (int)ttcd->nmcd.hdr.hwndFrom, (int) g_hwnd); + ok(ttcd->nmcd.hdr.hwndFrom == g_hwnd, "Unexpected hwnd source %p (%p)\n", + ttcd->nmcd.hdr.hwndFrom, g_hwnd); ok(ttcd->nmcd.hdr.idFrom == 0x1234ABCD, "Unexpected id %x\n", (int)ttcd->nmcd.hdr.idFrom); switch (ttcd->nmcd.dwDrawStage) {

1 0