April 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : wineboot: Relaunch the 64-bit version of wineboot on Wow64.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 871d028c0980079de7f158ef61f85806e6b72eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=871d028c0980079de7f158ef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 22:29:25 2010 +0100 wineboot: Relaunch the 64-bit version of wineboot on Wow64. (cherry picked from commit 9b3483899225a0232b6ebc22597a1d1d836ab7dd) --- programs/wineboot/wineboot.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 3f16445..b69ceed 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1122,11 +1122,36 @@ int main( int argc, char *argv[] ) int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0, update = 0; HANDLE event; SECURITY_ATTRIBUTES sa; + BOOL is_wow64; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } + while ((optc = getopt_long(argc, argv, short_options, long_options, NULL )) != -1) { switch(optc)

1 0

Alexandre Julliard : winecfg: Relaunch the 64-bit version of winecfg on Wow64.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 1d023079a92580d11bda17c9066316cb4bdd331e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d023079a92580d11bda17c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 22:29:49 2010 +0100 winecfg: Relaunch the 64-bit version of winecfg on Wow64. (cherry picked from commit fb929be9a423d47683d49d1ba63c14ff57679a60) --- programs/winecfg/main.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index fdefefb..7376309 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -214,6 +214,32 @@ ProcessCmdLine(LPSTR lpCmdLine) int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow) { + BOOL is_wow64; + + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } + if (ProcessCmdLine(szCmdLine)) { return 0; }

1 0

Alexandre Julliard : winecfg: Set Wow64 registry keys as well as the 64-bit ones for version information .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: baa48dd07d895de1fee7443686f7c3937e97e436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa48dd07d895de1fee744368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 22:30:18 2010 +0100 winecfg: Set Wow64 registry keys as well as the 64-bit ones for version information. (cherry picked from commit d15d52ddab95d246cf20f4fbc0f1674d1b777b83) --- programs/winecfg/winecfg.c | 62 ++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 25 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 1abf8ed..c41d2ba 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -34,6 +34,7 @@ #include <limits.h> #include <windows.h> #include <winreg.h> +#include <wine/unicode.h> #include <wine/debug.h> #include <wine/list.h> @@ -42,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #include "winecfg.h" #include "resource.h" +static const int is_win64 = (sizeof(void *) > sizeof(int)); + HKEY config_key = NULL; HMENU hPopupMenus = 0; @@ -159,7 +162,8 @@ end: * * If valueName or value is NULL, an empty section will be created */ -static int set_config_key(HKEY root, const WCHAR *subkey, const WCHAR *name, const void *value, DWORD type) { +static int set_config_key(HKEY root, const WCHAR *subkey, REGSAM access, const WCHAR *name, const void *value, DWORD type) +{ DWORD res = 1; HKEY key = NULL; @@ -170,7 +174,8 @@ static int set_config_key(HKEY root, const WCHAR *subkey, const WCHAR *name, con if (subkey[0]) { - res = RegCreateKeyW(root, subkey, &key); + res = RegCreateKeyExW( root, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, + access, NULL, &key, NULL ); if (res != ERROR_SUCCESS) goto end; } else key = root; @@ -192,25 +197,6 @@ end: return res; } -/* removes the requested value from the registry, however, does not - * remove the section if empty. Returns S_OK (0) on success. - */ -static HRESULT remove_value(HKEY root, const WCHAR *subkey, const WCHAR *name) -{ - HRESULT hr; - HKEY key; - - WINE_TRACE("subkey=%s, name=%s\n", wine_dbgstr_w(subkey), wine_dbgstr_w(name)); - - hr = RegOpenKeyW(root, subkey, &key); - if (hr != S_OK) return hr; - - hr = RegDeleteValueW(key, name); - if (hr != ERROR_SUCCESS) return hr; - - return S_OK; -} - /* ========================================================================= */ /* This code exists for the following reasons: @@ -635,17 +621,43 @@ BOOL reg_key_exists(HKEY root, const char *path, const char *name) static void process_setting(struct setting *s) { + static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; + HKEY key; + BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && + !strncmpiW( s->path, softwareW, sizeof(softwareW)/sizeof(WCHAR) )); + if (s->value) { WINE_TRACE("Setting %s:%s to '%s'\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name), wine_dbgstr_w(s->value)); - set_config_key(s->root, s->path, s->name, s->value, s->type); + set_config_key(s->root, s->path, MAXIMUM_ALLOWED, s->name, s->value, s->type); + if (needs_wow64) + { + WINE_TRACE("Setting 32-bit %s:%s to '%s'\n", wine_dbgstr_w(s->path), + wine_dbgstr_w(s->name), wine_dbgstr_w(s->value)); + set_config_key(s->root, s->path, MAXIMUM_ALLOWED | KEY_WOW64_32KEY, s->name, s->value, s->type); + } } else { - /* NULL name means remove that path/section entirely */ - if (s->path && s->name) remove_value(s->root, s->path, s->name); - else if (s->path && !s->name) RegDeleteTreeW(s->root, s->path); + WINE_TRACE("Removing %s:%s\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name)); + if (!RegOpenKeyW( s->root, s->path, &key )) + { + /* NULL name means remove that path/section entirely */ + if (s->name) RegDeleteValueW( key, s->name ); + else RegDeleteTreeW( key, NULL ); + RegCloseKey( key ); + } + if (needs_wow64) + { + WINE_TRACE("Removing 32-bit %s:%s\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name)); + if (!RegOpenKeyExW( s->root, s->path, 0, MAXIMUM_ALLOWED | KEY_WOW64_32KEY, &key )) + { + if (s->name) RegDeleteValueW( key, s->name ); + else RegDeleteTreeW( key, NULL ); + RegCloseKey( key ); + } + } } }

