wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Andrew Nguyen : atl: Accept a NULL output container pointer in AtlAxAttachControl.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: e01794d4f7b3097b51d558452618f04175f672fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01794d4f7b3097b51d558452… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 29 09:06:35 2010 -0500 atl: Accept a NULL output container pointer in AtlAxAttachControl. --- dlls/atl/atl_ax.c | 5 +- dlls/atl/tests/Makefile.in | 3 +- dlls/atl/tests/atl_ax.c | 122 ++++++++++++++++++++++++++++++++++++++++++++ dlls/atl/tests/module.c | 1 - 4 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index cf654e1..d9d60a5 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1044,10 +1044,11 @@ HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUn TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer ); - *ppUnkContainer = NULL; + if (!pControl) + return E_INVALIDARG; hr = IOCS_Create( hWnd, pControl, &pUnkContainer ); - if ( SUCCEEDED( hr ) ) + if ( SUCCEEDED( hr ) && ppUnkContainer) { *ppUnkContainer = (IUnknown*) pUnkContainer; } diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in index b9752d4..98d9b03 100644 --- a/dlls/atl/tests/Makefile.in +++ b/dlls/atl/tests/Makefile.in @@ -3,9 +3,10 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = atl.dll -IMPORTS = atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32 +IMPORTS = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32 C_SRCS = \ + atl_ax.c \ module.c @MAKE_TEST_RULES@ diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c new file mode 100644 index 0000000..8b9966c --- /dev/null +++ b/dlls/atl/tests/atl_ax.c @@ -0,0 +1,122 @@ +/* + * Unit tests for Active Template Library ActiveX functions + * + * Copyright 2010 Andrew Nguyen + * + * 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include <wine/test.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <winnls.h> +#include <winerror.h> +#include <winnt.h> +#include <wtypes.h> +#include <olectl.h> +#include <ocidl.h> +#include <exdisp.h> + +HRESULT WINAPI AtlAxAttachControl(IUnknown *, HWND, IUnknown **); + +static ATOM register_class(void) +{ + WNDCLASSA wndclassA; + + wndclassA.style = 0; + wndclassA.lpfnWndProc = DefWindowProc; + wndclassA.cbClsExtra = 0; + wndclassA.cbWndExtra = 0; + wndclassA.hInstance = GetModuleHandleA(NULL); + wndclassA.hIcon = NULL; + wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); + wndclassA.lpszMenuName = NULL; + wndclassA.lpszClassName = "WineAtlTestClass"; + + return RegisterClassA(&wndclassA); +} + +static void test_AtlAxAttachControl(void) +{ + HWND hwnd = CreateWindowA("WineAtlTestClass", "Wine ATL Test Window", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, NULL, NULL, NULL, NULL); + HRESULT hr; + IUnknown *pObj, *pContainer; + + hr = AtlAxAttachControl(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + pContainer = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, NULL, &pContainer); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(pContainer == (IUnknown *)0xdeadbeef, + "Expected the output container pointer to be untouched, got %p\n", pContainer); + + hr = AtlAxAttachControl(NULL, hwnd, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IOleObject, (void **)&pObj); + ok(hr == S_OK, "Expected CoCreateInstance to return S_OK, got 0x%08x\n", hr); + + if (FAILED(hr)) + { + skip("Couldn't obtain a test IOleObject instance\n"); + return; + } + + hr = AtlAxAttachControl(pObj, NULL, NULL); + todo_wine + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + + pContainer = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(pObj, NULL, &pContainer); + todo_wine + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + ok(pContainer != (IUnknown *)0xdeadbeef && + pContainer != NULL, + "Expected the output container pointer to be initialized to non-NULL, got %p\n", pContainer); + + if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) + IUnknown_Release(pContainer); + + hr = AtlAxAttachControl(pObj, hwnd, NULL); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + + IUnknown_Release(pObj); + + DestroyWindow(hwnd); +} + +START_TEST(atl_ax) +{ + if (!register_class()) + return; + + CoInitialize(NULL); + + test_AtlAxAttachControl(); + + CoUninitialize(); +} diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 294d87b..1b21f6e 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -32,7 +32,6 @@ #include <winnls.h> #include <winerror.h> #include <winnt.h> -#include <initguid.h> #include <wtypes.h> #include <olectl.h> #include <ocidl.h>

1 0

Marko Nikolic : advapi32/tests: Removed sign comparison warning in test_LookupAccountName.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 29dd5235057bde5beba2807bb6876a7aa56d62b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29dd5235057bde5beba2807bb… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Tue Jun 29 23:23:37 2010 +0200 advapi32/tests: Removed sign comparison warning in test_LookupAccountName. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1f1b697..cd4624a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1931,7 +1931,7 @@ static void test_LookupAccountName(void) ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); } ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); - ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); + ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use); domain_size = domain_save; sid_size = sid_save; @@ -1949,7 +1949,7 @@ static void test_LookupAccountName(void) ok(!lstrcmp(account, "Everyone"), "Expected Everyone, got %s\n", account); ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == 0, "Expected 0, got %d\n", domain_size); - ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); + ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeWellKnownGroup (%d), got %d\n", SidTypeWellKnownGroup, sid_use); domain_size = domain_save; }

1 0

André Hentschel : user32/tests: Use if(0) instead of a comment to make sure code still compiles.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 50c94bf054f10ac879934ae1419ae60af9a1799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c94bf054f10ac879934ae14… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 29 21:56:45 2010 +0200 user32/tests: Use if(0) instead of a comment to make sure code still compiles. --- dlls/user32/tests/msg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index eb27800..e0494ef 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4717,10 +4717,10 @@ static void test_messages(void) ok(hwnd != 0, "Failed to create custom dialog window\n"); ok_sequence(WmCreateCustomDialogSeq, "CreateCustomDialog", TRUE); - /* + if(0) { trace("testing scroll APIs on a visible dialog %p\n", hwnd); test_scroll_messages(hwnd); - */ + } flush_sequence();

