January 2008 - Wine-commits

Rob Shearman : rpcrt4: Update todos.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: c8b3dc40a4c1f1c6d1ec20253c197ab93632d78b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b3dc40a4c1f1c6d1ec20253… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 4 16:23:23 2008 +0000 rpcrt4: Update todos. --- dlls/rpcrt4/ndr_marshall.c | 1 - dlls/rpcrt4/rpc_server.c | 3 -- dlls/rpcrt4/rpcrt4_main.c | 61 -------------------------------------------- 3 files changed, 0 insertions(+), 65 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3b6106f..b3c7df8 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - Non-conformant strings * - String structs * - Byte count pointers * - transmit_as/represent as diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 34c71c7..3db7365 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -17,9 +17,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * TODO: - * - a whole lot */ #include "config.h" diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index e48cf58..a4559f9 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -19,74 +19,13 @@ * * WINE RPC TODO's (and a few TODONT's) * - * - Ove's decreasingly incomplete widl is an IDL compiler for wine. For widl - * to be wine's only IDL compiler, a fair bit of work remains to be done. - * until then we have used some midl-generated stuff. (What?) - * widl currently doesn't generate stub/proxy files required by wine's (O)RPC - * capabilities -- nor does it make those lovely format strings :( - * The MS MIDL compiler does some really esoteric stuff. Of course Ove has - * started with the less esoteric stuff. There are also lots of nice - * comments in there if you want to flex your bison and help build this monster. - * - * - RPC has a quite featureful error handling mechanism; basically none of this is - * implemented right now. We also have deficiencies on the compiler side, where - * wine's __TRY / __EXCEPT / __FINALLY macros are not even used for RpcTryExcept & co, - * due to syntactic differences! (we can fix it with widl by using __TRY) - * - * - There are several different memory allocation schemes for MSRPC. - * I don't even understand what they all are yet, much less have them - * properly implemented. Surely we are supposed to be doing something with - * the user-provided allocation/deallocation functions, but so far, - * I don't think we are doing this... - * - * - MSRPC provides impersonation capabilities which currently are not possible - * to implement in wine. At the very least we should implement the authorization - * API's & gracefully ignore the irrelevant stuff (to an extent we already do). - * - * - Some transports are not yet implemented. The existing transport implementations - * are incomplete and may be bug-infested. - * - * - The various transports that we do support ought to be supported in a more - * object-oriented manner, as in DCE's RPC implementation, instead of cluttering - * up the code with conditionals like we do now. - * - * - Data marshalling: So far, only the beginnings of a full implementation - * exist in wine. NDR protocol itself is documented, but the MS API's to - * convert data-types in memory into NDR are not. This is challenging work, - * and has supposedly been "at the top of Greg's queue" for several months now. - * - * - ORPC is RPC for OLE; once we have a working RPC framework, we can - * use it to implement out-of-process OLE client/server communications. - * ATM there is maybe a disconnect between the marshalling in the OLE DLLs - * and the marshalling going on here [TODO: well, is there or not?] - * - * - In-source API Documentation, at least for those functions which we have - * implemented, but preferably for everything we can document, would be nice, - * since some of this stuff is quite obscure. - * - * - Name services... [TODO: what about them] - * - * - Protocol Towers: Totally unimplemented.... I think. - * - * - Context Handle Rundown: whatever that is. - * - * - Nested RPC's: Totally unimplemented. - * * - Statistics: we are supposed to be keeping various counters. we aren't. * * - Async RPC: Unimplemented. * - * - XML/http RPC: Somewhere there's an XML fiend that wants to do this! Betcha - * we could use these as a transport for RPC's across computers without a - * permissions and/or licensing crisis. - * * - The NT "ports" API, aka LPC. Greg claims this is on his radar. Might (or * might not) enable users to get some kind of meaningful result out of * NT-based native rpcrt4's. Commonly-used transport for self-to-self RPC's. - * - * - ...? More stuff I haven't thought of. If you think of more RPC todo's - * drop me an e-mail <gmturner007(a)ameritech.net> or send a patch to the - * wine-patches mailing list. */ #include "config.h"

