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

James Hawkins : kernel32: Skip the screen buffer tests if codepage 866 is not available.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 430a46fdf73d1299d385da479efb650271203f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=430a46fdf73d1299d385da479… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 02:26:12 2008 -0500 kernel32: Skip the screen buffer tests if codepage 866 is not available. --- dlls/kernel32/tests/console.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6204fa5..bccb02f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -600,6 +600,12 @@ static void testScreenBuffer(HANDLE hConOut) BOOL ret; DWORD oldcp; + if (!IsValidCodePage(866)) + { + skip("Codepage 866 not available\n"); + return; + } + /* In the beginning set output codepage to 866 */ oldcp = GetConsoleOutputCP(); ok(SetConsoleOutputCP(866), "Cannot set output codepage to 866\n");

1 0

James Hawkins : inetcomm: Fix a test that fails on all systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b8ffcbc35b30d320a4f096ba5c105f0cc0632e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ffcbc35b30d320a4f096ba5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 19 22:06:10 2008 -0500 inetcomm: Fix a test that fails on all systems. --- dlls/inetcomm/tests/mimeole.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index d286b74..bfa721e 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -216,7 +216,6 @@ static void test_CreateMessage(void) ULONG count; FINDBODY find_struct; HCHARSET hcs; - INETCSETINFO csi; char text[] = "text"; HBODY *body_list; @@ -274,7 +273,10 @@ static void test_CreateMessage(void) hr = IMimeBody_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); - ok(hcs == NULL, "ret %p\n", hcs); + todo_wine + { + ok(hcs != NULL, "Expected non-NULL charset\n"); + } IMimeBody_Release(body); @@ -309,9 +311,10 @@ static void test_CreateMessage(void) hr = IMimeMessage_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); - ok(hcs == NULL, "ret %p\n", hcs); - hr = MimeOleGetCharsetInfo(hcs, &csi); - ok(hr == E_INVALIDARG, "ret %08x\n", hr); + todo_wine + { + ok(hcs != NULL, "Expected non-NULL charset\n"); + } IMimeMessage_Release(msg);

1 0

James Hawkins : crypt32: Remove tests for properties not present on all systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 99d3e4c92dd2afd18dc7ca70444415e64ed65566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d3e4c92dd2afd18dc7ca704… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 19 22:04:29 2008 -0500 crypt32: Remove tests for properties not present on all systems. --- dlls/crypt32/tests/cert.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 0ab9334..3fce85e 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -475,14 +475,6 @@ static void testCertProperties(void) /* Check a few other implicit properties */ checkHash(bigCert, sizeof(bigCert), CALG_MD5, context, CERT_MD5_HASH_PROP_ID); - checkHash( - context->pCertInfo->Subject.pbData, - context->pCertInfo->Subject.cbData, - CALG_MD5, context, CERT_SUBJECT_NAME_MD5_HASH_PROP_ID); - checkHash( - context->pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData, - context->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData, - CALG_MD5, context, CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID); /* Test key contexts and handles and such */ size = 0; @@ -1775,7 +1767,7 @@ static void testSignAndEncodeCert(void) algID.pszObjId = oid_rsa_md5; ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size); - ok(ret, "CryptSignAndEncodeCertificate failed: %08x\n", GetLastError()); + /* oid_rsa_md5 not present in some win2k */ if (ret) { LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size);

1 0

James Hawkins : advpack: Fix a few failing tests in win95.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b08f7fd80301f53443facf70db4e7aa5e1a63240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08f7fd80301f53443facf70d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 19 00:01:56 2008 -0500 advpack: Fix a few failing tests in win95. --- dlls/advpack/tests/files.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 0f82fa8..530c3b2 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -402,8 +402,10 @@ static void test_ExtractFiles(void) /* extract all files in the cab to nonexistent destination directory */ hr = pExtractFiles("extract.cab", destFolder, 0, NULL, NULL, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), - "Expected %d, got %d\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || + hr == E_FAIL, /* win95 */ + "Expected %08x or %08x, got %08x\n", E_FAIL, + HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), hr); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); @@ -470,9 +472,19 @@ static void test_ExtractFiles(void) static void test_AdvInstallFile(void) { HRESULT hr; + HMODULE hmod; char CURR_DIR[MAX_PATH]; char destFolder[MAX_PATH]; + hmod = LoadLibrary("setupapi.dll"); + if (!hmod) + { + skip("setupapi.dll not present\n"); + return; + } + + FreeLibrary(hmod); + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); lstrcpyA(destFolder, CURR_DIR);