1 0

Jacek Caban : shdocvw: Added IBindStatusCallback::OnProgress( BINDSTATUS_REDIRECTING) implementation.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: df8f393b59823f646f4e53322ca82009d5146090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8f393b59823f646f4e53322… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 21:03:47 2010 +0200 shdocvw: Added IBindStatusCallback::OnProgress(BINDSTATUS_REDIRECTING) implementation. --- dlls/shdocvw/navigate.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 5166e97..6f05cf2 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -222,6 +222,8 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, debugstr_w(szStatusText)); switch(ulStatusCode) { + case BINDSTATUS_REDIRECTING: + return set_dochost_url(This->doc_host, szStatusText); case BINDSTATUS_BEGINDOWNLOADDATA: set_status_text(This, szStatusText); /* FIXME: "Start downloading from site: %s" */ return S_OK;

1 0

Jacek Caban : shdocvw: Store DocHost url on a regular heap.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: aed47627f6e1db38b52874acb12b76ad701fe0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed47627f6e1db38b52874acb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 21:03:22 2010 +0200 shdocvw: Store DocHost url on a regular heap. --- dlls/shdocvw/dochost.c | 2 +- dlls/shdocvw/navigate.c | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 2196eb9..b3db012 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -820,5 +820,5 @@ void DocHost_Release(DocHost *This) ConnectionPointContainer_Destroy(&This->cps); - CoTaskMemFree(This->url); + heap_free(This->url); } diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 3310cba..5166e97 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -111,6 +111,23 @@ static void set_status_text(BindStatusCallback *This, LPCWSTR str) IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str); } +static HRESULT set_dochost_url(DocHost *This, const WCHAR *url) +{ + WCHAR *new_url; + + if(url) { + new_url = heap_strdupW(url); + if(!new_url) + return E_OUTOFMEMORY; + }else { + new_url = NULL; + } + + heap_free(This->url); + This->url = new_url; + return S_OK; +} + #define BINDSC_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, @@ -502,6 +519,7 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt IBindStatusCallback *callback) { IUnknown *unk = NULL; + WCHAR *display_name; HRESULT hres; if(mon) { @@ -512,10 +530,16 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt return hres; } - CoTaskMemFree(This->url); - hres = IMoniker_GetDisplayName(mon, 0, NULL, &This->url); - if(FAILED(hres)) + hres = IMoniker_GetDisplayName(mon, 0, NULL, &display_name); + if(FAILED(hres)) { FIXME("GetDisplayName failed: %08x\n", hres); + return hres; + } + + hres = set_dochost_url(This, display_name); + CoTaskMemFree(display_name); + if(FAILED(hres)) + return hres; IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)CLIENTSITE(This)); @@ -538,18 +562,12 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt static void html_window_navigate(DocHost *This, IHTMLPrivateWindow *window, BSTR url, BSTR headers, SAFEARRAY *post_data) { VARIANT headers_var, post_data_var; - WCHAR *new_url; BSTR empty_str; - DWORD size; HRESULT hres; - size = (strlenW(url)+1)*sizeof(WCHAR); - new_url = CoTaskMemAlloc(size); - if(!new_url) + hres = set_dochost_url(This, url); + if(FAILED(hres)) return; - memcpy(new_url, url, size); - CoTaskMemFree(This->url); - This->url = new_url; empty_str = SysAllocStringLen(NULL, 0);

