September 2014 - Wine-Commits

Hans Leidekker : msi: Set the OutOfNoRbDiskSpace property.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 04f9058a2897b03544ad59545d0b9c9e1ee43ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f9058a2897b03544ad59545… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:03:56 2014 +0200 msi: Set the OutOfNoRbDiskSpace property. --- dlls/msi/action.c | 3 +++ dlls/msi/tests/package.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 41f367b..7ebdcc8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2355,6 +2355,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) static const WCHAR szPrimaryVolumeSpaceAvailable[] = {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', 'A','v','a','i','l','a','b','l','e',0}; + static const WCHAR szOutOfNoRbDiskSpace[] = + {'O','u','t','O','f','N','o','R','b','D','i','s','k','S','p','a','c','e',0}; MSICOMPONENT *comp; MSIQUERY *view; WCHAR *level, *primary_key, *primary_folder; @@ -2431,6 +2433,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) /* FIXME: check volume disk space */ msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); + msi_set_property( package->db, szOutOfNoRbDiskSpace, szZero, -1 ); return MSI_SetFeatureStates(package); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9705827..1a5935d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1145,6 +1145,12 @@ static void test_settargetpath(void) r = MsiDoActionA( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + buffer[0] = 0; + sz = sizeof(buffer); + r = MsiGetPropertyA( hpkg, "OutOfNoRbDiskSpace", buffer, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); + trace( "OutOfNoRbDiskSpace = \"%s\"\n", buffer ); + r = MsiSetTargetPathA( 0, NULL, NULL ); ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n");

1 0

Austin English : advapi32: Add stub for OpenEncryptedFileRawA/W.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 27f00d4f68b4fc19015c626b5ecb3771ef7fa7b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f00d4f68b4fc19015c626b5… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:03:08 2014 -0500 advapi32: Add stub for OpenEncryptedFileRawA/W. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/crypt.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index b4bf440..57d2c65 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -507,8 +507,8 @@ @ stdcall ObjectPrivilegeAuditAlarmW(wstr ptr long long ptr long) @ stdcall OpenBackupEventLogA (str str) @ stdcall OpenBackupEventLogW (wstr wstr) -# @ stub OpenEncryptedFileRawA -# @ stub OpenEncryptedFileRawW +@ stdcall OpenEncryptedFileRawA(str long ptr) +@ stdcall OpenEncryptedFileRawW(wstr long ptr) @ stdcall OpenEventLogA (str str) @ stdcall OpenEventLogW (wstr wstr) @ stdcall OpenProcessToken(long long ptr) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 2c5e411..b41965d 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2260,6 +2260,36 @@ BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, const BYTE *pbSignature, DW } /****************************************************************************** + * OpenEncryptedFileRawA (ADVAPI32.@) + * + * See OpenEncryptedFileRawW + */ +DWORD WINAPI OpenEncryptedFileRawA(LPCSTR filename, ULONG flags, PVOID *context) +{ + FIXME("(%s, %x, %p): stub\n", debugstr_a(filename), flags, context); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * OpenEncryptedFileRawW (ADVAPI32.@) + * + * Opens an EFS encrypted file for backup/restore + * + * PARAMS + * filename [I] Filename to operate on + * flags [I] Operation to perform + * context [I] Handle to the context (out) + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI OpenEncryptedFileRawW(LPCWSTR filename, ULONG flags, PVOID *context) +{ + FIXME("(%s, %x, %p): stub\n", debugstr_w(filename), flags, context); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** * SystemFunction030 (ADVAPI32.@) * * Tests if two blocks of 16 bytes are equal

1 0

Hans Leidekker : winhttp/tests: Avoid test failures caused by connection errors.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: e52bbd581d4414d3e08169d6660ef29a0377c92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52bbd581d4414d3e08169d66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 14:48:49 2014 +0200 winhttp/tests: Avoid test failures caused by connection errors. --- dlls/winhttp/tests/winhttp.c | 47 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0d8f8be..51fcc86 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -265,8 +265,14 @@ static void test_empty_headers_param(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, empty, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); + done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -315,6 +321,11 @@ static void test_SendRequest (void) context++; ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); context = 0; @@ -346,9 +357,9 @@ static void test_SendRequest (void) ok(bytes_rw == sizeof(test_post) - 1, "Read %u bytes\n", bytes_rw); ok(!memcmp(buffer, test_post, sizeof(test_post) - 1), "Data read did not match.\n"); + done: ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); - done: ret = WinHttpCloseHandle(connection); ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); ret = WinHttpCloseHandle(session); @@ -845,18 +856,17 @@ static void test_secure_connection(void) WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); - if (!ret) + if (!ret && (GetLastError() == ERROR_WINHTTP_SECURE_FAILURE || GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT)) { skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; } + ok(ret, "failed to send request %u\n", GetLastError()); size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); - if (ret) - CertFreeCertificateContext(cert); + if (ret) CertFreeCertificateContext(cert); size = sizeof(bitness); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); @@ -920,6 +930,11 @@ static void test_request_parameter_defaults(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); @@ -936,6 +951,11 @@ static void test_request_parameter_defaults(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); @@ -959,6 +979,7 @@ static void test_request_parameter_defaults(void) ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); +done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -1719,12 +1740,11 @@ static void test_resolve_timeout(void) SetLastError(0xdeadbeef); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - if(ret == 1) + if (ret) { skip("nxdomain returned success. Broken ISP redirects?\n"); - return; + goto done; } - ok(!ret, "sent request\n"); ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); @@ -1749,8 +1769,14 @@ static void test_resolve_timeout(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request\n"); + done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -3071,6 +3097,11 @@ static void test_chunked_read(void) if (!req) goto done; ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok( ret, "WinHttpSendRequest failed with error %u\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL );

1 0

Jacek Caban : atl: Added typelib.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: f900bb5cbcf0ab726b1326f0c8ac2abafb7a8ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900bb5cbcf0ab726b1326f0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 13:45:06 2014 +0200 atl: Added typelib. --- configure | 8 ++++---- configure.ac | 8 ++++---- dlls/atl/Makefile.in | 4 +++- dlls/atl/atl_lib.idl | 36 ++++++++++++++++++++++++++++++++++++ dlls/atl100/Makefile.in | 2 ++ dlls/atl110/Makefile.in | 2 ++ dlls/atl80/Makefile.in | 2 ++ dlls/atl90/Makefile.in | 2 ++ 8 files changed, 55 insertions(+), 9 deletions(-) diff --git a/configure b/configure index fe2cf48..35bdf9d 100755 --- a/configure +++ b/configure @@ -16792,12 +16792,12 @@ wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl clean,implib wine_fn_config_test dlls/atl/tests atl_test -wine_fn_config_dll atl100 enable_atl100 implib +wine_fn_config_dll atl100 enable_atl100 clean,implib wine_fn_config_test dlls/atl100/tests atl100_test -wine_fn_config_dll atl110 enable_atl110 -wine_fn_config_dll atl80 enable_atl80 implib +wine_fn_config_dll atl110 enable_atl110 clean +wine_fn_config_dll atl80 enable_atl80 clean,implib wine_fn_config_test dlls/atl80/tests atl80_test -wine_fn_config_dll atl90 enable_atl90 +wine_fn_config_dll atl90 enable_atl90 clean wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po diff --git a/configure.ac b/configure.ac index ba0c927..2f291e3 100644 --- a/configure.ac +++ b/configure.ac @@ -2702,12 +2702,12 @@ WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl/tests) -WINE_CONFIG_DLL(atl100,,[implib]) +WINE_CONFIG_DLL(atl100,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl100/tests) -WINE_CONFIG_DLL(atl110) -WINE_CONFIG_DLL(atl80,,[implib]) +WINE_CONFIG_DLL(atl110,,[clean]) +WINE_CONFIG_DLL(atl80,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl80/tests) -WINE_CONFIG_DLL(atl90) +WINE_CONFIG_DLL(atl90,,[clean]) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 4f87b27..34ae9b8 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -9,4 +9,6 @@ C_SRCS = \ atl_ax.c \ registrar.c -IDL_SRCS = atl_classes.idl +IDL_SRCS = \ + atl_classes.idl \ + atl_lib.idl diff --git a/dlls/atl/atl_lib.idl b/dlls/atl/atl_lib.idl new file mode 100644 index 0000000..918416c --- /dev/null +++ b/dlls/atl/atl_lib.idl @@ -0,0 +1,36 @@ +/* + * Copyright 2014 Jacek Caban 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 + */ + +#pragma makedep regtypelib +#pragma makedep register + +import "atliface.idl"; + +[ + uuid(44ec0535-400f-11d0-9dcd-00a0c90391d3), + version(1.0), + helpstring("ATL 2.0 Type Library") +] +library ATLLib +{ + importlib("stdole2.tlb"); + + interface IDocHostUIHandlerDispatch; + interface IAxWinAmbientDispatch; + interface IAxWinAmbientDispatchEx; +} diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 35b37ac..916bd8e 100644 --- a/dlls/atl100/Makefile.in +++ b/dlls/atl100/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ atl.c \ atl_ax.c \ registrar.c + +IDL_SRCS = atl_lib.idl diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index ed357f6..ced0f18 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -7,3 +7,5 @@ C_SRCS = \ atl.c \ atl_ax.c \ registrar.c + +IDL_SRCS = atl_lib.idl diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 2ada925..4b7bbd7 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -10,4 +10,6 @@ C_SRCS = \ atl_ax.c \ registrar.c +IDL_SRCS = atl_lib.idl + RC_SRCS = atl80.rc diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index a5082bc..5fed63b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -8,4 +8,6 @@ C_SRCS = \ atl_ax.c \ registrar.c +IDL_SRCS = atl_lib.idl + RC_SRCS = atl90.rc

