setupapi: Turn several constants and variables into static constants.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

setupapi: Turn several constants and variables into static constants.
837b4aa4 · Alex Henrie · Alexandre Julliard · 63924319 · 837b4aa4 · 837b4aa4
Commit 837b4aa4 authored Nov 30, 2018 by Alex Henrie Committed by Alexandre Julliard Nov 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

devinst.c dlls/setupapi/devinst.c +3 -3

install.c dlls/setupapi/install.c +1 -1

No files found.
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -259,7 +259,7 @@ static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr)

 static WCHAR *get_iface_key_path(struct device_iface *iface)
 {
-    const WCHAR slashW[] = {'\\',0};
+    static const WCHAR slashW[] = {'\\',0};
    WCHAR *path, *ptr;
    size_t len = strlenW(DeviceClasses) + 1 + 38 + 1 + strlenW(iface->symlink);

@@ -286,8 +286,8 @@ static WCHAR *get_iface_key_path(struct device_iface *iface)

 static WCHAR *get_refstr_key_path(struct device_iface *iface)
 {
-    const WCHAR hashW[] = {'#',0};
-    const WCHAR slashW[] = {'\\',0};
+    static const WCHAR hashW[] = {'#',0};
+    static const WCHAR slashW[] = {'\\',0};
    WCHAR *path, *ptr;
    size_t len = strlenW(DeviceClasses) + 1 + 38 + 1 + strlenW(iface->symlink) + 1 + 1;


--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -1598,7 +1598,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer,
    }
    else
    {
-        WCHAR infdir[] = {'\\','i','n','f',0 };
+        static const WCHAR infdir[] = {'\\','i','n','f',0};
        DWORD msize;
        dir_len = GetWindowsDirectoryW( NULL, 0 );
        msize = ( 7 + 4 + dir_len ) * sizeof( WCHAR );