October 2008 - Wine-Commits

Alexandre Julliard : winecfg: Store the Unix device if any in the drive configuration.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: 18b66912b7f0c27cf5caca6c26295b9c915f6cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b66912b7f0c27cf5caca6c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 23 16:19:36 2008 +0200 winecfg: Store the Unix device if any in the drive configuration. --- programs/winecfg/drive.c | 35 ++++++++++++++++++++++++++--------- programs/winecfg/drivedetect.c | 16 ++++++++++------ programs/winecfg/driveui.c | 4 ++-- programs/winecfg/winecfg.h | 4 +++- 4 files changed, 41 insertions(+), 18 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 35f013b..7ee9a0e 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -93,19 +93,22 @@ long drive_available_mask(char letter) return result; } -BOOL add_drive(char letter, const char *targetpath, const WCHAR *label, DWORD serial, DWORD type) +BOOL add_drive(char letter, const char *targetpath, const char *device, const WCHAR *label, + DWORD serial, DWORD type) { int driveIndex = letter_to_index(letter); if(drives[driveIndex].in_use) return FALSE; - WINE_TRACE("letter == '%c', unixpath == '%s', label == %s, serial == %08x, type == %d\n", - letter, targetpath, wine_dbgstr_w(label), serial, type); + WINE_TRACE("letter == '%c', unixpath == %s, device == %s, label == %s, serial == %08x, type == %d\n", + letter, wine_dbgstr_a(targetpath), wine_dbgstr_a(device), + wine_dbgstr_w(label), serial, type); drives[driveIndex].letter = toupper(letter); drives[driveIndex].unixpath = strdupA(targetpath); - drives[driveIndex].label = strdupW(label); + drives[driveIndex].device = device ? strdupA(device) : NULL; + drives[driveIndex].label = label ? strdupW(label) : NULL; drives[driveIndex].serial = serial; drives[driveIndex].type = type; drives[driveIndex].in_use = TRUE; @@ -119,6 +122,8 @@ void delete_drive(struct drive *d) { HeapFree(GetProcessHeap(), 0, d->unixpath); d->unixpath = NULL; + HeapFree(GetProcessHeap(), 0, d->device); + d->device = NULL; HeapFree(GetProcessHeap(), 0, d->label); d->label = NULL; d->serial = 0; @@ -316,7 +321,7 @@ void load_drives(void) c = targetpath; do if (*c == '\\') *c = '/'; while (*c++); - add_drive(*devices, targetpath, volname, serial, get_drive_type(devices[0]) ); + add_drive(*devices, targetpath, NULL, volname, serial, get_drive_type(devices[0]) ); len -= lstrlenW(devices); devices += lstrlenW(devices); @@ -354,7 +359,7 @@ void load_drives(void) buff[cnt] = '\0'; WINE_TRACE("found broken symlink %s -> %s\n", path, buff); - add_drive('A' + i, buff, NULL, 0, DRIVE_UNKNOWN); + add_drive('A' + i, buff, NULL, NULL, 0, DRIVE_UNKNOWN); drivecount++; } @@ -388,16 +393,28 @@ void apply_drive_changes(void) drives[i].modified = FALSE; len = sizeof(*ioctl); - if (drives[i].in_use) len += strlen(drives[i].unixpath) + 1; + if (drives[i].in_use) + { + len += strlen(drives[i].unixpath) + 1; + if (drives[i].device) len += strlen(drives[i].device) + 1; + } if (!(ioctl = HeapAlloc( GetProcessHeap(), 0, len ))) continue; ioctl->size = len; ioctl->letter = 'a' + i; ioctl->device_offset = 0; if (drives[i].in_use) { + char *ptr = (char *)(ioctl + 1); + ioctl->type = drives[i].type; - ioctl->mount_point_offset = sizeof(*ioctl); - strcpy( (char *)(ioctl + 1), drives[i].unixpath ); + strcpy( ptr, drives[i].unixpath ); + ioctl->mount_point_offset = ptr - (char *)ioctl; + if (drives[i].device) + { + ptr += strlen(ptr) + 1; + strcpy( ptr, drives[i].device ); + ioctl->device_offset = ptr - (char *)ioctl; + } } else { diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 9a2b451..1c03b6f 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -235,7 +235,7 @@ static void ensure_root_is_mapped(void) { if (!drives[letter - 'A'].in_use) { - add_drive(letter, "/", NULL, 0, DRIVE_FIXED); + add_drive(letter, "/", NULL, NULL, 0, DRIVE_FIXED); WINE_TRACE("allocated drive %c as the root drive\n", letter); break; } @@ -264,7 +264,7 @@ static void ensure_home_is_mapped(void) { if (!drives[letter - 'A'].in_use) { - add_drive(letter, home, NULL, 0, DRIVE_FIXED); + add_drive(letter, home, NULL, NULL, 0, DRIVE_FIXED); WINE_TRACE("allocated drive %c as the user's home directory\n", letter); break; } @@ -292,7 +292,7 @@ static void ensure_drive_c_is_mapped(void) WCHAR label[64]; LoadStringW (GetModuleHandle (NULL), IDS_SYSTEM_DRIVE_LABEL, label, sizeof(label)/sizeof(label[0])); - add_drive('C', "../drive_c", label, 0, DRIVE_FIXED); + add_drive('C', "../drive_c", NULL, label, 0, DRIVE_FIXED); } else { @@ -330,7 +330,8 @@ int autodetect_drives(void) { char letter; int type; - + char *device = NULL; + WINE_TRACE("ent->mnt_dir=%s\n", ent->mnt_dir); if (should_ignore_fstype(ent->mnt_type)) continue; @@ -355,8 +356,11 @@ int autodetect_drives(void) return FALSE; } - WINE_TRACE("adding drive %c for %s, type %s\n", letter, ent->mnt_dir, ent->mnt_type); - add_drive(letter, ent->mnt_dir, NULL, 0, type); + if (type == DRIVE_CDROM) device = ent->mnt_fsname; + + WINE_TRACE("adding drive %c for %s, device %s, type %s\n", + letter, ent->mnt_dir, device, ent->mnt_type); + add_drive(letter, ent->mnt_dir, device, NULL, 0, type); /* working_mask is a map of the drive letters still available. */ working_mask &= ~DRIVE_MASK_BIT(letter); diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 8443537..a15d599 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -315,9 +315,9 @@ static void on_add_click(HWND dialog) WCHAR label[64]; LoadStringW (GetModuleHandle (NULL), IDS_SYSTEM_DRIVE_LABEL, label, sizeof(label)/sizeof(label[0])); - add_drive(new, "../drive_c", label, 0, DRIVE_FIXED); + add_drive(new, "../drive_c", NULL, label, 0, DRIVE_FIXED); } - else add_drive(new, "/", NULL, 0, DRIVE_UNKNOWN); + else add_drive(new, "/", NULL, NULL, 0, DRIVE_UNKNOWN); fill_drives_list(dialog); diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 807caf7..b0e2e40 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -97,6 +97,7 @@ struct drive { char letter; char *unixpath; + char *device; WCHAR *label; DWORD serial; DWORD type; /* one of the DRIVE_ constants from winbase.h */ @@ -108,7 +109,8 @@ struct drive #define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A')) long drive_available_mask(char letter); -BOOL add_drive(char letter, const char *targetpath, const WCHAR *label, DWORD serial, DWORD type); +BOOL add_drive(char letter, const char *targetpath, const char *device, + const WCHAR *label, DWORD serial, DWORD type); void delete_drive(struct drive *pDrive); void apply_drive_changes(void); BOOL browse_for_unix_folder(HWND dialog, WCHAR *pszPath);

1 0

Alexandre Julliard : mountmgr: Allow to specify the drive letter explicitly when creating/ removing a drive.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: b2ebab9f6fc20ec0ddee172d4d4925887aca351b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ebab9f6fc20ec0ddee172d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 23 15:44:18 2008 +0200 mountmgr: Allow to specify the drive letter explicitly when creating/removing a drive. --- dlls/mountmgr.sys/device.c | 44 ++++++++++++++++++++++++++++++----------- dlls/mountmgr.sys/diskarb.c | 4 +- dlls/mountmgr.sys/hal.c | 4 +- dlls/mountmgr.sys/mountmgr.h | 5 ++- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 3ed689f..9036654 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -464,16 +464,30 @@ static void create_drive_devices(void) RtlFreeHeap( GetProcessHeap(), 0, path ); } -BOOL add_dos_device( const char *udi, const char *device, const char *mount_point, DWORD type ) +/* create a new dos drive */ +NTSTATUS add_dos_device( int letter, const char *udi, const char *device, + const char *mount_point, DWORD type ) { struct dos_drive *drive, *next; - int letter = add_drive( device, type ); - if (letter == -1) return FALSE; + if (letter == -1) /* auto-assign a letter */ + { + letter = add_drive( device, type ); + if (letter == -1) return STATUS_OBJECT_NAME_COLLISION; + } + else /* simply reset the device symlink */ + { + char *path, *p; + + if (!(path = get_dosdevices_path( &p ))) return STATUS_NO_MEMORY; + *p = 'a' + letter; + unlink( path ); + if (device) symlink( device, path ); + } LIST_FOR_EACH_ENTRY_SAFE( drive, next, &drives_list, struct dos_drive, entry ) { - if (drive->udi && !strcmp( udi, drive->udi )) + if (udi && drive->udi && !strcmp( udi, drive->udi )) { if (type == drive->type) goto found; delete_disk_device( drive ); @@ -482,7 +496,7 @@ BOOL add_dos_device( const char *udi, const char *device, const char *mount_poin if (drive->drive == letter) delete_disk_device( drive ); } - if (create_disk_device( udi, type, &drive )) return FALSE; + if (create_disk_device( udi, type, &drive )) return STATUS_NO_MEMORY; found: RtlFreeHeap( GetProcessHeap(), 0, drive->unix_device ); @@ -513,19 +527,25 @@ found: RegCloseKey( hkey ); } - send_notify( drive->drive, DBT_DEVICEARRIVAL ); + if (udi) send_notify( drive->drive, DBT_DEVICEARRIVAL ); } - return TRUE; + return STATUS_SUCCESS; } -BOOL remove_dos_device( const char *udi ) +/* remove an existing dos drive, by letter or udi */ +NTSTATUS remove_dos_device( int letter, const char *udi ) { HKEY hkey; struct dos_drive *drive; LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { - if (!drive->udi || strcmp( udi, drive->udi )) continue; + if (letter != -1 && drive->drive != letter) continue; + if (udi) + { + if (!drive->udi) continue; + if (strcmp( udi, drive->udi )) continue; + } if (drive->drive != -1) { @@ -540,12 +560,12 @@ BOOL remove_dos_device( const char *udi ) RegCloseKey( hkey ); } - if (modified) send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); + if (modified && udi) send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); } delete_disk_device( drive ); - return TRUE; + return STATUS_SUCCESS; } - return FALSE; + return STATUS_NO_SUCH_DEVICE; } /* handler for ioctls on the harddisk device */ diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 90ced5e..a469ee6 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -69,7 +69,7 @@ static void appeared_callback( DADiskRef disk, void *context ) TRACE( "got mount notification for '%s' on '%s'\n", device, mount_point ); - add_dos_device( device, device, mount_point, type ); + add_dos_device( -1, device, device, mount_point, type ); done: CFRelease( dict ); } @@ -98,7 +98,7 @@ static void disappeared_callback( DADiskRef disk, void *context ) TRACE( "got unmount notification for '%s'\n", device ); - remove_dos_device( device ); + remove_dos_device( -1, device ); done: CFRelease( dict ); } diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 0f21e99..e1d3da1 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -135,7 +135,7 @@ static void new_device( LibHalContext *ctx, const char *udi ) if (type && !strcmp( type, "cdrom" )) drive_type = DRIVE_CDROM; else drive_type = DRIVE_REMOVABLE; /* FIXME: default to removable */ - add_dos_device( udi, device, mount_point, drive_type ); + add_dos_device( -1, udi, device, mount_point, drive_type ); /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); @@ -155,7 +155,7 @@ static void removed_device( LibHalContext *ctx, const char *udi ) TRACE( "removed %s\n", wine_dbgstr_a(udi) ); - if (remove_dos_device( udi )) + if (!remove_dos_device( -1, udi )) { p_dbus_error_init( &error ); p_libhal_device_remove_property_watch( ctx, udi, &error ); diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index ac163db..57c7b38 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -39,8 +39,9 @@ extern void initialize_diskarbitration(void); /* device functions */ -extern BOOL add_dos_device( const char *udi, const char *device, const char *mount_point, DWORD type ); -extern BOOL remove_dos_device( const char *udi ); +extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, + const char *mount_point, DWORD type ); +extern NTSTATUS remove_dos_device( int letter, const char *udi ); extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); /* mount point functions */

