January 2012 - Wine-Commits

Francois Gouget : po: Update the Hebrew fuzzy translations.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 8c79785a4fed95b0289726ae733e8a335a8a8607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c79785a4fed95b0289726ae7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 16 00:48:04 2012 +0100 po: Update the Hebrew fuzzy translations. --- po/he.po | 225 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 94 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c79785a4fed95b028972…

1 0

Gustavo Henrique Milaré : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 79afc93910aa937ff491c389af42cca5460bf343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79afc93910aa937ff491c389a… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Sun Jan 15 01:47:35 2012 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 395 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 198 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79afc93910aa937ff491c…

1 0

Frédéric Delanoy : po: Fixes in French translation.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: becff2b62e37193764db7df3b3fb57877b72c0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=becff2b62e37193764db7df3b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 14 20:09:58 2012 +0100 po: Fixes in French translation. --- po/fr.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4c1ff4e..ee1298b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -130,7 +130,7 @@ msgstr "" "applications incorporant du HTML puissent fonctionner correctement.\n" "Wine peut automatiquement le télécharger et l'installer pour vous.\n" "\n" -"Note : il est recommandé d'utiliser le paquet de votre distribution." +"Note : il est recommandé d'utiliser le paquet de votre distribution. " "Consultez <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/" "Gecko</a> pour plus de détails." @@ -3371,7 +3371,7 @@ msgid "" "List of websites you have accessed." msgstr "" "Historique\n" -"Liste des sites web accédés." +"Liste des sites web visités." #: inetcpl.rc:74 msgid "" @@ -4274,7 +4274,7 @@ msgstr "Aucune autre donnée n'est disponible\n" #: winerror.mc:906 msgid "Cannot use Copy API\n" -msgstr "L'API Copy ne peut pas être utilisée\n" +msgstr "L'API de copie est inutilisable\n" #: winerror.mc:911 msgid "Directory name invalid\n" @@ -4523,7 +4523,7 @@ msgstr "Le processus s'est arrêté brutalement\n" #: winerror.mc:1216 msgid "Service dependency failed\n" -msgstr "Dépendances du service non démarrées/ables\n" +msgstr "Échec de démarrage des dépendances du service\n" #: winerror.mc:1221 msgid "Service login failed\n" @@ -6546,7 +6546,7 @@ msgstr "Ajouter un port local" #: localui.rc:39 msgid "&Enter the port name to add:" -msgstr "&Saisisser le nom du port à ajouter :" +msgstr "&Saisissez le nom du port à ajouter :" #: localui.rc:48 msgid "Configure LPT Port"

1 0

Frédéric Delanoy : po: Typo fixes in Dutch translation.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 96c787c1148c589ec7748d74da88478401134ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c787c1148c589ec7748d74d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 14 19:21:37 2012 +0100 po: Typo fixes in Dutch translation. --- po/nl.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index fba9841..cb657e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1965,7 +1965,7 @@ msgstr "Non-Repudiatie" #: crypt32.rc:226 msgid "Key Encipherment" -msgstr "sleutel codering" +msgstr "Sleutel codering" #: crypt32.rc:227 msgid "Data Encipherment" @@ -4270,7 +4270,7 @@ msgstr "Niet meer data beschikbaar\n" #: winerror.mc:906 msgid "Cannot use Copy API\n" -msgstr "Kan de Copy API niet gebuiken\n" +msgstr "Kan de Copy API niet gebruiken\n" #: winerror.mc:911 msgid "Directory name invalid\n"

1 0

