July 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : mountmgr: Create a separate structure for volume information.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: bc8dce2004438243ae0a7e1feb4f88f15a29a724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8dce2004438243ae0a7e1fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 15:56:26 2009 +0200 mountmgr: Create a separate structure for volume information. --- dlls/mountmgr.sys/device.c | 100 ++++++++++++++++++++++++++++--------------- 1 files changed, 65 insertions(+), 35 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8821b41..8057a69 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -66,14 +66,20 @@ struct disk_device char *unix_mount; /* unix mount point path */ }; +struct volume +{ + struct list entry; /* entry in volumes list */ + struct disk_device *device; /* disk device */ + char *udi; /* unique identifier for dynamic volumes */ + struct mount_point *mount; /* Volume{xxx} mount point */ +}; + struct dos_drive { struct list entry; /* entry in drives list */ - struct disk_device *device; /* disk device */ - char *udi; /* unique identifier for dynamic drives */ + struct volume *volume; /* volume for this drive */ int drive; /* drive letter (0 = A: etc.) */ struct mount_point *dosdev; /* DosDevices mount point */ - struct mount_point *volume; /* Volume{xxx} mount point */ }; static struct list drives_list = LIST_INIT(drives_list); @@ -269,6 +275,41 @@ static void delete_disk_device( struct disk_device *device ) IoDeleteDevice( device->dev_obj ); } +/* create a disk volume */ +static NTSTATUS create_volume( const char *udi, enum device_type type, struct volume **volume_ret ) +{ + struct volume *volume; + NTSTATUS status; + + if (!(volume = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*volume) ))) + return STATUS_NO_MEMORY; + + if (udi && !(volume->udi = strdupA( udi ))) + { + RtlFreeHeap( GetProcessHeap(), 0, volume ); + return STATUS_NO_MEMORY; + } + if (!(status = create_disk_device( type, &volume->device ))) + { + *volume_ret = volume; + } + else + { + RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); + RtlFreeHeap( GetProcessHeap(), 0, volume ); + } + return status; +} + +/* delete a volume and the corresponding disk device */ +static void delete_volume( struct volume *volume ) +{ + if (volume->mount) delete_mount_point( volume->mount ); + delete_disk_device( volume->device ); + RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); + RtlFreeHeap( GetProcessHeap(), 0, volume ); +} + /* create the disk device for a given volume */ static NTSTATUS create_dos_device( const char *udi, enum device_type type, struct dos_drive **drive_ret ) { @@ -278,25 +319,14 @@ static NTSTATUS create_dos_device( const char *udi, enum device_type type, struc if (!(drive = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*drive) ))) return STATUS_NO_MEMORY; drive->drive = -1; drive->dosdev = NULL; - drive->volume = NULL; - drive->udi = strdupA( udi ); - if (udi && !drive->udi) - { - RtlFreeHeap( GetProcessHeap(), 0, drive ); - return STATUS_NO_MEMORY; - } - - if (!(status = create_disk_device( type, &drive->device ))) + if (!(status = create_volume( udi, type, &drive->volume ))) { list_add_tail( &drives_list, &drive->entry ); *drive_ret = drive; } - else - { - RtlFreeHeap( GetProcessHeap(), 0, drive->udi ); - RtlFreeHeap( GetProcessHeap(), 0, drive ); - } + else RtlFreeHeap( GetProcessHeap(), 0, drive ); + return status; } @@ -305,9 +335,7 @@ static void delete_dos_device( struct dos_drive *drive ) { list_remove( &drive->entry ); if (drive->dosdev) delete_mount_point( drive->dosdev ); - if (drive->volume) delete_mount_point( drive->volume ); - delete_disk_device( drive->device ); - RtlFreeHeap( GetProcessHeap(), 0, drive->udi ); + delete_volume( drive->volume ); RtlFreeHeap( GetProcessHeap(), 0, drive ); } @@ -316,11 +344,12 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) { void *id = NULL; unsigned int id_len = 0; - struct disk_device *device = drive->device; + struct volume *volume = drive->volume; + struct disk_device *device = volume->device; if (drive->drive == letter) return; if (drive->dosdev) delete_mount_point( drive->dosdev ); - if (drive->volume) delete_mount_point( drive->volume ); + if (volume->mount) delete_mount_point( volume->mount ); drive->drive = letter; if (letter == -1) return; if (device->unix_mount) @@ -329,7 +358,7 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) id_len = strlen( device->unix_mount ) + 1; } drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter, id, id_len ); - drive->volume = add_volume_mount_point( device->dev_obj, &device->name, letter, id, id_len ); + volume->mount = add_volume_mount_point( device->dev_obj, &device->name, letter, id, id_len ); } static inline int is_valid_device( struct stat *st ) @@ -420,7 +449,8 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi { char *path, *p; BOOL modified = FALSE; - struct disk_device *device = drive->device; + struct volume *volume = drive->volume; + struct disk_device *device = volume->device; if (!(path = get_dosdevices_path( &p ))) return FALSE; p[0] = 'a' + drive->drive; @@ -438,7 +468,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); device->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 ); + if (volume->mount) set_mount_point_id( volume->mount, mount_point, strlen(mount_point) + 1 ); } else { @@ -446,7 +476,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); device->unix_mount = NULL; if (drive->dosdev) set_mount_point_id( drive->dosdev, NULL, 0 ); - if (drive->volume) set_mount_point_id( drive->volume, NULL, 0 ); + if (volume->mount) set_mount_point_id( volume->mount, NULL, 0 ); } HeapFree( GetProcessHeap(), 0, path ); @@ -496,8 +526,8 @@ static void create_drive_devices(void) if (!create_dos_device( NULL, drive_type, &drive )) { - drive->device->unix_mount = link; - drive->device->unix_device = device; + drive->volume->device->unix_mount = link; + drive->volume->device->unix_device = device; set_drive_letter( drive, i ); } else @@ -533,9 +563,9 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, LIST_FOR_EACH_ENTRY_SAFE( drive, next, &drives_list, struct dos_drive, entry ) { - if (udi && drive->udi && !strcmp( udi, drive->udi )) + if (udi && drive->volume->udi && !strcmp( udi, drive->volume->udi )) { - if (type == drive->device->type) goto found; + if (type == drive->volume->device->type) goto found; delete_dos_device( drive ); continue; } @@ -545,8 +575,8 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, if (create_dos_device( udi, type, &drive )) return STATUS_NO_MEMORY; found: - RtlFreeHeap( GetProcessHeap(), 0, drive->device->unix_device ); - drive->device->unix_device = strdupA( device ); + RtlFreeHeap( GetProcessHeap(), 0, drive->volume->device->unix_device ); + drive->volume->device->unix_device = strdupA( device ); set_drive_letter( drive, letter ); set_unix_mount_point( drive, mount_point ); @@ -590,8 +620,8 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) if (letter != -1 && drive->drive != letter) continue; if (udi) { - if (!drive->udi) continue; - if (strcmp( udi, drive->udi )) continue; + if (!drive->volume->udi) continue; + if (strcmp( udi, drive->volume->udi )) continue; } if (drive->drive != -1) @@ -625,7 +655,7 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { if (drive->drive != letter) continue; - disk_device = drive->device; + disk_device = drive->volume->device; if (type) *type = disk_device->type; if (device) *device = disk_device->unix_device; if (mount_point) *mount_point = disk_device->unix_mount;

1 0

Alexandre Julliard : mountmgr: Add support for setting the drive UUID instead of having it always hardcoded .
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 84396c2e625d918be73d6948c7aed650e4e139c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84396c2e625d918be73d6948c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 16:05:04 2009 +0200 mountmgr: Add support for setting the drive UUID instead of having it always hardcoded. --- dlls/mountmgr.sys/device.c | 16 ++++++++++++++-- dlls/mountmgr.sys/diskarb.c | 2 +- dlls/mountmgr.sys/hal.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 13 +++++-------- dlls/mountmgr.sys/mountmgr.h | 4 ++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8057a69..1b23d97 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -71,6 +71,7 @@ struct volume struct list entry; /* entry in volumes list */ struct disk_device *device; /* disk device */ char *udi; /* unique identifier for dynamic volumes */ + GUID guid; /* volume uuid */ struct mount_point *mount; /* Volume{xxx} mount point */ }; @@ -109,6 +110,14 @@ static char *strdupA( const char *str ) return ret; } +static const GUID *get_default_uuid( int letter ) +{ + static GUID guid; + + guid.Data4[7] = 'A' + letter; + return &guid; +} + /* read a Unix symlink; returned buffer must be freed by caller */ static char *read_symlink( const char *path ) { @@ -358,7 +367,7 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) id_len = strlen( device->unix_mount ) + 1; } drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter, id, id_len ); - volume->mount = add_volume_mount_point( device->dev_obj, &device->name, letter, id, id_len ); + volume->mount = add_volume_mount_point( device->dev_obj, &device->name, &volume->guid, id, id_len ); } static inline int is_valid_device( struct stat *st ) @@ -528,6 +537,7 @@ static void create_drive_devices(void) { drive->volume->device->unix_mount = link; drive->volume->device->unix_device = device; + drive->volume->guid = *get_default_uuid( i ); set_drive_letter( drive, i ); } else @@ -542,7 +552,7 @@ static void create_drive_devices(void) /* create a new dos drive */ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type ) + const char *mount_point, enum device_type type, const GUID *guid ) { struct dos_drive *drive, *next; @@ -575,6 +585,8 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, if (create_dos_device( udi, type, &drive )) return STATUS_NO_MEMORY; found: + if (!guid) guid = get_default_uuid( letter ); + drive->volume->guid = *guid; RtlFreeHeap( GetProcessHeap(), 0, drive->volume->device->unix_device ); drive->volume->device->unix_device = strdupA( device ); set_drive_letter( drive, letter ); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 3296d04..1597e34 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( -1, device, device, mount_point, type ); + add_dos_device( -1, device, device, mount_point, type, NULL ); done: CFRelease( dict ); } diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 310b144..6e09c2c 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -136,7 +136,7 @@ static void new_device( LibHalContext *ctx, const char *udi ) else if (type && !strcmp( type, "floppy" )) drive_type = DEVICE_FLOPPY; else drive_type = DEVICE_UNKNOWN; - add_dos_device( -1, udi, device, mount_point, drive_type ); + add_dos_device( -1, udi, device, mount_point, drive_type, NULL ); /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index d2b1515..4554de6 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -103,20 +103,17 @@ struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN /* create the Volume mount point symlink for a new device */ struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive, const void *id, unsigned int id_len ) + const GUID *guid, const void *id, unsigned int id_len ) { 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 link[sizeof(volumeW)]; - GUID guid; - memset( &guid, 0, sizeof(guid) ); /* FIXME */ - guid.Data4[7] = 'A' + drive; - sprintfW( 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]); + sprintfW( 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]); return add_mount_point( device, device_name, link, id, id_len ); } @@ -266,7 +263,7 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) case DRIVE_RAMDISK: type = DEVICE_RAMDISK; break; case DRIVE_FIXED: type = DEVICE_HARDDISK_VOL; break; } - return add_dos_device( letter - 'a', NULL, device, mount_point, type ); + return add_dos_device( letter - 'a', NULL, device, mount_point, type, NULL ); } else { diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index e8f7d5d..5ce5886 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -52,7 +52,7 @@ enum device_type }; extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type ); + const char *mount_point, enum device_type type, const GUID *guid ); extern NTSTATUS remove_dos_device( int letter, const char *udi ); extern NTSTATUS query_dos_device( int letter, enum device_type *type, const char **device, const char **mount_point ); @@ -65,6 +65,6 @@ struct mount_point; extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, int drive, const void *id, unsigned int id_len ); extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive, const void *id, unsigned int id_len ); + const GUID *guid, const void *id, unsigned int id_len ); extern void delete_mount_point( struct mount_point *mount ); extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len );