1 0

Alexandre Julliard : mountmgr: Store the contents of the device symlink in the drive object.
by Alexandre Julliard Oct. 24, 2008

Oct. 24, 2008

Module: wine Branch: master Commit: 5f2d2c7df07249b8128d9626bb8b67f72c47ac92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2d2c7df07249b8128d9626b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 23 15:43:46 2008 +0200 mountmgr: Store the contents of the device symlink in the drive object. --- dlls/mountmgr.sys/device.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index dd98c16..3ed689f 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -67,6 +67,7 @@ struct dos_drive STORAGE_DEVICE_NUMBER devnum; /* device number info */ struct mount_point *dosdev; /* DosDevices mount point */ struct mount_point *volume; /* Volume{xxx} mount point */ + char *unix_device; /* unix device path */ char *unix_mount; /* unix mount point path */ }; @@ -88,6 +89,15 @@ static char *get_dosdevices_path( char **drive ) return path; } +static char *strdupA( const char *str ) +{ + char *ret; + + if (!str) return NULL; + if ((ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(str) + 1 ))) strcpy( ret, str ); + return ret; +} + /* read a Unix symlink; returned buffer must be freed by caller */ static char *read_symlink( const char *path ) { @@ -186,7 +196,8 @@ static NTSTATUS create_disk_device( const char *udi, DWORD type, struct dos_driv drive->type = type; drive->dosdev = NULL; drive->volume = NULL; - drive->unix_mount = NULL; + drive->unix_device = NULL; + drive->unix_mount = NULL; drive->symlink.Buffer = NULL; if (udi) { @@ -258,6 +269,7 @@ static void delete_disk_device( struct dos_drive *drive ) IoDeleteSymbolicLink( &drive->symlink ); RtlFreeUnicodeString( &drive->symlink ); } + RtlFreeHeap( GetProcessHeap(), 0, drive->unix_device ); RtlFreeHeap( GetProcessHeap(), 0, drive->unix_mount ); RtlFreeHeap( GetProcessHeap(), 0, drive->udi ); RtlFreeUnicodeString( &drive->name ); @@ -379,8 +391,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi modified = TRUE; } RtlFreeHeap( GetProcessHeap(), 0, drive->unix_mount ); - if ((drive->unix_mount = RtlAllocateHeap( GetProcessHeap(), 0, strlen(mount_point) + 1 ))) - strcpy( drive->unix_mount, mount_point ); + drive->unix_mount = strdupA( mount_point ); if (drive->dosdev) set_mount_point_id( drive->dosdev, mount_point, strlen(mount_point) + 1 ); if (drive->volume) set_mount_point_id( drive->volume, mount_point, strlen(mount_point) + 1 ); } @@ -400,7 +411,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi /* create devices for mapped drives */ static void create_drive_devices(void) { - char *path, *p, *link; + char *path, *p, *link, *device; struct dos_drive *drive; unsigned int i; HKEY drives_key; @@ -415,6 +426,8 @@ static void create_drive_devices(void) p[0] = 'a' + i; p[2] = 0; if (!(link = read_symlink( path ))) continue; + p[2] = ':'; + device = read_symlink( path ); drive_type = i < 2 ? DRIVE_REMOVABLE : DRIVE_FIXED; if (drives_key) @@ -438,9 +451,14 @@ static void create_drive_devices(void) if (!create_disk_device( NULL, drive_type, &drive )) { drive->unix_mount = link; + drive->unix_device = device; set_drive_letter( drive, i ); } - else RtlFreeHeap( GetProcessHeap(), 0, link ); + else + { + RtlFreeHeap( GetProcessHeap(), 0, link ); + RtlFreeHeap( GetProcessHeap(), 0, device ); + } } RegCloseKey( drives_key ); RtlFreeHeap( GetProcessHeap(), 0, path ); @@ -467,6 +485,8 @@ BOOL add_dos_device( const char *udi, const char *device, const char *mount_poin if (create_disk_device( udi, type, &drive )) return FALSE; found: + RtlFreeHeap( GetProcessHeap(), 0, drive->unix_device ); + drive->unix_device = strdupA( device ); set_drive_letter( drive, letter ); set_unix_mount_point( drive, mount_point );

1 0

Dylan Smith : richedit: Fixed the call to the EditWordBreakProc.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 503972980e150f9eda348962f437484d7c9daa43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503972980e150f9eda348962f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Oct 23 01:07:31 2008 -0400 richedit: Fixed the call to the EditWordBreakProc. --- dlls/riched20/string.c | 24 +++++++++++++++++++----- dlls/riched20/tests/editor.c | 4 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 97b5a67..7da521c 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -304,6 +304,8 @@ ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) /* FIXME: Native also knows about punctuation */ TRACE("s==%s, start==%d, len==%d, code==%d\n", debugstr_wn(s, len), start, len, code); + /* convert number of bytes to number of characters. */ + len /= sizeof(WCHAR); switch (code) { case WB_ISDELIMITER: @@ -330,11 +332,23 @@ ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) { - /* FIXME: ANSIfy the string when bEmulateVersion10 is TRUE */ - if (!editor->pfnWordBreak) - return ME_WordBreakProc(str->szData, start, str->nLen, code); - else - return editor->pfnWordBreak(str->szData, start, str->nLen, code); + if (!editor->pfnWordBreak) { + return ME_WordBreakProc(str->szData, start, str->nLen*sizeof(WCHAR), code); + } else if (!editor->bEmulateVersion10) { + /* MSDN lied about the third parameter for EditWordBreakProc being the number + * of characters, it is actually the number of bytes of the string. */ + return editor->pfnWordBreak(str->szData, start, str->nLen*sizeof(WCHAR), code); + } else { + int result; + int buffer_size = WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + NULL, 0, NULL, NULL); + char *buffer = (char*)heap_alloc(buffer_size); + WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + buffer, buffer_size, NULL, NULL); + result = editor->pfnWordBreak(str->szData, start, str->nLen, code); + heap_free(buffer); + return result; + } } LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9c0a21d..8946ed3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5652,7 +5652,7 @@ static void test_word_movement(void) /* one twoX|three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); - todo_wine ok(sel_start == 8, "Cursor is at %d instead of %d\n", sel_start, 8); + ok(sel_start == 8, "Cursor is at %d instead of %d\n", sel_start, 8); DestroyWindow(hwnd); @@ -5671,7 +5671,7 @@ static void test_word_movement(void) /* one twoX|three */ SendMessageW(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); - todo_wine ok(sel_start == 8, "Cursor is at %d instead of %d\n", sel_start, 8); + ok(sel_start == 8, "Cursor is at %d instead of %d\n", sel_start, 8); DestroyWindow(hwnd); }