Francois Gouget : po: Remove English strings from the Walloon translation.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 0db9804f2732bcbe9e3fef4a1887d73a935d62bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db9804f2732bcbe9e3fef4a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 16 00:49:00 2012 +0100 po: Remove English strings from the Walloon translation. --- po/wa.po | 74 ++++++++++++++++++++++--------------------------------------- 1 files changed, 27 insertions(+), 47 deletions(-) diff --git a/po/wa.po b/po/wa.po index b6f827c..48c498a 100644 --- a/po/wa.po +++ b/po/wa.po @@ -288,7 +288,7 @@ msgstr "&Mete èn Oûve" #: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86 msgid "Help" -msgstr "Help" +msgstr "" #: comctl32.rc:62 msgid "Wizard" @@ -483,7 +483,7 @@ msgstr "Sicrirece &specifike" #: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31 msgid "Orientation" -msgstr "Orientation" +msgstr "" #: comdlg32.rc:230 msgid "Po&rtrait" @@ -2137,9 +2137,8 @@ msgid "Enable &only the following purposes for this certificate:" msgstr "" #: cryptui.rc:250 -#, fuzzy msgid "Add &Purpose..." -msgstr "&Browse..." +msgstr "" #: cryptui.rc:254 msgid "Add Purpose" @@ -2921,9 +2920,8 @@ msgid "Device" msgstr "" #: dinput.rc:50 -#, fuzzy msgid "Actions" -msgstr "Informåcion" +msgstr "" #: dinput.rc:51 msgid "Mapping" @@ -2934,9 +2932,8 @@ msgid "Show Assigned First" msgstr "" #: dinput.rc:34 -#, fuzzy msgid "Action" -msgstr "Informåcion" +msgstr "" #: dinput.rc:35 msgid "Object" @@ -3653,9 +3650,8 @@ msgid "Sharing violation\n" msgstr "" #: winerror.mc:191 -#, fuzzy msgid "Lock violation\n" -msgstr "Informåcion" +msgstr "" #: winerror.mc:196 msgid "Wrong disk\n" @@ -4056,9 +4052,8 @@ msgid "Resource in use\n" msgstr "" #: winerror.mc:696 -#, fuzzy msgid "Cancel violation\n" -msgstr "Informåcion" +msgstr "" #: winerror.mc:701 msgid "Atomic locks not supported\n" @@ -5719,9 +5714,8 @@ msgid "Invalid handle state\n" msgstr "" #: winerror.mc:2771 -#, fuzzy msgid "Bad configuration\n" -msgstr "Informåcion" +msgstr "" #: winerror.mc:2776 msgid "Index is missing\n" @@ -6966,9 +6960,8 @@ msgid "diagram" msgstr "" #: oleacc.rc:81 -#, fuzzy msgid "animation" -msgstr "Informåcion" +msgstr "" #: oleacc.rc:82 msgid "equation" @@ -7238,9 +7231,8 @@ msgid "Copying Files..." msgstr "" #: setupapi.rc:42 -#, fuzzy msgid "Destination:" -msgstr "Informåcion" +msgstr "" #: setupapi.rc:49 #, fuzzy @@ -7714,11 +7706,11 @@ msgstr "Å dfait di %s" #: shell32.rc:333 msgid "Wine &license" -msgstr "Wine &license" +msgstr "" #: shell32.rc:338 msgid "Running on %s" -msgstr "Running on %s" +msgstr "" #: shell32.rc:339 msgid "Wine was brought to you by:" @@ -7729,17 +7721,15 @@ msgid "" "Type the name of a program, folder, document, or Internet resource, and Wine " "will open it for you." msgstr "" -"Type the name of a program, folder, document, or Internet resource, and Wine " -"will open it for you." #: shell32.rc:348 msgid "&Open:" -msgstr "&Open:" +msgstr "" #: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:136 msgid "&Browse..." -msgstr "&Browse..." +msgstr "" #: shell32.rc:135 shell32.rc:139 winefile.rc:111 msgid "Size" @@ -7960,9 +7950,8 @@ msgid "Status" msgstr "" #: shell32.rc:149 -#, fuzzy msgid "Location" -msgstr "Informåcion" +msgstr "" #: shell32.rc:150 msgid "Model" @@ -8244,11 +8233,11 @@ msgstr "&Passer hute" #: user32.rc:84 msgid "&Try Again" -msgstr "&Try Again" +msgstr "" #: user32.rc:85 msgid "&Continue" -msgstr "&Continue" +msgstr "" #: user32.rc:91 #, fuzzy @@ -9664,9 +9653,8 @@ msgid "Wine Explorer" msgstr "" #: explorer.rc:29 -#, fuzzy msgid "Location:" -msgstr "Informåcion" +msgstr "" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -10035,9 +10023,8 @@ msgid "&View TypeLib..." msgstr "" #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "Informåcion" +msgstr "" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -10336,9 +10323,8 @@ msgid "Implementation" msgstr "" #: oleview.rc:140 -#, fuzzy msgid "Activation" -msgstr "Informåcion" +msgstr "" #: oleview.rc:142 msgid "CoGetClassObject failed." @@ -11984,9 +11970,8 @@ msgid "&Owner:" msgstr "" #: winecfg.rc:137 -#, fuzzy msgid "Organi&zation:" -msgstr "Informåcion" +msgstr "" #: winecfg.rc:145 msgid "Application settings" @@ -12248,9 +12233,8 @@ msgid "About" msgstr "" #: winecfg.rc:41 -#, fuzzy msgid "Wine configuration" -msgstr "Informåcion" +msgstr "" #: winecfg.rc:43 msgid "Theme files (*.msstyles; *.theme)" @@ -12582,9 +12566,8 @@ msgid "&Color" msgstr "" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr "Informåcion" +msgstr "" #: wineconsole.rc:100 msgid "Buffer zone" @@ -12859,9 +12842,8 @@ msgid "Tile &Vertically\tCtrl+F4" msgstr "&Tchwezi totafwait" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File Manager" -msgstr "&Informåcion..." +msgstr "" #: winefile.rc:128 msgid "Select destination" @@ -12939,9 +12921,8 @@ msgid "&Compressed" msgstr "" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "Informåcion" +msgstr "" #: winefile.rc:93 msgid "Applying font settings" @@ -13150,7 +13131,7 @@ msgstr "Todi &Visibe" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Informåcion..." +msgstr "" #: winhlp32.rc:64 #, fuzzy @@ -13312,9 +13293,8 @@ msgid "&Pale yellow\tCtrl+2" msgstr "&Tchwezi totafwait" #: wordpad.rc:93 -#, fuzzy msgid "&About Wine Wordpad" -msgstr "&Informåcion..." +msgstr "" #: wordpad.rc:130 msgid "Automatic"