1 0

James Hawkins : advapi32: Remove a test that fails on some systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 9f859b4519704a6484d479c8d04900230c4aee5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f859b4519704a6484d479c8d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 18 23:14:05 2008 -0500 advapi32: Remove a test that fails on some systems. --- dlls/advapi32/tests/crypt.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 63163dd..8ad2b6b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -873,7 +873,7 @@ static void test_set_provider_ex(void) static void test_machine_guid(void) { - char originalGuid[40], guid[40]; + char originalGuid[40]; LONG r; HKEY key; DWORD size; @@ -904,12 +904,7 @@ static void test_machine_guid(void) ret = pCryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); CryptReleaseContext(hCryptProv, 0); - /* Check that MachineGuid was created */ - size = sizeof(guid); - r = RegQueryValueExA(key, "MachineGuid", NULL, NULL, (BYTE *)guid, &size); - ok(!r, "expected to find MachineGuid: %d\n", r); - r = RegDeleteValueA(key, "MachineGuid"); - ok(!r, "RegDeleteValueA failed: %d\n", r); + if (restoreGuid) RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid, strlen(originalGuid)+1);

1 0

James Hawkins : advapi32: Fix a test that fails on some versions of win2k.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 3a4f271a6b943e72040645846fbf47c8cc72cfc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4f271a6b943e72040645846… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 18 23:21:14 2008 -0500 advapi32: Fix a test that fails on some versions of win2k. --- dlls/advapi32/tests/registry.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 474879e..5d86d9b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1102,11 +1102,17 @@ static void test_regconnectregistry( void) lstrcpynA(netwName+2, compName, MAX_COMPUTERNAME_LENGTH + 1); retl = RegConnectRegistryA( compName, HKEY_LOCAL_MACHINE, &hkey); - ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %d\n", retl); + ok( !retl || + retl == ERROR_DLL_INIT_FAILED || + retl == ERROR_BAD_NETPATH, /* some win2k */ + "RegConnectRegistryA failed err = %d\n", retl); if( !retl) RegCloseKey( hkey); retl = RegConnectRegistryA( netwName, HKEY_LOCAL_MACHINE, &hkey); - ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %d\n", retl); + ok( !retl || + retl == ERROR_DLL_INIT_FAILED || + retl == ERROR_BAD_NETPATH, /* some win2k */ + "RegConnectRegistryA failed err = %d\n", retl); if( !retl) RegCloseKey( hkey); SetLastError(0xdeadbeef);

1 0

