November 2005 - Wine-Commits

wine/dlls/shell32 shlexec.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21500 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:04:09 Modified files: dlls/shell32 : shlexec.c Log message: Ge van Geldorp <gvg(a)reactos.org> Other code in shlexec.c (e.g. the extension handling code in ShellExecute_GetClassKey) expects sei->lpFile to not be enclosed in quotes. Patch: http://cvs.winehq.org/patch.py?id=21500 Old revision New revision Changes Path 1.76 1.77 +1 -3 wine/dlls/shell32/shlexec.c Index: wine/dlls/shell32/shlexec.c diff -u -p wine/dlls/shell32/shlexec.c:1.76 wine/dlls/shell32/shlexec.c:1.77 --- wine/dlls/shell32/shlexec.c:1.76 28 Nov 2005 20: 4: 9 -0000 +++ wine/dlls/shell32/shlexec.c 28 Nov 2005 20: 4: 9 -0000 @@ -1266,9 +1266,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW return TRUE; } - wszApplicationName[0] = '"'; - SHGetPathFromIDListW(sei_tmp.lpIDList, wszApplicationName+1); - strcatW(wszApplicationName, wQuote); + SHGetPathFromIDListW(sei_tmp.lpIDList, wszApplicationName); TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); }

1 0

wine/dlls/winspool info.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21499 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:04:01 Modified files: dlls/winspool : info.c Log message: Detlef Riekenberg <wine.dev(a)web.de> Documentation added for GetPrinterDriverDirectoryW + A. Patch: http://cvs.winehq.org/patch.py?id=21499 Old revision New revision Changes Path 1.130 1.131 +37 -0 wine/dlls/winspool/info.c Index: wine/dlls/winspool/info.c diff -u -p wine/dlls/winspool/info.c:1.130 wine/dlls/winspool/info.c:1.131 --- wine/dlls/winspool/info.c:1.130 28 Nov 2005 20: 4: 1 -0000 +++ wine/dlls/winspool/info.c 28 Nov 2005 20: 4: 1 -0000 @@ -3228,6 +3228,35 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPr /***************************************************************************** * GetPrinterDriverDirectoryW [WINSPOOL.@] + * + * Return the PATH for the Printer-Drivers (UNICODE) + * + * PARAMS + * pName [I] Servername (NT only) or NULL (local Computer) + * pEnvironment [I] Printing-Environment (see below) or NULL (Default) + * Level [I] Structure-Level (must be 1) + * pDriverDirectory [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pDriverDirectory + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / + * required for pDriverDirectory + * + * RETURNS + * Success: TRUE and in pcbNeeded the Bytes used in pDriverDirectory + * Failure: FALSE and in pcbNeeded the Bytes required for pDriverDirectory, + * if cbBuf is to small + * + * Native Values returned in pDriverDirectory on Success: + *| NT(Windows NT x86): "%winsysdir%\\spool\\DRIVERS\\w32x86" + *| NT(Windows 4.0): "%winsysdir%\\spool\\DRIVERS\\win40" + *| win9x(Windows 4.0): "%winsysdir%" + * + * "%winsysdir%" is the Value from GetSystemDirectoryW() + * + * FIXME + *- pName != NULL not supported + *- pEnvironment != NULL not supported + *- Current Implementation returns always "%winsysdir%" + * */ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverDirectory, @@ -3271,6 +3300,14 @@ BOOL WINAPI GetPrinterDriverDirectoryW(L /***************************************************************************** * GetPrinterDriverDirectoryA [WINSPOOL.@] + * + * Return the PATH for the Printer-Drivers (ANSI) + * + * See GetPrinterDriverDirectoryW. + * + * NOTES + * On NT, pDriverDirectory need the same Size as the Unicode-Version + * */ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverDirectory,

1 0

