mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 5da3827d863ae43f8367cdafbeba73cec7cdee3d.
This commit is contained in:
parent
eb5a19f4fd
commit
22d9eec489
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -1 +1 @@
|
||||
272f712b605174e946da1dc65f927a23ee92a572
|
||||
5da3827d863ae43f8367cdafbeba73cec7cdee3d
|
||||
|
Loading…
Reference in New Issue
Block a user