[PATCH 0/3] MR10849: Mix shadow var

[Alistair Leslie-Hughes (＠alesliehughes)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10849

[PATCH 1/3] odbc32: Do not shadow len parameter

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <[e-mail]>

---
 dlls/odbc32/proxyodbc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 2ced00dc3fd..52265afa2d4 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -2967,8 +2967,8 @@ static SQLRETURN get_desc_rec_win32_a( struct descriptor *desc, SQLSMALLINT reco
                                                      subtype, len, precision, scale, nullable );
         if (SUCCESS( ret ))
         {
-            int len = WideCharToMultiByte( CP_ACP, 0, nameW, -1, (char *)name, buflen, NULL, NULL );
-            if (retlen) *retlen = len - 1;
+            int stringlen = WideCharToMultiByte( CP_ACP, 0, nameW, -1, (char *)name, buflen, NULL, NULL );
+            if (retlen) *retlen = stringlen - 1;
         }
         free( nameW );
     }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10849

[PATCH 2/3] windows.devices.enumeration: Do not shadow hr variable

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <[e-mail]>

---
 dlls/windows.devices.enumeration/main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c
index 081260da759..1509313c015 100644
--- a/dlls/windows.devices.enumeration/main.c
+++ b/dlls/windows.devices.enumeration/main.c
@@ -391,7 +391,6 @@ static HRESULT WINAPI device_watcher_Start( IDeviceWatcher *iface )
         const DEVPROP_FILTER_EXPRESSION *filters = NULL;
         ULONG filters_len = 0;
         IWeakReference *weak;
-        HRESULT hr;
 
         if (query_params->expr)
         {
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10849

[PATCH 3/3] odbccp32: Do not shadow hkeydriver variable

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <[e-mail]>

---
 dlls/odbccp32/odbccp32.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c
index f42a9e22c65..c6e4834f9ef 100644
--- a/dlls/odbccp32/odbccp32.c
+++ b/dlls/odbccp32/odbccp32.c
@@ -1798,8 +1798,6 @@ BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver)
     filename[0] = 0;
     if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\ODBC\\ODBCINST.INI\\", &hkey) == ERROR_SUCCESS)
     {
-        HKEY hkeydriver;
-
         if (RegOpenKeyW(hkey, lpszDriver, &hkeydriver) == ERROR_SUCCESS)
         {
             DWORD size = MAX_PATH * sizeof(WCHAR);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10849