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

Thomas Spear : wine.inf: Add uninstall key.
by Alexandre Julliard 23 May '07

23 May '07

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

Francois Gouget : port.h: Issue an error if port. h is included after the regular Wine headers.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 41b099172fc992fa0c39693c88b63b9d9e7be9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b099172fc992fa0c39693c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 22 18:12:05 2007 +0200 port.h: Issue an error if port.h is included after the regular Wine headers. --- include/wine/port.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 8861408..6ab0627 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -25,6 +25,10 @@ # error You must include config.h to use this header #endif +#ifdef __WINE_BASETSD_H +# error You must include port.h before all other headers +#endif + #define _FILE_OFFSET_BITS 64 #define _GNU_SOURCE /* for pread/pwrite */ #include <fcntl.h>

1 0

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

23 May '07

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 23 May '07

23 May '07

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

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

23 May '07

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 : winternl.h: Make the fields of the PROCESS_BASIC_INFORMATION structure use same type width as a PSDK one .
by Alexandre Julliard 23 May '07

23 May '07

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 23 May '07

23 May '07

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

Rob Shearman : ole32: Remove spurious AddRef of returned object on retrieval of an interface from the global interface table .
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 30cc21196e3b1397ba64e5fa2621bbde535c9bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cc21196e3b1397ba64e5fa2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:32:55 2007 +0100 ole32: Remove spurious AddRef of returned object on retrieval of an interface from the global interface table. --- dlls/ole32/git.c | 4 ---- dlls/ole32/tests/marshal.c | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index c310249..e878f83 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -262,7 +262,6 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( { StdGITEntry* entry; HRESULT hres; - LPUNKNOWN lpUnk; IStream *stream; TRACE("dwCookie=0x%x, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv); @@ -296,9 +295,6 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( return hres; } - /* addref it */ - lpUnk = *ppv; - IUnknown_AddRef(lpUnk); TRACE("ppv=%p\n", *ppv); return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 0b3cfeb..b089913 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2651,7 +2651,6 @@ static void test_globalinterfacetable(void) hr = IGlobalInterfaceTable_RevokeInterfaceFromGlobal(git, cookie); ok_ole_success(hr, IGlobalInterfaceTable_RevokeInterfaceFromGlobal); - todo_wine ok_no_locks(); IGlobalInterfaceTable_Release(git);

1 0

Rob Shearman : ole32: Allow the getting of different interfaces from the global interface table than that with what the object was registered with .
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 7d90b6ce295fe876dc7b3474146e965cdc4a5cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d90b6ce295fe876dc7b34741… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:32:19 2007 +0100 ole32: Allow the getting of different interfaces from the global interface table than that with what the object was registered with. --- dlls/ole32/git.c | 6 +----- dlls/ole32/tests/marshal.c | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index b51990d..c310249 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -271,15 +271,11 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); if (entry == NULL) { + WARN("Entry for cookie 0x%x not found\n", dwCookie); LeaveCriticalSection(&git_section); return E_INVALIDARG; } - if (!IsEqualIID(&entry->iid, riid)) { - LeaveCriticalSection(&git_section); - WARN("entry->iid (%s) != riid\n", debugstr_guid(&entry->iid)); - return E_INVALIDARG; - } TRACE("entry=%p\n", entry); hres = IStream_Clone(entry->stream, &stream); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index d0735fc..0b3cfeb 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2640,9 +2640,8 @@ static void test_globalinterfacetable(void) /* test getting interface from global with different iid */ hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IUnknown, (void **)&object); - todo_wine ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); - if (SUCCEEDED(hr)) IUnknown_Release(object); + IUnknown_Release(object); /* test getting interface from global with same iid */ hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IClassFactory, (void **)&object);

1 0

Peter Oberndorfer : ntdll: Fix up instruction pointer in context inside raise_exception.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: eab168cf9eaa6ed9f8800b25155d329376f2343f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab168cf9eaa6ed9f8800b251… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue May 22 18:28:53 2007 +0200 ntdll: Fix up instruction pointer in context inside raise_exception. --- dlls/ntdll/exception.c | 5 +++++ dlls/ntdll/tests/exception.c | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 7f0da0c..8974ced 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -336,6 +336,11 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return STATUS_SUCCESS; +#ifdef __i386__ + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; +#endif + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) return STATUS_SUCCESS; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9ebbda7..83613f7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -215,10 +215,8 @@ LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionIn */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine { ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xa); - } } else { @@ -247,10 +245,8 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine { ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xa); - } } else { @@ -525,9 +521,7 @@ static DWORD int3_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD { ok( rec->ExceptionAddress == code_mem, "exception address not at: %p, but at %p\n", code_mem, rec->ExceptionAddress); - todo_wine { - ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip); - } + ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip); if(context->Eip == (DWORD)code_mem) context->Eip++; /* skip breakpoint */ return ExceptionContinueExecution; @@ -692,10 +686,8 @@ static void test_debugger(void) /* ctx.Eip is the same value the exception handler got */ if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine{ ok((char *)ctx.Eip == (char *)code_mem_address + 0xa, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); - } /* need to fixup Eip for debuggee */ if ((char *)ctx.Eip == (char *)code_mem_address + 0xa) ctx.Eip += 1;

1 0