1 0

André Hentschel : wineusr: Add WINEARCH description.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: docs Branch: master Commit: 621c6e936c46cd75170c8a51e3576d083715b8fe URL: http://source.winehq.org/git/docs.git/?a=commit;h=621c6e936c46cd75170c8a51e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 29 21:56:35 2010 +0200 wineusr: Add WINEARCH description. --- en/wineusr-running.sgml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 9c5ae2f..1ec71e9 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -279,6 +279,18 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </para> </sect2> <sect2> + <title>WINEARCH</title> + <para> + Specifies the Windows architecture to support. It can be set either to + win32 (support only 32-bit applications), or to win64 + (support both 64-bit applications and 32-bit ones in WoW64 mode). + The architecture supported by a given Wine prefix is set at prefix + creation time and cannot be changed afterwards. When running with an + existing prefix, Wine will refuse to start if WINEARCH doesn't match + the prefix architecture. + </para> + </sect2> + <sect2> <title>OSS Audio Driver Settings</title> <para> If you are using the OSS audio driver and you have multiple devices,

1 0

Piotr Caban : wininet: Reconnect if persistent connection was closed by server.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: ee68473fe5c244cc3ad3ed6ad8751652b9962c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee68473fe5c244cc3ad3ed6ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 29 12:20:51 2010 +0200 wininet: Reconnect if persistent connection was closed by server. --- dlls/wininet/http.c | 23 ++++++++++++++++++++--- dlls/wininet/netconnection.c | 6 +++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 200d03f..4b4bc5b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3454,6 +3454,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, do { DWORD len; + BOOL reusing_connection; char *ascii_req; loop_next = FALSE; @@ -3504,6 +3505,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, TRACE("Request header -> %s\n", debugstr_w(requestString) ); /* Send the request and store the results */ + if(NETCON_connected(&lpwhr->netConnection)) + reusing_connection = TRUE; + else + reusing_connection = FALSE; + if ((res = HTTP_OpenConnection(lpwhr)) != ERROR_SUCCESS) goto lend; @@ -3545,6 +3551,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, goto lend; responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE); + /* FIXME: We should know that connection is closed before sending + * headers. Otherwise wrong callbacks are executed */ + if(!responseLen && reusing_connection) { + TRACE("Connection closed by server, reconnecting\n"); + loop_next = TRUE; + continue; + } INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, @@ -4457,9 +4470,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear) TRACE("-->\n"); - /* clear old response headers (eg. from a redirect response) */ - if (clear) HTTP_clear_response_headers( lpwhr ); - if (!NETCON_connected(&lpwhr->netConnection)) goto lend; @@ -4471,6 +4481,13 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear) buflen = MAX_REPLY_LEN; if (!read_line(lpwhr, bufferA, &buflen)) goto lend; + + /* clear old response headers (eg. from a redirect response) */ + if (clear) { + HTTP_clear_response_headers( lpwhr ); + clear = FALSE; + } + rc += buflen; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* check is this a status code line? */ diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 5aa647a..abd7415 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -770,6 +770,8 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int if (!connection->useSSL) { *recvd = recv(connection->socketFD, buf, len, flags); + if(!*recvd) + NETCON_close(connection); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } else @@ -779,8 +781,10 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int /* Check if EOF was received */ if(!*recvd && (pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_ZERO_RETURN - || pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_SYSCALL)) + || pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_SYSCALL)) { + NETCON_close(connection); return ERROR_SUCCESS; + } return *recvd > 0 ? ERROR_SUCCESS : ERROR_INTERNET_CONNECTION_ABORTED; #else

1 0

