wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Francois Gouget : setupapi/tests: Remove a pointless use of assert().
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: ce64b90c97a53c3cb5ee2249a7eef2a66ccbc25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce64b90c97a53c3cb5ee2249a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:14:14 2013 +0200 setupapi/tests: Remove a pointless use of assert(). --- dlls/setupapi/tests/parser.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 53f7cc0..5a99423 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -424,7 +423,12 @@ static void test_key_names(void) if (hinf == INVALID_HANDLE_VALUE) continue; ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); - assert( ret ); + ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); + if (!ret) + { + SetupCloseInfFile( hinf ); + continue; + } check_key( &context, key_names[i].key );

1 0

Francois Gouget : twain_32/tests: Generate an error and skip instead of assert()-ing when the setup fails.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 499eaca38bf96df9a661a7ebdaad7c59188ae147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499eaca38bf96df9a661a7ebd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:11:01 2013 +0200 twain_32/tests: Generate an error and skip instead of assert()-ing when the setup fails. --- dlls/twain_32/tests/dsm.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index f3b6f95..96381e6 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -18,7 +18,7 @@ * */ #include <stdarg.h> -#include <assert.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -33,6 +33,7 @@ static DSMENTRYPROC pDSM_Entry; static BOOL dsm_RegisterWindowClasses(void) { WNDCLASSA cls; + BOOL rc; cls.style = 0; cls.lpfnWndProc = DefWindowProc; @@ -44,9 +45,10 @@ static BOOL dsm_RegisterWindowClasses(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "TWAIN_dsm_class"; - if (!RegisterClassA(&cls)) return FALSE; - return TRUE; + rc = RegisterClassA(&cls); + ok(rc, "RegisterClassA failed: le=%u\n", GetLastError()); + return rc; } @@ -832,7 +834,11 @@ START_TEST(dsm) HANDLE hwnd; HMODULE htwain; - if (!dsm_RegisterWindowClasses()) assert(0); + if (!dsm_RegisterWindowClasses()) + { + skip("Could not register the test class, skipping tests\n"); + return; + } htwain = LoadLibraryA("twain_32.dll"); if (! htwain)

1 0

