Use CreateEventW in preference to CreateEventA for unnamed events
Mike McCormack
mike at codeweavers.com
Fri Jan 7 00:31:02 CST 2005
This avoids one extra level of function calls for these cases.
Mike
ChangeLog:
* Use CreateEventW in preference to CreateEventA for unnamed events
-------------- next part --------------
Index: dlls/advapi32/registry.c
===================================================================
RCS file: /home/wine/wine/dlls/advapi32/registry.c,v
retrieving revision 1.69
diff -u -r1.69 registry.c
--- dlls/advapi32/registry.c 23 Dec 2004 18:24:50 -0000 1.69
+++ dlls/advapi32/registry.c 7 Jan 2005 06:26:33 -0000
@@ -2073,7 +2073,7 @@
hEvent,fAsync);
if( !fAsync )
- hEvent = CreateEventA(NULL, 0, 0, NULL);
+ hEvent = CreateEventW(NULL, 0, 0, NULL);
SERVER_START_REQ( set_registry_notification )
{
Index: dlls/ddraw/dsurface/user.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/dsurface/user.c,v
retrieving revision 1.17
diff -u -r1.17 user.c
--- dlls/ddraw/dsurface/user.c 23 Aug 2004 19:39:58 -0000 1.17
+++ dlls/ddraw/dsurface/user.c 7 Jan 2005 06:26:34 -0000
@@ -96,8 +96,8 @@
#endif
#ifndef SYNC_UPDATE
InitializeCriticalSection(&priv->user.crit);
- priv->user.refresh_event = CreateEventA(NULL, TRUE, FALSE, NULL);
- priv->user.update_event = CreateEventA(NULL, FALSE, FALSE, NULL);
+ priv->user.refresh_event = CreateEventW(NULL, TRUE, FALSE, NULL);
+ priv->user.update_event = CreateEventW(NULL, FALSE, FALSE, NULL);
priv->user.update_thread = CreateThread(NULL, 0, User_update_thread, This, 0, NULL);
#ifdef OWN_WINDOW
if (This->ddraw_owner->cooperative_level & DDSCL_FULLSCREEN) {
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.53
diff -u -r1.53 dplay.c
--- dlls/dplayx/dplay.c 23 Dec 2004 18:41:06 -0000 1.53
+++ dlls/dplayx/dplay.c 7 Jan 2005 06:26:36 -0000
@@ -2309,7 +2309,7 @@
lpData->dwTimeout = dwTimeout;
This->dp2->hKillEnumSessionThreadEvent =
- CreateEventA( NULL, TRUE, FALSE, NULL );
+ CreateEventW( NULL, TRUE, FALSE, NULL );
if( !DuplicateHandle( GetCurrentProcess(),
This->dp2->hKillEnumSessionThreadEvent,
@@ -4582,7 +4582,7 @@
{
DWORD dwWaitReturn;
- This->dp2->hReplyEvent = CreateEventA( NULL, FALSE, FALSE, NULL );
+ This->dp2->hReplyEvent = CreateEventW( NULL, FALSE, FALSE, NULL );
dwWaitReturn = WaitForSingleObject( hReplyEvent, dwTimeout );
if( dwWaitReturn != WAIT_OBJECT_0 )
Index: dlls/dplayx/dplayx_messages.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplayx_messages.c,v
retrieving revision 1.15
diff -u -r1.15 dplayx_messages.c
--- dlls/dplayx/dplayx_messages.c 13 Dec 2004 12:01:58 -0000 1.15
+++ dlls/dplayx/dplayx_messages.c 7 Jan 2005 06:26:37 -0000
@@ -166,7 +166,7 @@
HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This,
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.lpReplyMsg = NULL;
lpReplyStructList->replyExpected.dwMsgBodySize = 0;
Index: dlls/dplayx/dplobby.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplobby.c,v
retrieving revision 1.37
diff -u -r1.37 dplobby.c
--- dlls/dplayx/dplobby.c 30 Nov 2004 21:39:00 -0000 1.37
+++ dlls/dplayx/dplobby.c 7 Jan 2005 06:26:37 -0000
@@ -1164,13 +1164,13 @@
s_attrib.bInheritHandle = TRUE;
/* FIXME: Is there a handle leak here? */
- hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
+ hTemp = CreateEventW( &s_attrib, TRUE, FALSE, NULL );
*lphStart = ConvertToGlobalHandle( hTemp );
- hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
+ hTemp = CreateEventW( &s_attrib, TRUE, FALSE, NULL );
*lphDeath = ConvertToGlobalHandle( hTemp );
- hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
+ hTemp = CreateEventW( &s_attrib, TRUE, FALSE, NULL );
*lphRead = ConvertToGlobalHandle( hTemp );
if( ( !DuplicateHandle( GetCurrentProcess(), *lphStart,
Index: dlls/kernel/comm.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/comm.c,v
retrieving revision 1.85
diff -u -r1.85 comm.c
--- dlls/kernel/comm.c 23 Dec 2004 18:48:47 -0000 1.85
+++ dlls/kernel/comm.c 7 Jan 2005 06:26:38 -0000
@@ -2025,7 +2025,7 @@
return COMM_WaitCommEvent(hFile, lpdwEvents, lpOverlapped);
/* 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);
Index: dlls/kernel/sync.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/sync.c,v
retrieving revision 1.66
diff -u -r1.66 sync.c
--- dlls/kernel/sync.c 3 Jan 2005 14:43:15 -0000 1.66
+++ dlls/kernel/sync.c 7 Jan 2005 06:26:38 -0000
@@ -440,7 +440,7 @@
*/
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 @@
*/
HANDLE WINAPI VWin32_EventCreate(VOID)
{
- HANDLE hEvent = CreateEventA( NULL, FALSE, 0, NULL );
+ HANDLE hEvent = CreateEventW( NULL, FALSE, 0, NULL );
return ConvertToGlobalHandle( hEvent );
}
@@ -1301,7 +1301,7 @@
}
memset(&ov,0,sizeof(ov));
- ov.hEvent = CreateEventA(NULL,0,0,NULL);
+ ov.hEvent = CreateEventW(NULL,0,0,NULL);
if (!ov.hEvent)
return FALSE;
Index: dlls/rpcrt4/rpc_binding.c
===================================================================
RCS file: /home/wine/wine/dlls/rpcrt4/rpc_binding.c,v
retrieving revision 1.30
diff -u -r1.30 rpc_binding.c
--- dlls/rpcrt4/rpc_binding.c 23 Dec 2004 17:12:07 -0000 1.30
+++ dlls/rpcrt4/rpc_binding.c 7 Jan 2005 06:26:39 -0000
@@ -147,7 +147,7 @@
RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL);
HeapFree(GetProcessHeap(), 0, pname);
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)) {
WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError());
if (GetLastError() == ERROR_PIPE_CONNECTED) {
@@ -171,7 +171,7 @@
RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL);
HeapFree(GetProcessHeap(), 0, pname);
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)) {
WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError());
if (GetLastError() == ERROR_PIPE_CONNECTED) {
@@ -223,7 +223,7 @@
/* pipe is connected; change to message-read mode. */
dwMode = PIPE_READMODE_MESSAGE;
SetNamedPipeHandleState(conn, &dwMode, NULL, NULL);
- Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
+ Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
Connection->conn = conn;
}
/* protseq=ncacn_np: named pipes */
@@ -257,7 +257,7 @@
/* pipe is connected; change to message-read mode. */
dwMode = PIPE_READMODE_MESSAGE;
SetNamedPipeHandleState(conn, &dwMode, NULL, NULL);
- Connection->ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
+ Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
Connection->conn = conn;
} else {
ERR("protseq %s not supported\n", Connection->Protseq);
Index: dlls/rpcrt4/rpc_server.c
===================================================================
RCS file: /home/wine/wine/dlls/rpcrt4/rpc_server.c,v
retrieving revision 1.34
diff -u -r1.34 rpc_server.c
--- dlls/rpcrt4/rpc_server.c 23 Dec 2004 17:12:07 -0000 1.34
+++ dlls/rpcrt4/rpc_server.c 7 Jan 2005 06:26:39 -0000
@@ -542,8 +542,8 @@
EnterCriticalSection(&listen_cs);
if (! ++listen_count) {
- if (!mgr_event) mgr_event = CreateEventA(NULL, TRUE, FALSE, NULL);
- if (!server_sem) server_sem = CreateSemaphoreA(NULL, 0, MAX_THREADS, NULL);
+ if (!mgr_event) mgr_event = CreateEventW(NULL, TRUE, FALSE, NULL);
+ if (!server_sem) server_sem = CreateSemaphoreW(NULL, 0, MAX_THREADS, NULL);
if (!worker_tls) worker_tls = TlsAlloc();
std_listen = TRUE;
server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, NULL, 0, NULL);
Index: dlls/shlwapi/thread.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/thread.c,v
retrieving revision 1.17
diff -u -r1.17 thread.c
--- dlls/shlwapi/thread.c 7 Oct 2004 03:06:48 -0000 1.17
+++ dlls/shlwapi/thread.c 7 Jan 2005 06:26:39 -0000
@@ -288,7 +288,7 @@
ti.pfnCallback = pfnCallback;
ti.pData = pData;
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 */
if(dwFlags & CTF_THREAD_REF)
Index: dlls/user/comm16.c
===================================================================
RCS file: /home/wine/wine/dlls/user/comm16.c,v
retrieving revision 1.24
diff -u -r1.24 comm16.c
--- dlls/user/comm16.c 20 Dec 2004 19:02:40 -0000 1.24
+++ dlls/user/comm16.c 7 Jan 2005 06:26:40 -0000
@@ -249,7 +249,7 @@
DWORD count= -1;
ZeroMemory(&ov,sizeof(ov));
- ov.hEvent = CreateEventA(NULL,0,0,NULL);
+ ov.hEvent = CreateEventW(NULL,0,0,NULL);
if(ov.hEvent==INVALID_HANDLE_VALUE)
return -1;
Index: dlls/winedos/dosvm.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/dosvm.c,v
retrieving revision 1.60
diff -u -r1.60 dosvm.c
--- dlls/winedos/dosvm.c 3 Jan 2005 20:04:54 -0000 1.60
+++ dlls/winedos/dosvm.c 7 Jan 2005 06:26:41 -0000
@@ -725,7 +725,7 @@
DisableThreadLibraryCalls(hinstDLL);
DOSVM_InitSegments();
- event_notifier = CreateEventA(NULL, FALSE, FALSE, NULL);
+ event_notifier = CreateEventW(NULL, FALSE, FALSE, NULL);
if(!event_notifier)
ERR("Failed to create event object!\n");
}
Index: dlls/winedos/module.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/module.c,v
retrieving revision 1.45
diff -u -r1.45 module.c
--- dlls/winedos/module.c 18 Oct 2004 21:19:57 -0000 1.45
+++ dlls/winedos/module.c 7 Jan 2005 06:26:41 -0000
@@ -590,7 +590,7 @@
spc.proc = proc;
spc.arg = arg;
- event = CreateEventA(NULL, TRUE, FALSE, NULL);
+ event = CreateEventW(NULL, TRUE, FALSE, NULL);
PostThreadMessageA(loop_tid, WM_USER, (WPARAM)event, (LPARAM)&spc);
WaitForSingleObject(event, INFINITE);
CloseHandle(event);
Index: dlls/wininet/internet.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/internet.c,v
retrieving revision 1.109
diff -u -r1.109 internet.c
--- dlls/wininet/internet.c 4 Jan 2005 20:38:53 -0000 1.109
+++ dlls/wininet/internet.c 7 Jan 2005 06:26:41 -0000
@@ -273,8 +273,8 @@
if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES)
return FALSE;
- hQuitEvent = CreateEventA(0, TRUE, FALSE, NULL);
- hWorkEvent = CreateEventA(0, FALSE, FALSE, NULL);
+ hQuitEvent = CreateEventW(0, TRUE, FALSE, NULL);
+ hWorkEvent = CreateEventW(0, FALSE, FALSE, NULL);
InitializeCriticalSection(&csQueue);
URLCacheContainers_CreateDefaults();
Index: dlls/winmm/mciavi/mciavi.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciavi/mciavi.c,v
retrieving revision 1.28
diff -u -r1.28 mciavi.c
--- dlls/winmm/mciavi/mciavi.c 23 Dec 2004 20:31:56 -0000 1.28
+++ dlls/winmm/mciavi/mciavi.c 7 Jan 2005 06:26:41 -0000
@@ -152,7 +152,7 @@
return 0;
InitializeCriticalSection(&wma->cs);
- wma->hStopEvent = CreateEventA(NULL, FALSE, FALSE, NULL);
+ wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
wma->wDevID = modp->wDeviceID;
wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0);
modp->wCustomCommandTable = wma->wCommandTable;
Index: dlls/winmm/mciavi/mmoutput.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciavi/mmoutput.c,v
retrieving revision 1.16
diff -u -r1.16 mmoutput.c
--- dlls/winmm/mciavi/mmoutput.c 9 Aug 2004 18:47:37 -0000 1.16
+++ dlls/winmm/mciavi/mmoutput.c 7 Jan 2005 06:26:42 -0000
@@ -561,7 +561,7 @@
}
wma->dwCurrAudioBlock = 0;
- wma->hEvent = CreateEventA(NULL, FALSE, FALSE, NULL);
+ wma->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
wma->dwEventCount = *nHdr - 1;
*pWaveHdr = waveHdr;
cleanUp:
Index: dlls/winmm/mciwave/mciwave.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciwave/mciwave.c,v
retrieving revision 1.32
diff -u -r1.32 mciwave.c
--- dlls/winmm/mciwave/mciwave.c 23 Dec 2004 20:31:56 -0000 1.32
+++ dlls/winmm/mciwave/mciwave.c 7 Jan 2005 06:26:42 -0000
@@ -809,7 +809,7 @@
whidx = 0;
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 */
TRACE("Playing (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, left);
@@ -1048,7 +1048,7 @@
goto cleanUp;
}
- wmw->hEvent = CreateEventA(NULL, FALSE, FALSE, NULL);
+ wmw->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
wmw->dwEventCount = 1L; /* for first buffer */
TRACE("Recording (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, end - wmw->dwPosition);
Index: dlls/winsock/socket.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.169
diff -u -r1.169 socket.c
--- dlls/winsock/socket.c 23 Dec 2004 20:31:56 -0000 1.169
+++ dlls/winsock/socket.c 7 Jan 2005 06:26:43 -0000
@@ -2997,7 +2997,7 @@
/* Create a manual-reset event, with initial state: unsignaled */
TRACE("\n");
- return CreateEventA(NULL, TRUE, FALSE, NULL);
+ return CreateEventW(NULL, TRUE, FALSE, NULL);
}
/***********************************************************************
Index: dlls/winsock/tests/sock.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/tests/sock.c,v
retrieving revision 1.16
diff -u -r1.16 sock.c
--- dlls/winsock/tests/sock.c 4 Nov 2004 21:05:48 -0000 1.16
+++ dlls/winsock/tests/sock.c 7 Jan 2005 06:26:43 -0000
@@ -599,9 +599,9 @@
DWORD i, n = min (test->general.n_clients, MAX_CLIENTS);
DWORD wait;
- server_ready = CreateEventA ( NULL, TRUE, FALSE, NULL );
+ server_ready = CreateEventW ( NULL, TRUE, FALSE, NULL );
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 );
StartClients ( test->clt, &test->general, &test->clt_params );
More information about the wine-patches
mailing list