1 0

Jacek Caban : mshtml: Use TID_LIST in debugstr_mshtml_guid.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 8b0e62c42b50719c4883bc23cff2558cf3831986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0e62c42b50719c4883bc23c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 11:45:31 2014 +0200 mshtml: Use TID_LIST in debugstr_mshtml_guid. --- dlls/mshtml/main.c | 50 +++++--------------------------------------------- 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8e11ce9..ce9222f 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -504,7 +504,6 @@ HRESULT WINAPI DllUnregisterServer(void) const char *debugstr_mshtml_guid(const GUID *iid) { #define X(x) if(IsEqualGUID(iid, &x)) return #x - X(DIID_DispHTMLDocument); X(DIID_HTMLDocumentEvents); X(DIID_HTMLDocumentEvents2); X(DIID_HTMLTableEvents); @@ -517,54 +516,10 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IEnumConnections); X(IID_IEnumVARIANT); X(IID_IHlinkTarget); - X(IID_IHTMLAttributeCollection); - X(IID_IHTMLAttributeCollection2); - X(IID_IHTMLAttributeCollection3); - X(IID_IHTMLCurrentStyle); - X(IID_IHTMLCurrentStyle2); - X(IID_IHTMLCurrentStyle3); - X(IID_IHTMLCurrentStyle4); - X(IID_IHTMLDocument); - X(IID_IHTMLDocument2); - X(IID_IHTMLDocument3); - X(IID_IHTMLDocument4); - X(IID_IHTMLDocument5); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); - X(IID_IHTMLDOMAttribute); - X(IID_IHTMLDOMChildrenCollection); - X(IID_IHTMLDOMImplementation); - X(IID_IHTMLDOMNode); - X(IID_IHTMLDOMNode2); - X(IID_IHTMLElement); - X(IID_IHTMLElement2); - X(IID_IHTMLElement3); - X(IID_IHTMLElement4); - X(IID_IHTMLElementCollection); - X(IID_IHTMLEventObj); - X(IID_IHTMLFiltersCollection); X(IID_IHTMLFramesCollection2); - X(IID_IHTMLImageElementFactory); - X(IID_IHTMLLocation); - X(IID_IHTMLOptionElementFactory); X(IID_IHTMLPrivateWindow); - X(IID_IHTMLRect); - X(IID_IHTMLScreen); - X(IID_IHTMLStorage); - X(IID_IHTMLStyle); - X(IID_IHTMLStyle2); - X(IID_IHTMLStyle3); - X(IID_IHTMLStyle4); - X(IID_IHTMLStyle5); - X(IID_IHTMLStyle6); - X(IID_IHTMLStyleSheet); - X(IID_IHTMLStyleSheetRulesCollection); - X(IID_IHTMLStyleSheetsCollection); - X(IID_IHTMLWindow2); - X(IID_IHTMLWindow3); - X(IID_IHTMLWindow4); - X(IID_IHTMLWindow5); - X(IID_IHTMLWindow6); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); @@ -601,6 +556,11 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IViewObjectEx); X(IID_nsCycleCollectionISupports); X(IID_nsXPCOMCycleCollectionParticipant); +#define XIID(x) X(IID_##x); +#define XDIID(x) X(DIID_##x); + TID_LIST +#undef XIID +#undef XDIID #undef X return debugstr_guid(iid);

1 0

Austin English : advapi32: Add stub for CloseEncryptedFileRaw.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: d5ef271ecec7dfe974a95feff1847489e93b9f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ef271ecec7dfe974a95feff… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:18:59 2014 -0500 advapi32: Add stub for CloseEncryptedFileRaw. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d1ab64d..f1cae1f 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -84,7 +84,7 @@ @ stdcall ClearEventLogA (long str) @ stdcall ClearEventLogW (long wstr) # @ stub CloseCodeAuthzLevel -# @ stub CloseEncryptedFileRaw +@ stdcall CloseEncryptedFileRaw(ptr) @ stdcall CloseEventLog (long) @ stdcall CloseServiceHandle(long) # @ stub CloseThreadWaitChainSession diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f74dee4..b2be5e3 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -319,6 +319,23 @@ static void CRYPT_CreateMachineGuid(void) } } + +/****************************************************************************** + * CloseEncryptedFileRaw (ADVAPI32.@) + * + * Close encrypted files + * + * PARAMS + * context [I] pointer to the context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +void WINAPI CloseEncryptedFileRaw(PVOID context) +{ + FIXME("(%p): stub\n", context); +} + /****************************************************************************** * CryptAcquireContextW (ADVAPI32.@) *

1 0

Akihiro Sagawa : winmm: Don' t call the custom MMIOM_SEEK handler while opening.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: e2779a4c9aec515e0e478cb1d4c9fbe5a87d2367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2779a4c9aec515e0e478cb1d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 2 00:10:13 2014 +0900 winmm: Don't call the custom MMIOM_SEEK handler while opening. --- dlls/winmm/mmio.c | 18 ++++++++++++++---- dlls/winmm/tests/mmio.c | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 026bedb..f2a04cf 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -667,7 +667,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, (LPARAM)szFileName, 0, FALSE); /* update offsets and grab file size, when possible */ - if (wm->info.fccIOProc != FOURCC_MEM && (send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)) != -1) { + if (wm->info.fccIOProc == FOURCC_DOS && (send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)) != -1) { pos = wm->info.lBufOffset = wm->info.lDiskOffset; send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_END, FALSE); wm->dwFileSize = wm->info.lDiskOffset; @@ -885,7 +885,17 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) offset = wm->info.lBufOffset + (wm->info.pchNext - wm->info.pchBuffer) + lOffset; break; case SEEK_END: - offset = ((wm->info.fccIOProc == FOURCC_MEM)? wm->info.cchBuffer : wm->dwFileSize) - lOffset; + switch (wm->info.fccIOProc) { + case FOURCC_MEM: + offset = wm->info.cchBuffer - lOffset; + break; + case FOURCC_DOS: + offset = wm->dwFileSize - lOffset; + break; + default: + offset = send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, SEEK_END, FALSE); + break; + } break; default: return -1; @@ -896,7 +906,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) if ((wm->info.cchBuffer > 0) && ((offset < wm->info.lBufOffset) || (offset > wm->info.lBufOffset + wm->info.cchBuffer) || - (offset > wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) || + (offset > wm->dwFileSize && wm->info.fccIOProc == FOURCC_DOS) || !wm->bBufferLoaded)) { /* condition to change buffer */ @@ -1023,7 +1033,7 @@ MMRESULT WINAPI mmioAdvance(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) return MMIOERR_CANNOTWRITE; - if (lpmmioinfo) { + if (lpmmioinfo && lpmmioinfo->fccIOProc == FOURCC_DOS) { wm->dwFileSize = max(wm->dwFileSize, lpmmioinfo->lBufOffset + (lpmmioinfo->pchNext - lpmmioinfo->pchBuffer)); } diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 57dc166..cf02c0d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -636,9 +636,9 @@ static void test_mmioOpen_fourcc(void) mmioGetInfo(hmmio, &mmio, 0); ok(hmmio && mmio.fccIOProc == FOURCC_XYZ, "mmioOpenA error %u, got %4.4s\n", mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); - todo_wine ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %d\n", + ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %d\n", mmio.adwInfo[1]); - todo_wine ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %d\n", + ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %d\n", mmio.lDiskOffset); mmioClose(hmmio, 0);

