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

Alessandro Pignotti : dplayx: Corrected the way nameserver initializes the sessiondesc structure on broadcast request reply .
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: 7169718d6e570b964bea9c9d6db018ecb1f69a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7169718d6e570b964bea9c9d6… Author: Alessandro Pignotti <alex.pigna(a)inventati.org> Date: Thu Mar 22 17:20:17 2007 +0100 dplayx: Corrected the way nameserver initializes the sessiondesc structure on broadcast request reply. --- dlls/dplayx/name_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index c731ea6..f46af67 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -410,7 +410,7 @@ void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg, rmsg->envelope.wVersion = DPMSGVER_DP6; CopyMemory( &rmsg->sd, lpDP->dp2->lpSessionDesc, - sizeof( lpDP->dp2->lpSessionDesc->dwSize ) ); + lpDP->dp2->lpSessionDesc->dwSize ); rmsg->dwUnknown = 0x0000005c; if( bAnsi ) {

1 0

Andrew Talbot : msi: Replace inline static with static inline.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: efc988e1c817edfbe7c74c77b331835ed3e673ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc988e1c817edfbe7c74c77b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 22 18:21:52 2007 +0000 msi: Replace inline static with static inline. --- dlls/msi/msipriv.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 971f71e..d61eab9 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -825,7 +825,7 @@ static inline BOOL msi_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } -inline static char *strdupWtoA( LPCWSTR str ) +static inline char *strdupWtoA( LPCWSTR str ) { LPSTR ret = NULL; DWORD len; @@ -838,7 +838,7 @@ inline static char *strdupWtoA( LPCWSTR str ) return ret; } -inline static LPWSTR strdupAtoW( LPCSTR str ) +static inline LPWSTR strdupAtoW( LPCSTR str ) { LPWSTR ret = NULL; DWORD len; @@ -851,7 +851,7 @@ inline static LPWSTR strdupAtoW( LPCSTR str ) return ret; } -inline static LPWSTR strdupW( LPCWSTR src ) +static inline LPWSTR strdupW( LPCWSTR src ) { LPWSTR dest; if (!src) return NULL;

1 0

Andrew Talbot : shell32: Replace inline static with static inline.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: 55355d2def15f9cfd5cdf4a6834f19fefb68b450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55355d2def15f9cfd5cdf4a68… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 22 18:27:53 2007 +0000 shell32: Replace inline static with static inline. --- dlls/shell32/shell32_main.h | 10 +++++----- dlls/shell32/shelllink.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 2937065..c974c8e 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -175,7 +175,7 @@ BOOL16 WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM); void WINAPI _InsertMenuItem (HMENU hmenu, UINT indexMenu, BOOL fByPosition, UINT wID, UINT fType, LPCSTR dwTypeData, UINT fState); -inline static BOOL SHELL_OsIsUnicode(void) +static inline BOOL SHELL_OsIsUnicode(void) { /* if high-bit of version is 0, we are emulating NT */ return !(GetVersion() & 0x80000000); @@ -186,26 +186,26 @@ inline static BOOL SHELL_OsIsUnicode(void) SHFree(*ptr); \ *ptr = NULL; \ }; -inline static void __SHCloneStrA(char ** target,const char * source) +static inline void __SHCloneStrA(char ** target,const char * source) { *target = SHAlloc(strlen(source)+1); strcpy(*target, source); } -inline static void __SHCloneStrWtoA(char ** target, const WCHAR * source) +static inline void __SHCloneStrWtoA(char ** target, const WCHAR * source) { int len = WideCharToMultiByte(CP_ACP, 0, source, -1, NULL, 0, NULL, NULL); *target = SHAlloc(len); WideCharToMultiByte(CP_ACP, 0, source, -1, *target, len, NULL, NULL); } -inline static void __SHCloneStrW(WCHAR ** target, const WCHAR * source) +static inline void __SHCloneStrW(WCHAR ** target, const WCHAR * source) { *target = SHAlloc( (lstrlenW(source)+1) * sizeof(WCHAR) ); lstrcpyW(*target, source); } -inline static WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) +static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) { int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0); *target = SHAlloc(len*sizeof(WCHAR)); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 61885ed..f7c9c59 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -201,7 +201,7 @@ static inline IShellLinkImpl *impl_from_IObjectWithSite( IObjectWithSite *iface static HRESULT ShellLink_UpdatePath(LPWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); /* strdup on the process heap */ -inline static LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) +static inline LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) { INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); @@ -211,7 +211,7 @@ inline static LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) return p; } -inline static LPWSTR strdupW( LPCWSTR src ) +static inline LPWSTR strdupW( LPCWSTR src ) { LPWSTR dest; if (!src) return NULL;

1 0

Andrew Talbot : msvcrt/tests: Replace inline static with static inline.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: 1e8e0a4ed2771d1d50a082de29ef2b9dd4353932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8e0a4ed2771d1d50a082de2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 22 18:22:51 2007 +0000 msvcrt/tests: Replace inline static with static inline. --- dlls/msvcrt/tests/cpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index b9acbb1..1d43502 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -126,7 +126,7 @@ static void* bAncientVersion; /* Emulate a __thiscall */ #ifdef _MSC_VER -inline static void* do_call_func1(void *func, void *_this) +static inline void* do_call_func1(void *func, void *_this) { volatile void* retval = 0; __asm @@ -140,7 +140,7 @@ inline static void* do_call_func1(void *func, void *_this) return (void*)retval; } -inline static void* do_call_func2(void *func, void *_this, const void* arg) +static inline void* do_call_func2(void *func, void *_this, const void* arg) { volatile void* retval = 0; __asm

1 0

Andrew Talbot : ole32: Replace inline static with static inline.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: 24a197490c73990085c397adaf4c86c77a92294f URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a197490c73990085c397ada… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 22 18:24:53 2007 +0000 ole32: Replace inline static with static inline. --- dlls/ole32/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 490b762..55afade 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -68,7 +68,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, * IPIDs identify an interface stub and are apartment scoped */ -inline static HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) +static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) { HRESULT hr; CLSID clsid;

1 0

Andrew Talbot : oleaut32: Replace inline static with static inline.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: cae5c216a568b61883d70c44b0bb00b317ba27be URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae5c216a568b61883d70c44b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 22 18:29:03 2007 +0000 oleaut32: Replace inline static with static inline. --- 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 1b2199c..54b389a 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -144,7 +144,7 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, } /* Inline return type */ -#define RETTYP inline static HRESULT +#define RETTYP static inline HRESULT /* Simple compiler cast from one type to another */

