January 2011 - Wine-commits

Alexander Scott-Johns : notepad: Load UTF-8 encoding name from resources instead of using GetCPInfoEx.
by Alexandre Julliard 31 Jan '11

31 Jan '11

1 0

Eric Pouech : winedump: Added definition and dumping of thread local variables.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 5b4e192aca75d338181e6f262a0f39e1731e142a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4e192aca75d338181e6f262… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:37:58 2011 +0100 winedump: Added definition and dumping of thread local variables. --- include/wine/mscvpdb.h | 32 ++++++++++++++++++++++++++++++++ tools/winedump/msc.c | 23 +++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index e72bee5..4755c5a 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1554,6 +1554,36 @@ union codeview_symbol short int id; unsigned int offset; unsigned short segment; + unsigned short symtype; + struct p_string p_name; + } thread_v1; + + struct + { + short int len; + short int id; + unsigned int symtype; + unsigned int offset; + unsigned short segment; + struct p_string p_name; + } thread_v2; + + struct + { + short int len; + short int id; + unsigned int symtype; + unsigned int offset; + unsigned short segment; + char name[1]; + } thread_v3; + + struct + { + short int len; + short int id; + unsigned int offset; + unsigned short segment; } ssearch_v1; struct @@ -1646,6 +1676,8 @@ union codeview_symbol #define S_LPROC_V3 0x110F #define S_GPROC_V3 0x1110 #define S_REGREL_V3 0x1111 +#define S_LTHREAD_V3 0x1112 +#define S_GTHREAD_V3 0x1113 #define S_MSTOOL_V3 0x1116 /* compiler command line options and build information */ #define S_PUB_FUNC1_V3 0x1125 /* didn't get the difference between the two */ #define S_PUB_FUNC2_V3 0x1127 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5b276fb..950eb59 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1352,6 +1352,29 @@ int codeview_dump_symbols(const void* root, unsigned long size) *(const unsigned*)((const char*)sym + 4), (const char*)sym + 8); break; + case S_LTHREAD_V1: + case S_GTHREAD_V1: + printf("\tS-Thread %s Var V1 '%s' seg=%04x offset=%08x type=%x\n", + sym->generic.id == S_LTHREAD_V1 ? "global" : "local", + p_string(&sym->thread_v1.p_name), + sym->thread_v1.segment, sym->thread_v1.offset, sym->thread_v1.symtype); + break; + + case S_LTHREAD_V2: + case S_GTHREAD_V2: + printf("\tS-Thread %s Var V2 '%s' seg=%04x offset=%08x type=%x\n", + sym->generic.id == S_LTHREAD_V2 ? "global" : "local", + p_string(&sym->thread_v2.p_name), + sym->thread_v2.segment, sym->thread_v2.offset, sym->thread_v2.symtype); + break; + + case S_LTHREAD_V3: + case S_GTHREAD_V3: + printf("\tS-Thread %s Var V3 '%s' seg=%04x offset=%08x type=%x\n", + sym->generic.id == S_LTHREAD_V3 ? "global" : "local", sym->thread_v3.name, + sym->thread_v3.segment, sym->thread_v3.offset, sym->thread_v3.symtype); + break; + default: printf(">>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Eric Pouech : dbghelp: Added support for variables in thread storage.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 031cce8e77b4e153fccd966ad36e07baaa6ae6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031cce8e77b4e153fccd966ad… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:38:04 2011 +0100 dbghelp: Added support for variables in thread storage. --- dlls/dbghelp/coff.c | 8 ++++++-- dlls/dbghelp/dbghelp_private.h | 8 +++++--- dlls/dbghelp/dwarf.c | 4 ++-- dlls/dbghelp/elf_module.c | 9 +++++++-- dlls/dbghelp/macho_module.c | 7 ++++++- dlls/dbghelp/msc.c | 6 +++++- dlls/dbghelp/pe_module.c | 1 + dlls/dbghelp/stabs.c | 12 ++++++++---- dlls/dbghelp/symbol.c | 23 +++++++++++++++++------ 9 files changed, 57 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=031cce8e77b4e153fccd9…

1 0