Vitaliy Margolen : shdoclc: Add Russian translation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8190afb7f779faed78c63337fdcc14fa61bddaf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8190afb7f779faed78c63337f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 20 19:27:34 2008 -0600 shdoclc: Add Russian translation. --- dlls/shdoclc/Ru.rc | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/rsrc.rc | 1 + 2 files changed, 248 insertions(+), 0 deletions(-) diff --git a/dlls/shdoclc/Ru.rc b/dlls/shdoclc/Ru.rc new file mode 100644 index 0000000..6b6a15e --- /dev/null +++ b/dlls/shdoclc/Ru.rc @@ -0,0 +1,247 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&b�� &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} + +IDR_BROWSE_CONTEXT_MENU MENU +{ + POPUP "Default" + { + MENUITEM "&��", IDM_GOBACKWARD + MENUITEM "&��", IDM_GOFORWARD + MENUITEM SEPARATOR + MENUITEM "&�� ...", IDM_SAVEBACKGROUND + MENUITEM "�� ", IDM_SETWALLPAPER + MENUITEM "&�� ", IDM_COPYBACKGROUND + MENUITEM "�� &�", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "�� &�", IDM_SELECTALL + MENUITEM "��&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_CREATESHORTCUT + MENUITEM "�� &��", IDM_ADDFAVORITES + MENUITEM "&�� ",IDM_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&��", IDM_LANGUAGE + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_PRINT + MENUITEM "�&��", _IDM_REFRESH + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "��", IDM_PROPERTIES + } + + POPUP "Image" + { + MENUITEM "&�� ", IDM_FOLLOWLINKC + MENUITEM "�� ",IDM_FOLLOWLINKN + MENUITEM "�� ...", IDM_SAVETARGET + MENUITEM "&�� ", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_SHOWPICTURE + MENUITEM "&�� ...",IDM_SAVEPICTURE + MENUITEM "&�� E-mail...",IDM_MP_EMAILPICTURE + MENUITEM "&�� ...", IDM_MP_PRINTPICTURE + MENUITEM "&�� ", IDM_MP_MYPICS + MENUITEM "�� ", IDM_SETWALLPAPER + MENUITEM "�� &�", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "�� &��", IDM_COPYSHORTCUT + MENUITEM "&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "��", IDM_PROPERTIES + } + + POPUP "Control" + { + MENUITEM "&��", IDM_UNDO + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "&��", IDM_PASTE + MENUITEM "�&��", IDM_DELETE + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "�� &�", IDM_SELECTALL + } + + POPUP "Table" + { + POPUP "&��" + { + MENUITEM "&��", IDM_CELLSELECT + MENUITEM "&��", IDM_ROWSELECT + MENUITEM "&��", IDM_COLUMNSELECT + MENUITEM "&��", IDM_TABLESELECT + } + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&�� ", IDM_CELLPROPERTIES + MENUITEM "�� &��", IDM_TABLEPROPERTIES + } + + POPUP "1DSite Select" + { + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "&��", IDM_PASTE + MENUITEM "�� &�", IDM_SELECTALL + MENUITEM "��&��", IDM_PRINT + MENUITEM SEPARATOR + } + + POPUP "Anchor" + { + MENUITEM "&��", IDM_FOLLOWLINKC + MENUITEM "�� &�� ",IDM_FOLLOWLINKN + MENUITEM "�� ...", IDM_SAVETARGET + MENUITEM "&�� ", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "�� &��", IDM_COPYSHORTCUT + MENUITEM "&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� &��",IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&��", IDM_PROPERTIES + } + + POPUP "Context Unknown" + { + MENUITEM SEPARATOR + } + + POPUP "DYNSRC Image" + { + MENUITEM "&�� ", IDM_FOLLOWLINKC + MENUITEM "�� &�� ", IDM_FOLLOWLINKN + MENUITEM "�� ...", IDM_SAVETARGET + MENUITEM "&�� ", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_SHOWPICTURE + MENUITEM "&�� ...",IDM_SAVEPICTURE + MENUITEM "�� ", IDM_SETWALLPAPER + MENUITEM "�� &�", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "�� &��", IDM_COPYSHORTCUT + MENUITEM "&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "��", IDM_DYNSRCPLAY + MENUITEM "��", IDM_DYNSRCSTOP + MENUITEM "&��", IDM_PROPERTIES + } + + POPUP "ART Image" + { + MENUITEM "&�� ", IDM_FOLLOWLINKC + MENUITEM "�� &�� ", IDM_FOLLOWLINKN + MENUITEM "�� ...", IDM_SAVETARGET + MENUITEM "&�� ", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_SHOWPICTURE + MENUITEM "&�� ...",IDM_SAVEPICTURE + MENUITEM "�� ", IDM_SETWALLPAPER + MENUITEM "�� &�", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "�� &��", IDM_COPYSHORTCUT + MENUITEM "&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM "��", IDM_IMGARTPLAY + MENUITEM "��", IDM_IMGARTSTOP + MENUITEM "��", IDM_IMGARTREWIND + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&��", IDM_PROPERTIES + } + + POPUP "Debug" + { + MENUITEM "Trace Tags", IDM_TRACETAGS + MENUITEM "Resource Failures", IDM_RESOURCEFAILURES + MENUITEM "Dump Tracking Info", IDM_DUMPTRACKINGINFO + MENUITEM "Debug Break", IDM_DEBUGBREAK + MENUITEM "Debug View", IDM_DEBUGVIEW + MENUITEM "Dump Tree", IDM_DUMPTREE + MENUITEM "Dump Lines", IDM_DUMPLINES + MENUITEM "Dump DisplayTree", IDM_DUMPDISPLAYTREE + MENUITEM "Dump FormatCaches", IDM_DUMPFORMATCACHES + MENUITEM "Dump LayoutRects", IDM_DUMPLAYOUTRECTS + MENUITEM "Memory Monitor", IDM_MEMORYMONITOR + MENUITEM "Performance Meters", IDM_PERFORMANCEMETERS + MENUITEM "Save HTML", IDM_SAVEHTML + MENUITEM SEPARATOR + MENUITEM "&Browse View", IDM_BROWSEMODE + MENUITEM "&Edit View", IDM_EDITMODE + } + + POPUP "Vertical Scrollbar" + { + MENUITEM "�� ", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "��", IDM_SCROLL_TOP + MENUITEM "��", IDM_SCROLL_BOTTOM + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_PAGEUP + MENUITEM "�� ", IDM_SCROLL_PAGEDOWN + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_UP + MENUITEM "�� ", IDM_SCROLL_DOWN + } + + POPUP "Horizontal Scrollbar" + { + MENUITEM "�� ", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_LEFTEDGE + MENUITEM "�� ", IDM_SCROLL_RIGHTEDGE + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_PAGELEFT + MENUITEM "�� ", IDM_SCROLL_PAGERIGHT + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_LEFT + MENUITEM "�� ", IDM_SCROLL_RIGHT + } +} diff --git a/dlls/shdoclc/rsrc.rc b/dlls/shdoclc/rsrc.rc index 646b305..7b90dc5 100644 --- a/dlls/shdoclc/rsrc.rc +++ b/dlls/shdoclc/rsrc.rc @@ -32,6 +32,7 @@ #include "Ko.rc" #include "Nl.rc" #include "No.rc" +#include "Ru.rc" #include "Si.rc" #include "Sv.rc" #include "Tr.rc"

