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

Francois Gouget : mprapi: Add FIXME for the missing in6addr.h include.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 6e660bb22042991da8b55009d0c7bd5b45208760 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e660bb22042991da8b5500… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 12 00:28:29 2006 +0200 mprapi: Add FIXME for the missing in6addr.h include. --- include/mprapi.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/mprapi.h b/include/mprapi.h index fcbf8a1..6a304be 100644 --- a/include/mprapi.h +++ b/include/mprapi.h @@ -21,6 +21,7 @@ #define __WINE_MPRAPI_H #include <lmcons.h> #include <ras.h> +/* FIXME: #include <in6addr.h> */ #ifdef __cplusplus extern "C" {

1 0

Francois Gouget : rpcrt4: Fix some conditional includes.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 325912de986c98c0ff0e448a3c17fafc95dc485c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=325912de986c98c0ff0e448… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 12 00:27:02 2006 +0200 rpcrt4: Fix some conditional includes. Check for HAVE_UNISTD_H before including unistd.h. There is no HAVE_SYS_TYPES to check. Tweak the indentation of a few #include directives. --- dlls/rpcrt4/rpc_transport.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 86b4303..0db5b6a 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -29,20 +29,20 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include <fcntl.h> #include <stdlib.h> -#ifdef HAVE_SYS_TYPES #include <sys/types.h> -#endif #ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> +# include <sys/socket.h> #endif #ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> +# include <netinet/in.h> #endif #ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> +# include <arpa/inet.h> #endif #ifdef HAVE_NETDB_H #include <netdb.h>

1 0

Francois Gouget : winapi: Add support for APIENTRY.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 9139fd140c436e07f7d331cbf6dc91dc14e34a95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9139fd140c436e07f7d331c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 12 00:19:54 2006 +0200 winapi: Add support for APIENTRY. Factorize a couple of call convention matching regular expressions. --- tools/winapi/c_parser.pm | 2 +- tools/winapi/winapi_local.pm | 2 +- tools/winapi/winapi_parser.pm | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index f29b1a1..975d7fe 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -37,7 +37,7 @@ # Defined a couple common regexp tidbits my $CALL_CONVENTION="__cdecl|__stdcall|" . "__RPC_API|__RPC_STUB|__RPC_USER|" . "CALLBACK|CDECL|NTAPI|PASCAL|RPC_ENTRY|RPC_VAR_ENTRY|" . - "VFWAPI|VFWAPIV|WINAPI|WINAPIV|"; + "VFWAPI|VFWAPIV|WINAPI|WINAPIV|APIENTRY|"; sub parse_c_function($$$$$); diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 20d7f71..55b5138 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -101,7 +101,7 @@ sub _check_function($$$$$$) { $implemented_calling_convention = "cdecl"; } elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) { $implemented_calling_convention = "varargs"; - } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|APIENTRY|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { if(defined($implemented_return_kind) && $implemented_return_kind eq "longlong") { $implemented_calling_convention = "stdcall"; # FIXME: Check entry flags } else { diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 2260c4f..4a5e44b 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -23,6 +23,13 @@ use strict; use output qw($output); use options qw($options); +# Defined a couple common regexp tidbits +my $CALL_CONVENTION="__cdecl|__stdcall|" . + "__RPC_API|__RPC_STUB|__RPC_USER|RPC_ENTRY|" . + "RPC_VAR_ENTRY|STDMETHODCALLTYPE|NET_API_FUNCTION|" . + "CALLBACK|CDECL|NTAPI|PASCAL|APIENTRY|" . + "VFWAPI|VFWAPIV|WINAPI|WINAPIV|"; + sub parse_c_file($$) { my $file = shift; my $callbacks = shift; @@ -373,7 +380,7 @@ sub parse_c_file($$) { } next; } elsif(/(extern\s+|static\s+)?((interface\s+|struct\s+|union\s+|enum\s+|signed\s+|unsigned\s+)?\w+((\s*\*)+\s*|\s+)) - ((__cdecl|__stdcall|__RPC_STUB|__RPC_USER|CDECL|NET_API_FUNCTION|RPC_ENTRY|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK)\s+)? + (($CALL_CONVENTION)\s+)? (\w+($\w+$)?)\s*$(.*?)$\s*(\{|\;)/sx) { my @lines = split(/\n/, $&); @@ -449,8 +456,8 @@ sub parse_c_file($$) { ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+)? (?:short\s+(?=int)|long\s+(?=int))?)?\w+)\s* ((?:const|volatile)?\s*(?:\*\s*(?:const|volatile)?\s*?)*)\s* - (?:__cdecl\s+|__stdcall\s+|__RPC_STUB\s+|__RPC_USER\s+|CALLBACK\s+|CDECL\s+|NET_API_FUNCTION\s+|RPC_ENTRY\s+|STDMETHODCALLTYPE\s+|VFWAPIV\s+|VFWAPI\s+|WINAPIV\s+|WINAPI\s+)? - $\s*(?:__cdecl|__stdcall|__RPC_STUB|__RPC_USER|CALLBACK|CDECL|NET_API_FUNCTION|RPC_ENTRY|STDMETHODCALLTYPE|VFWAPIV|VFWAPI|WINAPIV|WINAPI)?\s*\*\s*((?:\w+)?)\s*$\s* + (?:(?:$CALL_CONVENTION)\s+)? + $\s*(?:$CALL_CONVENTION)?\s*\*\s*((?:\w+)?)\s*$\s* $\s*(.*?)\s*$$/x) { my $return_type = $1;

