March 2008 - Wine-commits - list.winehq.org

Hans Leidekker : wininet: Set ProxyEnable registry value if it isn' t already set.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: ed1cb1f099f88eb4d06ce72227258cab690829db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1cb1f099f88eb4d06ce7222… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Mar 30 19:17:54 2008 +0100 wininet: Set ProxyEnable registry value if it isn't already set. --- dlls/wininet/internet.c | 64 ++++++++++++++++++++++------------------------ 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3495b5c..69b6897 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -357,45 +357,43 @@ static BOOL INTERNET_ConfigureProxy( LPWININETAPPINFOW lpwai ) if (RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key )) return FALSE; len = sizeof enabled; - if (!RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&enabled, &len ) && - (type == REG_DWORD)) + if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&enabled, &len ) || type != REG_DWORD) + RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&enabled, sizeof(REG_DWORD) ); + + if (enabled) { - if (enabled) + TRACE("Proxy is enabled.\n"); + + /* figure out how much memory the proxy setting takes */ + if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { - TRACE("Proxy is enabled.\n"); + LPWSTR szProxy, p; + static const WCHAR szHttp[] = {'h','t','t','p','=',0}; - /* figure out how much memory the proxy setting takes */ - if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && - len && (type == REG_SZ)) + if (!(szProxy = HeapAlloc( GetProcessHeap(), 0, len ))) { - LPWSTR szProxy, p; - static const WCHAR szHttp[] = {'h','t','t','p','=',0}; - - if (!(szProxy = HeapAlloc( GetProcessHeap(), 0, len ))) - { - RegCloseKey( key ); - return FALSE; - } - RegQueryValueExW( key, szProxyServer, NULL, &type, (BYTE*)szProxy, &len ); + RegCloseKey( key ); + return FALSE; + } + RegQueryValueExW( key, szProxyServer, NULL, &type, (BYTE*)szProxy, &len ); - /* find the http proxy, and strip away everything else */ - p = strstrW( szProxy, szHttp ); - if (p) - { - p += lstrlenW( szHttp ); - lstrcpyW( szProxy, p ); - } - p = strchrW( szProxy, ' ' ); - if (p) *p = 0; + /* find the http proxy, and strip away everything else */ + p = strstrW( szProxy, szHttp ); + if (p) + { + p += lstrlenW( szHttp ); + lstrcpyW( szProxy, p ); + } + p = strchrW( szProxy, ' ' ); + if (p) *p = 0; - lpwai->dwAccessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->lpszProxy = szProxy; + lpwai->dwAccessType = INTERNET_OPEN_TYPE_PROXY; + lpwai->lpszProxy = szProxy; - TRACE("http proxy = %s\n", debugstr_w(lpwai->lpszProxy)); - } - else - ERR("Couldn't read proxy server settings from registry.\n"); + TRACE("http proxy = %s\n", debugstr_w(lpwai->lpszProxy)); } + else + ERR("Couldn't read proxy server settings from registry.\n"); } else if ((envproxy = getenv( "http_proxy" ))) {

1 0

Hans Leidekker : wininet: Don't set the host port from the server port.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: e4c59c263d21bed459bfe66091c7da3db643a44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c59c263d21bed459bfe6609… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Mar 30 19:17:31 2008 +0100 wininet: Don't set the host port from the server port. This works for direct connections but in case of proxy connections server port and host port usually are different. --- dlls/wininet/http.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 40cd3ff..a197c43 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1960,7 +1960,11 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, lpwhs->nServerPort = (dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT); - lpwhs->nHostPort = lpwhs->nServerPort; + + if (lpwhs->nHostPort == INTERNET_INVALID_PORT_NUMBER) + lpwhs->nHostPort = (dwFlags & INTERNET_FLAG_SECURE ? + INTERNET_DEFAULT_HTTPS_PORT : + INTERNET_DEFAULT_HTTP_PORT); if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0) HTTP_DealWithProxy( hIC, lpwhs, lpwhr );

1 0