1 0

Hans Leidekker : kernel32: Fix two test failures on Win98 due to missing GetTempPathW.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: b7917bcfda8ad391813fb758acae8c19ca912936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7917bcfda8ad391813fb758a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 4 15:48:32 2008 +0100 kernel32: Fix two test failures on Win98 due to missing GetTempPathW. --- dlls/kernel32/tests/change.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 3c5ace3..bb1f73d 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -387,7 +387,13 @@ static void test_readdirectorychanges(void) return; } + SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); + if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("GetTempPathW is not implemented\n"); + return; + } ok( r != 0, "temp path failed\n"); if (!r) return; @@ -600,8 +606,13 @@ static void test_readdirectorychanges_null(void) skip("ReadDirectoryChangesW is not available\n"); return; } - + SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); + if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("GetTempPathW is not implemented\n"); + return; + } ok( r != 0, "temp path failed\n"); if (!r) return;

1 0

Hans Leidekker : kernel32: Add Surinam Dutch and Belgian Dutch translations of language group names.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 16d5be1f2fa0379c4427339e3bde3d65e9d95794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d5be1f2fa0379c4427339e3… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 4 15:48:48 2008 +0100 kernel32: Add Surinam Dutch and Belgian Dutch translations of language group names. --- dlls/kernel32/nls/nlb.nls | 34 +++++++++++++++++----------------- dlls/kernel32/nls/nls.nls | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/nls/nlb.nls b/dlls/kernel32/nls/nlb.nls index 553bf86..12eec82 100644 --- a/dlls/kernel32/nls/nlb.nls +++ b/dlls/kernel32/nls/nlb.nls @@ -135,21 +135,21 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_BELGIAN LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "West Europa en Verenigde Staten" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Centraal Europa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" + LGRPID_GREEK+LGRPID_RES_BASE "Grieks" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Turks" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japans" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreaans" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditioneel Chinees" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Vereenvoudigd Chinees" + LGRPID_THAI+LGRPID_RES_BASE "Thais" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebreeuws" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamees" + LGRPID_INDIC+LGRPID_RES_BASE "Indisch" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armeens" } diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls index 6d2b825..bac2404 100644 --- a/dlls/kernel32/nls/nls.nls +++ b/dlls/kernel32/nls/nls.nls @@ -141,21 +141,21 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "West Europa en Verenigde Staten" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Centraal Europa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" + LGRPID_GREEK+LGRPID_RES_BASE "Grieks" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Turks" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japans" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreaans" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditioneel Chinees" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Vereenvoudigd Chinees" + LGRPID_THAI+LGRPID_RES_BASE "Thais" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebreeuws" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamees" + LGRPID_INDIC+LGRPID_RES_BASE "Indisch" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armeens" }

1 0

Hans Leidekker : tools/wine.desktop: Add Dutch translation.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: e6455c601bec49f3046f3780ae6565a97f512fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6455c601bec49f3046f3780a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 4 15:49:09 2008 +0100 tools/wine.desktop: Add Dutch translation. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index c57b844..a2165f9 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -2,6 +2,7 @@ Type=Application Name=Wine Windows Emulator Name[de]=Wine Windows-Emulator +Name[nl]=Wine Windows-emulator Name[sv]=Windows-emulatorn Wine Name[ru]=Wine Эмулятор Windows Name[fr]=Émulateur Windows Wine

1 0

Alexandre Julliard : mountmgr.sys: Create disk devices for all configured drives.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 2143dee78a0acf8be8c07062e84cc12ef18ef7cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2143dee78a0acf8be8c07062e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 14:24:59 2008 +0100 mountmgr.sys: Create disk devices for all configured drives. --- dlls/mountmgr.sys/mountmgr.c | 199 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 199 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index f6c0f20..c24c78c 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -38,6 +38,178 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); +#define MAX_DOS_DRIVES 26 +#define MAX_MOUNT_POINTS (2 * MAX_DOS_DRIVES) + +/* extra info for disk devices, stored in DeviceExtension */ +struct disk_device_info +{ + UNICODE_STRING name; /* device name */ +}; + +struct mount_point +{ + DEVICE_OBJECT *device; + UNICODE_STRING link; /* DOS device symlink */ + void *id; /* device unique id */ + unsigned int id_len; +}; + +static struct mount_point mount_points[MAX_MOUNT_POINTS]; + +static inline UNICODE_STRING *get_device_name( DEVICE_OBJECT *dev ) +{ + return &((struct disk_device_info *)dev->DeviceExtension)->name; +} + +/* read a Unix symlink; returned buffer must be freed by caller */ +static char *read_symlink( const char *path ) +{ + char *buffer; + int ret, size = 128; + + for (;;) + { + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return 0; + } + ret = readlink( path, buffer, size ); + if (ret == -1) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + return 0; + } + if (ret != size) + { + buffer[ret] = 0; + return buffer; + } + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + size *= 2; + } +} + +static NTSTATUS create_disk_device( DRIVER_OBJECT *driver, DWORD type, DEVICE_OBJECT **dev_obj ) +{ + static const WCHAR harddiskW[] = {'\\','D','e','v','i','c','e', + '\\','H','a','r','d','d','i','s','k','V','o','l','u','m','e','%','u',0}; + static const WCHAR cdromW[] = {'\\','D','e','v','i','c','e','\\','C','d','R','o','m','%','u',0}; + static const WCHAR floppyW[] = {'\\','D','e','v','i','c','e','\\','F','l','o','p','p','y','%','u',0}; + + UINT i, first = 0; + NTSTATUS status = 0; + const WCHAR *format; + UNICODE_STRING name; + struct disk_device_info *info; + + switch(type) + { + case DRIVE_REMOVABLE: + format = floppyW; + break; + case DRIVE_CDROM: + format = cdromW; + break; + case DRIVE_FIXED: + default: /* FIXME */ + format = harddiskW; + first = 1; /* harddisk volumes start counting from 1 */ + break; + } + + name.MaximumLength = (strlenW(format) + 10) * sizeof(WCHAR); + name.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, name.MaximumLength ); + for (i = first; i < 32; i++) + { + sprintfW( name.Buffer, format, i ); + name.Length = strlenW(name.Buffer) * sizeof(WCHAR); + status = IoCreateDevice( driver, sizeof(*info), &name, 0, 0, FALSE, dev_obj ); + if (status != STATUS_OBJECT_NAME_COLLISION) break; + } + if (!status) + { + info = (*dev_obj)->DeviceExtension; + info->name = name; + } + else + { + FIXME( "IoCreateDevice %s got %x\n", debugstr_w(name.Buffer), status ); + RtlFreeUnicodeString( &name ); + } + return status; +} + + +static NTSTATUS add_mount_point( DRIVER_OBJECT *driver, DWORD type, int drive, + const void *id, unsigned int id_len ) +{ + static const WCHAR driveW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','%','c',':',0}; + static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{', + '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; + WCHAR *drive_link, *volume_link; + NTSTATUS status; + GUID guid; + UINT i; + struct mount_point *mount_drive = NULL, *mount_volume = NULL; + + /* find two free mount points */ + + for (i = 0; i < MAX_MOUNT_POINTS; i++) + { + if (mount_points[i].device) continue; + if (!mount_drive) + { + mount_drive = &mount_points[i]; + continue; + } + mount_volume = &mount_points[i]; + break; + } + if (!mount_volume) return STATUS_NO_MEMORY; + + /* create the volume */ + + memset( &guid, 0, sizeof(guid) ); /* FIXME */ + guid.Data4[7] = 'A' + drive; + + drive_link = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(driveW) ); + volume_link = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(volumeW) ); + sprintfW( drive_link, driveW, 'A' + drive ); + sprintfW( volume_link, volumeW, guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + + RtlInitUnicodeString( &mount_drive->link, drive_link ); + RtlInitUnicodeString( &mount_volume->link, volume_link ); + status = create_disk_device( driver, type, &mount_drive->device ); + if (status) + { + RtlFreeUnicodeString( &mount_drive->link ); + RtlFreeUnicodeString( &mount_volume->link ); + return status; + } + + mount_volume->device = mount_drive->device; /* FIXME: incr ref count */ + mount_drive->id = RtlAllocateHeap( GetProcessHeap(), 0, id_len ); + mount_drive->id_len = id_len; + memcpy( mount_drive->id, id, id_len ); + mount_volume->id = RtlAllocateHeap( GetProcessHeap(), 0, id_len ); + mount_volume->id_len = id_len; + memcpy( mount_volume->id, id, id_len ); + + IoCreateSymbolicLink( &mount_drive->link, get_device_name(mount_drive->device) ); + IoCreateSymbolicLink( &mount_volume->link, get_device_name(mount_volume->device) ); + + TRACE( "created device %s symlinks %s %s\n", debugstr_w(get_device_name(mount_drive->device)->Buffer), + debugstr_w(mount_drive->link.Buffer), debugstr_w(mount_volume->link.Buffer) ); + + return STATUS_SUCCESS; +} + /* handler for ioctls on the mount manager device */ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) { @@ -78,6 +250,31 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) return irp->IoStatus.u.Status; } +/* create mount points for mapped drives */ +static void create_drive_mount_points( DRIVER_OBJECT *driver ) +{ + const char *config_dir = wine_get_config_dir(); + char *buffer, *p, *link; + unsigned int i; + + if ((buffer = RtlAllocateHeap( GetProcessHeap(), 0, + strlen(config_dir) + sizeof("/dosdevices/a:") ))) + { + strcpy( buffer, config_dir ); + strcat( buffer, "/dosdevices/a:" ); + p = buffer + strlen(buffer) - 2; + + for (i = 0; i < MAX_DOS_DRIVES; i++) + { + *p = 'a' + i; + if (!(link = read_symlink( buffer ))) continue; + add_mount_point( driver, DRIVE_FIXED, i, link, strlen(link) ); + RtlFreeHeap( GetProcessHeap(), 0, link ); + } + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + } +} + /* driver entry point for the harddisk driver */ static NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { @@ -101,6 +298,8 @@ static NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STR return status; } + create_drive_mount_points( driver ); + return status; }

