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

Frédéric Delanoy : wininet: Update French translation.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 2b18ed11a5096df4c2256e5614ef4c0246ffe216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b18ed11a5096df4c2256e561… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 23 23:22:51 2009 +0200 wininet: Update French translation. --- dlls/wininet/wininet_Fr.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Fr.rc b/dlls/wininet/wininet_Fr.rc index e12aa6d..74ee208 100644 --- a/dlls/wininet/wininet_Fr.rc +++ b/dlls/wininet/wininet_Fr.rc @@ -49,6 +49,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuler", IDCANCEL, 147, 128, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 218, 150 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Authentification requise" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Entrez votre nom d'utilisateur et votre mot de passe :", -1, 10, 8, 173, 12 + LTEXT "Serveur", -1, 10, 28, 50, 17 + LTEXT "Domaine", -1, 10, 50, 50, 10 + LTEXT "Utilisateur", -1, 10, 71, 50, 10 + LTEXT "Mot de passe", -1, 10, 90, 50, 10 + LTEXT "" IDC_SERVER, 58, 28, 150, 14, 0 + LTEXT "" IDC_REALM, 58, 48, 150, 14, 0 + EDITTEXT IDC_USERNAME, 58, 68, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 58, 88, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Enregistrer ce mot de passe (risqué)", IDC_SAVEPASSWORD, + 58, 108, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 87, 128, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 147, 128, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Connexion réseau local (LAN)"

1 0

