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

Dmitry Timoshkov : riched20: Split unicode and ansi window procs, handle messages depending on the unicode flag.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: 592b53d0a48ee41558df78bcd128dbdc4ed4802c URL: http://source.winehq.org/git/wine.git/?a=commit;h=592b53d0a48ee41558df78bcd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 22 19:09:43 2007 +0800 riched20: Split unicode and ansi window procs, handle messages depending on the unicode flag. Add a hack for WM_GETTEXT in RichEdit20W class when running in win9x emulation mode. --- dlls/riched20/editor.c | 91 +++++++++++++++++++++++++++-------------- dlls/riched20/editor.h | 6 +-- dlls/riched20/string.c | 27 ++----------- dlls/riched20/tests/editor.c | 32 +++++++++++---- 4 files changed, 90 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=592b53d0a48ee41558df7…

1 0

Aric Stewart : Revert 7c35db07c35db0... msiexec: Use CommandLineToArgvW instead of process_args to reduce code duplication.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: 54c7b7e81b5542f015dc6e71fc6030ba3919f5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c7b7e81b5542f015dc6e71f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 22 08:20:16 2007 -0500 Revert 7c35db07c35db0... msiexec: Use CommandLineToArgvW instead of process_args to reduce code duplication. The previous command line processing is not identical to CommandLineToArgvW and CommandLineToArgvW breaks msi command line processing for things such as Excel Viewer 2003. Specifically the command line created by the Excel Viewer 2003 and passed to msiexec.exe is "c:\windows\system32\msiexec.exe" /I C:\windows\temp\IXP000.TMP\XLVIEW.MSI CDCACHE="2" LAUNCHEDFROMSETUP="1" SETUPEXEPATH="C:\windows\temp\IXP000.TMP\" SETUPEXENAME="SETUP.EXE" /lpiwaeo "C:\windows\temp\Microsoft Office Excel Viewer 2003 Setup(0001)_Task(0001).txt" CDCACH"... --- programs/msiexec/Makefile.in | 2 +- programs/msiexec/msiexec.c | 104 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 4 deletions(-) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 10e1cc4..c2bd981 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msiexec.exe APPMODE = -mconsole -IMPORTS = msi shell32 ole32 advapi32 user32 kernel32 +IMPORTS = msi ole32 advapi32 user32 kernel32 C_SRCS = \ msiexec.c diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 2d2728c..810dd70 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -25,7 +25,6 @@ #include <msi.h> #include <objbase.h> #include <stdio.h> -#include <shellapi.h> #include "wine/debug.h" #include "wine/unicode.h" @@ -211,6 +210,14 @@ static DWORD msi_atou(LPCWSTR str) return 0; } +static LPWSTR msi_strdup(LPCWSTR str) +{ + DWORD len = lstrlenW(str)+1; + LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + lstrcpyW(ret, str); + return ret; +} + /* str1 is the same as str2, ignoring case */ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) { @@ -366,6 +373,97 @@ static INT DoEmbedding( LPWSTR key ) return 1; } +/* + * state machine to break up the command line properly + */ + +enum chomp_state +{ + cs_whitespace, + cs_token, + cs_quote +}; + +static int chomp( WCHAR *str ) +{ + enum chomp_state state = cs_whitespace; + WCHAR *p, *out; + int count = 0, ignore; + + for( p = str, out = str; *p; p++ ) + { + ignore = 1; + switch( state ) + { + case cs_whitespace: + switch( *p ) + { + case ' ': + break; + case '"': + state = cs_quote; + count++; + break; + default: + count++; + ignore = 0; + state = cs_token; + } + break; + + case cs_token: + switch( *p ) + { + case '"': + state = cs_quote; + break; + case ' ': + state = cs_whitespace; + *out++ = 0; + break; + default: + ignore = 0; + } + break; + + case cs_quote: + switch( *p ) + { + case '"': + state = cs_token; + break; + default: + ignore = 0; + } + break; + } + if( !ignore ) + *out++ = *p; + } + + *out = 0; + + return count; +} + +static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) +{ + WCHAR **argv, *p = msi_strdup(cmdline); + int i, n; + + n = chomp( p ); + argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); + for( i=0; i<n; i++ ) + { + argv[i] = p; + p += lstrlenW(p) + 1; + } + argv[i] = NULL; + + *pargc = n; + *pargv = argv; +} + static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) { LONG r; @@ -384,7 +482,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); if( r == ERROR_SUCCESS ) { - *pargv = CommandLineToArgvW(buf, pargc); + process_args(buf, pargc, pargv); ret = TRUE; } } @@ -430,7 +528,7 @@ int main(int argc, char **argv) LPWSTR *argvW = NULL; /* overwrite the command line */ - argvW = CommandLineToArgvW( GetCommandLineW(), &argc ); + process_args( GetCommandLineW(), &argc, &argvW ); /* * If the args begin with /@ IDENT then we need to load the real

