December 2009 - Wine-Commits

James Hawkins : msi: MsiSetMode returns a UINT system error code, not a BOOL.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 7d3e6643127b56549778784f7b57f62217fa95f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3e6643127b56549778784f7… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 3 21:11:49 2009 -0800 msi: MsiSetMode returns a UINT system error code, not a BOOL. --- dlls/msi/install.c | 15 +++------------ dlls/msi/tests/automation.c | 4 ++-- include/msiquery.h | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 1a535eb..b1d741a 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -717,19 +717,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) /*********************************************************************** * MsiSetMode (MSI.@) */ -BOOL WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) +UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) { - switch (iRunMode) - { - case MSIRUNMODE_RESERVED11: - case MSIRUNMODE_WINDOWS9X: - case MSIRUNMODE_RESERVED14: - case MSIRUNMODE_RESERVED15: - return FALSE; - default: - FIXME("%d %d %d\n", hInstall, iRunMode, fState); - } - return TRUE; + FIXME("%d %d %d\n", hInstall, iRunMode, fState); + return ERROR_SUCCESS; } /*********************************************************************** diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 29a7cd2..b792fa7 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1713,12 +1713,12 @@ static void test_Session(IDispatch *pSession) /* Session::Mode, put */ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); - todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot at end session mode is %d, expected 1\n", bool); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ - todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); /* Session::Database, get */ hr = Session_Database(pSession, &pDatabase); diff --git a/include/msiquery.h b/include/msiquery.h index 6a1bfa4..2ea8320 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -301,7 +301,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,PUINT); UINT WINAPI MsiEnableUIPreview(MSIHANDLE, MSIHANDLE*); BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE); -BOOL WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL); +UINT WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL); UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE);

1 0

Jacek Caban : jscript: Correctly handle NaN in to_integer.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: ec769d2d95d69f87436f1a2ef73bbe4c4c2f0b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec769d2d95d69f87436f1a2ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 4 02:56:25 2009 +0100 jscript: Correctly handle NaN in to_integer. --- dlls/jscript/jsutils.c | 8 ++++++-- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 304980d..9e49cc7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -449,10 +449,14 @@ HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) if(FAILED(hres)) return hres; - if(V_VT(&num) == VT_I4) + if(V_VT(&num) == VT_I4) { *ret = num; - else + }else if(isnan(V_R8(&num))) { + V_VT(ret) = VT_I4; + V_I4(ret) = 0; + }else { num_set_val(ret, V_R8(&num) >= 0.0 ? floor(V_R8(&num)) : -floor(-V_R8(&num))); + } return S_OK; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 42a79e8..80bdf88 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -231,6 +231,8 @@ tmp = "abc".charAt(-1); ok(tmp === "", "'abc',charAt(-1) = " + tmp); tmp = "abc".charAt(0,2); ok(tmp === "a", "'abc',charAt(0.2) = " + tmp); +tmp = "abc".charAt(NaN); +ok(tmp === "a", "'abc',charAt(NaN) = " + tmp); tmp = "abc".charCodeAt(0); ok(tmp === 0x61, "'abc'.charCodeAt(0) = " + tmp);

1 0

Juan Lang : wintrust: Fix memory leaks in tests.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: ba9ccc51e252ac9f38cb4c145b5619ac5508b6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9ccc51e252ac9f38cb4c145… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 15:12:57 2009 -0800 wintrust: Fix memory leaks in tests. --- dlls/wintrust/tests/softpub.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index c60ccb3..e01a26c 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -179,8 +179,12 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ok(data.pasSigners[0].pasCertChain != NULL, "Expected pasCertChain to be allocated\n"); if (data.pasSigners[0].pasCertChain) + { ok(data.pasSigners[0].pasCertChain[0].pCert == cert, "Unexpected cert\n"); + CertFreeCertificateContext( + data.pasSigners[0].pasCertChain[0].pCert); + } CertFreeCertificateContext(cert); } else @@ -433,6 +437,9 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) (CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST), "Expected CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST, got %08x\n", data.pasSigners[0].pasCertChain[0].dwConfidence); + CertFreeCertificateContext( + data.pasSigners[0].pasCertChain[0].pCert); + CertFreeCertificateChain(data.pasSigners[0].pChainContext); CertFreeCertificateContext(cert); } }

1 0