wine/include/ddk wdm.h
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21498 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 14:03:43 Modified files: include/ddk : wdm.h Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Add directory and symlink access rights. Patch: http://cvs.winehq.org/patch.py?id=21498 Old revision New revision Changes Path 1.1 1.2 +11 -0 wine/include/ddk/wdm.h Index: wine/include/ddk/wdm.h diff -u -p wine/include/ddk/wdm.h:1.1 wine/include/ddk/wdm.h:1.2 --- wine/include/ddk/wdm.h:1.1 28 Nov 2005 20: 3:43 -0000 +++ wine/include/ddk/wdm.h 28 Nov 2005 20: 3:43 -0000 @@ -831,4 +831,15 @@ typedef struct _KUSER_SHARED_DATA { #define KernelMode 0 #define UserMode 1 +/* directory object access rights */ +#define DIRECTORY_QUERY 0x0001 +#define DIRECTORY_TRAVERSE 0x0002 +#define DIRECTORY_CREATE_OBJECT 0x0004 +#define DIRECTORY_CREATE_SUBDIRECTORY 0x0008 +#define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF) + +/* symbolic link access rights */ +#define SYMBOLIC_LINK_QUERY 0x0001 +#define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) + #endif

1 0

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

Nov. 28, 2005

ChangeSet ID: 21497 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:07:36 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Add support for using secure (SSL/TLS) connections through a proxy server. Patch: http://cvs.winehq.org/patch.py?id=21497 Old revision New revision Changes Path 1.122 1.123 +64 -16 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.122 wine/dlls/wininet/http.c:1.123 --- wine/dlls/wininet/http.c:1.122 28 Nov 2005 11: 7:36 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 7:36 -0000 @@ -57,14 +57,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); -static const WCHAR g_szHttp[] = {' ','H','T','T','P','/','1','.','0',0 }; +static const WCHAR g_szHttp1_0[] = {' ','H','T','T','P','/','1','.','0',0 }; +static const WCHAR g_szHttp1_1[] = {' ','H','T','T','P','/','1','.','1',0 }; static const WCHAR g_szReferer[] = {'R','e','f','e','r','e','r',0}; static const WCHAR g_szAccept[] = {'A','c','c','e','p','t',0}; static const WCHAR g_szUserAgent[] = {'U','s','e','r','-','A','g','e','n','t',0}; static const WCHAR g_szHost[] = {'H','o','s','t',0}; -#define HTTPHEADER g_szHttp #define MAXHOSTNAME 100 #define MAX_FIELD_VALUE_LEN 256 #define MAX_FIELD_LEN 256 @@ -208,7 +208,7 @@ static void HTTP_FixURL( LPWININETHTTPRE } } -static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr ) +static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR verb, LPCWSTR path, BOOL http1_1 ) { LPWSTR requestString; DWORD len, n; @@ -225,12 +225,12 @@ static LPWSTR HTTP_BuildHeaderRequestStr len = (HTTP_QUERY_MAX + lpwhr->nCustHeaders)*4 + 9; req = HeapAlloc( GetProcessHeap(), 0, len*sizeof(LPCWSTR) ); - /* add the verb, path and HTTP/1.0 */ + /* add the verb, path and HTTP version string */ n = 0; - req[n++] = lpwhr->lpszVerb; + req[n++] = verb; req[n++] = szSpace; - req[n++] = lpwhr->lpszPath; - req[n++] = HTTPHEADER; + req[n++] = path; + req[n++] = http1_1 ? g_szHttp1_1 : g_szHttp1_0; /* Append standard request headers */ for (i = 0; i <= HTTP_QUERY_MAX; i++) @@ -359,13 +359,10 @@ static void HTTP_ProcessHeaders( LPWININ static void HTTP_AddProxyInfo( LPWININETHTTPREQW lpwhr ) { - LPWININETHTTPSESSIONW lpwhs = NULL; - LPWININETAPPINFOW hIC = NULL; + LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent; + LPWININETAPPINFOW hIC = (LPWININETAPPINFOW)lpwhs->hdr.lpwhparent; - lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; assert(lpwhs->hdr.htype == WH_HHTTPSESSION); - - hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; assert(hIC->hdr.htype == WH_HINIT); if (hIC && (hIC->lpszProxyUsername || hIC->lpszProxyPassword )) @@ -1615,7 +1612,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET HTTP_AddProxyInfo(lpwhr); - requestString = HTTP_BuildHeaderRequestString(lpwhr); + requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, FALSE); TRACE("Request header -> %s\n", debugstr_w(requestString) ); @@ -1897,6 +1894,48 @@ static LPWSTR HTTP_build_req( LPCWSTR *l return str; } +static BOOL HTTP_SecureProxyConnect(LPWININETHTTPREQW lpwhr) +{ + LPWSTR lpszPath; + LPWSTR requestString; + INT len; + INT cnt; + INT responseLen; + char *ascii_req; + BOOL ret; + static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; + static const WCHAR szFormat[] = {'%','s',':','%','d',0}; + LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent; + + TRACE("\n"); + + lpszPath = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( lpwhs->lpszHostName ) + 13)*sizeof(WCHAR) ); + sprintfW( lpszPath, szFormat, lpwhs->lpszHostName, lpwhs->nHostPort ); + requestString = HTTP_BuildHeaderRequestString( lpwhr, szConnect, lpszPath, FALSE ); + HeapFree( GetProcessHeap(), 0, lpszPath ); + + len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, + NULL, 0, NULL, NULL ); + len--; /* the nul terminator isn't needed */ + ascii_req = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, requestString, -1, + ascii_req, len, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, requestString ); + + TRACE("full request -> %s\n", debugstr_an( ascii_req, len ) ); + + ret = NETCON_send( &lpwhr->netConnection, ascii_req, len, 0, &cnt ); + HeapFree( GetProcessHeap(), 0, ascii_req ); + if (!ret || cnt < 0) + return FALSE; + + responseLen = HTTP_GetResponseHeaders( lpwhr ); + if (!responseLen) + return FALSE; + + return TRUE; +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -1956,7 +1995,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI /* if there's a proxy username and password, add it to the headers */ HTTP_AddProxyInfo(lpwhr); - requestString = HTTP_BuildHeaderRequestString(lpwhr); + requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, FALSE); TRACE("Request header -> %s\n", debugstr_w(requestString) ); @@ -2188,6 +2227,15 @@ static BOOL HTTP_OpenConnection(LPWININE if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) { + /* Note: we differ from Microsoft's WinINet here. they seem to have + * a bug that causes no status callbacks to be sent when starting + * a tunnel to a proxy server using the CONNECT verb. i believe our + * behaviour to be more correct and to not cause any incompatibilities + * because using a secure connection through a proxy server is a rare + * case that would be hard for anyone to depend on */ + if (hIC->lpszProxy && !HTTP_SecureProxyConnect(lpwhr)) + goto lend; + if (!NETCON_secure_connect(&lpwhr->netConnection, lpwhs->lpszHostName)) { WARN("Couldn't connect securely to host\n"); @@ -2252,7 +2300,7 @@ static void HTTP_clear_response_headers( * TRUE on success * FALSE on error */ -static BOOL HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) +static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) { INT cbreaks = 0; WCHAR buffer[MAX_REPLY_LEN]; @@ -2368,7 +2416,7 @@ lend: if (bSuccess) return rc; else - return FALSE; + return 0; }