André Hentschel : wininet: Update German translation.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: f32366a6b952962807919562eabb23aa03ed12bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f32366a6b952962807919562e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 23 19:50:12 2009 +0200 wininet: Update German translation. --- dlls/wininet/wininet_De.rc | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet_De.rc b/dlls/wininet/wininet_De.rc index 4766589..f602a97 100644 --- a/dlls/wininet/wininet_De.rc +++ b/dlls/wininet/wininet_De.rc @@ -1,5 +1,6 @@ /* * Copyright 2004 Henning Gerhardt + * Copyright 2009 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,8 +30,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Geben Sie Benutzernamen und Kennwort ein:", -1, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 - LTEXT "Realm", -1, 40, 46, 50, 10 - LTEXT "Ben&utzername", -1, 40, 66, 50, 10 + LTEXT "Bereich", -1, 40, 46, 50, 10 + LTEXT "Ben&utzer", -1, 40, 66, 50, 10 LTEXT "Kenn&wort", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 @@ -42,6 +43,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Benutzeranmeldung" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Geben Sie Benutzernamen und Kennwort ein:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Bereich", -1, 40, 46, 50, 10 + LTEXT "Benutzer", -1, 40, 66, 50, 10 + LTEXT "Kennwort", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Dieses &Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN Verbindung"

1 0

Aurimas Fišeras : wininet: Update Lithuanian translation.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: fb374536f0d0c409cd7f7ff6a3942a0c1cedead9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb374536f0d0c409cd7f7ff6a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 23 20:23:29 2009 +0300 wininet: Update Lithuanian translation. --- dlls/wininet/wininet_Lt.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Lt.rc b/dlls/wininet/wininet_Lt.rc index 6cb176c..cd4bf48 100644 --- a/dlls/wininet/wininet_Lt.rc +++ b/dlls/wininet/wininet_Lt.rc @@ -43,6 +43,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Reikalingas tapatumo nustatymas" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Įveskite savo naudotojo vardą ir slaptažodį:", -1, 40, 6, 150, 15 + LTEXT "Serveris", -1, 40, 26, 50, 10 + LTEXT "Sritis", -1, 40, 46, 50, 10 + LTEXT "Naudotojas", -1, 40, 66, 50, 10 + LTEXT "Slaptažodis", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Į&rašyti šį slaptažodį (nesaugu)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Vietinio tinklo ryšys"

1 0

Juan Lang : winhttp: Only output fixme for unhandled resolve timeout.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 2b99adc2f1b84fca6b582b947c584c70e9b36acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b99adc2f1b84fca6b582b947… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 23 09:12:29 2009 -0700 winhttp: Only output fixme for unhandled resolve timeout. --- dlls/winhttp/session.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 4c93123..7bc61a9 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1169,7 +1169,8 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int return FALSE; } - FIXME("resolve timeout not supported\n"); + if (resolve > 0) + FIXME("resolve timeout (%d) not supported\n", resolve); if (!(request = (request_t *)grab_object( handle ))) {

1 0

Juan Lang : winhttp: Implement connect timeout.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 68039dcaff74876ea2eb9193b8b059c6b437d75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68039dcaff74876ea2eb9193b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 23 09:11:32 2009 -0700 winhttp: Implement connect timeout. --- dlls/winhttp/net.c | 41 ++++++++++++++++++++++++++++++++++----- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 6 ++++- dlls/winhttp/winhttp_private.h | 3 +- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6f2d5f5..ed4d4b9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -287,15 +287,44 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len ) +BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len, int timeout ) { - if (connect( conn->socket, sockaddr, addr_len ) == -1) + BOOL ret = FALSE; + int res = 0, state; + + if (timeout > 0) { - WARN("unable to connect to host (%s)\n", strerror(errno)); - set_last_error( sock_get_error( errno ) ); - return FALSE; + state = 1; + ioctlsocket( conn->socket, FIONBIO, &state ); } - return TRUE; + if (connect( conn->socket, sockaddr, addr_len ) < 0) + { + res = sock_get_error( errno ); + if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) + { + struct pollfd pfd; + + pfd.fd = conn->socket; + pfd.events = POLLOUT; + if (poll( &pfd, 1, timeout ) > 0) + ret = TRUE; + else + res = sock_get_error( errno ); + } + } + else + ret = TRUE; + if (timeout > 0) + { + state = 0; + ioctlsocket( conn->socket, FIONBIO, &state ); + } + if (!ret) + { + WARN("unable to connect to host (%d)\n", res); + set_last_error( res ); + } + return ret; } BOOL netconn_secure_connect( netconn_t *conn ) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 83d6117..0efada4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -925,7 +925,7 @@ static BOOL open_connection( request_t *request ) } netconn_set_timeout( &request->netconn, TRUE, request->send_timeout ); netconn_set_timeout( &request->netconn, FALSE, request->recv_timeout ); - if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen )) + if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen, request->connect_timeout )) { netconn_close( &request->netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 27509e1..4c93123 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); +#define DEFAULT_CONNECT_TIMEOUT 60000 #define DEFAULT_SEND_TIMEOUT 30000 #define DEFAULT_RECEIVE_TIMEOUT 30000 @@ -636,6 +637,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o list_add_head( &connect->hdr.children, &request->hdr.entry ); if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; + request->connect_timeout = DEFAULT_CONNECT_TIMEOUT; request->send_timeout = DEFAULT_SEND_TIMEOUT; request->recv_timeout = DEFAULT_RECEIVE_TIMEOUT; @@ -1167,7 +1169,7 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int return FALSE; } - FIXME("resolve and connect timeout not supported\n"); + FIXME("resolve timeout not supported\n"); if (!(request = (request_t *)grab_object( handle ))) { @@ -1182,6 +1184,8 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int return FALSE; } + request->connect_timeout = connect; + if (send < 0) send = 0; request->send_timeout = send; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 97c8f90..83df0c0 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -139,6 +139,7 @@ typedef struct LPWSTR version; LPWSTR raw_headers; netconn_t netconn; + int connect_timeout; int send_timeout; int recv_timeout; LPWSTR status_text; @@ -206,7 +207,7 @@ void send_callback( object_header_t *, DWORD, LPVOID, DWORD ); void close_connection( request_t * ); BOOL netconn_close( netconn_t * ); -BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int ); +BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ); BOOL netconn_connected( netconn_t * ); BOOL netconn_create( netconn_t *, int, int, int ); BOOL netconn_get_next_line( netconn_t *, char *, DWORD * );

1 0

Alexandre Julliard : kernel32: Fetch more information from the DosDevices directory for QueryDosDevice.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: f18276fe0bc0bedf5c58c51f53f9491265f500dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18276fe0bc0bedf5c58c51f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 11:01:41 2009 +0200 kernel32: Fetch more information from the DosDevices directory for QueryDosDevice. --- dlls/kernel32/volume.c | 66 ++++++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 0f4161c..9fcd061 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1018,11 +1018,10 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) static const WCHAR prnW[] = {'P','R','N',0}; static const WCHAR comW[] = {'C','O','M',0}; static const WCHAR lptW[] = {'L','P','T',0}; - static const WCHAR rootW[] = {'A',':','\\',0}; static const WCHAR com0W[] = {'\\','?','?','\\','C','O','M','0',0}; static const WCHAR com1W[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','C','O','M','1',0,0}; static const WCHAR lpt1W[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','L','P','T','1',0,0}; - static const WCHAR driveW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','A',':',0}; + static const WCHAR dosdevW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; UNICODE_STRING nt_name; ANSI_STRING unix_name; @@ -1046,15 +1045,21 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) memcpy( name, devname + HIWORD(dosdev)/sizeof(WCHAR), LOWORD(dosdev) ); name[LOWORD(dosdev)/sizeof(WCHAR)] = 0; } - else if (devname[0] && devname[1] == ':' && !devname[2]) + else { - /* FIXME: should do this for all devices, not just drives */ NTSTATUS status; - WCHAR buffer[sizeof(driveW)/sizeof(WCHAR)]; + WCHAR *buffer; - memcpy( buffer, driveW, sizeof(driveW) ); - buffer[12] = devname[0]; - if ((status = read_nt_symlink( buffer, target, bufsize ))) + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(dosdevW) + strlenW(devname)*sizeof(WCHAR) ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return 0; + } + memcpy( buffer, dosdevW, sizeof(dosdevW) ); + strcatW( buffer, devname ); + status = read_nt_symlink( buffer, target, bufsize ); + HeapFree( GetProcessHeap(), 0, buffer ); + if (status) { SetLastError( RtlNtStatusToDosError(status) ); return 0; @@ -1062,11 +1067,8 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) ret = strlenW( target ) + 1; goto done; } - else - { - SetLastError( ERROR_BAD_PATHNAME ); - return 0; - } + + /* FIXME: should read NT symlink for all devices */ if (!(path = get_dos_device_path( name ))) return 0; link = read_symlink( path ); @@ -1125,6 +1127,8 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) } else /* return a list of all devices */ { + OBJECT_ATTRIBUTES attr; + HANDLE handle; WCHAR *p = target; int i; @@ -1134,6 +1138,8 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) return 0; } + /* FIXME: these should be NT symlinks too */ + memcpy( p, auxW, sizeof(auxW) ); p += sizeof(auxW) / sizeof(WCHAR); memcpy( p, nulW, sizeof(nulW) ); @@ -1180,30 +1186,36 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) } } - strcpyW( nt_buffer + 4, rootW ); - RtlInitUnicodeString( &nt_name, nt_buffer ); - - /* FIXME: should simply enumerate the DosDevices directory instead */ - for (i = 0; i < 26; i++) + RtlInitUnicodeString( &nt_name, dosdevW ); + nt_name.Length -= sizeof(WCHAR); /* without trailing slash */ + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nt_name; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + status = NtOpenDirectoryObject( &handle, FILE_LIST_DIRECTORY, &attr ); + if (!status) { - WCHAR buffer[sizeof(driveW)/sizeof(WCHAR)], dummy[8]; - NTSTATUS status; + char data[1024]; + DIRECTORY_BASIC_INFORMATION *info = (DIRECTORY_BASIC_INFORMATION *)data; + ULONG ctx = 0, len; - memcpy( buffer, driveW, sizeof(driveW) ); - buffer[12] = 'A' + i; - status = read_nt_symlink( buffer, dummy, sizeof(dummy)/sizeof(WCHAR) ); - if (status == STATUS_SUCCESS || status == STATUS_BUFFER_TOO_SMALL) + while (!NtQueryDirectoryObject( handle, info, sizeof(data), 1, 0, &ctx, &len )) { - if (p + 3 >= target + bufsize) + if (p + info->ObjectName.Length/sizeof(WCHAR) + 1 >= target + bufsize) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); + NtClose( handle ); return 0; } - *p++ = 'A' + i; - *p++ = ':'; + memcpy( p, info->ObjectName.Buffer, info->ObjectName.Length ); + p += info->ObjectName.Length/sizeof(WCHAR); *p++ = 0; } + NtClose( handle ); } + *p++ = 0; /* terminating null */ return p - target; }

