January 2007 - Wine-commits

Alexandre Julliard : ntdll: Implementation of inter-process VirtualQueryEx.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 3d002395868c38d8c7d2a3207cc037ac135d729b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d002395868c38d8c7d2a3207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 15 22:28:42 2007 +0100 ntdll: Implementation of inter-process VirtualQueryEx. --- dlls/kernel32/tests/virtual.c | 41 +++++++++++++++------------------------ dlls/ntdll/sync.c | 20 +++++++++++++++++++ dlls/ntdll/virtual.c | 25 +++++++++++++++++++++-- include/wine/server_protocol.h | 22 +++++++++++++++++++- server/protocol.def | 20 ++++++++++++++++++- server/thread.c | 5 +++- server/trace.c | 11 ++++++++++ 7 files changed, 112 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d002395868c38d8c7d2a…

1 0

Alexandre Julliard : ntdll: Implementation of inter-process VirtualProtectEx.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 1ea968016f1eaa9fada60a328e6f310fa0d5d7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea968016f1eaa9fada60a328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 15 22:30:04 2007 +0100 ntdll: Implementation of inter-process VirtualProtectEx. --- dlls/kernel32/tests/virtual.c | 16 ++++++---------- dlls/ntdll/sync.c | 10 ++++++++++ dlls/ntdll/virtual.c | 21 ++++++++++++++++++--- include/wine/server_protocol.h | 20 ++++++++++++++++++-- server/protocol.def | 18 +++++++++++++++++- server/thread.c | 1 + server/trace.c | 11 +++++++++++ 7 files changed, 81 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 3c64a06..d19818c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -118,7 +118,7 @@ static void test_VirtualAllocEx(void) SetLastError(0xdeadbeef); ok(!VirtualProtectEx(hProcess, addr1, 0xFFFC, PAGE_READONLY, &old_prot), "VirtualProtectEx should fail on a not committed memory\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ || + ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ || GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */ "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); @@ -141,21 +141,17 @@ static void test_VirtualAllocEx(void) SetLastError(0xdeadbeef); ok(!VirtualProtectEx(hProcess, addr1, 0xFFFC, PAGE_READONLY, &old_prot), "VirtualProtectEx should fail on a not committed memory\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ || + ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ || 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); + ok(VirtualProtectEx(hProcess, addr1, 0x1000, PAGE_READONLY, &old_prot), "VirtualProtectEx failed\n"); + 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, - "wrong old protection: got %04x instead of PAGE_READONLY\n", old_prot); + ok(VirtualProtectEx(hProcess, addr1, 0x1000, PAGE_READWRITE, &old_prot), "VirtualProtectEx failed\n"); + ok(old_prot == PAGE_READONLY, "wrong old protection: got %04x instead of PAGE_READONLY\n", old_prot); ok(!VirtualFreeEx(hProcess, addr1, 0x10000, 0), "VirtualFreeEx should fail with type 0\n"); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index e0eb2d4..8cfd1e5 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -746,6 +746,16 @@ static BOOL call_apcs( BOOL alertable ) } break; } + case APC_VIRTUAL_PROTECT: + result.type = call.type; + result.virtual_protect.addr = call.virtual_protect.addr; + result.virtual_protect.size = call.virtual_protect.size; + result.virtual_protect.status = NtProtectVirtualMemory( NtCurrentProcess(), + &result.virtual_protect.addr, + &result.virtual_protect.size, + call.virtual_protect.prot, + &result.virtual_protect.prot ); + 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 0407a21..57cbb20 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1597,10 +1597,25 @@ NTSTATUS WINAPI NtProtectVirtualMemory( TRACE("%p %p %08lx %08x\n", process, addr, size, new_prot ); - 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_protect.type = APC_VIRTUAL_PROTECT; + call.virtual_protect.addr = addr; + call.virtual_protect.size = size; + call.virtual_protect.prot = new_prot; + status = NTDLL_queue_process_apc( process, &call, &result ); + if (status != STATUS_SUCCESS) return status; + + if (result.virtual_protect.status == STATUS_SUCCESS) + { + *addr_ptr = result.virtual_protect.addr; + *size_ptr = result.virtual_protect.size; + if (old_prot) *old_prot = result.virtual_protect.prot; + } + return result.virtual_protect.status; } /* Fix the parameters */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 60715ff..890dabd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -217,7 +217,8 @@ enum apc_type APC_ASYNC_IO, APC_VIRTUAL_ALLOC, APC_VIRTUAL_FREE, - APC_VIRTUAL_QUERY + APC_VIRTUAL_QUERY, + APC_VIRTUAL_PROTECT }; typedef union @@ -265,6 +266,13 @@ typedef union enum apc_type type; const void *addr; } virtual_query; + struct + { + enum apc_type type; + void *addr; + unsigned long size; + unsigned int prot; + } virtual_protect; } apc_call_t; typedef union @@ -296,6 +304,14 @@ typedef union unsigned int alloc_prot; unsigned int alloc_type; } virtual_query; + struct + { + enum apc_type type; + unsigned int status; + void *addr; + unsigned long size; + unsigned int prot; + } virtual_protect; } apc_result_t; @@ -4517,6 +4533,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 267 +#define SERVER_PROTOCOL_VERSION 268 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index b24e275..8c40e10 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -233,7 +233,8 @@ enum apc_type APC_ASYNC_IO, APC_VIRTUAL_ALLOC, APC_VIRTUAL_FREE, - APC_VIRTUAL_QUERY + APC_VIRTUAL_QUERY, + APC_VIRTUAL_PROTECT }; typedef union @@ -281,6 +282,13 @@ typedef union enum apc_type type; /* APC_VIRTUAL_QUERY */ const void *addr; /* requested address */ } virtual_query; + struct + { + enum apc_type type; /* APC_VIRTUAL_PROTECT */ + void *addr; /* requested address */ + unsigned long size; /* requested address */ + unsigned int prot; /* new protection flags */ + } virtual_protect; } apc_call_t; typedef union @@ -312,6 +320,14 @@ typedef union unsigned int alloc_prot;/* resulting allocation protection */ unsigned int alloc_type;/* resulting region allocation type */ } virtual_query; + struct + { + enum apc_type type; /* APC_VIRTUAL_PROTECT */ + unsigned int status; /* status returned by call */ + void *addr; /* resulting address */ + unsigned long size; /* resulting size */ + unsigned int prot; /* old protection flags */ + } virtual_protect; } apc_result_t; /****************************************************************/ diff --git a/server/thread.c b/server/thread.c index 62bd559..35484a4 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1157,6 +1157,7 @@ DECL_HANDLER(queue_apc) case APC_VIRTUAL_ALLOC: case APC_VIRTUAL_FREE: case APC_VIRTUAL_QUERY: + case APC_VIRTUAL_PROTECT: access = (apc->call.type == APC_VIRTUAL_QUERY) ? PROCESS_QUERY_INFORMATION : PROCESS_VM_OPERATION; if ((process = get_process_from_handle( req->process, access ))) { diff --git a/server/trace.c b/server/trace.c index 2b9ee8c..b878c02 100644 --- a/server/trace.c +++ b/server/trace.c @@ -133,6 +133,11 @@ static void dump_apc_call( const apc_cal case APC_VIRTUAL_QUERY: fprintf( stderr, "APC_VIRTUAL_QUERY,addr=%p", call->virtual_query.addr ); break; + case APC_VIRTUAL_PROTECT: + fprintf( stderr, "APC_VIRTUAL_PROTECT,addr=%p,size=%lu,prot=%x", + call->virtual_protect.addr, call->virtual_protect.size, + call->virtual_protect.prot ); + break; default: fprintf( stderr, "type=%u", call->type ); break; @@ -165,6 +170,12 @@ static void dump_apc_result( const apc_r result->virtual_query.prot, result->virtual_query.alloc_prot, result->virtual_query.alloc_type ); break; + case APC_VIRTUAL_PROTECT: + fprintf( stderr, "APC_VIRTUAL_PROTECT,status=%s,addr=%p,size=%lu,prot=%x", + get_status_name( result->virtual_protect.status ), + result->virtual_protect.addr, result->virtual_protect.size, + result->virtual_protect.prot ); + break; default: fprintf( stderr, "type=%u", result->type ); break;

1 0

Alexandre Julliard : kernel32: Use the proper codepage for console functions.
by Alexandre Julliard 16 Jan '07

16 Jan '07

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

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

16 Jan '07

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 : server: Added mechanism for returning results of APC calls.
by Alexandre Julliard 16 Jan '07

16 Jan '07

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

appdb/ admin/editAppVersion.php include/downlo ...
by WineHQ 16 Jan '07

16 Jan '07

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 : crypt32/tests: Fix compilation for older gcc versions ( and MinGW).
by Alexandre Julliard 15 Jan '07

15 Jan '07

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

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

15 Jan '07

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 : secur32/tests: Fix compilation for older gcc versions ( and MinGW).
by Alexandre Julliard 15 Jan '07

15 Jan '07

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

Andrew Talbot : msvcrt: Declare some items static.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 338100c2556438a741acdcef5654c58f00355c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=338100c2556438a741acdcef5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 13 20:31:01 2007 +0000 msvcrt: Declare some items static. --- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/exit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 07cc61a..76bcb04 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -412,7 +412,7 @@ static BOOL WINAPI msvcrt_console_handle typedef void (*float_handler)(int, int); /* The exception codes are actually NTSTATUS values */ -struct +static const struct { NTSTATUS status; int signal; diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index fecbf10..a5d5283 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -41,7 +41,7 @@ extern char *MSVCRT__pgmptr; void (*_aexit_rtn)(int) = MSVCRT__exit; /* INTERNAL: call atexit functions */ -void __MSVCRT__call_atexit(void) +static void __MSVCRT__call_atexit(void) { /* Note: should only be called with the exit lock held */ TRACE("%d atext functions to call\n", MSVCRT_atexit_registered);

1 0