Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
a18f2061
Commit
a18f2061
authored
Jun 16, 2005
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed registry paths to edit the real config, and removed the startup
warning message.
parent
f0fcaed6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
23 deletions
+14
-23
main.c
programs/winecfg/main.c
+0
-9
winecfg.c
programs/winecfg/winecfg.c
+1
-1
winecfg.h
programs/winecfg/winecfg.h
+1
-1
x11drvdlg.c
programs/winecfg/x11drvdlg.c
+12
-12
No files found.
programs/winecfg/main.c
View file @
a18f2061
...
...
@@ -233,15 +233,6 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow)
if
(
ProcessCmdLine
(
szCmdLine
))
{
return
0
;
}
/* Until winecfg is fully functional, warn users that it is incomplete and doesn't do anything */
if
(
!
getenv
(
"WINECFG_NOWARN"
))
{
WINE_FIXME
(
"The winecfg tool is not yet complete, and does not actually alter your configuration.
\n
"
);
WINE_FIXME
(
"If you want to alter the way Wine works, look in the ~/.wine/config file for more information.
\n
"
);
MessageBoxA
(
NULL
,
"The winecfg tool is not yet complete, and does not actually alter your configuration
\n\n
"
"If you want to alter the way Wine works, look in the ~/.wine/config file for more information."
,
""
,
MB_OK
|
MB_ICONEXCLAMATION
);
}
if
(
initialize
()
!=
0
)
{
WINE_ERR
(
"initialization failed, aborting
\n
"
);
...
...
programs/winecfg/winecfg.c
View file @
a18f2061
...
...
@@ -521,7 +521,7 @@ void PRINTERROR(void)
}
int
initialize
(
void
)
{
DWORD
res
=
RegCreateKey
(
HKEY_
LOCAL_MACHINE
,
WINE_KEY_ROOT
,
&
config_key
);
DWORD
res
=
RegCreateKey
(
HKEY_
CURRENT_USER
,
WINE_KEY_ROOT
,
&
config_key
);
if
(
res
!=
ERROR_SUCCESS
)
{
WINE_ERR
(
"RegOpenKey failed on wine config key (%ld)
\n
"
,
res
);
...
...
programs/winecfg/winecfg.h
View file @
a18f2061
...
...
@@ -126,6 +126,6 @@ static inline void set_text(HWND dialog, WORD id, const char *text)
SetWindowText
(
GetDlgItem
(
dialog
,
id
),
text
);
}
#define WINE_KEY_ROOT "Software\\Wine
\\Testing\\Config
"
#define WINE_KEY_ROOT "Software\\Wine"
#endif
programs/winecfg/x11drvdlg.c
View file @
a18f2061
...
...
@@ -44,7 +44,7 @@ static void update_gui_for_desktop_mode(HWND dialog) {
updating_ui
=
TRUE
;
/* do we have desktop mode enabled? */
if
(
reg_key_exists
(
keypath
(
"
x11drv
"
),
"Desktop"
))
if
(
reg_key_exists
(
keypath
(
"
X11 Driver
"
),
"Desktop"
))
{
char
*
buf
,
*
bufindex
;
CheckDlgButton
(
dialog
,
IDC_ENABLE_DESKTOP
,
BST_CHECKED
);
...
...
@@ -54,7 +54,7 @@ static void update_gui_for_desktop_mode(HWND dialog) {
enable
(
IDC_DESKTOP_SIZE
);
enable
(
IDC_DESKTOP_BY
);
buf
=
get_reg_key
(
keypath
(
"
x11drv
"
),
"Desktop"
,
"640x480"
);
buf
=
get_reg_key
(
keypath
(
"
X11 Driver
"
),
"Desktop"
,
"640x480"
);
bufindex
=
strchr
(
buf
,
'x'
);
if
(
bufindex
)
{
*
bufindex
=
0
;
...
...
@@ -99,7 +99,7 @@ static void init_dialog (HWND dialog)
SendDlgItemMessage
(
dialog
,
IDC_SCREEN_DEPTH
,
CB_ADDSTRING
,
0
,
(
LPARAM
)
"24 bit"
);
SendDlgItemMessage
(
dialog
,
IDC_SCREEN_DEPTH
,
CB_ADDSTRING
,
0
,
(
LPARAM
)
"32 bit"
);
/* is this valid? */
buf
=
get_reg_key
(
keypath
(
"
x11drv
"
),
"ScreenDepth"
,
"24"
);
buf
=
get_reg_key
(
keypath
(
"
X11 Driver
"
),
"ScreenDepth"
,
"24"
);
if
(
strcmp
(
buf
,
"8"
)
==
0
)
SendDlgItemMessage
(
dialog
,
IDC_SCREEN_DEPTH
,
CB_SETCURSEL
,
0
,
0
);
else
if
(
strcmp
(
buf
,
"16"
)
==
0
)
...
...
@@ -115,14 +115,14 @@ static void init_dialog (HWND dialog)
SendDlgItemMessage
(
dialog
,
IDC_DESKTOP_WIDTH
,
EM_LIMITTEXT
,
RES_MAXLEN
,
0
);
SendDlgItemMessage
(
dialog
,
IDC_DESKTOP_HEIGHT
,
EM_LIMITTEXT
,
RES_MAXLEN
,
0
);
buf
=
get_reg_key
(
keypath
(
"
x11drv
"
),
"DXGrab"
,
"Y"
);
buf
=
get_reg_key
(
keypath
(
"
X11 Driver
"
),
"DXGrab"
,
"Y"
);
if
(
IS_OPTION_TRUE
(
*
buf
))
CheckDlgButton
(
dialog
,
IDC_DX_MOUSE_GRAB
,
BST_CHECKED
);
else
CheckDlgButton
(
dialog
,
IDC_DX_MOUSE_GRAB
,
BST_UNCHECKED
);
HeapFree
(
GetProcessHeap
(),
0
,
buf
);
buf
=
get_reg_key
(
keypath
(
"
x11drv
"
),
"DesktopDoubleBuffered"
,
"Y"
);
buf
=
get_reg_key
(
keypath
(
"
X11 Driver
"
),
"DesktopDoubleBuffered"
,
"Y"
);
if
(
IS_OPTION_TRUE
(
*
buf
))
CheckDlgButton
(
dialog
,
IDC_DOUBLE_BUFFER
,
BST_CHECKED
);
else
...
...
@@ -154,7 +154,7 @@ static void set_from_desktop_edits(HWND dialog) {
new
=
HeapAlloc
(
GetProcessHeap
(),
0
,
strlen
(
width
)
+
strlen
(
height
)
+
2
/* x + terminator */
);
sprintf
(
new
,
"%sx%s"
,
width
,
height
);
set_reg_key
(
keypath
(
"
x11drv
"
),
"Desktop"
,
new
);
set_reg_key
(
keypath
(
"
X11 Driver
"
),
"Desktop"
,
new
);
HeapFree
(
GetProcessHeap
(),
0
,
width
);
HeapFree
(
GetProcessHeap
(),
0
,
height
);
...
...
@@ -167,7 +167,7 @@ static void on_enable_desktop_clicked(HWND dialog) {
if
(
IsDlgButtonChecked
(
dialog
,
IDC_ENABLE_DESKTOP
)
==
BST_CHECKED
)
{
set_from_desktop_edits
(
dialog
);
}
else
{
set_reg_key
(
keypath
(
"
x11drv
"
),
"Desktop"
,
NULL
);
set_reg_key
(
keypath
(
"
X11 Driver
"
),
"Desktop"
,
NULL
);
}
update_gui_for_desktop_mode
(
dialog
);
...
...
@@ -181,23 +181,23 @@ static void on_screen_depth_changed(HWND dialog) {
if
(
updating_ui
)
return
;
*
spaceIndex
=
'\0'
;
set_reg_key
(
keypath
(
"
x11drv
"
),
"ScreenDepth"
,
newvalue
);
set_reg_key
(
keypath
(
"
X11 Driver
"
),
"ScreenDepth"
,
newvalue
);
HeapFree
(
GetProcessHeap
(),
0
,
newvalue
);
}
static
void
on_dx_mouse_grab_clicked
(
HWND
dialog
)
{
if
(
IsDlgButtonChecked
(
dialog
,
IDC_DX_MOUSE_GRAB
)
==
BST_CHECKED
)
set_reg_key
(
keypath
(
"
x11drv
"
),
"DXGrab"
,
"Y"
);
set_reg_key
(
keypath
(
"
X11 Driver
"
),
"DXGrab"
,
"Y"
);
else
set_reg_key
(
keypath
(
"
x11drv
"
),
"DXGrab"
,
"N"
);
set_reg_key
(
keypath
(
"
X11 Driver
"
),
"DXGrab"
,
"N"
);
}
static
void
on_double_buffer_clicked
(
HWND
dialog
)
{
if
(
IsDlgButtonChecked
(
dialog
,
IDC_DOUBLE_BUFFER
)
==
BST_CHECKED
)
set_reg_key
(
keypath
(
"
x11drv
"
),
"DesktopDoubleBuffered"
,
"Y"
);
set_reg_key
(
keypath
(
"
X11 Driver
"
),
"DesktopDoubleBuffered"
,
"Y"
);
else
set_reg_key
(
keypath
(
"
x11drv
"
),
"DesktopDoubleBuffered"
,
"N"
);
set_reg_key
(
keypath
(
"
X11 Driver
"
),
"DesktopDoubleBuffered"
,
"N"
);
}
INT_PTR
CALLBACK
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment