Skip to content

W
wine-cw
Commit 5fd5f384 authored by Robert van Herk's avatar Robert van Herk Committed by Alexandre Julliard
Browse files
Options

Added a tabsheet that allows the user to change the dll overrides,

both globally and per app.
parent 640cc3f3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 70 deletions
programs/winecfg/En.rc
View file @ 5fd5f384
......@@ -96,15 +96,18 @@ IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250
STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Sans Serif"
BEGIN
GROUPBOX "Static",IDC_STATIC,8,4,244,157
CONTROL "Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,59,144,57,10
CONTROL "Native (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,121,144,72,10
LTEXT "Libraries can be specified individually to be either builtin or native. A DLL entry specified as ""*"" pertains to all DLLs not specified explicitly.",
IDC_STATIC,15,17,228,27
CONTROL "List3",IDC_LIST_DLLS,"SysListView32",LVS_LIST |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER |
WS_TABSTOP,15,47,227,90
LTEXT "Load order:",IDC_STATIC,16,144,37,8
GROUPBOX "DLL Overrides",IDC_STATIC,8,4,244,240
LTEXT "Libraries can be specified individually to be either builtin or native. A DLL entry specified as ""*"" pertains to all DLLs not specified explicitly.\n\nBe careful, wrong settings here have the potential to pretty much kill your setup."
, IDC_STATIC,15,17,228,47
CONTROL "DLL Overrides", IDC_TREE_DLLS, "SysTreeView32", WS_TABSTOP | TVS_LINESATROOT | TVS_HASLINES | TVS_SHOWSELALWAYS | TVS_HASBUTTONS, 15,65,142,172
LTEXT "Load order:",IDC_STATIC,163,65,37,8
CONTROL "Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,163,80,57,10
CONTROL "Native (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,163,95,72,10
PUSHBUTTON "Add application...",IDC_DLLS_ADDAPP,163,114,82,14
PUSHBUTTON "Remove application",IDC_DLLS_REMOVEAPP, 163,134,82,14
PUSHBUTTON "Add DLL override for:",IDC_DLLS_ADDDLL, 163,154,82,14
COMBOBOX IDC_DLLLIST,163,174,82,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE
PUSHBUTTON "Remove DLL override",IDC_DLLS_REMOVEDLL,163,194,82,14
END
IDD_SYSTEMCFG DIALOG DISCARDABLE 0, 0, 260, 250
......
programs/winecfg/Es.rc
View file @ 5fd5f384
......@@ -84,15 +84,6 @@ IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250
STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Sans Serif"
BEGIN
GROUPBOX "Esttico",IDC_STATIC,8,4,244,157
CONTROL "Integrado (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,59,144,57,10
CONTROL "Nativo (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,121,144,72,10
LTEXT "Las libreras pueden especificarse individualmente para ser integradas o nativas. Una entrada de DLL especificada como ""*"" se refiere a todas las DLL no especificadas explcitamente.",
IDC_STATIC,15,17,228,27
CONTROL "List3",IDC_LIST_DLLS,"SysListView32",LVS_LIST |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER |
WS_TABSTOP,15,47,227,90
LTEXT "Orden de carga:",IDC_STATIC,16,144,37,8
END
IDD_SYSTEMCFG DIALOG DISCARDABLE 0, 0, 260, 250
......
programs/winecfg/Makefile.in
View file @ 5fd5f384
......@@ -4,11 +4,12 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winecfg.exe
APPMODE = gui
IMPORTS = comctl32 user32 advapi32
IMPORTS = comdlg32 comctl32 user32 advapi32
C_SRCS = \
appdefaults.c \
drive.c \
libraries.c \
main.c \
properties.c \
winecfg.c \
......
programs/winecfg/Pt.rc
View file @ 5fd5f384
......@@ -40,7 +40,6 @@ BEGIN
GROUPBOX "Comportamento padro",IDC_STATIC,8,115,244,97
LTEXT "Wine providencia a aplicaes Windows, a habilidade de se parecer a vrias verses e estilos de Windows",
IDC_STATIC,15,128,227,20
GROUPBOX "Informao",IDC_STATIC,8,4,244,106
CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.",
IDC_STATIC,119,44,124,59
END
......@@ -93,15 +92,6 @@ IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250
STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Sans Serif"
BEGIN
GROUPBOX "Esttico",IDC_STATIC,8,4,244,157
CONTROL "Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,59,144,57,10
CONTROL "Native (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,121,144,72,10
LTEXT "Bibliotecas podem ser especificadas individualmente a ser builtin ou native. Uma entrada de DLL especificada como ""*"" define todas as DLLs no especificadas explicitamente.",
IDC_STATIC,15,17,228,27
CONTROL "List3",IDC_LIST_DLLS,"SysListView32",LVS_LIST |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER |
WS_TABSTOP,15,47,227,90
LTEXT "Ordem de carga:",IDC_STATIC,16,144,37,8
END
......
programs/winecfg/Ru.rc
View file @ 5fd5f384
......@@ -97,15 +97,6 @@ IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250
STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Sans Serif"
BEGIN
GROUPBOX "",IDC_STATIC,8,4,244,157
CONTROL " (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,59,144,57,10
CONTROL " (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,121,144,72,10
LTEXT " . ""*"" .",
IDC_STATIC,15,17,228,27
CONTROL "List3",IDC_LIST_DLLS,"SysListView32",LVS_LIST |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER |
WS_TABSTOP,15,47,227,90
LTEXT " :",IDC_STATIC,16,144,37,8
END
IDD_SYSTEMCFG DIALOG DISCARDABLE 0, 0, 260, 250
......
programs/winecfg/Si.rc
View file @ 5fd5f384
......@@ -88,15 +88,6 @@ IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250
STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Sans Serif"
BEGIN
GROUPBOX "Static",IDC_STATIC,8,4,244,157
CONTROL "Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,59,144,57,10
CONTROL "Native (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,121,144,72,10
LTEXT "Libraries can be specified individually to be either builtin or native. A DLL entry specified as ""*"" pertains to all DLLs not specified explicitly.",
IDC_STATIC,15,17,228,27
CONTROL "List3",IDC_LIST_DLLS,"SysListView32",LVS_LIST |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER |
WS_TABSTOP,15,47,227,90
LTEXT "Load order:",IDC_STATIC,16,144,37,8
END
STRINGTABLE DISCARDABLE
......
programs/winecfg/main.c
View file @ 5fd5f384
......@@ -177,22 +177,6 @@ GeneralDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
return FALSE;
}
INT_PTR CALLBACK
DllDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
case WM_COMMAND:
break;
default:
break;
}
return FALSE;
}
#define NUM_PROPERTY_PAGES 5
INT_PTR
doPropertySheet (HINSTANCE hInstance, HWND hOwner)
......@@ -235,7 +219,7 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
psp[2].hInstance = hInstance;
psp[2].u.pszTemplate = MAKEINTRESOURCE (IDD_DLLCFG);
psp[2].u2.pszIcon = NULL;
psp[2].pfnDlgProc = DllDlgProc;
psp[2].pfnDlgProc = LibrariesDlgProc;
psp[2].pszTitle = "Libraries";
psp[2].lParam = 0;
......
programs/winecfg/resource.h
View file @ 5fd5f384
......@@ -54,9 +54,12 @@
#define IDC_XSHM 1028
#define IDC_RAD_BUILTIN 1029
#define IDC_RAD_NATIVE 1030
#define IDC_LIST_DLLS 1031
#define IDC_LIST_BUILTIN_DLLS 1031
#define IDC_LIST_NATIVE_DLLS 1032
#define IDC_TREE_DLLS 1031
#define IDC_DLLS_ADDAPP 8000
#define IDC_DLLS_ADDDLL 8001
#define IDC_DLLS_REMOVEAPP 8002
#define IDC_DLLS_REMOVEDLL 8003
#define IDC_DLLLIST 8004
#define IDC_RADIO_DEFAULT_BUILTIN 1033
#define IDC_RADIO_DEFAULT_NATIVE 1034
#define IDC_RADIO_VIRTUAL 1035
......
programs/winecfg/winecfg.c
View file @ 5fd5f384
......@@ -132,7 +132,8 @@ end:
* const char *value : the value to set the configuration key to
*
* Returns 0 on success, non-zero otherwise
*
*
* If *valueName or *value is NULL, an empty section will be created
*/
int setConfigValue (const char *subkey, const char *valueName, const char *value) {
DWORD res = 1;
......@@ -141,11 +142,10 @@ int setConfigValue (const char *subkey, const char *valueName, const char *value
WINE_TRACE("subkey=%s, valueName=%s, value=%s\n", subkey, valueName, value);
assert( subkey != NULL );
assert( valueName != NULL );
assert( value != NULL );
res = RegCreateKey(configKey, subkey, &key);
if (res != ERROR_SUCCESS) goto end;
if (value == NULL || valueName == NULL) goto end;
res = RegSetValueEx(key, valueName, 0, REG_SZ, value, strlen(value) + 1);
if (res != ERROR_SUCCESS) goto end;
......
programs/winecfg/winecfg.h
View file @ 5fd5f384
......@@ -109,6 +109,7 @@ void saveDriveSettings (HWND hDlg);
INT_PTR CALLBACK DriveDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK DriveEditDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
/* some basic utilities to make win32 suck less */
char *getDialogItemText(HWND hDlg, WORD controlID);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment