January 2019 - Wine-Commits

Andrey Gusev : d3drm/tests: Add missing HRESULT.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: c04c0f26581f60bc7b1ebd579d9768f51f4bb392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c04c0f26581f60bc7b1ebd57… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Jan 27 23:49:20 2019 +0200 d3drm/tests: Add missing HRESULT. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5157952..2fb2699 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3268,7 +3268,7 @@ static void test_device_qi(void) ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr); - IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr); IDirect3DRMDevice3_Release(device3); test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));

1 0

Zebediah Figura : hal: Implement plain spinlock functions on top of DPC-level ones.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 286ef484982c96504fdf4c43f5e2d182fcd9e771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=286ef484982c96504fdf4c43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 20:45:34 2019 -0600 hal: Implement plain spinlock functions on top of DPC-level ones. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/Makefile.in | 1 + dlls/hal/hal.c | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index cc2620e..63211a1 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -1,5 +1,6 @@ MODULE = hal.dll IMPORTLIB = hal +IMPORTS = ntoskrnl C_SRCS = \ hal.c diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index fca4f23..5b3ee44 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -76,16 +76,10 @@ KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock( KSPIN_LOCK *lock ) return irql; } -static inline void small_pause(void) -{ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -} - void WINAPI KeAcquireSpinLock( KSPIN_LOCK *lock, KIRQL *irql ) { TRACE("lock %p, irql %p.\n", lock, irql); - while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) - small_pause(); + KeAcquireSpinLockAtDpcLevel( lock ); *irql = 0; } @@ -98,7 +92,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock( KSPIN_LOCK *lock, KIRQL ir void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) { TRACE("lock %p, irql %u.\n", lock, irql); - InterlockedExchangePointer( (void **)lock, 0 ); + KeReleaseSpinLockFromDpcLevel( lock ); } #endif /* __i386__ */

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeAcquireSpinLockAtDpcLevel().
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: da4291dfc535052a6d802ca6a374198104b1426c URL: https://source.winehq.org/git/wine.git/?a=commit;h=da4291dfc535052a6d802ca6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 20:45:32 2019 -0600 ntoskrnl.exe: Implement KeAcquireSpinLockAtDpcLevel(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 10 ++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 47ce683..52ffc3d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -510,7 +510,7 @@ @ stub Ke386QueryIoAccessMap @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock -@ stub KeAcquireSpinLockAtDpcLevel +@ stdcall KeAcquireSpinLockAtDpcLevel(ptr) @ stdcall -arch=arm,arm64,x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stub KeAreApcsDisabled diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index b439695..31a3ad7 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -396,6 +396,16 @@ static inline void small_pause(void) } /*********************************************************************** + * KeAcquireSpinLockAtDpcLevel (NTOSKRNL.EXE.@) + */ +void WINAPI KeAcquireSpinLockAtDpcLevel( KSPIN_LOCK *lock ) +{ + TRACE("lock %p.\n", lock); + while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) + small_pause(); +} + +/*********************************************************************** * KeReleaseSpinLockFromDpcLevel (NTOSKRNL.EXE.@) */ void WINAPI KeReleaseSpinLockFromDpcLevel( KSPIN_LOCK *lock ) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 25d7da8..ca2aa9d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1427,6 +1427,7 @@ void WINAPI KeAcquireSpinLock(KSPIN_LOCK*,KIRQL*); #define KeAcquireSpinLock( lock, irql ) *(irql) = KeAcquireSpinLockRaiseToDpc( lock ) KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK*); #endif +void WINAPI KeAcquireSpinLockAtDpcLevel(KSPIN_LOCK*); BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeReleaseSpinLockFromDpcLevel().
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: a1dfdfaf22c24524f26dad720fceaf421ec6bb78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1dfdfaf22c24524f26dad72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 20:45:31 2019 -0600 ntoskrnl.exe: Implement KeReleaseSpinLockFromDpcLevel(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 11 ++++++++++- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index bf87504..47ce683 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -594,7 +594,7 @@ @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) @ stdcall -arch=arm,arm64,x86_64 KeReleaseSpinLock(ptr long) -@ stub KeReleaseSpinLockFromDpcLevel +@ stdcall KeReleaseSpinLockFromDpcLevel(ptr) @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy @ stub KeRemoveDeviceQueue diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 475fcf1..b439695 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -386,7 +386,6 @@ void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) *lock = 0; } -#ifndef __i386__ static inline void small_pause(void) { #ifdef __x86_64__ @@ -397,6 +396,16 @@ static inline void small_pause(void) } /*********************************************************************** + * KeReleaseSpinLockFromDpcLevel (NTOSKRNL.EXE.@) + */ +void WINAPI KeReleaseSpinLockFromDpcLevel( KSPIN_LOCK *lock ) +{ + TRACE("lock %p.\n", lock); + InterlockedExchangePointer( (void **)lock, 0 ); +} + +#ifndef __i386__ +/*********************************************************************** * KeReleaseSpinLock (NTOSKRNL.EXE.@) */ void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a53c7a2..25d7da8 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1443,6 +1443,7 @@ ULONG WINAPI KeQueryTimeIncrement(void); LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); void WINAPI KeReleaseSpinLock(KSPIN_LOCK*,KIRQL); +void WINAPI KeReleaseSpinLockFromDpcLevel(KSPIN_LOCK*); LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY);

1 0

Nikolay Sivov : ole32: Implement chained IInitializeSpy support.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 645a1f8c5a3a91ddc1704acdacca1365ea092b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=645a1f8c5a3a91ddc1704acd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 07:07:52 2019 +0300 ole32: Implement chained IInitializeSpy support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 111 +++++++++++++++++++++++++++++++++---------- dlls/ole32/compobj_private.h | 17 ++++++- dlls/ole32/tests/compobj.c | 15 ++---- 3 files changed, 105 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=645a1f8c5a3a91ddc170…

1 0

Gijs Vermeulen : kernel32/tests: Add CopyFile[Ex]A NULL handling tests.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 9b7113bcecd3281d3b558bd512dcf5a015d92632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7113bcecd3281d3b558bd5… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Jan 26 22:17:54 2019 +0100 kernel32/tests: Add CopyFile[Ex]A NULL handling tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d1b76bb..b47b2b9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -738,6 +738,14 @@ static void test_CopyFileA(void) ret = CopyFileA(source, dest, FALSE); ok(ret, "CopyFileA: error %d\n", GetLastError()); + /* NULL checks */ + retok = CopyFileA(NULL, dest, TRUE); + ok(!retok && GetLastError() == ERROR_PATH_NOT_FOUND, + "CopyFileA: ret = %d, unexpected error %d\n", retok, GetLastError()); + retok = CopyFileA(source, NULL, TRUE); + ok(!retok && GetLastError() == ERROR_PATH_NOT_FOUND, + "CopyFileA: ret = %d, unexpected error %d\n", retok, GetLastError()); + /* copying from a read-locked source fails */ hfile = CreateFileA(source, GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); @@ -1174,6 +1182,13 @@ static void test_CopyFileEx(void) todo_wine ok(GetFileAttributesA(dest) == INVALID_FILE_ATTRIBUTES, "file was not deleted\n"); + retok = CopyFileExA(source, NULL, copy_progress_cb, hfile, NULL, 0); + ok(!retok, "CopyFileExA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, "expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + retok = CopyFileExA(NULL, dest, copy_progress_cb, hfile, NULL, 0); + ok(!retok, "CopyFileExA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, "expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + ret = DeleteFileA(source); ok(ret, "DeleteFileA failed with error %d\n", GetLastError()); ret = DeleteFileA(dest);

1 0

Zebediah Figura : ntoskrnl.exe/tests: Open the test file for synchronous I /O.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: e07d25c799a528c933031666278ddf5666b94372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07d25c799a528c933031666… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 26 12:53:00 2019 -0600 ntoskrnl.exe/tests: Open the test file for synchronous I/O. Especially to avoid a panic when we close the file before a write has completed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6ab5c3e..5c34b41 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -53,12 +53,10 @@ extern int CDECL _vsnprintf(char *str, size_t len, const char *format, __ms_va_l static void kvprintf(const char *format, __ms_va_list ap) { static char buffer[512]; - LARGE_INTEGER offset; IO_STATUS_BLOCK io; _vsnprintf(buffer, sizeof(buffer), format, ap); - offset.QuadPart = -1; - ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, strlen(buffer), &offset, NULL); + ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, strlen(buffer), NULL, NULL); } static void WINAPIV kprintf(const char *format, ...) @@ -522,7 +520,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) winetest_report_success = test_input->winetest_report_success; attr.ObjectName = &pathU; attr.Attributes = OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA, &attr, &io, 0, 0); + ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); test_currentprocess(); test_mdl_map();

1 0

Nikolay Sivov : usp10/tests: Add missing return value checks (Coverity).
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 64edf6f79d1523cdf68225d350762a60a0c89792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64edf6f79d1523cdf68225d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 09:41:15 2019 +0300 usp10/tests: Add missing return value checks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e907c8c..4c16df5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3019,6 +3019,7 @@ static void test_ScriptXtoX(void) WORD clust = 0; INT advance = 16; hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP failed, hr %#x.\n", hr); ok(piCP==0 && piTrailing==0,"%i should return 0(%i) and 0(%i)\n",iX, piCP,piTrailing); } for (iX = 8; iX < 16; iX++) @@ -3026,6 +3027,7 @@ static void test_ScriptXtoX(void) WORD clust = 0; INT advance = 16; hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP failed, hr %#x.\n", hr); ok(piCP==0 && piTrailing==1,"%i should return 0(%i) and 1(%i)\n",iX, piCP,piTrailing); }

1 0

Nikolay Sivov : shell32: Remove duplicated assignment (Coverity).
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 1a98e6538655cb7b6c9ad7a567f4a25d6674c309 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a98e6538655cb7b6c9ad7a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 09:33:02 2019 +0300 shell32: Remove duplicated assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/brsfolder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d771d0b..37363a1 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -647,7 +647,6 @@ static LRESULT BrsFolder_Treeview_Keydown(browse_info *info, LPNMTVKEYDOWN keydo TV_ITEMDATA *item_data; item.mask = TVIF_PARAM; - item.mask = TVIF_HANDLE|TVIF_PARAM; item.hItem = selected_item; SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); item_data = (TV_ITEMDATA *)item.lParam;

1 0

Nikolay Sivov : comctl32/rebar: Do not use global variable for debug buffer (Coverity).
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: fc87823654ccb4830d54bf91a880e82577635f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc87823654ccb4830d54bf91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:57:24 2019 +0300 comctl32/rebar: Do not use global variable for debug buffer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 20ce49b..aaa1047 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -281,6 +281,9 @@ static const char * const band_stylename[] = { "RBBS_VARIABLEHEIGHT", /* 0040 */ "RBBS_GRIPPERALWAYS", /* 0080 */ "RBBS_NOGRIPPER", /* 0100 */ + "RBBS_USECHEVRON", /* 0200 */ + "RBBS_HIDETITLE", /* 0400 */ + "RBBS_TOPALIGN", /* 0800 */ NULL }; static const char * const band_maskname[] = { @@ -296,50 +299,52 @@ static const char * const band_maskname[] = { "RBBIM_IDEALSIZE", /* 0x00000200 */ "RBBIM_LPARAM", /* 0x00000400 */ "RBBIM_HEADERSIZE", /* 0x00000800 */ + "RBBIM_CHEVRONLOCATION", /* 0x00001000 */ + "RBBIM_CHEVRONSTATE", /* 0x00002000 */ NULL }; -static CHAR line[200]; - static const WCHAR themeClass[] = { 'R','e','b','a','r',0 }; static CHAR * -REBAR_FmtStyle( UINT style) +REBAR_FmtStyle(char *buffer, UINT style) { INT i = 0; - *line = 0; + *buffer = 0; while (band_stylename[i]) { if (style & (1<<i)) { - if (*line != 0) strcat(line, " | "); - strcat(line, band_stylename[i]); + if (*buffer) strcat(buffer, " | "); + strcat(buffer, band_stylename[i]); } i++; } - return line; + return buffer; } static CHAR * -REBAR_FmtMask( UINT mask) +REBAR_FmtMask(char *buffer, UINT mask) { INT i = 0; - *line = 0; + *buffer = 0; while (band_maskname[i]) { if (mask & (1<<i)) { - if (*line != 0) strcat(line, " | "); - strcat(line, band_maskname[i]); + if (*buffer) strcat(buffer, " | "); + strcat(buffer, band_maskname[i]); } i++; } - return line; + return buffer; } static VOID REBAR_DumpBandInfo(const REBARBANDINFOW *pB) { + char buff[300]; + if( !TRACE_ON(rebar) ) return; TRACE("band info: "); if (pB->fMask & RBBIM_ID) @@ -349,9 +354,9 @@ REBAR_DumpBandInfo(const REBARBANDINFOW *pB) TRACE(", clrF=0x%06x, clrB=0x%06x", pB->clrFore, pB->clrBack); TRACE("\n"); - TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask)); + TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(buff, pB->fMask)); if (pB->fMask & RBBIM_STYLE) - TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(pB->fStyle)); + TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(buff, pB->fStyle)); if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_HEADERSIZE | RBBIM_LPARAM )) { TRACE("band info:"); if (pB->fMask & RBBIM_SIZE) @@ -373,6 +378,7 @@ REBAR_DumpBandInfo(const REBARBANDINFOW *pB) static VOID REBAR_DumpBand (const REBAR_INFO *iP) { + char buff[300]; REBAR_BAND *pB; UINT i; @@ -398,10 +404,9 @@ REBAR_DumpBand (const REBAR_INFO *iP) if (pB->fMask & RBBIM_COLORS) TRACE(" clrF=0x%06x clrB=0x%06x", pB->clrFore, pB->clrBack); TRACE("\n"); - TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask)); + TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(buff, pB->fMask)); if (pB->fMask & RBBIM_STYLE) - TRACE("band # %u: style=0x%08x (%s)\n", - i, pB->fStyle, REBAR_FmtStyle(pB->fStyle)); + TRACE("band # %u: style=0x%08x (%s)\n", i, pB->fStyle, REBAR_FmtStyle(buff, pB->fStyle)); TRACE("band # %u: xHeader=%u", i, pB->cxHeader); if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_LPARAM )) {

1 0