1 0

Dylan Smith : richedit: Added test for correct behaviour for calling EditWordBreakProc.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 00fd6b62d3ca794b8e2dac7357a4fa95febb1e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fd6b62d3ca794b8e2dac735… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Oct 23 01:07:11 2008 -0400 richedit: Added test for correct behaviour for calling EditWordBreakProc. EditWordBreakProc documented the third parameter as being the number of unicode characters in the string for richedit 2.0 and up. It turns out that it should actually be the number of bytes in the string. --- dlls/riched20/tests/editor.c | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 72e57c3..9c0a21d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5548,6 +5548,43 @@ static void test_undo_coalescing(void) DestroyWindow(hwnd); } +LONG CALLBACK customWordBreakProc(WCHAR *text, int pos, int bytes, int code) +{ + int length; + + /* MSDN lied, length is actually the number of bytes. */ + length = bytes / sizeof(WCHAR); + switch(code) + { + case WB_ISDELIMITER: + return text[pos] == 'X'; + case WB_LEFT: + case WB_MOVEWORDLEFT: + if (customWordBreakProc(text, pos, bytes, WB_ISDELIMITER)) + return pos-1; + return min(customWordBreakProc(text, pos, bytes, WB_LEFTBREAK)-1, 0); + case WB_LEFTBREAK: + pos--; + while (pos > 0 && !customWordBreakProc(text, pos, bytes, WB_ISDELIMITER)) + pos--; + return pos; + case WB_RIGHT: + case WB_MOVEWORDRIGHT: + if (customWordBreakProc(text, pos, bytes, WB_ISDELIMITER)) + return pos+1; + return min(customWordBreakProc(text, pos, bytes, WB_RIGHTBREAK)+1, length); + case WB_RIGHTBREAK: + pos++; + while (pos < length && !customWordBreakProc(text, pos, bytes, WB_ISDELIMITER)) + pos++; + return pos; + default: + ok(FALSE, "Unexpected code %d\n", code); + break; + } + return 0; +} + #define SEND_CTRL_LEFT(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, VK_LEFT) #define SEND_CTRL_RIGHT(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, VK_RIGHT) @@ -5556,6 +5593,7 @@ static void test_word_movement(void) HWND hwnd; int result; int sel_start, sel_end; + const WCHAR textW[] = {'o','n','e',' ','t','w','o','X','t','h','r','e','e',0}; /* multi-line control inserts CR normally */ hwnd = new_richedit(NULL); @@ -5605,6 +5643,36 @@ static void test_word_movement(void) ok(sel_start == sel_end, "Selection should be empty\n"); ok(sel_start == 9, "Cursor is at %d instead of %d\n", sel_start, 9); + /* Test with a custom word break procedure that uses X as the delimiter. */ + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"one twoXthree"); + ok (result == TRUE, "Failed to clear the text.\n"); + SendMessage(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)customWordBreakProc); + /* |one twoXthree */ + SEND_CTRL_RIGHT(hwnd); + /* one twoX|three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + todo_wine ok(sel_start == 8, "Cursor is at %d instead of %d\n", sel_start, 8); + + DestroyWindow(hwnd); + + /* Make sure the behaviour is the same with a unicode richedit window, + * and using unicode functions. */ + hwnd = CreateWindowW(RICHEDIT_CLASS20W, NULL, + ES_MULTILINE|WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + + /* Test with a custom word break procedure that uses X as the delimiter. */ + result = SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW); + ok (result == TRUE, "Failed to clear the text.\n"); + SendMessageW(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)customWordBreakProc); + /* |one twoXthree */ + SEND_CTRL_RIGHT(hwnd); + /* one twoX|three */ + SendMessageW(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + todo_wine ok(sel_start == 8, "Cursor is at %d instead of %d\n", sel_start, 8); + DestroyWindow(hwnd); }