Hans Leidekker : wininet: Fix redirects through a proxy.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 0ffe9f52077058c38c4423e3c34d565055cde69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffe9f52077058c38c4423e3c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Mar 30 19:16:52 2008 +0100 wininet: Fix redirects through a proxy. HTTP_DealWithProxy replaces the request path with a full URL to make sure a correct request is built for for the proxy. This will work just once in case of a redirect because the path will be appended to the redirect url, resulting in an incorrect url. --- dlls/wininet/http.c | 56 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3f83d6d..40cd3ff 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1231,6 +1231,36 @@ static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, struct HttpAuthIn return TRUE; } +static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) +{ + WCHAR new_location[2048], *url; + DWORD size; + + size = sizeof(new_location); + if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_LOCATION, new_location, &size, NULL)) + { + if (!(url = HeapAlloc( GetProcessHeap(), 0, size + sizeof(WCHAR) ))) return NULL; + strcpyW( url, new_location ); + } + else + { + static const WCHAR slash[] = { '/',0 }; + static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; + WININETHTTPSESSIONW *session = req->lpHttpSession; + + size = 15; /* "http://" + sizeof(port#) + ":/\0" */ + size += strlenW( session->lpszHostName ) + strlenW( req->lpszPath ); + + if (!(url = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return FALSE; + + sprintfW( url, format, session->lpszHostName, session->nHostPort ); + if (req->lpszPath[0] != '/') strcatW( url, slash ); + strcatW( url, req->lpszPath ); + } + TRACE("url=%s\n", debugstr_w(url)); + return url; +} + /*********************************************************************** * HTTP_DealWithProxy */ @@ -1242,9 +1272,8 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, WCHAR* url; static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; - static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }, szSlash[] = { '/',0 } ; - static const WCHAR szFormat1[] = { 'h','t','t','p',':','/','/','%','s',0 }; - static const WCHAR szFormat2[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; + static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; + static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; int len; memset( &UrlComponents, 0, sizeof UrlComponents ); @@ -1254,7 +1283,7 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, if( CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, hIC->lpszProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) ) - sprintfW(proxy, szFormat1, hIC->lpszProxy); + sprintfW(proxy, szFormat, hIC->lpszProxy); else strcpyW(proxy, hIC->lpszProxy); if( !InternetCrackUrlW(proxy, 0, 0, &UrlComponents) ) @@ -1273,15 +1302,6 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - sprintfW(url, szFormat2, lpwhs->lpszHostName, lpwhs->nHostPort); - - if( lpwhr->lpszPath[0] != '/' ) - strcatW( url, szSlash ); - strcatW(url, lpwhr->lpszPath); - if(lpwhr->lpszPath != szNul) - HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); - lpwhr->lpszPath = url; - HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); lpwhs->lpszServerName = WININET_strdupW(UrlComponents.lpszHostName); lpwhs->nServerPort = UrlComponents.nPort; @@ -3177,7 +3197,15 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } - requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion); + if (lpwhr->lpHttpSession->lpAppInfo->lpszProxy && lpwhr->lpHttpSession->lpAppInfo->lpszProxy[0]) + { + WCHAR *url = HTTP_BuildProxyRequestUrl(lpwhr); + requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, url, lpwhr->lpszVersion); + HeapFree(GetProcessHeap(), 0, url); + } + else + requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion); + TRACE("Request header -> %s\n", debugstr_w(requestString) );

1 0

Hans Leidekker : wininet: Don' t close proxy connections when keep-alive is specified.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 454fae84321f46d2c5b7df7f763d2855fc304948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454fae84321f46d2c5b7df7f7… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Mar 30 19:16:34 2008 +0100 wininet: Don't close proxy connections when keep-alive is specified. --- dlls/wininet/http.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3980e9a..3f83d6d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3971,9 +3971,10 @@ BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) { WCHAR szConnectionResponse[20]; dwBufferSize = sizeof(szConnectionResponse); - if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, - &dwBufferSize, NULL) || - strcmpiW(szConnectionResponse, szKeepAlive)) + if ((!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) || + strcmpiW(szConnectionResponse, szKeepAlive)) && + (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) || + strcmpiW(szConnectionResponse, szKeepAlive))) { HTTPREQ_CloseConnection(&lpwhr->hdr); }

1 0

Hans Leidekker : wininet: Support http_proxy environment variable.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: c7f93666c3bceb11abf5bb020e84ceb09dd57048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f93666c3bceb11abf5bb020… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Mar 30 19:16:11 2008 +0100 wininet: Support http_proxy environment variable. Based on a patch by Mike Hearn. --- dlls/wininet/internet.c | 104 +++++++++++++++++++++++++++------------------- 1 files changed, 61 insertions(+), 43 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index be2fa9c..3495b5c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -336,67 +336,85 @@ BOOL WINAPI DetectAutoProxyUrl(LPSTR lpszAutoProxyUrl, /*********************************************************************** - * INTERNET_ConfigureProxyFromReg + * INTERNET_ConfigureProxy * * FIXME: * The proxy may be specified in the form 'http=proxy.my.org' * Presumably that means there can be ftp=ftpproxy.my.org too. */ -static BOOL INTERNET_ConfigureProxyFromReg( LPWININETAPPINFOW lpwai ) +static BOOL INTERNET_ConfigureProxy( LPWININETAPPINFOW lpwai ) { HKEY key; - DWORD r, keytype, len, enabled; - LPCSTR lpszInternetSettings = - "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; + DWORD type, len, enabled = 0; + LPCSTR envproxy; + static const WCHAR szInternetSettings[] = + { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0 }; static const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 }; + static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l','e', 0 }; - r = RegOpenKeyA(HKEY_CURRENT_USER, lpszInternetSettings, &key); - if ( r != ERROR_SUCCESS ) - return FALSE; + if (RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key )) return FALSE; len = sizeof enabled; - r = RegQueryValueExA( key, "ProxyEnable", NULL, &keytype, - (BYTE*)&enabled, &len); - if( (r == ERROR_SUCCESS) && enabled ) + if (!RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&enabled, &len ) && + (type == REG_DWORD)) { - TRACE("Proxy is enabled.\n"); - - /* figure out how much memory the proxy setting takes */ - r = RegQueryValueExW( key, szProxyServer, NULL, &keytype, - NULL, &len); - if( (r == ERROR_SUCCESS) && len && (keytype == REG_SZ) ) + if (enabled) { - LPWSTR szProxy, p; - static const WCHAR szHttp[] = {'h','t','t','p','=',0}; - - szProxy=HeapAlloc( GetProcessHeap(), 0, len ); - RegQueryValueExW( key, szProxyServer, NULL, &keytype, - (BYTE*)szProxy, &len); + TRACE("Proxy is enabled.\n"); - /* find the http proxy, and strip away everything else */ - p = strstrW( szProxy, szHttp ); - if( p ) + /* figure out how much memory the proxy setting takes */ + if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && + len && (type == REG_SZ)) { - p += lstrlenW(szHttp); - lstrcpyW( szProxy, p ); - } - p = strchrW( szProxy, ' ' ); - if( p ) - *p = 0; + LPWSTR szProxy, p; + static const WCHAR szHttp[] = {'h','t','t','p','=',0}; + + if (!(szProxy = HeapAlloc( GetProcessHeap(), 0, len ))) + { + RegCloseKey( key ); + return FALSE; + } + RegQueryValueExW( key, szProxyServer, NULL, &type, (BYTE*)szProxy, &len ); + + /* find the http proxy, and strip away everything else */ + p = strstrW( szProxy, szHttp ); + if (p) + { + p += lstrlenW( szHttp ); + lstrcpyW( szProxy, p ); + } + p = strchrW( szProxy, ' ' ); + if (p) *p = 0; - lpwai->dwAccessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->lpszProxy = szProxy; + lpwai->dwAccessType = INTERNET_OPEN_TYPE_PROXY; + lpwai->lpszProxy = szProxy; - TRACE("http proxy = %s\n", debugstr_w(lpwai->lpszProxy)); + TRACE("http proxy = %s\n", debugstr_w(lpwai->lpszProxy)); + } + else + ERR("Couldn't read proxy server settings from registry.\n"); } - else - ERR("Couldn't read proxy server settings.\n"); } - else - TRACE("Proxy is not enabled.\n"); - RegCloseKey(key); + else if ((envproxy = getenv( "http_proxy" ))) + { + WCHAR *envproxyW; + + len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); + if (!(envproxyW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR)))) return FALSE; + MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + + lpwai->dwAccessType = INTERNET_OPEN_TYPE_PROXY; + lpwai->lpszProxy = envproxyW; + + TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwai->lpszProxy)); + enabled = 1; + } + if (!enabled) TRACE("Proxy is not enabled.\n"); - return enabled; + RegCloseKey( key ); + return (enabled > 0); } /*********************************************************************** @@ -582,7 +600,7 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, lstrcpyW( lpwai->lpszAgent, lpszAgent ); } if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG) - INTERNET_ConfigureProxyFromReg( lpwai ); + INTERNET_ConfigureProxy( lpwai ); else if (NULL != lpszProxy) { lpwai->lpszProxy = HeapAlloc( GetProcessHeap(), 0, @@ -1922,7 +1940,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d { TRACE("Getting global proxy info\n"); memset(&wai, 0, sizeof(WININETAPPINFOW)); - INTERNET_ConfigureProxyFromReg( &wai ); + INTERNET_ConfigureProxy( &wai ); lpwai = &wai; }

1 0

Alexander Nicolaysen Sørnes : net: Add Norwegian Bokmål resource.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: f40e9258043227c6ac48b82eb8c2815c7922e558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40e9258043227c6ac48b82eb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Mar 30 01:08:06 2008 +0100 net: Add Norwegian Bokmål resource. --- programs/net/No.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ programs/net/rsrc.rc | 1 + 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/programs/net/No.rc b/programs/net/No.rc new file mode 100644 index 0000000..ededb05 --- /dev/null +++ b/programs/net/No.rc @@ -0,0 +1,43 @@ +/* + * NET.EXE - Wine-compatible net program + * Norwegian (Bokm�l) language support + * + * Copyright (C) 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + STRING_USAGE, "Programmet brukes som f�lger:\n\nNET [ HELP | START | STOP ]\n" + STRING_START_USAGE, "Oppgi navnet p� tjeneren soms skal startes.\n" + STRING_STOP_USAGE, "Oppgi navnet p� tjeneren som skal stoppes.\n" + STRING_STOP_DEP, "Stopper avhengig tjeneste: %s\n" + STRING_CANT_STOP, "Klarte ikke stoppe tjenesten �%s�\n" + STRING_NO_SCM, "Klarte ikke n� tjenestebehandleren.\n" + STRING_NO_SVCHANDLE, "Klarte ikke n� tjenesten.\n" + STRING_START_SVC, "Tjenesten �%s� starter.\n" + STRING_START_SVC_SUCCESS, "Tjenesten �%s� ble startet vellykket.\n" + STRING_START_SVC_FAIL, "Tjenesten �%s� klarte ikke starte.\n" + STRING_STOP_SVC, "Tjenesten �%s� stopper.\n" + STRING_STOP_SVC_SUCCESS, "Tjenesten �%s� ble stoppet vellykket.\n" + STRING_STOP_SVC_FAIL, "Klarte ikke stoppe tjenesten �%s�.\n" + STRING_HELP_USAGE, "Hjelp brukes som f�lgende:\n\nNET HELP kommando\n -eller-\nNET kommando /HELP\n\n Tilgjengelige kommandoer:\n NET HELP NET START NET STOP\n" + STRING_NO_ENTRIES, "Det er ingen oppf�ringer p� listen.\n" + STRING_USE_HEADER, "\nStatus Lokal Remote\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S �pne ressurser: %lu\n" +} diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc index 3511882..e26cbff 100644 --- a/programs/net/rsrc.rc +++ b/programs/net/rsrc.rc @@ -26,5 +26,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Fr.rc" #include "Ko.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc" #include "Ru.rc"

1 0

Marcus Meissner : shell32: Adjusted German about dialog for changes in English one.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 8c63754d67e90952a0eca77e6a8b21be0d981f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c63754d67e90952a0eca77e6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Mar 30 00:07:30 2008 +0100 shell32: Adjusted German about dialog for changes in English one. --- dlls/shell32/shell32_De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index de1e191..73068d4 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -143,10 +143,12 @@ CAPTION "Informationen FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + PUSHBUTTON "&Lizenz...", IDC_ABOUT_LICENSE, 153, 113, 50, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 + LTEXT "Wine Version %s", IDC_ABOUT_STATIC_TEXT3, 40, 34, 170, 10 LTEXT "WINE wurde f�r Sie gekeltert von:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 }

1 0

Alexander Nicolaysen Sørnes : reg: Add Norwegian Bokmål resource.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 31bb5dcf03868408aa7994200ce16ffd6da6536c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bb5dcf03868408aa7994200… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Mar 30 00:59:15 2008 +0100 reg: Add Norwegian Bokmål resource. --- programs/reg/No.rc | 30 ++++++++++++++++++++++++++++++ programs/reg/rsrc.rc | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/reg/No.rc b/programs/reg/No.rc new file mode 100644 index 0000000..5b9a33d --- /dev/null +++ b/programs/reg/No.rc @@ -0,0 +1,30 @@ +/* + * REG.EXE - Wine-compatible reg program. + * Norwegian (Bokm�l) language support + * + * Copyright 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + STRING_USAGE, "Programmer kj�res som f�lger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" + STRING_ADD_USAGE, "REG ADD n�kkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE n�kkelnavn [/v verdi | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY n�kkelnavn [/v verdi | /ve] [/s]\n" +} diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc index 3a721db..125b3e3 100644 --- a/programs/reg/rsrc.rc +++ b/programs/reg/rsrc.rc @@ -24,4 +24,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc"

1 0

Andrew Talbot : dbghelp: Fix type mismatch in comparison.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: ae1791b0b8d181e0d01f8db1cae4eba48edefbac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1791b0b8d181e0d01f8db1c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 29 16:11:20 2008 +0000 dbghelp: Fix type mismatch in comparison. --- dlls/dbghelp/stabs.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index d597848..f9b5991 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -792,10 +792,11 @@ static inline int stabs_pts_read_array(struct ParseTypedefData* ptd, static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typename, struct symt** ret_dt) { + static struct symt null_dt = {SymTagNull}; int idx; - long sz = -1; - struct symt* new_dt = NULL; /* newly created data type */ - struct symt* ref_dt; /* referenced data type (pointer...) */ + long sz = -1; + struct symt* new_dt = &null_dt; /* newly created data type */ + struct symt* ref_dt; /* referenced data type (pointer...) */ long filenr1, subnr1, tmp; /* things are a bit complicated because of the way the typedefs are stored inside @@ -807,7 +808,7 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ while (*ptd->ptr == '=') { ptd->ptr++; - PTS_ABORTIF(ptd, new_dt != btNoType); + PTS_ABORTIF(ptd, new_dt->tag != SymTagNull); /* first handle attribute if any */ switch (*ptd->ptr)

1 0

Maarten Lankhorst : quartz: Check against a null dereference and don' t read beyond the end of file.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 714e807aa538681472719e038f2741f5bff69a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=714e807aa538681472719e038… Author: Maarten Lankhorst <crumb(a)google.com> Date: Fri Mar 28 13:10:20 2008 -0700 quartz: Check against a null dereference and don't read beyond the end of file. --- dlls/quartz/mpegsplit.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index ab4d371..cb7528f 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -370,8 +370,12 @@ fail: FIXME("Failed with hres: %08x!\n", hr); This->skipbytes += This->remaining_bytes; This->remaining_bytes = 0; - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; + if (This->pCurrentSample) + { + IMediaSample_SetActualDataLength(This->pCurrentSample, 0); + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + } } if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile) @@ -647,6 +651,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) while (pos < This->EndOfFile && SUCCEEDED(hr)) { LONGLONG length = 0; + hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); while (parse_header(header, &length, &duration)) { /* No valid header yet; shift by a byte and check again */ @@ -655,11 +660,8 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) if (FAILED(hr)) break; } - if (SUCCEEDED(hr)) - { - pos += length; - hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); - } + pos += length; + TRACE("Pos: %x%08x/%x%08x\n", (DWORD)(pos >> 32), (DWORD)pos, (DWORD)(This->EndOfFile>>32), (DWORD)This->EndOfFile); } hr = S_OK; TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000));

1 0