1 0

Alexandre Julliard : server: Don't enforce named pipes path format in ntdll , only in the server.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: 50c48004054e8127ecae3afd8f970cac597f372f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c48004054e8127ecae3afd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 22 14:40:41 2007 +0100 server: Don't enforce named pipes path format in ntdll, only in the server. --- dlls/ntdll/file.c | 5 ----- server/named_pipe.c | 8 ++++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2a2f9d2..eb11c69 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2085,17 +2085,12 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access, PLARGE_INTEGER timeout) { NTSTATUS status; - static const WCHAR leadin[] = {'\\','?','?','\\','P','I','P','E','\\'}; TRACE("(%p %x %s %p %x %d %x %d %d %d %d %d %d %p)\n", handle, access, debugstr_w(attr->ObjectName->Buffer), iosb, sharing, dispo, options, pipe_type, read_mode, completion_mode, max_inst, inbound_quota, outbound_quota, timeout); - if (attr->ObjectName->Length < sizeof(leadin) || - strncmpiW( attr->ObjectName->Buffer, - leadin, sizeof(leadin)/sizeof(leadin[0]) )) - return STATUS_OBJECT_NAME_INVALID; /* assume we only get relative timeout, and storable in a DWORD as ms */ if (timeout->QuadPart > 0 || (timeout->QuadPart / -10000) >> 32) FIXME("Wrong time %s\n", wine_dbgstr_longlong(timeout->QuadPart)); diff --git a/server/named_pipe.c b/server/named_pipe.c index e121c91..ff11280 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -585,7 +585,11 @@ static struct named_pipe *create_named_pipe( struct directory *root, const struc if (!name || !name->len) return alloc_object( &named_pipe_ops ); - if (!(obj = find_object_dir( root, name, attr, &new_name ))) return NULL; + if (!(obj = find_object_dir( root, name, attr, &new_name ))) + { + set_error( STATUS_OBJECT_NAME_INVALID ); + return NULL; + } if (!new_name.len) { if (attr & OBJ_OPENIF && obj->ops == &named_pipe_ops) @@ -603,7 +607,7 @@ static struct named_pipe *create_named_pipe( struct directory *root, const struc } if (obj->ops != &named_pipe_device_ops) - set_error( STATUS_OBJECT_TYPE_MISMATCH ); + set_error( STATUS_OBJECT_NAME_INVALID ); else { struct named_pipe_device *dev = (struct named_pipe_device *)obj;

1 0

Alexandre Julliard : server: Don't enforce mailslots path format in ntdll, only in the server.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: 928d28f688d5656fc366dd01e5d9403255ebb7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=928d28f688d5656fc366dd01e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 22 14:41:37 2007 +0100 server: Don't enforce mailslots path format in ntdll, only in the server. --- dlls/ntdll/file.c | 11 ----------- server/mailslot.c | 8 ++++++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index eb11c69..16eb9b7 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2187,8 +2187,6 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, PLARGE_INTEGER TimeOut) { LARGE_INTEGER timeout; - static const WCHAR leadin[] = { - '\\','?','?','\\','M','A','I','L','S','L','O','T','\\'}; NTSTATUS ret; TRACE("%p %08x %p %p %08x %08x %08x %p\n", @@ -2196,18 +2194,9 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, CreateOptions, MailslotQuota, MaxMessageSize, TimeOut); if (!pHandle) return STATUS_ACCESS_VIOLATION; - if (!attr) return STATUS_INVALID_PARAMETER; - if (!attr->ObjectName) return STATUS_OBJECT_PATH_SYNTAX_BAD; - if (attr->ObjectName->Length < sizeof(leadin) || - strncmpiW( attr->ObjectName->Buffer, - leadin, sizeof(leadin)/sizeof(leadin[0]) )) - { - return STATUS_OBJECT_NAME_INVALID; - } - /* * For a NULL TimeOut pointer set the default timeout value */ diff --git a/server/mailslot.c b/server/mailslot.c index 9391e13..28c67a8 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -345,7 +345,11 @@ static struct mailslot *create_mailslot( struct directory *root, if (!name || !name->len) return alloc_object( &mailslot_ops ); - if (!(obj = find_object_dir( root, name, attr, &new_name ))) return NULL; + if (!(obj = find_object_dir( root, name, attr, &new_name ))) + { + set_error( STATUS_OBJECT_NAME_INVALID ); + return NULL; + } if (!new_name.len) { @@ -362,7 +366,7 @@ static struct mailslot *create_mailslot( struct directory *root, if (obj->ops != &mailslot_device_ops) { - set_error( STATUS_OBJECT_TYPE_MISMATCH ); + set_error( STATUS_OBJECT_NAME_INVALID ); release_object( obj ); return NULL; }

1 0

Dmitry Timoshkov : user32: WM_GETTEXT message converters have to 0-terminate output buffer if there is enough space even if there is no text to convert .
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: b9eb76dea0fe37cc0f0a4ca7f236b47d7fc98700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9eb76dea0fe37cc0f0a4ca7f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 22 19:08:21 2007 +0800 user32: WM_GETTEXT message converters have to 0-terminate output buffer if there is enough space even if there is no text to convert. --- dlls/user32/winproc.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 1d093a9..5a00e51 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -856,9 +856,11 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, if (!(ptr = get_buffer( buffer, sizeof(buffer), len ))) break; ret = callback( hwnd, msg, wParam, (LPARAM)ptr, result, arg ); - if (*result && wParam) + if (wParam) { - RtlUnicodeToMultiByteN( str, wParam - 1, &len, ptr, strlenW(ptr) * sizeof(WCHAR) ); + len = 0; + if (*result) + RtlUnicodeToMultiByteN( str, wParam - 1, &len, ptr, strlenW(ptr) * sizeof(WCHAR) ); str[len] = 0; *result = len; } @@ -1091,10 +1093,13 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN if (!(ptr = get_buffer( buffer, sizeof(buffer), len ))) break; ret = callback( hwnd, msg, wParam, (LPARAM)ptr, result, arg ); - if (*result && len) + if (len) { - RtlMultiByteToUnicodeN( (LPWSTR)lParam, wParam*sizeof(WCHAR), &len, ptr, strlen(ptr)+1 ); - *result = len/sizeof(WCHAR) - 1; /* do not count terminating null */ + if (*result) + { + RtlMultiByteToUnicodeN( (LPWSTR)lParam, wParam*sizeof(WCHAR), &len, ptr, strlen(ptr)+1 ); + *result = len/sizeof(WCHAR) - 1; /* do not count terminating null */ + } ((LPWSTR)lParam)[*result] = 0; } free_buffer( buffer, ptr );

1 0

Alexandre Julliard : server: Create the named pipe and mailslot devices under \Device.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: 846dc62355db50237711f07037d20e549d11c641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846dc62355db50237711f0703… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 22 12:01:16 2007 +0100 server: Create the named pipe and mailslot devices under \Device. Add appropriate symlinks to them in the \?? directory. --- server/directory.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/server/directory.c b/server/directory.c index 006d959..55c3264 100644 --- a/server/directory.c +++ b/server/directory.c @@ -302,55 +302,67 @@ void init_directories(void) static const WCHAR dir_driverW[] = {'D','r','i','v','e','r'}; static const WCHAR dir_deviceW[] = {'D','e','v','i','c','e'}; static const WCHAR dir_basenamedW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s'}; + static const WCHAR dir_named_pipeW[] = {'\\','D','e','v','i','c','e','\\','N','a','m','e','d','P','i','p','e'}; + static const WCHAR dir_mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t'}; static const struct unicode_str dir_global_str = {dir_globalW, sizeof(dir_globalW)}; static const struct unicode_str dir_driver_str = {dir_driverW, sizeof(dir_driverW)}; static const struct unicode_str dir_device_str = {dir_deviceW, sizeof(dir_deviceW)}; static const struct unicode_str dir_basenamed_str = {dir_basenamedW, sizeof(dir_basenamedW)}; + static const struct unicode_str dir_named_pipe_str = {dir_named_pipeW, sizeof(dir_named_pipeW)}; + static const struct unicode_str dir_mailslot_str = {dir_mailslotW, sizeof(dir_mailslotW)}; /* symlinks */ static const WCHAR link_dosdevW[] = {'D','o','s','D','e','v','i','c','e','s'}; static const WCHAR link_globalW[] = {'G','l','o','b','a','l'}; static const WCHAR link_localW[] = {'L','o','c','a','l'}; + static const WCHAR link_pipeW[] = {'P','I','P','E'}; + static const WCHAR link_mailslotW[] = {'M','A','I','L','S','L','O','T'}; static const struct unicode_str link_dosdev_str = {link_dosdevW, sizeof(link_dosdevW)}; static const struct unicode_str link_global_str = {link_globalW, sizeof(link_globalW)}; static const struct unicode_str link_local_str = {link_localW, sizeof(link_localW)}; + static const struct unicode_str link_pipe_str = {link_pipeW, sizeof(link_pipeW)}; + static const struct unicode_str link_mailslot_str = {link_mailslotW, sizeof(link_mailslotW)}; /* devices */ - static const WCHAR pipeW[] = {'P','I','P','E'}; - static const WCHAR mailslotW[] = {'M','A','I','L','S','L','O','T'}; - static const struct unicode_str pipe_str = {pipeW, sizeof(pipeW)}; + static const WCHAR named_pipeW[] = {'N','a','m','e','d','P','i','p','e'}; + static const WCHAR mailslotW[] = {'M','a','i','l','S','l','o','t'}; + static const struct unicode_str named_pipe_str = {named_pipeW, sizeof(named_pipeW)}; static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed; - struct symlink *link_dosdev, *link_global1, *link_global2, *link_local; + struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_pipe, *link_mailslot; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); dir_driver = create_directory( root_directory, &dir_driver_str, 0, HASH_SIZE ); dir_device = create_directory( root_directory, &dir_device_str, 0, HASH_SIZE ); make_object_static( &root_directory->obj ); make_object_static( &dir_driver->obj ); - make_object_static( &dir_device->obj ); dir_global = create_directory( NULL, &dir_global_str, 0, HASH_SIZE ); /* use a larger hash table for this one since it can contain a lot of objects */ dir_basenamed = create_directory( NULL, &dir_basenamed_str, 0, 37 ); + /* devices */ + create_named_pipe_device( dir_device, &named_pipe_str ); + create_mailslot_device( dir_device, &mailslot_str ); + /* symlinks */ link_dosdev = create_symlink( root_directory, &link_dosdev_str, 0, &dir_global_str ); link_global1 = create_symlink( dir_global, &link_global_str, 0, &dir_global_str ); link_global2 = create_symlink( dir_basenamed, &link_global_str, 0, &dir_basenamed_str ); link_local = create_symlink( dir_basenamed, &link_local_str, 0, &dir_basenamed_str ); + link_pipe = create_symlink( dir_global, &link_pipe_str, 0, &dir_named_pipe_str ); + link_mailslot = create_symlink( dir_global, &link_mailslot_str, 0, &dir_mailslot_str ); make_object_static( (struct object *)link_dosdev ); make_object_static( (struct object *)link_global1 ); make_object_static( (struct object *)link_global2 ); make_object_static( (struct object *)link_local ); - - /* devices */ - create_named_pipe_device( dir_global, &pipe_str ); - create_mailslot_device( dir_global, &mailslot_str ); + make_object_static( (struct object *)link_pipe ); + make_object_static( (struct object *)link_mailslot ); /* the symlinks or devices hold references so we can release these */ release_object( dir_global ); + release_object( dir_device ); release_object( dir_basenamed ); }

1 0

Juan Lang : wine.inf: Move fake rundll32 to the system directory.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: c6bf5108daa4aa7970a85913fddf5ac4e53d39ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bf5108daa4aa7970a85913f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Mar 19 18:08:53 2007 -0700 wine.inf: Move fake rundll32 to the system directory. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index ebefa21..ec9c602 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2156,7 +2156,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDllsSection] 10,,notepad.exe 10,,regedit.exe -10,,rundll32.exe 10,,winebrowser.exe 10,,winhelp.exe 10,command,start.exe @@ -2198,6 +2197,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,riched20.dll 11,,riched32.dll 11,,rpcrt4.dll +11,,rundll32.exe 11,,setupapi.dll 11,,shdocvw.dll 11,,shell32.dll

1 0

Louis Lenders : kernel32: Print a fixme only once.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: b335a25638d4d54391f606522944e173ec603707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b335a25638d4d54391f606522… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Mar 22 08:51:57 2007 +0000 kernel32: Print a fixme only once. --- dlls/kernel32/actctx.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index af05fef..a0bd3c1 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -87,7 +87,16 @@ HANDLE WINAPI CreateActCtxW(PCACTCTXW pActCtx) */ BOOL WINAPI ActivateActCtx(HANDLE hActCtx, ULONG_PTR *ulCookie) { - FIXME("%p %p\n", hActCtx, ulCookie ); + static BOOL reported = FALSE; + + if (reported) + TRACE("%p %p\n", hActCtx, ulCookie); + else + { + FIXME("%p %p\n", hActCtx, ulCookie); + reported = TRUE; + } + if (ulCookie) *ulCookie = ACTCTX_FAKE_COOKIE; return TRUE; @@ -100,7 +109,16 @@ BOOL WINAPI ActivateActCtx(HANDLE hActCtx, ULONG_PTR *ulCookie) */ BOOL WINAPI DeactivateActCtx(DWORD dwFlags, ULONG_PTR ulCookie) { - FIXME("%08x %08lx\n", dwFlags, ulCookie); + static BOOL reported = FALSE; + + if (reported) + TRACE("%08x %08lx\n", dwFlags, ulCookie); + else + { + FIXME("%08x %08lx\n", dwFlags, ulCookie); + reported = TRUE; + } + if (ulCookie != ACTCTX_FAKE_COOKIE) return FALSE; return TRUE;

1 0

Damjan Jovanovic : ws2_32: WSASendTo should always re-enable the FD_WRITE event.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: e39dca6af6c87a30ab1d907c0468de2602a6e442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39dca6af6c87a30ab1d907c0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Mar 22 08:03:28 2007 +0200 ws2_32: WSASendTo should always re-enable the FD_WRITE event. --- dlls/ws2_32/socket.c | 2 + dlls/ws2_32/tests/sock.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9be5535..a872f7a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2930,6 +2930,8 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); goto err_free; } + else + _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); *lpNumberOfBytesSent = n; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bd01bd3..6ae9180 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1729,6 +1729,146 @@ end: HeapFree(GetProcessHeap(), 0, buffer); } +static void test_write_events(void) +{ + SOCKET src = INVALID_SOCKET; + SOCKET server = INVALID_SOCKET; + SOCKET dst = INVALID_SOCKET; + HANDLE hThread = NULL; + HANDLE hEvent = INVALID_HANDLE_VALUE; + struct sockaddr_in addr; + int len; + u_long one = 1; + int ret; + + src = socket(AF_INET, SOCK_STREAM, 0); + if (src == INVALID_SOCKET) + { + ok(0, "socket failed, error %d\n", WSAGetLastError()); + goto end; + } + + server = socket(AF_INET, SOCK_STREAM, 0); + if (server == INVALID_SOCKET) + { + ok(0, "socket failed, error %d\n", WSAGetLastError()); + goto end; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); + if (ret != 0) + { + ok(0, "bind failed, error %d\n", WSAGetLastError()); + goto end; + } + + len = sizeof(addr); + ret = getsockname(server, (struct sockaddr*)&addr, &len); + if (ret != 0) + { + ok(0, "getsockname failed, error %d\n", WSAGetLastError()); + goto end; + } + + ret = listen(server, 1); + if (ret != 0) + { + ok(0, "listen failed, error %d\n", WSAGetLastError()); + goto end; + } + + ret = connect(src, (struct sockaddr*)&addr, sizeof(addr)); + if (ret != 0) + { + ok(0, "connect failed, error %d\n", WSAGetLastError()); + goto end; + } + + len = sizeof(addr); + dst = accept(server, (struct sockaddr*)&addr, &len); + if (dst == INVALID_SOCKET) + { + ok(0, "accept failed, error %d\n", WSAGetLastError()); + goto end; + } + + hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, NULL); + if (hThread == NULL) + { + ok(0, "CreateThread failed, error %d\n", GetLastError()); + goto end; + } + + hEvent = CreateEventW(NULL, FALSE, TRUE, NULL); + if (hEvent == INVALID_HANDLE_VALUE) + { + ok(0, "CreateEventW failed, error %d\n", GetLastError()); + goto end; + } + + ret = ioctlsocket(src, FIONBIO, &one); + if (ret) + { + ok(0, "ioctlsocket failed, error %d\n", WSAGetLastError()); + goto end; + } + + ret = WSAEventSelect(src, hEvent, FD_WRITE | FD_CLOSE); + if (ret) + { + ok(0, "WSAEventSelect failed, error %d\n", ret); + goto end; + } + + for (len = 100; len > 0; --len) + { + WSANETWORKEVENTS netEvents; + DWORD dwRet = WaitForSingleObject(hEvent, 5000); + if (dwRet != WAIT_OBJECT_0) + { + ok(0, "WaitForSingleObject failed, error %d\n", dwRet); + goto end; + } + + ret = WSAEnumNetworkEvents(src, NULL, &netEvents); + if (ret) + { + ok(0, "WSAEnumNetworkEvents failed, error %d\n", ret); + goto end; + } + + if (netEvents.lNetworkEvents & FD_WRITE) + { + ret = send(src, "a", 1, 0); + if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK) + { + ok(0, "send failed, error %d\n", WSAGetLastError()); + goto end; + } + } + + if (netEvents.lNetworkEvents & FD_CLOSE) + { + ok(0, "unexpected close\n"); + goto end; + } + } + +end: + if (src != INVALID_SOCKET) + closesocket(src); + if (server != INVALID_SOCKET) + closesocket(server); + if (dst != INVALID_SOCKET) + closesocket(dst); + if (hThread != NULL) + CloseHandle(hThread); + CloseHandle(hEvent); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -1763,6 +1903,7 @@ START_TEST( sock ) test_inet_addr(); test_send(); + test_write_events(); Exit(); }