1 0

Alexandre Julliard : winemenubuilder: Reduce memory usage for string copies .
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: f428813ce283949e05b93afa04d79b6774c124e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f428813ce283949e05b93afa0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 10:41:25 2009 +0200 winemenubuilder: Reduce memory usage for string copies. --- programs/winemenubuilder/winemenubuilder.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 1eaa530..15ce483 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -692,11 +692,20 @@ static unsigned short crc16(const char* string) return crc; } +static char *strdupA( const char *str ) +{ + char *ret; + + if (!str) return NULL; + if ((ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ))) strcpy( ret, str ); + return ret; +} + static char* heap_printf(const char *format, ...) { va_list args; int size = 4096; - char *buffer; + char *buffer, *ret; int n; va_start(args, format); @@ -715,7 +724,9 @@ static char* heap_printf(const char *format, ...) HeapFree(GetProcessHeap(), 0, buffer); } va_end(args); - return buffer; + ret = HeapReAlloc(GetProcessHeap(), 0, buffer, strlen(buffer) + 1 ); + if (!ret) ret = buffer; + return ret; } static BOOL create_directories(char *directory) @@ -1429,8 +1440,8 @@ static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) if (mime_type_entry) { *pos = 0; - mime_type_entry->mimeType = heap_printf("%s", line); - mime_type_entry->glob = heap_printf("%s", pos + 1); + mime_type_entry->mimeType = strdupA(line); + mime_type_entry->glob = strdupA(pos + 1); if (mime_type_entry->mimeType && mime_type_entry->glob) list_add_tail(mime_types, &mime_type_entry->entry); else @@ -1480,7 +1491,7 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim if (xdg_data_dirs == NULL) xdg_data_dirs = heap_printf("/usr/local/share/:/usr/share/"); else - xdg_data_dirs = heap_printf("%s", xdg_data_dirs); + xdg_data_dirs = strdupA(xdg_data_dirs); if (xdg_data_dirs) { @@ -1543,7 +1554,7 @@ static BOOL match_glob(struct list *native_mime_types, const char *extension, if (*match != NULL) { - *match = heap_printf("%s", *match); + *match = strdupA(*match); if (*match == NULL) return FALSE; } @@ -2664,7 +2675,7 @@ static BOOL init_xdg(void) { create_directories(xdg_config_dir); if (getenv("XDG_DATA_HOME")) - xdg_data_dir = heap_printf("%s", getenv("XDG_DATA_HOME")); + xdg_data_dir = strdupA(getenv("XDG_DATA_HOME")); else xdg_data_dir = heap_printf("%s/.local/share", getenv("HOME")); if (xdg_data_dir)

1 0

Alexandre Julliard : libwine: Fix the wctomb validity check for codepages where the default chars don' t convert to each other.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 464c956a0a0c81d3871362630e0647a5c1ebd010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464c956a0a0c81d3871362630… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 10:40:32 2009 +0200 libwine: Fix the wctomb validity check for codepages where the default chars don't convert to each other. --- libs/wine/wctomb.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/wine/wctomb.c b/libs/wine/wctomb.c index 966e6af..3b081d4 100644 --- a/libs/wine/wctomb.c +++ b/libs/wine/wctomb.c @@ -69,9 +69,9 @@ WCHAR compose( const WCHAR *str ) static inline int is_valid_sbcs_mapping( const struct sbcs_table *table, int flags, WCHAR wch, unsigned char ch ) { - if (flags & WC_NO_BEST_FIT_CHARS) return (table->cp2uni[ch] == wch); - if (ch != (unsigned char)table->info.def_char) return 1; - return (wch == table->info.def_unicode_char); + if ((flags & WC_NO_BEST_FIT_CHARS) || ch == (unsigned char)table->info.def_char) + return (table->cp2uni[ch] == wch); + return 1; } /* query necessary dst length for src string */ @@ -262,8 +262,7 @@ static int wcstombs_sbcs_slow( const struct sbcs_table *table, int flags, static inline int is_valid_dbcs_mapping( const struct dbcs_table *table, int flags, WCHAR wch, unsigned short ch ) { - if (ch == table->info.def_char && wch != table->info.def_unicode_char) return 0; - if (flags & WC_NO_BEST_FIT_CHARS) + if ((flags & WC_NO_BEST_FIT_CHARS) || ch == table->info.def_char) { /* check if char maps back to the same Unicode value */ if (ch & 0xff00)

1 0

Roderick Colenbrander : winex11: Make X11DRV_SetupGCForPatBlt independent of screen_depth.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: c6570a50f89b20a652e37530cca01991eb57d7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6570a50f89b20a652e37530c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jul 22 21:33:44 2009 +0200 winex11: Make X11DRV_SetupGCForPatBlt independent of screen_depth. --- dlls/winex11.drv/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index abdd505..7a64022 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -233,7 +233,7 @@ BOOL X11DRV_SetupGCForPatBlt( X11DRV_PDEVICE *physDev, GC gc, BOOL fMapColors ) register int x, y; XImage *image; wine_tsx11_lock(); - pixmap = XCreatePixmap( gdi_display, root_window, 8, 8, screen_depth ); + pixmap = XCreatePixmap( gdi_display, root_window, 8, 8, physDev->depth ); image = XGetImage( gdi_display, physDev->brush.pixmap, 0, 0, 8, 8, AllPlanes, ZPixmap ); for (y = 0; y < 8; y++)

1 0

Roderick Colenbrander : winex11: Make BRUSH_DitherColor independent of the screen_depth.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: d01235332cf4df8bd8b3d0c8614ba7c80d43ad42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01235332cf4df8bd8b3d0c86… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jul 22 20:17:10 2009 +0200 winex11: Make BRUSH_DitherColor independent of the screen_depth. --- dlls/winex11.drv/brush.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 3368bbf..c94e04e 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -114,7 +114,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) if (!ditherImage) { - ditherImage = X11DRV_DIB_CreateXImage( MATRIX_SIZE, MATRIX_SIZE, screen_depth ); + ditherImage = X11DRV_DIB_CreateXImage( MATRIX_SIZE, MATRIX_SIZE, depth ); if (!ditherImage) { ERR("Could not create dither image\n"); @@ -144,7 +144,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) prevColor = color; } - pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, screen_depth ); + pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, depth ); XPutImage( gdi_display, pixmap, gc, ditherImage, 0, 0, 0, 0, MATRIX_SIZE, MATRIX_SIZE ); wine_tsx11_unlock();

1 0