March 2007 - Wine-commits - list.winehq.org

Francois Gouget : wined3d: Remove space before '\n' in trace.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: e11ca0a7fd6d07eb7841558d7f92b23872943519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11ca0a7fd6d07eb7841558d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 14 09:17:46 2007 +0100 wined3d: Remove space before '\n' in trace. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ad81c8b..ec45543 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1074,7 +1074,7 @@ void blt_to_drawable(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *surface) { coords[3].x = -1; coords[3].y = -1; coords[3].z = -1; default: - ERR("Unexpected texture target \n"); + ERR("Unexpected texture target\n"); LEAVE_GL(); return; }

1 0

Alexandre Julliard : msvcrt: _initterm doesn't return anything.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: 8f097d8c9d6c0e30e570900183458ad15f4c764c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f097d8c9d6c0e30e57090018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 12:26:43 2007 +0100 msvcrt: _initterm doesn't return anything. --- dlls/msvcrt/data.c | 5 +---- dlls/msvcrt/tests/data.c | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 2511970..994e19b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -339,10 +339,9 @@ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** * /********************************************************************* * _initterm (MSVCRT.@) */ -unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) +void CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) { _INITTERMFUN* current = start; - unsigned int count=0; TRACE("(%p,%p)\n",start,end); while (current<end) @@ -352,11 +351,9 @@ unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) TRACE("Call init function %p\n",*current); (**current)(); TRACE("returned\n"); - count++; } current++; } - return count; } /********************************************************************* diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index a137819..262909e 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -32,7 +32,7 @@ #include <errno.h> typedef void (*_INITTERMFUN)(void); -static unsigned int (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); +static void (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); static int callbacked; @@ -43,8 +43,7 @@ static void initcallback(void) #define initterm_test(start, end, expected) \ callbacked = 0; \ - rc = p_initterm(start, end); \ - ok(expected == rc, "_initterm: return result mismatch: got %i, expected %i\n", rc, expected); \ + p_initterm(start, end); \ ok(expected == callbacked,"_initterm: callbacks count mismatch: got %i, expected %i\n", callbacked, expected); static void test_initterm(void)

1 0

Alexandre Julliard : ntdll: Add a wrapper to call the thread entry point for broken apps.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: 7744443febb04213cf014b007a83744a66544d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7744443febb04213cf014b007… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 12:28:38 2007 +0100 ntdll: Add a wrapper to call the thread entry point for broken apps. --- dlls/ntdll/thread.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9656331..d0871a1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -349,6 +349,26 @@ static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) return unhandled_exception_filter; } +#ifdef __i386__ +/* wrapper for apps that don't declare the thread function correctly */ +extern DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC(call_thread_entry_point, + "pushl %ebp\n\t" + "movl %esp,%ebp\n\t" + "subl $4,%esp\n\t" + "pushl 12(%ebp)\n\t" + "movl 8(%ebp),%eax\n\t" + "call *%eax\n\t" + "leave\n\t" + "ret" ); +#else +static inline DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ) +{ + LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)rtl_func; + return func( arg ); +} +#endif + /*********************************************************************** * call_thread_func * @@ -356,16 +376,15 @@ static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) */ static void DECLSPEC_NORETURN call_thread_func( PRTL_THREAD_START_ROUTINE rtl_func, void *arg ) { - LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)rtl_func; DWORD exit_code; BOOL last; MODULE_DllThreadAttach( NULL ); if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); + DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), rtl_func, arg ); - exit_code = func( arg ); + exit_code = call_thread_entry_point( rtl_func, arg ); /* send the exit code to the server */ SERVER_START_REQ( terminate_thread )

1 0

Alexandre Julliard : ntdll: Changed some Solaris defines so that we can access the signal error code.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: 7d12fbcc5bfd50ee986d94efb4307277c0900913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d12fbcc5bfd50ee986d94efb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 09:53:59 2007 +0100 ntdll: Changed some Solaris defines so that we can access the signal error code. --- dlls/ntdll/signal_i386.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 0c32374..edfa5ea 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -59,11 +59,15 @@ #include "thread.h" #include "wine/library.h" #include "ntdll_misc.h" +#include "wine/exception.h" +#include "wine/debug.h" #ifdef HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> #endif +#undef ERR /* Solaris needs to define this */ + /*********************************************************************** * signal context platform-specific definitions */ @@ -196,10 +200,7 @@ typedef struct sigcontext SIGCONTEXT; #ifdef _SCO_DS #include <sys/regset.h> #endif -/* Solaris kludge */ -#undef ERR #include <sys/ucontext.h> -#undef ERR typedef struct ucontext SIGCONTEXT; #ifdef _SCO_DS @@ -232,6 +233,9 @@ typedef struct ucontext SIGCONTEXT; #else #define ESP_sig(context) ((context)->uc_mcontext.gregs[ESP]) #endif +#ifdef ERR +#define ERROR_sig(context) ((context)->uc_mcontext.gregs[ERR]) +#endif #ifdef TRAPNO #define TRAP_sig(context) ((context)->uc_mcontext.gregs[TRAPNO]) #endif @@ -286,9 +290,6 @@ typedef ucontext_t SIGCONTEXT; #endif /* __APPLE__ */ -#include "wine/exception.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(seh); typedef int (*wine_signal_handler)(unsigned int sig); @@ -899,10 +900,10 @@ static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func fun if ((char *)stack >= (char *)get_signal_stack() && (char *)stack < (char *)get_signal_stack() + signal_stack_size) { - ERR( "nested exception on signal stack in thread %04x eip %08x esp %08x stack %p-%p\n", - GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), - (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, - NtCurrentTeb()->Tib.StackBase ); + WINE_ERR( "nested exception on signal stack in thread %04x eip %08x esp %08x stack %p-%p\n", + GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), + (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, + NtCurrentTeb()->Tib.StackBase ); server_abort_thread(1); } @@ -913,10 +914,10 @@ static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func fun UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)stack; if (diff < 4096) { - ERR( "stack overflow %u bytes in thread %04x eip %08x esp %08x stack %p-%p\n", - diff, GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), - (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, - NtCurrentTeb()->Tib.StackBase ); + WINE_ERR( "stack overflow %u bytes in thread %04x eip %08x esp %08x stack %p-%p\n", + diff, GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), + (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, + NtCurrentTeb()->Tib.StackBase ); server_abort_thread(1); } else WARN( "exception outside of stack limits in thread %04x eip %08x esp %08x stack %p-%p\n", @@ -1165,7 +1166,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default: - ERR( "Got unexpected trap %d\n", get_trap_code(context) ); + WINE_ERR( "Got unexpected trap %d\n", get_trap_code(context) ); /* fall through */ case TRAP_x86_NMI: /* NMI interrupt */ case TRAP_x86_DNA: /* Device not available exception */ @@ -1243,7 +1244,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionInformation[0] = 0; break; default: - ERR( "Got unexpected trap %d\n", get_trap_code(context) ); + WINE_ERR( "Got unexpected trap %d\n", get_trap_code(context) ); rec->ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } @@ -1485,7 +1486,7 @@ void __wine_enter_vm86( CONTEXT *context ) break; case VM86_SIGNAL: /* cannot happen because vm86_enter handles this case */ default: - ERR( "unhandled result from vm86 mode %x\n", res ); + WINE_ERR( "unhandled result from vm86 mode %x\n", res ); continue; } __regs_RtlRaiseException( &rec, context );

1 0