1 0

Francois Gouget : po: Remove English strings from the Ukrainian translation .
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 24ff3ad5eb07d8b64184a31d50b53bfa1000aaf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ff3ad5eb07d8b64184a31d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 16 00:51:28 2012 +0100 po: Remove English strings from the Ukrainian translation. --- po/uk.po | 72 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 34 insertions(+), 38 deletions(-) diff --git a/po/uk.po b/po/uk.po index 164b2a2..9a776ff 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2208,7 +2208,7 @@ msgstr "" #: cryptui.rc:296 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" -msgstr "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" +msgstr "" #: cryptui.rc:298 msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" @@ -2353,15 +2353,15 @@ msgstr "Виберіть формат, який ви хочете викорис #: cryptui.rc:405 msgid "&DER-encoded X.509 (.cer)" -msgstr "&DER-encoded X.509 (.cer)" +msgstr "" #: cryptui.rc:407 msgid "Ba&se64-encoded X.509 (.cer):" -msgstr "Ba&se64-encoded X.509 (.cer):" +msgstr "" #: cryptui.rc:409 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" -msgstr "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" +msgstr "" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -2857,11 +2857,11 @@ msgstr "Вказаний файл вже існує. Ви хочете його #: cryptui.rc:153 msgid "DER-Encoded Binary X.509 (*.cer)" -msgstr "DER-Encoded Binary X.509 (*.cer)" +msgstr "" #: cryptui.rc:154 msgid "Base64-Encoded X.509 (*.cer)" -msgstr "Base64-Encoded X.509 (*.cer)" +msgstr "" #: cryptui.rc:157 msgid "CMS/PKCS #7 Messages (*.p7b)" @@ -3326,26 +3326,24 @@ msgid "&Blank page" msgstr "По&рожня сторінка" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " Browsing history " +msgstr "" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." -msgstr "You can delete cached pages, cookies and other data." +msgstr "" #: inetcpl.rc:56 msgid "Delete &files..." -msgstr "Delete &files..." +msgstr "" #: inetcpl.rc:57 msgid "&Settings..." -msgstr "&Settings..." +msgstr "" #: inetcpl.rc:65 -#, fuzzy msgid "Delete browsing history" -msgstr " Browsing history " +msgstr "" #: inetcpl.rc:68 msgid "" @@ -6595,7 +6593,7 @@ msgstr "Вся Мережа" #: msacm32.rc:27 msgid "Sound Selection" -msgstr "Sound Selection" +msgstr "" #: msacm32.rc:36 msgid "&Save As..." @@ -7240,12 +7238,12 @@ msgstr "СКАНУВАННЯ... Зачекайте" #: sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "px" +msgstr "" #: sane.rc:32 msgctxt "unit: bits" msgid "b" -msgstr "b" +msgstr "" #: sane.rc:34 winecfg.rc:174 msgctxt "unit: dots/inch" @@ -8332,7 +8330,7 @@ msgstr "&Розмір паперу:" #: wineps.rc:36 msgid "Duplex:" -msgstr "Duplex:" +msgstr "" #: wininet.rc:39 wininet.rc:59 msgid "Realm" @@ -9849,12 +9847,12 @@ msgstr "Ви впевнені" #: cmd.rc:292 xcopy.rc:40 msgctxt "Yes key" msgid "Y" -msgstr "Y" +msgstr "" #: cmd.rc:293 xcopy.rc:41 msgctxt "No key" msgid "N" -msgstr "N" +msgstr "" #: cmd.rc:294 #, fuzzy @@ -9931,7 +9929,7 @@ msgstr "Не можу викликати мітку пакету за межам #: cmd.rc:312 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "A" +msgstr "" #: cmd.rc:313 #, fuzzy @@ -10073,7 +10071,7 @@ msgstr "Передача" #: ipconfig.rc:37 msgid "Peer-to-peer" -msgstr "Peer-to-peer" +msgstr "" #: ipconfig.rc:38 msgid "Mixed" @@ -10438,7 +10436,7 @@ msgstr "&Об'єкт" #: oleview.rc:39 msgid "&CoCreateInstance Flag" -msgstr "&CoCreateInstance Flag" +msgstr "" #: oleview.rc:41 msgid "&In-process server" @@ -10548,7 +10546,7 @@ msgstr "" #: oleview.rc:178 msgid "Default Interface Viewer" -msgstr "Default Interface Viewer" +msgstr "" #: oleview.rc:181 msgid "Interface" @@ -10564,7 +10562,7 @@ msgstr "&Дивитись дані про тип" #: oleview.rc:191 msgid "IPersist Interface Viewer" -msgstr "IPersist Interface Viewer" +msgstr "" #: oleview.rc:194 oleview.rc:206 msgid "Class Name:" @@ -10576,7 +10574,7 @@ msgstr "CLSID:" #: oleview.rc:203 msgid "IPersistStream Interface Viewer" -msgstr "IPersistStream Interface Viewer" +msgstr "" #: oleview.rc:93 oleview.rc:94 msgid "OleView" @@ -12480,7 +12478,7 @@ msgstr " Параметри вікна " #: winecfg.rc:161 msgid "Automatically capture the &mouse in full-screen windows" -msgstr "Automatically capture the &mouse in full-screen windows" +msgstr "" #: winecfg.rc:162 msgid "Allow the window manager to &decorate the windows" @@ -12620,30 +12618,28 @@ msgid "Show &dot files" msgstr "Показати &файли, що починаються з крапки" #: winecfg.rc:256 -#, fuzzy msgid "Driver diagnostics" -msgstr " Driver Diagnostics " +msgstr "" #: winecfg.rc:258 -#, fuzzy msgid "Defaults" -msgstr " Defaults " +msgstr "" #: winecfg.rc:259 msgid "Output device:" -msgstr "Output device:" +msgstr "" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Voice output device:" +msgstr "" #: winecfg.rc:261 msgid "Input device:" -msgstr "Input device:" +msgstr "" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Voice input device:" +msgstr "" #: winecfg.rc:267 msgid "&Test Sound" @@ -13024,11 +13020,11 @@ msgstr "Сплив. меню" #: wineconsole.rc:67 msgid "&Control" -msgstr "&Control" +msgstr "" #: wineconsole.rc:68 msgid "S&hift" -msgstr "S&hift" +msgstr "" #: wineconsole.rc:69 msgid "Quick edit" @@ -13403,7 +13399,7 @@ msgstr "Останні зміни:" #: winefile.rc:174 msgid "Cop&yright:" -msgstr "Cop&yright:" +msgstr "" #: winefile.rc:176 msgid "Size:" @@ -13582,7 +13578,7 @@ msgstr "WineMine" #: winemine.rc:28 msgid "Nobody" -msgstr "Nobody" +msgstr "" #: winemine.rc:29 msgid "Copyright 2000 Joshua Thielen"