1 0

Vitaliy Margolen : Update Russian translation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c39329d13c3fdab48525990b5ab600abd7ad76ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39329d13c3fdab48525990b5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 20 19:27:47 2008 -0600 Update Russian translation. --- programs/cmdlgtst/Ru.rc | 28 ++++++++++++++++++++++++++++ programs/wineconsole/wineconsole_Ru.rc | 2 +- 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/programs/cmdlgtst/Ru.rc b/programs/cmdlgtst/Ru.rc index 6419186..a438b24 100644 --- a/programs/cmdlgtst/Ru.rc +++ b/programs/cmdlgtst/Ru.rc @@ -179,6 +179,34 @@ FONT 8, "MS Shell Dlg" CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP } +PageSetup_Flags_Dialog DIALOG 4, 17, 239, 245 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION " " +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 + PUSHBUTTON "��", IDCANCEL, 180, 24, 50, 14 + CHECKBOX "PSD_DEFAULTMINMARGINS", I_PSD_DEFAULTMINMARGINS, 12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEMARGINS", I_PSD_DISABLEMARGINS, 12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEORIENTATION", I_PSD_DISABLEORIENTATION, 12, 36, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAGEPAINTING", I_PSD_DISABLEPAGEPAINTING, 12, 48, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAPER", I_PSD_DISABLEPAPER, 12, 60, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPRINTER", I_PSD_DISABLEPRINTER, 12, 72, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGEPAINTHOOK", I_PSD_ENABLEPAGEPAINTHOOK, 12, 84, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPHOOK", I_PSD_ENABLEPAGESETUPHOOK, 12, 96, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATE", I_PSD_ENABLEPAGESETUPTEMPLATE, 12, 108, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATEHANDLE", I_PSD_ENABLEPAGESETUPTEMPLATEHANDLE, 12, 120, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INHUNDREDTHSOFMILLIMETERS", I_PSD_INHUNDREDTHSOFMILLIMETERS, 12, 132, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INTHOUSANDTHSOFINCHES", I_PSD_INTHOUSANDTHSOFINCHES, 12, 144, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INWININIINTLMEASURE", I_PSD_INWININIINTLMEASURE, 12, 156, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MARGINS", I_PSD_MARGINS, 12, 168, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MINMARGINS", I_PSD_MINMARGINS, 12, 180, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NONETWORKBUTTON", I_PSD_NONETWORKBUTTON, 12, 192, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NOWARNING", I_PSD_NOWARNING, 12, 204, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_RETURNDEFAULT", I_PSD_RETURNDEFAULT, 12, 216, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_SHOWHELP", I_PSD_SHOWHELP, 12, 228, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +} + File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� /�� " diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 7e1f2ec..0044538 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -129,8 +129,8 @@ CAPTION " FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 10, 10, 178, 31, BS_GROUPBOX - AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP PUSHBUTTON "OK", IDOK, 40, 50, 50, 14 PUSHBUTTON "��", IDCANCEL, 110, 50, 50, 14

