wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Dmitry Timoshkov : gdiplus/tests: Add GdipGetClipBounds tests.
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: e1572f9cd15bb44e1067569a570b19e5f2aee69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1572f9cd15bb44e1067569a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 4 18:34:57 2013 +0900 gdiplus/tests: Add GdipGetClipBounds tests. --- dlls/gdiplus/tests/graphics.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6ed1463..e12cac0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4521,6 +4521,64 @@ static void test_bitmapfromgraphics(void) GdipDisposeImage((GpImage*)bitmap); } +static void test_clipping(void) +{ + HDC hdc; + GpStatus status; + GpGraphics *graphics; + GpRegion *region; + GpMatrix *matrix; + GpRectF rect; + + hdc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateRegion(&region); + expect(Ok, status); + status = GdipSetEmpty(region); + expect(Ok, status); + + rect.X = rect.Y = 100.0; + rect.Width = rect.Height = 100.0; + status = GdipCombineRegionRect(region, &rect, CombineModeUnion); + expect(Ok, status); + status = GdipSetClipRegion(graphics, region, CombineModeReplace); + expect(Ok, status); + + status = GdipGetClipBounds(graphics, &rect); + expect(Ok, status); + expectf(100.0, rect.X); + expectf(100.0, rect.Y); + expectf(100.0, rect.Width); + expectf(100.0, rect.Height); + + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + status = GdipScaleMatrix(matrix, 2.0, 4.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipTranslateMatrix(matrix, 10.0, 20.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + + status = GdipGetClipBounds(graphics, &rect); + expect(Ok, status); +todo_wine + expectf(45.0, rect.X); +todo_wine + expectf(20.0, rect.Y); +todo_wine + expectf(50.0, rect.Width); +todo_wine + expectf(25.0, rect.Height); + + GdipDeleteMatrix(matrix); + GdipDeleteRegion(region); + GdipDeleteGraphics(graphics); + DeleteDC(hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4547,6 +4605,7 @@ START_TEST(graphics) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_clipping(); test_measured_extra_space(); test_measure_string(); test_font_height_scaling();

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for GetShortPathName called for a non-existent short file name.
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: 24ab4453d7acadca427fb165c4f71fc1fcb1218a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ab4453d7acadca427fb165c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 4 13:43:11 2013 +0900 kernel32/tests: Add a test for GetShortPathName called for a non-existent short file name. --- dlls/kernel32/tests/path.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 41650f5..d703aa9 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1275,7 +1275,17 @@ static void test_GetShortPathNameW(void) ok( length, "GetShortPathNameW returned 0.\n" ); ret = GetShortPathNameW( path, short_path, length ); ok( ret, "GetShortPathNameW returned 0.\n" ); + lstrcatW( short_path, name ); + + /* GetShortPathName for a non-existent short file name should fail */ + SetLastError(0xdeadbeef); + length = GetShortPathNameW( short_path, path, 0 ); +todo_wine + ok(!length, "GetShortPathNameW should fail\n"); +todo_wine + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" );

1 0

Dmitry Timoshkov : kernel32/tests: Fix compilation with a PSDK compiler.
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: 0fa1877e440c695e3b44968e9fc9dc1823edd06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa1877e440c695e3b44968e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 4 13:42:27 2013 +0900 kernel32/tests: Fix compilation with a PSDK compiler. --- dlls/kernel32/tests/path.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ba47910..41650f5 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -558,9 +559,10 @@ static void test_ShortPathCase(const char *tmpdir, const char *dirname, { char buf[MAX_PATH], shortbuf[MAX_PATH]; HANDLE hndl; - int i; + size_t i; - snprintf(buf,sizeof(buf),"%s\\%s\\%s",tmpdir,dirname,filename); + assert(strlen(tmpdir) + strlen(dirname) + strlen(filename) + 2 < sizeof(buf)); + sprintf(buf,"%s\\%s\\%s",tmpdir,dirname,filename); GetShortPathNameA(buf,shortbuf,sizeof(shortbuf)); hndl = CreateFileA(shortbuf,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed (%d)\n",GetLastError());

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: 25e66d9ad22591fc774f0dd88c7bf4e4adef13b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e66d9ad22591fc774f0dd88… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Fri Jul 5 21:36:58 2013 +0800 po: Update Simplified Chinese translation. --- po/zh_CN.po | 112 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 60 insertions(+), 52 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index b9a7194..d032f7c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12190,7 +12190,7 @@ msgstr "窗口设置" #: winecfg.rc:161 msgid "Automatically capture the &mouse in full-screen windows" -msgstr "" +msgstr "全屏模式下自动捕获光标(&M)" #: winecfg.rc:162 msgid "Allow the window manager to &decorate the windows" @@ -12214,7 +12214,7 @@ msgstr "屏幕分辨率" #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "" +msgstr "这是使用 10 号 Tahoma 字体的示例文本" #: winecfg.rc:182 msgid "DLL overrides" @@ -12321,15 +12321,15 @@ msgstr "显示隐藏文件(&D)" #: winecfg.rc:256 msgid "Driver diagnostics" -msgstr "" +msgstr "驱动程序诊断" #: winecfg.rc:258 msgid "Defaults" -msgstr "" +msgstr "默认值" #: winecfg.rc:259 msgid "Output device:" -msgstr "" +msgstr "输出设备：" #: winecfg.rc:260 msgid "Voice output device:" @@ -12337,7 +12337,7 @@ msgstr "" #: winecfg.rc:261 msgid "Input device:" -msgstr "" +msgstr "输入设备：" #: winecfg.rc:262 msgid "Voice input device:" @@ -12437,7 +12437,7 @@ msgstr "Wine 设置：针对 %s" #: winecfg.rc:81 msgid "Selected driver: %s" -msgstr "" +msgstr "选中的驱动：%s" #: winecfg.rc:82 msgid "(None)" @@ -12445,7 +12445,7 @@ msgstr "(无)" #: winecfg.rc:83 msgid "Audio test failed!" -msgstr "" +msgstr "音频测试失败！" #: winecfg.rc:85 msgid "(System default)" @@ -12517,7 +12517,7 @@ msgstr "软盘" #: winecfg.rc:70 msgid "CD-ROM" -msgstr "" +msgstr "光驱" #: winecfg.rc:71 msgid "" @@ -12918,7 +12918,7 @@ msgstr "程序错误" msgid "" "The program %s has encountered a serious problem and needs to close. We are " "sorry for the inconvenience." -msgstr "" +msgstr "程序 %s 遇到严重的问题需要关闭。我们对此造成的不便表示抱歉。" #: winedbg.rc:55 msgid "" @@ -12926,6 +12926,8 @@ msgid "" "may want to check the <a href=\"http://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" +"这可能是由程序的问题或者 Wine 的缺陷造成的。你可能需要查看 <a href=\"http://" +"appdb.winehq.org\">Application Databa</a> 来获取运行该应用的相关技巧。" #: winedbg.rc:58 msgid "Show &Details" @@ -12942,18 +12944,21 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"若该问题在 Windows 不会出现并且未曾被报告过，您可以使用“另存为”按钮将详细信息" +"保存为一个文件，然后<a href=\"http://wiki.winehq.org/Bugs\">新建一个错误报告" +"</a>并且附带上该文件。" #: winedbg.rc:35 msgid "Wine program crash" -msgstr "" +msgstr "Wine 程序崩溃" #: winedbg.rc:36 msgid "Internal errors - invalid parameters received" -msgstr "" +msgstr "内部错误 - 收到无效参数" #: winedbg.rc:37 msgid "(unidentified)" -msgstr "" +msgstr "（未被识别的）" #: winedbg.rc:40 msgid "Saving failed" @@ -12961,7 +12966,7 @@ msgstr "保存失败" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "正在载入详细信息，请稍候……" #: winefile.rc:26 msgid "&Open\tEnter" @@ -13061,7 +13066,7 @@ msgstr "文件类型" #: winefile.rc:141 msgid "&Directories" -msgstr "" +msgstr "目录(&D)" #: winefile.rc:143 msgid "&Programs" @@ -13073,11 +13078,11 @@ msgstr "文档(&M)" #: winefile.rc:147 msgid "&Other files" -msgstr "" +msgstr "其他文件(&O)" #: winefile.rc:149 msgid "Show Hidden/&System Files" -msgstr "" +msgstr "显示隐藏文件/系统文件(&S)" #: winefile.rc:160 msgid "&File Name:" @@ -13085,11 +13090,11 @@ msgstr "文件名(&F)：" #: winefile.rc:162 msgid "Full &Path:" -msgstr "" +msgstr "完整路径(&P)：" #: winefile.rc:164 msgid "Last Change:" -msgstr "" +msgstr "最后更改：" #: winefile.rc:168 msgid "Cop&yright:" @@ -13101,11 +13106,11 @@ msgstr "大小:" #: winefile.rc:174 msgid "H&idden" -msgstr "" +msgstr "隐藏(&I)" #: winefile.rc:175 msgid "&Archive" -msgstr "" +msgstr "存档(&A)" #: winefile.rc:176 msgid "&System" @@ -13122,31 +13127,31 @@ msgstr "版本信息" #: winefile.rc:194 msgctxt "accelerator Fullscreen" msgid "S" -msgstr "" +msgstr "S" #: winefile.rc:87 msgid "Applying font settings" -msgstr "" +msgstr "应用字体设置" #: winefile.rc:88 msgid "Error while selecting new font." -msgstr "" +msgstr "选取新字体时发生错误。" #: winefile.rc:93 msgid "Wine File Manager" -msgstr "" +msgstr "Wine 文件管理器" #: winefile.rc:95 msgid "root fs" -msgstr "" +msgstr "root fs" #: winefile.rc:96 msgid "unixfs" -msgstr "" +msgstr "unixfs" #: winefile.rc:98 msgid "Shell" -msgstr "" +msgstr "Shell" #: winefile.rc:99 winhlp32.rc:107 winhlp32.rc:82 msgid "Not yet implemented" @@ -13166,30 +13171,30 @@ msgstr "修改日期" #: winefile.rc:109 msgid "Index/Inode" -msgstr "" +msgstr "索引/Inode" #: winefile.rc:114 msgid "%1 of %2 free" -msgstr "" +msgstr "%2 中剩余 %1" #: winefile.rc:115 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "kB" #: winefile.rc:116 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "MB" #: winefile.rc:117 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "GB" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "游戏(&G)" #: winemine.rc:35 msgid "&New\tF2" @@ -13197,7 +13202,7 @@ msgstr "新游戏(&N)\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "问号(&M)" #: winemine.rc:39 msgid "&Beginner" @@ -13564,37 +13569,37 @@ msgstr "工具栏" #: wordpad.rc:273 msgctxt "accelerator Align Left" msgid "L" -msgstr "" +msgstr "L" #: wordpad.rc:274 msgctxt "accelerator Align Center" msgid "E" -msgstr "" +msgstr "E" #: wordpad.rc:275 msgctxt "accelerator Align Right" msgid "R" -msgstr "" +msgstr "R" #: wordpad.rc:282 msgctxt "accelerator Redo" msgid "Y" -msgstr "" +msgstr "Y" #: wordpad.rc:283 msgctxt "accelerator Bold" msgid "B" -msgstr "" +msgstr "B" #: wordpad.rc:284 msgctxt "accelerator Italic" msgid "I" -msgstr "" +msgstr "I" #: wordpad.rc:285 msgctxt "accelerator Underline" msgid "U" -msgstr "" +msgstr "U" #: wordpad.rc:136 msgid "All documents (*.*)" @@ -13751,23 +13756,23 @@ msgstr "启动写字板失败" #: xcopy.rc:27 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "" +msgstr "无效参数个数 - 使用 xcopy /? 获取帮助\n" #: xcopy.rc:28 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "" +msgstr "无效参数 ‘%1’ - 使用 xcopy /? 获取帮助\n" #: xcopy.rc:29 msgid "Press <Enter> to begin copying\n" -msgstr "" +msgstr "请按 <Enter> 开始复制\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n" -msgstr "" +msgstr "%1!d! 个文件将会被复制\n" #: xcopy.rc:31 msgid "%1!d! file(s) copied\n" -msgstr "" +msgstr "已复制 %1!d! 个文件\n" #: xcopy.rc:34 msgid "" @@ -13775,14 +13780,17 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" +"%1 是一个在目标路径上的\n" +"文件名还是目录？\n" +"（F - 文件，D - 目录）\n" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "" +msgstr "%1？（Yes|No）\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "" +msgstr "是否覆盖 %1？（Yes|No|All）\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" @@ -13790,17 +13798,17 @@ msgstr "" #: xcopy.rc:39 msgid "Failed during reading of '%1'\n" -msgstr "" +msgstr "读取‘%1’失败\n" #: xcopy.rc:43 msgctxt "File key" msgid "F" -msgstr "" +msgstr "F" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "" +msgstr "D" #: xcopy.rc:77 msgid ""

1 0

Volkan Gezer : po: Update Turkish translation
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: 13f1a358401dfef009b7b89a84bb153eabe1f35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f1a358401dfef009b7b89a8… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Thu Jul 4 00:10:54 2013 +0200 po: Update Turkish translation --- po/tr.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/tr.po b/po/tr.po index 9ca439c..0f82206 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,9 +5,9 @@ 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-06-24 11:42+0200\n" +"PO-Revision-Date: 2013-07-04 00:10+0200\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" -"Language-Team: none\n" +"Language-Team: Turkish <kde-l10n-tr(a)kde.org>\n" "Language: Turkish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -719,7 +719,7 @@ msgstr "&Seçim" #: comdlg32.rc:383 msgid "&from:" -msgstr "&Başlangıç:" +msgstr "&başlangıç:" #: comdlg32.rc:384 msgid "&to:" @@ -2354,11 +2354,11 @@ msgstr "Kullanmak biçimi seçin:" #: cryptui.rc:405 msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-encoded X.509 (*.cer)" +msgstr "&DER-Kodlu X.509 (*.cer)" #: cryptui.rc:407 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-encoded X.509 (*.cer):" +msgstr "Ba&se64-Kodlu X.509 (*.cer):" #: cryptui.rc:409 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2434,7 +2434,7 @@ msgstr "Bu sertifika aşağıdaki isteklerde amaçlanıyor:" #: cryptui.rc:35 msgid "Issued to: " -msgstr "Verilen:" +msgstr "Verilen: " #: cryptui.rc:36 msgid "Issued by: " @@ -2442,7 +2442,7 @@ msgstr "Veren: " #: cryptui.rc:37 msgid "Valid from " -msgstr "Geçerlilik başlangıcı" +msgstr "Geçerlilik başlangıcı " #: cryptui.rc:38 msgid " to " @@ -7926,7 +7926,7 @@ msgstr "Sık Kullanılanlar" #: shell32.rc:203 msgid "StartUp" -msgstr "Başlangı" +msgstr "Başlangıç" #: shell32.rc:204 msgid "Start Menu"

1 0

Julian Rüger : server: Update German translation of manpage.
by Alexandre Julliard 08 Jul '13

08 Jul '13

Module: wine Branch: master Commit: 8dca13df5dce6667729c0704aec65c09e7dbc20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dca13df5dce6667729c0704a… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jul 3 22:17:14 2013 +0200 server: Update German translation of manpage. --- server/wineserver.de.man.in | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/server/wineserver.de.man.in b/server/wineserver.de.man.in index 0a89890..26d0deb 100644 --- a/server/wineserver.de.man.in +++ b/server/wineserver.de.man.in @@ -1,4 +1,3 @@ -.\" -*- nroff -*- .TH WINESERVER 1 "Oktober 2005" "@PACKAGE_STRING@" "Windows on Unix" .SH NAME wineserver \- der Wine Server @@ -24,8 +23,8 @@ detaillierte Ausgabe. Wenn .I n nicht angegeben wird, ist 1 der Standardwert. Die Debugausgabe wird an stderr geleitet. \fBwine\fR(1) wird beim Start von \fBwineserver\fR -automatisch das Debuglevel setzen, wenn +server in der Umgebungsvariable -WINEDEBUG angegeben ist. +automatisch das Debuglevel auf normal setzen, wenn +server in der +Umgebungsvariable WINEDEBUG angegeben ist. .TP .BR \-f ", " --foreground Lässt den Server zur vereinfachten Fehlersuche im Vordergrund laufen, @@ -36,7 +35,7 @@ Zeigt den Hilfetext an. .TP \fB\-k\fI[n]\fR, \fB--kill\fI[=n] Beendet den momentan laufenden -.B wineserver , +.BR wineserver , optional mit Signal \fIn\fR. Wenn kein Signal angegeben wurde, wird SIGINT, gefolgt von einem SIGKILL gesendet. Die zu beendende Instanz von \fBwineserver\fR wird durch die Umgebungsvariable WINEPREFIX bestimmt. @@ -98,16 +97,15 @@ Der ursprüngliche Autor von ist Alexandre Julliard. Viele andere Personen haben neue Funktionen hinzugefügt und Fehler behoben. Details finden Sie in der Datei Changelog. .SH FEHLER -Wenn Sie einen Fehler finden, melden Sie ihn bitte unter +Wenn Sie einen Fehler finden, melden Sie ihn bitte im .UR http://bugs.winehq.org -.BR http://bugs.winehq.org . -.UE +.B Wine Bugtracker +.UE . .SH VERFÜGBARKEIT .B wineserver -ist Teil der Wine-Distribution, verfügbar im WineHQ, dem Hauptquartier der -Wine-Entwicklung, unter +ist Teil der Wine-Distribution, verfügbar im WineHQ, dem .UR http://www.winehq.org/ -.BR http://www.winehq.org/ . -.UE +.B Hauptquartier der Wine-Entwicklung +.UE . .SH "SIEHE AUCH" .BR wine (1).

1 0

Marcus Meissner : oleaut32/tests: Test return of SafeArrayAllocData ( Coverity).
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 9a0b4345ec1896c2ab7945ea3a96f85534e29e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0b4345ec1896c2ab7945ea3… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jul 2 17:08:55 2013 +0200 oleaut32/tests: Test return of SafeArrayAllocData (Coverity). --- dlls/oleaut32/tests/safearray.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 289640b..469bdef 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -324,7 +324,8 @@ static void test_safearray(void) a->rgsabound[1].cElements = 4; a->rgsabound[1].lLbound = 1; a->cbElements = 2; - SafeArrayAllocData(a); + hres = SafeArrayAllocData(a); + ok(hres == S_OK, "SafeArrayAllocData failed with hres %x\n", hres); indices[0] = 4; indices[1] = 2;

1 0

Marcus Meissner : oleaut32: Check a return value (Coverity).
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 0f86ae37c63ac9d55fe068d85440b121d03df432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f86ae37c63ac9d55fe068d85… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jul 2 15:45:04 2013 +0200 oleaut32: Check a return value (Coverity). --- dlls/oleaut32/usrmarshal.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 495c257..0b541e4 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1070,15 +1070,16 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B Buffer += sizeof(wiresab[0]) * wiresa->cDims; if(vt) + { *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); + if (!*ppsa) RpcRaiseException(E_OUTOFMEMORY); + } else { - SafeArrayAllocDescriptor(wiresa->cDims, ppsa); - if(*ppsa) - memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims); + if (FAILED(SafeArrayAllocDescriptor(wiresa->cDims, ppsa))) + RpcRaiseException(E_OUTOFMEMORY); + memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims); } - if (!*ppsa) - RpcRaiseException(E_OUTOFMEMORY); /* be careful about which flags we set since they could be a security * risk */

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 653354ab254e70eb846aa920ff43de75bb30773d URL: http://source.winehq.org/git/wine.git/?a=commit;h=653354ab254e70eb846aa920f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:11:13 2013 +0200 Assorted spelling fixes. --- dlls/shell32/iconcache.c | 6 +++--- dlls/shell32/tests/shelllink.c | 6 ++++-- dlls/user32/tests/edit.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 91f0eb5..e2300f1 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -880,11 +880,11 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) /**************************************************************************** * SHGetStockIconInfo [SHELL32.@] * - * Receive informations for builtin icons + * Receive information for builtin icons * * PARAMS - * id [I] selected icon-id to get informations - * flags [I] select informations to receive + * id [I] selected icon-id to get information for + * flags [I] selects the information to receive * sii [IO] SHSTOCKICONINFO structure to fill * * RETURNS diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index a3301d8..7dc4379 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1042,8 +1042,10 @@ static void test_SHGetStockIconInfo(void) if (atleast_win7 && (i == (SIID_MAX_ICONS - 1)) && broken(hr == E_INVALIDARG)) { - /* off by one windows bug: there are SIID_MAX_ICONS icons from 0 upto - SIID_MAX_ICONS-1 on win8, but the last one is missing on win7 */ + /* Off by one windows bug: there are SIID_MAX_ICONS icons from 0 + * up to SIID_MAX_ICONS-1 on Windows 8, but the last one is missing + * on Windows 7. + */ trace("%3d: got E_INVALIDARG (windows bug: off by one)\n", i); } else if (atleast_win7 && (i < (SIID_MAX_ICONS))) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 700dfb0..fb4a8b3 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2628,7 +2628,7 @@ static void test_EM_GETHANDLE(void) len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); - /* everything is normal upto EM_GETHANDLE */ + /* everything is normal up to EM_GETHANDLE */ hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); /* Some messages still work while other messages fail. After LocalFree the memory handle, messages can crash the app */

1 0

Francois Gouget : mlang/tests: We already link with mlang. dll so there is no need to do a LoadLibrary() on it.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 28139bceebd968692c78f287553513f2caa59011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28139bceebd968692c78f2875… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:15:32 2013 +0200 mlang/tests: We already link with mlang.dll so there is no need to do a LoadLibrary() on it. --- dlls/mlang/tests/mlang.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 0da31b5..1d52af6 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -230,13 +230,7 @@ static BOOL init_function_ptrs(void) { HMODULE hMlang; - hMlang = LoadLibraryA("mlang.dll"); - if (!hMlang) - { - skip("mlang not available\n"); - return FALSE; - } - + hMlang = GetModuleHandleA("mlang.dll"); pConvertINetMultiByteToUnicode = (void *)GetProcAddress(hMlang, "ConvertINetMultiByteToUnicode"); pConvertINetUnicodeToMultiByte = (void *)GetProcAddress(hMlang, "ConvertINetUnicodeToMultiByte"); pRfc1766ToLcidA = (void *)GetProcAddress(hMlang, "Rfc1766ToLcidA");

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
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