September 2008 - Wine-commits

Muneyuki Noguchi : oledlg: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 7d6c52d6472a9527257279594bc626a6a70f32bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6c52d6472a9527257279594… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:39:38 2008 +0900 oledlg: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/oledlg/oledlg_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_Ja.rc b/dlls/oledlg/oledlg_Ja.rc index a412f7d..f96e327 100644 --- a/dlls/oledlg/oledlg_Ja.rc +++ b/dlls/oledlg/oledlg_Ja.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�I�u�W�F�N�g�̑}��" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |

1 0

Muneyuki Noguchi : msacm32: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: d1fbd962431cd3db0d7d548eff733251575dafc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fbd962431cd3db0d7d548ef… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:37:50 2008 +0900 msacm32: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/msacm32/msacm_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/msacm_Ja.rc b/dlls/msacm32/msacm_Ja.rc index 3b15f5a..8efd28f 100644 --- a/dlls/msacm32/msacm_Ja.rc +++ b/dlls/msacm32/msacm_Ja.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�T�E��h�̑I��" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "��O(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP

1 0

Muneyuki Noguchi : wininet: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 6c0c3fdaace2a34a68ad364043f9f77c5b6a1515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0c3fdaace2a34a68ad36404… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:32:10 2008 +0900 wininet: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/wininet/wininet_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Ja.rc b/dlls/wininet/wininet_Ja.rc index 766c042..4d130b1 100644 --- a/dlls/wininet/wininet_Ja.rc +++ b/dlls/wininet/wininet_Ja.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�l�b�g��[�N �p�X��[�h�̓��" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" { LTEXT "��[�U��ƃp�X��[�h��͂��ĉ��:", -1, 40, 6, 150, 15 LTEXT "�v��L�V", -1, 40, 26, 50, 10

1 0

Muneyuki Noguchi : comctl32: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: adb32f76fc05b7db2939f15caf56f2bbceb5da85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb32f76fc05b7db2939f15ca… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:36:22 2008 +0900 comctl32: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/comctl32/comctl_Ja.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl_Ja.rc b/dlls/comctl32/comctl_Ja.rc index b00969a..6152d42 100644 --- a/dlls/comctl32/comctl_Ja.rc +++ b/dlls/comctl32/comctl_Ja.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Properties for %s" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "�L��Z��", IDCANCEL,58,122,50,14 @@ -34,7 +34,7 @@ END IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Wizard" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN PUSHBUTTON "< �߂�(&B)", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "�i��(&N) >", IDC_NEXT_BUTTON,121,138,50,14 @@ -50,7 +50,7 @@ END IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Customize Toolbar" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "��(&C)", IDCANCEL,308,6,44,14 PUSHBUTTON "��Z�b�g(R&)", IDC_RESET_BTN,308,23,44,14

1 0

Muneyuki Noguchi : wineps.drv: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 4d41ea4f7b7307421ab3d874fe7cd1765717855e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d41ea4f7b7307421ab3d874f… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:30:32 2008 +0900 wineps.drv: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/wineps.drv/wps_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/wps_Ja.rc b/dlls/wineps.drv/wps_Ja.rc index 180422d..e7759ff 100644 --- a/dlls/wineps.drv/wps_Ja.rc +++ b/dlls/wineps.drv/wps_Ja.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE CAPTION "�p��" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" { LTEXT "�p��T�C�Y(&z):", -1, 10, 6, 100, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS |

1 0

Jeff Zaroyko : website: fix statement about Sims running on Wine
by Jeremy Newman 26 Sep '08

26 Sep '08

Module: website Branch: master Commit: 79790f599a78c3e476d0dc2c35dc9a70bc070cb0 URL: http://source.winehq.org/git/website.git/?a=commit;h=79790f599a78c3e476d0dc… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Fri Sep 26 23:15:32 2008 +1000 website: fix statement about Sims running on Wine Someone pointed out on the Ubuntu forums that the website ( http://www.winehq.org/site/why ) says The Sims works, but as evidenced by the AppDB it doesn't. >From bc7c369ccf960c3e97bfbfea75471fd498b4231b Mon Sep 17 00:00:00 2001 From: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri, 26 Sep 2008 23:10:21 +1000 Subject: Correction, the Sims doesn't run on Wine, but Spore does. --- templates/en/why.template | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/templates/en/why.template b/templates/en/why.template index aed8245..5f4823c 100644 --- a/templates/en/why.template +++ b/templates/en/why.template @@ -135,8 +135,7 @@ and <a href="http://appdb.winehq.org/appview.php?appId=131">Windows Media Player</a>, and even games such as <a href="http://appdb.winehq.org/appview.php?appId=661">Max Payne</a> or -<a href="http://appdb.winehq.org/appview.php?appId=768">The -SIMS</a>.<br /> +<a href="http://appdb.winehq.org/appview.php?appId=8185">Spore</a>.<br /> Almost any other complex application can be made to run well given a bit of time. And each time that work is done to add one application to this list, many

1 0

Michael Karcher : kernel32: Fix profile sharing mode.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: 004278cb811e9044990b3d5da8dc28ecfcbc2775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=004278cb811e9044990b3d5da… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Fri Sep 19 17:43:21 2008 +0200 kernel32: Fix profile sharing mode. Based on a patch from Austin English. (cherry picked from commit 33ca67dcab8e99d2fddbd2d3a11d73b21ba0ef41) --- dlls/kernel32/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 9b6b1a1..6820218 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -755,7 +755,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) TRACE("path: %s\n", debugstr_w(buffer)); hFile = CreateFileW(buffer, GENERIC_READ | (write_access ? GENERIC_WRITE : 0), - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if ((hFile == INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_FILE_NOT_FOUND))

1 0

Alexandre Julliard : ntdll: Hardcode the filesystem cluster size to avoid trouble on NFS.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: b372ec2cbd0dfcd3ba86819af9c63b533bf5f451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b372ec2cbd0dfcd3ba86819af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 11:32:38 2008 +0200 ntdll: Hardcode the filesystem cluster size to avoid trouble on NFS. (cherry picked from commit b0192cfed382c470e67aaac744de56011fe27bfb) --- dlls/ntdll/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 972d600..3c7fac5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2221,6 +2221,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } else { + ULONGLONG bsize; /* Linux's fstatvfs is buggy */ #if !defined(linux) || !defined(HAVE_FSTATFS) struct statvfs stfs; @@ -2230,7 +2231,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io io->u.Status = FILE_GetNtStatus(); break; } - info->BytesPerSector = stfs.f_frsize; + bsize = stfs.f_frsize; #else struct statfs stfs; if (fstatfs( fd, &stfs ) < 0) @@ -2238,11 +2239,12 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io io->u.Status = FILE_GetNtStatus(); break; } - info->BytesPerSector = stfs.f_bsize; + bsize = stfs.f_bsize; #endif - info->TotalAllocationUnits.QuadPart = stfs.f_blocks; - info->AvailableAllocationUnits.QuadPart = stfs.f_bavail; - info->SectorsPerAllocationUnit = 1; + info->BytesPerSector = 512; + info->SectorsPerAllocationUnit = 8; + info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (512 * 8); + info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (512 * 8); io->Information = sizeof(*info); io->u.Status = STATUS_SUCCESS; }

1 0

Jim Cameron : user32: Fixed bug in loading .cur files.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: d908cc3fa193d33b23a1d95302ba1c6c4a7032f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d908cc3fa193d33b23a1d9530… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Wed Aug 27 21:46:59 2008 +0100 user32: Fixed bug in loading .cur files. (cherry picked from commit 08775c642a3f19ecf1e47b8bdbbc20221442414c) --- dlls/user32/cursoricon.c | 75 ++++++++++++++++++++++++--------------- dlls/user32/tests/cursoricon.c | 3 -- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a1ba570..4927bb2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -660,48 +660,26 @@ static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *d return &dir->idEntries[n]; } -/********************************************************************** - * CreateIconFromResourceEx (USER32.@) - * - * FIXME: Convert to mono when cFlag is LR_MONOCHROME. Do something - * with cbSize parameter as well. - */ -HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, - BOOL bIcon, DWORD dwVersion, - INT width, INT height, - UINT cFlag ) +static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, + POINT16 hotspot, BOOL bIcon, + DWORD dwVersion, + INT width, INT height, + UINT cFlag ) { HGLOBAL16 hObj; static HDC hdcMem; int sizeAnd, sizeXor; HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */ BITMAP bmpXor, bmpAnd; - POINT16 hotspot; - BITMAPINFO *bmi; BOOL DoStretch; INT size; - hotspot.x = ICON_HOTSPOT; - hotspot.y = ICON_HOTSPOT; - - TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", - bits, cbSize, dwVersion, width, height, - bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); if (dwVersion == 0x00020000) { FIXME_(cursor)("\t2.xx resources are not supported\n"); return 0; } - if (bIcon) - bmi = (BITMAPINFO *)bits; - else /* get the hotspot */ - { - POINT16 *pt = (POINT16 *)bits; - hotspot = *pt; - bmi = (BITMAPINFO *)(pt + 1); - } - /* Check bitmap header */ if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && @@ -873,6 +851,41 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, /********************************************************************** + * CreateIconFromResourceEx (USER32.@) + * + * FIXME: Convert to mono when cFlag is LR_MONOCHROME. Do something + * with cbSize parameter as well. + */ +HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, + BOOL bIcon, DWORD dwVersion, + INT width, INT height, + UINT cFlag ) +{ + POINT16 hotspot; + BITMAPINFO *bmi; + + hotspot.x = ICON_HOTSPOT; + hotspot.y = ICON_HOTSPOT; + + TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", + bits, cbSize, dwVersion, width, height, + bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); + + if (bIcon) + bmi = (BITMAPINFO *)bits; + else /* get the hotspot */ + { + POINT16 *pt = (POINT16 *)bits; + hotspot = *pt; + bmi = (BITMAPINFO *)(pt + 1); + } + + return CURSORICON_CreateIconFromBMI( bmi, hotspot, bIcon, dwVersion, + width, height, cFlag ); +} + + +/********************************************************************** * CreateIconFromResource (USER32.@) */ HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize, @@ -891,6 +904,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, DWORD filesize = 0; HICON hIcon = 0; LPBYTE bits; + POINT16 hotspot; TRACE("loading %s\n", debugstr_w( filename )); @@ -926,8 +940,11 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, if ( entry->dwDIBOffset + entry->dwDIBSize > filesize ) goto end; - hIcon = CreateIconFromResourceEx( &bits[entry->dwDIBOffset], entry->dwDIBSize, - !fCursor, 0x00030000, width, height, loadflags ); + hotspot.x = entry->xHotspot; + hotspot.y = entry->yHotspot; + hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset], + hotspot, !fCursor, 0x00030000, + width, height, loadflags ); end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); UnmapViewOfFile( bits ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index e00c45e..bc24bea 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -813,7 +813,6 @@ static void test_LoadImage(void) /* Test loading an icon as a cursor. */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); - todo_wine ok(handle != NULL, "LoadImage() failed.\n"); error = GetLastError(); ok(error == 0, "Last error: %u\n", error); @@ -821,7 +820,6 @@ static void test_LoadImage(void) /* Test the icon information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); - todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); @@ -838,7 +836,6 @@ static void test_LoadImage(void) /* Clean up. */ SetLastError(0xdeadbeef); ret = DestroyCursor(handle); - todo_wine ok(ret, "DestroyCursor() failed.\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error);

1 0

Henri Verbeet : msvcrt: Don't depend on the system's implementation of acos () & asin().
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: stable Commit: 81c6271783a79ff1c836aaf3b1b5a1a00a264480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c6271783a79ff1c836aaf3b… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Fri Aug 29 02:11:53 2008 +0200 msvcrt: Don't depend on the system's implementation of acos() & asin(). (cherry picked from commit 71aa14af993dd065b1882675fb9f01af44ed232a) --- dlls/msvcrt/math.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b449af5..25ac69f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -57,7 +57,12 @@ static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; double CDECL MSVCRT_acos( double x ) { if (x < -1.0 || x > 1.0 || !finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; - return acos(x); + /* glibc implements acos() as the FPU equivalent of atan2(sqrt(1 - x ^ 2), x). + * asin() uses a similar construction. This is bad because as x gets nearer to + * 1 the error in the expression "1 - x^2" can get relatively large due to + * cancellation. The sqrt() makes things worse. A safer way to calculate + * acos() is to use atan2(sqrt((1 - x) * (1 + x)), x). */ + return atan2(sqrt((1 - x) * (1 + x)), x); } /********************************************************************* @@ -66,7 +71,7 @@ double CDECL MSVCRT_acos( double x ) double CDECL MSVCRT_asin( double x ) { if (x < -1.0 || x > 1.0 || !finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; - return asin(x); + return atan2(x, sqrt((1 - x) * (1 + x))); } /*********************************************************************

1 0