November 2005 - Wine-Commits

wine/dlls/kernel virtual.c sync.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21380 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 10:26:34 Modified files: dlls/kernel : virtual.c sync.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Kernel32 should create named objects with OBJ_OPENIF flag set. Handle STATUS_OBJECT_NAME_EXISTS explicitly as it's not mapped with RtlNtStatusToDosError. Patch: http://cvs.winehq.org/patch.py?id=21380 Old revision New revision Changes Path 1.11 1.12 +5 -2 wine/dlls/kernel/virtual.c 1.92 1.93 +20 -8 wine/dlls/kernel/sync.c Index: wine/dlls/kernel/virtual.c diff -u -p wine/dlls/kernel/virtual.c:1.11 wine/dlls/kernel/virtual.c:1.12 --- wine/dlls/kernel/virtual.c:1.11 21 Nov 2005 16:26:34 -0000 +++ wine/dlls/kernel/virtual.c 21 Nov 2005 16:26:34 -0000 @@ -308,7 +308,7 @@ HANDLE WINAPI CreateFileMappingW( HANDLE attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; @@ -354,7 +354,10 @@ HANDLE WINAPI CreateFileMappingW( HANDLE size.u.HighPart = size_high; status = NtCreateSection( &ret, access, &attr, &size, protect, sec_type, hFile ); - SetLastError( RtlNtStatusToDosError(status) ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); return ret; } Index: wine/dlls/kernel/sync.c diff -u -p wine/dlls/kernel/sync.c:1.92 wine/dlls/kernel/sync.c:1.93 --- wine/dlls/kernel/sync.c:1.92 21 Nov 2005 16:26:34 -0000 +++ wine/dlls/kernel/sync.c 21 Nov 2005 16:26:34 -0000 @@ -445,7 +445,7 @@ HANDLE WINAPI CreateEventW( SECURITY_ATT attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; @@ -456,7 +456,10 @@ HANDLE WINAPI CreateEventW( SECURITY_ATT } status = NtCreateEvent( &ret, EVENT_ALL_ACCESS, &attr, manual_reset, initial_state ); - SetLastError( RtlNtStatusToDosError(status) ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); return ret; } @@ -640,7 +643,7 @@ HANDLE WINAPI CreateMutexW( SECURITY_ATT attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; @@ -651,7 +654,10 @@ HANDLE WINAPI CreateMutexW( SECURITY_ATT } status = NtCreateMutant( &ret, MUTEX_ALL_ACCESS, &attr, owner ); - SetLastError( RtlNtStatusToDosError(status) ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); return ret; } @@ -762,7 +768,7 @@ HANDLE WINAPI CreateSemaphoreW( SECURITY attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; @@ -773,7 +779,10 @@ HANDLE WINAPI CreateSemaphoreW( SECURITY } status = NtCreateSemaphore( &ret, SEMAPHORE_ALL_ACCESS, &attr, initial, max ); - SetLastError( RtlNtStatusToDosError(status) ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); return ret; } @@ -877,7 +886,7 @@ HANDLE WINAPI CreateWaitableTimerW( SECU attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = NULL; - attr.Attributes = OBJ_CASE_INSENSITIVE | + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; @@ -889,7 +898,10 @@ HANDLE WINAPI CreateWaitableTimerW( SECU status = NtCreateTimer(&handle, TIMER_ALL_ACCESS, &attr, manual ? NotificationTimer : SynchronizationTimer); - SetLastError( RtlNtStatusToDosError(status) ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); return handle; }

1 0

lostwages/images/bannerads cw-ad02.gif
by Jeremy Newman Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21379 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/11/21 10:26:25 Modified files: images/bannerads: cw-ad02.gif Log message: make this ad static Patch: http://cvs.winehq.org/patch.py?id=21379 Old revision New revision Changes Path 1.2 1.3 +8 -28 lostwages/images/bannerads/cw-ad02.gif

1 0

