May 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : ddraw: Use IsRectEmpty() instead of open coding it.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 08201eef3cac11cbab5a923adc5cb939a8a2868b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08201eef3cac11cbab5a923ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 3 21:43:55 2016 +0200 ddraw: Use IsRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 80a2f0b..1edf8fe 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6118,8 +6118,7 @@ static HRESULT d3d_device7_Load(IDirect3DDevice7 *iface, IDirectDrawSurface7 *ds * for it may be divided. If any dimension of dest is larger than source, it can't be * mip level subset, so an error can be returned early. */ - if (srcrect.left >= srcrect.right || srcrect.top >= srcrect.bottom || - srcrect.right > src->surface_desc.dwWidth || + if (IsRectEmpty(&srcrect) || srcrect.right > src->surface_desc.dwWidth || srcrect.bottom > src->surface_desc.dwHeight || destpoint.x + srcrect.right - srcrect.left > src->surface_desc.dwWidth || destpoint.y + srcrect.bottom - srcrect.top > src->surface_desc.dwHeight ||

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: da5bffdbe8e7ce07af104aeb46e77b001ce5cbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5bffdbe8e7ce07af104aeb4… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue May 10 18:09:45 2016 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 96 +++++++++++++++++----------------------------------------------- 1 file changed, 25 insertions(+), 71 deletions(-) diff --git a/po/de.po b/po/de.po index 16acac1..b650350 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-01-11 12:42+0100\n" +"PO-Revision-Date: 2016-05-10 18:09+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -11646,116 +11646,86 @@ msgid "The operation completed successfully\n" msgstr "Der Vorgang wurde erfolgreich abgeschlossen\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Fehler: Ungültiger Schlüssel\n" +msgstr "reg: Ungültiger Schlüsselname\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Fehler: Ungültige Befehlszeilenargumente\n" +msgstr "reg: Ungültige Befehlszeilenargumente\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Fehler: Auf den Remoterechner kann nicht zugegriffen werden\n" +msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" msgstr "" -"Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n" +"reg: Das System konnte den angegebenen Schlüssel oder Wert nicht finden\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Fehler: Nicht unterstützter Typ\n" +msgstr "reg: Nicht unterstützter Registrierungsdatentyp [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n" +msgstr "reg: Auf die Option [/d] muss eine gültige Ganzzahl folgen\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" -"Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n" +msgstr "reg: Auf die Option [/d] muss ein gültiger Hexadezimalwert folgen\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: Unbehandelter Registrierungsdatentyp [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Die angegebene Datei existiert bereits. Möchten Sie sie ersetzen?" +msgstr "Der Wert '%1' existiert bereits. Möchten Sie ihn ersetzen?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "Der Registrierungsvorgang wurde abgebrochen\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" msgstr "(Standard)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Möchten Sie diese Werte wirklich löschen?" +msgstr "Sind Sie sicher, dass Sie den Wert '%1' löschen möchten?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Möchten Sie den Wert '%s' wirklich löschen?" +msgstr "Sind Sie sicher, dass Sie alle Werte in '%1' löschen möchten?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Sind Sie sicher, dass Sie '%1' löschen möchten?" +msgstr "Sind Sie sicher, dass Sie den Schlüssel '%1' löschen möchten?" #: reg.rc:52 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" -"Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n" +msgstr "reg: Auf die Option [/d] muss eine gültige Zeichenkette folgen\n" #: reg.rc:53 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: Es konnten nicht alle Werte in '%1' gelöscht werden. Es ist ein " +"unerwarteter Fehler aufgetreten.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: Der angegebene Vorgang konnte nicht abgeschlossen werden. Es ist ein " +"unerwarteter Fehler aufgetreten.\n" #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Suche abgeschlossen. Gefundene Übereinstimmungen: %1!d!\n" #: regedit.rc:34 msgid "&Registry" @@ -13212,8 +13182,6 @@ msgstr "" "Einstellungen in diesen Reitern vornehmen können." #: winecfg.rc:159 -#, fuzzy -#| msgid "&Add application..." msgid "Add appli&cation..." msgstr "Anw. &hinzufügen..." @@ -13277,7 +13245,7 @@ msgstr "&Neue Überschreibung für:" #: winecfg.rc:196 msgid "A&dd" -msgstr "" +msgstr "&Hinzufügen" #: winecfg.rc:197 msgid "Existing &overrides:" @@ -13304,10 +13272,8 @@ msgid "&Native (Windows)" msgstr "&Native (Windows)" #: winecfg.rc:211 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" -msgstr "Bui&ltin dann Native" +msgstr "Buil&tin dann Native" #: winecfg.rc:212 msgid "Nati&ve then Builtin" @@ -13330,26 +13296,20 @@ msgstr "" "nicht bearbeitet werden." #: winecfg.rc:236 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." msgstr "&Hinzufügen..." #: winecfg.rc:238 -#, fuzzy -#| msgid "Autodetect" msgid "Aut&odetect" -msgstr "Automatisch" +msgstr "&Automatisch" #: winecfg.rc:241 msgid "&Path:" msgstr "&Pfad:" #: winecfg.rc:248 winecfg.rc:38 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "&Erweitert" +msgstr "&Erweitert anzeigen" #: winecfg.rc:249 msgid "De&vice:" @@ -13368,8 +13328,6 @@ msgid "S&erial:" msgstr "S&erien-Nr.:" #: winecfg.rc:258 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" msgstr "D&ot-Dateien anzeigen" @@ -13450,8 +13408,6 @@ msgid "Select the Unix target directory, please." msgstr "Bitte wählen Sie das Unix-Zielverzeichnis." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" msgstr "&Erweitert ausblenden" @@ -13916,13 +13872,11 @@ msgid "Configuration error" msgstr "Konfigurationsfehler" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." msgstr "" -"Die Größe des Zeichenpuffers muss mindestens der Fenstergröße entsprechen" +"Die Größe des Zeichenpuffers muss mindestens der Fenstergröße entsprechen." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: b23a1437f1e78e899b70fdd6558b753b18f0d6cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23a1437f1e78e899b70fdd65… Author: Kim Malmo <berencamlost(a)msn.com> Date: Sun May 8 18:53:51 2016 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 5cc5229..9d23bd6 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-04 12:00+0200\n" +"PO-Revision-Date: 2016-05-08 20:00+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -11631,15 +11631,15 @@ msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" -"reg: Kan ikke slette alle registerverdiene i \"%1\". Ett uventet " -"problemoppstod.\n" +"reg: Kan ikke slette alle registerverdiene i \"%1\". Ett uventet problem " +"oppstod.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" -"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventetproblem " +"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventet problem " "oppstod.\n" #: reg.rc:55

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 407c57705413394049839bacb7a4dcc19ceeb619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407c57705413394049839bacb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 8 20:25:07 2016 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 335c624..604cc42 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-19 21:25+0900\n" +"PO-Revision-Date: 2016-05-05 15:32+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -11612,26 +11612,28 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "本当にレジストリキー '%1' を削除しますか?" #: reg.rc:52 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid integer\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: /d オプションのあとに正しい整数値を指定してください\n" +msgstr "reg: /d オプションのあとに正しい文字列を指定してください\n" #: reg.rc:53 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: '%1' にある一部のレジストリ値を削除できませんでした。予期しない\n" +"エラーが発生しました。\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: 指定された操作を完了できませんでした。予期しないエラーが発生しまし\n" +"た。\n" #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "検索が完了しました。該当箇所の数: %1!d!\n" #: regedit.rc:34 msgid "&Registry"

1 0

Kirill K. Smirnov : mciavi32: Propely handle Heap[Re]Alloc failure.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: ed79f458174d9db8e41d2b166fcc8acde7dfdeb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed79f458174d9db8e41d2b166… Author: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Date: Sun May 8 19:10:44 2016 +0300 mciavi32: Propely handle Heap[Re]Alloc failure. Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mmoutput.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index d3badb6..c932ab4 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -229,14 +229,16 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, alb->numAudioBlocks, mmck->cksize); if (wma->lpWaveFormat) { if (alb->numAudioBlocks >= alb->numAudioAllocated) { - alb->numAudioAllocated += 32; - if (!wma->lpAudioIndex) - wma->lpAudioIndex = HeapAlloc(GetProcessHeap(), 0, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - else - wma->lpAudioIndex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - if (!wma->lpAudioIndex) return FALSE; + DWORD newsize = alb->numAudioAllocated + 32; + struct MMIOPos* newindex; + + if (!wma->lpAudioIndex) + newindex = HeapAlloc(GetProcessHeap(), 0, newsize * sizeof(struct MMIOPos)); + else + newindex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, newsize * sizeof(struct MMIOPos)); + if (!newindex) return FALSE; + alb->numAudioAllocated = newsize; + wma->lpAudioIndex = newindex; } wma->lpAudioIndex[alb->numAudioBlocks].dwOffset = mmck->dwDataOffset; wma->lpAudioIndex[alb->numAudioBlocks].dwSize = mmck->cksize;

1 0

Piotr Caban : msvcp110: Fix Yarn::operator=(const char*) implementation.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: f8a0f90effcb0ff2d5f453079c47f4881483744a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a0f90effcb0ff2d5f453079… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:23:58 2016 +0200 msvcp110: Fix Yarn::operator=(const char*) implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/string.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 9f0d7fe..e102020 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1644,17 +1644,19 @@ _Yarn_char* __thiscall _Yarn_char_op_assign_cstr(_Yarn_char *this, const char *s { TRACE("(%p %p)\n", this, str); - _Yarn_char__Tidy(this); - - if(str) { - MSVCP_size_t len = strlen(str); - - this->str = MSVCRT_operator_new((len+1)*sizeof(char)); - if(!this->str) { - ERR("out of memory\n"); - return NULL; + if(str != this->str) { + _Yarn_char__Tidy(this); + + if(str) { + MSVCP_size_t len = strlen(str); + + this->str = MSVCRT_operator_new((len+1)*sizeof(char)); + if(!this->str) { + ERR("out of memory\n"); + return NULL; + } + memcpy(this->str, str, (len+1)*sizeof(char)); } - memcpy(this->str, str, (len+1)*sizeof(char)); } return this; } @@ -1762,17 +1764,19 @@ _Yarn_wchar* __thiscall _Yarn_wchar_op_assign_cstr(_Yarn_wchar *this, const wcha { TRACE("(%p %p)\n", this, str); - _Yarn_wchar__Tidy(this); + if(str != this->str) { + _Yarn_wchar__Tidy(this); - if(str) { - MSVCP_size_t len = wcslen(str); + if(str) { + MSVCP_size_t len = wcslen(str); - this->str = MSVCRT_operator_new((len+1)*sizeof(wchar_t)); - if(!this->str) { - ERR("out of memory\n"); - return NULL; + this->str = MSVCRT_operator_new((len+1)*sizeof(wchar_t)); + if(!this->str) { + ERR("out of memory\n"); + return NULL; + } + memcpy(this->str, str, (len+1)*sizeof(wchar_t)); } - memcpy(this->str, str, (len+1)*sizeof(wchar_t)); } return this; }

1 0

Piotr Caban : msvcp110: Don't allocate empty buffers in _Locinfo:: _Locinfo_ctor.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 5a427e5124d0ca587a363d37d98cfd625d702365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a427e5124d0ca587a363d37d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:04 2016 +0200 msvcp110: Don't allocate empty buffers in _Locinfo::_Locinfo_ctor. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 13 ++++++------- dlls/msvcp90/msvcp90.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 24cacc7..0a06da2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -69,6 +69,7 @@ LCID* __cdecl ___lc_handle_func(void); #if _MSVCP_VER < 100 #define locale_string basic_string_char +#define locale_string_char_ctor(this) MSVCP_basic_string_char_ctor(this) #define locale_string_char_ctor_cstr(this,str) MSVCP_basic_string_char_ctor_cstr(this,str) #define locale_string_char_copy_ctor(this,copy) MSVCP_basic_string_char_copy_ctor(this,copy) #define locale_string_char_dtor(this) MSVCP_basic_string_char_dtor(this) @@ -76,6 +77,7 @@ LCID* __cdecl ___lc_handle_func(void); #define locale_string_char_assign(this,assign) MSVCP_basic_string_char_assign(this,assign) #else #define locale_string _Yarn_char +#define locale_string_char_ctor(this) _Yarn_char_ctor(this) #define locale_string_char_ctor_cstr(this,str) _Yarn_char_ctor_cstr(this,str) #define locale_string_char_copy_ctor(this,copy) _Yarn_char_copy_ctor(this,copy) #define locale_string_char_dtor(this) _Yarn_char_dtor(this) @@ -512,9 +514,6 @@ void* __thiscall _Timevec__Getptr(_Timevec *this) _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int category, const char *locstr) { const char *locale = NULL; -#if _MSVCP_VER >= 110 - static const wchar_t empty[] = { '\0' }; -#endif /* This function is probably modifying more global objects */ FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); @@ -523,11 +522,11 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); - locale_string_char_ctor_cstr(&locinfo->days, ""); - locale_string_char_ctor_cstr(&locinfo->months, ""); + locale_string_char_ctor(&locinfo->days); + locale_string_char_ctor(&locinfo->months); #if _MSVCP_VER >= 110 - locale_string_wchar_ctor_cstr(&locinfo->wdays, empty); - locale_string_wchar_ctor_cstr(&locinfo->wmonths, empty); + locale_string_wchar_ctor(&locinfo->wdays); + locale_string_wchar_ctor(&locinfo->wmonths); #endif locale_string_char_ctor_cstr(&locinfo->oldlocname, setlocale(LC_ALL, NULL)); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 2d0f4f8..4a42332 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -142,6 +142,7 @@ typedef struct char null_str; } _Yarn_char; +_Yarn_char* __thiscall _Yarn_char_ctor(_Yarn_char*); _Yarn_char* __thiscall _Yarn_char_ctor_cstr(_Yarn_char*, const char*); _Yarn_char* __thiscall _Yarn_char_copy_ctor(_Yarn_char*, const _Yarn_char*); const char* __thiscall _Yarn_char_c_str(const _Yarn_char*);

1 0

Piotr Caban : msvcp110: Use locale_string:: assign instead of freeing and allocating new object in _Locinfo__W_Getdays.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 40a59a968a9818321c9534cb858c4e1f06ccc9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a59a968a9818321c9534cb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:08 2016 +0200 msvcp110: Use locale_string::assign instead of freeing and allocating new object in _Locinfo__W_Getdays. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0a06da2..89465b5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -86,9 +86,9 @@ LCID* __cdecl ___lc_handle_func(void); #define locale_string_wchar _Yarn_wchar #define locale_string_wchar_ctor(this) _Yarn_wchar_ctor(this) -#define locale_string_wchar_ctor_cstr(this,str) _Yarn_wchar_ctor(this); _Yarn_wchar_op_assign_cstr(this,str) #define locale_string_wchar_dtor(this) _Yarn_wchar_dtor(this) #define locale_string_wchar_c_str(this) _Yarn_wchar__C_str(this) +#define locale_string_wchar_assign(this,str) _Yarn_wchar_op_assign_cstr(this,str) #endif typedef int category; @@ -850,8 +850,7 @@ const wchar_t* __thiscall _Locinfo__W_Getdays(const _Locinfo *this) TRACE("(%p)\n", this); if(wdays) { - locale_string_wchar_dtor((locale_string_wchar *)&this->wdays); - locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wdays, wdays); + locale_string_wchar_assign((locale_string_wchar *)&this->wdays, wdays); free(wdays); } @@ -886,8 +885,7 @@ const wchar_t* __thiscall _Locinfo__W_Getmonths(const _Locinfo *this) TRACE("(%p)\n", this); if(wmonths) { - locale_string_wchar_dtor((locale_string_wchar *)&this->wmonths); - locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wmonths, wmonths); + locale_string_wchar_assign((locale_string_wchar *)&this->wmonths, wmonths); free(wmonths); }

1 0

Piotr Caban : msvcp110: Fix num_put<char> structure layout.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 77184106c8c2bff7db9ea5d20b3b3330196befc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77184106c8c2bff7db9ea5d20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:12 2016 +0200 msvcp110: Fix num_put<char> structure layout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 37 ++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 2 ++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 89465b5..06b2ca1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7124,7 +7124,9 @@ DEFINE_THISCALL_WRAPPER(num_put_char__Init, 8) void __thiscall num_put_char__Init(num_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER < 110 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -7869,7 +7871,9 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar__Init, 8) void __thiscall num_put_wchar__Init(num_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER < 110 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -8104,6 +8108,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Put(const num_put *this, ostre return ret; } +#if _MSVCP_VER < 110 /* ?_Putc@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PBDI(a)Z */ /* ?_Putc@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K(a)Z */ /* ?_Putc@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@PBDI(a)Z */ @@ -8124,6 +8129,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Putc(const num_put *this, ostr *ret = dest; return ret; } +#endif /* ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PBDI_W(a)Z */ /* ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K_W(a)Z */ @@ -8208,6 +8214,27 @@ ostreambuf_iterator_wchar* __cdecl num_put_short__Fput(const num_put *this, ostr return NULL; } +#if _MSVCP_VER < 110 +static void num_put_wchar_wide_put(const num_put *this, + ostreambuf_iterator_wchar *dest, ios_base *base, + const char *buf, MSVCP_size_t count) +{ + num_put_wchar__Putc(this, dest, *dest, buf, count); +} +#else +static void num_put_wchar_wide_put(const num_put *this, + ostreambuf_iterator_wchar *dest, ios_base *base, + const char *buf, MSVCP_size_t count) +{ + ctype_wchar *ctype; + MSVCP_size_t i; + + ctype = ctype_wchar_use_facet(IOS_LOCALE(base)); + for(i=0; i<count; i++) + ostreambuf_iterator_wchar_put(dest, ctype_wchar_widen_ch(ctype, buf[i])); +} +#endif + /* TODO: This function should be removed when num_put_wchar__Fput is implemented */ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf, @@ -8258,7 +8285,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ base->wide = 0; if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { - num_put_wchar__Putc(this, &dest, dest, buf, 1); + num_put_wchar_wide_put(this, &dest, base, buf, 1); buf++; } if(adjustfield != FMTFLAG_left) { @@ -8272,7 +8299,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ else if(!buf[i]) num_put_wchar__Rep(this, &dest, dest, sep, 1); else - num_put_wchar__Putc(this, &dest, dest, buf+i, 1); + num_put_wchar_wide_put(this, &dest, base, buf+i, 1); } return num_put_wchar__Rep(this, ret, dest, fill, pad); @@ -8351,10 +8378,10 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ base->wide = 0; if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { - num_put_wchar__Putc(this, &dest, dest, buf, 1); + num_put_wchar_wide_put(this, &dest, base, buf, 1); buf++; }else if((adjustfield & FMTFLAG_internal) && (buf[1]=='x' || buf[1]=='X')) { - num_put_wchar__Putc(this, &dest, dest, buf, 2); + num_put_wchar_wide_put(this, &dest, base, buf, 2); buf += 2; } if(adjustfield != FMTFLAG_left) { @@ -8366,7 +8393,7 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ if(!buf[i]) num_put_wchar__Rep(this, &dest, dest, sep, 1); else - num_put_wchar__Putc(this, &dest, dest, buf+i, 1); + num_put_wchar_wide_put(this, &dest, base, buf+i, 1); } return num_put_wchar__Rep(this, ret, dest, fill, pad); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 4a42332..aa7322f 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -550,7 +550,9 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, ist /* class num_put<wchar> */ typedef struct { locale_facet facet; +#if _MSVCP_VER < 110 _Cvtvec cvt; +#endif } num_put; num_put* num_put_char_use_facet(const locale*);

1 0

Julian Rüger : German translation for release 1.8.2
by Jeremy Newman 10 May '16

10 May '16

Module: website Branch: master Commit: 97ecdafee87384cba5ea2bbe312427e3005df0d9 URL: http://source.winehq.org/git/website.git/?a=commit;h=97ecdafee87384cba5ea2b… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue May 10 16:48:09 2016 +0200 German translation for release 1.8.2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016041201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2016041201.xml b/news/de/2016041201.xml new file mode 100644 index 0000000..7400aee --- /dev/null +++ b/news/de/2016041201.xml @@ -0,0 +1,13 @@ +<news> +<date>12. April 2016</date> +<title>Wine 1.8.2 freigegeben</title> +<body> + Die Wartungsversion 1.8.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>Kleinere Übersetzungsupdates.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0