November 2012 - Wine-Commits

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

Nov. 19, 2012

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 : wininet: Use processed string from server_t for constructing proxy path.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

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

Nikolay Sivov : xmllite: Store reader input impl pointer in reader structure.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 67c07ff42a1af398279f909b2780360c4b5fcb55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c07ff42a1af398279f909b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 17 14:22:09 2012 -0500 xmllite: Store reader input impl pointer in reader structure. --- dlls/xmllite/reader.c | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 880e5fa..ae05057 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -64,17 +64,6 @@ typedef struct unsigned int written; } encoded_buffer; -typedef struct _xmlreader -{ - IXmlReader IXmlReader_iface; - LONG ref; - IXmlReaderInput *input; - IMalloc *imalloc; - XmlReadState state; - DtdProcessing dtdmode; - UINT line, pos; /* reader position in XML stream */ -} xmlreader; - typedef struct input_buffer input_buffer; typedef struct _xmlreaderinput @@ -91,6 +80,17 @@ typedef struct _xmlreaderinput input_buffer *buffer; } xmlreaderinput; +typedef struct _xmlreader +{ + IXmlReader IXmlReader_iface; + LONG ref; + xmlreaderinput *input; + IMalloc *imalloc; + XmlReadState state; + DtdProcessing dtdmode; + UINT line, pos; /* reader position in XML stream */ +} xmlreader; + struct input_buffer { encoded_buffer utf16; @@ -226,27 +226,24 @@ static void free_input_buffer(input_buffer *buffer) readerinput_free(buffer->input, buffer); } -static void xmlreaderinput_release_stream(IXmlReaderInput *iface) +static void xmlreaderinput_release_stream(xmlreaderinput *readerinput) { - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - - if (This->stream) { - ISequentialStream_Release(This->stream); - This->stream = NULL; + if (readerinput->stream) { + ISequentialStream_Release(readerinput->stream); + readerinput->stream = NULL; } } /* Queries already stored interface for IStream/ISequentialStream. Interface supplied on creation will be overwritten */ -static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface) +static HRESULT xmlreaderinput_query_for_stream(xmlreaderinput *readerinput) { - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); HRESULT hr; - xmlreaderinput_release_stream(iface); - hr = IUnknown_QueryInterface(This->input, &IID_IStream, (void**)&This->stream); + xmlreaderinput_release_stream(readerinput); + hr = IUnknown_QueryInterface(readerinput->input, &IID_IStream, (void**)&readerinput->stream); if (hr != S_OK) - hr = IUnknown_QueryInterface(This->input, &IID_ISequentialStream, (void**)&This->stream); + hr = IUnknown_QueryInterface(readerinput->input, &IID_ISequentialStream, (void**)&readerinput->stream); return hr; } @@ -291,7 +288,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) if (ref == 0) { IMalloc *imalloc = This->imalloc; - if (This->input) IUnknown_Release(This->input); + if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -309,7 +306,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) if (This->input) { xmlreaderinput_release_stream(This->input); - IUnknown_Release(This->input); + IUnknown_Release(&This->input->IXmlReaderInput_iface); This->input = NULL; } @@ -326,10 +323,13 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); if (hr != S_OK) { + IXmlReaderInput *readerinput; + /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, - NULL, NULL, FALSE, NULL, &This->input); + NULL, NULL, FALSE, NULL, &readerinput); if (hr != S_OK) return hr; + This->input = impl_from_IXmlReaderInput(readerinput); } /* set stream for supplied IXmlReaderInput */

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 92a9fe463be7562e49faa088ddae8df7789313b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a9fe463be7562e49faa088d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:48 2012 +0100 ddraw: Avoid LPDIRECT3D. --- include/d3d.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 24dcad6..46fb2d6 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -409,7 +409,7 @@ DECLARE_INTERFACE_(IDirect3DLight,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DLight methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(SetLight)(THIS_ LPD3DLIGHT lpLight) PURE; STDMETHOD(GetLight)(THIS_ LPD3DLIGHT lpLight) PURE; }; @@ -447,7 +447,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DMaterial methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DMATERIALHANDLE *handle) PURE; @@ -652,7 +652,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -720,7 +720,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -796,7 +796,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -936,7 +936,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d, GUID *guid, D3DDEVICEDESC *desc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, @@ -958,7 +958,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(DeleteMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D *lplpDirect3D) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D **d3d) PURE; }; #undef INTERFACE

1 0

Michael Stefaniuc : user32: Remove two superfluous casts.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 8f7eaf26ce329e0eea0e30aa1d32bd0b183b666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7eaf26ce329e0eea0e30aa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:51:54 2012 +0100 user32: Remove two superfluous casts. --- dlls/user32/tests/resource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index dd4342d..346cc2a 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -170,11 +170,11 @@ static void test_accel1(void) ac[n].cmd = 0xfff0; ac[n].key = 0xffff; - ac[n++].fVirt = (SHORT) 0x0000; + ac[n++].fVirt = 0x0000; ac[n].cmd = 0xfff0; ac[n].key = 0xffff; - ac[n++].fVirt = (SHORT) 0x0001; + ac[n++].fVirt = 0x0001; hAccel = CreateAcceleratorTable( &ac[0], n ); ok( hAccel != NULL, "create accelerator table\n");

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D2.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 4a339708d6034c58cee87369a355df834d402f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a339708d6034c58cee87369a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:47 2012 +0100 ddraw: Avoid LPDIRECT3D2. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f1b9e2d..24dcad6 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1036,7 +1036,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D2 *lplpDirect3D2) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D2 **d3d) PURE; /*** DrawPrimitive API ***/ STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport2 **viewport) PURE;

1 0

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

Nov. 19, 2012

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

Alexandre Julliard : gdi32: Fix coordinate mapping of arc limits.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 1c4cf1a2db92045895864423f07ef973cc205dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4cf1a2db92045895864423f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 19 12:48:06 2012 +0100 gdi32: Fix coordinate mapping of arc limits. --- dlls/gdi32/dibdrv/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 0b54188..f358fbd 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -304,10 +304,10 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, pt[1].y = end_y; LPtoDP( dev->hdc, pt, 2 ); /* make them relative to the ellipse center */ - pt[0].x -= left + width / 2; - pt[0].y -= top + height / 2; - pt[1].x -= left + width / 2; - pt[1].y -= top + height / 2; + pt[0].x -= rect.left + width / 2; + pt[0].y -= rect.top + height / 2; + pt[1].x -= rect.left + width / 2; + pt[1].y -= rect.top + height / 2; points = HeapAlloc( GetProcessHeap(), 0, (width + height) * 3 * sizeof(*points) ); if (!points) return FALSE;

1 0

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

Nov. 19, 2012

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

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

Nov. 19, 2012

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