May 2007 - Wine-Commits - list.winehq.org

Thomas Spear : wine.inf: Add uninstall key.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 4d00f3ccc86220b9dabd9b25d3a8ce383949b06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d00f3ccc86220b9dabd9b25d… Author: Thomas Spear <Speeddymon(a)gmail.com> Date: Tue May 22 13:29:04 2007 -0500 wine.inf: Add uninstall key. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index ee6a287..5d0420d 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -175,6 +175,7 @@ HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" +HKLM,%CurrentVersion%\Uninstall,,,"" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"Change preferred organization in ~/.wine/system.reg" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"Change preferred owner in ~/.wine/system.reg" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%"

1 0

Marcus Meissner : quartz: ppinsplitter might be used uninitialized ( Coverity).
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: d2bc96bf8a6ec09667164b91c602357524c4b55a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bc96bf8a6ec09667164b91c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 22 21:28:47 2007 +0100 quartz: ppinsplitter might be used uninitialized (Coverity). --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e6c19f5..02728d5 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -997,7 +997,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, IBaseFilter* preader = NULL; IBaseFilter* psplitter = NULL; IPin* ppinreader = NULL; - IPin* ppinsplitter; + IPin* ppinsplitter = NULL; IEnumPins* penumpins; ULONG pin; HRESULT hr;

1 0

