July 2010 - Wine-commits - list.winehq.org

Michael Stefaniuc : progman: Fix the sizes of a dialog in the Romanian translation.
by Alexandre Julliard 06 Jul '10

06 Jul '10

Module: wine Branch: master Commit: 28c48c21f7b4c8601056b9a043718281f78bb7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c48c21f7b4c8601056b9a04… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 6 00:33:44 2010 +0200 progman: Fix the sizes of a dialog in the Romanian translation. --- programs/progman/Ro.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/progman/Ro.rc b/programs/progman/Ro.rc index 2016803..1402db7 100644 --- a/programs/progman/Ro.rc +++ b/programs/progman/Ro.rc @@ -155,19 +155,19 @@ PUSHBUTTON "A&jutor", PM_HELP, 185, 85, 80, 15, WS_TABSTOP /* Dialog `Symbol' */ -DIALOG_SYMBOL DIALOG 0, 0, 200, 85 +DIALOG_SYMBOL DIALOG 0, 0, 215, 85 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Schimbare pictogramă" { -LTEXT "Nume de &fișier:", PM_ICON_FILE_TXT, 5, 15, 40, 10 -EDITTEXT PM_ICON_FILE, 45, 15, 85, 15, WS_TABSTOP -LTEXT "P&ictogramă curentă:", PM_SYMBOL_LIST_TXT, 5, 30, 125, 10 -COMBOBOX PM_SYMBOL_LIST, 5, 40, 125, 50, +LTEXT "Nume de &fișier:", PM_ICON_FILE_TXT, 5, 15, 50, 10 +EDITTEXT PM_ICON_FILE, 60, 15, 85, 15, WS_TABSTOP +LTEXT "P&ictogramă curentă:", PM_SYMBOL_LIST_TXT, 5, 35, 125, 10 +COMBOBOX PM_SYMBOL_LIST, 5, 45, 140, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OWNERDRAWFIXED | WS_TABSTOP -DEFPUSHBUTTON "OK", IDOK, 135, 5, 60, 15, WS_TABSTOP -PUSHBUTTON "Renunță", IDCANCEL, 135, 25, 60, 15, WS_TABSTOP -PUSHBUTTON "Na&vigare...", PM_BROWSE, 135, 45, 60, 15, WS_TABSTOP -PUSHBUTTON "A&jutor", PM_HELP, 135, 65, 60, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 150, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 150, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "Na&vigare...", PM_BROWSE, 150, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "A&jutor", PM_HELP, 150, 65, 60, 15, WS_TABSTOP } /* Dialog `Execute' */

1 0

Michael Stefaniuc : wordpad: Add the Romanian translation.
by Alexandre Julliard 06 Jul '10

06 Jul '10

Module: wine Branch: master Commit: 58c0f2de169e572466f3a8d8266d18f60fbf0860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c0f2de169e572466f3a8d82… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 6 00:34:18 2010 +0200 wordpad: Add the Romanian translation. Translation by Claudia Cotună, reviewed by Alexandru Băluț. --- programs/wordpad/Makefile.in | 1 + programs/wordpad/Ro.rc | 267 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58c0f2de169e572466f3a…

1 0

Ken Sharp : mapi32: Add Welsh resource.
by Alexandre Julliard 06 Jul '10

06 Jul '10

Module: wine Branch: master Commit: d7b8831a8d48712d8f7610ebc99b20153214b687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b8831a8d48712d8f7610ebc… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Tue Jun 15 07:58:56 2010 +0100 mapi32: Add Welsh resource. --- dlls/mapi32/Cy.rc | 31 +++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Cy.rc b/dlls/mapi32/Cy.rc new file mode 100644 index 0000000..1003a9e --- /dev/null +++ b/dlls/mapi32/Cy.rc @@ -0,0 +1,31 @@ +/* + * Cefnogaeth iaith Cymraeg + * Welsh language support + * + * Copyright 2010 Ken Sharp +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +LANGUAGE LANG_WELSH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Mail anfon methu fel nad oes gennych gleient mail MAPI gorseddedig." + IDS_SEND_MAIL, "Anfon Mail" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 6197cd5..120f4bd 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ util.c RC_SRCS = \ + Cy.rc \ Da.rc \ De.rc \ En.rc \

1 0

Ken Sharp : msrle32: Add Welsh resource.
by Alexandre Julliard 06 Jul '10

06 Jul '10

Module: wine Branch: master Commit: e39243e232e7e14a69a13a781720d3176a307f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39243e232e7e14a69a13a781… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Tue Jun 15 08:02:58 2010 +0100 msrle32: Add Welsh resource. --- dlls/msrle32/Makefile.in | 1 + dlls/msrle32/msrle_Cy.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 1c0828e..a54f0fe 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = msrle32.c RC_SRCS = \ msrle_Bg.rc \ msrle_Cs.rc \ + msrle_Cy.rc \ msrle_Da.rc \ msrle_De.rc \ msrle_En.rc \ diff --git a/dlls/msrle32/msrle_Cy.rc b/dlls/msrle32/msrle_Cy.rc new file mode 100644 index 0000000..59a36cb --- /dev/null +++ b/dlls/msrle32/msrle_Cy.rc @@ -0,0 +1,33 @@ +/* + * Cefnogaeth iaith Cymraeg + * Welsh language support + * + * Copyright 2010 Ken Sharp + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msrle_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_WELSH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE 'n fideo codec" + IDS_ABOUT "Wine MS-RLE 'n fideo codec\nHawlfraint 2002 Michael Günnewig" +}

1 0

Alexandre Julliard : ntdll/tests: Fix a few test failures in the new exe protection tests.
by Alexandre Julliard 06 Jul '10

06 Jul '10

Module: wine Branch: master Commit: 604f79dbdba40776b0aa43ac1f6e35dd21f977dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=604f79dbdba40776b0aa43ac1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 11:19:05 2010 +0200 ntdll/tests: Fix a few test failures in the new exe protection tests. --- dlls/ntdll/tests/info.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 094d562..13c29f8 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -993,9 +993,11 @@ static void test_queryvirtualmemory(void) status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); - ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE); + ok (mbi.AllocationProtect == PAGE_READWRITE || mbi.AllocationProtect == PAGE_EXECUTE_READWRITE, + "mbi.AllocationProtect is 0x%x\n", mbi.AllocationProtect); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); + ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_EXECUTE_READWRITE, + "mbi.Protect is 0x%x\n", mbi.Protect); trace("Check flags of stack\n"); status = pNtQueryVirtualMemory(NtCurrentProcess(), stackbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); @@ -1011,7 +1013,8 @@ static void test_queryvirtualmemory(void) ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - todo_wine ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY); + if (mbi.Protect != PAGE_READONLY) + todo_wine ok( mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY); trace("Check flags of read-write global data (.bss)\n"); status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);

1 0

Stefan Dösinger : d3d9: Ignore a Windows 7 failure in the d3d9 depth clamp test.
by Alexandre Julliard 06 Jul '10

06 Jul '10

Module: wine Branch: master Commit: cb4ba6a86210f38c1840928cd4df88718c7fbd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4ba6a86210f38c1840928cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 10:53:14 2010 +0200 d3d9: Ignore a Windows 7 failure in the d3d9 depth clamp test. --- dlls/d3d9/tests/visual.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a17588b..c0cd79d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10862,6 +10862,17 @@ static void depth_clamp_test(IDirect3DDevice9 *device) vp.MaxZ = 7.5; hr = IDirect3DDevice9_SetViewport(device, &vp); + if(FAILED(hr)) + { + /* Windows 7 rejects MaxZ > 1.0, Windows XP allows it. This doesn't break + * the tests because the 7.5 is just intended to show that it doesn't have + * any influence on the drawing or D3DRS_CLIPPING = FALSE. Set an accepted + * viewport and continue. + */ + ok(broken(hr == D3DERR_INVALIDCALL), "D3D rejected maxZ > 1.0\n"); + vp.MaxZ = 1.0; + hr = IDirect3DDevice9_SetViewport(device, &vp); + } ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0);

1 0

Marco Meijer : updated the mandriva text on the website
by Jeremy Newman 06 Jul '10

06 Jul '10

Module: website Branch: master Commit: 440e51fab025ada54229f7afe1eda2f60341bb17 URL: http://source.winehq.org/git/website.git/?a=commit;h=440e51fab025ada54229f7… Author: Marco Meijer <marco(a)mandrivaclub.nl> Date: Thu May 13 12:01:12 2010 +0200 updated the mandriva text on the website --- templates/en/download.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index ff7e500..02aae97 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -104,8 +104,8 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Download Mandriva packages</a> - - binary .rpms for Mandriva Linux 2006, 2007, and 2008. Download the 2008.1 package if your Mandriva is a 2008.1 - release, eg. 2008 Spring. Download the 2008.0 package if your Mandriva is the first 2008 release.</td> + - binary .rpms for Mandriva Linux 2008, 2009, and 2010. Download the 2010.1 package if your Mandriva is a 2010.1 + release, eg. 2010 Spring. Download the 2010.0 package if your Mandriva is the first 2010 release.</td> <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> </tr>