1 0

Paul Vriens : tools/wine.inf.in: Fix a typo.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 88f4705156b12cba14fb0b45399f6a4b9d9c2a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f4705156b12cba14fb0b453… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Apr 21 08:14:20 2008 +0200 tools/wine.inf.in: Fix a typo. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 7f02284..e2057ad 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2681,7 +2681,7 @@ ErrorControl=1 [SpoolerService] Description="Loads files to memory for later printing" DisplayName="Print Spooler" -ServiceBinary="%11\spoolsv.exe" +ServiceBinary="%11%\spoolsv.exe" ServiceType=1 StartType=4 ErrorControl=1

1 0

James Hawkins : advpack: Remove a test that fails inconsistently on several platforms.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a42f4b654ba405de59757230acb8cbb600f8ecd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42f4b654ba405de59757230a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 18 23:06:25 2008 -0500 advpack: Remove a test that fails inconsistently on several platforms. --- dlls/advpack/tests/files.c | 35 ----------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index e109a88..0f82fa8 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -103,36 +103,6 @@ static BOOL check_ini_file_attr(LPSTR filename) return ret; } -#define FIELD_LEN 16 - -static BOOL check_ini_contents(LPSTR filename, BOOL add) -{ - CHAR field[FIELD_LEN]; - BOOL ret = TRUE, match; - - GetPrivateProfileStringA("backup", "one", NULL, field, FIELD_LEN, filename); - match = !lstrcmpA(field, "-1,0,0,0,0,0,-1"); - if ((add && !match) || (!add && match)) { - trace("first test: got %s\n", field); - ret = FALSE; - } - - GetPrivateProfileStringA("backup", "two", NULL, field, FIELD_LEN, filename); - if (lstrcmpA(field, "-1,0,0,0,0,0,-1")) { - trace("second test: got %s\n", field); - ret = FALSE; - } - - GetPrivateProfileStringA("backup", "three", NULL, field, FIELD_LEN, filename); - match = !lstrcmpA(field, "-1,0,0,0,0,0,-1"); - if ((add && !match) || (!add && match)) { - trace("third test: got %s\n", field); - ret = FALSE; - } - - return ret; -} - static void test_AddDelBackupEntry(void) { HRESULT res; @@ -171,7 +141,6 @@ static void test_AddDelBackupEntry(void) res = pAddDelBackupEntry("one\0two\0three\0", "c:\\", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); - ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); ok(DeleteFileA(path), "Expected path to exist\n"); lstrcpyA(path, CURR_DIR); @@ -182,7 +151,6 @@ static void test_AddDelBackupEntry(void) res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!check_ini_file_attr(path), "Expected ini file to not be hidden\n"); - ok(!check_ini_contents(path, TRUE), "Expected ini contents to not match\n"); ok(!DeleteFileA(path), "Expected path to not exist\n"); /* try an existent, relative backup directory */ @@ -190,7 +158,6 @@ static void test_AddDelBackupEntry(void) res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); - ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); ok(DeleteFileA(path), "Expected path to exist\n"); RemoveDirectoryA("backup"); @@ -200,14 +167,12 @@ static void test_AddDelBackupEntry(void) /* try a NULL backup dir, INI is created in the windows directory */ res = pAddDelBackupEntry("one\0two\0three\0", NULL, "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); - ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); /* remove the entries with AADBE_DEL_ENTRY */ SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY); SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); ok(res == S_OK, "Expected S_OK, got %d\n", res); - ok(check_ini_contents(path, FALSE), "Expected ini contents to match\n"); ok(DeleteFileA(path), "Expected path to exist\n"); }

1 0