1 0

Francois Gouget : include: Remove uneeded __RPC_FAR references.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: adf52cda0454de92ce635698b2834458d1bb218e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=adf52cda0454de92ce63569… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 12 00:22:21 2006 +0200 include: Remove uneeded __RPC_FAR references. --- include/dmusici.h | 6 +++--- include/rpcdce.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/dmusici.h b/include/dmusici.h index 90bd054..3d871a5 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -134,9 +134,9 @@ typedef struct IDirectMusicContainer *LP typedef struct IDirectMusicContainer IDirectMusicContainer8, *LPDIRECTMUSICCONTAINER8; /* RPC declarations */ -typedef struct IDirectMusicBand __RPC_FAR *LPDMUS_BAND; -typedef struct IDirectMusicLoader __RPC_FAR *LPDMUS_LOADER; -typedef struct IDirectMusicObject __RPC_FAR *LPDMUS_OBJECT; +typedef struct IDirectMusicBand *LPDMUS_BAND; +typedef struct IDirectMusicLoader *LPDMUS_LOADER; +typedef struct IDirectMusicObject *LPDMUS_OBJECT; /* GUIDs - all types loader */ DEFINE_GUID(GUID_DirectMusicAllTypes, 0xd2ac2893,0xb39b,0x11d1,0x87,0x04,0x00,0x60,0x08,0x93,0xb1,0xbd); diff --git a/include/rpcdce.h b/include/rpcdce.h index 2510a18..de808ee 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -149,22 +149,22 @@ typedef struct _RPC_POLICY typedef struct _SEC_WINNT_AUTH_IDENTITY_W { - unsigned short __RPC_FAR* User; + unsigned short* User; unsigned long UserLength; - unsigned short __RPC_FAR* Domain; + unsigned short* Domain; unsigned long DomainLength; - unsigned short __RPC_FAR* Password; + unsigned short* Password; unsigned long PasswordLength; unsigned long Flags; } SEC_WINNT_AUTH_IDENTITY_W, *PSEC_WINNT_AUTH_IDENTITY_W; typedef struct _SEC_WINNT_AUTH_IDENTITY_A { - unsigned char __RPC_FAR* User; + unsigned char* User; unsigned long UserLength; - unsigned char __RPC_FAR* Domain; + unsigned char* Domain; unsigned long DomainLength; - unsigned char __RPC_FAR* Password; + unsigned char* Password; unsigned long PasswordLength; unsigned long Flags; } SEC_WINNT_AUTH_IDENTITY_A, *PSEC_WINNT_AUTH_IDENTITY_A;

