June 2008 - Wine-Commits - list.winehq.org

Paul Vriens : advpack/tests: Add a FreeLibrary and a skip message.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: ee69c6141b01e1a89b56beb35275a95cf4db4fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee69c6141b01e1a89b56beb35… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jun 8 12:31:26 2008 +0200 advpack/tests: Add a FreeLibrary and a skip message. --- dlls/advpack/tests/advpack.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 0b668a7..eeb35c6 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -82,7 +82,11 @@ static BOOL init_function_pointers(void) if (!pCloseINFEngine || !pDelNode || !pGetVersionFromFile || !pOpenINFEngine || !pSetPerUserSecValues || !pTranslateInfString) + { + skip("Needed functions are not available\n"); + FreeLibrary(hAdvPack); return FALSE; + } return TRUE; }

1 0

Hans Leidekker : winebrowser: Convert URL obtained through DdeGetData to Unicode.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: 3dcf22e03fb4473db112bcd47671b37a037cbfc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dcf22e03fb4473db112bcd47… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Jun 7 17:10:00 2008 +0200 winebrowser: Convert URL obtained through DdeGetData to Unicode. --- programs/winebrowser/main.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 20d6b72..3ad24ae 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -190,15 +190,27 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, return (HDDEDATA)FALSE; case XTYP_EXECUTE: + { + char *buffer = NULL; + if (!(size = DdeGetData(hData, NULL, 0, 0))) WINE_ERR("DdeGetData returned zero size of execute string\n"); - else if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, size))) + else if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size))) WINE_ERR("Out of memory\n"); - else if (DdeGetData(hData, (LPBYTE)ddeString, size, 0) != size) + else if (DdeGetData(hData, (LPBYTE)buffer, size, 0) != size) WINE_WARN("DdeGetData did not return %d bytes\n", size); + else + { + int len = MultiByteToWideChar(CP_ACP, 0, buffer, -1, NULL, 0); + if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + WINE_ERR("Out of memory\n"); + else + MultiByteToWideChar(CP_ACP, 0, buffer, -1, ddeString, len); + } + HeapFree(GetProcessHeap(), 0, buffer); DdeFreeDataHandle(hData); return (HDDEDATA)DDE_FACK; - + } case XTYP_REQUEST: ret = -3; /* error */ if (!(size = DdeQueryStringW(ddeInst, hsz2, NULL, 0, CP_WINUNICODE)))

1 0