1 0

Sylvain Petreolle : ole32: Stub implementation for CoGetCallerTID.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: e7d951320acb7cb395b4bc2b71acf5b3b2a71c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d951320acb7cb395b4bc2b7… Author: Sylvain Petreolle <spetreolle(a)yahoo.fr> Date: Thu Oct 23 09:48:25 2008 +0000 ole32: Stub implementation for CoGetCallerTID. --- dlls/ole32/ole2stubs.c | 9 +++++++++ dlls/ole32/ole32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index e339651..7c45704 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -119,3 +119,12 @@ HRESULT WINAPI OleRegEnumFormatEtc ( return E_NOTIMPL; } + +/*********************************************************************** + * CoGetCallerTID [OLE32.@] + */ +HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) +{ + FIXME("stub!\n"); + return E_NOTIMPL; +} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7561156..e5e90b3 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -22,7 +22,7 @@ @ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetCallContext(ptr ptr) -@ stub CoGetCallerTID +@ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) @ stub CoGetCurrentLogicalThreadId

1 0

Aric Stewart : ntdll/tests: handle info behavior for vista and 2008 properly.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 589d7eaa93710e9bb42a419e1917c509e1bd7bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589d7eaa93710e9bb42a419e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 23 07:49:04 2008 -0500 ntdll/tests: handle info behavior for vista and 2008 properly. --- dlls/ntdll/tests/info.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index d93e0bc..f61196e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -376,9 +376,18 @@ static void test_query_procperf(void) ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH /* vista */, "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength); - ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n"); - ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n"); - ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n"); + if (status == STATUS_SUCCESS) + { + ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n"); + ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n"); + ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n"); + } + else /* vista and 2008 */ + { + ok (sppi->KernelTime.QuadPart == 0xdeaddead, "KernelTime changed\n"); + ok (sppi->UserTime.QuadPart == 0xdeaddead, "UserTime changed\n"); + ok (sppi->IdleTime.QuadPart == 0xdeaddead, "IdleTime changed\n"); + } HeapFree( GetProcessHeap(), 0, sppi); }