1 0

Damian Dixon : advapi32: Added check for NULL pointer being passed to QueryServiceStatus for either parameter .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: de07506c2f57240232358c3c8c137aa0d2a10691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de07506c2f57240232358c3c8… Author: Damian Dixon <damian.dixon(a)gmail.com> Date: Mon Dec 20 20:34:49 2010 +0000 advapi32: Added check for NULL pointer being passed to QueryServiceStatus for either parameter. (cherry picked from commit fd0bec1f960407ba4a4411e41d7585274ebe5ad6) --- dlls/advapi32/service.c | 11 +++++++++++ dlls/advapi32/tests/service.c | 1 - 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index cce2af4..abe35d1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1130,6 +1130,17 @@ BOOL WINAPI QueryServiceStatus(SC_HANDLE hService, TRACE("%p %p\n", hService, lpservicestatus); + if (!hService) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!lpservicestatus) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&SvcStatusData, sizeof(SERVICE_STATUS_PROCESS), &dummy); if (ret) memcpy(lpservicestatus, &SvcStatusData, sizeof(SERVICE_STATUS)) ; diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 605f384..bf38259 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -918,7 +918,6 @@ static void test_query_svc(void) SetLastError(0xdeadbeef); ret = QueryServiceStatus(svc_handle, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_ADDRESS || GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, "Unexpected last error %d\n", GetLastError());

1 0

Austin English : urlmon: Add stubs for ordinals 410 and 423.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: b96f0bdbf05652d21fc7239a0f9bc08446c13f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96f0bdbf05652d21fc7239a0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 14 19:23:09 2010 +0000 urlmon: Add stubs for ordinals 410 and 423. (cherry picked from commit 967657de352d040c535e9b84c3e6f9d12418de14) --- dlls/urlmon/urlmon.spec | 3 +++ dlls/urlmon/urlmon_main.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index e79850c..b947f31 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -85,3 +85,6 @@ @ stdcall UrlMkSetSessionOption(long ptr long long) @ stub WriteHitLogging @ stub ZonesReInit + +410 stdcall @(long long) URLMON_410 +423 stdcall @(long long long long) URLMON_423 diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index edaad42..2e07e9f 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -861,3 +861,23 @@ BOOL WINAPI IsLoggingEnabledW(LPCWSTR url) FIXME("(%s)\n", debugstr_w(url)); return FALSE; } + +/*********************************************************************** + * URLMON_410 (URLMON.410) + * Undocumented, added in IE8 + */ +BOOL WINAPI URLMON_410(DWORD unknown1, DWORD unknown2) +{ + FIXME("stub: %d %d\n", unknown1, unknown2); + return FALSE; +} + +/*********************************************************************** + * URLMON_423 (URLMON.423) + * Undocumented, added in IE8 + */ +BOOL WINAPI URLMON_423(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unknown4) +{ + FIXME("stub: %d %d %d %d\n", unknown1, unknown2, unknown3, unknown4); + return FALSE; +}