Jonathan Ernst : kernel: Updated French translation.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: bcdfb88e537842737c095d1551ad330181abad57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcdfb88e537842737c095d155… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Sat Jun 7 12:41:32 2008 +0200 kernel: Updated French translation. --- dlls/kernel32/nls/winerr_fra.mc | 128 +++++++++++++++++++------------------- 1 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/kernel32/nls/winerr_fra.mc b/dlls/kernel32/nls/winerr_fra.mc index 17b111e..510c3ed 100644 --- a/dlls/kernel32/nls/winerr_fra.mc +++ b/dlls/kernel32/nls/winerr_fra.mc @@ -71,12 +71,12 @@ Bloc invalide MessageId=10 SymbolicName=ERROR_BAD_ENVIRONMENT Language=FRA -Mauvais environnement +Environnement incorrect . MessageId=11 SymbolicName=ERROR_BAD_FORMAT Language=FRA -Mauvais format +Format incorrect . MessageId=12 SymbolicName=ERROR_INVALID_ACCESS @@ -121,7 +121,7 @@ Prot MessageId=20 SymbolicName=ERROR_BAD_UNIT Language=FRA -Mauvaise unit� +Unit� incorrecte . MessageId=21 SymbolicName=ERROR_NOT_READY @@ -131,7 +131,7 @@ Non pr MessageId=22 SymbolicName=ERROR_BAD_COMMAND Language=FRA -Mauvaise commande +Commande incorrecte . MessageId=23 SymbolicName=ERROR_CRC @@ -141,7 +141,7 @@ Erreur CRC MessageId=24 SymbolicName=ERROR_BAD_LENGTH Language=FRA -Mauvaise taille +Taille incorrecte . MessageId=25 SymbolicName=ERROR_SEEK @@ -191,7 +191,7 @@ Violation de verrou MessageId=34 SymbolicName=ERROR_WRONG_DISK Language=FRA -Wrong disk +Mauvais disque . MessageId=36 SymbolicName=ERROR_SHARING_BUFFER_EXCEEDED @@ -226,277 +226,277 @@ Nom r MessageId=53 SymbolicName=ERROR_BAD_NETPATH Language=FRA -Mauvais chemin r�seau +Chemin r�seau incorrect . MessageId=54 SymbolicName=ERROR_NETWORK_BUSY Language=FRA -Network busy +R�seau occup� . MessageId=55 SymbolicName=ERROR_DEV_NOT_EXIST Language=FRA -Device does not exist +Le p�riph�rique n'existe pas . MessageId=56 SymbolicName=ERROR_TOO_MANY_CMDS Language=FRA -Too many commands +Trop de commandes . MessageId=57 SymbolicName=ERROR_ADAP_HDW_ERR Language=FRA -Adaptor hardware error +Erreur mat�rielle de l'adaptateur . MessageId=58 SymbolicName=ERROR_BAD_NET_RESP Language=FRA -Bad network response +R�ponse du r�seau incorrecte . MessageId=59 SymbolicName=ERROR_UNEXP_NET_ERR Language=FRA -Unexpected network error +Erreur r�seau inattendue . MessageId=60 SymbolicName=ERROR_BAD_REM_ADAP Language=FRA -Bad remote adaptor +Adaptateur distant incorrect . MessageId=61 SymbolicName=ERROR_PRINTQ_FULL Language=FRA -Print queue full +Queue d'impression pleine . MessageId=62 SymbolicName=ERROR_NO_SPOOL_SPACE Language=FRA -No spool space +Pas d'espace de spool . MessageId=63 SymbolicName=ERROR_PRINT_CANCELLED Language=FRA -Print cancelled +Impression annul�e . MessageId=64 SymbolicName=ERROR_NETNAME_DELETED Language=FRA -Network name deleted +Nom r�seau supprim� . MessageId=65 SymbolicName=ERROR_NETWORK_ACCESS_DENIED Language=FRA -Network access denied +Acc�s r�seau refus� . MessageId=66 SymbolicName=ERROR_BAD_DEV_TYPE Language=FRA -Bad device type +Type de p�riph�rique incorrect . MessageId=67 SymbolicName=ERROR_BAD_NET_NAME Language=FRA -Bad network name +Nom r�seau incorrect . MessageId=68 SymbolicName=ERROR_TOO_MANY_NAMES Language=FRA -Too many network names +Trop de noms r�seau . MessageId=69 SymbolicName=ERROR_TOO_MANY_SESS Language=FRA -Too many network sessions +Trop de sessions r�seau . MessageId=70 SymbolicName=ERROR_SHARING_PAUSED Language=FRA -Sharing paused +Partage en pause . MessageId=71 SymbolicName=ERROR_REQ_NOT_ACCEP Language=FRA -Request not accepted +Requ�te non accept�e . MessageId=72 SymbolicName=ERROR_REDIR_PAUSED Language=FRA -Redirector paused +Redirecteur en pause . MessageId=80 SymbolicName=ERROR_FILE_EXISTS Language=FRA -File exists +Le fichier existe . MessageId=82 SymbolicName=ERROR_CANNOT_MAKE Language=FRA -Cannot create +Impossible de cr�er . MessageId=83 SymbolicName=ERROR_FAIL_I24 Language=FRA -Int24 failure +Erreur Int24 . MessageId=84 SymbolicName=ERROR_OUT_OF_STRUCTURES Language=FRA -Out of structures +� cours de structures . MessageId=85 SymbolicName=ERROR_ALREADY_ASSIGNED Language=FRA -Already assigned +D�j� assign� . MessageId=86 SymbolicName=ERROR_INVALID_PASSWORD Language=FRA -Invalid password +Mot de passe non valide . MessageId=87 SymbolicName=ERROR_INVALID_PARAMETER Language=FRA -Invalid parameter +Param�tre non valide . MessageId=88 SymbolicName=ERROR_NET_WRITE_FAULT Language=FRA -Net write fault +Erreur d'�criture r�seau . MessageId=89 SymbolicName=ERROR_NO_PROC_SLOTS Language=FRA -No process slots +Plus d'emplacement pour processus . MessageId=100 SymbolicName=ERROR_TOO_MANY_SEMAPHORES Language=FRA -Too many semaphores +Trop de s�maphores . MessageId=101 SymbolicName=ERROR_EXCL_SEM_ALREADY_OWNED Language=FRA -Exclusive semaphore already owned +S�maphore exclusif d�j� acquis . MessageId=102 SymbolicName=ERROR_SEM_IS_SET Language=FRA -Semaphore is set +Le s�maphore est actif . MessageId=103 SymbolicName=ERROR_TOO_MANY_SEM_REQUESTS Language=FRA -Too many semaphore requests +Trop de requ�tes de s�maphores . MessageId=104 SymbolicName=ERROR_INVALID_AT_INTERRUPT_TIME Language=FRA -Invalid at interrupt time +Non valide au moment de l'interruption . MessageId=105 SymbolicName=ERROR_SEM_OWNER_DIED Language=FRA -Semaphore owner died +L'acqu�reur du s�maphore est mort . MessageId=106 SymbolicName=ERROR_SEM_USER_LIMIT Language=FRA -Semaphore user limit +Limite utilisateur pour le s�maphore . MessageId=107 SymbolicName=ERROR_DISK_CHANGE Language=FRA -Insert disk for drive %1 +Ins�rez le disque pour le lecteur %1 . MessageId=108 SymbolicName=ERROR_DRIVE_LOCKED Language=FRA -Drive locked +Lecteur verrouill� . MessageId=109 SymbolicName=ERROR_BROKEN_PIPE Language=FRA -Broken pipe +Tube interrompu . MessageId=110 SymbolicName=ERROR_OPEN_FAILED Language=FRA -Open failed +�chec lors de l'ouverture . MessageId=111 SymbolicName=ERROR_BUFFER_OVERFLOW Language=FRA -Buffer overflow +D�passement de tampon . MessageId=112 SymbolicName=ERROR_DISK_FULL Language=FRA -Disk full +Disque plein . MessageId=113 SymbolicName=ERROR_NO_MORE_SEARCH_HANDLES Language=FRA -No more search handles +Plus d'attaches de recherche . MessageId=114 SymbolicName=ERROR_INVALID_TARGET_HANDLE Language=FRA -Invalid target handle +Attache de destination non valide . MessageId=117 SymbolicName=ERROR_INVALID_CATEGORY Language=FRA -Invalid IOCTL +IOCTL non valide . MessageId=118 SymbolicName=ERROR_INVALID_VERIFY_SWITCH Language=FRA -Invalid verify switch +Bascule de v�rification non valide . MessageId=119 SymbolicName=ERROR_BAD_DRIVER_LEVEL Language=FRA -Bad driver level +Niveau de pilote incorrect . MessageId=120 SymbolicName=ERROR_CALL_NOT_IMPLEMENTED Language=FRA -Call not implemented +Appel non impl�ment� . MessageId=121 SymbolicName=ERROR_SEM_TIMEOUT Language=FRA -Semaphore timeout +D�passement du d�lai du s�maphore . MessageId=122 SymbolicName=ERROR_INSUFFICIENT_BUFFER Language=FRA -Insufficient buffer +Tampon insuffisant . MessageId=123 SymbolicName=ERROR_INVALID_NAME Language=FRA -Invalid name +Nom non valide . MessageId=124 SymbolicName=ERROR_INVALID_LEVEL Language=FRA -Invalid level +Niveau non valide . MessageId=125 SymbolicName=ERROR_NO_VOLUME_LABEL Language=FRA -No volume label +Pas d'�tiquette de volume . MessageId=126 SymbolicName=ERROR_MOD_NOT_FOUND Language=FRA -Module not found +Module introuvable . MessageId=127 SymbolicName=ERROR_PROC_NOT_FOUND Language=FRA -Procedure not found +Proc�dure introuvable . MessageId=128 SymbolicName=ERROR_WAIT_NO_CHILDREN @@ -571,7 +571,7 @@ Attempt to SUBST to a JOINed drive MessageId=142 SymbolicName=ERROR_BUSY_DRIVE Language=FRA -Drive is busy +Le lecteur est occup� . MessageId=143 SymbolicName=ERROR_SAME_DRIVE @@ -586,7 +586,7 @@ Not toplevel directory MessageId=145 SymbolicName=ERROR_DIR_NOT_EMPTY Language=FRA -Directory is not empty +Le r�pertoire n'est pas vide . MessageId=146 SymbolicName=ERROR_IS_SUBST_PATH @@ -3606,7 +3606,7 @@ Already awaiting printer handle MessageId=1905 SymbolicName=ERROR_PRINTER_DELETED Language=FRA -Printer deleted +Imprimante supprim�e . MessageId=1906 SymbolicName=ERROR_INVALID_PRINTER_STATE

