October 2008 - Wine-commits

Juan Lang : cryptui: Fix destination store for self-signed certs.
by Alexandre Julliard 29 Oct '08

29 Oct '08

Module: wine Branch: master Commit: b7fa4a77123fd62886c85731fe246f240952f7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fa4a77123fd62886c85731f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 28 11:17:50 2008 -0700 cryptui: Fix destination store for self-signed certs. --- dlls/cryptui/main.c | 14 +------------- dlls/cryptui/tests/cryptui.c | 1 - 2 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 3b116f0..afb8491 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -182,27 +182,15 @@ static BOOL is_ca_cert(PCCERT_CONTEXT cert, BOOL defaultIfNotSpecified) return isCA; } -static inline BOOL is_cert_self_signed(PCCERT_CONTEXT cert) -{ - return CertCompareCertificateName(cert->dwCertEncodingType, - &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); -} - static HCERTSTORE choose_store_for_cert(PCCERT_CONTEXT cert) { - static const WCHAR Root[] = {'R','o','o','t',0}; static const WCHAR AddressBook[] = { 'A','d','d','r','e','s','s', 'B','o','o','k',0 }; static const WCHAR CA[] = { 'C','A',0 }; LPCWSTR storeName; if (is_ca_cert(cert, TRUE)) - { - if (is_cert_self_signed(cert)) - storeName = Root; - else - storeName = CA; - } + storeName = CA; else storeName = AddressBook; return CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 773168c..c96bcb5 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -373,7 +373,6 @@ static void test_crypt_ui_wiz_import(void) info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); - todo_wine ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) {

1 0

Owen Rudge : appwiz.cpl: Use MS Shell Dlg instead of MS Sans Serif for dialog boxes.
by Alexandre Julliard 29 Oct '08

29 Oct '08

Module: wine Branch: master Commit: 0abb8658cbd19677a787bb2abf9c1250d221c12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0abb8658cbd19677a787bb2ab… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Oct 28 19:04:11 2008 +0000 appwiz.cpl: Use MS Shell Dlg instead of MS Sans Serif for dialog boxes. --- dlls/appwiz.cpl/En.rc | 4 ++-- dlls/appwiz.cpl/Fr.rc | 4 ++-- dlls/appwiz.cpl/Ko.rc | 4 ++-- dlls/appwiz.cpl/Nl.rc | 4 ++-- dlls/appwiz.cpl/No.rc | 4 ++-- dlls/appwiz.cpl/Ru.rc | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index 22c0879..f04af8e 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -40,7 +40,7 @@ STRINGTABLE IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Install/Uninstall" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "To install a new program from a floppy disk, CD-ROM drive, or your hard drive, click Install.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Install...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 @@ -56,7 +56,7 @@ FONT 8, "MS Sans Serif" IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Support Information" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 CONTROL "The following information can be used to get technical support for %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index ab2e0a3..20bfa6e 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -40,7 +40,7 @@ STRINGTABLE IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation/D�sinstallation" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "Pour installer un nouveau programme � partir d'une disquette, d'un cdrom ou de votre disque dur, cliquer sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Installer", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 @@ -56,7 +56,7 @@ CONTROL "Pour installer un nouveau programme IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Information pour support" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 CONTROL "Les informations suivantes peuvent �tre utilis�es pour obtenir un support technique pour %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index 1399b1f..9adc0c5 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -40,7 +40,7 @@ STRINGTABLE IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "��ġ/��" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "�÷�� ũ�� õ��̳� ,�ϵ��ũ�� α׷�� ġ�Ϸ�� [��ġ]�� Ŭ��Ͻʽÿ�.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "��ġ(&I)...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 @@ -56,7 +56,7 @@ FONT 8, "MS Sans Serif" IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� " -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "Ȯ��", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 CONTROL "�� %s: �� ޱ� �� ˴ϴ�", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 696dc20..82d8f21 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -40,7 +40,7 @@ STRINGTABLE IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installeren/Verwijderen" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "Om een programma te installeren vanaf een floppy disk, CD-ROM drive, of uw hard disk, click op Installeren.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Installeren...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 @@ -56,7 +56,7 @@ FONT 8, "MS Sans Serif" IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Support Informatie" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 CONTROL "De volgende informatie kan gebruikt worden om technische ondersteuning te krijgen voor %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index 5658773..0060ea0 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -40,7 +40,7 @@ STRINGTABLE IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installer/Avinstaller" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "Trykk �Installer� for � installere et program fra en diskett, CD-stasjon eller annet medium.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 @@ -56,7 +56,7 @@ FONT 8, "MS Sans Serif" IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "St�tteinformasjon" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 CONTROL "F�lgende informasjon kan brukes til � f� teknisk st�tte for %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc index cfb77c0..4510c5e 100644 --- a/dlls/appwiz.cpl/Ru.rc +++ b/dlls/appwiz.cpl/Ru.rc @@ -40,7 +40,7 @@ STRINGTABLE IDD_MAIN DIALOG 0, 0, 320, 235 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "��/��" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "�� CD-ROM, �� , �� .", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "��&��...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 @@ -56,7 +56,7 @@ CONTROL " IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� " -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 CONTROL "�� %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 23

1 0

Katayama Hirofumi MZ : notepad: Don't save maximized size.
by Alexandre Julliard 29 Oct '08

29 Oct '08

Module: wine Branch: master Commit: 873b971bb7c9fa9ef9463bc848b8c2641eea4fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873b971bb7c9fa9ef9463bc84… Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> Date: Fri Oct 24 21:10:11 2008 +0900 notepad: Don't save maximized size. --- programs/notepad/main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index a9d3c3b..1751c90 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -119,8 +119,11 @@ static VOID NOTEPAD_SaveSettingToRegistry(void) REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disp) == ERROR_SUCCESS) { DWORD data; + WINDOWPLACEMENT wndpl; - GetWindowRect(Globals.hMainWnd, &main_rect); + wndpl.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(Globals.hMainWnd, &wndpl); + main_rect = wndpl.rcNormalPosition; #define SET_NOTEPAD_REG(hkey, value_name, value_data) do { DWORD data = (DWORD)(value_data); RegSetValueEx(hkey, value_name, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); }while(0) SET_NOTEPAD_REG(hkey, value_fWrap, Globals.bWrapLongLines);

1 0

Juan Lang : cryptui: Fix a failing test on Windows.
by Alexandre Julliard 29 Oct '08

29 Oct '08

Module: wine Branch: master Commit: 472984f565b3c3b73563853139b8628158ef688f URL: http://source.winehq.org/git/wine.git/?a=commit;h=472984f565b3c3b7356385313… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 28 11:10:18 2008 -0700 cryptui: Fix a failing test on Windows. --- dlls/cryptui/tests/cryptui.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 2ffc83e..773168c 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -368,7 +368,7 @@ static void test_crypt_ui_wiz_import(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); /* Imports the following cert--self-signed, with no basic constraints set-- - * to the root store. Puts up a dialog at the end if it succeeds or fails. + * to the CA store. Puts up a dialog at the end if it succeeds or fails. */ info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); @@ -377,15 +377,15 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR Root[] = { 'R','o','o','t',0 }; - HCERTSTORE root = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, Root); + static const WCHAR CA[] = { 'C','A',0 }; + HCERTSTORE ca = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, CA); - if (root) + if (ca) { - find_and_delete_cert_in_store(root, "root", info.u.pCertContext, - "v1CertWithValidPubKey", FALSE); - CertCloseStore(root, 0); + find_and_delete_cert_in_store(ca, "CA", + info.u.pCertContext, "v1CertWithValidPubKey", FALSE); + CertCloseStore(ca, 0); } } CertFreeCertificateContext(info.u.pCertContext);

1 0

Scott Ritchie : Update download-deb page to refer to Ubuntu 8.10
by Jeremy Newman 28 Oct '08

28 Oct '08

Module: website Branch: master Commit: bbec0115efc7494ab1a8c06cdf4192234cb3bd68 URL: http://source.winehq.org/git/website.git/?a=commit;h=bbec0115efc7494ab1a8c0… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Oct 27 22:17:20 2008 -0700 Update download-deb page to refer to Ubuntu 8.10 Update download-deb page to refer to Ubuntu 8.10 >From 0d9810e7baf01c51399e4acd2a9fc5fa2276ec4d Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Mon, 27 Oct 2008 17:00:47 -0700 Subject: Update download page to refer to Ubuntu 8.10, move up in the distro list --- templates/en/download.template | 54 ++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 55ebe7b..54a2b03 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -20,6 +20,33 @@ for post-installation instructions. <td align="center" bgcolor="black">Notes</td> <td align="center" bgcolor="black">Maintainer</td> </tr> + + <tr bgcolor="#ffffff"> + <td align="center"><a href="{$root}/site/download-deb"> + <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> + </td> + <td> <a href="{$root}/site/download-deb">Ubuntu</a> + binary and source .debs for Ubuntu Hardy (8.04) and Intrepid (8.10) + <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center"><a href="{$root}/site/download-deb"> + <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a> + </td> + <td> <a href="{$root}/site/download-deb">Debian</a> + binary and source .debs for Debian Etch (4.0)</td> + <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center"><a href="http://www.freshports.org/emulators/wine/"> + <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> + </td> + <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> + source for FreeBSD 5.3 or later</td> + <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> + </tr> <tr bgcolor="#ffffff"> <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> @@ -64,33 +91,6 @@ for post-installation instructions. binary .tgz for Slackware 10.2</td> <td><a href="mailto:sadam(a)clemson.edu">Adam Schreiber</a></td> </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/site/download-deb"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> - </td> - <td> <a href="{$root}/site/download-deb">Ubuntu</a> - binary and source .debs for Ubuntu Hardy (8.04) - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/site/download-deb"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a> - </td> - <td> <a href="{$root}/site/download-deb">Debian</a> - binary and source .debs for Debian Etch (4.0)</td> - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> - source for FreeBSD 5.3 or later</td> - <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> - </tr> <tr bgcolor="#ffffff"> <td align="center"><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">

1 0

Scott Ritchie : Redo download-deb page to give graphical instructions
by Jeremy Newman 28 Oct '08

28 Oct '08

Module: website Branch: master Commit: e8c0b5f573471025069e61c349fa182de45681de URL: http://source.winehq.org/git/website.git/?a=commit;h=e8c0b5f573471025069e61… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Oct 27 22:18:28 2008 -0700 Redo download-deb page to give graphical instructions Redo download-deb page to give graphical instructions >From badb0fe73d8293a52b39648d39f29a3ac3790281 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Mon, 27 Oct 2008 20:35:34 -0700 Subject: Redo download-deb page to give graphical instructions --- images/distro/synaptic-repository-binary.png | Bin 27654 -> 0 bytes images/distro/synaptic-repository-binary3.png | Bin 18631 -> 0 bytes images/distro/synaptic-repository-deb.png | Bin 22298 -> 0 bytes images/distro/synaptic-repository-source.png | Bin 27874 -> 0 bytes images/distro/synaptic-repository-source3.png | Bin 18683 -> 0 bytes images/distro/ubuntu-softwaresources1.png | Bin 0 -> 48850 bytes images/distro/ubuntu-softwaresources2.png | Bin 0 -> 36288 bytes templates/en/download-deb.template | 70 ++++++++++++++----------- 8 files changed, 40 insertions(+), 30 deletions(-) diff --git a/images/distro/synaptic-repository-binary.png b/images/distro/synaptic-repository-binary.png deleted file mode 100644 index 251d91b..0000000 Binary files a/images/distro/synaptic-repository-binary.png and /dev/null differ diff --git a/images/distro/synaptic-repository-binary3.png b/images/distro/synaptic-repository-binary3.png deleted file mode 100644 index 3a7e426..0000000 Binary files a/images/distro/synaptic-repository-binary3.png and /dev/null differ diff --git a/images/distro/synaptic-repository-deb.png b/images/distro/synaptic-repository-deb.png deleted file mode 100644 index 52257f4..0000000 Binary files a/images/distro/synaptic-repository-deb.png and /dev/null differ diff --git a/images/distro/synaptic-repository-source.png b/images/distro/synaptic-repository-source.png deleted file mode 100644 index 5dcc76e..0000000 Binary files a/images/distro/synaptic-repository-source.png and /dev/null differ diff --git a/images/distro/synaptic-repository-source3.png b/images/distro/synaptic-repository-source3.png deleted file mode 100644 index cb7f8f0..0000000 Binary files a/images/distro/synaptic-repository-source3.png and /dev/null differ diff --git a/images/distro/ubuntu-softwaresources1.png b/images/distro/ubuntu-softwaresources1.png new file mode 100644 index 0000000..f64f15f Binary files /dev/null and b/images/distro/ubuntu-softwaresources1.png differ diff --git a/images/distro/ubuntu-softwaresources2.png b/images/distro/ubuntu-softwaresources2.png new file mode 100644 index 0000000..a4bdb12 Binary files /dev/null and b/images/distro/ubuntu-softwaresources2.png differ diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index 2961047..b7b557e 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -4,53 +4,63 @@ Wine for Ubuntu, Debian, and Debian-based distributions <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></h1> -Debian and Debian-based distributions such as Ubuntu utilize a special tool -for managing packages known as APT. APT is able to automagically install all of -the needed dependencies for a software package, as well as keep the package -up to date, by scanning what are known as APT repositories. Debian-based +Ubuntu and other Debian-based distributions utilize a special tool for +managing packages known as APT. APT is able to automagically install all of +the needed dependencies for a software package, as well as keep the package up +to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software that include Wine, -however we keep our own repository of the latest available beta packages here for -download. +however we keep our own repository of the latest available beta packages here +for download. -There used to be graphical instructions here, however we have found that the -terminal commands are actually simpler to describe and quicker for the user to -input. Because the commands below use sudo, you may have to enter your user -password after hitting enter. +<h2>Warning: These are beta packages</h2> -<h2>Warning: These are development packages</h2> - -The packages here are development packages. This means they will -periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an update may break functionality in Wine. If the latest -stable release of Wine (currently Wine 1.0) works for you, then you may not want -to use the development packages. +The packages here are beta packages. This means they will +periodically suffer from +<a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an +update may break functionality in Wine. If the latest stable release of Wine +(currently Wine 1.0.1) works for you, then you may not want to use these +beta packages. <h2>Adding the WineHQ APT Repository:</h2> -First, open a terminal window (Applications->Accessories->Terminal). On -Debian, you will need to open a root terminal. Then add the repository's key -to your system's list of trusted APT keys by copy and pasting the following: +Open the Software Sources menu by going to +System->Administration->Software Sources. Then select the Third +Party Software tab and click Add. -wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - +<img src="{$root}/images/distro/ubuntu-softwaresources1.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> -Next, add the repository to your system's list of APT sources: +Then, copy and paste one of the lines below depending on which +version you are running. -For Ubuntu Hardy (8.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Intrepid (8.10): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list +deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" +For Ubuntu Hardy (8.04): +deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" For Debian Lenny (5.0): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/lenny.list -O /etc/apt/sources.list.d/winehq.list +deb http://wine.budgetdedicated.com/apt lenny main #WineHQ - Debian 5.0 "Lenny" + +<h2>Trusting the WineHQ APT Repository and installing Wine:</h2> + +After adding the repository, you also need to add the key for the repository +to your system's list of trusted keys. + +<a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Download +and save Scott Ritchie's key</a> to your desktop. Then open the +Authentication tab, click import key file, and select the key +file you just saved (Scott Ritchie.gpg). It is safe to delete this file after +doing this step. -Then update APT's package information by running 'sudo apt-get update'. +<img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> -If you are using Ubuntu, you can now install Wine by <a href="apt://wine"> -clicking this link</a>. Alternatively, you can install by going to -Applications->Add/Remove and searching for Wine. +Click close to finish, and then reload the package information. If +you have Wine installed, the system's update manager will now inform you of the +latest Wine beta release and prompt you to upgrade. If you haven't installed +Wine yet, go to Applications->Add/Remove and search for Wine. <h2>Upgrading to a new version of Ubuntu</h2> If you are upgrading the entire system, such as going from Ubuntu 8.04 to -8.10, you will need to come back to this page and enter the command for the new +8.10, you will need to come back to this page and add the repository for the new version above. The built in update manager will not switch the Wine repository automatically.

1 0

Bobby Bingham : gdi32: Add support for the GGO_UNHINTED flag in GetGlyphOutline.
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: a900f5e06509237ea87d81eda5ee67a150571afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a900f5e06509237ea87d81eda… Author: Bobby Bingham <uhmmmm(a)gmail.com> Date: Sun Oct 26 18:20:13 2008 -0400 gdi32: Add support for the GGO_UNHINTED flag in GetGlyphOutline. --- dlls/gdi32/freetype.c | 5 +++++ include/wingdi.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 313e625..2e64038 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4373,6 +4373,11 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, original_index = glyph_index; } + if(format & GGO_UNHINTED) { + load_flags |= FT_LOAD_NO_HINTING; + format &= ~GGO_UNHINTED; + } + /* tategaki never appears to happen to lower glyph index */ if (glyph_index < TATEGAKI_LOWER_BOUND ) tategaki = FALSE; diff --git a/include/wingdi.h b/include/wingdi.h index 322a267..e7be055 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1294,6 +1294,7 @@ typedef struct #define GGO_GRAY4_BITMAP 5 #define GGO_GRAY8_BITMAP 6 #define GGO_GLYPH_INDEX 0x80 +#define GGO_UNHINTED 0x100 #ifdef __WINESRC__ #define WINE_GGO_GRAY16_BITMAP 0x7f