1 0

Daniel Lehman : msvcp90: Start rfind from given position.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: cbe1bcd29f6ba69a6d20d681fb96d14e379a717c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe1bcd29f6ba69a6d20d681f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Dec 30 09:45:10 2011 -0800 msvcp90: Start rfind from given position. --- dlls/msvcp90/string.c | 4 +- dlls/msvcp90/tests/string.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 2ecd004..8a6bf64 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1624,7 +1624,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_rfind_cstr_substr( if(pos > this->size-len+1) pos = this->size-len+1; end = basic_string_char_const_ptr(this); - for(p=end+pos-1; p>=end; p--) { + for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_char_compare(p, find, len)) return p-basic_string_char_const_ptr(this); } @@ -3611,7 +3611,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_rfind_cstr_substr( if(pos > this->size-len+1) pos = this->size-len+1; end = basic_string_wchar_const_ptr(this); - for(p=end+pos-1; p>=end; p--) { + for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_wchar_compare(p, find, len)) return p-basic_string_wchar_const_ptr(this); } diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 60fa460..6857dee 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -74,6 +74,9 @@ static basic_string_char* (__thiscall *p_basic_string_char_append_substr)(basic_ static int (__thiscall *p_basic_string_char_compare_substr_substr)(basic_string_char*, size_t, size_t, basic_string_char*, size_t, size_t); static int (__thiscall *p_basic_string_char_compare_substr_cstr_len)(basic_string_char*, size_t, size_t, const char*, size_t); static size_t (__thiscall *p_basic_string_char_find_cstr_substr)(basic_string_char*, const char*, size_t, size_t); +static size_t (__thiscall *p_basic_string_char_rfind_cstr_substr)(basic_string_char*, const char*, size_t, size_t); + +static size_t *p_basic_string_char_npos; static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); @@ -219,6 +222,10 @@ static BOOL init(void) "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@PEBD(a)Z"); SET(p_basic_string_char_find_cstr_substr, "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); + SET(p_basic_string_char_rfind_cstr_substr, + "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); + SET(p_basic_string_char_npos, + "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2_KB"); SET(p_basic_string_wchar_ctor, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ"); @@ -279,6 +286,10 @@ static BOOL init(void) "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@PBD(a)Z"); SET(p_basic_string_char_find_cstr_substr, "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); + SET(p_basic_string_char_rfind_cstr_substr, + "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); + SET(p_basic_string_char_npos, + "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB"); SET(p_basic_string_wchar_ctor, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ"); @@ -503,6 +514,40 @@ static void test_basic_string_char_find(void) { call_func1(p_basic_string_char_dtor, &str); } +static void test_basic_string_char_rfind(void) { + struct rfind_char_test { + const char *str; + const char *find; + size_t pos; + size_t len; + size_t ret; + }; + + int i; + basic_string_char str; + size_t ret; + struct rfind_char_test tests[] = { + { "", "a", 0, 1, *p_basic_string_char_npos }, /* empty string */ + { "a", "", 0, 0, 0 }, /* empty find */ + { "aaa", "aaa", 0, 3, 0 }, /* simple case */ + { "aaa", "a", 0, 1, 0 }, /* start of string */ + { "aaa", "a", 2, 1, 2 }, /* end of string */ + { "aaa", "a", *p_basic_string_char_npos, 1, 2 }, /* off == npos */ + { "aaa", "z", 0, 1, *p_basic_string_char_npos } /* can't find */ + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + + ret = (size_t)call_func4(p_basic_string_char_rfind_cstr_substr, &str, + tests[i].find, tests[i].pos, tests[i].len); + ok(ret == tests[i].ret, "str = '%s' find = '%s' ret = %lu\n", + tests[i].str, tests[i].find, (unsigned long)ret); + + call_func1(p_basic_string_char_dtor, &str); + } +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -614,6 +659,7 @@ START_TEST(string) test_basic_string_char_compare(); test_basic_string_char_concatenate(); test_basic_string_char_find(); + test_basic_string_char_rfind(); test_basic_string_wchar(); test_basic_string_wchar_swap();

1 0

André Hentschel : d3drm: Fix invocation of GetTextureCoordinates.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 467bbc4497e2d75030f48268c71a9df6845b8bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=467bbc4497e2d75030f48268c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 15 17:00:16 2012 +0100 d3drm: Fix invocation of GetTextureCoordinates. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 34a8d4c..7ad7a38 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -774,7 +774,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetTextureCoordinates(IDirect3 TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v); - return IDirect3DRMMeshBuilder2_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, + return IDirect3DRMMeshBuilder3_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, index, u, v); }