1 0

Alexandre Julliard : mountmgr.sys: Add devices to the MountedDevices registry key.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 6befc98dba09aae816692da159be4fb3431b2a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6befc98dba09aae816692da15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 14:27:53 2008 +0100 mountmgr.sys: Add devices to the MountedDevices registry key. --- dlls/mountmgr.sys/mountmgr.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index c24c78c..875bd79 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "winternl.h" #include "winioctl.h" +#include "winreg.h" #include "ddk/wdm.h" #include "ddk/mountmgr.h" #include "wine/library.h" @@ -56,6 +57,7 @@ struct mount_point }; static struct mount_point mount_points[MAX_MOUNT_POINTS]; +static HKEY mount_key; static inline UNICODE_STRING *get_device_name( DEVICE_OBJECT *dev ) { @@ -207,6 +209,11 @@ static NTSTATUS add_mount_point( DRIVER_OBJECT *driver, DWORD type, int drive, TRACE( "created device %s symlinks %s %s\n", debugstr_w(get_device_name(mount_drive->device)->Buffer), debugstr_w(mount_drive->link.Buffer), debugstr_w(mount_volume->link.Buffer) ); + RegSetValueExW( mount_key, mount_drive->link.Buffer, 0, REG_BINARY, + mount_drive->id, mount_drive->id_len ); + RegSetValueExW( mount_key, mount_volume->link.Buffer, 0, REG_BINARY, + mount_volume->id, mount_volume->id_len ); + return STATUS_SUCCESS; } @@ -278,6 +285,8 @@ static void create_drive_mount_points( DRIVER_OBJECT *driver ) /* driver entry point for the harddisk driver */ static NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { + static const WCHAR mounted_devicesW[] = {'S','y','s','t','e','m','\\', + 'M','o','u','n','t','e','d','D','e','v','i','c','e','s',0}; static const WCHAR harddisk0W[] = {'\\','D','e','v','i','c','e', '\\','H','a','r','d','d','i','s','k','0',0}; static const WCHAR physdrive0W[] = {'\\','?','?','\\','P','h','y','s','i','c','a','l','D','r','i','v','e','0',0}; @@ -288,6 +297,9 @@ static NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STR driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = harddisk_ioctl; + RegCreateKeyExW( HKEY_LOCAL_MACHINE, mounted_devicesW, 0, NULL, + REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &mount_key, NULL ); + RtlInitUnicodeString( &nameW, harddisk0W ); RtlInitUnicodeString( &linkW, physdrive0W ); if (!(status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device )))