1 0

Rico Schüller : shell32: Fix German shortcuts in the menu.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: 2e4c9b3da7ae778cf73f654fe2e9751f93c97a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4c9b3da7ae778cf73f654fe… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jun 6 22:15:50 2008 +0200 shell32: Fix German shortcuts in the menu. --- dlls/shell32/shell32_De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 7b3bbbd..194ef09 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -76,14 +76,14 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Ausw�hlen" FCIDM_SHVIEW_OPEN + MENUITEM "Aus&w�hlen" FCIDM_SHVIEW_OPEN MENUITEM "E&rkunden", FCIDM_SHVIEW_EXPLORE MENUITEM "&�ffnen" FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "&Ausschneiden", FCIDM_SHVIEW_CUT MENUITEM "&Kopieren", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Ver&kn�pfung erzeugen", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Verkn�pfung erzeugen", FCIDM_SHVIEW_CREATELINK MENUITEM "&L�schen", FCIDM_SHVIEW_DELETE MENUITEM "&Umbenennen", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR

1 0

Jonathan Ernst : notepad: Updated About menu entry.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: 6f41fd0c8628e142c3e7711ca6b000cf888a2b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f41fd0c8628e142c3e7711ca… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Sat Jun 7 12:07:15 2008 +0200 notepad: Updated About menu entry. --- programs/notepad/Bg.rc | 2 +- programs/notepad/Da.rc | 2 +- programs/notepad/De.rc | 2 +- programs/notepad/En.rc | 2 +- programs/notepad/Eo.rc | 2 +- programs/notepad/Es.rc | 2 +- programs/notepad/Fi.rc | 2 +- programs/notepad/Fr.rc | 2 +- programs/notepad/Hu.rc | 2 +- programs/notepad/It.rc | 2 +- programs/notepad/Ja.rc | 2 +- programs/notepad/Nl.rc | 2 +- programs/notepad/No.rc | 2 +- programs/notepad/Pl.rc | 2 +- programs/notepad/Pt.rc | 2 +- programs/notepad/Ro.rc | 2 +- programs/notepad/Ru.rc | 2 +- programs/notepad/Si.rc | 2 +- programs/notepad/Sv.rc | 2 +- programs/notepad/Th.rc | 2 +- programs/notepad/Tr.rc | 2 +- programs/notepad/Wa.rc | 2 +- programs/notepad/Zh.rc | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/notepad/Bg.rc b/programs/notepad/Bg.rc index e5d39c5..80c8d4e 100644 --- a/programs/notepad/Bg.rc +++ b/programs/notepad/Bg.rc @@ -57,7 +57,7 @@ POPUP "& MENUITEM "&��...", CMD_HELP_SEARCH MENUITEM "&�� ", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index ac289da..979b5b9 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -59,7 +59,7 @@ POPUP "&Hj MENUITEM "&S�g efter hj�lp om...", CMD_HELP_SEARCH MENUITEM "&Brug af Hj�lp", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&Om Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Om Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index 2739b27..268d1a2 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -59,7 +59,7 @@ POPUP "&Hilfe" { MENUITEM "&Suchen...", CMD_HELP_SEARCH MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&�ber Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "�&ber Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index 917c3c8..58127e4 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -59,7 +59,7 @@ POPUP "&Help" { MENUITEM "&Search...", CMD_HELP_SEARCH MENUITEM "&Help on help", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Eo.rc b/programs/notepad/Eo.rc index 7639139..7b75244 100644 --- a/programs/notepad/Eo.rc +++ b/programs/notepad/Eo.rc @@ -57,7 +57,7 @@ POPUP "&Helpo" { MENUITEM "Ser�u...", CMD_HELP_SEARCH MENUITEM "Pri Helpanto", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "Pri Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "Pri Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc index 8f52f2d..43b0f26 100644 --- a/programs/notepad/Es.rc +++ b/programs/notepad/Es.rc @@ -61,7 +61,7 @@ POPUP "A&yuda" { MENUITEM "&Buscar...", CMD_HELP_SEARCH MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc index 914c8bd..bd4b204 100644 --- a/programs/notepad/Fi.rc +++ b/programs/notepad/Fi.rc @@ -58,7 +58,7 @@ POPUP "&Apua" { MENUITEM "&Etsi...", CMD_HELP_SEARCH MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index 8713e18..b2493f2 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -59,7 +59,7 @@ POPUP "Aid&e" { MENUITEM "&Rechercher...", CMD_HELP_SEARCH MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "� &propos de Bloc-notes...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "� &propos du Bloc-notes", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Hu.rc b/programs/notepad/Hu.rc index 9c9d90f..9bf2986 100644 --- a/programs/notepad/Hu.rc +++ b/programs/notepad/Hu.rc @@ -58,7 +58,7 @@ POPUP "&S MENUITEM "&Keres�s...", CMD_HELP_SEARCH MENUITEM "&Haszn�lat", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/It.rc b/programs/notepad/It.rc index 3ebb703..2df31d1 100644 --- a/programs/notepad/It.rc +++ b/programs/notepad/It.rc @@ -62,7 +62,7 @@ POPUP "&Aiuto" { MENUITEM "&Trova...", CMD_HELP_SEARCH MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&Informazioni sul Blocco Note...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Informazioni sul Blocco Note", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 84cd5b2..651f183 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -59,7 +59,7 @@ POPUP " MENUITEM "��(&S)...", CMD_HELP_SEARCH MENUITEM "�w��v�̎g��(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc index 1a427fd..cde9ca1 100644 --- a/programs/notepad/Nl.rc +++ b/programs/notepad/Nl.rc @@ -57,7 +57,7 @@ POPUP "&Help" { MENUITEM "&Zoeken...", CMD_HELP_SEARCH MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/No.rc b/programs/notepad/No.rc index db9ac0f..8be504d 100644 --- a/programs/notepad/No.rc +++ b/programs/notepad/No.rc @@ -57,7 +57,7 @@ POPUP "&Hjelp" { MENUITEM "&S�k...", CMD_HELP_SEARCH MENUITEM "&Hjelp om hjelp", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Om Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Pl.rc b/programs/notepad/Pl.rc index 18078d7..c05c715 100644 --- a/programs/notepad/Pl.rc +++ b/programs/notepad/Pl.rc @@ -60,7 +60,7 @@ POPUP "Pomo&c" { MENUITEM "&Szukaj...", CMD_HELP_SEARCH MENUITEM "&Pomoc", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "Notepad - &informacje", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index f3f34c8..2a2ec2f 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -61,7 +61,7 @@ POPUP "&Ajuda" { MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Ro.rc b/programs/notepad/Ro.rc index 2bb7651..1a288f7 100644 --- a/programs/notepad/Ro.rc +++ b/programs/notepad/Ro.rc @@ -59,7 +59,7 @@ POPUP "&Ajutor" { MENUITEM "&Caută...", CMD_HELP_SEARCH MENUITEM "&Ajutor la ajutor", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&Despre notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Despre notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index a2184fa..439c1eb 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -57,7 +57,7 @@ POPUP "& MENUITEM "&��...", CMD_HELP_SEARCH MENUITEM "&�� ", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&� Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc index 63cce21..be51010 100644 --- a/programs/notepad/Si.rc +++ b/programs/notepad/Si.rc @@ -59,7 +59,7 @@ POPUP "&Pomoč" { MENUITEM "&Iskanje ...", CMD_HELP_SEARCH MENUITEM "&O pomoči", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&O Beležnici ...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&O Beležnici", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index 59ebf7f..1689417 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -59,7 +59,7 @@ POPUP "&Hj MENUITEM "&S�k...", CMD_HELP_SEARCH MENUITEM "Anv�ndning &av hj�lp", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Th.rc b/programs/notepad/Th.rc index a892361..988a392 100644 --- a/programs/notepad/Th.rc +++ b/programs/notepad/Th.rc @@ -57,7 +57,7 @@ MAIN_MENU MENU MENUITEM "��...", CMD_HELP_SEARCH MENUITEM "��ǡѺ��", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Tr.rc b/programs/notepad/Tr.rc index d61c9a2..66c0eda 100644 --- a/programs/notepad/Tr.rc +++ b/programs/notepad/Tr.rc @@ -57,7 +57,7 @@ POPUP "&Yard MENUITEM "&Ara...", CMD_HELP_SEARCH MENUITEM "&Yard�m kullan�m�", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc index 72963c7..4265a45 100644 --- a/programs/notepad/Wa.rc +++ b/programs/notepad/Wa.rc @@ -61,7 +61,7 @@ POPUP "&Aide" { MENUITEM "C&wer�...", CMD_HELP_SEARCH MENUITEM "&Aide so l' Aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 09c5e67..46cee03 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -55,7 +55,7 @@ POPUP " MENUITEM "��&S��...", CMD_HELP_SEARCH MENUITEM "��ʹ�ð��&H��", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD } }

1 0

Rico Schüller : winecfg: Fix German translation.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: b27a5942e064c648d69e3644e39568ddd02f499e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27a5942e064c648d69e3644e… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jun 6 22:15:31 2008 +0200 winecfg: Fix German translation. --- programs/winecfg/De.rc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 0023c87..fa67d43 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -37,10 +37,8 @@ BEGIN LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - LTEXT "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.", - IDC_STATIC,119,44,124,72 LTEXT "Diese Bibliothek ist freie Software; Sie d�rfen sie unter den Bedingungen der GNU Lesser General Public License, wie von der Free Software Foundation ver�ffentlicht, weiterverteilen und/oder modifizieren; entweder gem�� Version 2.1 der Lizenz oder (nach Ihrer Option) jeder sp�teren Version.", - IDC_STATIC,119,124,124,72 + IDC_STATIC,119,44,124,72 END IDD_APPCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Jacek Caban : mshtml: Added FIXME about QUERY_USES_HISTORYFOLDER in about protocol.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: f6a3234bf36240baa5015ab75a32286564d70fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a3234bf36240baa5015ab75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 6 20:09:45 2008 +0200 mshtml: Added FIXME about QUERY_USES_HISTORYFOLDER in about protocol. --- dlls/mshtml/protocol.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 0b502ba..ff319ac 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -483,6 +483,9 @@ static HRESULT WINAPI AboutProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, case QUERY_IS_SAFE: FIXME("Unsupported option QUERY_IS_SAFE\n"); return E_NOTIMPL; + case QUERY_USES_HISTORYFOLDER: + FIXME("Unsupported option QUERY_USES_HISTORYFOLDER\n"); + return E_FAIL; default: return E_FAIL; }

1 0

Paul Vriens : iphlpapi/tests: Fix test on Vista.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: d1108c8774568f0f6e4bd47c2e7de703799ea018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1108c8774568f0f6e4bd47c2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 6 21:37:51 2008 +0200 iphlpapi/tests: Fix test on Vista. --- dlls/iphlpapi/tests/iphlpapi.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index a857e99..79a2446 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -190,8 +190,9 @@ static void testGetIfEntry(DWORD index) apiReturn); row.dwIndex = -1; /* hope that's always bogus! */ apiReturn = gGetIfEntry(&row); - ok(apiReturn == ERROR_INVALID_DATA, - "GetIfEntry(bogus row) returned %d, expected ERROR_INVALID_DATA\n", + ok(apiReturn == ERROR_INVALID_DATA || + apiReturn == ERROR_FILE_NOT_FOUND /* Vista */, + "GetIfEntry(bogus row) returned %d, expected ERROR_INVALID_DATA or ERROR_FILE_NOT_FOUND\n", apiReturn); row.dwIndex = index; apiReturn = gGetIfEntry(&row);

1 0

Austin English : rsaenh: Fix a couple failing tests on 2k.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: 7bdee81c0522c3066b1caf1c9a7c46eccf32a065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdee81c0522c3066b1caf1c9… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 6 11:38:38 2008 -0500 rsaenh: Fix a couple failing tests on 2k. --- dlls/rsaenh/tests/rsaenh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 0119f28..479b428 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1775,12 +1775,12 @@ static void test_null_provider(void) ok(!result && GetLastError() == NTE_BAD_PROV_TYPE, "Expected NTE_BAD_PROV_TYPE, got %08x\n", GetLastError()); result = CryptAcquireContext(NULL, szContainer, NULL, PROV_RSA_FULL, 0); - ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + ok(!result && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_KEYSET), + "Expected ERROR_INVALID_PARAMETER or NTE_BAD_KEYSET, got %08x\n", GetLastError()); result = CryptAcquireContext(NULL, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - ok(!result && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + ok(!result && ( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_KEYSET), + "Expected ERROR_INVALID_PARAMETER or NTE_BAD_KEYSET, got %08x\n", GetLastError()); result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); ok(!result && GetLastError() == NTE_BAD_KEYSET,

1 0

Paul Vriens : iphlpapi/tests: Fix crash on Vista.
by Alexandre Julliard June 9, 2008

June 9, 2008

Module: wine Branch: master Commit: fa68a3d9c379bd5848568511a8729371bd3a82ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa68a3d9c379bd5848568511a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 6 21:34:32 2008 +0200 iphlpapi/tests: Fix crash on Vista. --- dlls/iphlpapi/tests/iphlpapi.c | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 04fd572..a857e99 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -153,14 +153,23 @@ static void testWin98OnlyFunctions(void) static void testGetNumberOfInterfaces(void) { if (gGetNumberOfInterfaces) { - DWORD apiReturn = gGetNumberOfInterfaces(NULL), numInterfaces; + DWORD apiReturn, numInterfaces; + + /* Crashes on Vista */ + if (0) { + apiReturn = gGetNumberOfInterfaces(NULL), numInterfaces; + if (apiReturn == ERROR_NOT_SUPPORTED) + return; + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetNumberOfInterfaces(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + } - if (apiReturn == ERROR_NOT_SUPPORTED) - return; - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetNumberOfInterfaces(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); apiReturn = gGetNumberOfInterfaces(&numInterfaces); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetNumberOfInterfaces is not supported\n"); + return; + } ok(apiReturn == NO_ERROR, "GetNumberOfInterfaces returned %d, expected 0\n", apiReturn); } @@ -313,13 +322,22 @@ static void testGetIcmpStatistics(void) DWORD apiReturn; MIB_ICMP stats; - apiReturn = gGetIcmpStatistics(NULL); + /* Crashes on Vista */ + if (0) { + apiReturn = gGetIcmpStatistics(NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) + return; + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIcmpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", + apiReturn); + } + + apiReturn = gGetIcmpStatistics(&stats); if (apiReturn == ERROR_NOT_SUPPORTED) + { + skip("GetIcmpStatistics is not supported\n"); return; - ok(apiReturn == ERROR_INVALID_PARAMETER, - "GetIcmpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", - apiReturn); - apiReturn = gGetIcmpStatistics(&stats); + } ok(apiReturn == NO_ERROR, "GetIcmpStatistics returned %d, expected NO_ERROR\n", apiReturn); }

1 0