1 0

Francois Gouget : ole32: Fix compilation with gcc 2.95.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 3b102b39f40aa87d1f715c3a668b9cfb96cf274f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b102b39f40aa87d1f715c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 12 00:16:19 2006 +0200 ole32: Fix compilation with gcc 2.95. --- dlls/ole32/tests/storage32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e579897..9bd8074 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -715,8 +715,8 @@ static void test_storage_refcount(void) r = IStorage_Stat( stg, &statstg, STATFLAG_NONAME ); ok(r == S_OK, "Stat should have succeded instead of returning 0x%08lx\n", r); ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %ld\n", statstg.type); - ok(statstg.cbSize.LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %ld\n", statstg.cbSize.LowPart); - ok(statstg.cbSize.HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %ld\n", statstg.cbSize.HighPart); + ok(U(statstg.cbSize).LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %ld\n", U(statstg.cbSize).LowPart); + ok(U(statstg.cbSize).HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %ld\n", U(statstg.cbSize).HighPart); ok(statstg.grfMode == (STGM_TRANSACTED|STGM_SHARE_DENY_WRITE|STGM_READWRITE), "Statstg grfMode should have been 0x10022 instead of 0x%lx\n", statstg.grfMode); ok(statstg.grfLocksSupported == 0, "Statstg grfLocksSupported should have been 0 instead of %ld\n", statstg.grfLocksSupported); @@ -732,8 +732,8 @@ static void test_storage_refcount(void) ok(!lstrcmpW(statstg.pwcsName, stgname), "Statstg pwcsName should have been the name the storage was created with\n"); ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %ld\n", statstg.type); - ok(statstg.cbSize.LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %ld\n", statstg.cbSize.LowPart); - ok(statstg.cbSize.HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %ld\n", statstg.cbSize.HighPart); + ok(U(statstg.cbSize).LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %ld\n", U(statstg.cbSize).LowPart); + ok(U(statstg.cbSize).HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %ld\n", U(statstg.cbSize).HighPart); ok(statstg.grfMode == STGM_SHARE_EXCLUSIVE, "Statstg grfMode should have been STGM_SHARE_EXCLUSIVE instead of 0x%lx\n", statstg.grfMode); ok(statstg.grfLocksSupported == 0, "Statstg grfLocksSupported should have been 0 instead of %ld\n", statstg.grfLocksSupported);

1 0

Juan Lang : crypt32: Use the HRESULT synonyms for converted Win32 error codes.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 7e9ba76da1e41675c5a17061208e7d412d0da031 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e9ba76da1e41675c5a1706… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 11 09:48:01 2006 -0700 crypt32: Use the HRESULT synonyms for converted Win32 error codes. --- dlls/crypt32/cert.c | 8 +-- dlls/crypt32/encode.c | 8 +-- dlls/crypt32/oid.c | 2 - dlls/crypt32/serialize.c | 9 +-- dlls/crypt32/store.c | 26 +++++----- dlls/crypt32/tests/cert.c | 27 ++++------ dlls/crypt32/tests/encode.c | 19 +++---- dlls/crypt32/tests/main.c | 6 +- dlls/crypt32/tests/oid.c | 6 +- dlls/crypt32/tests/store.c | 115 ++++++++++++++++--------------------------- 10 files changed, 93 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7e9ba76da1e41675c5a…

1 0