Eric Pouech : dbghelp: Properly declare variables with thread storage from codeview debug format.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 935ac12d04db44861188648571290ba314895570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935ac12d04db4486118864857… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:38:15 2011 +0100 dbghelp: Properly declare variables with thread storage from codeview debug format. --- dlls/dbghelp/msc.c | 65 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 7bd9fc4..5c630a0 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1523,17 +1523,16 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, struct symt_compiland* compiland, const char* name, unsigned segment, unsigned offset, - unsigned symtype, BOOL is_local, BOOL force) + unsigned symtype, BOOL is_local, BOOL in_tls, BOOL force) { if (name && *name) { - unsigned long address = codeview_get_address(msc_dbg, segment, offset); struct location loc; - loc.kind = loc_absolute; + loc.kind = in_tls ? loc_tlsrel : loc_absolute; loc.reg = 0; - loc.offset = address; - if (force || !symt_find_nearest(msc_dbg->module, address)) + loc.offset = in_tls ? offset : codeview_get_address(msc_dbg, segment, offset); + if (force || in_tls || !symt_find_nearest(msc_dbg->module, loc.offset)) { symt_new_global_variable(msc_dbg->module, compiland, name, is_local, loc, 0, @@ -1576,21 +1575,44 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root if (do_globals) codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->data_v1.p_name), sym->data_v1.segment, sym->data_v1.offset, sym->data_v1.symtype, - sym->generic.id == S_LDATA_V1, TRUE); + sym->generic.id == S_LDATA_V1, FALSE, TRUE); break; case S_GDATA_V2: case S_LDATA_V2: if (do_globals) codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->data_v2.p_name), sym->data_v2.segment, sym->data_v2.offset, sym->data_v2.symtype, - sym->generic.id == S_LDATA_V2, TRUE); + sym->generic.id == S_LDATA_V2, FALSE, TRUE); break; case S_GDATA_V3: case S_LDATA_V3: if (do_globals) codeview_add_variable(msc_dbg, compiland, sym->data_v3.name, sym->data_v3.segment, sym->data_v3.offset, sym->data_v3.symtype, - sym->generic.id == S_LDATA_V3, TRUE); + sym->generic.id == S_LDATA_V3, FALSE, TRUE); + break; + + /* variables with thread storage */ + case S_GTHREAD_V1: + case S_LTHREAD_V1: + if (do_globals) + codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->thread_v1.p_name), + sym->thread_v1.segment, sym->thread_v1.offset, sym->thread_v1.symtype, + sym->generic.id == S_LTHREAD_V1, TRUE, TRUE); + break; + case S_GTHREAD_V2: + case S_LTHREAD_V2: + if (do_globals) + codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->thread_v2.p_name), + sym->thread_v2.segment, sym->thread_v2.offset, sym->thread_v2.symtype, + sym->generic.id == S_LTHREAD_V2, TRUE, TRUE); + break; + case S_GTHREAD_V3: + case S_LTHREAD_V3: + if (do_globals) + codeview_add_variable(msc_dbg, compiland, sym->thread_v3.name, + sym->thread_v3.segment, sym->thread_v3.offset, sym->thread_v3.symtype, + sym->generic.id == S_LTHREAD_V3, TRUE, TRUE); break; /* Public symbols */ @@ -2026,20 +2048,41 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT case S_LDATA_V1: codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->data_v1.p_name), sym->data_v1.segment, sym->data_v1.offset, sym->data_v1.symtype, - sym->generic.id == S_LDATA_V1, FALSE); + sym->generic.id == S_LDATA_V1, FALSE, FALSE); break; case S_GDATA_V2: case S_LDATA_V2: codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->data_v2.p_name), sym->data_v2.segment, sym->data_v2.offset, sym->data_v2.symtype, - sym->generic.id == S_LDATA_V2, FALSE); + sym->generic.id == S_LDATA_V2, FALSE, FALSE); break; case S_GDATA_V3: case S_LDATA_V3: codeview_add_variable(msc_dbg, compiland, sym->data_v3.name, sym->data_v3.segment, sym->data_v3.offset, sym->data_v3.symtype, - sym->generic.id == S_LDATA_V3, FALSE); + sym->generic.id == S_LDATA_V3, FALSE, FALSE); + break; + + /* variables with thread storage */ + case S_GTHREAD_V1: + case S_LTHREAD_V1: + codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->thread_v1.p_name), + sym->thread_v1.segment, sym->thread_v1.offset, sym->thread_v1.symtype, + sym->generic.id == S_LTHREAD_V1, TRUE, FALSE); break; + case S_GTHREAD_V2: + case S_LTHREAD_V2: + codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->thread_v2.p_name), + sym->thread_v2.segment, sym->thread_v2.offset, sym->thread_v2.symtype, + sym->generic.id == S_LTHREAD_V2, TRUE, FALSE); + break; + case S_GTHREAD_V3: + case S_LTHREAD_V3: + codeview_add_variable(msc_dbg, compiland, sym->thread_v3.name, + sym->thread_v3.segment, sym->thread_v3.offset, sym->thread_v3.symtype, + sym->generic.id == S_LTHREAD_V3, TRUE, FALSE); + break; + /* * These are special, in that they are always followed by an * additional length-prefixed string which is *not* included

1 0

Eric Pouech : winedbg: Added support for variables with thread storage.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: f9e1943de8279755d60ad3476f6bc8e378f5f442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e1943de8279755d60ad3476… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:38:21 2011 +0100 winedbg: Added support for variables with thread storage. --- programs/winedbg/symbol.c | 49 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 60e1c55..6b689c2 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -130,6 +130,50 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, lvalue->cookie = DLV_TARGET; lvalue->addr.Offset = base + sym->Address; } + else if (sym->Flags & SYMFLAG_TLSREL) + { + PROCESS_BASIC_INFORMATION pbi; + THREAD_BASIC_INFORMATION tbi; + DWORD_PTR addr; + PEB peb; + PEB_LDR_DATA ldr_data; + PLIST_ENTRY head, current; + LDR_MODULE ldr_module; + unsigned tlsindex = -1; + + if (NtQueryInformationProcess(dbg_curr_process->handle, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL) || + NtQueryInformationThread(dbg_curr_thread->handle, ThreadBasicInformation, + &tbi, sizeof(tbi), NULL)) + { + tls_error: + if (buffer) snprintf(buffer, sz, "Cannot read TLS address\n"); + return FALSE; + } + addr = (DWORD_PTR)&(((TEB*)tbi.TebBaseAddress)->ThreadLocalStoragePointer); + if (!dbg_read_memory((void*)addr, &addr, sizeof(addr)) || + !dbg_read_memory(pbi.PebBaseAddress, &peb, sizeof(peb)) || + !dbg_read_memory(peb.LdrData, &ldr_data, sizeof(ldr_data))) + goto tls_error; + current = ldr_data.InLoadOrderModuleList.Flink; + head = &((PEB_LDR_DATA*)peb.LdrData)->InLoadOrderModuleList; + do + { + if (!dbg_read_memory(CONTAINING_RECORD(current, LDR_MODULE, InLoadOrderModuleList), + &ldr_module, sizeof(ldr_module))) goto tls_error; + if ((DWORD_PTR)ldr_module.BaseAddress == sym->ModBase) + { + tlsindex = ldr_module.TlsIndex; + break; + } + current = ldr_module.InLoadOrderModuleList.Flink; + } while (current != head); + + addr += tlsindex * sizeof(DWORD_PTR); + if (!dbg_read_memory((void*)addr, &addr, sizeof(addr))) goto tls_error; + lvalue->cookie = DLV_TARGET; + lvalue->addr.Offset = addr + sym->Address; + } else { lvalue->cookie = DLV_TARGET; @@ -177,10 +221,11 @@ static BOOL CALLBACK sgv_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) sgv->name, NUMDBGV); return FALSE; } - WINE_TRACE("==> %s %s%s%s%s%s%s%s\n", - sym->Name, + WINE_TRACE("==> %s %s%s%s%s%s%s%s%s\n", + sym->Name, (sym->Flags & SYMFLAG_FUNCTION) ? "func " : "", (sym->Flags & SYMFLAG_FRAMEREL) ? "framerel " : "", + (sym->Flags & SYMFLAG_TLSREL) ? "tlsrel " : "", (sym->Flags & SYMFLAG_REGISTER) ? "register " : "", (sym->Flags & SYMFLAG_REGREL) ? "regrel " : "", (sym->Flags & SYMFLAG_PARAMETER) ? "param " : "",

1 0

Alexandre Julliard : ntdll: Fix frame address check in RtlCaptureStackBackTrace to match what RtlUnwind does .
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: c865b3f8e0ba194ff0178c23cc97f6a7668cb5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c865b3f8e0ba194ff0178c23c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 14:18:30 2011 +0100 ntdll: Fix frame address check in RtlCaptureStackBackTrace to match what RtlUnwind does. --- dlls/ntdll/signal_i386.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index aff4509..f86c810 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2433,14 +2433,16 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, while (skip--) { if (((void *)frame < NtCurrentTeb()->Tib.StackLimit) || - ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase)) return 0; + ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase) || + ((ULONG_PTR)frame & 3)) return 0; frame = (ULONG *)*frame; } for (i = 0; i < count; i++) { if (((void *)frame < NtCurrentTeb()->Tib.StackLimit) || - ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase)) break; + ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase) || + ((ULONG_PTR)frame & 3)) break; buffer[i] = (void *)frame[1]; if (hash) *hash += frame[1]; frame = (ULONG *)*frame;

1 0

Detlef Riekenberg : msvcrt: Use the _set_error_mode value to switch between a dialogbox and stderr for C runtime messages .
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 49a8bb0aa078d7e46193f4d08e0950c377ab06bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a8bb0aa078d7e46193f4d08… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 30 23:34:38 2011 +0100 msvcrt: Use the _set_error_mode value to switch between a dialogbox and stderr for C runtime messages. --- dlls/msvcrt/errno.c | 29 ----------------------------- dlls/msvcrt/exit.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 70a895c..3f9f300 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -407,35 +407,6 @@ MSVCRT_wchar_t* CDECL __wcserror(const MSVCRT_wchar_t* str) } /****************************************************************************** - * _set_error_mode (MSVCRT.@) - * - * Set the error mode, which describes where the C run-time writes error - * messages. - * - * PARAMS - * mode - the new error mode - * - * RETURNS - * The old error mode. - * - * TODO - * This function does not have a proper implementation; the error mode is - * never used. - */ -int CDECL _set_error_mode(int mode) -{ - static int current_mode = MSVCRT__OUT_TO_DEFAULT; - - const int old = current_mode; - if ( MSVCRT__REPORT_ERRMODE != mode ) { - current_mode = mode; - FIXME("dummy implementation (old mode: %d, new mode: %d)\n", - old, mode); - } - return old; -} - -/****************************************************************************** * _seterrormode (MSVCRT.@) */ void CDECL _seterrormode(int mode) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index ac7e9b3..6e5a58a 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -40,6 +40,7 @@ extern int MSVCRT_app_type; extern char *MSVCRT__pgmptr; static unsigned int MSVCRT_abort_behavior = MSVCRT__WRITE_ABORT_MSG | MSVCRT__CALL_REPORTFAULT; +static int MSVCRT_error_mode = MSVCRT__OUT_TO_DEFAULT; void (*CDECL _aexit_rtn)(int) = MSVCRT__exit; @@ -134,8 +135,9 @@ static void DoMessageBox(LPCSTR lead, LPCSTR message) void CDECL _amsg_exit(int errnum) { TRACE("(%d)\n", errnum); - /* FIXME: text for the error number. */ - if (MSVCRT_app_type == 2) + + if ((MSVCRT_error_mode == MSVCRT__OUT_TO_MSGBOX) || + ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2))) { char text[32]; sprintf(text, "Error: R60%d",errnum); @@ -155,7 +157,8 @@ void CDECL MSVCRT_abort(void) if (MSVCRT_abort_behavior & MSVCRT__WRITE_ABORT_MSG) { - if (MSVCRT_app_type == 2) + if ((MSVCRT_error_mode == MSVCRT__OUT_TO_MSGBOX) || + ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2))) { DoMessageBox("Runtime error!", "abnormal program termination"); } @@ -190,7 +193,8 @@ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int m void CDECL MSVCRT__assert(const char* str, const char* file, unsigned int line) { TRACE("(%s,%s,%d)\n",str,file,line); - if (MSVCRT_app_type == 2) + if ((MSVCRT_error_mode == MSVCRT__OUT_TO_MSGBOX) || + ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2))) { char text[2048]; snprintf(text, sizeof(text), "File: %s\nLine: %d\n\nExpression: \"%s\"", file, line, str); @@ -296,3 +300,25 @@ void CDECL _purecall(void) purecall_handler(); _amsg_exit( 25 ); } + +/****************************************************************************** + * _set_error_mode (MSVCRT.@) + * + * Set the error mode, which describes where the C run-time writes error messages. + * + * PARAMS + * mode - the new error mode + * + * RETURNS + * The old error mode. + * + */ +int CDECL _set_error_mode(int mode) +{ + + const int old = MSVCRT_error_mode; + if ( MSVCRT__REPORT_ERRMODE != mode ) { + MSVCRT_error_mode = mode; + } + return old; +}