1 0

Andrew Talbot : rpcrt4: Replace inline static with static inline.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: 67813450b938bd0f11f6343d59839ab94e38d59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=67813450b938bd0f11f6343d5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 22 18:26:46 2007 +0000 rpcrt4: Replace inline static with static inline. --- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/rpcrt4/rpc_server.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 7fce001..ad95b53 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -532,7 +532,7 @@ finish_conf: /* multiply two numbers together, raising an RPC_S_INVALID_BOUND exception if * the result overflows 32-bits */ -inline static ULONG safe_multiply(ULONG a, ULONG b) +static inline ULONG safe_multiply(ULONG a, ULONG b) { ULONGLONG ret = (ULONGLONG)a * b; if (ret > 0xffffffff) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d9285d2..7152453 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -97,7 +97,7 @@ static LONG listen_count; static UUID uuid_nil; -inline static RpcObjTypeMap *LookupObjTypeMap(UUID *ObjUuid) +static inline RpcObjTypeMap *LookupObjTypeMap(UUID *ObjUuid) { RpcObjTypeMap *rslt = RpcObjTypeMaps; RPC_STATUS dummy; @@ -110,7 +110,7 @@ inline static RpcObjTypeMap *LookupObjTypeMap(UUID *ObjUuid) return rslt; } -inline static UUID *LookupObjType(UUID *ObjUuid) +static inline UUID *LookupObjType(UUID *ObjUuid) { RpcObjTypeMap *map = LookupObjTypeMap(ObjUuid); if (map)

1 0

Alexandre Julliard : ntdll: Better support for NT path names in wine_nt_to_unix_file_name.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: ee478bbada340f3bcedfb5aaca0246be74a74140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee478bbada340f3bcedfb5aac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 22 16:35:51 2007 +0100 ntdll: Better support for NT path names in wine_nt_to_unix_file_name. Don't map NT namespace 1:1 to Unix, add a magic \??\unix device instead. More generic support for \??\ devices, with fallback to the wineserver for paths that don't exist. --- dlls/ntdll/directory.c | 118 +++++++++++++++++++++++++++--------------------- 1 files changed, 67 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f03a7b4..e60dad7 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1799,7 +1799,7 @@ static inline int get_dos_prefix_len( const UNICODE_STRING *name ) NTSTATUS wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, UINT disposition, BOOLEAN check_case ) { - static const WCHAR uncW[] = {'U','N','C','\\'}; + static const WCHAR unixW[] = {'u','n','i','x'}; static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 }; NTSTATUS status = STATUS_SUCCESS; @@ -1807,71 +1807,87 @@ NTSTATUS wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *un const WCHAR *name, *p; struct stat st; char *unix_name; - int pos, ret, name_len, unix_len, used_default; + int pos, ret, name_len, unix_len, prefix_len, used_default; + WCHAR prefix[MAX_DIR_ENTRY_LEN]; + BOOLEAN is_unix = FALSE; name = nameW->Buffer; name_len = nameW->Length / sizeof(WCHAR); if (!name_len || !IS_SEPARATOR(name[0])) return STATUS_OBJECT_PATH_SYNTAX_BAD; - if ((pos = get_dos_prefix_len( nameW ))) + if (!(pos = get_dos_prefix_len( nameW ))) + return STATUS_BAD_DEVICE_TYPE; /* no DOS prefix, assume NT native name */ + + name += pos; + name_len -= pos; + + /* check for sub-directory */ + for (pos = 0; pos < name_len; pos++) { - BOOLEAN is_unc = FALSE; + if (IS_SEPARATOR(name[pos])) break; + if (name[pos] < 32 || strchrW( invalid_charsW, name[pos] )) + return STATUS_OBJECT_NAME_INVALID; + } + if (pos > MAX_DIR_ENTRY_LEN) + return STATUS_OBJECT_NAME_INVALID; - name += pos; - name_len -= pos; + if (pos == name_len) /* no subdir, plain DOS device */ + return get_dos_device( name, name_len, unix_name_ret ); - /* check for UNC prefix */ - if (name_len > 4 && !memicmpW( name, uncW, 4 )) - { - name += 3; - name_len -= 3; - is_unc = TRUE; - } - else - { - /* check for a drive letter with path */ - if (name_len < 3 || !isalphaW(name[0]) || name[1] != ':' || !IS_SEPARATOR(name[2])) - { - /* not a drive with path, try other DOS devices */ - return get_dos_device( name, name_len, unix_name_ret ); - } - name += 2; /* skip drive letter */ - name_len -= 2; - } + for (prefix_len = 0; prefix_len < pos; prefix_len++) + prefix[prefix_len] = tolowerW(name[prefix_len]); - /* check for invalid characters */ + name += prefix_len; + name_len -= prefix_len; + + /* check for invalid characters (all chars except 0 are valid for unix) */ + is_unix = (prefix_len == 4 && !memcmp( prefix, unixW, sizeof(unixW) )); + if (is_unix) + { + for (p = name; p < name + name_len; p++) + if (!*p) return STATUS_OBJECT_NAME_INVALID; + check_case = TRUE; + } + else + { for (p = name; p < name + name_len; p++) if (*p < 32 || strchrW( invalid_charsW, *p )) return STATUS_OBJECT_NAME_INVALID; + } - unix_len = ntdll_wcstoumbs( 0, name, name_len, NULL, 0, NULL, NULL ); - unix_len += MAX_DIR_ENTRY_LEN + 3; - unix_len += strlen(config_dir) + sizeof("/dosdevices/") + 3; - if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len ))) - return STATUS_NO_MEMORY; - strcpy( unix_name, config_dir ); - strcat( unix_name, "/dosdevices/" ); - pos = strlen(unix_name); - if (is_unc) - { - strcpy( unix_name + pos, "unc" ); - pos += 3; - } - else - { - unix_name[pos++] = tolowerW( name[-2] ); - unix_name[pos++] = ':'; - unix_name[pos] = 0; - } + unix_len = ntdll_wcstoumbs( 0, prefix, prefix_len, NULL, 0, NULL, NULL ); + unix_len += ntdll_wcstoumbs( 0, name, name_len, NULL, 0, NULL, NULL ); + unix_len += MAX_DIR_ENTRY_LEN + 3; + unix_len += strlen(config_dir) + sizeof("/dosdevices/"); + if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len ))) + return STATUS_NO_MEMORY; + strcpy( unix_name, config_dir ); + strcat( unix_name, "/dosdevices/" ); + pos = strlen(unix_name); + + ret = ntdll_wcstoumbs( 0, prefix, prefix_len, unix_name + pos, unix_len - pos - 1, + NULL, &used_default ); + if (!ret || used_default) + { + RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + return STATUS_OBJECT_NAME_INVALID; } - else /* no DOS prefix, assume NT native name, map directly to Unix */ + pos += ret; + + /* check if prefix exists (except for DOS drives to avoid extra stat calls) */ + + if (prefix_len != 2 || prefix[1] != ':') { - if (!name_len || !IS_SEPARATOR(name[0])) return STATUS_OBJECT_NAME_INVALID; - unix_len = ntdll_wcstoumbs( 0, name, name_len, NULL, 0, NULL, NULL ); - unix_len += MAX_DIR_ENTRY_LEN + 3; - if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len ))) - return STATUS_NO_MEMORY; - pos = 0; + unix_name[pos] = 0; + if (lstat( unix_name, &st ) == -1 && errno == ENOENT) + { + if (!is_unix) + { + RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + return STATUS_BAD_DEVICE_TYPE; + } + pos = 0; /* fall back to unix root */ + } } /* try a shortcut first */