wine/programs wcmd/Ko.rc regedit/Ko.rc
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21378 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 10:25:12 Modified files: programs/wcmd : Ko.rc programs/regedit: Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Update Korean translations. Patch: http://cvs.winehq.org/patch.py?id=21378 Old revision New revision Changes Path 1.1 1.2 +2 -2 wine/programs/wcmd/Ko.rc 1.2 1.3 +36 -36 wine/programs/regedit/Ko.rc Index: wine/programs/wcmd/Ko.rc diff -u -p wine/programs/wcmd/Ko.rc:1.1 wine/programs/wcmd/Ko.rc:1.2 --- wine/programs/wcmd/Ko.rc:1.1 21 Nov 2005 16:25:12 -0000 +++ wine/programs/wcmd/Ko.rc 21 Nov 2005 16:25:12 -0000 @@ -36,7 +36,7 @@ ÆÄÀÏÇÑÅ× µ¹ŸÆ°©ŽÏŽÙ. CALL ží·ÉÀº È£ÃâÇÏ WCMD_CD, " CD µµ¿òž»\n" WCMD_CHDIR, " CHDIR µµ¿òž»\n" - WCMD_CLS, "CLS clears the console screen\n" + WCMD_CLS, "CLS ÄÜŒÖ Èžé ±ú²ýÈ÷\n" WCMD_COPY, "COPY µµ¿òž»\n" WCMD_CTTY, "CTTY µµ¿òž»\n" @@ -150,7 +150,7 @@ action, and can therefore be used as a c WCMD_RMDIR, "RMDIR µµ¿òž»\n" WCMD_SET, -"SET displays or changes the wcmd environment variables.\n\ +"SET wcmd È¯°æ º¯Œö ºž¿©ÁÖ°Å³ª ¹Ù²Ù±â.\n\ \n\ SET without parameters shows all of the current environment.\n\ \n\ Index: wine/programs/regedit/Ko.rc diff -u -p wine/programs/regedit/Ko.rc:1.2 wine/programs/regedit/Ko.rc:1.3 --- wine/programs/regedit/Ko.rc:1.2 21 Nov 2005 16:25:12 -0000 +++ wine/programs/regedit/Ko.rc 21 Nov 2005 16:25:12 -0000 @@ -244,57 +244,57 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_MENU "Contains commands for working with the whole registry" - ID_EDIT_MENU "Contains commands for editing values or keys" - ID_VIEW_MENU "Contains commands for customising the registry window" - ID_FAVORITES_MENU "Contains commands for accessing frequently used keys" - ID_HELP_MENU "Contains commands for displaying help and information about registry editor" - ID_EDIT_NEW_MENU "Contains commands for creating new keys or values" + ID_REGISTRY_MENU "žðµç ·¹ÁöœºÆ®ž® ÀÛŸ÷ ží·É Æ÷ÇÔ" + ID_EDIT_MENU "Å°ÀÇ °ª ÆíÁý ží·É Æ÷ÇÔ" + ID_VIEW_MENU "·¹ÁöœºÆ®ž® Ã¢ »ç¿ëÀÚ Á€ÀÇÇÏŽÂ ží·É Æ÷ÇÔ" + ID_FAVORITES_MENU "ÀÚÁÖ »ç¿ëÇÏŽÂ Å° Á¢±ÙÇÏŽÂ ží·É Æ÷ÇÔ" + ID_HELP_MENU "·¹ÁöœºÆ®ž® ÆíÁý±â Á€ºž¿Í µµ¿òž» ºž¿©ÁÖŽÂ ží·É Æ÷ÇÔ" + ID_EDIT_NEW_MENU "»õ Å°³ª °ª žžµåŽÂ ží·É Æ÷ÇÔ" END STRINGTABLE DISCARDABLE BEGIN - ID_EDIT_MODIFY "Modifies the value's data" - ID_EDIT_NEW_KEY "Adds a new key" - ID_EDIT_NEW_STRINGVALUE "Adds a new string value" - ID_EDIT_NEW_BINARYVALUE "Adds a new binary value" - ID_EDIT_NEW_DWORDVALUE "Adds a new double word value" - ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry" + ID_EDIT_MODIFY "°ª µ¥ÀÌÅž °íÄ¡±â" + ID_EDIT_NEW_KEY "»õ Å° ŽõÇÏ±â" + ID_EDIT_NEW_STRINGVALUE "»õ ¹®ÀÚ °ª ŽõÇÏ±â" + ID_EDIT_NEW_BINARYVALUE "»õ ¹ÙÀÌ³Êž® °ª ŽõÇÏ±â" + ID_EDIT_NEW_DWORDVALUE "»õ Žõºí ¿öµå °ª ŽõÇÏ±â" + ID_REGISTRY_IMPORTREGISTRYFILE "ÅØœºÆ® ÆÄÀÏÀ» ·¹ÁöœºÆ®ž®¿¡ ³¢¿ö³Ö±â" ID_REGISTRY_EXPORTREGISTRYFILE - "Exports all or part of the registry to a text file" + "·¹ÁöœºÆ®ž®ÀÇ ÀüºÎ³ª ÀÏºÎºÐÀ» ÅØœºÆ® ÆÄÀÏ·Î ³»ºž³»±â" ID_REGISTRY_CONNECTNETWORKREGISTRY - "Connects to a remote computer's registry" + "¿ø°Ý ÄÄÇ»ÅÍÀÇ ·¹ÁöœºÆ®ž® ¿¬°á" ID_REGISTRY_DISCONNECTNETWORKREGISTRY - "Disconnects from a remote computer's registry" - ID_REGISTRY_PRINT "Prints all or part of the registry" -/* ID_HELP_HELPTOPICS "Opens registry editor help" */ - ID_HELP_ABOUT "Displays program information, version number and copyright" + "¿ø°Ý ÄÄÇ»ÅÍÀÇ ·¹ÁöœºÆ®ž® ¿¬°á ÇØÁŠ" + ID_REGISTRY_PRINT "·¹ÁöœºÆ®ž® ÀüºÎ³ª ºÎºÐ ÀÎŒâÇÏ±â" +/* ID_HELP_HELPTOPICS "·¹ÁöœºÆ®ž® ÆíÁý±â µµ¿òž» ¿±â" */ + ID_HELP_ABOUT "Ç®±×ž² Á€ºž,¹öÁ¯, ÀúÀÛ±Ç ºž¿©ÁÖ±â" END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_EXIT "Quits the registry editor" - ID_FAVORITES_ADDTOFAVORITES "Adds keys to the favorites list" - ID_FAVORITES_REMOVEFAVORITE "Removes keys from the favorites list" - ID_VIEW_STATUSBAR "Shows or hides the status bar" - ID_VIEW_SPLIT "Change position of split between two panes" - ID_VIEW_REFRESH "Refreshes the window" - ID_EDIT_DELETE "Deletes the selection" - ID_EDIT_RENAME "Renames the selection" - ID_EDIT_COPYKEYNAME "Copies the name of the selected key to the clipboard" - ID_EDIT_FIND "Finds a text string in a key, value or data" - ID_EDIT_FINDNEXT "Finds next occurrence of text specified in previous search" + ID_REGISTRY_EXIT "·¹ÁöœºÆ®ž® ÆíÁý±â ³ª°¡±â" + ID_FAVORITES_ADDTOFAVORITES "Áñ°Ü Ã£±â žñ·Ï¿¡ Å° ŽõÇÏ±â" + ID_FAVORITES_REMOVEFAVORITE "Áñ°Ü Ã£±â žñ·Ï¿¡ Å° Áö¿ì±â" + ID_VIEW_STATUSBAR "»óÅÂ¹Ù ºž¿©ÁÖ°Å³ª Œû±â±â" + ID_VIEW_SPLIT "µÎ Æ²À» ³ªŽ©ŽÂ À§Ä¡ ¹Ù²Ù±â" + ID_VIEW_REFRESH "Ã¢ ŽÙœÃ ÀÐ±â" + ID_EDIT_DELETE "ÀÌ ŒœŒÇ Áö¿ì±â" + ID_EDIT_RENAME "ÀÌ ŒœŒÇ ÀÌž§¹Ù²Ù±â" + ID_EDIT_COPYKEYNAME "Œ±ÅÃµÈ Å°ÀÇ ÀÌž§À» Å¬ž³ºžµå¿¡ º¹»ç" + ID_EDIT_FIND "Å°,°ªÀÌ³ª µ¥ÀÌÅž¿¡Œ ÅØœºÆ® ¹®ÀÚ¿ Ã£±â" + ID_EDIT_FINDNEXT "ÀÌÀü Ã£±â¿¡Œ ÁöÁ€µÈ ¹®ÀÚ¿·Î ŽÙœÃ Ã£±â" END STRINGTABLE DISCARDABLE BEGIN IDS_ERROR "¿¡·¯" - IDS_BAD_KEY "Can't query key '%s'" - IDS_BAD_VALUE "Can't query value '%s'" - IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" - IDS_TOO_BIG_VALUE "Value is too big (%ld)" - IDS_DELETE_BOX_TITLE "Confirm Value Delete" - IDS_DELETE_BOX_TEXT "Are you sure you want to delete value '%s'?" + IDS_BAD_KEY " Å° '%s'žŠ ÁúÀÇÇÒ Œö ŸøœÀŽÏŽÙ" + IDS_BAD_VALUE "°ª '%s'žŠ ÁúÀÇÇÒ Œö ŸøœÀŽÏŽÙ" + IDS_UNSUPPORTED_TYPE "ÀÌ ÅžÀÔ (%ld)ÀÇ Å°žŠ °íÄ¥ Œö ŸøœÀŽÏŽÙ" + IDS_TOO_BIG_VALUE "°ªÀÌ ³Ê¹« Å®ŽÏŽÙ (%ld)" + IDS_DELETE_BOX_TITLE "°ª Áö¿ì±â È®ÀÎ" + IDS_DELETE_BOX_TEXT "ŽçœÅÀº ÀÌ °ª '%s'À» Á€ž»·Î Áö¿ì°ÚœÀŽÏ±î?" IDS_NEWKEY "»õ Å° #%d" IDS_NEWVALUE "»õ °ª #%d" END @@ -342,7 +342,7 @@ END *STRINGTABLE DISCARDABLE *BEGIN * ID_HELP_HELPTOPICS "·¹ÁöœºÆ®ž® ÆíÁý±â µµ¿òž» ¿±â." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." + * ID_HELP_ABOUT "Ç®±×ž² Á€ºž,¹öÁ¯, ÀúÀÛ±Ç ºž¿©ÁÖ±â." *END */