1 0

Dmitry Timoshkov : gdi32: Add EMR_GDICOMMENT to the list of records producing output.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: ccba8578f5c81ea0650cad277683cbaff6306caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccba8578f5c81ea0650cad277… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 23 21:32:43 2008 +0900 gdi32: Add EMR_GDICOMMENT to the list of records producing output. This completely fixes the print previews generated by MS Access in a Win9x mode. Access has a custom handler for an EMR_GDICOMMENT record, and GDI APIs it calls from it don't work properly due to wrong DC mapping. --- dlls/gdi32/enhmetafile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index e998c60..22451d2 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -692,6 +692,7 @@ static BOOL emr_produces_output(int type) case EMR_LINETO: case EMR_ARCTO: case EMR_POLYDRAW: + case EMR_GDICOMMENT: case EMR_FILLRGN: case EMR_FRAMERGN: case EMR_INVERTRGN:

1 0

Alexandre Julliard : msiexec: Fix initial state of the argument parsing state machine.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 8d7fc617177e0593fd6d0461fc6c9e74be41fe00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7fc617177e0593fd6d0461f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 23 12:53:47 2008 +0200 msiexec: Fix initial state of the argument parsing state machine. --- programs/msiexec/msiexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 9649d82..7b00eb7 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -388,9 +388,9 @@ enum chomp_state static int chomp( WCHAR *str ) { - enum chomp_state state = cs_whitespace; + enum chomp_state state = cs_token; WCHAR *p, *out; - int count = 0, ignore; + int count = 1, ignore; for( p = str, out = str; *p; p++ ) {

1 0

Andrey Turkin : wordpad: Do not pass resource ids to MessageBox.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 783b855f422341f94e875b4cbc98fa0a9c03b0b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=783b855f422341f94e875b4cb… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Oct 21 11:07:09 2008 +0400 wordpad: Do not pass resource ids to MessageBox. --- programs/wordpad/wordpad.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 754ae50..d06b2d9 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -116,6 +116,25 @@ static void DoLoadStrings(void) LoadStringW(hInstance, STRING_UNITS_CM, units_cmW, MAX_STRING_LEN); } +/* Show a message box with resource strings */ +static int MessageBoxWithResStringW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType) +{ + MSGBOXPARAMSW params; + + params.cbSize = sizeof(params); + params.hwndOwner = hWnd; + params.hInstance = GetModuleHandleW(0); + params.lpszText = lpText; + params.lpszCaption = lpCaption; + params.dwStyle = uType; + params.lpszIcon = NULL; + params.dwContextHelpId = 0; + params.lpfnMsgBoxCallback = NULL; + params.dwLanguageId = 0; + return MessageBoxIndirectW(&params); +} + + static void AddButton(HWND hwndToolBar, int nImage, int nCommand) { TBBUTTON button; @@ -289,7 +308,7 @@ static void on_sizelist_modified(HWND hwndSizeList, LPWSTR wszNewFontSize) } else { SetWindowTextW(hwndSizeList, sizeBuffer); - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); } } @@ -747,8 +766,8 @@ static void DoOpenFile(LPCWSTR szOpenFileName) else if (!memcmp(STG_magic, fileStart, sizeof(STG_magic))) { CloseHandle(hFile); - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_OLE_STORAGE_NOT_SUPPORTED), wszAppTitle, - MB_OK | MB_ICONEXCLAMATION); + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_OLE_STORAGE_NOT_SUPPORTED), + wszAppTitle, MB_OK | MB_ICONEXCLAMATION); return; } } @@ -863,7 +882,7 @@ static void DialogSaveFile(void) { if(fileformat_flags(sfn.nFilterIndex-1) != SF_RTF) { - if(MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), + if(MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), wszAppTitle, MB_YESNO | MB_ICONEXCLAMATION) != IDYES) { continue; @@ -1161,7 +1180,7 @@ static void HandleCommandLine(LPWSTR cmdline) } if (opt_print) - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK); + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK); } static LRESULT handle_findmsg(LPFINDREPLACEW pFr) @@ -1239,7 +1258,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if(ret == -1) { pFr->lCustData = -1; - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, MB_OK | MB_ICONASTERISK); } else { @@ -1503,7 +1522,7 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, if(ret != 3) { - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONASTERISK); return FALSE; } else @@ -1615,7 +1634,7 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP if(!number_from_string(buffer, &number, TRUE)) { - MessageBoxW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); } else { @@ -1817,7 +1836,7 @@ static LRESULT OnCreate( HWND hWnd ) hDLL = LoadLibraryW(wszRichEditDll); if(!hDLL) { - MessageBoxW(hWnd, MAKEINTRESOURCEW(STRING_LOAD_RICHED_FAILED), wszAppTitle, + MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_LOAD_RICHED_FAILED), wszAppTitle, MB_OK | MB_ICONEXCLAMATION); PostQuitMessage(1); }

1 0