Nikolay Sivov : kernel32/lcformat: Don't use uneeded string conversion.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 8e4f283e2de59fad52b60c500007187e36b64a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4f283e2de59fad52b60c500… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 23:02:21 2009 +0300 kernel32/lcformat: Don't use uneeded string conversion. --- dlls/kernel32/lcformat.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 83c190f..c24ee37 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -470,7 +470,6 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, else if ((dwFlags & DATE_DATEVARSONLY && IsDateFmtChar(*lpFormat)) || (dwFlags & TIME_TIMEVARSONLY && IsTimeFmtChar(*lpFormat))) { - char buffA[32]; WCHAR buff[32], fmtChar; LPCWSTR szAdd = NULL; DWORD dwVal = 0; @@ -604,9 +603,9 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, if (szAdd == buff && buff[0] == '\0') { + static const WCHAR fmtW[] = {'%','.','*','d',0}; /* We have a numeric value to add */ - sprintf(buffA, "%.*d", count, dwVal); - MultiByteToWideChar(CP_ACP, 0, buffA, -1, buff, sizeof(buff)/sizeof(WCHAR)); + snprintfW(buff, sizeof(buff)/sizeof(WCHAR), fmtW, count, dwVal); } dwLen = szAdd ? strlenW(szAdd) : 0;

1 0

Nikolay Sivov : kernel32/lcformat: Add support for genitive month names in GetDateFormat().
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 8ea4102a6c6e0ce0fad52e87fdd94530475255f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea4102a6c6e0ce0fad52e87f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 4 03:06:58 2009 +0300 kernel32/lcformat: Add support for genitive month names in GetDateFormat(). --- dlls/kernel32/lcformat.c | 90 +++++++++++++++++++++++++++++++++++++---- dlls/kernel32/tests/locale.c | 69 ++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ea4102a6c6e0ce0fad52…

1 0

Alexandre Julliard : ntdll/tests: Fix a few test failures on Windows in the open by id test.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 3dd6c9a6fe41c47c141a0ca5f2265b7c2cddf2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd6c9a6fe41c47c141a0ca5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 12:06:40 2009 +0100 ntdll/tests: Fix a few test failures on Windows in the open by id test. --- dlls/ntdll/tests/file.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index aeb8cc7..39e71a5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -199,7 +199,9 @@ static void open_file_test(void) nameW.Length += sizeof(WCHAR); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( status == STATUS_INVALID_PARAMETER || status == STATUS_OBJECT_PATH_SYNTAX_BAD, /* nt4 */ + ok( status == STATUS_INVALID_PARAMETER || + status == STATUS_OBJECT_NAME_INVALID || + status == STATUS_OBJECT_PATH_SYNTAX_BAD, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); if (!status) CloseHandle( handle ); @@ -228,8 +230,13 @@ static void open_file_test(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); + if (status == STATUS_NOT_IMPLEMENTED) + { + win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); + break; + } if (!status) { FILE_ALL_INFORMATION all_info;

1 0

Juan Lang : winhttp: Pass hostname to netconn_secure_connect.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: a33c4bfd0b8be409012c46483d400bee4711d965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33c4bfd0b8be409012c46483… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 13:28:23 2009 -0800 winhttp: Pass hostname to netconn_secure_connect. --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 2 +- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 53911d6..5d5f9b7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -418,7 +418,7 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned return ret; } -BOOL netconn_secure_connect( netconn_t *conn ) +BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) { #ifdef SONAME_LIBSSL X509 *cert; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4d5be84..f6c9bce 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -957,7 +957,7 @@ static BOOL open_connection( request_t *request ) return FALSE; } } - if (!netconn_secure_connect( &request->netconn )) + if (!netconn_secure_connect( &request->netconn, connect->servername )) { netconn_close( &request->netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 64348a2..73ac5ba 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -219,7 +219,7 @@ void netconn_unload( void ); BOOL netconn_query_data_available( netconn_t *, DWORD * ); BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t * ); -BOOL netconn_secure_connect( netconn_t * ); +BOOL netconn_secure_connect( netconn_t *, WCHAR * ); BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); DWORD netconn_set_timeout( netconn_t *, BOOL, int ); const void *netconn_get_certificate( netconn_t * );

1 0

Juan Lang : winhttp: Set callback to verify hostname with peer' s certificate.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 48a7580135b03c270c2a6328cc4ba1df7b40fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a7580135b03c270c2a6328c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 16:56:40 2009 -0800 winhttp: Set callback to verify hostname with peer's certificate. --- dlls/winhttp/net.c | 41 +++++++++++++++++++++++++++++++++-------- 1 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index cf83f20..a86a5a6 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -110,9 +110,12 @@ MAKE_FUNCPTR( SSL_read ); MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_data ); MAKE_FUNCPTR( SSL_set_ex_data ); +MAKE_FUNCPTR( SSL_get_ex_data_X509_STORE_CTX_idx ); MAKE_FUNCPTR( SSL_get_verify_result ); MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); +MAKE_FUNCPTR( SSL_CTX_set_verify ); +MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); @@ -208,6 +211,19 @@ static int sock_get_error( int err ) return err; } +#ifdef SONAME_LIBSSL +static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) +{ + SSL *ssl; + WCHAR *server; + + ssl = pX509_STORE_CTX_get_ex_data( ctx, pSSL_get_ex_data_X509_STORE_CTX_idx() ); + server = pSSL_get_ex_data( ssl, hostname_idx ); + FIXME("verify %s\n", debugstr_w(server)); + return preverify_ok; +} +#endif + BOOL netconn_init( netconn_t *conn, BOOL secure ) { #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) @@ -261,9 +277,12 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_get_ex_new_index ); LOAD_FUNCPTR( SSL_get_ex_data ); LOAD_FUNCPTR( SSL_set_ex_data ); + LOAD_FUNCPTR( SSL_get_ex_data_X509_STORE_CTX_idx ); LOAD_FUNCPTR( SSL_get_verify_result ); LOAD_FUNCPTR( SSL_get_peer_certificate ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); + LOAD_FUNCPTR( SSL_CTX_set_verify ); + LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); #undef LOAD_FUNCPTR #define LOAD_FUNCPTR(x) \ @@ -297,6 +316,14 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) return FALSE; } hostname_idx = pSSL_get_ex_new_index( 0, (void *)"hostname index", NULL, NULL, NULL ); + if (hostname_idx == -1) + { + ERR("SSL_get_ex_new_index failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); + return FALSE; + } + pSSL_CTX_set_verify( ctx, SSL_VERIFY_PEER, netconn_secure_verify ); pCRYPTO_set_id_callback(ssl_thread_id); num_ssl_locks = pCRYPTO_num_locks(); @@ -429,7 +456,6 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) { #ifdef SONAME_LIBSSL - X509 *cert; long res; if (!(conn->ssl_conn = pSSL_new( ctx ))) @@ -438,22 +464,21 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) set_last_error( ERROR_OUTOFMEMORY ); goto fail; } - if (!pSSL_set_fd( conn->ssl_conn, conn->socket )) + if (!pSSL_set_ex_data( conn->ssl_conn, hostname_idx, hostname )) { - ERR("SSL_set_fd failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + ERR("SSL_set_ex_data failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; } - if (pSSL_connect( conn->ssl_conn ) <= 0) + if (!pSSL_set_fd( conn->ssl_conn, conn->socket )) { - ERR("SSL_connect failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + ERR("SSL_set_fd failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; } - pSSL_set_ex_data( conn->ssl_conn, hostname_idx, hostname ); - if (!(cert = pSSL_get_peer_certificate( conn->ssl_conn ))) + if (pSSL_connect( conn->ssl_conn ) <= 0) { - ERR("No certificate for server: %s\n", pERR_error_string( pERR_get_error(), 0 )); + ERR("SSL_connect failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; }