1 0

wine/programs/winecfg drive.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21377 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 09:25:27 Modified files: programs/winecfg: drive.c Log message: Only set label and serial number when they are actually changed. Patch: http://cvs.winehq.org/patch.py?id=21377 Old revision New revision Changes Path 1.32 1.33 +48 -63 wine/programs/winecfg/drive.c Index: wine/programs/winecfg/drive.c diff -u -p wine/programs/winecfg/drive.c:1.32 wine/programs/winecfg/drive.c:1.33 --- wine/programs/winecfg/drive.c:1.32 21 Nov 2005 15:25:27 -0000 +++ wine/programs/winecfg/drive.c 21 Nov 2005 15:25:27 -0000 @@ -174,6 +174,44 @@ static DWORD get_drive_type( char letter return ret; } + +static void set_drive_label( char letter, const char *label ) +{ + char device[] = "a:\\"; /* SetVolumeLabel() requires a trailing slash */ + device[0] = letter; + + if(!SetVolumeLabel(device, label)) + { + WINE_WARN("unable to set volume label for devicename of '%s', label of '%s'\n", + device, label); + PRINTERROR(); + } + else + { + WINE_TRACE(" set volume label for devicename of '%s', label of '%s'\n", + device, label); + } +} + +/* set the drive serial number via a .windows-serial file */ +static void set_drive_serial( char letter, const char *serial ) +{ + char filename[] = "a:\\.windows-serial"; + HANDLE hFile; + + filename[0] = letter; + WINE_TRACE("Putting serial number of '%s' into file '%s'\n", serial, filename); + hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + DWORD w; + WriteFile(hFile, serial, strlen(serial), &w, NULL); + WriteFile(hFile, "\n", 1, &w, NULL); + CloseHandle(hFile); + } +} + #if 0 /* currently unused, but if users have this burning desire to be able to rename drives, @@ -340,6 +378,7 @@ void apply_drive_changes(void) DWORD maxComponentLength; DWORD fileSystemFlags; CHAR fileSystemName[128]; + char newSerialNumberText[32]; int retval; BOOL defineDevice; @@ -350,6 +389,8 @@ void apply_drive_changes(void) { defineDevice = FALSE; foundDrive = FALSE; + volumeNameBuffer[0] = 0; + serialNumber = 0; snprintf(devicename, sizeof(devicename), "%c:", 'A' + i); /* get a drive */ @@ -366,10 +407,6 @@ void apply_drive_changes(void) /* if we found a drive and have a drive then compare things */ if(foundDrive && drives[i].in_use) { - char newSerialNumberText[256]; - - volumeNameBuffer[0] = 0; - WINE_TRACE("drives[i].letter: '%c'\n", drives[i].letter); snprintf(devicename, sizeof(devicename), "%c:\\", 'A' + i); @@ -389,20 +426,12 @@ void apply_drive_changes(void) continue; /* skip this drive */ } - snprintf(newSerialNumberText, sizeof(newSerialNumberText), "%lX", serialNumber); - WINE_TRACE(" current path: '%s', new path: '%s'\n", targetpath, drives[i].unixpath); - WINE_TRACE(" current label: '%s', new label: '%s'\n", - volumeNameBuffer, drives[i].label); - WINE_TRACE(" current serial: '%s', new serial: '%s'\n", - newSerialNumberText, drives[i].serial); /* compare to what we have */ /* do we have the same targetpath? */ - if(strcmp(drives[i].unixpath, targetpath) || - strcmp(drives[i].label, volumeNameBuffer) || - strcmp(drives[i].serial, newSerialNumberText)) + if(strcmp(drives[i].unixpath, targetpath)) { defineDevice = TRUE; WINE_TRACE(" making changes to drive '%s'\n", devicename); @@ -438,9 +467,6 @@ void apply_drive_changes(void) /* adding and modifying are the same steps */ if(defineDevice) { - char filename[256]; - HANDLE hFile; - /* define this drive */ /* DefineDosDevice() requires that NO trailing slash be present */ snprintf(devicename, sizeof(devicename), "%c:", 'A' + i); @@ -454,56 +480,15 @@ void apply_drive_changes(void) { WINE_TRACE(" added devicename of '%s', targetpath of '%s'\n", devicename, drives[i].unixpath); - - /* SetVolumeLabel() requires a trailing slash */ - snprintf(devicename, sizeof(devicename), "%c:\\", 'A' + i); - if(!SetVolumeLabel(devicename, drives[i].label)) - { - WINE_WARN("unable to set volume label for devicename of '%s', label of '%s'\n", - devicename, drives[i].label); - PRINTERROR(); - } - else - { - WINE_TRACE(" set volume label for devicename of '%s', label of '%s'\n", - devicename, drives[i].label); - } } + } + if (drives[i].label && strcmp(drives[i].label, volumeNameBuffer)) + set_drive_label( drives[i].letter, drives[i].label ); - /* Set the drive serial number via a .windows-serial file in */ - /* the targetpath directory */ - snprintf(filename, sizeof(filename), "%c:\\.windows-serial", drives[i].letter); - WINE_TRACE(" Putting serial number of '%ld' into file '%s'\n", - serialNumber, filename); - hFile = CreateFile(filename, - GENERIC_WRITE, - FILE_SHARE_READ, - NULL, - CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (hFile != INVALID_HANDLE_VALUE) - { - DWORD w; - WINE_TRACE(" writing serial number of '%s'\n", drives[i].serial); - WriteFile(hFile, - drives[i].serial, - strlen(drives[i].serial), - &w, - NULL); - WriteFile(hFile, - "\n", - strlen("\n"), - &w, - NULL); - CloseHandle(hFile); - } - else - { - WINE_TRACE(" CreateFile() error with file '%s'\n", filename); - } - } + snprintf(newSerialNumberText, sizeof(newSerialNumberText), "%lX", serialNumber); + if (drives[i].serial && drives[i].serial[0] && strcmp(drives[i].serial, newSerialNumberText)) + set_drive_serial( drives[i].letter, drives[i].serial ); set_drive_type( drives[i].letter, drives[i].type ); }