1 0

Alexandre Julliard : server: Implement the open_file method for mailslots.
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: 806bb49edaf60182ca6d464262949a3004be7930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806bb49edaf60182ca6d46426… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 22 16:36:54 2007 +0100 server: Implement the open_file method for mailslots. Get rid of the open_mailslot request, we can now use a normal open_file_object. --- dlls/ntdll/file.c | 23 -------- include/wine/server_protocol.h | 22 +------- server/mailslot.c | 119 ++++++++++++++-------------------------- server/protocol.def | 12 ---- server/request.h | 2 - server/trace.c | 18 ------ 6 files changed, 43 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=806bb49edaf60182ca6d4…

1 0

Alexandre Julliard : server: Implement the open_file method for named pipes .
by Alexandre Julliard 23 Mar '07

23 Mar '07

Module: wine Branch: master Commit: de1866d4fd6a19317014ce94e5bbfdd0dae7cc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1866d4fd6a19317014ce94e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 22 16:47:46 2007 +0100 server: Implement the open_file method for named pipes. Get rid of the open_named_pipe request, we can now use a normal open_file_object. --- dlls/ntdll/file.c | 23 ------ include/wine/server_protocol.h | 22 +------ server/named_pipe.c | 146 ++++++++++++++++++---------------------- server/protocol.def | 12 --- server/request.h | 2 - server/trace.c | 18 ----- 6 files changed, 67 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de1866d4fd6a19317014c…

1 0