1 0

Alexandre Julliard : dbghelp: Fix an uninitialized return value.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: daab2c114d7acc50238167f2fe816ed5fd26cfed URL: http://source.winehq.org/git/wine.git/?a=commit;h=daab2c114d7acc50238167f2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 15:36:23 2011 +0100 dbghelp: Fix an uninitialized return value. --- dlls/dbghelp/source.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index a5bb86f..5f12b9f 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -87,11 +87,11 @@ static unsigned source_find(const char* name) */ unsigned source_new(struct module* module, const char* base, const char* name) { - unsigned ret; + unsigned ret = -1; const char* full; char* tmp = NULL; - if (!name) return (unsigned)-1; + if (!name) return ret; if (!base || *name == '/') full = name; else @@ -99,7 +99,7 @@ unsigned source_new(struct module* module, const char* base, const char* name) unsigned bsz = strlen(base); tmp = HeapAlloc(GetProcessHeap(), 0, bsz + 1 + strlen(name) + 1); - if (!tmp) return (unsigned)-1; + if (!tmp) return ret; full = tmp; strcpy(tmp, base); if (tmp[bsz - 1] != '/') tmp[bsz++] = '/';

1 0

Alexandre Julliard : ntdll/tests: Avoid sizeof in a trace.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 852d9675bcd5b10819a0a7dafe09e459de051d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852d9675bcd5b10819a0a7daf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 15:36:32 2011 +0100 ntdll/tests: Avoid sizeof in a trace. --- dlls/ntdll/tests/file.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index aa599ed..c473262 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1547,8 +1547,7 @@ todo_wine ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); ok(ffvi->SupportsObjects == 1,"expected 1, got %d\n", ffvi->SupportsObjects); } - ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "expected %d, got %d\n", - lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), ffvi->VolumeLabelLength); + ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %d\n", ffvi->VolumeLabelLength); trace("VolumeSerialNumber: %x VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel));

