November 2012 - Wine-commits

Dmitry Timoshkov : windowscodecs: Add NULL pointer checks to some color context methods.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: bfed6e5f3003a3a9b33b71290e35d0b983a9e7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfed6e5f3003a3a9b33b71290… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 19 13:33:48 2012 +0800 windowscodecs: Add NULL pointer checks to some color context methods. --- dlls/windowscodecs/colorcontext.c | 8 ++++++++ dlls/windowscodecs/pngformat.c | 2 ++ dlls/windowscodecs/tests/pngformat.c | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 5434fc6..457b4db 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -144,6 +144,8 @@ static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, ColorContext *This = impl_from_IWICColorContext(iface); TRACE("(%p,%p)\n", iface, pType); + if (!pType) return E_INVALIDARG; + *pType = This->type; return S_OK; } @@ -157,6 +159,8 @@ static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, if (This->type != WICColorContextProfile) return WINCODEC_ERR_NOTINITIALIZED; + if (!pcbActual) return E_INVALIDARG; + if (cbBuffer >= This->profile_len && pbBuffer) memcpy(pbBuffer, This->profile, This->profile_len); @@ -171,6 +175,8 @@ static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface, ColorContext *This = impl_from_IWICColorContext(iface); TRACE("(%p,%p)\n", iface, pValue); + if (!pValue) return E_INVALIDARG; + *pValue = This->exif_color_space; return S_OK; } @@ -191,6 +197,8 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) { ColorContext *This; + if (!colorcontext) return E_INVALIDARG; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ColorContext)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 89f092e..6d6117e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -854,6 +854,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + if (!pcActualCount) return E_INVALIDARG; + EnterCriticalSection(&This->lock); if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len)) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index b7dfbd0..3f4e855 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -331,6 +331,9 @@ static void test_color_contexts(void) ok(decoder != 0, "Failed to load PNG image data\n"); /* global color context */ + hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, NULL); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "GetColorContexts error %#x\n", hr); + count = 0xdeadbeef; hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, &count); ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "GetColorContexts error %#x\n", hr); @@ -340,6 +343,9 @@ static void test_color_contexts(void) hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); + hr = IWICBitmapFrameDecode_GetColorContexts(frame, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + count = 0xdeadbeef; hr = IWICBitmapFrameDecode_GetColorContexts(frame, 0, NULL, &count); ok(hr == S_OK, "GetColorContexts error %#x\n", hr); @@ -366,19 +372,31 @@ static void test_color_contexts(void) ok(hr == S_OK, "GetColorContexts error %#x\n", hr); ok(count == 1, "unexpected count %u\n", count); + hr = IWICImagingFactory_CreateColorContext(factory, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICImagingFactory_CreateColorContext(factory, &context); ok(hr == S_OK, "CreateColorContext error %#x\n", hr); + hr = IWICColorContext_GetType(context, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + type = 0xdeadbeef; hr = IWICColorContext_GetType(context, &type); ok(hr == S_OK, "GetType error %#x\n", hr); ok(type == WICColorContextUninitialized, "unexpected type %u\n", type); + hr = IWICColorContext_GetProfileBytes(context, 0, NULL, NULL); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "GetProfileBytes error %#x\n", hr); + size = 0; hr = IWICColorContext_GetProfileBytes(context, 0, NULL, &size); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "GetProfileBytes error %#x\n", hr); ok(!size, "unexpected size %u\n", size); + hr = IWICColorContext_GetExifColorSpace(context, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + colorspace = 0xdeadbeef; hr = IWICColorContext_GetExifColorSpace(context, &colorspace); ok(hr == S_OK, "GetExifColorSpace error %#x\n", hr); @@ -424,6 +442,9 @@ static void test_color_contexts(void) hr = IWICBitmapFrameDecode_GetColorContexts(frame, count, &context, &count); ok(hr == S_OK, "GetColorContexts error %#x\n", hr); + hr = IWICColorContext_GetProfileBytes(context, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + size = 0; hr = IWICColorContext_GetProfileBytes(context, 0, NULL, &size); ok(hr == S_OK, "GetProfileBytes error %#x\n", hr);

1 0

Michael Stefaniuc : appwiz: Use the correct types for callbacks.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 2a1a48b586a3285928869debfe93d5880c4f2a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1a48b586a3285928869debf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 09:28:43 2012 +0100 appwiz: Use the correct types for callbacks. --- dlls/appwiz.cpl/appwiz.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index c50adf7..4f6670d 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -592,7 +592,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage * lParam - additional parameter * Returns : Depends on the message */ -static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { APPINFO *iter; HKEY hkey; @@ -681,8 +681,7 @@ static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR */ static void SupportInfo(HWND hWnd, int id) { - DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_INFO), hWnd, (DLGPROC) - SupportInfoDlgProc, (LPARAM) id); + DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_INFO), hWnd, SupportInfoDlgProc, id); } /* Definition of column headers for AddListViewColumns function */ @@ -822,7 +821,7 @@ static HIMAGELIST ResetApplicationList(BOOL bFirstRun, HWND hWnd, HIMAGELIST hIm * lParam - additional parameter * Returns : Depends on the message */ -static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { int selitem; static HIMAGELIST hImageList; @@ -947,7 +946,7 @@ static void StartApplet(HWND hWnd) psp.hInstance = hInst; psp.u.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN); psp.u2.pszIcon = NULL; - psp.pfnDlgProc = (DLGPROC) MainDlgProc; + psp.pfnDlgProc = MainDlgProc; psp.pszTitle = tab_title; psp.lParam = 0;

1 0

Michael Stefaniuc : wintab32/tests: Remove a function pointer cast.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: d94b651519eea53a7d9a4b17e96a6b09271d680e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94b651519eea53a7d9a4b17e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 09:29:48 2012 +0100 wintab32/tests: Remove a function pointer cast. --- dlls/wintab32/tests/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 6b37129..5f05912 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -80,7 +80,7 @@ static void wintab_create_window(HWND* pHwnd) ZeroMemory(&testWindowClass, sizeof(testWindowClass)); - testWindowClass.lpfnWndProc = (WNDPROC)wintabTestWndProc; + testWindowClass.lpfnWndProc = wintabTestWndProc; testWindowClass.hInstance = NULL; testWindowClass.hIcon = NULL; testWindowClass.hCursor = NULL;

1 0

Jacek Caban : amvideo.idl: Use proper IDirectDraw forward declaration.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: d1607dbb308147abc2ac2aec0f56620d1f7e6c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1607dbb308147abc2ac2aec0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:27:58 2012 +0100 amvideo.idl: Use proper IDirectDraw forward declaration. --- include/amvideo.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/amvideo.idl b/include/amvideo.idl index ad92055..f3dc45f 100644 --- a/include/amvideo.idl +++ b/include/amvideo.idl @@ -21,7 +21,7 @@ import "objidl.idl"; /* trick widl into thinking that it knows the DirectDraw types * as there is no IDL file for them (yet) */ cpp_quote("#if 0") -typedef void IDirectDraw; +interface IDirectDraw; typedef void DDSURFACEDESC,DDCAPS; typedef DWORD RGBQUAD; typedef LONGLONG REFERENCE_TIME;

1 0

Jacek Caban : wininet: Store an info if connection is HTTPS in server_t.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: cdf25ee4693dbb5b2144db62394f5588b40aedbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf25ee4693dbb5b2144db623… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:46:50 2012 +0100 wininet: Store an info if connection is HTTPS in server_t. --- dlls/wininet/http.c | 11 ++++++----- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3eb0b8d..27f8e85 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -251,14 +251,14 @@ void server_release(server_t *server) heap_free(server); } -server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL do_create) +server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL do_create) { server_t *iter, *server = NULL; EnterCriticalSection(&connection_pool_cs); LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) { - if(iter->port == port && !strcmpW(iter->name, name)) { + if(iter->port == port && !strcmpW(iter->name, name) && iter->is_https == is_https) { server = iter; server_addref(server); break; @@ -270,6 +270,7 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL do_create) if(server) { server->ref = 2; /* list reference and return */ server->port = port; + server->is_https = is_https; list_init(&server->conn_pool); server->name = heap_strdupW(name); if(server->name) { @@ -1725,7 +1726,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, TRUE); + new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); if(!new_server) return FALSE; @@ -3194,7 +3195,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if(port == INTERNET_INVALID_PORT_NUMBER) port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; - request->server = get_server(session->hostName, port, TRUE); + request->server = get_server(session->hostName, port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; @@ -4022,7 +4023,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) if(strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort) { server_t *new_server; - new_server = get_server(hostName, urlComponents.nPort, TRUE); + new_server = get_server(hostName, urlComponents.nPort, urlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); server_release(request->server); request->server = new_server; } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1877af9..d982207 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4431,7 +4431,7 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT if(url.nPort == INTERNET_INVALID_PORT_NUMBER) url.nPort = INTERNET_DEFAULT_HTTPS_PORT; - server = get_server(hostname, url.nPort, FALSE); + server = get_server(hostname, url.nPort, TRUE, FALSE); if(!server) { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); return FALSE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 1baaf2a..b932114 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -58,6 +58,7 @@ extern HMODULE WININET_hModule DECLSPEC_HIDDEN; typedef struct { WCHAR *name; INTERNET_PORT port; + BOOL is_https; struct sockaddr_storage addr; socklen_t addr_len; char addr_str[INET6_ADDRSTRLEN]; @@ -550,7 +551,7 @@ int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; -server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL); +server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Allow passing INTERNET_INVALID_PORT_NUMBER port to get_server.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: e1d26a24ed2a8ef0c27439ab68fef579acb3968d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d26a24ed2a8ef0c27439ab6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:47:06 2012 +0100 wininet: Allow passing INTERNET_INVALID_PORT_NUMBER port to get_server. --- dlls/wininet/http.c | 13 ++++--------- dlls/wininet/internet.c | 3 --- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 27f8e85..733a535 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -255,6 +255,9 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL { server_t *iter, *server = NULL; + if(port == INTERNET_INVALID_PORT_NUMBER) + port = is_https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + EnterCriticalSection(&connection_pool_cs); LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) { @@ -1723,9 +1726,6 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if( !request->path ) request->path = szNul; - if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); if(!new_server) return FALSE; @@ -3164,7 +3164,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = session->appInfo; http_request_t *request; - INTERNET_PORT port; DWORD len, res = ERROR_SUCCESS; TRACE("-->\n"); @@ -3191,11 +3190,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); - port = session->hostPort; - if(port == INTERNET_INVALID_PORT_NUMBER) - port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; - - request->server = get_server(session->hostName, port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); + request->server = get_server(session->hostName, session->hostPort, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d982207..d04e825 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4428,9 +4428,6 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT return FALSE; } - if(url.nPort == INTERNET_INVALID_PORT_NUMBER) - url.nPort = INTERNET_DEFAULT_HTTPS_PORT; - server = get_server(hostname, url.nPort, TRUE, FALSE); if(!server) { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND);

1 0

Jacek Caban : wininet: Store more useful strings in server_t.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 3cf2838a932e606fe6f494e2e9701091a37e32f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf2838a932e606fe6f494e2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:47:19 2012 +0100 wininet: Store more useful strings in server_t. --- dlls/wininet/http.c | 63 ++++++++++++++++++++++++---------------------- dlls/wininet/internet.h | 4 +++ 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 733a535..af40b6f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -248,9 +248,37 @@ void server_release(server_t *server) if(server->cert_chain) CertFreeCertificateChain(server->cert_chain); heap_free(server->name); + heap_free(server->scheme_host_port); heap_free(server); } +static BOOL process_host_port(server_t *server) +{ + BOOL default_port; + size_t name_len; + WCHAR *buf; + + static const WCHAR httpW[] = {'h','t','t','p',0}; + static const WCHAR httpsW[] = {'h','t','t','p','s',0}; + static const WCHAR formatW[] = {'%','s',':','/','/','%','s',':','%','u',0}; + + name_len = strlenW(server->name); + buf = heap_alloc((name_len + 10 /* strlen("://:<port>") */)*sizeof(WCHAR) + sizeof(httpsW)); + if(!buf) + return FALSE; + + sprintfW(buf, formatW, server->is_https ? httpsW : httpW, server->name, server->port); + server->scheme_host_port = buf; + + server->host_port = server->scheme_host_port + 7 /* strlen("http://") */; + if(server->is_https) + server->host_port++; + + default_port = server->port == (server->is_https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT); + server->canon_host_port = default_port ? server->name : server->host_port; + return TRUE; +} + server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL do_create) { server_t *iter, *server = NULL; @@ -276,7 +304,7 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL server->is_https = is_https; list_init(&server->conn_pool); server->name = heap_strdupW(name); - if(server->name) { + if(server->name && process_host_port(server)) { list_add_head(&connection_pool, &server->entry); }else { heap_free(server); @@ -3241,27 +3269,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); request->version = heap_strdupW(lpszVersion ? lpszVersion : g_szHttp1_1); - if (session->hostPort != INTERNET_INVALID_PORT_NUMBER && - session->hostPort != INTERNET_DEFAULT_HTTP_PORT && - session->hostPort != INTERNET_DEFAULT_HTTPS_PORT) - { - WCHAR *host_name; - - static const WCHAR host_formatW[] = {'%','s',':','%','u',0}; - - host_name = heap_alloc((strlenW(session->hostName) + 7 /* length of ":65535" + 1 */) * sizeof(WCHAR)); - if (!host_name) { - res = ERROR_OUTOFMEMORY; - goto lend; - } - - sprintfW(host_name, host_formatW, session->hostName, session->hostPort); - HTTP_ProcessHeader(request, hostW, host_name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); - heap_free(host_name); - } - else - HTTP_ProcessHeader(request, hostW, session->hostName, - HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); + HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) session->hostPort = (dwFlags & INTERNET_FLAG_SECURE ? @@ -3275,7 +3283,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, INTERNET_STATUS_HANDLE_CREATED, &request->hdr.hInternet, sizeof(HINTERNET)); -lend: TRACE("<-- %u (%p)\n", res, request); if(res != ERROR_SUCCESS) { @@ -4080,22 +4087,18 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static DWORD HTTP_SecureProxyConnect(http_request_t *request) { server_t *server = request->server; - LPWSTR lpszPath; LPWSTR requestString; INT len; INT cnt; INT responseLen; char *ascii_req; DWORD res; - static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; - static const WCHAR szFormat[] = {'%','s',':','%','u',0}; + + static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; TRACE("\n"); - lpszPath = heap_alloc((lstrlenW(server->name) + 13)*sizeof(WCHAR)); - sprintfW(lpszPath, szFormat, server->name, server->port); - requestString = HTTP_BuildHeaderRequestString( request, szConnect, lpszPath, g_szHttp1_1 ); - heap_free( lpszPath ); + requestString = HTTP_BuildHeaderRequestString( request, connectW, server->host_port, g_szHttp1_1 ); len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, NULL, 0, NULL, NULL ); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b932114..09db338 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -63,6 +63,10 @@ typedef struct { socklen_t addr_len; char addr_str[INET6_ADDRSTRLEN]; + WCHAR *scheme_host_port; + const WCHAR *host_port; + const WCHAR *canon_host_port; + LONG ref; DWORD security_flags;

1 0

Jacek Caban : wininet: Use processed string from server_t for constructing proxy path.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 5fb49243af34c9d5ed071c4afce6436a1fb36df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb49243af34c9d5ed071c4af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:47:50 2012 +0100 wininet: Use processed string from server_t for constructing proxy path. --- dlls/wininet/http.c | 48 ++++++++++++++++-------------------------------- 1 files changed, 16 insertions(+), 32 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index af40b6f..9df90a9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1679,41 +1679,25 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn return TRUE; } -static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) +static WCHAR *build_proxy_path_url(http_request_t *req) { - static const WCHAR slash[] = { '/',0 }; - static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; - static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; - http_session_t *session = req->session; - WCHAR new_location[INTERNET_MAX_URL_LENGTH], *url; - DWORD size; - - size = sizeof(new_location); - if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_LOCATION, new_location, &size, NULL) == ERROR_SUCCESS) - { - URL_COMPONENTSW UrlComponents; - - if (!(url = heap_alloc(size + sizeof(WCHAR)))) return NULL; - strcpyW( url, new_location ); + DWORD size, len; + WCHAR *url; - ZeroMemory(&UrlComponents,sizeof(URL_COMPONENTSW)); - if(InternetCrackUrlW(url, 0, 0, &UrlComponents)) goto done; - heap_free(url); - } + len = strlenW(req->server->scheme_host_port); + size = len + strlenW(req->path) + 1; + if(*req->path != '/') + size++; + url = heap_alloc(size * sizeof(WCHAR)); + if(!url) + return NULL; - size = 16; /* "https://" + sizeof(port#) + ":/\0" */ - size += strlenW( session->hostName ) + strlenW( req->path ); + memcpy(url, req->server->scheme_host_port, len*sizeof(WCHAR)); + if(*req->path != '/') + url[len++] = '/'; - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return NULL; + strcpyW(url+len, req->path); - if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) - sprintfW( url, formatSSL, session->hostName, session->hostPort ); - else - sprintfW( url, format, session->hostName, session->hostPort ); - if (req->path[0] != '/') strcatW( url, slash ); - strcatW( url, req->path ); - -done: TRACE("url=%s\n", debugstr_w(url)); return url; } @@ -4856,7 +4840,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (request->session->appInfo->proxy && request->session->appInfo->proxy[0]) { - WCHAR *url = HTTP_BuildProxyRequestUrl(request); + WCHAR *url = build_proxy_path_url(request); requestString = HTTP_BuildHeaderRequestString(request, request->verb, url, request->version); heap_free(url); }