1 0

Alexandre Julliard : mountmgr.sys: Implemented the IOCTL_MOUNTMGR_QUERY_POINTS request.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 838f12539bf54370d0c344d8b6d880ac303ffb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=838f12539bf54370d0c344d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 14:28:47 2008 +0100 mountmgr.sys: Implemented the IOCTL_MOUNTMGR_QUERY_POINTS request. --- dlls/mountmgr.sys/mountmgr.c | 97 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 875bd79..1ea73e4 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -217,6 +217,94 @@ static NTSTATUS add_mount_point( DRIVER_OBJECT *driver, DWORD type, int drive, return STATUS_SUCCESS; } +/* check if a given mount point matches the requested specs */ +static BOOL matching_mount_point( const struct mount_point *mount, const MOUNTMGR_MOUNT_POINT *spec ) +{ + if (spec->SymbolicLinkNameOffset) + { + const WCHAR *name = (const WCHAR *)((const char *)spec + spec->SymbolicLinkNameOffset); + if (spec->SymbolicLinkNameLength != mount->link.Length) return FALSE; + if (memicmpW( name, mount->link.Buffer, mount->link.Length/sizeof(WCHAR))) + return FALSE; + } + if (spec->DeviceNameOffset) + { + const WCHAR *name = (const WCHAR *)((const char *)spec + spec->DeviceNameOffset); + const UNICODE_STRING *dev_name = get_device_name( mount->device ); + if (spec->DeviceNameLength != dev_name->Length) return FALSE; + if (memicmpW( name, dev_name->Buffer, dev_name->Length/sizeof(WCHAR))) + return FALSE; + } + if (spec->UniqueIdOffset) + { + const void *id = ((const char *)spec + spec->UniqueIdOffset); + if (spec->UniqueIdLength != mount->id_len) return FALSE; + if (memcmp( id, mount->id, mount->id_len )) return FALSE; + } + return TRUE; +} + +/* implementation of IOCTL_MOUNTMGR_QUERY_POINTS */ +static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, + void *out_buff, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +{ + UINT i, j, pos, size; + const MOUNTMGR_MOUNT_POINT *input = in_buff; + MOUNTMGR_MOUNT_POINTS *info = out_buff; + UNICODE_STRING *dev_name; + + /* sanity checks */ + if (input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength > insize || + input->UniqueIdOffset + input->UniqueIdLength > insize || + input->DeviceNameOffset + input->DeviceNameLength > insize || + input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength < input->SymbolicLinkNameOffset || + input->UniqueIdOffset + input->UniqueIdLength < input->UniqueIdOffset || + input->DeviceNameOffset + input->DeviceNameLength < input->DeviceNameOffset) + return STATUS_INVALID_PARAMETER; + + for (i = j = size = 0; i < MAX_MOUNT_POINTS; i++) + { + if (!mount_points[i].device) continue; + if (!matching_mount_point( &mount_points[i], input )) continue; + size += get_device_name(mount_points[i].device)->Length; + size += mount_points[i].link.Length; + j++; + } + pos = FIELD_OFFSET( MOUNTMGR_MOUNT_POINTS, MountPoints[j] ); + size += pos; + + if (size > outsize) + { + if (size >= sizeof(info->Size)) info->Size = size; + iosb->Information = sizeof(info->Size); + return STATUS_MORE_ENTRIES; + } + + info->NumberOfMountPoints = j; + for (i = j = 0; i < MAX_MOUNT_POINTS; i++) + { + if (!mount_points[i].device) continue; + if (!matching_mount_point( &mount_points[i], input )) continue; + info->MountPoints[j].UniqueIdOffset = 0; /* FIXME */ + info->MountPoints[j].UniqueIdLength = 0; + + dev_name = get_device_name( mount_points[i].device ); + info->MountPoints[j].DeviceNameOffset = pos; + info->MountPoints[j].DeviceNameLength = dev_name->Length; + memcpy( (char *)out_buff + pos, dev_name->Buffer, dev_name->Length ); + pos += dev_name->Length; + + info->MountPoints[j].SymbolicLinkNameOffset = pos; + info->MountPoints[j].SymbolicLinkNameLength = mount_points[i].link.Length; + memcpy( (char *)out_buff + pos, mount_points[i].link.Buffer, mount_points[i].link.Length ); + pos += mount_points[i].link.Length; + j++; + } + info->Size = pos; + iosb->Information = pos; + return STATUS_SUCCESS; +} + /* handler for ioctls on the mount manager device */ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) { @@ -229,6 +317,15 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch(irpsp->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_MOUNTMGR_QUERY_POINTS: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(MOUNTMGR_MOUNT_POINT)) + return STATUS_INVALID_PARAMETER; + irp->IoStatus.u.Status = query_mount_points( irpsp->Parameters.DeviceIoControl.Type3InputBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irp->MdlAddress->StartVa, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); + break; default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;

1 0

Alexandre Julliard : kernel32: Implemented FindFirstVolume/ FindNextVolume using the mount point manager.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 7f508df25b1e068f58e8299dd113f51b014c721e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f508df25b1e068f58e8299dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 14:31:40 2008 +0100 kernel32: Implemented FindFirstVolume/FindNextVolume using the mount point manager. --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/volume.c | 121 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 107 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7bc5db3..51eec84 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -378,10 +378,10 @@ @ stdcall FindNextChangeNotification(long) @ stdcall FindNextFileA(long ptr) @ stdcall FindNextFileW(long ptr) -@ stub FindNextVolumeA +@ stdcall FindNextVolumeA(long ptr long) @ stub FindNextVolumeMountPointA @ stub FindNextVolumeMountPointW -@ stub FindNextVolumeW +@ stdcall FindNextVolumeW(long ptr long) @ stdcall FindResourceA(long str str) @ stdcall FindResourceExA(long str str long) @ stdcall FindResourceExW(long wstr wstr long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 1869d0d..9edcf64 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -37,6 +37,7 @@ #include "winternl.h" #include "winioctl.h" #include "ntddcdrm.h" +#include "ddk/mountmgr.h" #include "kernel_private.h" #include "wine/library.h" #include "wine/unicode.h" @@ -1403,22 +1404,120 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu */ HANDLE WINAPI FindFirstVolumeA(LPSTR volume, DWORD len) { - FIXME("(%p, %d), stub!\n", volume, len); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return INVALID_HANDLE_VALUE; + WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + HANDLE handle = FindFirstVolumeW( buffer, len ); + + if (handle != INVALID_HANDLE_VALUE) + { + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, volume, len, NULL, NULL )) + { + FindVolumeClose( handle ); + handle = INVALID_HANDLE_VALUE; + } + } + HeapFree( GetProcessHeap(), 0, buffer ); + return handle; } /*********************************************************************** * FindFirstVolumeW (KERNEL32.@) */ -HANDLE WINAPI FindFirstVolumeW(LPWSTR volume, DWORD len) +HANDLE WINAPI FindFirstVolumeW( LPWSTR volume, DWORD len ) { - FIXME("(%p, %d), stub!\n", volume, len); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DWORD size = 1024; + HANDLE mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; + + for (;;) + { + MOUNTMGR_MOUNT_POINT input; + MOUNTMGR_MOUNT_POINTS *output; + + if (!(output = HeapAlloc( GetProcessHeap(), 0, size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + break; + } + memset( &input, 0, sizeof(input) ); + + if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, &input, sizeof(input), + output, size, NULL, NULL )) + { + if (GetLastError() != ERROR_MORE_DATA) break; + size = output->Size; + HeapFree( GetProcessHeap(), 0, output ); + continue; + } + CloseHandle( mgr ); + /* abuse the Size field to store the current index */ + output->Size = 0; + if (!FindNextVolumeW( output, volume, len )) + { + HeapFree( GetProcessHeap(), 0, output ); + return INVALID_HANDLE_VALUE; + } + return (HANDLE)output; + } + CloseHandle( mgr ); return INVALID_HANDLE_VALUE; } /*********************************************************************** + * FindNextVolumeA (KERNEL32.@) + */ +BOOL WINAPI FindNextVolumeA( HANDLE handle, LPSTR volume, DWORD len ) +{ + WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + BOOL ret; + + if ((ret = FindNextVolumeW( handle, buffer, len ))) + { + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, volume, len, NULL, NULL )) ret = FALSE; + } + return ret; +} + +/*********************************************************************** + * FindNextVolumeW (KERNEL32.@) + */ +BOOL WINAPI FindNextVolumeW( HANDLE handle, LPWSTR volume, DWORD len ) +{ + MOUNTMGR_MOUNT_POINTS *data = handle; + + while (data->Size < data->NumberOfMountPoints) + { + static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{',}; + WCHAR *link = (WCHAR *)((char *)data + data->MountPoints[data->Size].SymbolicLinkNameOffset); + DWORD size = data->MountPoints[data->Size].SymbolicLinkNameLength; + data->Size++; + /* skip non-volumes */ + if (size < sizeof(volumeW) || memcmp( link, volumeW, sizeof(volumeW) )) continue; + if (size + sizeof(WCHAR) >= len * sizeof(WCHAR)) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return FALSE; + } + memcpy( volume, link, size ); + volume[1] = '\\'; /* map \??\ to \\?\ */ + volume[size / sizeof(WCHAR)] = '\\'; /* Windows appends a backslash */ + volume[size / sizeof(WCHAR) + 1] = 0; + TRACE( "returning entry %u %s\n", data->Size - 1, debugstr_w(volume) ); + return TRUE; + } + SetLastError( ERROR_NO_MORE_FILES ); + return FALSE; +} + +/*********************************************************************** + * FindVolumeClose (KERNEL32.@) + */ +BOOL WINAPI FindVolumeClose(HANDLE handle) +{ + return HeapFree( GetProcessHeap(), 0, handle ); +} + +/*********************************************************************** * FindFirstVolumeMountPointA (KERNEL32.@) */ HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD len) @@ -1439,16 +1538,6 @@ HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD } /*********************************************************************** - * FindVolumeClose (KERNEL32.@) - */ -BOOL WINAPI FindVolumeClose(HANDLE handle) -{ - FIXME("(%p), stub!\n", handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** * FindVolumeMountPointClose (KERNEL32.@) */ BOOL WINAPI FindVolumeMountPointClose(HANDLE h)

1 0

Alexandre Julliard : kernel32/tests: Added tests for FindFirstVolume/ FindNextVolume.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: d17b29303cd9075123033f159339f9872c14b227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17b29303cd9075123033f159… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 14:31:55 2008 +0100 kernel32/tests: Added tests for FindFirstVolume/FindNextVolume. --- dlls/kernel32/tests/volume.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 0811ce5..94ace87 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -24,6 +24,9 @@ static HINSTANCE hdll; static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointW)(LPCWSTR, LPWSTR, DWORD); +static HANDLE (WINAPI *pFindFirstVolumeA)(LPSTR,DWORD); +static BOOL (WINAPI *pFindNextVolumeA)(HANDLE,LPSTR,DWORD); +static BOOL (WINAPI *pFindVolumeClose)(HANDLE); /* ############################### */ @@ -44,6 +47,32 @@ static void test_query_dos_deviceA(void) todo_wine ok(found, "expected at least one devicename to contain HARDDISK or RAMDISK\n"); } +static void test_FindFirstVolume(void) +{ + char volume[50]; + HANDLE handle; + + handle = pFindFirstVolumeA( volume, 0 ); + ok( handle == INVALID_HANDLE_VALUE, "succeeded with short buffer\n" ); + ok( GetLastError() == ERROR_FILENAME_EXCED_RANGE, "wrong error %u\n", GetLastError() ); + handle = pFindFirstVolumeA( volume, 49 ); + ok( handle == INVALID_HANDLE_VALUE, "succeeded with short buffer\n" ); + ok( GetLastError() == ERROR_FILENAME_EXCED_RANGE, "wrong error %u\n", GetLastError() ); + handle = pFindFirstVolumeA( volume, 50 ); + ok( handle != INVALID_HANDLE_VALUE, "failed err %u\n", GetLastError() ); + if (handle != INVALID_HANDLE_VALUE) + { + do + { + ok( strlen(volume) == 49, "bad volume name %s\n", volume ); + ok( !memcmp( volume, "\\\\?\\Volume{", 11 ), "bad volume name %s\n", volume ); + ok( !memcmp( volume + 47, "}\\", 2 ), "bad volume name %s\n", volume ); + } while (pFindNextVolumeA( handle, volume, MAX_PATH )); + ok( GetLastError() == ERROR_NO_MORE_FILES, "wrong error %u\n", GetLastError() ); + pFindVolumeClose( handle ); + } +} + static void test_GetVolumeNameForVolumeMountPointA(void) { BOOL ret; @@ -103,8 +132,12 @@ START_TEST(volume) hdll = GetModuleHandleA("kernel32.dll"); pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hdll, "GetVolumeNameForVolumeMountPointA"); pGetVolumeNameForVolumeMountPointW = (void *) GetProcAddress(hdll, "GetVolumeNameForVolumeMountPointW"); + pFindFirstVolumeA = (void *) GetProcAddress(hdll, "FindFirstVolumeA"); + pFindNextVolumeA = (void *) GetProcAddress(hdll, "FindNextVolumeA"); + pFindVolumeClose = (void *) GetProcAddress(hdll, "FindVolumeClose"); test_query_dos_deviceA(); + test_FindFirstVolume(); test_GetVolumeNameForVolumeMountPointA(); test_GetVolumeNameForVolumeMountPointW(); }

