While looking over this file, I came across something that just doesn't look right:
{ "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""},
(for those that don't pay attention to the winecfg code, the third value is the major version for the emulated version of Windows)
Now, this is the Windows 3.1 emulation selection, but the major/minor here is 2.10
Is this a bug, or a "compatability bug", as in an intentional fault to be compatable with windows?
Attached is a patch to "correct" this behaviour (assuming that it is wrong)
ChangeLog: Modified the dwMajorVersion of the Windows 3.1 emulation from 2 to 3 in programs/winecfg/appdefaults.c
Index: appdefaults.c =================================================================== RCS file: /home/wine/wine/programs/winecfg/appdefaults.c,v retrieving revision 1.23 diff -u -r1.23 appdefaults.c --- appdefaults.c 18 Mar 2006 18:52:29 -0000 1.23 +++ appdefaults.c 23 Apr 2006 03:17:30 -0000 @@ -55,7 +55,7 @@ { "win95", "Windows 95", 4, 0, 0x3B6, VER_PLATFORM_WIN32_WINDOWS, "", 0, 0, ""}, { "nt40", "Windows NT 4.0", 4, 0, 0x565, VER_PLATFORM_WIN32_NT, "Service Pack 6a", 6, 0, "WinNT"}, { "nt351", "Windows NT 3.5", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "WinNT"}, - { "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, + { "win31", "Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""} };
Please /dev/null that patch, I made a mistake in creating it. Attached is a corrected version.
Segin wrote:
While looking over this file, I came across something that just doesn't look right:
{ "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""},
(for those that don't pay attention to the winecfg code, the third value is the major version for the emulated version of Windows)
Now, this is the Windows 3.1 emulation selection, but the major/minor here is 2.10
Is this a bug, or a "compatability bug", as in an intentional fault to be compatable with windows?
Attached is a patch to "correct" this behaviour (assuming that it is wrong)
ChangeLog: Modified the dwMajorVersion of the Windows 3.1 emulation from 2 to 3 in programs/winecfg/appdefaults.c
Index: appdefaults.c
RCS file: /home/wine/wine/programs/winecfg/appdefaults.c,v retrieving revision 1.23 diff -u -r1.23 appdefaults.c --- appdefaults.c 18 Mar 2006 18:52:29 -0000 1.23 +++ appdefaults.c 23 Apr 2006 03:17:30 -0000 @@ -55,7 +55,7 @@ { "win95", "Windows 95", 4, 0, 0x3B6, VER_PLATFORM_WIN32_WINDOWS, "", 0, 0, ""}, { "nt40", "Windows NT 4.0", 4, 0, 0x565, VER_PLATFORM_WIN32_NT, "Service Pack 6a", 6, 0, "WinNT"}, { "nt351", "Windows NT 3.5", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "WinNT"},
- { "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""},
- { "win31", "Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}
};
Index: programs/winecfg/appdefaults.c =================================================================== RCS file: /home/wine/wine/programs/winecfg/appdefaults.c,v retrieving revision 1.23 diff -u -r1.23 appdefaults.c --- programs/winecfg/appdefaults.c 18 Mar 2006 18:52:29 -0000 1.23 +++ programs/winecfg/appdefaults.c 23 Apr 2006 11:22:41 -0000 @@ -55,7 +55,7 @@ { "win95", "Windows 95", 4, 0, 0x3B6, VER_PLATFORM_WIN32_WINDOWS, "", 0, 0, ""}, { "nt40", "Windows NT 4.0", 4, 0, 0x565, VER_PLATFORM_WIN32_NT, "Service Pack 6a", 6, 0, "WinNT"}, { "nt351", "Windows NT 3.5", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "WinNT"}, - { "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, + { "win31", "Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""} };
Please no HTMLs in patches. Especially quoting previous patch. 'cat mabox | patch -px' should work or the patch invalid. Attachments are ok.
Vitaliy Margolen
Sunday, April 23, 2006, 5:24:26 AM, Segin wrote:
Please /dev/null that patch, I made a mistake in creating it. Attachedis a corrected version.
Segin wrote: Whilelooking over this file, I came across something that just doesn't lookright:
{ "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s,"Win32s 1.3", 0, 0, ""},
(for those that don't pay attention to the winecfg code, the thirdvalue is the major version for the emulated version of Windows)
Now, this is the Windows 3.1 emulation selection, but the major/minorhere is 2.10
Is this a bug, or a "compatability bug", as in an intentional fault tobe compatable with windows?
Attached is a patch to "correct" this behaviour (assuming that it iswrong)
ChangeLog: Modified the dwMajorVersion of the Windows 3.1 emulation from 2 to 3in programs/winecfg/appdefaults.c
Index: appdefaults.c===================================================================RCS file: /home/wine/wine/programs/winecfg/appdefaults.c,vretrieving revision 1.23diff -u -r1.23 appdefaults.c--- appdefaults.c 18 Mar 2006 18:52:29 -0000 1.23+++ appdefaults.c 23 Apr 2006 03:17:30 -0000@@ -55,7 +55,7 @@ { "win95", "Windows 95", 4, 0, 0x3B6, VER_PLATFORM_WIN32_WINDOWS, "", 0, 0, ""}, { "nt40", "Windows NT 4.0", 4, 0, 0x565, VER_PLATFORM_WIN32_NT, "Service Pack 6a", 6, 0, "WinNT"}, { "nt351", "Windows NT 3.5", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "WinNT"},- { "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""},+ { "win31", "Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""} };
-
Segin -
Vitaliy Margolen