1 0

Johannes Brandstätter : wined3d: Fix trace output of emulated_textureram.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: de3cb3af6f19477ee32bc52e71846f6302ea1329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3cb3af6f19477ee32bc52e7… Author: Johannes Brandstätter <jbrandst(a)2ds.eu> Date: Tue Sep 2 13:35:00 2014 +0200 wined3d: Fix trace output of emulated_textureram. --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_main.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9f00dcf..79b2590 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1521,7 +1521,8 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, if (wined3d_settings.emulated_textureram) { - TRACE("Overriding amount of video memory with %u bytes.\n", wined3d_settings.emulated_textureram); + TRACE("Overriding amount of video memory with 0x%s bytes.\n", + wine_dbgstr_longlong(wined3d_settings.emulated_textureram)); driver_info->vram_bytes = wined3d_settings.emulated_textureram; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7ab2448..758ba43 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -256,10 +256,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) int TmpVideoMemorySize = atoi(buffer); if(TmpVideoMemorySize > 0) { - wined3d_settings.emulated_textureram = TmpVideoMemorySize *1024*1024; - TRACE("Use %iMB = %d byte for emulated_textureram\n", + wined3d_settings.emulated_textureram = (UINT64)TmpVideoMemorySize *1024*1024; + TRACE("Use %iMiB = 0x%s bytes for emulated_textureram\n", TmpVideoMemorySize, - wined3d_settings.emulated_textureram); + wine_dbgstr_longlong(wined3d_settings.emulated_textureram)); } else ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e99a7b4..f55b118 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -257,7 +257,7 @@ struct wined3d_settings unsigned short pci_vendor_id; unsigned short pci_device_id; /* Memory tracking and object counting. */ - unsigned int emulated_textureram; + UINT64 emulated_textureram; char *logo; int allow_multisampling; BOOL strict_draw_ordering;