1 0

Hans Leidekker : wininet: Fix handling of host and referrer headers in HttpOpenRequest.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 4d84eb26d011df52694b47c5dfc2e42548072416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d84eb26d011df52694b47c5d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 4 13:14:00 2008 +0100 wininet: Fix handling of host and referrer headers in HttpOpenRequest. --- dlls/wininet/http.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 098d7d2..c996e0c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1413,7 +1413,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, } if (NULL != lpszReferrer && strlenW(lpszReferrer)) - HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpszReferrer, HTTP_ADDHDR_FLAG_COALESCE); + HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpszReferrer, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (lpszAcceptTypes) { @@ -1436,23 +1436,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, else if (strlenW(lpszVerb)) lpwhr->lpszVerb = WININET_strdupW(lpszVerb); - if (NULL != lpszReferrer && strlenW(lpszReferrer)) - { - WCHAR buf[MAXHOSTNAME]; - URL_COMPONENTSW UrlComponents; - - buf[0] = '\0'; - memset( &UrlComponents, 0, sizeof UrlComponents ); - UrlComponents.dwStructSize = sizeof UrlComponents; - UrlComponents.lpszHostName = buf; - UrlComponents.dwHostNameLength = MAXHOSTNAME; - - if (InternetCrackUrlW(lpszReferrer, 0, 0, &UrlComponents) && - strlenW(UrlComponents.lpszHostName)) - HTTP_ProcessHeader(lpwhr, szHost, UrlComponents.lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - } - else - HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (lpwhs->nServerPort == INTERNET_INVALID_PORT_NUMBER) lpwhs->nServerPort = (dwFlags & INTERNET_FLAG_SECURE ?

1 0