1 0

Alexandre Julliard : opencl: Avoid size_t in traces.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 9302045ae64702a6dba25c6037234c7b24fb2cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9302045ae64702a6dba25c603… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 15:36:45 2011 +0100 opencl: Avoid size_t in traces. --- dlls/opencl/opencl.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 62e2355..03acb48 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -53,10 +53,10 @@ cl_int WINAPI wine_clGetPlatformIDs(cl_uint num_entries, cl_platform_id *platfor } cl_int WINAPI wine_clGetPlatformInfo(cl_platform_id platform, cl_platform_info param_name, - size_t param_value_size, void * param_value, size_t * param_value_size_ret) + SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret) { cl_int ret; - TRACE("(%p, 0x%x, %d, %p, %p)\n", platform, param_name, param_value_size, param_value, param_value_size_ret); + TRACE("(%p, 0x%x, %ld, %p, %p)\n", platform, param_name, param_value_size, param_value, param_value_size_ret); /* Hide all extensions. * TODO: Add individual extension support as needed. @@ -83,7 +83,7 @@ cl_int WINAPI wine_clGetPlatformInfo(cl_platform_id platform, cl_platform_info p ret = clGetPlatformInfo(platform, param_name, param_value_size, param_value, param_value_size_ret); } - TRACE("(%p, 0x%x, %d, %p, %p)=%d\n", platform, param_name, param_value_size, param_value, param_value_size_ret, ret); + TRACE("(%p, 0x%x, %ld, %p, %p)=%d\n", platform, param_name, param_value_size, param_value, param_value_size_ret, ret); return ret; } @@ -102,10 +102,10 @@ cl_int WINAPI wine_clGetDeviceIDs(cl_platform_id platform, cl_device_type device } cl_int WINAPI wine_clGetDeviceInfo(cl_device_id device, cl_device_info param_name, - size_t param_value_size, void * param_value, size_t * param_value_size_ret) + SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret) { cl_int ret; - TRACE("(%p, 0x%x, %d, %p, %p)\n",device, param_name, param_value_size, param_value, param_value_size_ret); + TRACE("(%p, 0x%x, %ld, %p, %p)\n",device, param_name, param_value_size, param_value, param_value_size_ret); /* Hide all extensions. * TODO: Add individual extension support as needed. @@ -139,7 +139,7 @@ cl_int WINAPI wine_clGetDeviceInfo(cl_device_id device, cl_device_info param_nam *caps &= ~CL_EXEC_NATIVE_KERNEL; } - TRACE("(%p, 0x%x, %d, %p, %p)=%d\n",device, param_name, param_value_size, param_value, param_value_size_ret, ret); + TRACE("(%p, 0x%x, %ld, %p, %p)=%d\n",device, param_name, param_value_size, param_value, param_value_size_ret, ret); return ret; } @@ -156,7 +156,7 @@ typedef struct static void context_fn_notify(const char *errinfo, const void *private_info, size_t cb, void *user_data) { CONTEXT_CALLBACK *ccb; - TRACE("(%s, %p, %d, %p)\n", errinfo, private_info, cb, user_data); + TRACE("(%s, %p, %ld, %p)\n", errinfo, private_info, (SIZE_T)cb, user_data); ccb = (CONTEXT_CALLBACK *) user_data; if(ccb->pfn_notify) ccb->pfn_notify(errinfo, private_info, cb, ccb->user_data); TRACE("Callback COMPLETED\n"); @@ -223,12 +223,12 @@ cl_int WINAPI wine_clReleaseContext(cl_context context) } cl_int WINAPI wine_clGetContextInfo(cl_context context, cl_context_info param_name, - size_t param_value_size, void * param_value, size_t * param_value_size_ret) + SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret) { cl_int ret; - TRACE("(%p, 0x%x, %d, %p, %p)\n", context, param_name, param_value_size, param_value, param_value_size_ret); + TRACE("(%p, 0x%x, %ld, %p, %p)\n", context, param_name, param_value_size, param_value, param_value_size_ret); ret = clGetContextInfo(context, param_name, param_value_size, param_value, param_value_size_ret); - TRACE("(%p, 0x%x, %d, %p, %p)=%d\n", context, param_name, param_value_size, param_value, param_value_size_ret, ret); + TRACE("(%p, 0x%x, %ld, %p, %p)=%d\n", context, param_name, param_value_size, param_value, param_value_size_ret, ret); return ret; } @@ -265,10 +265,10 @@ cl_int WINAPI wine_clReleaseCommandQueue(cl_command_queue command_queue) } cl_int WINAPI wine_clGetCommandQueueInfo(cl_command_queue command_queue, cl_command_queue_info param_name, - size_t param_value_size, void * param_value, size_t * param_value_size_ret) + SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret) { cl_int ret; - TRACE("%p, %d, %d, %p, %p\n", command_queue, param_name, param_value_size, param_value, param_value_size_ret); + TRACE("%p, %d, %ld, %p, %p\n", command_queue, param_name, param_value_size, param_value, param_value_size_ret); ret = clGetCommandQueueInfo(command_queue, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -672,14 +672,14 @@ cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem sr cl_int WINAPI wine_clEnqueueReadImage(cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, const size_t * origin, const size_t * region, - size_t row_pitch, size_t slice_pitch, void * ptr, + SIZE_T row_pitch, SIZE_T slice_pitch, void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) { cl_int ret; - TRACE("(%p, %p, %d, %p, %p, %d, %d, %p, %d, %p, %p)\n", command_queue, image, blocking_read, + TRACE("(%p, %p, %d, %p, %p, %ld, %ld, %p, %d, %p, %p)\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); ret = clEnqueueReadImage(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); - TRACE("(%p, %p, %d, %p, %p, %d, %d, %p, %d, %p, %p)=%d\n", command_queue, image, blocking_read, + TRACE("(%p, %p, %d, %p, %p, %ld, %ld, %p, %d, %p, %p)=%d\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event, ret); return ret; }

1 0