1 0

Aric Stewart : shlwapi: Close the correct key in SHRegCloseUSKey.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 3a55f964b9a2204bb94a08855d0d5374b0699af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a55f964b9a2204bb94a08855… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 3 14:04:20 2009 -0600 shlwapi: Close the correct key in SHRegCloseUSKey. --- dlls/shlwapi/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index c6fa2c7..9f652c9 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -200,7 +200,7 @@ LONG WINAPI SHRegCloseUSKey( if (hKey->HKLMkey) ret = RegCloseKey(hKey->HKLMkey); if (hKey->HKLMstart && hKey->HKLMstart != HKEY_LOCAL_MACHINE) - ret = RegCloseKey(hKey->HKCUstart); + ret = RegCloseKey(hKey->HKLMstart); HeapFree(GetProcessHeap(), 0, hKey); return ret;

1 0

Alexandre Julliard : ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 866db819b8684f9a11fe977de398221f292ead09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=866db819b8684f9a11fe977de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 12:06:20 2009 +0100 ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable. --- dlls/kernel32/kernel32.spec | 1 + dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/signal_x86_64.c | 20 ++++++++++++++++++++ include/winnt.h | 2 ++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index aad5e79..bab25a0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -924,6 +924,7 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) +@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e7f298d..0b3ebef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -408,6 +408,7 @@ # @ stub RtlAddAuditAccessObjectAce # @ stub RtlAddCompoundAce # @ stub RtlAddRange +@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredExceptionHandler(long ptr) @@ -513,6 +514,7 @@ @ stdcall RtlDeleteCriticalSection(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl +@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 94ec742..97a952e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2311,6 +2311,26 @@ void signal_init_process(void) /********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64 addr ) +{ + FIXME( "%p %u %lx: stub\n", table, count, addr ); + return FALSE; +} + + +/********************************************************************** + * RtlDeleteFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) +{ + FIXME( "%p: stub\n", table ); + return FALSE; +} + + +/********************************************************************** * RtlLookupFunctionEntry (NTDLL.@) */ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG64 pc, ULONG64 *base, UNWIND_HISTORY_TABLE *table ) diff --git a/include/winnt.h b/include/winnt.h index fae8a45..e2d1d1a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1076,6 +1076,8 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS } DUMMYUNIONNAME2; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD64); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(DWORD64,DWORD64*,UNWIND_HISTORY_TABLE*); PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG64*,KNONVOLATILE_CONTEXT_POINTERS*);

1 0