1 0

Hans Leidekker : msiexec: Command line option '!' is used to hide the cancel button.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: f5d916db0641a5d3cb0007b21251c423d6f64d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d916db0641a5d3cb0007b21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:02:57 2014 +0200 msiexec: Command line option '!' is used to hide the cancel button. --- programs/msiexec/msiexec.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e76b526..1c42e90 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -912,13 +912,18 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else if(msi_strequal(argvW[i]+2, "b+!")) { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; - WINE_FIXME("Unknown modifier: !\n"); + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL; + } + else if(msi_strequal(argvW[i]+2, "b-!")) + { + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; } else if(msi_strequal(argvW[i]+2, "b!")) { - InstallUILevel = INSTALLUILEVEL_BASIC; - WINE_FIXME("Unknown modifier: !\n"); + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL; } else {

1 0

Jacek Caban : msctf.idl: Added ITfMouse* interfaces.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 383e223cdafb9c654381bb1f1934cb061fc54add URL: http://source.winehq.org/git/wine.git/?a=commit;h=383e223cdafb9c654381bb1f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 15:11:39 2014 +0200 msctf.idl: Added ITfMouse* interfaces. --- include/msctf.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/msctf.idl b/include/msctf.idl index 68e2dc1..bce38ab 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1556,3 +1556,48 @@ interface ITfInputProcessorProfileActivationSink : IUnknown [in] HKL hkl, [in] DWORD dwFlags); } + +[ + object, + local, + uuid(a1adaaa2-3a24-449d-ac96-5183e7f5c217), + pointer_default(unique) +] +interface ITfMouseSink : IUnknown +{ + HRESULT OnMouseEvent( + [in] ULONG uEdge, + [in] ULONG uQuadrant, + [in] DWORD dwBtnStatus, + [out] BOOL *pfEaten); +} + +[ + object, + uuid(09d146cd-a544-4132-925b-7afa8ef322d0), + pointer_default(unique) +] +interface ITfMouseTracker : IUnknown +{ + HRESULT AdviseMouseSink( + [in] ITfRange *range, + [in] ITfMouseSink *pSink, + [out] DWORD *pdwCookie); + + HRESULT UnadviseMouseSink([in] DWORD dwCookie); +} + +[ + object, + uuid(3bdd78e2-c16e-47fd-b883-ce6facc1a208), + pointer_default(unique) +] +interface ITfMouseTrackerACP : IUnknown +{ + HRESULT AdviseMouseSink( + [in] ITfRangeACP *range, + [in] ITfMouseSink *pSink, + [out] DWORD *pdwCookie); + + HRESULT UnadviseMouseSink([in] DWORD dwCookie); +}

1 0