Francois Gouget : comctl32/tests: Use ok(0) to report unexpected function calls instead of assert(0).
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 47b56f238db4f14369c0cb68e689db81c72c38ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b56f238db4f14369c0cb68e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:09:07 2013 +0200 comctl32/tests: Use ok(0) to report unexpected function calls instead of assert(0). --- dlls/comctl32/tests/imagelist.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 58a7e70..3e7adbc 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -26,7 +26,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #include "windef.h" #include "winbase.h" @@ -651,26 +650,26 @@ static struct my_IStream *impl_from_IStream(IStream *iface) static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static ULONG STDMETHODCALLTYPE Test_Stream_AddRef(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return 2; } static ULONG STDMETHODCALLTYPE Test_Stream_Release(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return 1; } static HRESULT STDMETHODCALLTYPE Test_Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -703,13 +702,13 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_Write(IStream *iface, const void *p static HRESULT STDMETHODCALLTYPE Test_Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -717,46 +716,46 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_CopyTo(IStream *iface, IStream *pst ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Commit(IStream *iface, DWORD grfCommitFlags) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Revert(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Clone(IStream *iface, IStream **ppstm) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Akihiro Sagawa : po: Use English shell path names in Japanese locale.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 2633b3bc894de49786d2f08c4fcb0603763b2f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2633b3bc894de49786d2f08c4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 4 00:27:18 2013 +0900 po: Use English shell path names in Japanese locale. --- po/ja.po | 63 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1373b97..9ff9cb8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,15 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-07-02 23:19+0900\n" -"Last-Translator: Akira Nakagawa <matyapiro31(a)yahoo.co.jp>\n" +"PO-Revision-Date: 2013-07-03 23:54+0900\n" +"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" #: appwiz.rc:55 msgid "Install/Uninstall" @@ -7912,48 +7911,48 @@ msgstr "プログラム" #: shell32.rc:201 msgid "My Documents" -msgstr "マイドキュメント" +msgstr "My Documents" #: shell32.rc:202 msgid "Favorites" -msgstr "お気に入り" +msgstr "Favorites" #: shell32.rc:203 msgid "StartUp" -msgstr "スタートアップ" +msgstr "StartUp" #: shell32.rc:204 msgid "Start Menu" -msgstr "スタートメニュー" +msgstr "Start Menu" #: shell32.rc:205 msgid "My Music" -msgstr "マイミュージック" +msgstr "My Music" #: shell32.rc:206 msgid "My Videos" -msgstr "マイビデオ" +msgstr "My Videos" #: shell32.rc:207 msgctxt "directory" msgid "Desktop" -msgstr "デスクトップ" +msgstr "Desktop" #: shell32.rc:208 msgid "NetHood" -msgstr "ネットワーク内" +msgstr "NetHood" #: shell32.rc:209 msgid "Templates" -msgstr "テンプレート" +msgstr "Templates" #: shell32.rc:210 msgid "PrintHood" -msgstr "プリンタ内" +msgstr "PrintHood" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "ヒストリ" +msgstr "History" #: shell32.rc:212 msgid "Program Files" @@ -7961,7 +7960,7 @@ msgstr "Program Files" #: shell32.rc:214 msgid "My Pictures" -msgstr "マイピクチャ" +msgstr "My Pictures" #: shell32.rc:215 msgid "Common Files" @@ -7969,23 +7968,23 @@ msgstr "Common Files" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "ドキュメント" +msgstr "Documents" #: shell32.rc:217 msgid "Administrative Tools" -msgstr "管理者用ツール" +msgstr "Administrative Tools" #: shell32.rc:218 msgid "Music" -msgstr "ミュージック" +msgstr "Music" #: shell32.rc:219 msgid "Pictures" -msgstr "ピクチャ" +msgstr "Pictures" #: shell32.rc:220 msgid "Videos" -msgstr "ビデオ" +msgstr "Videos" #: shell32.rc:213 msgid "Program Files (x86)" @@ -7993,19 +7992,19 @@ msgstr "Program Files (x86)" #: shell32.rc:221 msgid "Contacts" -msgstr "連絡先" +msgstr "Contacs" #: shell32.rc:222 winefile.rc:110 msgid "Links" -msgstr "リンク" +msgstr "Links" #: shell32.rc:223 msgid "Slide Shows" -msgstr "スライドショー" +msgstr "Slide Shows" #: shell32.rc:224 msgid "Playlists" -msgstr "プレイリスト" +msgstr "Playlists" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -8021,35 +8020,35 @@ msgstr "機種名" #: shell32.rc:225 msgid "Sample Music" -msgstr "サンプルミュージック" +msgstr "Sample Music" #: shell32.rc:226 msgid "Sample Pictures" -msgstr "サンプルピクチャ" +msgstr "Sample Pictures" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "サンプルプレイリスト" +msgstr "Sample Playlists" #: shell32.rc:228 msgid "Sample Videos" -msgstr "サンプルビデオ" +msgstr "Sample Videos" #: shell32.rc:229 msgid "Saved Games" -msgstr "保存済みのゲーム" +msgstr "Saved Games" #: shell32.rc:230 msgid "Searches" -msgstr "検索" +msgstr "Searches" #: shell32.rc:231 msgid "Users" -msgstr "ユーザー" +msgstr "Users" #: shell32.rc:233 msgid "Downloads" -msgstr "ダウンロード" +msgstr "Downloads" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied."

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: df9f8be197647321eb5befc4c45a655a0ea2cdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9f8be197647321eb5befc4c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jul 3 10:58:57 2013 +0900 po: Update Korean translation. --- po/ko.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/ko.po b/po/ko.po index b001a9d..dc92e64 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13579,22 +13579,16 @@ msgid "Not yet implemented" msgstr "아직 구현안됨" #: winefile.rc:106 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Creation date" -msgstr "만들기 실패함.\n" +msgstr "만든 날짜" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "접근이 금지되었습니다.\n" +msgstr "접근한 날짜" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "인증서 경로" +msgstr "고친 날짜" #: winefile.rc:109 msgid "Index/Inode" @@ -13602,7 +13596,7 @@ msgstr "인덱스/아이노드" #: winefile.rc:114 msgid "%1 of %2 free" -msgstr "%1 의 %2 사용가능" +msgstr "%2 의 %1 사용가능" #: winefile.rc:115 msgctxt "unit kilobyte"