1 0

Alexandre Julliard : Convert English resources to UTF-8 where necessary.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: a32e4e5ee326c9daf19fa263c2be1c7e9df0ee79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32e4e5ee326c9daf19fa263c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 14:46:48 2009 +0200 Convert English resources to UTF-8 where necessary. --- dlls/avifil32/avifile_En.rc | 2 +- dlls/msrle32/msrle_En.rc | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile_En.rc b/dlls/avifil32/avifile_En.rc index 71c5d3e..e136569 100644 --- a/dlls/avifil32/avifile_En.rc +++ b/dlls/avifil32/avifile_En.rc @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael G�nnewig + * Copyright 2002 Michael Günnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/msrle32/msrle_En.rc b/dlls/msrle32/msrle_En.rc index becd9d9..e95f395 100644 --- a/dlls/msrle32/msrle_En.rc +++ b/dlls/msrle32/msrle_En.rc @@ -1,7 +1,7 @@ /* * English resource file for MS-RLE * - * Copyright 2002 Michael G�nnewig + * Copyright 2002 Michael Günnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,13 @@ #include "msrle_private.h" +#pragma code_page(65001) + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_NAME "WINE-MS-RLE" IDS_DESCRIPTION "Wine MS-RLE video codec" - IDS_ABOUT "Wine MS-RLE video codec\nCopyright 2002 by Michael G�nnewig" + IDS_ABOUT "Wine MS-RLE video codec\nCopyright 2002 by Michael Günnewig" }

1 0

Alexandre Julliard : mountmgr: Create a separate structure for disk device information, independent from the DOS drive.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 8fb8b2e6a335fbc6037d0896beedc7179fdfbfd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb8b2e6a335fbc6037d0896b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 15:46:34 2009 +0200 mountmgr: Create a separate structure for disk device information, independent from the DOS drive. --- dlls/mountmgr.sys/device.c | 206 +++++++++++++++++++++++++------------------ 1 files changed, 120 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fb8b2e6a335fbc6037d0…

1 0

Alexandre Julliard : winecfg: Fix quote characters in English resource.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: b8484cc082dbc60d12b750b9e56b7dbcfbad68fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8484cc082dbc60d12b750b9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 14:46:34 2009 +0200 winecfg: Fix quote characters in English resource. --- programs/winecfg/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index a69b4d9..cf0ce07 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -264,7 +264,7 @@ BEGIN IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" IDS_COL_DRIVELETTER "Letter" IDS_COL_DRIVEMAPPING "Drive Mapping" - IDS_NO_DRIVE_C "You don't have a drive C. This is not so great.\n\nRemember to click �Add� in the Drives tab to create one!\n" + IDS_NO_DRIVE_C "You don't have a drive C. This is not so great.\n\nRemember to click 'Add' in the Drives tab to create one!\n" END STRINGTABLE DISCARDABLE @@ -288,7 +288,7 @@ BEGIN IDS_DEVICES_MIDIIN "MIDI In Devices" IDS_DEVICES_AUX "Aux Devices" IDS_DEVICES_MIXER "Mixer Devices" - IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove �%s� from registry?" + IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove '%s' from registry?" IDS_WARNING "Warning" END

1 0

Alexander Nicolaysen Sørnes : cron: Temporarily disable error reporting
by Alexander Nicolaysen Sørnes 21 Jul '09

21 Jul '09

Module: appdb Branch: master Commit: 79df5bcdfcad75ac5f95ab648e375f55884a655f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=79df5bcdfcad75ac5f95ab64… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 16:27:35 2009 +0200 cron: Temporarily disable error reporting --- cron/cleanup.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 299c0b0..7c1fb25 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -17,7 +17,8 @@ inactiveUserCheck(); orphanVersionCheck(); /* report error log entries to admins and flush the error log after doing so */ -reportErrorLogEntries(); +// temporarily disabled - it apperas we have too many errors +// reportErrorLogEntries(); /* remove screenshots that are missing their screenshot and thumbnail files */ removeScreenshotsWithMissingFiles();