1 0

wine/dlls/wininet http.c internet.h netconnect ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21496 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:07:24 Modified files: dlls/wininet : http.c internet.h netconnection.c Log message: Robert Shearman <rob(a)codeweavers.com> Move the initiation of the SSL connection into a separate function. Patch: http://cvs.winehq.org/patch.py?id=21496 Old revision New revision Changes Path 1.121 1.122 +9 -0 wine/dlls/wininet/http.c 1.44 1.45 +1 -0 wine/dlls/wininet/internet.h 1.15 1.16 +38 -25 wine/dlls/wininet/netconnection.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.121 wine/dlls/wininet/http.c:1.122 --- wine/dlls/wininet/http.c:1.121 28 Nov 2005 11: 7:24 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 7:24 -0000 @@ -2186,6 +2186,15 @@ static BOOL HTTP_OpenConnection(LPWININE goto lend; } + if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) + { + if (!NETCON_secure_connect(&lpwhr->netConnection, lpwhs->lpszHostName)) + { + WARN("Couldn't connect securely to host\n"); + goto lend; + } + } + SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CONNECTED_TO_SERVER, &(lpwhs->socketAddress), Index: wine/dlls/wininet/internet.h diff -u -p wine/dlls/wininet/internet.h:1.44 wine/dlls/wininet/internet.h:1.45 --- wine/dlls/wininet/internet.h:1.44 28 Nov 2005 11: 7:24 -0000 +++ wine/dlls/wininet/internet.h 28 Nov 2005 11: 7:24 -0000 @@ -468,6 +468,7 @@ BOOL NETCON_create(WININET_NETCONNECTION BOOL NETCON_close(WININET_NETCONNECTION *connection); BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, unsigned int addrlen); +BOOL NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname); BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, int *sent /* out */); BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, Index: wine/dlls/wininet/netconnection.c diff -u -p wine/dlls/wininet/netconnection.c:1.15 wine/dlls/wininet/netconnection.c:1.16 --- wine/dlls/wininet/netconnection.c:1.15 28 Nov 2005 11: 7:24 -0000 +++ wine/dlls/wininet/netconnection.c 28 Nov 2005 11: 7:24 -0000 @@ -96,9 +96,9 @@ MAKE_FUNCPTR(BIO_new_fp); void NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) { - connection->useSSL = useSSL; + connection->useSSL = FALSE; connection->socketFD = -1; - if (connection->useSSL) + if (useSSL) { #ifdef HAVE_OPENSSL_SSL_H TRACE("using SSL connection\n"); @@ -161,7 +161,6 @@ void NETCON_init(WININET_NETCONNECTION * pBIO_new_fp(stderr, BIO_NOCLOSE); /* FIXME: should use winedebug stuff */ meth = pSSLv23_method(); - /* FIXME: SECURITY PROBLEM! WE ARN'T VERIFYING THE HOSTS CERTIFICATES OR ANYTHING */ connection->peek_msg = NULL; connection->peek_msg_mem = NULL; #else @@ -181,8 +180,7 @@ BOOL NETCON_connected(WININET_NETCONNECT /****************************************************************************** * NETCON_create - * Basically calls 'socket()' unless useSSL is supplised, - * in which case we do other things. + * Basically calls 'socket()' */ BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain, int type, int protocol) @@ -218,7 +216,8 @@ BOOL NETCON_close(WININET_NETCONNECTION connection->peek_msg = NULL; connection->peek_msg_mem = NULL; /* FIXME should we call SSL_shutdown here?? Probably on whatever is the - * opposite of NETCON_init.... */ + * opposite of NETCON_secure_connect.... */ + connection->useSSL = FALSE; } #endif @@ -228,8 +227,40 @@ BOOL NETCON_close(WININET_NETCONNECTION } /****************************************************************************** + * NETCON_secure_connect + * Initiates a secure connection over an existing plaintext connection. + */ +BOOL NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname) +{ +#ifdef HAVE_OPENSSL_SSL_H + BIO *sbio; + + /* nothing to do if we are already connected */ + if (connection->useSSL) + return FALSE; + + ctx = pSSL_CTX_new(meth); + connection->ssl_s = pSSL_new(ctx); + + sbio = pBIO_new_socket(connection->socketFD, BIO_NOCLOSE); + pSSL_set_bio(connection->ssl_s, sbio, sbio); + if (pSSL_connect(connection->ssl_s) <= 0) + { + ERR("ssl couldn't connect\n"); + return FALSE; + } + /* FIXME: verify the security of the connection and that the + * hostname of the certificate matches */ + connection->useSSL = TRUE; + return TRUE; +#else + return FALSE; +#endif +} + +/****************************************************************************** * NETCON_connect - * Basically calls 'connect()' unless we should use SSL + * Connects to the specified address. */ BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, unsigned int addrlen) @@ -246,24 +277,6 @@ BOOL NETCON_connect(WININET_NETCONNECTIO return FALSE; } -#ifdef HAVE_OPENSSL_SSL_H - if (connection->useSSL) - { - BIO *sbio; - - ctx = pSSL_CTX_new(meth); - connection->ssl_s = pSSL_new(ctx); - - sbio = pBIO_new_socket(connection->socketFD, BIO_NOCLOSE); - pSSL_set_bio(connection->ssl_s, sbio, sbio); - if (pSSL_connect(connection->ssl_s) <= 0) - { - ERR("ssl couldn't connect\n"); - return FALSE; - } - } -#endif - return TRUE; }