Alexandre Julliard : ntdll/tests: Mask reserved bits before testing dr7.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: 0963b84603dd33166e97abfc38dfc09943f98abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0963b84603dd33166e97abfc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 12:01:12 2007 +0100 ntdll/tests: Mask reserved bits before testing dr7. Also some spelling fixes. --- dlls/ntdll/tests/exception.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 58306d9..a8aa975 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -321,7 +321,7 @@ static void run_rtlraiseexception_test(DWORD exceptioncode) pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; } -static void test_rtlraiseexcpetion(void) +static void test_rtlraiseexception(void) { if (!pRtlRaiseException) { @@ -553,7 +553,7 @@ static void test_exceptions(void) res = pNtGetContextThread(GetCurrentThread(), &ctx); ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %x\n", res); ok(ctx.Dr0 == 0x42424242,"failed to set debugregister 0 to 0x42424242, got %x\n", ctx.Dr0); - ok(ctx.Dr7 == 0x155,"failed to set debugregister 7 to 0x155, got %x\n", ctx.Dr7); + ok((ctx.Dr7 & ~0xdc00) == 0x155,"failed to set debugregister 7 to 0x155, got %x\n", ctx.Dr7); /* test single stepping behavior */ got_exception = 0; @@ -644,7 +644,7 @@ static void test_debugger(void) status = pNtGetContextThread(pi.hThread, &ctx); ok(!status, "NtGetContextThread failed with 0x%x\n", status); - trace("excpetion 0x%x at %p firstchance=%d Eip=0x%x, Eax=0x%x\n", + trace("exception 0x%x at %p firstchance=%d Eip=0x%x, Eax=0x%x\n", de.u.Exception.ExceptionRecord.ExceptionCode, de.u.Exception.ExceptionRecord.ExceptionAddress, de.u.Exception.dwFirstChance, ctx.Eip, ctx.Eax); @@ -862,7 +862,7 @@ START_TEST(exception) test_prot_fault(); test_exceptions(); - test_rtlraiseexcpetion(); + test_rtlraiseexception(); test_debugger(); test_simd_exceptions();

1 0

Alexandre Julliard : ntdll: Fixed some exception codes and parameters.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: cdb833bf33f319d5063d9d548dce415bd81ce79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb833bf33f319d5063d9d548… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 12:02:43 2007 +0100 ntdll: Fixed some exception codes and parameters. --- dlls/ntdll/signal_i386.c | 17 +++++++++-------- dlls/ntdll/tests/exception.c | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index edfa5ea..df7b517 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -772,7 +772,7 @@ void set_cpu_context( const CONTEXT *context ) * Check if the fault location is a privileged instruction. * Based on the instruction emulation code in dlls/kernel/instr.c. */ -static inline int is_privileged_instr( CONTEXT86 *context ) +static inline DWORD is_privileged_instr( CONTEXT86 *context ) { const BYTE *instr; unsigned int prefix_count = 0; @@ -794,7 +794,7 @@ static inline int is_privileged_instr( CONTEXT86 *context ) case 0xf0: /* lock */ case 0xf2: /* repne */ case 0xf3: /* repe */ - if (++prefix_count >= 15) return 0; + if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION; instr++; continue; @@ -805,7 +805,7 @@ static inline int is_privileged_instr( CONTEXT86 *context ) case 0x21: /* mov drX, reg */ case 0x22: /* mov reg, crX */ case 0x23: /* mov reg drX */ - return 1; + return EXCEPTION_PRIV_INSTRUCTION; } return 0; case 0x6c: /* insb (%dx) */ @@ -824,7 +824,7 @@ static inline int is_privileged_instr( CONTEXT86 *context ) case 0xf4: /* hlt */ case 0xfa: /* cli */ case 0xfb: /* sti */ - return 1; + return EXCEPTION_PRIV_INSTRUCTION; default: return 0; } @@ -1144,16 +1144,17 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_SEGNPFLT: /* Segment not present exception */ case TRAP_x86_PROTFLT: /* General protection fault */ case TRAP_x86_UNKNOWN: /* Unknown fault code */ - if (!get_error_code(context) && is_privileged_instr( get_exception_context(rec) )) - rec->ExceptionCode = EXCEPTION_PRIV_INSTRUCTION; - else { WORD err = get_error_code(context); + if (!err && (rec->ExceptionCode = is_privileged_instr( get_exception_context(rec) ))) break; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; rec->ExceptionInformation[0] = 0; /* if error contains a LDT selector, use that as fault address */ - rec->ExceptionInformation[1] = (err & 7) == 4 ? (err & ~7) : 0xffffffff; + if ((err & 7) == 4 && !wine_ldt_is_system( err | 7 )) + rec->ExceptionInformation[1] = err & ~7; + else + rec->ExceptionInformation[1] = 0xffffffff; } break; case TRAP_x86_PAGEFLT: /* Page fault */ diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a8aa975..90aa3b6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -118,7 +118,7 @@ static const struct exception /* test overlong instruction (limit is 16 bytes) */ { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, - 0, 16, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, + 0, 16, STATUS_ILLEGAL_INSTRUCTION, 0 }, { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, 0, 15, STATUS_PRIVILEGED_INSTRUCTION, 0 },

1 0

Jason Edmeades : cmd.exe: Add dir /X support (sort of...).
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: 1497a2fec420fcef81fb31c6343fa79f43602758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1497a2fec420fcef81fb31c63… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 20:27:45 2007 +0000 cmd.exe: Add dir /X support (sort of...). --- programs/cmd/directory.c | 101 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 79 insertions(+), 22 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index d787a29..0c8c5af 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -33,7 +33,7 @@ int WCMD_dir_sort (const void *a, const void *b); void WCMD_list_directory (char *path, int level); char * WCMD_filesize64 (ULONGLONG free); char * WCMD_strrev (char *buff); - +static void WCMD_getfileowner(char *filename, char *owner, int ownerlen); extern int echo_mode; extern char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; @@ -47,7 +47,7 @@ typedef enum _DISPLAYTIME } DISPLAYTIME; static int file_total, dir_total, recurse, wide, bare, max_width, lower; -static int shortname; +static int shortname, usernames; static ULONGLONG byte_total; static DISPLAYTIME dirTime; @@ -77,6 +77,7 @@ void WCMD_directory (void) { bare = (strstr(quals, "/B") != NULL); lower = (strstr(quals, "/L") != NULL); shortname = (strstr(quals, "/X") != NULL); + usernames = (strstr(quals, "/Q") != NULL); if ((p = strstr(quals, "/T")) != NULL) { p = p + 2; @@ -98,6 +99,7 @@ void WCMD_directory (void) { /* Handle conflicting args and initialization */ if (bare || shortname) wide = FALSE; if (bare) shortname = FALSE; + if (wide) usernames = FALSE; if (wide) { if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &consoleInfo)) @@ -198,12 +200,12 @@ void WCMD_list_directory (char *search_path, int level) { lstrcpyn (real_path, search_path, (p-search_path+2)); /* Load all files into an in memory structure */ - fd = malloc (sizeof(WIN32_FIND_DATA)); + fd = HeapAlloc(GetProcessHeap(),0,sizeof(WIN32_FIND_DATA)); hff = FindFirstFile (search_path, fd); if (hff == INVALID_HANDLE_VALUE) { SetLastError (ERROR_FILE_NOT_FOUND); WCMD_print_error (); - free (fd); + HeapFree(GetProcessHeap(),0,fd); return; } do { @@ -216,7 +218,7 @@ void WCMD_list_directory (char *search_path, int level) { if (tmpLen > widest) widest = tmpLen; } - fd = realloc (fd, (entry_count+1)*sizeof(WIN32_FIND_DATA)); + fd = HeapReAlloc(GetProcessHeap(),0,fd,(entry_count+1)*sizeof(WIN32_FIND_DATA)); if (fd == NULL) { FindClose (hff); WCMD_output ("Memory Allocation Error"); @@ -235,6 +237,7 @@ void WCMD_list_directory (char *search_path, int level) { } for (i=0; i<entry_count; i++) { + char username[24]; /* /L convers all names to lower case */ if (lower) { @@ -242,6 +245,14 @@ void WCMD_list_directory (char *search_path, int level) { while ( (*p = tolower(*p)) ) ++p; } + /* /Q gets file ownership information */ + if (usernames) { + p = strrchr (search_path, '\\'); + lstrcpyn (string, search_path, (p-search_path+2)); + lstrcat (string, (fd+i)->cFileName); + WCMD_getfileowner(string, username, sizeof(username)); + } + if (dirTime == Written) { FileTimeToLocalFileTime (&(fd+i)->ftLastWriteTime, &ft); } else if (dirTime == Access) { @@ -283,13 +294,10 @@ void WCMD_list_directory (char *search_path, int level) { dir_count++; if (!bare) { - if (shortname) { - WCMD_output ("%10s %8s <DIR> %-13s%s\n", - datestring, timestring, (fd+i)->cAlternateFileName, (fd+i)->cFileName); - } else { - WCMD_output ("%10s %8s <DIR> %s\n", - datestring, timestring, (fd+i)->cFileName); - } + WCMD_output ("%10s %8s <DIR> ", datestring, timestring); + if (shortname) WCMD_output ("%-13s", (fd+i)->cAlternateFileName); + if (usernames) WCMD_output ("%-23s", username); + WCMD_output("%s\n",(fd+i)->cFileName); } else { if (!((strcmp((fd+i)->cFileName, ".") == 0) || (strcmp((fd+i)->cFileName, "..") == 0))) { @@ -303,15 +311,11 @@ void WCMD_list_directory (char *search_path, int level) { file_size.u.HighPart = (fd+i)->nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; if (!bare) { - if (shortname) { - WCMD_output ("%10s %8s %10s %-13s%s\n", - datestring, timestring, - WCMD_filesize64(file_size.QuadPart), (fd+i)->cAlternateFileName, (fd+i)->cFileName); - } else { - WCMD_output ("%10s %8s %10s %s\n", - datestring, timestring, - WCMD_filesize64(file_size.QuadPart), (fd+i)->cFileName); - } + WCMD_output ("%10s %8s %10s ", datestring, timestring, + WCMD_filesize64(file_size.QuadPart)); + if (shortname) WCMD_output ("%-13s", (fd+i)->cAlternateFileName); + if (usernames) WCMD_output ("%-23s", username); + WCMD_output("%s\n",(fd+i)->cFileName); } else { WCMD_output ("%s%s\n", recurse?real_path:"", (fd+i)->cFileName); } @@ -352,7 +356,7 @@ void WCMD_list_directory (char *search_path, int level) { WCMD_list_directory (string, 1); } } - free (fd); + HeapFree(GetProcessHeap(),0,fd); return; } @@ -411,3 +415,56 @@ int WCMD_dir_sort (const void *a, const void *b) return (lstrcmpi(((const WIN32_FIND_DATA *)a)->cFileName, ((const WIN32_FIND_DATA *)b)->cFileName)); } + +/***************************************************************************** + * WCMD_getfileowner + * + * Reverse a character string in-place (strrev() is not available under unixen :-( ). + */ +void WCMD_getfileowner(char *filename, char *owner, int ownerlen) { + + ULONG sizeNeeded = 0; + DWORD rc; + char name[MAXSTRING]; + char domain[MAXSTRING]; + + /* In case of error, return empty string */ + *owner = 0x00; + + /* Find out how much space we need for the owner security descritpor */ + GetFileSecurity(filename, OWNER_SECURITY_INFORMATION, 0, 0, &sizeNeeded); + rc = GetLastError(); + + if(rc == ERROR_INSUFFICIENT_BUFFER && sizeNeeded > 0) { + + LPBYTE secBuffer; + PSID pSID = NULL; + BOOL defaulted = FALSE; + ULONG nameLen = MAXSTRING; + ULONG domainLen = MAXSTRING; + SID_NAME_USE nameuse; + + secBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(),0,sizeNeeded * sizeof(BYTE)); + if(!secBuffer) return; + + /* Get the owners security descriptor */ + if(!GetFileSecurity(filename, OWNER_SECURITY_INFORMATION, secBuffer, + sizeNeeded, &sizeNeeded)) { + HeapFree(GetProcessHeap(),0,secBuffer); + return; + } + + /* Get the SID from the SD */ + if(!GetSecurityDescriptorOwner(secBuffer, &pSID, &defaulted)) { + HeapFree(GetProcessHeap(),0,secBuffer); + return; + } + + /* Convert to a username */ + if (LookupAccountSid(NULL, pSID, name, &nameLen, domain, &domainLen, &nameuse)) { + snprintf(owner, ownerlen, "%s%c%s", domain, '\\', name); + } + HeapFree(GetProcessHeap(),0,secBuffer); + } + return; +}

1 0

Felix Nawothnig : comctl32: Layout and redraw on TCM_SETIMAGELIST.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 0f2f718dea16ec3ad6e37fa48e27a1a177b364bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2f718dea16ec3ad6e37fa48… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Mon Mar 12 21:23:24 2007 +0100 comctl32: Layout and redraw on TCM_SETIMAGELIST. --- dlls/comctl32/tab.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 711c320..c63b0f7 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2930,6 +2930,8 @@ static inline LRESULT TAB_SetImageList (TAB_INFO *infoPtr, HIMAGELIST himlNew) HIMAGELIST himlPrev = infoPtr->himl; TRACE("\n"); infoPtr->himl = himlNew; + TAB_SetItemBounds(infoPtr); + InvalidateRect(infoPtr->hwnd, NULL, TRUE); return (LRESULT)himlPrev; }

1 0

Felix Nawothnig : comctl32: Fix visual glitches with TVS_HASLINES.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 6a514819db7430c167c86ba743713da55d007d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a514819db7430c167c86ba74… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Mon Mar 12 20:43:16 2007 +0100 comctl32: Fix visual glitches with TVS_HASLINES. --- dlls/comctl32/treeview.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 676e56a..8ababc9 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1730,6 +1730,11 @@ TREEVIEW_NaturalHeight(TREEVIEW_INFO *infoPtr) height = tm.tmHeight + tm.tmExternalLeading + TVHEIGHT_FONT_ADJUST; if (height < infoPtr->normalImageHeight) height = infoPtr->normalImageHeight; + + /* Round down, unless we support odd ("non even") heights. */ + if (!(infoPtr->dwStyle & TVS_NONEVENHEIGHT)) + height &= ~1; + return height; } @@ -2325,14 +2330,16 @@ TREEVIEW_DrawItemLines(TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) HTREEITEM parent; LOGBRUSH lb; - /* - * Get a dotted grey pen - */ + /* Get a dotted grey pen */ lb.lbStyle = BS_SOLID; lb.lbColor = infoPtr->clrLine; hNewPen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, NULL); hOldPen = SelectObject(hdc, hNewPen); + /* Make sure the center is on a dot (using +2 instead + * of +1 gives us pixel-by-pixel compat with native) */ + centery = (centery + 2) & ~1; + MoveToEx(hdc, item->stateOffset, centery, NULL); LineTo(hdc, centerx - 1, centery);

1 0

George Gov : comctl32: Add some listview message tests.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: aa685beb07ba6928dba39036786e11d50d88ed2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa685beb07ba6928dba390367… Author: George Gov <ggov(a)ucla.edu> Date: Mon Mar 12 19:53:47 2007 -0700 comctl32: Add some listview message tests. --- dlls/comctl32/tests/listview.c | 363 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 363 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa685beb07ba6928dba39…

1 0