1 0

Alexandre Julliard : server: Implemented the open_file method for named pipe and mailslot devices.
by Alexandre Julliard March 22, 2007

March 22, 2007

Module: wine Branch: master Commit: 94655c8493d938c3951fd9c2efd2c81253dd95a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94655c8493d938c3951fd9c2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 22 11:52:40 2007 +0100 server: Implemented the open_file method for named pipe and mailslot devices. --- dlls/ntdll/file.c | 1 + include/wine/server_protocol.h | 3 ++- server/fd.c | 10 ++++------ server/mailslot.c | 10 +++++++++- server/named_pipe.c | 10 +++++++++- server/protocol.def | 1 + server/trace.c | 1 + 7 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0b22583..2a2f9d2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -218,6 +218,7 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB req->attributes = attr->Attributes; req->rootdir = attr->RootDirectory; req->sharing = sharing; + req->options = options; wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); io->u.Status = wine_server_call( req ); *handle = reply->handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 726d833..c0d628f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1035,6 +1035,7 @@ struct open_file_object_request unsigned int attributes; obj_handle_t rootdir; unsigned int sharing; + unsigned int options; /* VARARG(filename,unicode_str); */ }; struct open_file_object_reply @@ -4699,6 +4700,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 285 +#define SERVER_PROTOCOL_VERSION 286 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index cefdc16..fba6907 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1871,7 +1871,7 @@ DECL_HANDLER(open_file_object) { struct unicode_str name; struct directory *root = NULL; - struct object *obj; + struct object *obj, *result; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) @@ -1879,12 +1879,10 @@ DECL_HANDLER(open_file_object) if ((obj = open_object_dir( root, &name, req->attributes, NULL ))) { - /* make sure this is a valid file object */ - struct fd *fd = get_obj_fd( obj ); - if (fd) + if ((result = obj->ops->open_file( obj, req->access, req->sharing, req->options ))) { - reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); - release_object( fd ); + reply->handle = alloc_handle( current->process, result, req->access, req->attributes ); + release_object( result ); } release_object( obj ); } diff --git a/server/mailslot.c b/server/mailslot.c index af2b25b..9391e13 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -154,6 +154,8 @@ static void mailslot_device_dump( struct object *obj, int verbose ); static struct fd *mailslot_device_get_fd( struct object *obj ); static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *mailslot_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); static void mailslot_device_destroy( struct object *obj ); static enum server_fd_type mailslot_device_get_file_info( struct fd *fd, int *flags ); @@ -169,7 +171,7 @@ static const struct object_ops mailslot_device_ops = mailslot_device_get_fd, /* get_fd */ no_map_access, /* map_access */ mailslot_device_lookup_name, /* lookup_name */ - no_open_file, /* open_file */ + mailslot_device_open_file, /* open_file */ fd_close_handle, /* close_handle */ mailslot_device_destroy /* destroy */ }; @@ -293,6 +295,12 @@ static struct object *mailslot_device_lookup_name( struct object *obj, struct un return found; } +static struct object *mailslot_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + static void mailslot_device_destroy( struct object *obj ) { struct mailslot_device *device = (struct mailslot_device*)obj; diff --git a/server/named_pipe.c b/server/named_pipe.c index 0e1aeab..e121c91 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -202,6 +202,8 @@ static void named_pipe_device_dump( struct object *obj, int verbose ); static struct fd *named_pipe_device_get_fd( struct object *obj ); static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *named_pipe_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); static void named_pipe_device_destroy( struct object *obj ); static enum server_fd_type named_pipe_device_get_file_info( struct fd *fd, int *flags ); @@ -217,7 +219,7 @@ static const struct object_ops named_pipe_device_ops = named_pipe_device_get_fd, /* get_fd */ pipe_map_access, /* map_access */ named_pipe_device_lookup_name, /* lookup_name */ - no_open_file, /* open_file */ + named_pipe_device_open_file, /* open_file */ fd_close_handle, /* close_handle */ named_pipe_device_destroy /* destroy */ }; @@ -434,6 +436,12 @@ static struct object *named_pipe_device_lookup_name( struct object *obj, struct return found; } +static struct object *named_pipe_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + static void named_pipe_device_destroy( struct object *obj ) { struct named_pipe_device *device = (struct named_pipe_device*)obj; diff --git a/server/protocol.def b/server/protocol.def index 1e7cb8b..8e7875c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -861,6 +861,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; unsigned int attributes; /* open attributes */ obj_handle_t rootdir; /* root directory */ unsigned int sharing; /* sharing flags */ + unsigned int options; /* file options */ VARARG(filename,unicode_str); /* file name */ @REPLY obj_handle_t handle; /* handle to the file */ diff --git a/server/trace.c b/server/trace.c index ed42650..c3ffe18 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1249,6 +1249,7 @@ static void dump_open_file_object_request( const struct open_file_object_request fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " sharing=%08x,", req->sharing ); + fprintf( stderr, " options=%08x,", req->options ); fprintf( stderr, " filename=" ); dump_varargs_unicode_str( cur_size ); }

1 0