1 0

wine/ server/trace.c server/protocol.def serve ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21376 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 09:23:49 Modified files: server : trace.c protocol.def mailslot.c include/wine : server_protocol.h dlls/ntdll : file.c dlls/kernel : sync.c Log message: Fixed handling of mailslot read timeout to avoid compiler warnings. Patch: http://cvs.winehq.org/patch.py?id=21376 Old revision New revision Changes Path 1.268 1.269 +3 -3 wine/server/trace.c 1.161 1.162 +3 -3 wine/server/protocol.def 1.12 1.13 +2 -3 wine/server/mailslot.c 1.162 1.163 +4 -4 wine/include/wine/server_protocol.h 1.104 1.105 +1 -1 wine/dlls/ntdll/file.c 1.91 1.92 +4 -1 wine/dlls/kernel/sync.c Index: wine/server/trace.c diff -u -p wine/server/trace.c:1.268 wine/server/trace.c:1.269 --- wine/server/trace.c:1.268 21 Nov 2005 15:23:49 -0000 +++ wine/server/trace.c 21 Nov 2005 15:23:49 -0000 @@ -3052,7 +3052,7 @@ static void dump_create_mailslot_request fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " max_msgsize=%08x,", req->max_msgsize ); - fprintf( stderr, " read_timeout=%08x,", req->read_timeout ); + fprintf( stderr, " read_timeout=%d,", req->read_timeout ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); } @@ -3080,13 +3080,13 @@ static void dump_set_mailslot_info_reque { fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " flags=%08x,", req->flags ); - fprintf( stderr, " read_timeout=%08x", req->read_timeout ); + fprintf( stderr, " read_timeout=%d", req->read_timeout ); } static void dump_set_mailslot_info_reply( const struct set_mailslot_info_reply *req ) { fprintf( stderr, " max_msgsize=%08x,", req->max_msgsize ); - fprintf( stderr, " read_timeout=%08x,", req->read_timeout ); + fprintf( stderr, " read_timeout=%d,", req->read_timeout ); fprintf( stderr, " msg_count=%08x,", req->msg_count ); fprintf( stderr, " next_msgsize=%08x", req->next_msgsize ); } Index: wine/server/protocol.def diff -u -p wine/server/protocol.def:1.161 wine/server/protocol.def:1.162 --- wine/server/protocol.def:1.161 21 Nov 2005 15:23:49 -0000 +++ wine/server/protocol.def 21 Nov 2005 15:23:49 -0000 @@ -2475,7 +2475,7 @@ enum message_type unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ unsigned int max_msgsize; - unsigned int read_timeout; + int read_timeout; VARARG(name,unicode_str); /* mailslot name */ @REPLY obj_handle_t handle; /* handle to the mailslot */ @@ -2497,10 +2497,10 @@ enum message_type @REQ(set_mailslot_info) obj_handle_t handle; /* handle to the mailslot */ unsigned int flags; - unsigned int read_timeout; + int read_timeout; @REPLY unsigned int max_msgsize; - unsigned int read_timeout; + int read_timeout; unsigned int msg_count; unsigned int next_msgsize; @END Index: wine/server/mailslot.c diff -u -p wine/server/mailslot.c:1.12 wine/server/mailslot.c:1.13 --- wine/server/mailslot.c:1.12 21 Nov 2005 15:23:49 -0000 +++ wine/server/mailslot.c 21 Nov 2005 15:23:49 -0000 @@ -56,7 +56,7 @@ struct mailslot struct fd *fd; struct fd *write_fd; unsigned int max_msgsize; - unsigned int read_timeout; + int read_timeout; struct list writers; }; @@ -207,8 +207,7 @@ static void mailslot_queue_async( struct return; } - if (mailslot->read_timeout != MAILSLOT_WAIT_FOREVER) - timeout = &mailslot->read_timeout; + if (mailslot->read_timeout != -1) timeout = &mailslot->read_timeout; fd_queue_async_timeout( fd, apc, user, iosb, type, count, timeout ); } Index: wine/include/wine/server_protocol.h diff -u -p wine/include/wine/server_protocol.h:1.162 wine/include/wine/server_protocol.h:1.163 --- wine/include/wine/server_protocol.h:1.162 21 Nov 2005 15:23:50 -0000 +++ wine/include/wine/server_protocol.h 21 Nov 2005 15:23:50 -0000 @@ -3532,7 +3532,7 @@ struct create_mailslot_request unsigned int access; unsigned int attributes; unsigned int max_msgsize; - unsigned int read_timeout; + int read_timeout; /* VARARG(name,unicode_str); */ }; struct create_mailslot_reply @@ -3564,13 +3564,13 @@ struct set_mailslot_info_request struct request_header __header; obj_handle_t handle; unsigned int flags; - unsigned int read_timeout; + int read_timeout; }; struct set_mailslot_info_reply { struct reply_header __header; unsigned int max_msgsize; - unsigned int read_timeout; + int read_timeout; unsigned int msg_count; unsigned int next_msgsize; }; @@ -4208,6 +4208,6 @@ union generic_reply struct set_mailslot_info_reply set_mailslot_info_reply; }; -#define SERVER_PROTOCOL_VERSION 198 +#define SERVER_PROTOCOL_VERSION 199 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ Index: wine/dlls/ntdll/file.c diff -u -p wine/dlls/ntdll/file.c:1.104 wine/dlls/ntdll/file.c:1.105 --- wine/dlls/ntdll/file.c:1.104 21 Nov 2005 15:23:50 -0000 +++ wine/dlls/ntdll/file.c 21 Nov 2005 15:23:50 -0000 @@ -2061,7 +2061,7 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHA req->access = DesiredAccess; req->attributes = (attr) ? attr->Attributes : 0; req->max_msgsize = MaxMessageSize; - req->read_timeout = TimeOut->QuadPart / -10000; + req->read_timeout = (TimeOut->QuadPart <= 0) ? TimeOut->QuadPart / -10000 : -1; wine_server_add_data( req, attr->ObjectName->Buffer + 4, attr->ObjectName->Length - 4*sizeof(WCHAR) ); ret = wine_server_call( req ); Index: wine/dlls/kernel/sync.c diff -u -p wine/dlls/kernel/sync.c:1.91 wine/dlls/kernel/sync.c:1.92 --- wine/dlls/kernel/sync.c:1.91 21 Nov 2005 15:23:50 -0000 +++ wine/dlls/kernel/sync.c 21 Nov 2005 15:23:50 -0000 @@ -1672,7 +1672,10 @@ HANDLE WINAPI CreateMailslotW( LPCWSTR l attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; - timeout.QuadPart = (ULONGLONG) lReadTimeout * -10000; + if (lReadTimeout != MAILSLOT_WAIT_FOREVER) + timeout.QuadPart = (ULONGLONG) lReadTimeout * -10000; + else + timeout.QuadPart = ((LONGLONG)0x7fffffff << 32) | 0xffffffff; status = NtCreateMailslotFile( &handle, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, 0, 0, nMaxMessageSize, &timeout );