Ricardo Filipe : mshtml: Fix Portuguese Portugal translation.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: c009107754dbaccb2d449b65b6f4330183a830c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c009107754dbaccb2d449b65b… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jun 29 01:52:15 2010 -0700 mshtml: Fix Portuguese Portugal translation. --- dlls/mshtml/Pt.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 689f930..be98a59 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -66,9 +66,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "O Wine não conseguiu encontrar o pacote Gecko que é necessário para aplicações com HTML embutido" \ + "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalá-lo por si.\n\n" \ + "Nota: é recomendável usar os pacotes da sua distribuição em vez disso. \n\ +Veja http://wiki.winehq.org/Gecko para mais detalhes.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Andrew Eikum : shell32: Pass the file extension to ParseDisplayName in unixfs's SetNameOf.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 2b3fea0249de423a3056a3ba3215fa86cb057e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3fea0249de423a3056a3ba3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 28 09:35:36 2010 -0500 shell32: Pass the file extension to ParseDisplayName in unixfs's SetNameOf. --- dlls/shell32/shfldr_unixfs.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index dfd7255..9c9f94a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1183,9 +1183,9 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H static const WCHAR awcInvalidChars[] = { '\\', '/', ':', '*', '?', '"', '<', '>', '|' }; char szSrc[FILENAME_MAX], szDest[FILENAME_MAX]; - WCHAR wszSrcRelative[MAX_PATH]; + WCHAR wszSrcRelative[MAX_PATH], *pwszExt = NULL; unsigned int i; - int cBasePathLen = lstrlenA(This->m_pszPath); + int cBasePathLen = lstrlenA(This->m_pszPath), cNameLen; struct stat statDest; LPITEMIDLIST pidlSrc, pidlDest, pidlRelativeDest; LPOLESTR lpwszName; @@ -1221,8 +1221,8 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H _ILSimpleGetTextW(pidl, wszSrcRelative, MAX_PATH) && SHELL_FS_HideExtension(wszSrcRelative)) { - WCHAR *pwszExt = PathFindExtensionW(wszSrcRelative); int cLenDest = strlen(szDest); + pwszExt = PathFindExtensionW(wszSrcRelative); WideCharToMultiByte(CP_UNIXCP, 0, pwszExt, -1, szDest + cLenDest, FILENAME_MAX - cLenDest, NULL, NULL); } @@ -1238,8 +1238,14 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H return E_FAIL; /* Build a pidl for the path of the renamed file */ - lpwszName = SHAlloc((lstrlenW(lpcwszName)+1)*sizeof(WCHAR)); /* due to const correctness. */ + cNameLen = lstrlenW(lpcwszName) + 1; + if(pwszExt) + cNameLen += lstrlenW(pwszExt); + lpwszName = SHAlloc(cNameLen*sizeof(WCHAR)); /* due to const correctness. */ lstrcpyW(lpwszName, lpcwszName); + if(pwszExt) + lstrcatW(lpwszName, pwszExt); + hr = IShellFolder2_ParseDisplayName(iface, NULL, NULL, lpwszName, NULL, &pidlRelativeDest, NULL); SHFree(lpwszName); if (FAILED(hr)) {

1 0

Alexandre Julliard : winex11: Disable antialiasing if either fontconfig or Xft disable it explicitly.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 4d9a31177113f53407595f055ea3dbdc6df6bcf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9a31177113f53407595f055… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 29 14:58:31 2010 +0200 winex11: Disable antialiasing if either fontconfig or Xft disable it explicitly. --- dlls/winex11.drv/xrender.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2fc804a..4f900b2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -905,6 +905,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) break; } + font_smoothing = TRUE; /* default to enabled */ #ifdef SONAME_LIBFONTCONFIG if (fontconfig_installed) { @@ -956,9 +957,10 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; - case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; + case FC_RGBA_NONE: entry->aa_default = AA_Grey; break; } } + if (!antialias) font_smoothing = FALSE; pFcPatternDestroy( match ); } pFcPatternDestroy( pattern ); @@ -984,11 +986,14 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; - else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; + else if (!strcmp( value, "none" )) entry->aa_default = AA_Grey; } wine_tsx11_unlock(); + if (!antialias) font_smoothing = FALSE; } + if (!font_smoothing) entry->aa_default = AA_None; + /* we can't support subpixel without xrender */ if (!X11DRV_XRender_Installed && entry->aa_default > AA_Grey) entry->aa_default = AA_Grey; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2010