January 2007 - Wine-Commits

Alexandre Julliard : server: Support queuing some APCs to a process instead of a thread.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 6ca1d1b0812496e670957543294b04abfefe8d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca1d1b0812496e6709575432… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 15 22:26:32 2007 +0100 server: Support queuing some APCs to a process instead of a thread. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/sync.c | 36 ++++++++++++ dlls/ntdll/thread.c | 2 +- include/wine/server_protocol.h | 6 +- server/protocol.def | 7 ++- server/thread.c | 125 +++++++++++++++++++++++++++++++++------- server/trace.c | 12 +++- 7 files changed, 160 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ca1d1b0812496e670957…

1 0

Alexandre Julliard : ntdll: Implementation of inter-process VirtualAllocEx and VirtualFreeEx.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 7a00142bc1469e4fcf7dce1a5f26bee0086878cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a00142bc1469e4fcf7dce1a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 15 22:27:40 2007 +0100 ntdll: Implementation of inter-process VirtualAllocEx and VirtualFreeEx. --- dlls/kernel32/tests/process.c | 10 --------- dlls/kernel32/tests/virtual.c | 18 ++++++++-------- dlls/ntdll/sync.c | 20 +++++++++++++++++++ dlls/ntdll/virtual.c | 42 +++++++++++++++++++++++++++++++++++----- 4 files changed, 65 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8a15722..8e782f1 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1311,7 +1311,6 @@ static void test_OpenProcess(void) SetLastError(0xdeadbeef); addr1 = pVirtualAllocEx(hproc, 0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS); -todo_wine { ok(!addr1, "VirtualAllocEx should fail\n"); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { /* Win9x */ @@ -1320,7 +1319,6 @@ todo_wine { return; } ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError()); -} read_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1334,11 +1332,7 @@ todo_wine { ok(hproc != NULL, "OpenProcess error %d\n", GetLastError()); addr1 = pVirtualAllocEx(hproc, 0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS); -todo_wine { ok(addr1 != NULL, "VirtualAllocEx error %d\n", GetLastError()); -} - if (addr1 == NULL) /* FIXME: remove once Wine is fixed */ - addr1 = pVirtualAllocEx(GetCurrentProcess(), 0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS); /* without PROCESS_QUERY_INFORMATION */ SetLastError(0xdeadbeef); @@ -1374,18 +1368,14 @@ todo_wine { ok(info.Type == MEM_PRIVATE, "%x != MEM_PRIVATE\n", info.Type); SetLastError(0xdeadbeef); -todo_wine { ok(!pVirtualFreeEx(hproc, addr1, 0, MEM_RELEASE), "VirtualFreeEx without PROCESS_VM_OPERATION rights should fail\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError()); -} CloseHandle(hproc); -todo_wine { ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } -} START_TEST(process) { diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 8773765..d03ee7b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -74,7 +74,7 @@ static void test_VirtualAllocEx(void) for (i = 0; i < alloc_size; i++) src[i] = 0xcafedead + i; - todo_wine ok(addr1 != NULL, "VirtualAllocEx error %u\n", GetLastError()); + ok(addr1 != NULL, "VirtualAllocEx error %u\n", GetLastError()); b = WriteProcessMemory(hProcess, addr1, src, alloc_size, &bytes_written); ok(b && (bytes_written == alloc_size), "%lu bytes written\n", bytes_written); @@ -82,7 +82,7 @@ static void test_VirtualAllocEx(void) ok(b && (bytes_read == alloc_size), "%lu bytes read\n", bytes_read); ok(!memcmp(src, dst, alloc_size), "Data from remote process differs\n"); b = VirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); - todo_wine ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError()); + ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError()); HeapFree( GetProcessHeap(), 0, src ); HeapFree( GetProcessHeap(), 0, dst ); @@ -99,7 +99,7 @@ static void test_VirtualAllocEx(void) "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); addr1 = VirtualAllocEx(hProcess, 0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS); - todo_wine ok(addr1 != NULL, "VirtualAllocEx failed\n"); + ok(addr1 != NULL, "VirtualAllocEx failed\n"); /* test a not committed memory */ memset(&info, 'q', sizeof(info)); @@ -154,11 +154,13 @@ static void test_VirtualAllocEx(void) GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */ "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); + old_prot = 0; todo_wine ok(VirtualProtectEx(hProcess, addr1, 0x1000, PAGE_READONLY, &old_prot), "VirtualProtectEx failed\n"); todo_wine ok(old_prot == PAGE_NOACCESS, "wrong old protection: got %04x instead of PAGE_NOACCESS\n", old_prot); + old_prot = 0; todo_wine ok(VirtualProtectEx(hProcess, addr1, 0x1000, PAGE_READWRITE, &old_prot), "VirtualProtectEx failed\n"); todo_wine ok(old_prot == PAGE_READONLY, @@ -166,20 +168,18 @@ static void test_VirtualAllocEx(void) ok(!VirtualFreeEx(hProcess, addr1, 0x10000, 0), "VirtualFreeEx should fail with type 0\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - todo_wine ok(VirtualFreeEx(hProcess, addr1, 0x10000, MEM_DECOMMIT), - "VirtualFreeEx failed\n"); + ok(VirtualFreeEx(hProcess, addr1, 0x10000, MEM_DECOMMIT), "VirtualFreeEx failed\n"); /* if the type is MEM_RELEASE, size must be 0 */ ok(!VirtualFreeEx(hProcess, addr1, 1, MEM_RELEASE), "VirtualFreeEx should fail\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - todo_wine ok(VirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE), - "VirtualFreeEx failed\n"); + ok(VirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE), "VirtualFreeEx failed\n"); TerminateProcess(hProcess, 0); CloseHandle(hProcess); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 2274e21..70dc4c9 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -706,6 +706,26 @@ static BOOL call_apcs( BOOL alertable ) NtCurrentTeb()->num_async_io--; call.async_io.func( call.async_io.user, call.async_io.sb, call.async_io.status ); break; + case APC_VIRTUAL_ALLOC: + result.type = call.type; + result.virtual_alloc.addr = call.virtual_alloc.addr; + result.virtual_alloc.size = call.virtual_alloc.size; + result.virtual_alloc.status = NtAllocateVirtualMemory( NtCurrentProcess(), + &result.virtual_alloc.addr, + call.virtual_alloc.zero_bits, + &result.virtual_alloc.size, + call.virtual_alloc.op_type, + call.virtual_alloc.prot ); + break; + case APC_VIRTUAL_FREE: + result.type = call.type; + result.virtual_free.addr = call.virtual_free.addr; + result.virtual_free.size = call.virtual_free.size; + result.virtual_free.status = NtFreeVirtualMemory( NtCurrentProcess(), + &result.virtual_free.addr, + &result.virtual_free.size, + call.virtual_free.op_type ); + break; default: server_protocol_error( "get_apc_request: bad type %d\n", call.type ); break; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3ff6b42..9c613cc 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1380,10 +1380,26 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( if (!size) return STATUS_INVALID_PARAMETER; - if (!is_current_process( process )) + if (process != NtCurrentProcess()) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + apc_call_t call; + apc_result_t result; + + call.virtual_alloc.type = APC_VIRTUAL_ALLOC; + call.virtual_alloc.addr = *ret; + call.virtual_alloc.size = *size_ptr; + call.virtual_alloc.zero_bits = zero_bits; + call.virtual_alloc.op_type = type; + call.virtual_alloc.prot = protect; + status = NTDLL_queue_process_apc( process, &call, &result ); + if (status != STATUS_SUCCESS) return status; + + if (result.virtual_alloc.status == STATUS_SUCCESS) + { + *ret = result.virtual_alloc.addr; + *size_ptr = result.virtual_alloc.size; + } + return result.virtual_alloc.status; } /* Round parameters to a page boundary */ @@ -1485,10 +1501,24 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HAN TRACE("%p %p %08lx %x\n", process, addr, size, type ); - if (!is_current_process( process )) + if (process != NtCurrentProcess()) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + apc_call_t call; + apc_result_t result; + + call.virtual_free.type = APC_VIRTUAL_FREE; + call.virtual_free.addr = addr; + call.virtual_free.size = size; + call.virtual_free.op_type = type; + status = NTDLL_queue_process_apc( process, &call, &result ); + if (status != STATUS_SUCCESS) return status; + + if (result.virtual_free.status == STATUS_SUCCESS) + { + *addr_ptr = result.virtual_free.addr; + *size_ptr = result.virtual_free.size; + } + return result.virtual_free.status; } /* Fix the parameters */

1 0

Alexandre Julliard : server: Added mechanism for returning results of APC calls.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: fb40dc4099cf5140069e31b6d8523da77ab15c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb40dc4099cf5140069e31b6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 15 22:24:40 2007 +0100 server: Added mechanism for returning results of APC calls. Defined APC_VIRTUAL_ALLOC and APC_VIRTUAL_FREE requests. --- dlls/ntdll/sync.c | 6 ++++ include/wine/server_protocol.h | 64 ++++++++++++++++++++++++++++++++++++++- server/protocol.def | 54 +++++++++++++++++++++++++++++++++- server/request.h | 2 + server/thread.c | 21 ++++++++++++- server/trace.c | 53 ++++++++++++++++++++++++++++++++- tools/make_requests | 1 + 7 files changed, 196 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb40dc4099cf5140069e3…

1 0

Alexandre Julliard : server: Properly wake the waiting threads when an APC is cancelled.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 46d7fa4852df8ff226bca32382e7214116bf3ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d7fa4852df8ff226bca3238… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 15 20:02:05 2007 +0100 server: Properly wake the waiting threads when an APC is cancelled. --- server/thread.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/server/thread.c b/server/thread.c index b8ee6fc..13563c3 100644 --- a/server/thread.c +++ b/server/thread.c @@ -77,6 +77,7 @@ struct thread_apc static void dump_thread_apc( struct object *obj, int verbose ); static int thread_apc_signaled( struct object *obj, struct thread *thread ); +static void clear_apc_queue( struct list *queue ); static const struct object_ops thread_apc_ops = { @@ -102,7 +103,6 @@ static int thread_signaled( struct objec static unsigned int thread_map_access( struct object *obj, unsigned int access ); static void thread_poll_event( struct fd *fd, int event ); static void destroy_thread( struct object *obj ); -static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_only ); static const struct object_ops thread_ops = { @@ -227,9 +227,9 @@ static void thread_poll_event( struct fd static void cleanup_thread( struct thread *thread ) { int i; - struct thread_apc *apc; - while ((apc = thread_dequeue_apc( thread, 0 ))) release_object( apc ); + clear_apc_queue( &thread->system_apc ); + clear_apc_queue( &thread->user_apc ); free( thread->req_data ); free( thread->reply_data ); if (thread->request_fd) release_object( thread->request_fd ); @@ -709,12 +709,14 @@ void thread_cancel_apc( struct thread *t { if (apc->owner != owner) continue; list_remove( &apc->entry ); + apc->executed = 1; + wake_up( &apc->obj, 0 ); release_object( apc ); return; } } -/* remove the head apc from the queue; the returned pointer must be freed by the caller */ +/* remove the head apc from the queue; the returned object must be released by the caller */ static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_only ) { struct thread_apc *apc = NULL; @@ -729,6 +731,21 @@ static struct thread_apc *thread_dequeue return apc; } +/* clear an APC queue, cancelling all the APCs on it */ +static void clear_apc_queue( struct list *queue ) +{ + struct list *ptr; + + while ((ptr = list_head( queue ))) + { + struct thread_apc *apc = LIST_ENTRY( ptr, struct thread_apc, entry ); + list_remove( &apc->entry ); + apc->executed = 1; + wake_up( &apc->obj, 0 ); + release_object( apc ); + } +} + /* add an fd to the inflight list */ /* return list index, or -1 on error */ int thread_add_inflight_fd( struct thread *thread, int client, int server ) @@ -1108,6 +1125,8 @@ DECL_HANDLER(get_apc) * wake up a thread, but since we got here the thread woke up already. */ if (apc->call.type != APC_NONE) break; + apc->executed = 1; + wake_up( &apc->obj, 0 ); release_object( apc ); }

1 0

Alexandre Julliard : kernel32: Use the proper codepage for console functions.
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 0df37dd9e37e157f372aac3628d4845941731f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df37dd9e37e157f372aac362… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 15 16:49:08 2007 +0100 kernel32: Use the proper codepage for console functions. Based on a patch by Anatoly Lyutin. --- dlls/kernel32/console.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a22076e..0590cd4 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1200,7 +1200,7 @@ BOOL WINAPI ReadConsoleA(HANDLE hConsole BOOL ret; if ((ret = ReadConsoleW(hConsoleInput, ptr, nNumberOfCharsToRead, &ncr, NULL))) - ncr = WideCharToMultiByte(CP_ACP, 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL); + ncr = WideCharToMultiByte(GetConsoleCP(), 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL); if (lpNumberOfCharsRead) *lpNumberOfCharsRead = ncr; HeapFree(GetProcessHeap(), 0, ptr); @@ -2005,13 +2005,13 @@ BOOL WINAPI WriteConsoleA(HANDLE hConsol LPWSTR xstring; DWORD n; - n = MultiByteToWideChar(CP_ACP, 0, lpBuffer, nNumberOfCharsToWrite, NULL, 0); + n = MultiByteToWideChar(GetConsoleOutputCP(), 0, lpBuffer, nNumberOfCharsToWrite, NULL, 0); if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; xstring = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); if (!xstring) return 0; - MultiByteToWideChar(CP_ACP, 0, lpBuffer, nNumberOfCharsToWrite, xstring, n); + MultiByteToWideChar(GetConsoleOutputCP(), 0, lpBuffer, nNumberOfCharsToWrite, xstring, n); ret = WriteConsoleW(hConsoleOutput, xstring, n, lpNumberOfCharsWritten, 0); @@ -2258,7 +2258,7 @@ BOOL WINAPI ScrollConsoleScreenBufferA(H CHAR_INFO ciw; ciw.Attributes = lpFill->Attributes; - MultiByteToWideChar(CP_ACP, 0, &lpFill->Char.AsciiChar, 1, &ciw.Char.UnicodeChar, 1); + MultiByteToWideChar(GetConsoleOutputCP(), 0, &lpFill->Char.AsciiChar, 1, &ciw.Char.UnicodeChar, 1); return ScrollConsoleScreenBufferW(hConsoleOutput, lpScrollRect, lpClipRect, dwDestOrigin, &ciw);

1 0

appdb/ admin/editAppVersion.php include/downlo ...
by WineHQ Jan. 16, 2007

Jan. 16, 2007

ChangeSet ID: 30879 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/15 22:25:56 Modified files: admin : editAppVersion.php include : downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Rename downloadurl::editor to OutputEditor for better conformance with other classes Patch: http://cvs.winehq.org/patch.py?id=30879 Old revision New revision Changes Path 1.44 1.45 +1 -1 appdb/admin/editAppVersion.php 1.5 1.6 +1 -1 appdb/include/downloadurl.php Index: appdb/admin/editAppVersion.php diff -u -p appdb/admin/editAppVersion.php:1.44 appdb/admin/editAppVersion.php:1.45 --- appdb/admin/editAppVersion.php:1.44 16 Jan 2007 4:25:56 -0000 +++ appdb/admin/editAppVersion.php 16 Jan 2007 4:25:56 -0000 @@ -87,7 +87,7 @@ if(!empty($aClean['sSubmit'])) echo "</form>"; /* Download URL editor */ - echo downloadurl::editor($oVersion, "editAppVersion.php"); + echo downloadurl::OutputEditor($oVersion, "editAppVersion.php"); /* only admins can move versions */ if($_SESSION['current']->hasPriv("admin")) Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.5 appdb/include/downloadurl.php:1.6 --- appdb/include/downloadurl.php:1.5 16 Jan 2007 4:25:56 -0000 +++ appdb/include/downloadurl.php 16 Jan 2007 4:25:56 -0000 @@ -57,7 +57,7 @@ class downloadurl } /* Output an editor for Download URL fields */ - function editor($oVersion, $sFormAction) + function OutputEditor($oVersion, $sFormAction) { /* Check for correct permissions */ if(!downloadurl::canEdit($oVersion->iVersionId))

1 0

Paul Vriens : secur32/tests: Fix compilation for older gcc versions ( and MinGW).
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

Module: wine Branch: master Commit: 7ba9ee9e7663373dd641470e6570bad5fbe78bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba9ee9e7663373dd641470e6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Jan 13 16:08:55 2007 +0100 secur32/tests: Fix compilation for older gcc versions (and MinGW). --- dlls/secur32/tests/schannel.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 0bbd96b..b71040a 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -116,11 +116,13 @@ static void testAcquireSecurityContext(v PCCERT_CONTEXT certs[2]; HCRYPTPROV csp; static CHAR unisp_name_a[] = UNISP_NAME_A; - static WCHAR ms_def_prov_w[] = MS_DEF_PROV_W; + WCHAR ms_def_prov_w[MAX_PATH]; BOOL ret; HCRYPTKEY key; CRYPT_KEY_PROV_INFO keyProvInfo; + lstrcpyW(ms_def_prov_w, MS_DEF_PROV_W); + keyProvInfo.pwszContainerName = cspNameW; keyProvInfo.pwszProvName = ms_def_prov_w; keyProvInfo.dwProvType = PROV_RSA_FULL;

1 0

Paul Vriens : mshtml/tests: Fix compilation for older gcc versions ( and MinGW).
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

Module: wine Branch: master Commit: 6651f9ba673ae1047b47f5f2c077a2e03dad3ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=6651f9ba673ae1047b47f5f2c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Jan 13 16:08:11 2007 +0100 mshtml/tests: Fix compilation for older gcc versions (and MinGW). --- dlls/mshtml/tests/htmldoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0815c01..33deb5e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1803,7 +1803,9 @@ static void test_Load(IPersistMoniker *p { IBindCtx *bind; HRESULT hres; - static WCHAR sz_html_clientsite_objectparam[] = SZ_HTML_CLIENTSITE_OBJECTPARAM; + WCHAR sz_html_clientsite_objectparam[MAX_PATH]; + + lstrcpyW(sz_html_clientsite_objectparam, SZ_HTML_CLIENTSITE_OBJECTPARAM); test_readyState((IUnknown*)persist);

1 0

Paul Vriens : crypt32/tests: Fix compilation for older gcc versions ( and MinGW).
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

Module: wine Branch: master Commit: cd3161eb321e5c81bc53e656369dff122d534128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3161eb321e5c81bc53e6563… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Jan 13 16:07:10 2007 +0100 crypt32/tests: Fix compilation for older gcc versions (and MinGW). --- dlls/crypt32/tests/cert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 963de41..345c9f5 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -309,7 +309,6 @@ static void checkHash(const BYTE *data, } static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e','m','p',0 }; -static WCHAR ms_def_prov_w[] = MS_DEF_PROV_W; static void testCertProperties(void) { @@ -1824,6 +1823,9 @@ static void testAcquireCertPrivateKey(vo BOOL callerFree; CRYPT_KEY_PROV_INFO keyProvInfo; HCRYPTKEY key; + WCHAR ms_def_prov_w[MAX_PATH]; + + lstrcpyW(ms_def_prov_w, MS_DEF_PROV_W); keyProvInfo.pwszContainerName = cspNameW; keyProvInfo.pwszProvName = ms_def_prov_w;

1 0

Andrew Talbot : ntdll: Remove unused function.
by Alexandre Julliard Jan. 15, 2007

Jan. 15, 2007

Module: wine Branch: master Commit: 16cb898600f839cb3635f6b8bb8135ec14766845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16cb898600f839cb3635f6b8b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 13 20:34:13 2007 +0000 ntdll: Remove unused function. --- dlls/ntdll/thread.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1037262..dda2ed2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -88,21 +88,6 @@ static inline NTSTATUS init_teb( TEB *te /*********************************************************************** - * free_teb - */ -static inline void free_teb( TEB *teb ) -{ - SIZE_T size = 0; - void *addr = teb; - struct ntdll_thread_regs *thread_regs = (struct ntdll_thread_regs *)teb->SpareBytes1; - - NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); - wine_ldt_free_fs( thread_regs->fs ); - munmap( teb, sigstack_total_size ); -} - - -/*********************************************************************** * fix_unicode_string * * Make sure the unicode string doesn't point beyond the end pointer

1 0