1 0

wine/dlls/user win.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21375 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 09:18:33 Modified files: dlls/user : win.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Choose what window styles to dump (WS_GROUP/WS_TABSTOP vs. WS_MINIMIZEBOX/WS_MAXIMIZEBOX) based on the WS_CHILD style set. Patch: http://cvs.winehq.org/patch.py?id=21375 Old revision New revision Changes Path 1.21 1.22 +10 -4 wine/dlls/user/win.c Index: wine/dlls/user/win.c diff -u -p wine/dlls/user/win.c:1.21 wine/dlls/user/win.c:1.22 --- wine/dlls/user/win.c:1.21 21 Nov 2005 15:18:33 -0000 +++ wine/dlls/user/win.c 21 Nov 2005 15:18:33 -0000 @@ -739,10 +739,16 @@ static void dump_window_styles( DWORD st if(style & WS_HSCROLL) TRACE(" WS_HSCROLL"); if(style & WS_SYSMENU) TRACE(" WS_SYSMENU"); if(style & WS_THICKFRAME) TRACE(" WS_THICKFRAME"); - if(style & WS_GROUP) TRACE(" WS_GROUP"); - if(style & WS_TABSTOP) TRACE(" WS_TABSTOP"); - if(style & WS_MINIMIZEBOX) TRACE(" WS_MINIMIZEBOX"); - if(style & WS_MAXIMIZEBOX) TRACE(" WS_MAXIMIZEBOX"); + if (style & WS_CHILD) + { + if(style & WS_GROUP) TRACE(" WS_GROUP"); + if(style & WS_TABSTOP) TRACE(" WS_TABSTOP"); + } + else + { + if(style & WS_MINIMIZEBOX) TRACE(" WS_MINIMIZEBOX"); + if(style & WS_MAXIMIZEBOX) TRACE(" WS_MAXIMIZEBOX"); + } /* FIXME: Add dumping of BS_/ES_/SBS_/LBS_/CBS_/DS_/etc. styles */ #define DUMPED_STYLES \