Thomas Weidenmueller : oleaut32: Fix converting file name to Unicode.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 05d629264c9e0053143e6a726eb892cdbf867373 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05d629264c9e0053143e6a7… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Fri May 12 00:07:59 2006 +0200 oleaut32: Fix converting file name to Unicode. Fix converting the typelib file name to Unicode by using the correct buffer size. --- dlls/oleaut32/tmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 139662d..b25cc4d 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -300,7 +300,7 @@ _get_typeinfo_for_iid(REFIID riid, IType ERR("Could not get typelib fn?\n"); return E_FAIL; } - MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, -1); + MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, sizeof(tlfnW) / sizeof(tlfnW[0])); hres = LoadTypeLib(tlfnW,&tl); if (hres) { ERR("Failed to load typelib for %s, but it should be there.\n",debugstr_guid(riid));

1 0

Eric Pouech : winedbg: Fixed regression for command 'bt all'.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: bf8509d37c263c602d84911b8e3624433139f908 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf8509d37c263c602d84911… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun May 14 18:08:43 2006 +0200 winedbg: Fixed regression for command 'bt all'. Don't print 'process has terminated' message when detaching from a process (or backtracing it). --- programs/winedbg/stack.c | 9 ++++++++- programs/winedbg/tgt_active.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index a6a37d1..72e140c 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -313,7 +313,11 @@ static void backtrace_tid(struct dbg_pro dbg_printf("Can't get context for thread 0x%lx in current process\n", tid); } - else backtrace(); + else + { + stack_fetch_frames(); + backtrace(); + } ResumeThread(dbg_curr_thread->handle); } else dbg_printf("Can't suspend thread 0x%lx in current process\n", tid); @@ -331,6 +335,7 @@ static void backtrace_tid(struct dbg_pro */ static void backtrace_all(void) { + struct dbg_process* process = dbg_curr_process; THREADENTRY32 entry; HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); @@ -370,6 +375,8 @@ static void backtrace_all(void) dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } CloseHandle(snapshot); + dbg_curr_process = process; + dbg_curr_pid = process ? process->pid : 0; } void stack_backtrace(DWORD tid) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index cdd50ad..ea7f22b 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -490,6 +490,7 @@ static unsigned dbg_handle_debug_event(D break; } tgt_process_active_close_process(dbg_curr_process, FALSE); + dbg_printf("Process of pid=0x%08lx has terminated\n", de->dwProcessId); break; case CREATE_THREAD_DEBUG_EVENT: @@ -917,7 +918,6 @@ static BOOL tgt_process_active_close_pro if (!kill && !DebugActiveProcessStop(dbg_curr_pid)) return FALSE; } SymCleanup(pcs->handle); - dbg_printf("Process of pid=0x%08lx has terminated\n", pcs->pid); dbg_del_process(pcs); return TRUE;

1 0

Mike McCormack : server: Avoid a crash if a registry notify event has been set already.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 5fb6e0ef16a7d9ce79e1debaddf03d540fca490f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5fb6e0ef16a7d9ce79e1deb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun May 14 17:11:54 2006 +0900 server: Avoid a crash if a registry notify event has been set already. --- server/registry.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/registry.c b/server/registry.c index f2a5ce5..b0c815d 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1954,7 +1954,8 @@ DECL_HANDLER(set_registry_notification) notify = find_notify( key, current->process, req->hkey ); if (notify) { - release_object( notify->event ); + if (notify->event) + release_object( notify->event ); grab_object( event ); notify->event = event; }

1 0

Mike McCormack : wininet: Check for null parameters in FtpSetCurrentDirectoryW.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 35f0965c431fe800594384e161ea64e1f354330e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35f0965c431fe800594384e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 12 00:47:52 2006 +0900 wininet: Check for null parameters in FtpSetCurrentDirectoryW. --- dlls/wininet/ftp.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index aa254f6..5fde83d 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -339,10 +339,16 @@ BOOL WINAPI FtpSetCurrentDirectoryA(HINT */ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) { - LPWININETFTPSESSIONW lpwfs; + LPWININETFTPSESSIONW lpwfs = NULL; LPWININETAPPINFOW hIC = NULL; BOOL r = FALSE; + if (!lpszDirectory) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hConnect ); if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) {

1 0