Marcus Meissner : ntdll: Initialize pointers to NULL (Coverity).
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: a5facc008bbeff60a30d5fd0753e408bec733979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5facc008bbeff60a30d5fd07… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 22 21:33:27 2007 +0100 ntdll: Initialize pointers to NULL (Coverity). --- dlls/ntdll/sec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index c417de8..af89b72 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1559,8 +1559,8 @@ NTSTATUS WINAPI NtSetSecurityObject(HANDLE Handle, { NTSTATUS status; struct security_descriptor sd; - PACL dacl, sacl; - PSID owner, group; + PACL dacl = NULL, sacl = NULL; + PSID owner = NULL, group = NULL; BOOLEAN defaulted, present; DWORD revision; SECURITY_DESCRIPTOR_CONTROL control;

1 0

Dmitry Timoshkov : ntdll: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: e142779b09ce1c163541972473ef35289a7c54d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e142779b09ce1c16354197247… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 23 16:36:29 2007 +0900 ntdll: Fix compilation warnings in 64-bit mode. --- dlls/ntdll/critsection.c | 12 +++++----- dlls/ntdll/heap.c | 4 +- dlls/ntdll/loader.c | 4 +- dlls/ntdll/ntdll_misc.h | 4 +- dlls/ntdll/process.c | 2 +- dlls/ntdll/reg.c | 2 +- dlls/ntdll/rtl.c | 8 +++--- dlls/ntdll/sec.c | 48 ++++++++++++++++++++++----------------------- dlls/ntdll/server.c | 4 +- dlls/ntdll/sync.c | 2 +- dlls/ntdll/thread.c | 14 ++++++------ dlls/ntdll/virtual.c | 4 +- 12 files changed, 53 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e142779b09ce1c1635419…

1 0

Dmitry Timoshkov : kernel32: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: a67b68912160a6073f632cc086eae7b32567b86e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67b68912160a6073f632cc08… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 23 16:36:53 2007 +0900 kernel32: Fix compilation warnings in 64-bit mode. --- dlls/kernel32/file.c | 24 +++++++++++++++--------- dlls/kernel32/locale.c | 2 +- dlls/kernel32/lzexpand.c | 6 +++--- dlls/kernel32/process.c | 16 ++++++++-------- dlls/kernel32/pthread.c | 6 +++--- dlls/kernel32/resource.c | 18 +++++++++--------- dlls/kernel32/sync.c | 4 ++-- dlls/kernel32/syslevel.c | 4 ++-- dlls/kernel32/thread.c | 8 ++++---- 9 files changed, 47 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a67b68912160a6073f632…

1 0

Dmitry Timoshkov : winternl.h: Make the fields of the PROCESS_BASIC_INFORMATION structure use same type width as a PSDK one .
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 737b9e5acd62b22cd75dd58f8448402b98305817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737b9e5acd62b22cd75dd58f8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 23 16:35:52 2007 +0900 winternl.h: Make the fields of the PROCESS_BASIC_INFORMATION structure use same type width as a PSDK one. --- dlls/ntdll/process.c | 2 +- include/winternl.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index a03b23e..39ca74a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -144,7 +144,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( if ((ret = wine_server_call( req )) == STATUS_SUCCESS) { pbi.ExitStatus = reply->exit_code; - pbi.PebBaseAddress = (DWORD)reply->peb; + pbi.PebBaseAddress = reply->peb; pbi.AffinityMask = reply->affinity; pbi.BasePriority = reply->priority; pbi.UniqueProcessId = reply->pid; diff --git a/include/winternl.h b/include/winternl.h index 06885b3..5594348 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -958,12 +958,12 @@ typedef struct _OBJECT_BASIC_INFORMATION { typedef struct _PROCESS_BASIC_INFORMATION { #ifdef __WINESRC__ - DWORD ExitStatus; - DWORD PebBaseAddress; + DWORD_PTR ExitStatus; + PPEB PebBaseAddress; DWORD_PTR AffinityMask; - DWORD BasePriority; - ULONG UniqueProcessId; - ULONG InheritedFromUniqueProcessId; + DWORD_PTR BasePriority; + ULONG_PTR UniqueProcessId; + ULONG_PTR InheritedFromUniqueProcessId; #else PVOID Reserved1; PPEB PebBaseAddress;

1 0

Dmitry Timoshkov : widl: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 4d0d9fcb69ddeabbd1651b469f908b4466deb75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0d9fcb69ddeabbd1651b469… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 23 16:36:08 2007 +0900 widl: Fix compilation warnings in 64-bit mode. --- tools/widl/typegen.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 49e95c8..dbd47c9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -62,7 +62,7 @@ struct expr_eval_routine static size_t type_memsize(const type_t *t, const array_dims_t *array, unsigned int *align); static size_t fields_memsize(const var_list_t *fields, unsigned int *align); static size_t write_struct_tfs(FILE *file, type_t *type, const char *name, unsigned int *tfsoff); -static void write_embedded_types(FILE *file, const type_t *type, size_t *tfsoff); +static void write_embedded_types(FILE *file, const type_t *type, unsigned int *tfsoff); const char *string_of_type(unsigned char type) { @@ -1480,7 +1480,7 @@ static size_t write_pointer_only_tfs(FILE *file, const attr_list_t *attrs, int p return start_offset; } -static void write_branch_type(FILE *file, const type_t *t, size_t *tfsoff) +static void write_branch_type(FILE *file, const type_t *t, unsigned int *tfsoff) { if (is_base_type(t->type)) { @@ -1499,10 +1499,10 @@ static void write_branch_type(FILE *file, const type_t *t, size_t *tfsoff) *tfsoff += 2; } -static size_t write_union_tfs(FILE *file, type_t *type, size_t *tfsoff) +static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) { - size_t align = 0; - size_t start_offset; + unsigned int align = 0; + unsigned int start_offset; size_t size = type_memsize(type, NULL, &align); var_list_t *fields = type->fields; size_t nbranch = 0; @@ -1743,7 +1743,7 @@ static void clear_tfsoff(type_t *type) } } -static void write_embedded_types(FILE *file, const type_t *type, size_t *tfsoff) +static void write_embedded_types(FILE *file, const type_t *type, unsigned int *tfsoff) { var_list_t *fields = type->fields; size_t offset = 0;

1 0

Dmitry Timoshkov : basetsd.h: Fix a typo in the parameter name.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 0cfe42b7da7f4245699d17d4aec3b740d7b34d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cfe42b7da7f4245699d17d4a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 23 17:32:33 2007 +0900 basetsd.h: Fix a typo in the parameter name. --- include/basetsd.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index e0d04f6..84ab6a9 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -219,7 +219,7 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR; #define HandleToULong(h) ((ULONG)(ULONG_PTR)(h)) #define HandleToLong(h) ((LONG)(LONG_PTR)(h)) #define ULongToHandle(ul) ((HANDLE)(ULONG_PTR)(ul)) -#define LongToHandle(h) ((HANDLE)(LONG_PTR)(h)) +#define LongToHandle(l) ((HANDLE)(LONG_PTR)(l)) #define PtrToUlong(p) ((ULONG)(ULONG_PTR)(p)) #define PtrToLong(p) ((LONG)(LONG_PTR)(p)) #define PtrToUint(p) ((UINT)(UINT_PTR)(p))

1 0

Peter Oberndorfer : winedbg: Only check for break/ watch points on first chance exceptions.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 394a36c25a143bb34627ec2bb13b12b7042fef98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394a36c25a143bb34627ec2bb… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue May 22 18:28:55 2007 +0200 winedbg: Only check for break/watch points on first chance exceptions. --- programs/winedbg/break.c | 11 +++++++++-- programs/winedbg/debugger.h | 2 +- programs/winedbg/tgt_active.c | 13 ++++++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 4c1e3fe..be6e6c5 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -775,15 +775,22 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) } /*********************************************************************** - * break_ajust_pc + * break_adjust_pc * * Adjust PC to the address where the trap (if any) actually occurred * Also sets dbg_curr_thread->stopped_xpoint */ -void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL* is_break) +void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_break) { DWORD oldval = 0; + /* break / watch points are handled on first chance */ + if ( !first_chance ) + { + *is_break = TRUE; + dbg_curr_thread->stopped_xpoint = -1; + return; + } *is_break = FALSE; /* If not single-stepping, back up to the break instruction */ diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index e09d5f3..556bc08 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -288,7 +288,7 @@ extern void break_delete_xpoint(int num); extern void break_delete_xpoints_from_module(unsigned long base); extern void break_enable_xpoint(int num, BOOL enable); extern void break_info(void); -extern void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL* is_break); +extern void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_break); extern BOOL break_should_continue(ADDRESS64* addr, DWORD code); extern void break_suspend_execution(void); extern void break_restart_execution(int count); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 1698201..348895d 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -107,7 +107,14 @@ static unsigned dbg_fetch_context(void) return TRUE; } -static unsigned dbg_exception_prolog(BOOL is_debug, const EXCEPTION_RECORD* rec) +/*********************************************************************** + * dbg_exception_prolog + * + * Examine exception and decide if interactive mode is entered(return TRUE) + * or exception is silently continued(return FALSE) + * is_debug means the exception is a breakpoint or single step exception + */ +static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXCEPTION_RECORD* rec) { ADDRESS64 addr; BOOL is_break; @@ -143,7 +150,7 @@ static unsigned dbg_exception_prolog(BOOL is_debug, const EXCEPTION_RECORD* rec) /* this will resynchronize builtin dbghelp's internal ELF module list */ SymLoadModule(dbg_curr_process->handle, 0, 0, 0, 0, 0); - if (is_debug) break_adjust_pc(&addr, rec->ExceptionCode, &is_break); + if (is_debug) break_adjust_pc(&addr, rec->ExceptionCode, first_chance, &is_break); /* * Do a quiet backtrace so that we have an idea of what the situation * is WRT the source files. @@ -398,7 +405,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance dbg_printf( ", invalid program stack" ); } - if (dbg_exception_prolog(is_debug, rec)) + if (dbg_exception_prolog(is_debug, first_chance, rec)) { dbg_interactiveP = TRUE; return 0;

1 0

Marcus Meissner : oleau32: Fix one entry overflow (Coverity).
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 46d94653f144c25dec717bd707fea9a577abf61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d94653f144c25dec717bd70… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 22 21:18:52 2007 +0100 oleau32: Fix one entry overflow (Coverity). --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index fd4e56e..fca8f8f 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7425,7 +7425,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd /* Parse the string into our structure */ while (*strIn) { - if (dp.dwCount > 6) + if (dp.dwCount >= 6) break; if (isdigitW(*strIn))

1 0