1 0

Huw Davies : fonts: Fix the metrics of the extended integral and brace glyphs.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 3cca8381c0e425c41dc7c36c8f1c844976572551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cca8381c0e425c41dc7c36c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 15 10:21:50 2010 +0000 fonts: Fix the metrics of the extended integral and brace glyphs. (cherry picked from commit 156f611ba8b24ed03c17c7c860d3accea1b31e51) --- fonts/symbol.sfd | 216 +++++++++++++++++++++++++++--------------------------- fonts/symbol.ttf | Bin 26040 -> 26040 bytes 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/fonts/symbol.sfd b/fonts/symbol.sfd index 0010a65..bf34606 100644 --- a/fonts/symbol.sfd +++ b/fonts/symbol.sfd @@ -83,7 +83,7 @@ BeginChars: 257 192 StartChar: .notdef Encoding: 255 711 0 -AltUni2: 000001.ffffffff.0 000002.ffffffff.0 000003.ffffffff.0 000004.ffffffff.0 000005.ffffffff.0 000006.ffffffff.0 000007.ffffffff.0 00000a.ffffffff.0 00000b.ffffffff.0 00000c.ffffffff.0 00000e.ffffffff.0 00000f.ffffffff.0 000010.ffffffff.0 000011.ffffffff.0 000012.ffffffff.0 000013.ffffffff.0 000014.ffffffff.0 000015.ffffffff.0 000016.ffffffff.0 000017.ffffffff.0 000018.ffffffff.0 000019.ffffffff.0 00001a.ffffffff.0 00001b.ffffffff.0 00001c.ffffffff.0 00001e.ffffffff.0 00001f.ffffffff.0 00007f.ffffffff.0 0000c4.ffffffff.0 0000c5.ffffffff.0 0000c7.ffffffff.0 0000c9.ffffffff.0 0000d1.ffffffff.0 0000d6.ffffffff.0 0000dc.ffffffff.0 0000e1.ffffffff.0 0000e0.ffffffff.0 0000e2.ffffffff.0 0000e4.ffffffff.0 0000e3.ffffffff.0 0000e5.ffffffff.0 0000e7.ffffffff.0 0000e9.ffffffff.0 0000e8.ffffffff.0 0000ea.ffffffff.0 0000eb.ffffffff.0 0000ed.ffffffff.0 0000ec.ffffffff.0 0000ee.ffffffff.0 0000ef.ffffffff.0 0000f1.ffffffff.0 0000f3.ffffffff.0 0000f2.ffffffff.0 0000f4.ffffffff.0 0000f6.ffffffff.0 0000f5.ffffffff.0 0000fa.ffffffff.0 0000f9.ffffffff.0 0000fb.ffffffff.0 0000fc.ffffffff.0 002020.ffffffff.0 +AltUni2: 002020.ffffffff.0 0000fc.ffffffff.0 0000fb.ffffffff.0 0000f9.ffffffff.0 0000fa.ffffffff.0 0000f5.ffffffff.0 0000f6.ffffffff.0 0000f4.ffffffff.0 0000f2.ffffffff.0 0000f3.ffffffff.0 0000f1.ffffffff.0 0000ef.ffffffff.0 0000ee.ffffffff.0 0000ec.ffffffff.0 0000ed.ffffffff.0 0000eb.ffffffff.0 0000ea.ffffffff.0 0000e8.ffffffff.0 0000e9.ffffffff.0 0000e7.ffffffff.0 0000e5.ffffffff.0 0000e3.ffffffff.0 0000e4.ffffffff.0 0000e2.ffffffff.0 0000e0.ffffffff.0 0000e1.ffffffff.0 0000dc.ffffffff.0 0000d6.ffffffff.0 0000d1.ffffffff.0 0000c9.ffffffff.0 0000c7.ffffffff.0 0000c5.ffffffff.0 0000c4.ffffffff.0 00007f.ffffffff.0 00001f.ffffffff.0 00001e.ffffffff.0 00001c.ffffffff.0 00001b.ffffffff.0 00001a.ffffffff.0 000019.ffffffff.0 000018.ffffffff.0 000017.ffffffff.0 000016.ffffffff.0 000015.ffffffff.0 000014.ffffffff.0 000013.ffffffff.0 000012.ffffffff.0 000011.ffffffff.0 000010.ffffffff.0 00000f.ffffffff.0 00000e.ffffffff.0 00000c.ffffffff.0 00000b.ffffffff.0 00000a.ffffffff.0 000007.ffffffff.0 000006.ffffffff.0 000005.ffffffff.0 000004.ffffffff.0 000003.ffffffff.0 000002.ffffffff.0 000001.ffffffff.0 Width: 1229 Flags: W LayerCount: 2 @@ -104,7 +104,7 @@ EndChar StartChar: uni001D Encoding: 29 29 1 -AltUni2: 000000.ffffffff.0 000008.ffffffff.0 00000d.ffffffff.0 +AltUni2: 00000d.ffffffff.0 000008.ffffffff.0 000000.ffffffff.0 Width: 0 Flags: W LayerCount: 2 @@ -5564,78 +5564,78 @@ EndChar StartChar: bracelefttp Encoding: 236 207 173 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -637 -162 m 1,0,-1 - 532 -162 l 1,1,-1 - 532 1290 l 1,2,3 - 549 1883 549 1883 984 1884 c 1,4,-1 - 1038 1836 l 1,5,6 - 621 1835 621 1835 637 1302 c 1,7,-1 - 637 -162 l 1,0,-1 +525 -162 m 1,0,-1 + 420 -162 l 1,1,-1 + 420 1290 l 1,2,3 + 437 1883 437 1883 872 1884 c 1,4,-1 + 926 1836 l 1,5,6 + 509 1835 509 1835 525 1302 c 1,7,-1 + 525 -162 l 1,0,-1 EndSplineSet EndChar StartChar: braceleftmid Encoding: 237 204 174 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -469 1444 m 1,0,1 - 460 1265 460 1265 420 1159.5 c 128,-1,2 - 380 1054 380 1054 313 989 c 128,-1,3 - 246 924 246 924 44 858 c 1,4,5 - 246 768 246 768 312 693.5 c 128,-1,6 - 378 619 378 619 423.5 506.5 c 128,-1,7 - 469 394 469 394 469 268 c 2,8,-1 - 469 -162 l 1,9,-1 - 364 -162 l 1,10,-1 - 364 250 l 1,11,12 - 366 463 366 463 286.5 596 c 128,-1,13 - 207 729 207 729 0 827 c 1,14,-1 - 0 899 l 1,15,16 - 206 949 206 949 288 1080.5 c 128,-1,17 - 370 1212 370 1212 364 1476 c 1,18,-1 - 364 1885 l 1,19,-1 - 469 1885 l 1,20,-1 - 469 1444 l 1,0,1 +525 1444 m 1,0,1 + 516 1265 516 1265 476 1159.5 c 128,-1,2 + 436 1054 436 1054 369 989 c 128,-1,3 + 302 924 302 924 100 858 c 1,4,5 + 302 768 302 768 368 693.5 c 128,-1,6 + 434 619 434 619 479.5 506.5 c 128,-1,7 + 525 394 525 394 525 268 c 2,8,-1 + 525 -162 l 1,9,-1 + 420 -162 l 1,10,-1 + 420 250 l 1,11,12 + 422 463 422 463 342.5 596 c 128,-1,13 + 263 729 263 729 56 827 c 1,14,-1 + 56 899 l 1,15,16 + 262 949 262 949 344 1080.5 c 128,-1,17 + 426 1212 426 1212 420 1476 c 1,18,-1 + 420 1885 l 1,19,-1 + 525 1885 l 1,20,-1 + 525 1444 l 1,0,1 EndSplineSet EndChar StartChar: braceleftbt Encoding: 238 211 175 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -637 420 m 1,0,1 - 621 -113 621 -113 1038 -113 c 1,2,-1 - 984 -162 l 1,3,4 - 549 -160 549 -160 532 432 c 1,5,-1 - 532 1884 l 1,6,-1 - 637 1884 l 1,7,-1 - 637 420 l 1,0,1 +525 420 m 1,0,1 + 509 -113 509 -113 926 -113 c 1,2,-1 + 872 -162 l 1,3,4 + 437 -160 437 -160 420 432 c 1,5,-1 + 420 1884 l 1,6,-1 + 525 1884 l 1,7,-1 + 525 420 l 1,0,1 EndSplineSet EndChar StartChar: braceex Encoding: 239 212 176 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -101 1899 m 1,0,-1 - 101 -161 l 1,1,-1 - 2 -161 l 1,2,-1 - 2 1899 l 1,3,-1 - 101 1899 l 1,0,-1 +519 1899 m 1,0,-1 + 519 -161 l 1,1,-1 + 420 -161 l 1,2,-1 + 420 1899 l 1,3,-1 + 519 1899 l 1,0,-1 EndSplineSet EndChar @@ -5733,44 +5733,44 @@ EndChar StartChar: integraltp Encoding: 243 219 180 Width: 1405 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -672 1804 m 1,0,1 - 584 1844 584 1844 502 1794 c 1,2,3 - 357 1725 357 1725 261.5 1503 c 128,-1,4 - 166 1281 166 1281 140 850 c 1,5,-1 - 140 -162 l 1,6,-1 - 0 -162 l 1,7,-1 - 0 679 l 1,8,9 - 13 1158 13 1158 110 1411.5 c 128,-1,10 - 207 1665 207 1665 341 1777 c 128,-1,11 - 475 1889 475 1889 602 1884 c 1,12,13 - 676 1885 676 1885 729 1830 c 128,-1,14 - 782 1775 782 1775 782 1692 c 1,15,16 - 783 1680 783 1680 781 1669 c 0,17,18 - 774 1619 774 1619 733 1588 c 1,19,20 - 693 1556 693 1556 642.5 1562 c 128,-1,21 - 592 1568 592 1568 562 1608 c 1,22,23 - 531 1647 531 1647 538 1697 c 128,-1,24 - 545 1747 545 1747 586 1779 c 0,25,26 - 624 1809 624 1809 672 1804 c 1,0,1 +1383 1804 m 1,0,1 + 1295 1844 1295 1844 1213 1794 c 1,2,3 + 1068 1725 1068 1725 972.5 1503 c 128,-1,4 + 877 1281 877 1281 851 850 c 1,5,-1 + 851 -162 l 1,6,-1 + 711 -162 l 1,7,-1 + 711 679 l 1,8,9 + 724 1158 724 1158 821 1411.5 c 128,-1,10 + 918 1665 918 1665 1052 1777 c 128,-1,11 + 1186 1889 1186 1889 1313 1884 c 1,12,13 + 1387 1885 1387 1885 1440 1830 c 128,-1,14 + 1493 1775 1493 1775 1493 1692 c 1,15,16 + 1494 1680 1494 1680 1492 1669 c 0,17,18 + 1485 1619 1485 1619 1444 1588 c 1,19,20 + 1404 1556 1404 1556 1353.5 1562 c 128,-1,21 + 1303 1568 1303 1568 1273 1608 c 1,22,23 + 1242 1647 1242 1647 1249 1697 c 128,-1,24 + 1256 1747 1256 1747 1297 1779 c 0,25,26 + 1335 1809 1335 1809 1383 1804 c 1,0,1 EndSplineSet EndChar StartChar: integralex Encoding: 244 217 181 Width: 1405 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -140 1885 m 1,0,-1 - 140 -162 l 1,1,-1 - 0 -162 l 1,2,-1 - 0 1886 l 1,3,-1 - 140 1885 l 1,0,-1 +851 1885 m 1,0,-1 + 851 -162 l 1,1,-1 + 711 -162 l 1,2,-1 + 711 1886 l 1,3,-1 + 851 1885 l 1,0,-1 EndSplineSet EndChar @@ -5784,7 +5784,7 @@ SplineSet 178 -82 m 1,0,1 266 -122 266 -122 348 -73 c 1,2,3 494 -3 494 -3 589.5 219 c 128,-1,4 - 685 441 685 441 711 872 c 1,5,-1 + 685 441 685 441 711 872 c 5,5,-1 711 1884 l 1,6,-1 851 1884 l 1,7,-1 851 1043 l 1,8,9 @@ -5904,62 +5904,62 @@ EndChar StartChar: bracerighttp Encoding: 252 184 189 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1302 m 1,0,1 - 443 1835 443 1835 26 1836 c 1,2,-1 - 80 1884 l 1,3,4 - 515 1883 515 1883 532 1290 c 1,5,-1 - 532 -162 l 1,6,-1 - 427 -162 l 1,7,-1 - 427 1302 l 1,0,1 +420 1302 m 1,0,1 + 436 1835 436 1835 19 1836 c 1,2,-1 + 73 1884 l 1,3,4 + 508 1883 508 1883 525 1290 c 1,5,-1 + 525 -162 l 1,6,-1 + 420 -162 l 1,7,-1 + 420 1302 l 1,0,1 EndSplineSet EndChar StartChar: bracerightmid Encoding: 253 733 190 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1884 m 1,0,-1 - 532 1884 l 1,1,-1 - 532 1475 l 1,2,3 - 527 1211 527 1211 608.5 1079.5 c 128,-1,4 - 690 948 690 948 896 898 c 1,5,-1 - 896 826 l 1,6,7 - 690 728 690 728 610 595 c 128,-1,8 - 530 462 530 462 532 249 c 1,9,-1 - 532 -163 l 1,10,-1 - 427 -163 l 1,11,-1 - 427 267 l 2,12,13 - 427 393 427 393 473 505.5 c 128,-1,14 - 519 618 519 618 584.5 692.5 c 128,-1,15 - 650 767 650 767 852 857 c 1,16,17 - 650 923 650 923 583.5 988 c 128,-1,18 - 517 1053 517 1053 476.5 1158.5 c 128,-1,19 - 436 1264 436 1264 427 1443 c 1,20,-1 - 427 1884 l 1,0,-1 +420 1884 m 1,0,-1 + 525 1884 l 1,1,-1 + 525 1475 l 1,2,3 + 520 1211 520 1211 601.5 1079.5 c 128,-1,4 + 683 948 683 948 889 898 c 1,5,-1 + 889 826 l 1,6,7 + 683 728 683 728 603 595 c 128,-1,8 + 523 462 523 462 525 249 c 1,9,-1 + 525 -163 l 1,10,-1 + 420 -163 l 1,11,-1 + 420 267 l 2,12,13 + 420 393 420 393 466 505.5 c 128,-1,14 + 512 618 512 618 577.5 692.5 c 128,-1,15 + 643 767 643 767 845 857 c 1,16,17 + 643 923 643 923 576.5 988 c 128,-1,18 + 510 1053 510 1053 469.5 1158.5 c 128,-1,19 + 429 1264 429 1264 420 1443 c 1,20,-1 + 420 1884 l 1,0,-1 EndSplineSet EndChar StartChar: bracerightbt Encoding: 254 731 191 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1884 m 1,0,-1 - 532 1884 l 1,1,-1 - 532 432 l 1,2,3 - 515 -160 515 -160 80 -162 c 1,4,-1 - 26 -113 l 1,5,6 - 443 -113 443 -113 427 420 c 1,7,-1 - 427 1884 l 1,0,-1 +420 1884 m 1,0,-1 + 525 1884 l 1,1,-1 + 525 432 l 1,2,3 + 508 -160 508 -160 73 -162 c 1,4,-1 + 19 -113 l 1,5,6 + 436 -113 436 -113 420 420 c 1,7,-1 + 420 1884 l 1,0,-1 EndSplineSet EndChar EndChars diff --git a/fonts/symbol.ttf b/fonts/symbol.ttf index f331787..b0a3fc1 100644 Binary files a/fonts/symbol.ttf and b/fonts/symbol.ttf differ

1 0

Huw Davies : fonts: Increase the version number so that we don' t use the Mac's version of symbol.ttf, which doesn' t contain a Microsoft Symbol charmap.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: f11a3d82a370abc9fb03dbdbb4d6b17ce21647df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11a3d82a370abc9fb03dbdbb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 11 09:49:34 2011 +0000 fonts: Increase the version number so that we don't use the Mac's version of symbol.ttf, which doesn't contain a Microsoft Symbol charmap. (cherry picked from commit 47dee8bda21de80077261cc11bba53adc02a9d19) --- fonts/symbol.sfd | 2 +- fonts/symbol.ttf | Bin 26040 -> 26040 bytes 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fonts/symbol.sfd b/fonts/symbol.sfd index bf34606..44b6302 100644 --- a/fonts/symbol.sfd +++ b/fonts/symbol.sfd @@ -4,7 +4,7 @@ FullName: Symbol FamilyName: Symbol Weight: Book Copyright: WineSymbol © (Jon Parshall for CodeWeavers). 2009. -Version: 0.001 February 3, 2009, initial release +Version: 1.1 February 3, 2009, initial release ItalicAngle: 0 UnderlinePosition: -173 UnderlineWidth: 100 diff --git a/fonts/symbol.ttf b/fonts/symbol.ttf index b0a3fc1..bb54fb8 100644 Binary files a/fonts/symbol.ttf and b/fonts/symbol.ttf differ