1 0

Jacek Caban : wininet: Use proxy settings directly from http_request_t in a few more places.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 3e23b5e589739a7a580361dcaca0566498eebb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e23b5e589739a7a580361dca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:48:08 2012 +0100 wininet: Use proxy settings directly from http_request_t in a few more places. --- dlls/wininet/http.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9df90a9..39978b2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1950,7 +1950,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe switch(option) { case INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO: { - http_session_t *session = req->session; INTERNET_DIAGNOSTIC_SOCKET_INFO *info = buffer; FIXME("INTERNET_DIAGNOSTIC_SOCKET_INFO stub\n"); @@ -1964,11 +1963,11 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->Socket = 0; /* FIXME: get source port from req->netConnection */ info->SourcePort = 0; - info->DestPort = session->hostPort; + info->DestPort = req->server->port; info->Flags = 0; if (HTTP_KeepAlive(req)) info->Flags |= IDSI_FLAG_KEEP_ALIVE; - if (session->appInfo->proxy && session->appInfo->proxy[0] != 0) + if (req->proxy) info->Flags |= IDSI_FLAG_PROXY; if (req->netconn->useSSL) info->Flags |= IDSI_FLAG_SECURE; @@ -2159,7 +2158,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe * INTERNET_REQFLAG_CACHE_WRITE_DISABLED */ - if(req->session->appInfo->proxy) + if(req->proxy) flags |= INTERNET_REQFLAG_VIA_PROXY; if(!req->rawHeaders) flags |= INTERNET_REQFLAG_NO_HEADERS; @@ -4838,7 +4837,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES)) HTTP_InsertCookies(request); - if (request->session->appInfo->proxy && request->session->appInfo->proxy[0]) + if (request->proxy) { WCHAR *url = build_proxy_path_url(request); requestString = HTTP_BuildHeaderRequestString(request, request->verb, url, request->version);

1 0

Nikolay Sivov : xmllite: Support application defined IMalloc for reader.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: c88cdc6e38329e3eab9fbb38aa2f81a4dd0ce337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88cdc6e38329e3eab9fbb38a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 17 11:22:47 2012 -0500 xmllite: Support application defined IMalloc for reader. --- dlls/xmllite/reader.c | 54 ++++++++++++++++++++++++++++----------- dlls/xmllite/xmllite_private.h | 35 ++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index f4c0e94..226b0f9 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -26,6 +26,7 @@ #include "initguid.h" #include "objbase.h" #include "xmllite.h" +#include "xmllite_private.h" #include "wine/debug.h" @@ -43,6 +44,7 @@ typedef struct _xmlreader IXmlReaderInput *input; ISequentialStream *stream;/* stored as sequential stream, cause currently optimizations possible with IStream aren't implemented */ + IMalloc *imalloc; XmlReadState state; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ @@ -65,6 +67,23 @@ static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface); } +/* reader memory allocation functions */ +static inline void *reader_alloc(xmlreader *reader, size_t len) +{ + if (reader->imalloc) + return IMalloc_Alloc(reader->imalloc, len); + else + return heap_alloc(len); +} + +static inline void reader_free(xmlreader *reader, void *mem) +{ + if (reader->imalloc) + IMalloc_Free(reader->imalloc, mem); + else + heap_free(mem); +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -90,23 +109,25 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); - LONG ref; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p\n", This); + TRACE("(%p)->(%d)\n", This, ref); - ref = InterlockedDecrement(&This->ref); if (ref == 0) { + IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(This->input); if (This->stream) ISequentialStream_Release(This->stream); - HeapFree(GetProcessHeap(), 0, This); + reader_free(This, This); + if (imalloc) IMalloc_Release(imalloc); } return ref; @@ -438,7 +459,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) if (ref == 0) { if (This->input) IUnknown_Release(This->input); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -451,13 +472,11 @@ static const struct IUnknownVtbl xmlreaderinput_vtbl = xmlreaderinput_Release }; -HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) +HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; - TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); - - if (pMalloc) FIXME("custom IMalloc not supported yet\n"); + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); if (!IsEqualGUID(riid, &IID_IXmlReader)) { @@ -465,7 +484,10 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) return E_FAIL; } - reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader)); + if (imalloc) + reader = IMalloc_Alloc(imalloc, sizeof(*reader)); + else + reader = heap_alloc(sizeof(*reader)); if(!reader) return E_OUTOFMEMORY; reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl; @@ -475,10 +497,12 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) reader->state = XmlReadState_Closed; reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; + reader->imalloc = imalloc; + if (imalloc) IMalloc_AddRef(imalloc); - *pObject = &reader->IXmlReader_iface; + *obj = &reader->IXmlReader_iface; - TRACE("returning iface %p\n", *pObject); + TRACE("returning iface %p\n", *obj); return S_OK; } @@ -497,7 +521,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, if (!stream || !ppInput) return E_INVALIDARG; - readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput)); + readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h new file mode 100644 index 0000000..1677e5c --- /dev/null +++ b/dlls/xmllite/xmllite_private.h @@ -0,0 +1,35 @@ +/* + * XMLLite private things + * + * Copyright 2012 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#ifndef __XMLLITE_PRIVATE__ +#define __XMLLITE_PRIVATE__ + +/* memory allocation functions */ +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +#endif /* __XMLLITE_PRIVATE__ */

1 0