1 0

Daniel Lehman : msvcrt: Add declarations to stdlib. h for _wcstoui64 and _wcstoi64.
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 9a8d3cc5bd27e86503a57554454d191270ba1a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8d3cc5bd27e86503a575544… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 13 15:03:46 2012 -0800 msvcrt: Add declarations to stdlib.h for _wcstoui64 and _wcstoi64. --- include/msvcrt/stdlib.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 6a6398d..c972156 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -237,6 +237,10 @@ size_t __cdecl wcstombs(char*,const wchar_t*,size_t); errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); __msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); int __cdecl wctomb(char*,wchar_t); +__int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int); +__int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t); +unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int); +unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t); #endif /* _WSTDLIB_DEFINED */ typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t);

1 0

Frédéric Delanoy : windowscodecs: Fix memory deallocation in LoadUnknownMetadata (Coverity).
by Alexandre Julliard Jan. 16, 2012

Jan. 16, 2012

Module: wine Branch: master Commit: 07b14bf2816e5376fd63aa9fc89023165ad614a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b14bf2816e5376fd63aa9fc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jan 15 00:35:47 2012 +0100 windowscodecs: Fix memory deallocation in LoadUnknownMetadata (Coverity). --- dlls/windowscodecs/metadatahandler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 114c3af..afcff21 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -557,7 +557,7 @@ static HRESULT LoadUnknownMetadata(IStream *input, const GUID *preferred_vendor, } result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); - if (FAILED(hr)) + if (!result) { HeapFree(GetProcessHeap(), 0, data); return E_OUTOFMEMORY;

1 0