mirror of
git://source.winehq.org/git/wine.git
synced 2024-07-21 21:34:10 +00:00
Remove the rest of the Tweak look hack.
This commit is contained in:
parent
dfd6bbf1d2
commit
abe9c975a8
|
@ -4374,13 +4374,8 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode)
|
||||||
es->style |= ES_AUTOVSCROLL;
|
es->style |= ES_AUTOVSCROLL;
|
||||||
} else {
|
} else {
|
||||||
es->buffer_limit = BUFLIMIT_SINGLE;
|
es->buffer_limit = BUFLIMIT_SINGLE;
|
||||||
if ( WIN95_LOOK == TWEAK_WineLook) {
|
es->style &= ~ES_CENTER;
|
||||||
es->style &= ~ES_CENTER;
|
es->style &= ~ES_RIGHT;
|
||||||
es->style &= ~ES_RIGHT;
|
|
||||||
} else {
|
|
||||||
if (es->style & ES_RIGHT)
|
|
||||||
es->style &= ~ES_CENTER;
|
|
||||||
}
|
|
||||||
es->style &= ~WS_HSCROLL;
|
es->style &= ~WS_HSCROLL;
|
||||||
es->style &= ~WS_VSCROLL;
|
es->style &= ~WS_VSCROLL;
|
||||||
es->style &= ~ES_AUTOVSCROLL;
|
es->style &= ~ES_AUTOVSCROLL;
|
||||||
|
|
|
@ -831,15 +831,9 @@ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, BO
|
||||||
/* handle fontsize > bitmap_height */
|
/* handle fontsize > bitmap_height */
|
||||||
top = (h>bm.bmHeight) ? rect->top+(h-bm.bmHeight)/2 : rect->top;
|
top = (h>bm.bmHeight) ? rect->top+(h-bm.bmHeight)/2 : rect->top;
|
||||||
left=rect->left;
|
left=rect->left;
|
||||||
if (TWEAK_WineLook == WIN95_LOOK) {
|
rop=((lpitem->fState & MF_HILITE) && !IS_MAGIC_ITEM(lpitem->text)) ? NOTSRCCOPY : SRCCOPY;
|
||||||
rop=((lpitem->fState & MF_HILITE) && !IS_MAGIC_ITEM(lpitem->text)) ? NOTSRCCOPY : SRCCOPY;
|
if ((lpitem->fState & MF_HILITE) && IS_BITMAP_ITEM(lpitem->fType))
|
||||||
if ((lpitem->fState & MF_HILITE) && IS_BITMAP_ITEM(lpitem->fType))
|
SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
|
||||||
SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
|
|
||||||
} else {
|
|
||||||
left++;
|
|
||||||
w-=2;
|
|
||||||
rop=((lpitem->fState & MF_HILITE) && !IS_MAGIC_ITEM(lpitem->text) && (!menuBar)) ? MERGEPAINT : SRCCOPY;
|
|
||||||
}
|
|
||||||
BitBlt( hdc, left, top, w, h, hdcMem, bmp_xoffset, 0, rop );
|
BitBlt( hdc, left, top, w, h, hdcMem, bmp_xoffset, 0, rop );
|
||||||
DeleteDC( hdcMem );
|
DeleteDC( hdcMem );
|
||||||
}
|
}
|
||||||
|
@ -921,12 +915,9 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
|
||||||
MENU_GetBitmapItemSize( (int)lpitem->text, lpitem->dwItemData, &size );
|
MENU_GetBitmapItemSize( (int)lpitem->text, lpitem->dwItemData, &size );
|
||||||
lpitem->rect.right += size.cx;
|
lpitem->rect.right += size.cx;
|
||||||
lpitem->rect.bottom += size.cy;
|
lpitem->rect.bottom += size.cy;
|
||||||
if (TWEAK_WineLook == WIN98_LOOK)
|
/* Leave space for the sunken border */
|
||||||
{
|
lpitem->rect.right += 2;
|
||||||
/* Leave space for the sunken border */
|
lpitem->rect.bottom += 2;
|
||||||
lpitem->rect.right += 2;
|
|
||||||
lpitem->rect.bottom += 2;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1170,18 +1161,10 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
|
||||||
{
|
{
|
||||||
if (lpitem->fState & MF_HILITE)
|
if (lpitem->fState & MF_HILITE)
|
||||||
{
|
{
|
||||||
if(TWEAK_WineLook == WIN98_LOOK)
|
if(menuBar)
|
||||||
{
|
DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT);
|
||||||
if(menuBar)
|
else
|
||||||
DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT);
|
FillRect(hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT));
|
||||||
else
|
|
||||||
FillRect(hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT));
|
|
||||||
}
|
|
||||||
else /* Not Win98 Look */
|
|
||||||
{
|
|
||||||
if(!IS_BITMAP_ITEM(lpitem->fType))
|
|
||||||
FillRect(hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
FillRect( hdc, &rect, GetSysColorBrush(COLOR_MENU) );
|
FillRect( hdc, &rect, GetSysColorBrush(COLOR_MENU) );
|
||||||
|
@ -1216,24 +1199,15 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
|
||||||
|
|
||||||
if (lpitem->fState & MF_HILITE)
|
if (lpitem->fState & MF_HILITE)
|
||||||
{
|
{
|
||||||
if(TWEAK_WineLook == WIN98_LOOK)
|
if(menuBar) {
|
||||||
{
|
SetTextColor(hdc, GetSysColor(COLOR_MENUTEXT));
|
||||||
if(menuBar) {
|
SetBkColor(hdc, GetSysColor(COLOR_MENU));
|
||||||
SetTextColor(hdc, GetSysColor(COLOR_MENUTEXT));
|
} else {
|
||||||
SetBkColor(hdc, GetSysColor(COLOR_MENU));
|
if(lpitem->fState & MF_GRAYED)
|
||||||
} else {
|
SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT));
|
||||||
if(lpitem->fState & MF_GRAYED)
|
else
|
||||||
SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT));
|
SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
|
||||||
else
|
SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
|
||||||
SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
|
|
||||||
SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else /* Not Win98 Look */
|
|
||||||
{
|
|
||||||
SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
|
|
||||||
if(!IS_BITMAP_ITEM(lpitem->fType))
|
|
||||||
SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -3186,23 +3160,22 @@ UINT WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags )
|
||||||
oldflags = item->fState & (MF_GRAYED | MF_DISABLED);
|
oldflags = item->fState & (MF_GRAYED | MF_DISABLED);
|
||||||
item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED);
|
item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED);
|
||||||
|
|
||||||
/* In win95 if the close item in the system menu change update the close button */
|
/* If the close item in the system menu change update the close button */
|
||||||
if (TWEAK_WineLook == WIN95_LOOK)
|
if((item->wID == SC_CLOSE) && (oldflags != wFlags))
|
||||||
if((item->wID == SC_CLOSE) && (oldflags != wFlags))
|
{
|
||||||
|
if (menu->hSysMenuOwner != 0)
|
||||||
{
|
{
|
||||||
if (menu->hSysMenuOwner != 0)
|
POPUPMENU* parentMenu;
|
||||||
{
|
|
||||||
POPUPMENU* parentMenu;
|
|
||||||
|
|
||||||
/* Get the parent menu to access*/
|
/* Get the parent menu to access*/
|
||||||
if (!(parentMenu = MENU_GetMenu(menu->hSysMenuOwner)))
|
if (!(parentMenu = MENU_GetMenu(menu->hSysMenuOwner)))
|
||||||
return (UINT)-1;
|
return (UINT)-1;
|
||||||
|
|
||||||
/* Refresh the frame to reflect the change*/
|
/* Refresh the frame to reflect the change*/
|
||||||
SetWindowPos(parentMenu->hWnd, 0, 0, 0, 0, 0,
|
SetWindowPos(parentMenu->hWnd, 0, 0, 0, 0, 0,
|
||||||
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
|
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return oldflags;
|
return oldflags;
|
||||||
}
|
}
|
||||||
|
|
|
@ -466,15 +466,7 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc,
|
||||||
LTInnerI = RBInnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)];
|
LTInnerI = RBInnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)];
|
||||||
LTOuterI = RBOuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)];
|
LTOuterI = RBOuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)];
|
||||||
|
|
||||||
/* Bertho Stultiens states above that this function exactly matches win95
|
if( LTInnerI != -1 ) LTInnerI = RBInnerI = COLOR_BTNFACE;
|
||||||
* In win98 BF_FLAT rectangles have an inner border same color as the
|
|
||||||
* middle (COLOR_BTNFACE). I believe it's the same for win95 but since
|
|
||||||
* I don't know I go with Bertho and just sets it for win98 until proven
|
|
||||||
* otherwise.
|
|
||||||
* Dennis Björklund, 10 June, 99
|
|
||||||
*/
|
|
||||||
if( TWEAK_WineLook == WIN98_LOOK && LTInnerI != -1 )
|
|
||||||
LTInnerI = RBInnerI = COLOR_BTNFACE;
|
|
||||||
}
|
}
|
||||||
else if(uFlags & BF_SOFT)
|
else if(uFlags & BF_SOFT)
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics);
|
||||||
|
|
||||||
USER_DRIVER USER_Driver;
|
USER_DRIVER USER_Driver;
|
||||||
|
|
||||||
WINE_LOOK TWEAK_WineLook = WIN95_LOOK;
|
|
||||||
|
|
||||||
WORD USER_HeapSel = 0; /* USER heap selector */
|
WORD USER_HeapSel = 0; /* USER heap selector */
|
||||||
HMODULE user32_module = 0;
|
HMODULE user32_module = 0;
|
||||||
|
|
||||||
|
@ -150,37 +148,6 @@ static void palette_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* tweak_init
|
|
||||||
*/
|
|
||||||
static void tweak_init(void)
|
|
||||||
{
|
|
||||||
static const char *OS = "Win95";
|
|
||||||
char buffer[80];
|
|
||||||
HKEY hkey;
|
|
||||||
DWORD type, count = sizeof(buffer);
|
|
||||||
|
|
||||||
if (RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Tweak.Layout", &hkey ))
|
|
||||||
return;
|
|
||||||
if (RegQueryValueExA( hkey, "WineLook", 0, &type, buffer, &count ))
|
|
||||||
strcpy( buffer, "Win95" ); /* default value */
|
|
||||||
RegCloseKey( hkey );
|
|
||||||
|
|
||||||
/* WIN31_LOOK is default */
|
|
||||||
if (!strncasecmp( buffer, "Win95", 5 ))
|
|
||||||
{
|
|
||||||
TWEAK_WineLook = WIN95_LOOK;
|
|
||||||
OS = "Win95";
|
|
||||||
}
|
|
||||||
else if (!strncasecmp( buffer, "Win98", 5 ))
|
|
||||||
{
|
|
||||||
TWEAK_WineLook = WIN98_LOOK;
|
|
||||||
OS = "Win98";
|
|
||||||
}
|
|
||||||
TRACE("Using %s look and feel.\n", OS);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* USER initialisation routine
|
* USER initialisation routine
|
||||||
*/
|
*/
|
||||||
|
@ -197,7 +164,6 @@ static BOOL process_attach(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Load the graphics driver */
|
/* Load the graphics driver */
|
||||||
tweak_init();
|
|
||||||
if (!load_driver()) return FALSE;
|
if (!load_driver()) return FALSE;
|
||||||
|
|
||||||
/* Initialize system colors and metrics */
|
/* Initialize system colors and metrics */
|
||||||
|
|
|
@ -546,9 +546,6 @@ currently lacking. We need:
|
||||||
; get the stuff from the readonly installation and can write to our own.
|
; get the stuff from the readonly installation and can write to our own.
|
||||||
Temp=t:\ (the TEMP directory)
|
Temp=t:\ (the TEMP directory)
|
||||||
|
|
||||||
* [Tweak.Layout]
|
|
||||||
WineLook=win95 (just the coolest look ;)
|
|
||||||
|
|
||||||
* Possibly modify the [spooler], [serialports] and [parallelports] sections.
|
* Possibly modify the [spooler], [serialports] and [parallelports] sections.
|
||||||
FIXME: possibly more, including printer stuff.
|
FIXME: possibly more, including printer stuff.
|
||||||
|
|
||||||
|
|
|
@ -361,11 +361,6 @@
|
||||||
<entry>no</entry>
|
<entry>no</entry>
|
||||||
<entry>Specifies locations of windows registry files</entry>
|
<entry>Specifies locations of windows registry files</entry>
|
||||||
</row>
|
</row>
|
||||||
<row>
|
|
||||||
<entry>[tweak.layout]</entry>
|
|
||||||
<entry>recmd</entry>
|
|
||||||
<entry>Appearance of Wine</entry>
|
|
||||||
</row>
|
|
||||||
<row>
|
<row>
|
||||||
<entry>[programs]</entry>
|
<entry>[programs]</entry>
|
||||||
<entry>no</entry>
|
<entry>no</entry>
|
||||||
|
@ -660,7 +655,7 @@
|
||||||
</sect3>
|
</sect3>
|
||||||
|
|
||||||
<sect3 id="config-debug-etc">
|
<sect3 id="config-debug-etc">
|
||||||
<title>The [Debug], [Registry], [tweak.layout], and [programs] Sections</title>
|
<title>The [Debug], [Registry], and [programs] Sections</title>
|
||||||
<para>
|
<para>
|
||||||
[Debug] is used to include or exclude debug messages, and to
|
[Debug] is used to include or exclude debug messages, and to
|
||||||
output them to a file. The latter is rarely used. <emphasis>These
|
output them to a file. The latter is rarely used. <emphasis>These
|
||||||
|
@ -715,16 +710,6 @@
|
||||||
<programlisting>"UserFileName" = "/dirs/to/user.reg"</programlisting>
|
<programlisting>"UserFileName" = "/dirs/to/user.reg"</programlisting>
|
||||||
The location of your old <filename>user.reg</filename> file.
|
The location of your old <filename>user.reg</filename> file.
|
||||||
</para>
|
</para>
|
||||||
<para>
|
|
||||||
[tweak.layout] is devoted to wine's look. There is only
|
|
||||||
one setting for it.
|
|
||||||
</para>
|
|
||||||
<para>
|
|
||||||
<programlisting>"WineLook" = "win31|win95|win98"</programlisting>
|
|
||||||
Will change the look of wine from Windows 3.1 to Windows 95.
|
|
||||||
The <literal>win98</literal> setting behaves
|
|
||||||
just like <literal>win95</literal> most of the time.
|
|
||||||
</para>
|
|
||||||
<para>
|
<para>
|
||||||
[programs] can be used to say what programs run under
|
[programs] can be used to say what programs run under
|
||||||
special conditions.
|
special conditions.
|
||||||
|
@ -2616,39 +2601,6 @@ the [Version] section.
|
||||||
&fonts;
|
&fonts;
|
||||||
&printing;
|
&printing;
|
||||||
|
|
||||||
<sect1 id="config-win95look">
|
|
||||||
<title>Win95/98 Look And Feel</title>
|
|
||||||
<para>
|
|
||||||
Instead of compiling Wine for Win3.1 vs. Win95 using
|
|
||||||
<constant>#define</constant> switches, the code now looks in a
|
|
||||||
special [Tweak.Layout] section of
|
|
||||||
<filename>~/.wine/config</filename> for a
|
|
||||||
<literal>"WineLook" = "Win95"</literal> or
|
|
||||||
<literal>"WineLook" = "Win98"</literal> entry.
|
|
||||||
</para>
|
|
||||||
<para>
|
|
||||||
A few new sections and a number of entries have been added to
|
|
||||||
the <filename>~/.wine/config</filename> file -- these are for
|
|
||||||
debugging the Win95 tweaks only and may be removed in a future
|
|
||||||
release! These entries/sections are:
|
|
||||||
</para>
|
|
||||||
<programlisting>
|
|
||||||
[Tweak.Fonts]
|
|
||||||
"System.Height" = "<point size>" # Sets the height of the system typeface
|
|
||||||
"System.Bold" = "[true|false]" # Whether the system font should be boldfaced
|
|
||||||
"System.Italic" = "[true|false]" # Whether the system font should be italicized
|
|
||||||
"System.Underline" = "[true|false]" # Whether the system font should be underlined
|
|
||||||
"System.StrikeOut" = "[true|false]" # Whether the system font should be struck out
|
|
||||||
"OEMFixed.xxx" # Same parameters for the OEM fixed typeface
|
|
||||||
"AnsiFixed.xxx" # Same parameters for the Ansi fixed typeface
|
|
||||||
"AnsiVar.xxx" # Same parameters for the Ansi variable typeface
|
|
||||||
"SystemFixed.xxx" # Same parameters for the System fixed typeface
|
|
||||||
|
|
||||||
[Tweak.Layout]
|
|
||||||
"WineLook" = "[Win31|Win95|Win98]" # Changes Wine's look and feel
|
|
||||||
</programlisting>
|
|
||||||
</sect1>
|
|
||||||
|
|
||||||
<sect1 id="config-scsi-support">
|
<sect1 id="config-scsi-support">
|
||||||
<title>SCSI Support</title>
|
<title>SCSI Support</title>
|
||||||
<para>
|
<para>
|
||||||
|
|
|
@ -196,12 +196,6 @@ WINE REGISTRY Version 2
|
||||||
; Save only modified keys
|
; Save only modified keys
|
||||||
"SaveOnlyUpdatedKeys" = "Y"
|
"SaveOnlyUpdatedKeys" = "Y"
|
||||||
|
|
||||||
[Tweak.Layout]
|
|
||||||
;; supported styles are 'Win95'(default), 'Win98'
|
|
||||||
;; this has *nothing* to do with the windows version Wine returns:
|
|
||||||
;; set the "Windows" value in the [Version] section if you want that.
|
|
||||||
"WineLook" = "Win95"
|
|
||||||
|
|
||||||
[Clipboard]
|
[Clipboard]
|
||||||
"ClearAllSelections" = "0"
|
"ClearAllSelections" = "0"
|
||||||
"PersistentSelection" = "1"
|
"PersistentSelection" = "1"
|
||||||
|
|
|
@ -264,14 +264,6 @@ Used to specify which functions will be included in the snoop debug log.
|
||||||
For Relay and Snoop <dllname>.* includes or excludes the whole dll. Exclude
|
For Relay and Snoop <dllname>.* includes or excludes the whole dll. Exclude
|
||||||
entries have priority over Include entries.
|
entries have priority over Include entries.
|
||||||
.PP
|
.PP
|
||||||
.B [Tweak.Layout]
|
|
||||||
.br
|
|
||||||
.I format: """WineLook""=""<Win31|Win95|Win98>"""
|
|
||||||
.br
|
|
||||||
default: "Win31"
|
|
||||||
.br
|
|
||||||
Use Win95-like window displays or Win3.1-like window displays.
|
|
||||||
.PP
|
|
||||||
.B [Registry]
|
.B [Registry]
|
||||||
.br
|
.br
|
||||||
.I format: """LoadGlobalRegistryFiles""=""<boolean>"""
|
.I format: """LoadGlobalRegistryFiles""=""<boolean>"""
|
||||||
|
|
|
@ -136,16 +136,6 @@ extern void USER_CheckNotLock(void);
|
||||||
|
|
||||||
extern BOOL USER_IsExitingThread( DWORD tid );
|
extern BOOL USER_IsExitingThread( DWORD tid );
|
||||||
|
|
||||||
/* Wine look */
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
WIN95_LOOK,
|
|
||||||
WIN98_LOOK
|
|
||||||
} WINE_LOOK;
|
|
||||||
|
|
||||||
extern WINE_LOOK TWEAK_WineLook;
|
|
||||||
|
|
||||||
/* gray brush cache */
|
/* gray brush cache */
|
||||||
extern HBRUSH CACHE_GetPattern55AABrush(void);
|
extern HBRUSH CACHE_GetPattern55AABrush(void);
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,6 @@ BEGIN
|
||||||
LTEXT "Windows Look:",IDC_STATIC,17,229,58,8
|
LTEXT "Windows Look:",IDC_STATIC,17,229,58,8
|
||||||
COMBOBOX IDC_WINVER,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_WINVER,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_DOSVER,83,208,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_DOSVER,83,208,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_WINELOOK,83,226,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_X11DRVCFG DIALOG DISCARDABLE 0, 0, 260, 250
|
IDD_X11DRVCFG DIALOG DISCARDABLE 0, 0, 260, 250
|
||||||
|
|
|
@ -28,7 +28,6 @@ FONT 8, "MS Sans Serif"
|
||||||
BEGIN
|
BEGIN
|
||||||
COMBOBOX IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_WINELOOK,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
|
||||||
LTEXT "Versión de Wine:",IDC_STATIC,119,17,45,8
|
LTEXT "Versión de Wine:",IDC_STATIC,119,17,45,8
|
||||||
LTEXT "CVS",IDC_WINEVER,169,17,56,8
|
LTEXT "CVS",IDC_WINEVER,169,17,56,8
|
||||||
LTEXT "Versión de Windows:",IDC_STATIC,17,155,58,8
|
LTEXT "Versión de Windows:",IDC_STATIC,17,155,58,8
|
||||||
|
|
|
@ -28,7 +28,6 @@ FONT 8, "MS Sans Serif"
|
||||||
BEGIN
|
BEGIN
|
||||||
COMBOBOX IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_WINELOOK,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
|
||||||
LTEXT "Versão do Wine:",IDC_STATIC,119,17,45,8
|
LTEXT "Versão do Wine:",IDC_STATIC,119,17,45,8
|
||||||
LTEXT "CVS",IDC_WINEVER,169,17,56,8
|
LTEXT "CVS",IDC_WINEVER,169,17,56,8
|
||||||
LTEXT "Versão do Windows:",IDC_STATIC,17,155,58,8
|
LTEXT "Versão do Windows:",IDC_STATIC,17,155,58,8
|
||||||
|
|
|
@ -38,7 +38,6 @@ FONT 8, "MS Sans Serif"
|
||||||
BEGIN
|
BEGIN
|
||||||
COMBOBOX IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_WINELOOK,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
|
||||||
LTEXT "Âåðñèÿ Wine:",IDC_STATIC,119,17,45,8
|
LTEXT "Âåðñèÿ Wine:",IDC_STATIC,119,17,45,8
|
||||||
LTEXT "CVS",IDC_WINEVER,169,17,56,8
|
LTEXT "CVS",IDC_WINEVER,169,17,56,8
|
||||||
LTEXT "Âåðñèÿ Windows:",IDC_STATIC,17,155,58,8
|
LTEXT "Âåðñèÿ Windows:",IDC_STATIC,17,155,58,8
|
||||||
|
|
|
@ -28,7 +28,6 @@ FONT 8, "MS Sans Serif"
|
||||||
BEGIN
|
BEGIN
|
||||||
COMBOBOX IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
COMBOBOX IDC_WINELOOK,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
|
||||||
LTEXT "Wine Version:",IDC_STATIC,119,17,45,8
|
LTEXT "Wine Version:",IDC_STATIC,119,17,45,8
|
||||||
LTEXT "CVS",IDC_WINEVER,169,17,56,8
|
LTEXT "CVS",IDC_WINEVER,169,17,56,8
|
||||||
LTEXT "Windows Version:",IDC_STATIC,17,155,58,8
|
LTEXT "Windows Version:",IDC_STATIC,17,155,58,8
|
||||||
|
|
|
@ -35,18 +35,15 @@ typedef struct _APPL
|
||||||
BOOL isGlobal;
|
BOOL isGlobal;
|
||||||
char* lpcApplication;
|
char* lpcApplication;
|
||||||
char* lpcVersionSection;
|
char* lpcVersionSection;
|
||||||
char* lpcWinelookSection;
|
|
||||||
} APPL, *LPAPPL;
|
} APPL, *LPAPPL;
|
||||||
|
|
||||||
static LPAPPL CreateAppl(BOOL isGlobal, char* application, char* version_section, char* winelook_section)
|
static LPAPPL CreateAppl(BOOL isGlobal, char* application, char* version_section)
|
||||||
{
|
{
|
||||||
LPAPPL out;
|
LPAPPL out;
|
||||||
WINE_TRACE("application: '%s', version_section: '%s', winelook_section: '%s'\n", application,
|
WINE_TRACE("application: '%s', version_section: '%s'\n", application, version_section);
|
||||||
version_section, winelook_section);
|
|
||||||
out = HeapAlloc(GetProcessHeap(),0,sizeof(APPL));
|
out = HeapAlloc(GetProcessHeap(),0,sizeof(APPL));
|
||||||
out->lpcApplication = strdup(application);
|
out->lpcApplication = strdup(application);
|
||||||
out->lpcVersionSection = strdup(version_section);
|
out->lpcVersionSection = strdup(version_section);
|
||||||
out->lpcWinelookSection = strdup(winelook_section);
|
|
||||||
out->isGlobal = isGlobal;
|
out->isGlobal = isGlobal;
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
@ -56,12 +53,11 @@ static VOID FreeAppl(LPAPPL lpAppl)
|
||||||
/* The strings were strdup-ped, so we use "free" */
|
/* The strings were strdup-ped, so we use "free" */
|
||||||
if (lpAppl->lpcApplication) free(lpAppl->lpcApplication);
|
if (lpAppl->lpcApplication) free(lpAppl->lpcApplication);
|
||||||
if (lpAppl->lpcVersionSection) free(lpAppl->lpcVersionSection);
|
if (lpAppl->lpcVersionSection) free(lpAppl->lpcVersionSection);
|
||||||
if (lpAppl->lpcWinelookSection) free(lpAppl->lpcWinelookSection);
|
|
||||||
HeapFree(GetProcessHeap(),0,lpAppl);
|
HeapFree(GetProcessHeap(),0,lpAppl);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* section can be "Version" or "Tweak.Layout" */
|
/* section can be "Version" */
|
||||||
/* key can be "Windows"/"Dos"/"WineLook" */
|
/* key can be "Windows"/"Dos" */
|
||||||
/* value can be appropriate values for the above keys */
|
/* value can be appropriate values for the above keys */
|
||||||
typedef struct _APPSETTING
|
typedef struct _APPSETTING
|
||||||
{
|
{
|
||||||
|
@ -128,9 +124,8 @@ static VOID LoadAppSettings(LPAPPL appl /*DON'T FREE, treeview will own this*/,
|
||||||
HTREEITEM hParent;
|
HTREEITEM hParent;
|
||||||
LPAPPSETTING lpas;
|
LPAPPSETTING lpas;
|
||||||
|
|
||||||
WINE_TRACE("opening '%s' and '%s'\n", appl->lpcVersionSection, appl->lpcWinelookSection);
|
WINE_TRACE("opening '%s'\n", appl->lpcVersionSection);
|
||||||
if ((RegOpenKey (configKey, appl->lpcVersionSection, &key) == ERROR_SUCCESS) ||
|
if (RegOpenKey (configKey, appl->lpcVersionSection, &key) == ERROR_SUCCESS)
|
||||||
(RegOpenKey (configKey, appl->lpcWinelookSection, &key) == ERROR_SUCCESS))
|
|
||||||
{
|
{
|
||||||
i = 0;
|
i = 0;
|
||||||
size = 255;
|
size = 255;
|
||||||
|
@ -182,39 +177,6 @@ static VOID LoadAppSettings(LPAPPL appl /*DON'T FREE, treeview will own this*/,
|
||||||
{
|
{
|
||||||
WINE_TRACE("no version section found\n");
|
WINE_TRACE("no version section found\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
i = 0; /* reset i to 0 before calling RegEnumValue() again */
|
|
||||||
|
|
||||||
/* insert winelook entries */
|
|
||||||
if(RegOpenKey (configKey, appl->lpcWinelookSection, &key) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
while (RegEnumValue(key, i, name, &size, NULL, NULL, read, &readSize) == ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
char itemtext[128];
|
|
||||||
|
|
||||||
WINE_TRACE("Reading value %s, namely %s\n", name, read);
|
|
||||||
|
|
||||||
lpIt = CreateItemTag();
|
|
||||||
lpas = CreateAppSetting(name, read);
|
|
||||||
lpIt->lpSetting = lpas;
|
|
||||||
lpIt->lpAppl = appl;
|
|
||||||
tis.u.item.lParam = (LPARAM)lpIt;
|
|
||||||
|
|
||||||
/* convert the value for 'winelook' to human readable form */
|
|
||||||
description = getDescriptionFromVersion(getWinelook(), read);
|
|
||||||
if(!description) description = "Not found";
|
|
||||||
|
|
||||||
sprintf(itemtext, "%s - %s", name, description);
|
|
||||||
tis.u.item.pszText = itemtext;
|
|
||||||
|
|
||||||
TreeView_InsertItem(hwndTV,&tis);
|
|
||||||
i++; size = 255; readSize = 255;
|
|
||||||
}
|
|
||||||
RegCloseKey(key);
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
WINE_TRACE("no winelook section found\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -230,14 +192,11 @@ static VOID UpdateComboboxes(HWND hDlg, LPAPPL lpAppl)
|
||||||
/* retrieve the registry values for this application */
|
/* retrieve the registry values for this application */
|
||||||
char *curWinVer = getConfigValue(lpAppl->lpcVersionSection, "Windows", "");
|
char *curWinVer = getConfigValue(lpAppl->lpcVersionSection, "Windows", "");
|
||||||
char *curDOSVer = getConfigValue(lpAppl->lpcVersionSection, "DOS", "");
|
char *curDOSVer = getConfigValue(lpAppl->lpcVersionSection, "DOS", "");
|
||||||
char *curWineLook = getConfigValue(lpAppl->lpcWinelookSection, "WineLook", "");
|
|
||||||
|
|
||||||
if(curWinVer) WINE_TRACE("curWinVer is '%s'\n", curWinVer);
|
if(curWinVer) WINE_TRACE("curWinVer is '%s'\n", curWinVer);
|
||||||
else WINE_TRACE("curWinVer is null\n");
|
else WINE_TRACE("curWinVer is null\n");
|
||||||
if(curDOSVer) WINE_TRACE("curDOSVer is '%s'\n", curDOSVer);
|
if(curDOSVer) WINE_TRACE("curDOSVer is '%s'\n", curDOSVer);
|
||||||
else WINE_TRACE("curDOSVer is null\n");
|
else WINE_TRACE("curDOSVer is null\n");
|
||||||
if(curWineLook) WINE_TRACE("curWineLook is '%s'\n", curWineLook);
|
|
||||||
else WINE_TRACE("curWineLook is null\n");
|
|
||||||
|
|
||||||
/* normalize the version strings */
|
/* normalize the version strings */
|
||||||
if(strlen(curWinVer) != 0)
|
if(strlen(curWinVer) != 0)
|
||||||
|
@ -286,33 +245,8 @@ static VOID UpdateComboboxes(HWND hDlg, LPAPPL lpAppl)
|
||||||
-1, 0);
|
-1, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strlen(curWineLook) != 0)
|
|
||||||
{
|
|
||||||
if ((pVer = getWinelook ()))
|
|
||||||
{
|
|
||||||
WINE_TRACE("Winelook\n");
|
|
||||||
|
|
||||||
for (i = 0; *pVer->szVersion || *pVer->szDescription; i++, pVer++)
|
|
||||||
{
|
|
||||||
WINE_TRACE("pVer->szVersion == %s\n", pVer->szVersion);
|
|
||||||
if (!strcasecmp (pVer->szVersion, curWineLook))
|
|
||||||
{
|
|
||||||
SendDlgItemMessage (hDlg, IDC_WINELOOK, CB_SETCURSEL,
|
|
||||||
(WPARAM) i, 0);
|
|
||||||
WINE_TRACE("match with %s\n", pVer->szVersion);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
WINE_TRACE("setting winelook to nothing\n");
|
|
||||||
SendDlgItemMessage (hDlg, IDC_WINELOOK, CB_SETCURSEL,
|
|
||||||
-1, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(curWinVer) free(curWinVer);
|
if(curWinVer) free(curWinVer);
|
||||||
if(curDOSVer) free(curDOSVer);
|
if(curDOSVer) free(curDOSVer);
|
||||||
if(curWineLook) free(curWineLook);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -337,14 +271,6 @@ initAppDlgComboboxes (HWND hDlg)
|
||||||
0, (LPARAM) pVer->szDescription);
|
0, (LPARAM) pVer->szDescription);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((pVer = getWinelook ()))
|
|
||||||
{
|
|
||||||
for (i = 0; *pVer->szVersion || *pVer->szDescription; i++, pVer++)
|
|
||||||
{
|
|
||||||
SendDlgItemMessage (hDlg, IDC_WINELOOK, CB_ADDSTRING,
|
|
||||||
0, (LPARAM) pVer->szDescription);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -357,11 +283,10 @@ static VOID OnInitAppDlg(HWND hDlg)
|
||||||
DWORD size;
|
DWORD size;
|
||||||
char appl [255];
|
char appl [255];
|
||||||
char lpcVersionKey [255];
|
char lpcVersionKey [255];
|
||||||
char lpcWinelookKey [255];
|
|
||||||
FILETIME ft;
|
FILETIME ft;
|
||||||
|
|
||||||
hwndTV = GetDlgItem(hDlg,IDC_APP_TREEVIEW);
|
hwndTV = GetDlgItem(hDlg,IDC_APP_TREEVIEW);
|
||||||
lpAppl = CreateAppl(TRUE, "Global Settings", "Version", "Tweak.Layout");
|
lpAppl = CreateAppl(TRUE, "Global Settings", "Version");
|
||||||
LoadAppSettings(lpAppl, hDlg, hwndTV);
|
LoadAppSettings(lpAppl, hDlg, hwndTV);
|
||||||
|
|
||||||
/*And now the application specific stuff:*/
|
/*And now the application specific stuff:*/
|
||||||
|
@ -372,8 +297,7 @@ static VOID OnInitAppDlg(HWND hDlg)
|
||||||
while (RegEnumKeyEx(applKey, i, appl, &size, NULL, NULL, NULL, &ft) == ERROR_SUCCESS)
|
while (RegEnumKeyEx(applKey, i, appl, &size, NULL, NULL, NULL, &ft) == ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
sprintf(lpcVersionKey, "AppDefaults\\%s\\Version", appl);
|
sprintf(lpcVersionKey, "AppDefaults\\%s\\Version", appl);
|
||||||
sprintf(lpcWinelookKey, "AppDefaults\\%s\\Tweak.Layout", appl);
|
lpAppl = CreateAppl(FALSE, appl, lpcVersionKey);
|
||||||
lpAppl = CreateAppl(FALSE, appl, lpcVersionKey, lpcWinelookKey);
|
|
||||||
LoadAppSettings(lpAppl, hDlg, hwndTV);
|
LoadAppSettings(lpAppl, hDlg, hwndTV);
|
||||||
i++; size = 255;
|
i++; size = 255;
|
||||||
}
|
}
|
||||||
|
@ -414,7 +338,6 @@ static VOID OnAddApplicationClick(HWND hDlg)
|
||||||
char szFileTitle [255];
|
char szFileTitle [255];
|
||||||
char szFile [255];
|
char szFile [255];
|
||||||
char lpcVersionKey [255];
|
char lpcVersionKey [255];
|
||||||
char lpcWinelookKey [255];
|
|
||||||
|
|
||||||
TVINSERTSTRUCT tis;
|
TVINSERTSTRUCT tis;
|
||||||
LPITEMTAG lpit;
|
LPITEMTAG lpit;
|
||||||
|
@ -438,14 +361,12 @@ static VOID OnAddApplicationClick(HWND hDlg)
|
||||||
tis.u.item.pszText = szFileTitle;
|
tis.u.item.pszText = szFileTitle;
|
||||||
lpit = CreateItemTag();
|
lpit = CreateItemTag();
|
||||||
sprintf(lpcVersionKey, "AppDefaults\\%s\\Version", szFileTitle);
|
sprintf(lpcVersionKey, "AppDefaults\\%s\\Version", szFileTitle);
|
||||||
sprintf(lpcWinelookKey, "AppDefaults\\%s\\Tweak.Layout", szFileTitle);
|
lpit->lpAppl = CreateAppl(FALSE, szFileTitle, lpcVersionKey);
|
||||||
lpit->lpAppl = CreateAppl(FALSE, szFileTitle, lpcVersionKey, lpcWinelookKey);
|
|
||||||
tis.u.item.lParam = (LPARAM)lpit;
|
tis.u.item.lParam = (LPARAM)lpit;
|
||||||
TreeView_InsertItem(GetDlgItem(hDlg, IDC_APP_TREEVIEW), &tis);
|
TreeView_InsertItem(GetDlgItem(hDlg, IDC_APP_TREEVIEW), &tis);
|
||||||
|
|
||||||
/* add the empty entries for the Version and Winelook sections for this app */
|
/* add the empty entries for the Version section for this app */
|
||||||
setConfigValue(lpcVersionKey,NULL,NULL);
|
setConfigValue(lpcVersionKey,NULL,NULL);
|
||||||
setConfigValue(lpcWinelookKey,NULL,NULL);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -465,7 +386,6 @@ static VOID OnRemoveApplicationClick(HWND hDlg)
|
||||||
{
|
{
|
||||||
/* add transactions to remove all entries for this application */
|
/* add transactions to remove all entries for this application */
|
||||||
addTransaction(lpit->lpAppl->lpcVersionSection, NULL, ACTION_REMOVE, NULL);
|
addTransaction(lpit->lpAppl->lpcVersionSection, NULL, ACTION_REMOVE, NULL);
|
||||||
addTransaction(lpit->lpAppl->lpcWinelookSection, NULL, ACTION_REMOVE, NULL);
|
|
||||||
TreeView_DeleteItem(hTV,ti.hItem);
|
TreeView_DeleteItem(hTV,ti.hItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -492,7 +412,7 @@ static void UpdateWinverSelection(HWND hDlg, int selection)
|
||||||
/* remove this applications setting */
|
/* remove this applications setting */
|
||||||
if((selection == CB_ERR) || !(*pVer[selection].szVersion))
|
if((selection == CB_ERR) || !(*pVer[selection].szVersion))
|
||||||
{
|
{
|
||||||
WINE_TRACE("removing section '%s'\n", lpit->lpAppl->lpcWinelookSection);
|
WINE_TRACE("removing section '%s'\n", lpit->lpAppl->lpcVersionSection);
|
||||||
addTransaction(lpit->lpAppl->lpcVersionSection, "Windows", ACTION_REMOVE, NULL); /* change registry entry */
|
addTransaction(lpit->lpAppl->lpcVersionSection, "Windows", ACTION_REMOVE, NULL); /* change registry entry */
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
|
@ -527,7 +447,7 @@ static void UpdateDosverSelection(HWND hDlg, int selection)
|
||||||
/* remove this applications setting */
|
/* remove this applications setting */
|
||||||
if((selection == CB_ERR) || !(*pVer[selection].szVersion))
|
if((selection == CB_ERR) || !(*pVer[selection].szVersion))
|
||||||
{
|
{
|
||||||
WINE_TRACE("removing section '%s'\n", lpit->lpAppl->lpcWinelookSection);
|
WINE_TRACE("removing section '%s'\n", lpit->lpAppl->lpcVersionSection);
|
||||||
addTransaction(lpit->lpAppl->lpcVersionSection, "DOS", ACTION_REMOVE, NULL); /* change registry entry */
|
addTransaction(lpit->lpAppl->lpcVersionSection, "DOS", ACTION_REMOVE, NULL); /* change registry entry */
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
|
@ -541,43 +461,6 @@ static void UpdateDosverSelection(HWND hDlg, int selection)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void UpdateWinelookSelection(HWND hDlg, int selection)
|
|
||||||
{
|
|
||||||
TVITEM ti;
|
|
||||||
LPITEMTAG lpit;
|
|
||||||
VERSION_DESC *pVer = NULL;
|
|
||||||
HWND hTV = GetDlgItem(hDlg, IDC_APP_TREEVIEW);
|
|
||||||
|
|
||||||
ti.mask = TVIF_PARAM;
|
|
||||||
ti.hItem = TreeView_GetSelection(hTV);
|
|
||||||
if (TreeView_GetItem (hTV, &ti))
|
|
||||||
{
|
|
||||||
lpit = (LPITEMTAG) ti.lParam;
|
|
||||||
|
|
||||||
if(lpit->lpAppl)
|
|
||||||
{
|
|
||||||
pVer = getWinelook();
|
|
||||||
|
|
||||||
/* if no item is selected OR if our version string is null */
|
|
||||||
/* remove this applications setting */
|
|
||||||
if((selection == CB_ERR) || !(*pVer[selection].szVersion))
|
|
||||||
{
|
|
||||||
WINE_TRACE("removing section '%s'\n", lpit->lpAppl->lpcWinelookSection);
|
|
||||||
addTransaction(lpit->lpAppl->lpcWinelookSection, "WineLook", ACTION_REMOVE, NULL); /* change registry entry */
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
WINE_TRACE("setting section '%s', key '%s', value '%s'\n", lpit->lpAppl->lpcWinelookSection, "WineLook", pVer[selection].szVersion);
|
|
||||||
addTransaction(lpit->lpAppl->lpcWinelookSection, "WineLook", ACTION_SET, pVer[selection].szVersion); /* change registry entry */
|
|
||||||
}
|
|
||||||
|
|
||||||
TreeView_DeleteAllItems(hTV); /* delete all items from the treeview */
|
|
||||||
OnInitAppDlg(hDlg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
INT_PTR CALLBACK
|
INT_PTR CALLBACK
|
||||||
AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
|
@ -615,10 +498,6 @@ AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
selection = SendDlgItemMessage( hDlg, IDC_DOSVER, CB_GETCURSEL, 0, 0);
|
selection = SendDlgItemMessage( hDlg, IDC_DOSVER, CB_GETCURSEL, 0, 0);
|
||||||
UpdateDosverSelection(hDlg, selection);
|
UpdateDosverSelection(hDlg, selection);
|
||||||
break;
|
break;
|
||||||
case IDC_WINELOOK:
|
|
||||||
selection = SendDlgItemMessage( hDlg, IDC_WINELOOK, CB_GETCURSEL, 0, 0);
|
|
||||||
UpdateWinelookSelection(hDlg, selection);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
case BN_CLICKED:
|
case BN_CLICKED:
|
||||||
switch(LOWORD(wParam)) {
|
switch(LOWORD(wParam)) {
|
||||||
|
|
|
@ -46,14 +46,6 @@ static VERSION_DESC sDOSVersions[] = {
|
||||||
{"", ""}
|
{"", ""}
|
||||||
};
|
};
|
||||||
|
|
||||||
static VERSION_DESC sWineLook[] = {
|
|
||||||
{"", "Use default(Global setting)"},
|
|
||||||
{"win31", "Windows 3.1"},
|
|
||||||
{"win95", "Windows 95"},
|
|
||||||
{"win98", "Windows 98"},
|
|
||||||
{"", ""}
|
|
||||||
};
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
static VERSION_DESC sWineDrivers[] = {
|
static VERSION_DESC sWineDrivers[] = {
|
||||||
{"x11drv", "X11 Interface"},
|
{"x11drv", "X11 Interface"},
|
||||||
|
@ -109,14 +101,6 @@ VERSION_DESC* getDOSVersions(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
*/
|
|
||||||
VERSION_DESC* getWinelook(void)
|
|
||||||
{
|
|
||||||
return sWineLook;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
*/
|
*/
|
||||||
DLL_DESC* getDLLDefaults(void)
|
DLL_DESC* getDLLDefaults(void)
|
||||||
|
|
|
@ -89,7 +89,6 @@ typedef struct
|
||||||
|
|
||||||
VERSION_DESC *getWinVersions(void);
|
VERSION_DESC *getWinVersions(void);
|
||||||
VERSION_DESC *getDOSVersions(void);
|
VERSION_DESC *getDOSVersions(void);
|
||||||
VERSION_DESC *getWinelook(void);
|
|
||||||
DLL_DESC *getDLLDefaults(void);
|
DLL_DESC *getDLLDefaults(void);
|
||||||
AUDIO_DRIVER *getAudioDrivers(void);
|
AUDIO_DRIVER *getAudioDrivers(void);
|
||||||
char* getVersionFromDescription(VERSION_DESC *pVer, char *desc);
|
char* getVersionFromDescription(VERSION_DESC *pVer, char *desc);
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
#define IDC_APPLYBTN 1002
|
#define IDC_APPLYBTN 1002
|
||||||
#define IDC_WINEVER 1011
|
#define IDC_WINEVER 1011
|
||||||
#define IDC_WINVER 1012
|
#define IDC_WINVER 1012
|
||||||
#define IDC_WINELOOK 1013
|
|
||||||
#define IDC_DOSVER 1014
|
#define IDC_DOSVER 1014
|
||||||
#define IDC_SYSCOLORS 1017
|
#define IDC_SYSCOLORS 1017
|
||||||
#define IDC_PRIVATEMAP 1018
|
#define IDC_PRIVATEMAP 1018
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
* - Make the desktop size UI a combo box, with a Custom option, so it's more obvious what you might want to choose here
|
* - Make the desktop size UI a combo box, with a Custom option, so it's more obvious what you might want to choose here
|
||||||
*
|
*
|
||||||
* BUGS:
|
* BUGS:
|
||||||
* - WineLook default fallback doesn't work
|
|
||||||
* - x11drv page triggers key writes on entry
|
* - x11drv page triggers key writes on entry
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue