September 2014 - Wine-commits

Akihiro Sagawa : winmm: Avoid sending MMIOM_SEEK message in debug trace.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: d5345e64f1d71745143344d06f64f6474188cc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5345e64f1d71745143344d06… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 2 00:10:11 2014 +0900 winmm: Avoid sending MMIOM_SEEK message in debug trace. --- dlls/winmm/mmio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index c61c99c..026bedb 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -516,9 +516,8 @@ static LONG MMIO_GrabNextBuffer(LPWINE_MMIO wm, int for_read) { LONG size = wm->info.cchBuffer; - TRACE("bo=%x do=%x of=%lx\n", - wm->info.lBufOffset, wm->info.lDiskOffset, - send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)); + TRACE("bo=%x do=%x\n", + wm->info.lBufOffset, wm->info.lDiskOffset); wm->info.lBufOffset = wm->info.lDiskOffset; wm->info.pchNext = wm->info.pchBuffer;

1 0

Akihiro Sagawa : winmm: Don' t call the custom MMIOM_SEEK handler while opening.
by Alexandre Julliard 02 Sep '14

02 Sep '14

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

Piotr Caban : msvcp90: Don't fail if conversion was successful in wctob.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 8b26ae824b01eae8fe2743ae53faec7192c59e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b26ae824b01eae8fe2743ae5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 1 17:50:34 2014 +0200 msvcp90: Don't fail if conversion was successful in wctob. --- dlls/msvcp90/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ef06172..b15f1b8 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10280,7 +10280,7 @@ int __cdecl wctob(wint_t wc) { char ret[MB_LEN_MAX]; - if (wc == WEOF || _Wcrtomb( ret, wc, NULL, NULL ) != -1) return EOF; + if (wc == WEOF || _Wcrtomb( ret, wc, NULL, NULL ) != 1) return EOF; return ret[0]; }

1 0

Jacek Caban : atl: Added typelib.
by Alexandre Julliard 02 Sep '14

02 Sep '14

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

Hans Leidekker : winhttp/tests: Avoid test failures caused by connection errors.
by Alexandre Julliard 02 Sep '14

02 Sep '14

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

Austin English : advapi32: Add stub for OpenEncryptedFileRawA/W.
by Alexandre Julliard 02 Sep '14

02 Sep '14

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

Austin English : advapi32: Add stub for ReadEncryptedFileRaw.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 8ca36632e98c1e96c2df5189973ccc93d97bc280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca36632e98c1e96c2df51899… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:12:59 2014 -0500 advapi32: Add stub for ReadEncryptedFileRaw. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 57d2c65..e61e983 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -566,7 +566,7 @@ @ stdcall QueryTraceW(int64 wstr ptr) # @ stub QueryUsersOnEncryptedFile @ stdcall QueryWindows31FilesMigration(long) -# @ stub ReadEncryptedFileRaw +@ stdcall ReadEncryptedFileRaw(ptr ptr ptr) @ stdcall ReadEventLogA (long long long ptr long ptr ptr) @ stdcall ReadEventLogW (long long long ptr long ptr ptr) @ stdcall RegCloseKey(long) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index b41965d..f369ae3 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2290,6 +2290,25 @@ DWORD WINAPI OpenEncryptedFileRawW(LPCWSTR filename, ULONG flags, PVOID *context } /****************************************************************************** + * ReadEncryptedFileRaw (ADVAPI32.@) + * + * Export encrypted files + * + * PARAMS + * export [I] pointer to the export callback function + * callback [I] pointer to the application defined context + * context [I] pointer to the system context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI ReadEncryptedFileRaw(PFE_EXPORT_FUNC export, PVOID callback, PVOID context) +{ + FIXME("(%p, %p, %p): stub\n", export, callback, context); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** * SystemFunction030 (ADVAPI32.@) * * Tests if two blocks of 16 bytes are equal

1 0

Austin English : advapi32: Add stub for WriteEncryptedFileRaw.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: a98496a09a97a554a18c7f29fc63f0052537fd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98496a09a97a554a18c7f29f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:15:10 2014 -0500 advapi32: Add stub for WriteEncryptedFileRaw. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e61e983..d1ab64d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -825,4 +825,4 @@ # @ stub WmiSetSingleItemA # @ stub WmiSetSingleItemW # @ stub Wow64Win32ApiEntry -# @ stub WriteEncryptedFileRaw +@ stdcall WriteEncryptedFileRaw(ptr ptr ptr) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f369ae3..f74dee4 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2434,3 +2434,22 @@ NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) FIXME("(%p, %x, %x): stub [RtlDecryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; } + +/****************************************************************************** + * WriteEncryptedFileRaw (ADVAPI32.@) + * + * Import encrypted files + * + * PARAMS + * import [I] pointer to the import callback function + * callback [I] pointer to the application defined context + * context [I] pointer to the system context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC import, PVOID callback, PVOID context) +{ + FIXME("(%p, %p, %p): stub\n", import, callback, context); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Austin English : advapi32: Add stub for CloseEncryptedFileRaw.
by Alexandre Julliard 02 Sep '14

02 Sep '14

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

Jacek Caban : mshtml: Fixed session_storage leak.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 6b18f619f49b02b8de0afe94aab56754029dbabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b18f619f49b02b8de0afe94a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 11:34:53 2014 +0200 mshtml: Fixed session_storage leak. --- dlls/mshtml/htmlwindow.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bc648f3..6c6c328 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -264,6 +264,9 @@ static void release_inner_window(HTMLInnerWindow *This) IOmHistory_Release(&This->history->IOmHistory_iface); } + if(This->session_storage) + IHTMLStorage_Release(This->session_storage); + if(This->mon) IMoniker_Release(This->mon);

1 0