1 0

Qian Hong : user32: Properly update caret position after result string is committed.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 9ef2c648ee557d25d2598a42fdc7854101709f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef2c648ee557d25d2598a42f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Jul 3 03:54:41 2013 +0800 user32: Properly update caret position after result string is committed. --- dlls/user32/edit.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3e5a850..3634710 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4421,10 +4421,16 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) return; if (CompFlag & GCS_RESULTSTR) + { EDIT_GetResultStr(hIMC, es); - if (CompFlag & GCS_COMPSTR) - EDIT_GetCompositionStr(hIMC, CompFlag, es); - cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); + cursor = 0; + } + else + { + if (CompFlag & GCS_COMPSTR) + EDIT_GetCompositionStr(hIMC, CompFlag, es); + cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); + } ImmReleaseContext(hwnd, hIMC); EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); }

1 0

André Hentschel : msvcrt: Remove superfluous casts.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: e931b5d17ee481798a72de2bd3103ed2d7afb131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e931b5d17ee481798a72de2bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 2 20:59:04 2013 +0200 msvcrt: Remove superfluous casts. --- dlls/msvcrt/cpp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 0fbdf5f..a3ee6b9 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -87,7 +87,7 @@ static void dump_obj_locator( const rtti_object_locator *ptr ) static void dump_obj_locator( const rtti_object_locator *ptr ) { int i; - char *base = ptr->signature == 0 ? (char*)RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; + char *base = ptr->signature == 0 ? RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); @@ -864,7 +864,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) char *base; if(obj_locator->signature == 0) - base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); + base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator; @@ -992,7 +992,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); if(obj_locator->signature == 0) - base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); + base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator;

1 0

Akira Nakagawa : po: Update Japanese translation.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 0fb9de61a5026ac6cf16bc3385c3828850a4c831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb9de61a5026ac6cf16bc338… Author: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Sun Jun 30 13:04:43 2013 +0900 po: Update Japanese translation. --- po/ja.po | 194 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 98 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fb9de61a5026ac6cf16b…

1 0

Mosaab Alzoubi : po: Update Arabic translation.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 694e4f5b76cf7f80beb947401263b1be77147ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694e4f5b76cf7f80beb947401… Author: Mosaab Alzoubi <moceap(a)hotmail.com> Date: Mon Jul 1 15:49:37 2013 +0300 po: Update Arabic translation. --- po/ar.po | 6895 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 3606 insertions(+), 3289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=694e4f5b76cf7f80beb94…

1 0

Mosaab Alzoubi : wine.desktop: Add Arabic title.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 5aac4b395e71c33883763c583d163551cd40c013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aac4b395e71c33883763c583… Author: Mosaab Alzoubi <moceap(a)hotmail.com> Date: Mon Jul 1 16:53:07 2013 +0300 wine.desktop: Add Arabic title. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 234e7e2..04f7da8 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Type=Application Name=Wine Windows Program Loader +Name[ar]=منظومة واين لتشغيل برامج وندوز Name[cs]=Zavaděč programů pro Wine Name[de]=Wine Windows-Programmstarter Name[es]=Wine Cargador de programas de Windows

1 0

← Newer
1
...
37
38
39
40
41
42
43
44
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2013