1 0

Alexandre Julliard : ntdll: Ignore some system directories in NtQueryDirectoryFile to avoid recursion troubles .
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: f0fed2831a6c6b305681b857729fce348691eaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fed2831a6c6b305681b8577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 28 13:55:24 2008 +0100 ntdll: Ignore some system directories in NtQueryDirectoryFile to avoid recursion troubles. --- dlls/ntdll/directory.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index dee0ce6..60f85ed 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -23,6 +23,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include <sys/types.h> #ifdef HAVE_DIRENT_H # include <dirent.h> @@ -136,6 +137,15 @@ static inline int getdents64( int fd, char *de, unsigned int size ) #define MAX_DIR_ENTRY_LEN 255 /* max length of a directory entry in chars */ +#define MAX_IGNORED_FILES 4 + +static struct +{ + dev_t dev; + ino_t ino; +} ignored_files[MAX_IGNORED_FILES]; +static int ignored_files_count; + static const unsigned int max_dir_info_size = FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[MAX_DIR_ENTRY_LEN] ); static int show_dot_files = -1; @@ -172,6 +182,28 @@ static inline int is_valid_mounted_device( const struct stat *st ) #endif } +static inline void ignore_file( const char *name ) +{ + struct stat st; + assert( ignored_files_count < MAX_IGNORED_FILES ); + if (!stat( name, &st )) + { + ignored_files[ignored_files_count].dev = st.st_dev; + ignored_files[ignored_files_count].ino = st.st_ino; + ignored_files_count++; + } +} + +static inline BOOL is_ignored_file( const struct stat *st ) +{ + unsigned int i; + + for (i = 0; i < ignored_files_count; i++) + if (ignored_files[i].dev == st->st_dev && ignored_files[i].ino == st->st_ino) + return TRUE; + return FALSE; +} + /*********************************************************************** * get_default_com_device * @@ -694,6 +726,14 @@ static void init_options(void) NtClose( hkey ); } NtClose( root ); + + /* a couple of directories that we don't want to return in directory searches */ + ignore_file( wine_get_config_dir() ); + ignore_file( "/dev" ); + ignore_file( "/proc" ); +#ifdef linux + ignore_file( "/sys" ); +#endif } @@ -929,6 +969,11 @@ static FILE_BOTH_DIR_INFORMATION *append_entry( void *info_ptr, ULONG_PTR *pos, if (stat( long_name, &st ) == -1) return NULL; if (S_ISDIR( st.st_mode )) info->FileAttributes |= FILE_ATTRIBUTE_REPARSE_POINT; } + if (is_ignored_file( &st )) + { + TRACE( "ignoring file %s\n", long_name ); + return NULL; + } info->NextEntryOffset = total_len; info->FileIndex = 0; /* NTFS always has 0 here, so let's not bother with it */