1 0

wine/dlls/user menu.c tests/menu.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21495 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:07:12 Modified files: dlls/user : menu.c dlls/user/tests: menu.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> set_menu_item_text handles converting an empty menu item to a separator on its own, give it a chance to do its work in the MIIM_FTYPE case. Patch: http://cvs.winehq.org/patch.py?id=21495 Old revision New revision Changes Path 1.41 1.42 +9 -6 wine/dlls/user/menu.c 1.8 1.9 +0 -2 wine/dlls/user/tests/menu.c Index: wine/dlls/user/menu.c diff -u -p wine/dlls/user/menu.c:1.41 wine/dlls/user/menu.c:1.42 --- wine/dlls/user/menu.c:1.41 28 Nov 2005 11: 7:12 -0000 +++ wine/dlls/user/menu.c 28 Nov 2005 11: 7:12 -0000 @@ -4230,10 +4230,10 @@ static BOOL SetMenuItemInfo_common(MENUI menu->fType &= ~MENU_ITEM_TYPE(menu->fType); menu->fType |= MENU_ITEM_TYPE(lpmii->fType); - menu->text = lpmii->dwTypeData; - - if (IS_STRING_ITEM(menu->fType)) - set_menu_item_text( menu, lpmii->dwTypeData, unicode ); + if (IS_STRING_ITEM(menu->fType)) + set_menu_item_text( menu, lpmii->dwTypeData, unicode ); + else + menu->text = lpmii->dwTypeData; } if (lpmii->fMask & MIIM_FTYPE ) { @@ -4244,8 +4244,11 @@ static BOOL SetMenuItemInfo_common(MENUI } menu->fType &= ~MENU_ITEM_TYPE(menu->fType); menu->fType |= MENU_ITEM_TYPE(lpmii->fType); - if ( IS_STRING_ITEM(menu->fType) && !menu->text ) - menu->fType |= MF_SEPARATOR; + + if (IS_STRING_ITEM(menu->fType)) + set_menu_item_text( menu, lpmii->dwTypeData, unicode ); + else + menu->text = lpmii->dwTypeData; } if (lpmii->fMask & MIIM_STRING ) { Index: wine/dlls/user/tests/menu.c diff -u -p wine/dlls/user/tests/menu.c:1.8 wine/dlls/user/tests/menu.c:1.9 --- wine/dlls/user/tests/menu.c:1.8 28 Nov 2005 11: 7:12 -0000 +++ wine/dlls/user/tests/menu.c 28 Nov 2005 11: 7:12 -0000 @@ -277,9 +277,7 @@ static void test_menu_add_string( void ) string[0] = 0; GetMenuItemInfo( hmenu, 0, TRUE, &info ); - todo_wine { ok( !strcmp( string, "blah" ), "menu item name differed\n"); - } DestroyMenu( hmenu ); }