1 0

Alexandre Julliard : transl: Add a margin to the contents of the text boxes .
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: tools Branch: master Commit: 6462cc1e32dab36aae472dd1d7b61af490591858 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6462cc1e32dab36aae472dd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:59:05 2009 +0200 transl: Add a margin to the contents of the text boxes. --- transl/php/index.php | 2 ++ transl/php/lang.php | 6 ++++++ transl/php/style.css | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index eb08251..6cd0c7e 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -29,6 +29,7 @@ while ($line = fgets($summary, 1024)) </head> <div class="main"> <h1>Wine translation statistics <?php echo $TITLE_APPENDIX ?></h1> +<div class="contents"> <?php echo $TITLE_DESCR ?> @@ -114,6 +115,7 @@ for ($i = 0; $i < count($transl); $i++) <?php draw_bar($transl_sum, $errors_sum, ($nr-1)*$sum) ?> </table> </div> +</div> <?php if ($time = filemtime("$DATAROOT/langs/summary")) { diff --git a/transl/php/lang.php b/transl/php/lang.php index 2fe240a..2dfb7c7 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -92,16 +92,22 @@ if (preg_match("/:00/", $lang) && $translations == 0) <div class="group"> <h2>Partially translated modules</h2> +<div class="contents"> <?php dump_table($partial) ?> </div> +</div> <div class="group"> <h2>Modules not translated</h2> +<div class="contents"> <?php dump_table($notransl) ?> </div> +</div> <div class="group"> <h2>Fully translated modules</h2> +<div class="contents"> <?php dump_table($transl) ?> </div> +</div> </div> </html> diff --git a/transl/php/style.css b/transl/php/style.css index 0464bc2..affea71 100644 --- a/transl/php/style.css +++ b/transl/php/style.css @@ -38,6 +38,10 @@ div.main { border: 1px solid #601919; } +div.contents { + margin: 5px; +} + div.group { margin: 10px 20% 10px 20%; background-color: white;

1 0

Alexandre Julliard : transl: Specify utf-8 charset everywhere and fix some quoting issues.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: tools Branch: master Commit: d3b35f51f3bf25e4078b1067a5cb5df4688267e2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d3b35f51f3bf25e4078b1067… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:46:19 2009 +0200 transl: Specify utf-8 charset everywhere and fix some quoting issues. --- transl/php/index.php | 1 + transl/php/lang.php | 1 + transl/php/lib.php | 2 +- transl/php/resfile.php | 1 + transl/php/resource.php | 1 + 5 files changed, 5 insertions(+), 1 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index f49fade..eb08251 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -24,6 +24,7 @@ while ($line = fgets($summary, 1024)) <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Wine translation statistics <?php echo $TITLE_APPENDIX ?></title> </head> <div class="main"> diff --git a/transl/php/lang.php b/transl/php/lang.php index 45ff62c..2fe240a 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -48,6 +48,7 @@ ksort($notransl); <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> </head> diff --git a/transl/php/lib.php b/transl/php/lib.php index 84bd179..7fc4ae5 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -177,7 +177,7 @@ function get_locale_name($localeid) { global $LOCALE_NAMES; enum_locale_names(); - return $LOCALE_NAMES[$localeid]; + return htmlspecialchars($LOCALE_NAMES[$localeid],ENT_QUOTES,'UTF-8'); } function get_res_path($resfile) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index a6fa628..71e3c19 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -11,6 +11,7 @@ $msgs = array(); <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Module <?php echo $resfile?> - Wine translations</title> </head> diff --git a/transl/php/resource.php b/transl/php/resource.php index e86fe8c..493e9f1 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -13,6 +13,7 @@ $compare = isset($_REQUEST['compare']); <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title><?php echo get_resource_name($type, $id) ?> from <?php echo $resfile?> - Wine translation</title> </head> <body>

1 0

Paul Vriens : transl: Simplify the resource parsing a bit by using a hash for the languages per module .
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: tools Branch: master Commit: 1ab3af542def7a18d7d753887ce316bbec73752d URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ab3af542def7a18d7d75388… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 09:20:44 2009 +0200 transl: Simplify the resource parsing a bit by using a hash for the languages per module. --- transl/scripts/checkmakefile.pl | 40 ++++++++++++++------------------------ 1 files changed, 15 insertions(+), 25 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 0c91132..e21685c 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -121,13 +121,11 @@ sub mycheck my $type = -1; my $resource; - my %deflangs = (); - my @file_langs = (); - my %reslangs = (); - @file_langs = ("009:01"); - $deflangs{"009:01"} = 1; + my %file_langs = (); + $file_langs{"009:01"} = 1; + my %reslangs = (); my @resources = (); my %transl_count = (); @@ -167,7 +165,7 @@ sub mycheck { my $lang = collapse($1); - # Don't add neutral langs (nn:00) to the file_langs array + # Don't add neutral langs (nn:00) to the file_langs hash # if we have sublangs (nn:xx) in the conf directory, add # it's sublangs instead (if present). # @@ -179,28 +177,20 @@ sub mycheck my $primary_lang = $lang; $primary_lang =~ s/:00//; my $found = 0; - foreach my $language (@languages) + my @sublanguages = grep(/$primary_lang/, @languages); + foreach my $language (@sublanguages) { - if ($language =~ /$primary_lang:./) - { - if (not defined $deflangs{$language}) - { - $deflangs{$language} = 1; - push @file_langs, $language; - } - $found = 1; - } + $file_langs{$language} = 1; + $found = 1; } - if ((!$found) && (not defined $deflangs{$lang})) + if (!$found) { - $deflangs{$lang} = 1; - push @file_langs, $lang; + $file_langs{$lang} = 1; } } - elsif (not defined $deflangs{$lang}) + else { - $deflangs{$lang} = 1; - push @file_langs, $lang; + $file_langs{$lang} = 1; } $reslangs{$type." ".$resource}{$lang} = 1; $transl_count{$lang}++; @@ -244,7 +234,7 @@ sub mycheck { next if ($notransl{$resource}); - foreach my $lang (@file_langs) + foreach my $lang (keys %file_langs) { my $basic_lang = $lang; $basic_lang=~s/:[0-9a-f][0-9a-f]/:00/; @@ -285,7 +275,7 @@ sub mycheck } } } - foreach my $lang (@file_langs) + foreach my $lang (keys %file_langs) { my $suffix; @@ -360,7 +350,7 @@ sub mycheck { next if (!($lang eq collapse($lang))); next if ($transl_count{"009:01"} == 0); - my @transl = grep {$_ eq $lang} @file_langs; + my @transl = grep {$_ eq $lang} keys %file_langs; if ($#transl == -1) { open(LANGOUT, ">>$workdir/langs/$lang");

1 0

Paul Vriens : transl: Show all translations instead of using the conf directory.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: tools Branch: master Commit: 94973ae3864c575cccdfbbfb3fd2f4ca2d6a0a70 URL: http://source.winehq.org/git/tools.git/?a=commit;h=94973ae3864c575cccdfbbfb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 09:37:05 2009 +0200 transl: Show all translations instead of using the conf directory. --- transl/php/lang.php | 8 -- transl/scripts/checkmakefile.pl | 190 +++++++++++++------------------------- 2 files changed, 65 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=94973ae3864c575cccdf…

1 0