1 0

wine/dlls/ntdll/tests om.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21374 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 09:18:10 Modified files: dlls/ntdll/tests: om.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> More Object Manager tests. Patch: http://cvs.winehq.org/patch.py?id=21374 Old revision New revision Changes Path 1.4 1.5 +403 -1 wine/dlls/ntdll/tests/om.c

1 0

wine/dlls/wininet tests/http.c http.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21373 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 09:17:55 Modified files: dlls/wininet/tests: http.c dlls/wininet : http.c Log message: Aric Stewart <aric(a)codeweavers.com> Implement HttpSendRequestEx and HttpEndRequest. Restructure, breaking some things out of HTTP_SendRequestW to avoid duplicate code. Patch: http://cvs.winehq.org/patch.py?id=21373 Old revision New revision Changes Path 1.31 1.32 +60 -0 wine/dlls/wininet/tests/http.c 1.110 1.111 +488 -213 wine/dlls/wininet/http.c

1 0

wine/dlls/crypt32 encode.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21372 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 07:35:26 Modified files: dlls/crypt32 : encode.c Log message: Ge van Geldorp <gvg(a)reactos.org> Don't redefine ASN_OCTETSTRING, it's already defined in snmp.h. Patch: http://cvs.winehq.org/patch.py?id=21372 Old revision New revision Changes Path 1.32 1.33 +0 -1 wine/dlls/crypt32/encode.c Index: wine/dlls/crypt32/encode.c diff -u -p wine/dlls/crypt32/encode.c:1.32 wine/dlls/crypt32/encode.c:1.33 --- wine/dlls/crypt32/encode.c:1.32 21 Nov 2005 13:35:26 -0000 +++ wine/dlls/crypt32/encode.c 21 Nov 2005 13:35:26 -0000 @@ -53,7 +53,6 @@ /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) -#define ASN_OCTETSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x04) #define ASN_ENUMERATED (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x0a) #define ASN_SETOF (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x11) #define ASN_NUMERICSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x12)

1 0

wine/dlls/shell32 shell32_main.h shell32_main. ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21371 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 07:35:06 Modified files: dlls/shell32 : shell32_main.h shell32_main.c iconcache.c Log message: Martin Fuchs <martin-fuchs(a)gmx.net> SHGetFileInfoW(): handle SHGFI_LINKOVERLAY and SHGFI_OVERLAYINDEX. SHMapPIDLToSystemImageListIndex(): determine overlay flag for PidlToSicIndex() and return -1 in error cases. Read shell overlay icon settings from registry to allow icon overrides. Patch: http://cvs.winehq.org/patch.py?id=21371 Old revision New revision Changes Path 1.108 1.109 +3 -0 wine/dlls/shell32/shell32_main.h 1.156 1.157 +41 -9 wine/dlls/shell32/shell32_main.c 1.95 1.96 +78 -22 wine/dlls/shell32/iconcache.c

1 0