From 22d9eec489d0e0020e41e965bf96871e35f51584 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 21 Jun 2023 08:23:37 +1000 Subject: [PATCH] Rebase against 5da3827d863ae43f8367cdafbeba73cec7cdee3d. --- .../0001-winecfg-Add-staging-tab-for-CSMT.patch | 6 +++--- ...necfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch | 2 +- ...winecfg-Add-checkbox-to-enable-disable-EAX-support.patch | 2 +- ...necfg-Add-checkbox-to-enable-disable-HideWineExpor.patch | 2 +- ...-winecfg-Add-option-to-enable-disable-GTK3-theming.patch | 2 +- ...necfg-Move-input-config-options-to-a-dedicated-tab.patch | 4 ++-- staging/upstream-commit | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch b/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch index 9454b3fa..fee072ab 100644 --- a/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch +++ b/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch @@ -45,8 +45,8 @@ index 77b732d6819..b467a6f1c8f 100644 + psp[pg].dwSize = sizeof (PROPSHEETPAGEW); + psp[pg].dwFlags = PSP_USETITLE; + psp[pg].hInstance = hInstance; -+ psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_STAGING); -+ psp[pg].u2.pszIcon = NULL; ++ psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_STAGING); ++ psp[pg].pszIcon = NULL; + psp[pg].pfnDlgProc = StagingDlgProc; + psp[pg].pszTitle = load_string (IDS_TAB_STAGING); + psp[pg].lParam = 0; @@ -127,7 +127,7 @@ index 00000000000..a2a2117a56d +{ + WCHAR *buf = get_reg_key(config_key, L"Direct3D", L"csmt", NULL); + BOOL ret = buf ? !!*buf : TRUE; -+ HeapFree(GetProcessHeap(), 0, buf); ++ free(buf); + return ret; +} +static void csmt_set(BOOL status) diff --git a/patches/winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch b/patches/winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch index d19f1499..89b78469 100644 --- a/patches/winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch +++ b/patches/winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch @@ -37,7 +37,7 @@ index a2a2117a56d..3ba1e618bb3 100644 + BOOL ret; + WCHAR *value = get_reg_key(config_key, keypath(L"DXVA2"), L"backend", NULL); + ret = (value && !wcscmp(value, L"va")); -+ HeapFree(GetProcessHeap(), 0, value); ++ free(value); + return ret; +} +static void vaapi_set(BOOL status) diff --git a/patches/winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch b/patches/winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch index f2bbe9fe..06755e09 100644 --- a/patches/winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch +++ b/patches/winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch @@ -37,7 +37,7 @@ index 3ba1e618bb3..5742187a9ff 100644 + BOOL ret; + WCHAR *value = get_reg_key(config_key, keypath(L"DirectSound"), L"EAXEnabled", L"N"); + ret = IS_OPTION_TRUE(*value); -+ HeapFree(GetProcessHeap(), 0, value); ++ free(value); + return ret; +} +static void eax_set(BOOL status) diff --git a/patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch b/patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch index 421dc2b7..c3e7d118 100644 --- a/patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch +++ b/patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch @@ -38,7 +38,7 @@ index 5742187a9ff..13d0fa2ecb0 100644 + BOOL ret; + WCHAR *value = get_reg_key(config_key, keypath(L""), L"HideWineExports", L"N"); + ret = IS_OPTION_TRUE(*value); -+ HeapFree(GetProcessHeap(), 0, value); ++ free(value); + return ret; +} +static void hidewine_set(BOOL status) diff --git a/patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch b/patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch index e4d85ca8..909deb01 100644 --- a/patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch +++ b/patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch @@ -37,7 +37,7 @@ index 13d0fa2ecb0..56dbda33cc9 100644 + BOOL ret; + WCHAR *value = get_reg_key(config_key, keypath(L""), L"ThemeEngine", NULL); + ret = (value && !wcsicmp(value, L"GTK")); -+ HeapFree(GetProcessHeap(), 0, value); ++ free(value); + return ret; +} +static void gtk3_set(BOOL status) diff --git a/patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch b/patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch index f2282698..fd652403 100644 --- a/patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch +++ b/patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch @@ -172,8 +172,8 @@ index e2429c0c047..2ce3020db50 100644 + psp[pg].dwSize = sizeof (PROPSHEETPAGEW); + psp[pg].dwFlags = PSP_USETITLE; + psp[pg].hInstance = hInstance; -+ psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_INPUT_CONFIG); -+ psp[pg].u2.pszIcon = NULL; ++ psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_INPUT_CONFIG); ++ psp[pg].pszIcon = NULL; + psp[pg].pfnDlgProc = InputDlgProc; + psp[pg].pszTitle = load_string (IDS_TAB_INPUT); + psp[pg].lParam = 0; diff --git a/staging/upstream-commit b/staging/upstream-commit index 48a112ce..de37599d 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -272f712b605174e946da1dc65f927a23ee92a572 +5da3827d863ae43f8367cdafbeba73cec7cdee3d