1 0

wine/dlls/wininet http.c internet.h
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21494 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:06:57 Modified files: dlls/wininet : http.c internet.h Log message: Robert Shearman <rob(a)codeweavers.com> Add a host port field that preserves the requested port of the destination URL. Patch: http://cvs.winehq.org/patch.py?id=21494 Old revision New revision Changes Path 1.120 1.121 +3 -1 wine/dlls/wininet/http.c 1.43 1.44 +2 -1 wine/dlls/wininet/internet.h Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.120 wine/dlls/wininet/http.c:1.121 --- wine/dlls/wininet/http.c:1.120 28 Nov 2005 11: 6:57 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 6:57 -0000 @@ -918,7 +918,7 @@ static BOOL HTTP_DealWithProxy( LPWININE if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - sprintfW(url, szFormat2, lpwhs->lpszHostName, lpwhs->nServerPort); + sprintfW(url, szFormat2, lpwhs->lpszHostName, lpwhs->nHostPort); if( lpwhr->lpszPath[0] != '/' ) strcatW( url, szSlash ); @@ -1042,6 +1042,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L lpwhs->nServerPort = (dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT); + lpwhs->nHostPort = lpwhs->nServerPort; if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0) HTTP_DealWithProxy( hIC, lpwhs, lpwhr ); @@ -2112,6 +2113,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW if (NULL != lpszUserName) lpwhs->lpszUserName = WININET_strdupW(lpszUserName); lpwhs->nServerPort = nServerPort; + lpwhs->nHostPort = nServerPort; /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(lpwhs->hdr.dwInternalFlags & INET_OPENURL)) Index: wine/dlls/wininet/internet.h diff -u -p wine/dlls/wininet/internet.h:1.43 wine/dlls/wininet/internet.h:1.44 --- wine/dlls/wininet/internet.h:1.43 28 Nov 2005 11: 6:57 -0000 +++ wine/dlls/wininet/internet.h 28 Nov 2005 11: 6:57 -0000 @@ -167,7 +167,8 @@ typedef struct LPWSTR lpszHostName; /* the final destination of the request */ LPWSTR lpszServerName; /* the name of the server we directly connect to */ LPWSTR lpszUserName; - INTERNET_PORT nServerPort; + INTERNET_PORT nHostPort; /* the final destination port of the request */ + INTERNET_PORT nServerPort; /* the port of the server we directly connect to */ struct sockaddr_in socketAddress; } WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW;

1 0

wine/ dlls/usp10/usp10.c include/usp10.h
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21493 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:06:44 Modified files: dlls/usp10 : usp10.c include : usp10.h Log message: Vijay Kiran Kamuju <infyquest(a)gmail.com> Added some missing definitions in usp10.h. Patch: http://cvs.winehq.org/patch.py?id=21493 Old revision New revision Changes Path 1.5 1.6 +1 -0 wine/dlls/usp10/usp10.c 1.4 1.5 +97 -3 wine/include/usp10.h Index: wine/dlls/usp10/usp10.c diff -u -p wine/dlls/usp10/usp10.c:1.5 wine/dlls/usp10/usp10.c:1.6 --- wine/dlls/usp10/usp10.c:1.5 28 Nov 2005 11: 6:44 -0000 +++ wine/dlls/usp10/usp10.c 28 Nov 2005 11: 6:44 -0000 @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "usp10.h" Index: wine/include/usp10.h diff -u -p wine/include/usp10.h:1.4 wine/include/usp10.h:1.5 --- wine/include/usp10.h:1.4 28 Nov 2005 11: 6:44 -0000 +++ wine/include/usp10.h 28 Nov 2005 11: 6:44 -0000 @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Steven Edwards + * Copyright (C) 2005 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -51,6 +52,38 @@ extern "C" { #define SIC_ASCIIDIGIT 2 #define SIC_NEUTRAL 4 +/** ScriptGetCMap */ +#define SGCM_RTL 0x00000001 + +/** ScriptApplyDigitSubstitution */ +#define SCRIPT_DIGITSUBSTITUTE_CONTEXT 0 +#define SCRIPT_DIGITSUBSTITUTE_NONE 1 +#define SCRIPT_DIGITSUBSTITUTE_NATIONAL 2 +#define SCRIPT_DIGITSUBSTITUTE_TRADITIONAL 3 + +#define SCRIPT_UNDEFINED 0 + +#define USP_E_SCRIPT_NOT_IN_FONT MAKE_HRESULT(SEVERITY_ERROR,FACILITY_ITF,0x200) + +typedef enum tag_SCRIPT_JUSTIFY { + SCRIPT_JUSTIFY_NONE = 0, + SCRIPT_JUSTIFY_ARABIC_BLANK = 1, + SCRIPT_JUSTIFY_CHARACTER = 2, + SCRIPT_JUSTIFY_RESERVED1 = 3, + SCRIPT_JUSTIFY_BLANK = 4, + SCRIPT_JUSTIFY_RESERVED2 = 5, + SCRIPT_JUSTIFY_RESERVED3 = 6, + SCRIPT_JUSTIFY_ARABIC_NORMAL = 7, + SCRIPT_JUSTIFY_ARABIC_KASHIDA = 8, + SCRIPT_JUSTIFY_ARABIC_ALEF = 9, + SCRIPT_JUSTIFY_ARABIC_HA = 10, + SCRIPT_JUSTIFY_ARABIC_RA = 11, + SCRIPT_JUSTIFY_ARABIC_BA = 12, + SCRIPT_JUSTIFY_ARABIC_BARA = 13, + SCRIPT_JUSTIFY_ARABIC_SEEN = 14, + SCRIPT_JUSTIFY_RESERVED4 = 15, +} SCRIPT_JUSTIFY; + typedef struct tag_SCRIPT_CONTROL { DWORD uDefaultLanguage :16; DWORD fContextDigits :1; @@ -135,19 +168,53 @@ typedef struct tag_SCRIPT_TABDEF { int iTabOrigin; } SCRIPT_TABDEF; +typedef struct tag_SCRIPT_VISATTR { + WORD uJustification :4; + WORD fClusterStart :1; + WORD fDiacritic :1; + WORD fZeroWidth :1; + WORD fReserved :1; + WORD fShapeReserved :8; +} SCRIPT_VISATTR; + +typedef struct tag_SCRIPT_LOGATTR { + BYTE fSoftBreak :1; + BYTE fWhiteSpace :1; + BYTE fCharStop :1; + BYTE fWordStop :1; + BYTE fInvalid :1; + BYTE fReserved :3; +} SCRIPT_LOGATTR; + typedef void *SCRIPT_CACHE; typedef void *SCRIPT_STRING_ANALYSIS; -/* Function Declairations */ +#ifndef LSDEFS_DEFINED +typedef struct tagGOFFSET { + LONG du; + LONG dv; +} GOFFSET; +#endif + +/* Function Declarations */ -HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts); -HRESULT WINAPI ScriptRecordDigitSubstitution(LCID Locale, SCRIPT_DIGITSUBSTITUTE *psds); HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE* psds, SCRIPT_CONTROL* psc, SCRIPT_STATE* pss); +HRESULT WINAPI ScriptApplyLogicalWidth(const int *piDx, int cChars, int cGlyphs, const WORD *pwLogClust, + const SCRIPT_VISATTR *psva, const int *piAdvance, + const SCRIPT_ANALYSIS *psa, ABC *pABC, int *piJustify); +HRESULT WINAPI ScriptRecordDigitSubstitution(LCID Locale, SCRIPT_DIGITSUBSTITUTE *psds); HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItems, const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, int *pcItems); +HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, int cChars, + DWORD dwFlags, WORD *pwOutGlyphs); HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp); +HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD wGlyph, ABC *pABC); +HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *psa, int cChars, int cGlyphs, + const int *piGlyphWidth, const WORD *pwLogClust, + const SCRIPT_VISATTR *psva, int *piDx); +HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts); HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, @@ -161,8 +228,35 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h SCRIPT_TABDEF *pTabdef, const BYTE *pbInClass, SCRIPT_STRING_ANALYSIS *pssa); +HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa); HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa); +HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc); HRESULT WINAPI ScriptIsComplex(const WCHAR* pwcInChars, int cInChars, DWORD dwFlags); +HRESULT WINAPI ScriptJustify(const SCRIPT_VISATTR *psva, const int *piAdvance, int cGlyphs, + int iDx, int iMinKashida, int *piJustify); +HRESULT WINAPI ScriptLayout(int cRuns, const BYTE *pbLevel, int *piVisualToLogical, int *piLogicalToVisual); +HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, int cChars, int cMaxGlyphs, + SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, SCRIPT_VISATTR *psva, int *pcGlyphs); +HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, + SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ); +HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, SCRIPT_LOGATTR *psla); +HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, long *tmHeight); +HRESULT WINAPI ScriptCPtoX(int iCP, BOOL fTrailing, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, + const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piX); +HRESULT WINAPI ScriptXtoCP(int iX, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, + const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piCP, int *piTrailing); +HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int *pX); +HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int *piCh , int *piTrailing); +HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piDx); +HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *puOrder); +HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, UINT uOptions, const RECT *prc, + int iMinSel, int iMaxSel, BOOL fDisabled); +HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UINT fuOptions, const RECT *lprc, + const SCRIPT_ANALYSIS *psa, const WCHAR *pwcReserved, int iReserved, const WORD *pwGlyphs, + int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset); +const int* WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa); +const SCRIPT_LOGATTR* WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa); +const SIZE* WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa); #ifdef __cplusplus } /* extern "C" */

1 0

wine/dlls/x11drv graphics.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21492 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:06:40 Modified files: dlls/x11drv : graphics.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Handle an X error in X11DRV_ExtFloodFill(). Patch: http://cvs.winehq.org/patch.py?id=21492 Old revision New revision Changes Path 1.8 1.9 +7 -0 wine/dlls/x11drv/graphics.c Index: wine/dlls/x11drv/graphics.c diff -u -p wine/dlls/x11drv/graphics.c:1.8 wine/dlls/x11drv/graphics.c:1.9 --- wine/dlls/x11drv/graphics.c:1.8 28 Nov 2005 11: 6:40 -0000 +++ wine/dlls/x11drv/graphics.c 28 Nov 2005 11: 6:40 -0000 @@ -1272,6 +1272,11 @@ static void X11DRV_InternalFloodFill(XIm } +static int ExtFloodFillXGetImageErrorHandler( Display *dpy, XErrorEvent *event, void *arg ) +{ + return (event->request_code == X_GetImage && event->error_code == BadMatch); +} + /********************************************************************** * X11DRV_ExtFloodFill */ @@ -1292,10 +1297,12 @@ X11DRV_ExtFloodFill( X11DRV_PDEVICE *phy GetRgnBox( physDev->region, &rect ); wine_tsx11_lock(); + X11DRV_expect_error( gdi_display, ExtFloodFillXGetImageErrorHandler, NULL ); image = XGetImage( gdi_display, physDev->drawable, physDev->org.x + rect.left, physDev->org.y + rect.top, rect.right - rect.left, rect.bottom - rect.top, AllPlanes, ZPixmap ); + if(X11DRV_check_error()) image = NULL; wine_tsx11_unlock(); if (!image) return FALSE;

1 0

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

Nov. 28, 2005

ChangeSet ID: 21491 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:06:33 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Fix "http://" prefix detection on the proxy URL. Patch: http://cvs.winehq.org/patch.py?id=21491 Old revision New revision Changes Path 1.119 1.120 +2 -2 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.119 wine/dlls/wininet/http.c:1.120 --- wine/dlls/wininet/http.c:1.119 28 Nov 2005 11: 6:33 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 6:33 -0000 @@ -898,10 +898,10 @@ static BOOL HTTP_DealWithProxy( LPWININE UrlComponents.dwHostNameLength = MAXHOSTNAME; if( CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - buf,strlenW(szHttp),szHttp,strlenW(szHttp)) ) + hIC->lpszProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) ) sprintfW(proxy, szFormat1, hIC->lpszProxy); else - strcpyW(proxy,buf); + strcpyW(proxy, hIC->lpszProxy); if( !InternetCrackUrlW(proxy, 0, 0, &UrlComponents) ) return FALSE; if( UrlComponents.dwHostNameLength == 0 )

1 0