Jacek Caban : wineconsole: Rename hSynchro to console.

Alexandre Julliard julliard at winehq.org
Wed Jul 29 15:47:00 CDT 2020


Module: wine
Branch: master
Commit: ad1f09d57424b26bcf463dd45b5b0acb5bd97029
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ad1f09d57424b26bcf463dd45b5b0acb5bd97029

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Jul 29 12:37:28 2020 +0200

wineconsole: Rename hSynchro to console.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/wineconsole/winecon_private.h |  2 +-
 programs/wineconsole/wineconsole.c     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h
index cdf05e9332..d78502a260 100644
--- a/programs/wineconsole/winecon_private.h
+++ b/programs/wineconsole/winecon_private.h
@@ -62,7 +62,7 @@ struct inner_data {
 
     HANDLE		hConIn;		/* console input handle */
     HANDLE		hConOut;	/* screen buffer handle: has to be changed when active sb changes */
-    HANDLE		hSynchro;	/* waitable handle signalled by server when something in server has been modified */
+    HANDLE		console;	/* console renderer handle */
     HANDLE              hProcess;       /* handle to the child process or NULL */
     HWND		hWnd;           /* handle of 'user' window or NULL for 'curses' */
     INT                 nCmdShow;       /* argument of WinMain */
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index 75bb878bfd..7e39ed5e51 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -203,7 +203,7 @@ void	WINECON_GrabChanges(struct inner_data* data)
 
     if (data->in_grab_changes) return;
 
-    if (!GetOverlappedResult(data->hSynchro, &data->overlapped, &num, FALSE))
+    if (!GetOverlappedResult(data->console, &data->overlapped, &num, FALSE))
     {
         if (GetLastError() == ERROR_IO_INCOMPLETE) return;
         ERR( "failed to get renderer events: %u\n", GetLastError() );
@@ -355,7 +355,7 @@ void	WINECON_GrabChanges(struct inner_data* data)
     }
     data->in_grab_changes = FALSE;
 
-    if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, data->events,
+    if (!DeviceIoControl(data->console, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, data->events,
                          sizeof(data->events), NULL, &data->overlapped) && GetLastError() != ERROR_IO_PENDING)
     {
         ERR("failed to get renderer events: %u\n", GetLastError());
@@ -550,7 +550,7 @@ static void WINECON_Delete(struct inner_data* data)
     if (data->fnDeleteBackend)  data->fnDeleteBackend(data);
     if (data->hConIn)		CloseHandle(data->hConIn);
     if (data->hConOut)		CloseHandle(data->hConOut);
-    if (data->hSynchro)		CloseHandle(data->hSynchro);
+    if (data->console)		CloseHandle(data->console);
     if (data->hProcess)         CloseHandle(data->hProcess);
     if (data->overlapped.hEvent) CloseHandle(data->overlapped.hEvent);
     HeapFree(GetProcessHeap(), 0, data->curcfg.registry);
@@ -664,17 +664,17 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna
     }
     SERVER_END_REQ;
     if (!ret) goto error;
-    WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->hSynchro);
+    WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->console);
 
     RtlInitUnicodeString(&string, renderer_pathW);
     attr.ObjectName = &string;
-    status = NtCreateFile(&data->hSynchro, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES
+    status = NtCreateFile(&data->console, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES
                           | FILE_READ_PROPERTIES | SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL,
                           0, FILE_OPEN, FILE_NON_DIRECTORY_FILE,  NULL, 0);
     if (status) goto error;
 
     h = condrv_handle(data->hConIn);
-    if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL))
+    if (!DeviceIoControl(data->console, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL))
         goto error;
 
     SERVER_START_REQ(create_console_output)




More information about the wine-cvs mailing list