1 0

Alexandre Julliard : ntdll: Use the end of the reserved area as address space limit, in case we have more than 3Gb available.
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: 56788cc5b6bfe2d5bf86eb62385d2427ee8eeed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56788cc5b6bfe2d5bf86eb623… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 28 13:51:36 2008 +0100 ntdll: Use the end of the reserved area as address space limit, in case we have more than 3Gb available. --- dlls/ntdll/virtual.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 527dedd..812d351 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -122,14 +122,14 @@ static RTL_CRITICAL_SECTION csVirtual = { &critsect_debug, -1, 0, 0, 0, 0 }; # define page_shift 12 # define page_size 0x1000 /* Note: these are Windows limits, you cannot change them. */ -# define ADDRESS_SPACE_LIMIT ((void *)0xc0000000) /* top of the total available address space */ -# define USER_SPACE_LIMIT ((void *)0x7fff0000) /* top of the user address space */ +static void *address_space_limit = (void *)0xc0000000; /* top of the total available address space */ +static void *user_space_limit = (void *)0x7fff0000; /* top of the user address space */ #else static UINT page_shift; static UINT page_size; static UINT_PTR page_mask; -# define ADDRESS_SPACE_LIMIT 0 /* no limit needed on other platforms */ -# define USER_SPACE_LIMIT 0 /* no limit needed on other platforms */ +static void * const address_space_limit = 0; /* no limit needed on other platforms */ +static void * const user_space_limit = 0; /* no limit needed on other platforms */ #endif /* __i386__ */ #define ROUND_ADDR(addr,mask) \ @@ -141,7 +141,6 @@ static UINT_PTR page_mask; #define VIRTUAL_DEBUG_DUMP_VIEW(view) \ do { if (TRACE_ON(virtual)) VIRTUAL_DumpView(view); } while (0) -static void *user_space_limit = USER_SPACE_LIMIT; static void *preload_reserve_start; static void *preload_reserve_end; static int use_locks; @@ -685,7 +684,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, if (base) { - if (is_beyond_limit( base, size, ADDRESS_SPACE_LIMIT )) + if (is_beyond_limit( base, size, address_space_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; switch (wine_mmap_is_in_reserved_area( base, size )) @@ -1168,6 +1167,13 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } +static int get_address_space_limit( void *base, size_t size, void *arg ) +{ + void **limit = arg; + if ((char *)base + size > (char *)*limit) *limit = (char *)base + size; + return 1; +} + /*********************************************************************** * virtual_init */ @@ -1191,6 +1197,8 @@ void virtual_init(void) preload_reserve_end = (void *)end; } } + if (address_space_limit) + wine_mmap_enum_reserved_areas( get_address_space_limit, &address_space_limit, 1 ); } @@ -1387,7 +1395,7 @@ void VIRTUAL_UseLargeAddressSpace(void) { /* no large address space on win9x */ if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; - user_space_limit = ADDRESS_SPACE_LIMIT; + user_space_limit = address_space_limit; } @@ -1449,7 +1457,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ /* disallow low 64k, wrap-around and kernel space */ if (((char *)base < (char *)0x10000) || ((char *)base + size < (char *)base) || - is_beyond_limit( base, size, ADDRESS_SPACE_LIMIT )) + is_beyond_limit( base, size, address_space_limit )) return STATUS_INVALID_PARAMETER; } else @@ -1730,7 +1738,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, return STATUS_INVALID_INFO_CLASS; } } - if (ADDRESS_SPACE_LIMIT && addr >= ADDRESS_SPACE_LIMIT) + if (address_space_limit && addr >= address_space_limit) return STATUS_WORKING_SET_LIMIT_RANGE; if (process != NtCurrentProcess()) @@ -1781,7 +1789,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } size = (char *)user_space_limit - alloc_base; } - else size = (char *)ADDRESS_SPACE_LIMIT - alloc_base; + else size = (char *)address_space_limit - alloc_base; view = NULL; break; }

1 0

Nicolas Le Cam : wininet/tests: Fix a failing test on IE6.
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: 6c7720e2ce3b3bc9a06a0a9bb8f4735fa6b16cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7720e2ce3b3bc9a06a0a9bb… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Oct 28 00:34:22 2008 +0100 wininet/tests: Fix a failing test on IE6. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1c686c8..01471ac 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1979,9 +1979,9 @@ static void test_bogus_accept_types_array(void) size = sizeof(buffer); ret = HttpQueryInfo(req, HTTP_QUERY_ACCEPT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); - ok(!strcmp(buffer, ", */*, %p, , */*") || /* IE6 */ + ok(!strcmp(buffer, ", */*, %p, , , */*") || /* IE6 */ !strcmp(buffer, "*/*, %p, */*"), - "got '%s' expected '*/*, %%p, */*' or ', */*, %%p, , */*'\n", buffer); + "got '%s' expected '*/*, %%p, */*' or ', */*, %%p, , , */*'\n", buffer); InternetCloseHandle(req); InternetCloseHandle(con);

1 0