1 0

André Hentschel : German translation of release news 1 .2-rc6
by Jeremy Newman 06 Jul '10

06 Jul '10

Module: website Branch: master Commit: 3f8c8230beb39d3735d612359e7b193c6e01798e URL: http://source.winehq.org/git/website.git/?a=commit;h=3f8c8230beb39d3735d612… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 3 14:16:28 2010 +0200 German translation of release news 1.2-rc6 --- news/de/2010070201.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/de/2010070201.xml b/news/de/2010070201.xml new file mode 100644 index 0000000..af18a44 --- /dev/null +++ b/news/de/2010070201.xml @@ -0,0 +1,13 @@ +<news> +<date>2. Juli 2010</date> +<title>Wine 1.2-rc6 Freigegeben</title> +<body> + Die Entwicklungsversion 1.2-rc6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.2-rc6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele Übersetzungen.</li> + <li>Ein Haufen Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc6.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Yaron Shahrabani : notepad: Add Arabic translation by Khaled Hosny.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: 055397f765f7714bf690821b81ec207cee99688a URL: http://source.winehq.org/git/wine.git/?a=commit;h=055397f765f7714bf690821b8… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sun Jul 4 10:24:03 2010 +0300 notepad: Add Arabic translation by Khaled Hosny. --- programs/notepad/Ar.rc | 130 ++++++++++++++++++++++++++++++++++++++++++ programs/notepad/Makefile.in | 1 + 2 files changed, 131 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ar.rc b/programs/notepad/Ar.rc new file mode 100644 index 0000000..5d2a9b9 --- /dev/null +++ b/programs/notepad/Ar.rc @@ -0,0 +1,130 @@ +/* + * Notepad (Arabic resources) + * + * Copyright 2010 Khaled Hosny <khaledhosny(a)eglug.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "notepad_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&مساعدة" { + MENUITEM "&جديد\tCtrl+N", CMD_NEW + MENUITEM "ا&فتح...\tCtrl+O", CMD_OPEN + MENUITEM "ا&حفظ\tCtrl+S", CMD_SAVE + MENUITEM "احفظ &ك‍...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "ا&طبع...\tCtrl+P", CMD_PRINT + MENUITEM "إ&عداد الصفحة...", CMD_PAGE_SETUP + MENUITEM "إعداد الطاب&عة...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "ا&خرج", CMD_EXIT + } +POPUP "&مساعدة" { + MENUITEM "&تراجع\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&قص\tCtrl+X", CMD_CUT + MENUITEM "ا&نسخ\tCtrl+C", CMD_COPY + MENUITEM "ا&لصق\tCtrl+V", CMD_PASTE + MENUITEM "اح&ذف\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "اختر ال&كل\tCtrl+A", CMD_SELECT_ALL + MENUITEM "ال&وقت\\التاريخ\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "ا&كسر السطور الطويلة", CMD_WRAP + MENUITEM "ال&خط...", CMD_FONT + } +POPUP "&مساعدة" { + MENUITEM "اب&بحث...\tCtrl+F", CMD_SEARCH + MENUITEM "اب&حث عن التالي\tF3", CMD_SEARCH_NEXT + MENUITEM "ا&ستبدل...\tCtrl+H", CMD_REPLACE + } +POPUP "&مساعدة" { + MENUITEM "الم&حتويات", CMD_HELP_CONTENTS + MENUITEM "ا&بحث...", CMD_HELP_SEARCH + MENUITEM "&مساعدة المساعدة", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&عن لوح الملاحظات", CMD_HELP_ABOUT_NOTEPAD + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "إعداد الصفحة" +{ +LTEXT "&Header:", 0x140, 10, 07, 40, 15 +EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "ال&تذييل:", 0x142, 10, 24, 40, 15 +EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "ال&حواف (مليمتر):", 0x144, 10, 43,160, 45 +LTEXT "ال&يسار:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "الأ&على:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "الي&مين:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "الأس&فل:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "حسنا", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "ألغِ", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&مساعدة", IDHELP, 180, 39, 40, 15, WS_TABSTOP +} + +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "الترميز:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&f" +STRING_PAGESETUP_FOOTERVALUE, "صفحة &p" + +STRING_NOTEPAD, "لوح الملاحظات" +STRING_ERROR, "خطأ" +STRING_WARNING, "تحذير" +STRING_INFO, "معلومات" + +STRING_UNTITLED, "بلا عنوان" + +STRING_ALL_FILES, "كل الملفات (*.*)" +STRING_TEXT_FILES_TXT, "ملفات النصوص (*.txt)" + +STRING_TOOLARGE, "الملف '%s' كبير جدا على لوح النصوص.\nمن فضلك استخدم محررا آخر." +STRING_NOTEXT, "لم تكتب أي نص.\nمن فضلك اكتب أي شيء ثم حاول ثانيا" +STRING_DOESNOTEXIST, "الملف '%s' غير موجود.\n\nأتريد إنشاء ملف جديد؟" +STRING_NOTSAVED, "حدثت تغييرات على الملف '%s'.\n\nأتريد حفظ التغييرات؟" +STRING_NOTFOUND, "تعذّر إيجاد '%s'." +STRING_OUT_OF_MEMORY, "لا تكفي الذاكرة المتاحة لإنهاء هذه المهمة.\nأغلق واحدا أو أكثر من التطبيقات لزيادة الذاكرة المتاحة." + +STRING_UNICODE_LE, "يونيكود (UTF-16)" +STRING_UNICODE_BE, "يونيكود (UTF-16 Big Endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\nيحتوي هذه الملف على محارف يونيكود لكنها ستُفقد إذا حفظت\nالملف بترميز %s.\nللحفاظ على هذه المحارف انقر على ألغِ، ثم اختر واحدا من\nخيارات يونيكود من قائمة الترميز المنسدلة.\nأأتابع؟" +} diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 372390e..773c63e 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ main.c RC_SRCS = \ + Ar.rc \ Bg.rc \ Cs.rc \ Da.rc \