1 0

Huw Davies : gdi32: Clear the accel flags.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: b2b0ad736f3fc5a9575d313926710abf7e29add0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b0ad736f3fc5a9575d31392… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 7 11:37:14 2010 +0000 gdi32: Clear the accel flags. (cherry picked from commit aec376dcef20823b81d6c70926e02d5c27c40b3b) --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 532278c4..cd1497e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6230,6 +6230,7 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { glyphset->cbThis = size; glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; } return size; }

1 0

Jacek Caban : aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 609be12dab74b82492022cd1e8e09e26b3f3c9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=609be12dab74b82492022cd1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 21 18:08:38 2010 +0100 aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler. (cherry picked from commit 0b6bfade5240eafe1c9ab5653192dc88ccf31b0d) --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a77f15e..e46da7b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -125,7 +125,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in i[[3456789]]86*) - ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32], + ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32,w64-mingw32],[x86_64-ac_wine_prefix-$2 ])" ;; diff --git a/configure b/configure index 08fd4b0..638d7ba 100755 --- a/configure +++ b/configure @@ -7008,7 +7008,7 @@ if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" then case "$host_cpu" in i[3456789]86*) - ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; + ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; x86_64) ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;; *)

1 0

Alexandre Julliard : krnl386: Fetch version from the PEB to avoid potentially using GetVersionEx before it 's initialized.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: a62026f05fa210f34f5d55c1536df1be2774a4f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62026f05fa210f34f5d55c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 13:17:41 2010 +0100 krnl386: Fetch version from the PEB to avoid potentially using GetVersionEx before it's initialized. (cherry picked from commit 5ce81a9dc2f727dfb8d3fb5db5ea8d0c79459faf) --- dlls/krnl386.exe16/ne_module.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 9f777cc..0bf4bd5 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -917,7 +917,6 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons NE_MODULE *pModule; HMODULE16 hModule; HINSTANCE16 hInstance; - OSVERSIONINFOW versionInfo; SIZE_T mapping_size = ~0UL; /* assume builtins don't contain invalid offsets... */ hModule = build_module( mz_header, mapping_size, file_name ); @@ -927,9 +926,8 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons pModule->owner32 = owner32; /* fake the expected version the module should have according to the current Windows version */ - versionInfo.dwOSVersionInfoSize = sizeof(versionInfo); - if (GetVersionExW( &versionInfo )) - pModule->ne_expver = MAKEWORD( versionInfo.dwMinorVersion, versionInfo.dwMajorVersion ); + pModule->ne_expver = MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion, + NtCurrentTeb()->Peb->OSMinorVersion ); hInstance = NE_DoLoadModule( pModule ); if (hInstance < 32) NE_FreeModule( hModule, 0 );

1 0