From 5e5fc95eb3c4d37689a9180c1fa67acbeb5d1dcb Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Fri, 1 Aug 2025 17:39:53 +0200 Subject: [PATCH] outGUID returns a const string, so making it return const TCHAR * --- od-win32/dinput.cpp | 2 +- od-win32/render.h | 2 +- od-win32/win32gfx.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp index f58a1b33..355c3013 100644 --- a/od-win32/dinput.cpp +++ b/od-win32/dinput.cpp @@ -1168,7 +1168,7 @@ static void rawinputfriendlynames (void) if (SetupDiGetDeviceInstanceId (di, &dd, devpath, sizeof devpath / sizeof(TCHAR), &size)) { DEVINST devinst = dd.DevInst; - TCHAR *cg = outGUID (&guid[ii]); + const TCHAR *cg = outGUID (&guid[ii]); for (;;) { TCHAR devname[MAX_DPATH]; ULONG size2; diff --git a/od-win32/render.h b/od-win32/render.h index d3120f60..ad5c5e63 100644 --- a/od-win32/render.h +++ b/od-win32/render.h @@ -110,6 +110,6 @@ typedef enum } DirectDraw_Mask_e; extern const TCHAR *DXError(HRESULT hr); -extern TCHAR *outGUID (const GUID *guid); +extern const TCHAR *outGUID (const GUID *guid); #endif diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp index 239a4b13..3a37626d 100644 --- a/od-win32/win32gfx.cpp +++ b/od-win32/win32gfx.cpp @@ -4266,7 +4266,7 @@ void releasehdc(int monid, HDC hdc) } } -TCHAR *outGUID(const GUID *guid) +const TCHAR *outGUID(const GUID *guid) { static TCHAR gb[64]; if (guid == NULL) -- 2.47.3