Use CreateEventW in preference to CreateEventA for unnamed events.

This commit is contained in:
Mike McCormack 2005-01-07 15:40:09 +00:00 committed by Alexandre Julliard
parent 1e0aaaf210
commit 4a0f999859
19 changed files with 32 additions and 32 deletions

View File

@ -2073,7 +2073,7 @@ LONG WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree,
hEvent,fAsync); hEvent,fAsync);
if( !fAsync ) if( !fAsync )
hEvent = CreateEventA(NULL, 0, 0, NULL); hEvent = CreateEventW(NULL, 0, 0, NULL);
SERVER_START_REQ( set_registry_notification ) SERVER_START_REQ( set_registry_notification )
{ {

View File

@ -96,8 +96,8 @@ User_DirectDrawSurface_Construct(IDirectDrawSurfaceImpl* This,
#endif #endif
#ifndef SYNC_UPDATE #ifndef SYNC_UPDATE
InitializeCriticalSection(&priv->user.crit); InitializeCriticalSection(&priv->user.crit);
priv->user.refresh_event = CreateEventA(NULL, TRUE, FALSE, NULL); priv->user.refresh_event = CreateEventW(NULL, TRUE, FALSE, NULL);
priv->user.update_event = CreateEventA(NULL, FALSE, FALSE, NULL); priv->user.update_event = CreateEventW(NULL, FALSE, FALSE, NULL);
priv->user.update_thread = CreateThread(NULL, 0, User_update_thread, This, 0, NULL); priv->user.update_thread = CreateThread(NULL, 0, User_update_thread, This, 0, NULL);
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
if (This->ddraw_owner->cooperative_level & DDSCL_FULLSCREEN) { if (This->ddraw_owner->cooperative_level & DDSCL_FULLSCREEN) {

View File

@ -2309,7 +2309,7 @@ static HRESULT WINAPI DP_IF_EnumSessions
lpData->dwTimeout = dwTimeout; lpData->dwTimeout = dwTimeout;
This->dp2->hKillEnumSessionThreadEvent = This->dp2->hKillEnumSessionThreadEvent =
CreateEventA( NULL, TRUE, FALSE, NULL ); CreateEventW( NULL, TRUE, FALSE, NULL );
if( !DuplicateHandle( GetCurrentProcess(), if( !DuplicateHandle( GetCurrentProcess(),
This->dp2->hKillEnumSessionThreadEvent, This->dp2->hKillEnumSessionThreadEvent,
@ -4582,7 +4582,7 @@ static HRESULT WINAPI DP_SendEx
{ {
DWORD dwWaitReturn; DWORD dwWaitReturn;
This->dp2->hReplyEvent = CreateEventA( NULL, FALSE, FALSE, NULL ); This->dp2->hReplyEvent = CreateEventW( NULL, FALSE, FALSE, NULL );
dwWaitReturn = WaitForSingleObject( hReplyEvent, dwTimeout ); dwWaitReturn = WaitForSingleObject( hReplyEvent, dwTimeout );
if( dwWaitReturn != WAIT_OBJECT_0 ) if( dwWaitReturn != WAIT_OBJECT_0 )

View File

@ -166,7 +166,7 @@ static
HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This,
LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, WORD wReplyCommandId ) LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, WORD wReplyCommandId )
{ {
lpReplyStructList->replyExpected.hReceipt = CreateEventA( NULL, FALSE, FALSE, NULL ); lpReplyStructList->replyExpected.hReceipt = CreateEventW( NULL, FALSE, FALSE, NULL );
lpReplyStructList->replyExpected.wExpectedReply = wReplyCommandId; lpReplyStructList->replyExpected.wExpectedReply = wReplyCommandId;
lpReplyStructList->replyExpected.lpReplyMsg = NULL; lpReplyStructList->replyExpected.lpReplyMsg = NULL;
lpReplyStructList->replyExpected.dwMsgBodySize = 0; lpReplyStructList->replyExpected.dwMsgBodySize = 0;

View File

@ -1164,13 +1164,13 @@ BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess,
s_attrib.bInheritHandle = TRUE; s_attrib.bInheritHandle = TRUE;
/* FIXME: Is there a handle leak here? */ /* FIXME: Is there a handle leak here? */
hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL ); hTemp = CreateEventW( &s_attrib, TRUE, FALSE, NULL );
*lphStart = ConvertToGlobalHandle( hTemp ); *lphStart = ConvertToGlobalHandle( hTemp );
hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL ); hTemp = CreateEventW( &s_attrib, TRUE, FALSE, NULL );
*lphDeath = ConvertToGlobalHandle( hTemp ); *lphDeath = ConvertToGlobalHandle( hTemp );
hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL ); hTemp = CreateEventW( &s_attrib, TRUE, FALSE, NULL );
*lphRead = ConvertToGlobalHandle( hTemp ); *lphRead = ConvertToGlobalHandle( hTemp );
if( ( !DuplicateHandle( GetCurrentProcess(), *lphStart, if( ( !DuplicateHandle( GetCurrentProcess(), *lphStart,

View File

@ -2025,7 +2025,7 @@ BOOL WINAPI WaitCommEvent(
return COMM_WaitCommEvent(hFile, lpdwEvents, lpOverlapped); return COMM_WaitCommEvent(hFile, lpdwEvents, lpOverlapped);
/* if there is no overlapped structure, create our own */ /* if there is no overlapped structure, create our own */
ov.hEvent = CreateEventA(NULL,FALSE,FALSE,NULL); ov.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL);
COMM_WaitCommEvent(hFile, lpdwEvents, &ov); COMM_WaitCommEvent(hFile, lpdwEvents, &ov);

View File

@ -440,7 +440,7 @@ HANDLE WINAPI CreateEventW( SECURITY_ATTRIBUTES *sa, BOOL manual_reset,
*/ */
HANDLE WINAPI WIN16_CreateEvent( BOOL manual_reset, BOOL initial_state ) HANDLE WINAPI WIN16_CreateEvent( BOOL manual_reset, BOOL initial_state )
{ {
return CreateEventA( NULL, manual_reset, initial_state, NULL ); return CreateEventW( NULL, manual_reset, initial_state, NULL );
} }
@ -548,7 +548,7 @@ BOOL WINAPI ResetEvent( HANDLE handle )
*/ */
HANDLE WINAPI VWin32_EventCreate(VOID) HANDLE WINAPI VWin32_EventCreate(VOID)
{ {
HANDLE hEvent = CreateEventA( NULL, FALSE, 0, NULL ); HANDLE hEvent = CreateEventW( NULL, FALSE, 0, NULL );
return ConvertToGlobalHandle( hEvent ); return ConvertToGlobalHandle( hEvent );
} }
@ -1301,7 +1301,7 @@ BOOL WINAPI ConnectNamedPipe(HANDLE hPipe, LPOVERLAPPED overlapped)
} }
memset(&ov,0,sizeof(ov)); memset(&ov,0,sizeof(ov));
ov.hEvent = CreateEventA(NULL,0,0,NULL); ov.hEvent = CreateEventW(NULL,0,0,NULL);
if (!ov.hEvent) if (!ov.hEvent)
return FALSE; return FALSE;

View File

@ -147,7 +147,7 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConnection* Connection)
RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL);
HeapFree(GetProcessHeap(), 0, pname); HeapFree(GetProcessHeap(), 0, pname);
memset(&Connection->ovl, 0, sizeof(Connection->ovl)); memset(&Connection->ovl, 0, sizeof(Connection->ovl));
Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) {
WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError());
if (GetLastError() == ERROR_PIPE_CONNECTED) { if (GetLastError() == ERROR_PIPE_CONNECTED) {
@ -171,7 +171,7 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConnection* Connection)
RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL);
HeapFree(GetProcessHeap(), 0, pname); HeapFree(GetProcessHeap(), 0, pname);
memset(&Connection->ovl, 0, sizeof(Connection->ovl)); memset(&Connection->ovl, 0, sizeof(Connection->ovl));
Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) {
WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError());
if (GetLastError() == ERROR_PIPE_CONNECTED) { if (GetLastError() == ERROR_PIPE_CONNECTED) {
@ -223,7 +223,7 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConnection* Connection)
/* pipe is connected; change to message-read mode. */ /* pipe is connected; change to message-read mode. */
dwMode = PIPE_READMODE_MESSAGE; dwMode = PIPE_READMODE_MESSAGE;
SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); SetNamedPipeHandleState(conn, &dwMode, NULL, NULL);
Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
Connection->conn = conn; Connection->conn = conn;
} }
/* protseq=ncacn_np: named pipes */ /* protseq=ncacn_np: named pipes */
@ -257,7 +257,7 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConnection* Connection)
/* pipe is connected; change to message-read mode. */ /* pipe is connected; change to message-read mode. */
dwMode = PIPE_READMODE_MESSAGE; dwMode = PIPE_READMODE_MESSAGE;
SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); SetNamedPipeHandleState(conn, &dwMode, NULL, NULL);
Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
Connection->conn = conn; Connection->conn = conn;
} else { } else {
ERR("protseq %s not supported\n", Connection->Protseq); ERR("protseq %s not supported\n", Connection->Protseq);

View File

@ -542,8 +542,8 @@ static void RPCRT4_start_listen(void)
EnterCriticalSection(&listen_cs); EnterCriticalSection(&listen_cs);
if (! ++listen_count) { if (! ++listen_count) {
if (!mgr_event) mgr_event = CreateEventA(NULL, TRUE, FALSE, NULL); if (!mgr_event) mgr_event = CreateEventW(NULL, TRUE, FALSE, NULL);
if (!server_sem) server_sem = CreateSemaphoreA(NULL, 0, MAX_THREADS, NULL); if (!server_sem) server_sem = CreateSemaphoreW(NULL, 0, MAX_THREADS, NULL);
if (!worker_tls) worker_tls = TlsAlloc(); if (!worker_tls) worker_tls = TlsAlloc();
std_listen = TRUE; std_listen = TRUE;
server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, NULL, 0, NULL); server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, NULL, 0, NULL);

View File

@ -288,7 +288,7 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE pfnThreadProc, VOID *pData,
ti.pfnCallback = pfnCallback; ti.pfnCallback = pfnCallback;
ti.pData = pData; ti.pData = pData;
ti.bInitCom = dwFlags & CTF_COINIT ? TRUE : FALSE; ti.bInitCom = dwFlags & CTF_COINIT ? TRUE : FALSE;
ti.hEvent = CreateEventA(NULL,FALSE,FALSE,NULL); ti.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL);
/* Hold references to the current thread and IE process, if desired */ /* Hold references to the current thread and IE process, if desired */
if(dwFlags & CTF_THREAD_REF) if(dwFlags & CTF_THREAD_REF)

View File

@ -249,7 +249,7 @@ static INT COMM16_WriteFile(HANDLE hComm, LPCVOID buffer, DWORD len)
DWORD count= -1; DWORD count= -1;
ZeroMemory(&ov,sizeof(ov)); ZeroMemory(&ov,sizeof(ov));
ov.hEvent = CreateEventA(NULL,0,0,NULL); ov.hEvent = CreateEventW(NULL,0,0,NULL);
if(ov.hEvent==INVALID_HANDLE_VALUE) if(ov.hEvent==INVALID_HANDLE_VALUE)
return -1; return -1;

View File

@ -725,7 +725,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
DisableThreadLibraryCalls(hinstDLL); DisableThreadLibraryCalls(hinstDLL);
DOSVM_InitSegments(); DOSVM_InitSegments();
event_notifier = CreateEventA(NULL, FALSE, FALSE, NULL); event_notifier = CreateEventW(NULL, FALSE, FALSE, NULL);
if(!event_notifier) if(!event_notifier)
ERR("Failed to create event object!\n"); ERR("Failed to create event object!\n");
} }

View File

@ -590,7 +590,7 @@ void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg )
spc.proc = proc; spc.proc = proc;
spc.arg = arg; spc.arg = arg;
event = CreateEventA(NULL, TRUE, FALSE, NULL); event = CreateEventW(NULL, TRUE, FALSE, NULL);
PostThreadMessageA(loop_tid, WM_USER, (WPARAM)event, (LPARAM)&spc); PostThreadMessageA(loop_tid, WM_USER, (WPARAM)event, (LPARAM)&spc);
WaitForSingleObject(event, INFINITE); WaitForSingleObject(event, INFINITE);
CloseHandle(event); CloseHandle(event);

View File

@ -273,8 +273,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES)
return FALSE; return FALSE;
hQuitEvent = CreateEventA(0, TRUE, FALSE, NULL); hQuitEvent = CreateEventW(0, TRUE, FALSE, NULL);
hWorkEvent = CreateEventA(0, FALSE, FALSE, NULL); hWorkEvent = CreateEventW(0, FALSE, FALSE, NULL);
InitializeCriticalSection(&csQueue); InitializeCriticalSection(&csQueue);
URLCacheContainers_CreateDefaults(); URLCacheContainers_CreateDefaults();

View File

@ -152,7 +152,7 @@ static DWORD MCIAVI_drvOpen(LPSTR str, LPMCI_OPEN_DRIVER_PARMSA modp)
return 0; return 0;
InitializeCriticalSection(&wma->cs); InitializeCriticalSection(&wma->cs);
wma->hStopEvent = CreateEventA(NULL, FALSE, FALSE, NULL); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
wma->wDevID = modp->wDeviceID; wma->wDevID = modp->wDeviceID;
wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0);
modp->wCustomCommandTable = wma->wCommandTable; modp->wCustomCommandTable = wma->wCommandTable;

View File

@ -561,7 +561,7 @@ DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr)
} }
wma->dwCurrAudioBlock = 0; wma->dwCurrAudioBlock = 0;
wma->hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); wma->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
wma->dwEventCount = *nHdr - 1; wma->dwEventCount = *nHdr - 1;
*pWaveHdr = waveHdr; *pWaveHdr = waveHdr;
cleanUp: cleanUp:

View File

@ -809,7 +809,7 @@ static DWORD WAVE_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
whidx = 0; whidx = 0;
left = min(wmw->ckWaveData.cksize, end - wmw->dwPosition); left = min(wmw->ckWaveData.cksize, end - wmw->dwPosition);
wmw->hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); wmw->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
wmw->dwEventCount = 1L; /* for first buffer */ wmw->dwEventCount = 1L; /* for first buffer */
TRACE("Playing (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, left); TRACE("Playing (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, left);
@ -1048,7 +1048,7 @@ static DWORD WAVE_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar
goto cleanUp; goto cleanUp;
} }
wmw->hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); wmw->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
wmw->dwEventCount = 1L; /* for first buffer */ wmw->dwEventCount = 1L; /* for first buffer */
TRACE("Recording (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, end - wmw->dwPosition); TRACE("Recording (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, end - wmw->dwPosition);

View File

@ -2997,7 +2997,7 @@ WSAEVENT WINAPI WSACreateEvent(void)
/* Create a manual-reset event, with initial state: unsignaled */ /* Create a manual-reset event, with initial state: unsignaled */
TRACE("\n"); TRACE("\n");
return CreateEventA(NULL, TRUE, FALSE, NULL); return CreateEventW(NULL, TRUE, FALSE, NULL);
} }
/*********************************************************************** /***********************************************************************

View File

@ -599,9 +599,9 @@ static void do_test( test_setup *test )
DWORD i, n = min (test->general.n_clients, MAX_CLIENTS); DWORD i, n = min (test->general.n_clients, MAX_CLIENTS);
DWORD wait; DWORD wait;
server_ready = CreateEventA ( NULL, TRUE, FALSE, NULL ); server_ready = CreateEventW ( NULL, TRUE, FALSE, NULL );
for (i = 0; i <= n; i++) for (i = 0; i <= n; i++)
client_ready[i] = CreateEventA ( NULL, TRUE, FALSE, NULL ); client_ready[i] = CreateEventW ( NULL, TRUE, FALSE, NULL );
StartServer ( test->srv, &test->general, &test->srv_params ); StartServer ( test->srv, &test->general, &test->srv_params );
StartClients ( test->clt, &test->general, &test->clt_params ); StartClients ( test->clt, &test->general, &test->clt_params );