1 0

Marcus Meissner : ntdll: Add tests for NtQueryVirtualMemory.
by Alexandre Julliard 05 Jul '10

05 Jul '10

Module: wine Branch: master Commit: 917089a9540ba35563a2221c77b9cdd214a926d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=917089a9540ba35563a2221c7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Jul 5 09:47:25 2010 +0200 ntdll: Add tests for NtQueryVirtualMemory. --- dlls/ntdll/tests/info.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 74ce710..094d562 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -28,6 +28,7 @@ static NTSTATUS (WINAPI * pNtQueryInformationThread)(HANDLE, THREADINFOCLASS, PV static NTSTATUS (WINAPI * pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pNtSetInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); +static NTSTATUS (WINAPI * pNtQueryVirtualMemory)(HANDLE, LPCVOID, MEMORY_INFORMATION_CLASS , PVOID , SIZE_T , SIZE_T *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static BOOL is_wow64; @@ -61,6 +62,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtSetInformationProcess); NTDLL_GET_PROC(NtSetInformationThread); NTDLL_GET_PROC(NtReadVirtualMemory); + NTDLL_GET_PROC(NtQueryVirtualMemory); pIsWow64Process = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -970,6 +972,56 @@ static void test_readvirtualmemory(void) CloseHandle(process); } +static void test_queryvirtualmemory(void) +{ + NTSTATUS status; + SIZE_T readcount; + static const char teststring[] = "test string"; + static char rwtestbuf[42]; + MEMORY_BASIC_INFORMATION mbi; + char stackbuf[42]; + + trace("Check flags of a function entry in NTDLL.DLL\n"); + status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); + todo_wine ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); + + trace("Check flags of heap\n"); + status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); + + trace("Check flags of stack\n"); + status = pNtQueryVirtualMemory(NtCurrentProcess(), stackbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); + + trace("Check flags of read-only data\n"); + status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); + todo_wine ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY); + + trace("Check flags of read-write global data (.bss)\n"); + status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); + todo_wine ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); +} + static void test_affinity(void) { NTSTATUS status; @@ -1154,6 +1206,8 @@ START_TEST(info) /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory(); + trace("Starting test_queryvirtualmemory()\n"); + test_queryvirtualmemory(); trace("Starting test_affinity()\n"); test_affinity();

1 0