Module: wine
Branch: master
Commit: 2a26e954ec13bc2fc47b6464ee063b102b6b4e7e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a26e954ec13bc2fc47b6464e…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Mon Jun 21 11:49:07 2010 +0200
hlink/tests: Comment out a test for an uninitialized return value.
---
dlls/hlink/tests/hlink.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c
index d454819..cf031f5 100644
--- a/dlls/hlink/tests/hlink.c
+++ b/dlls/hlink/tests/hlink.c
@@ -1093,7 +1093,8 @@ static void test_HlinkGetSetMonikerReference(void)
/* invalid HLINKSETF flags */
hres = IHlink_SetMonikerReference(hlink, 12, dummy2, two);
- ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres);
+ /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */
+ if (0) ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres);
hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc);
ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt);
@@ -1244,10 +1245,11 @@ static void test_HlinkGetSetStringReference(void)
CoTaskMemFree(fnd_loc);
hres = IHlink_SetStringReference(link, 4, NULL, NULL);
- ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres);
+ /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */
+ if (0) ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres);
hres = IHlink_SetStringReference(link, -4, NULL, NULL);
- ok(hres == -4, "IHlink_SetStringReference should have failed with 0xFFFFFFFC, instead: 0x%08x\n", hres);
+ if (0) ok(hres == -4, "IHlink_SetStringReference should have failed with 0xFFFFFFFC, instead: 0x%08x\n", hres);
IHlink_Release(link);
}
Module: wine
Branch: master
Commit: ed264c4bb7fe5624163f84555a3cf638c1b1e7b7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed264c4bb7fe5624163f84555…
Author: Hwang YunSong <hys545(a)dreamwiz.com>
Date: Mon Jun 21 10:35:27 2010 +0900
mapi32: New Korean resource.
---
dlls/mapi32/Ko.rc | 34 ++++++++++++++++++++++++++++++++++
dlls/mapi32/Makefile.in | 1 +
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/dlls/mapi32/Ko.rc b/dlls/mapi32/Ko.rc
new file mode 100644
index 0000000..710b0be
--- /dev/null
+++ b/dlls/mapi32/Ko.rc
@@ -0,0 +1,34 @@
+/*
+* MAPI32 Korean resources
+*
+* Copyright 2009 Owen Rudge for CodeWeavers
+* Copyright 2010 YunSong Hwang
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+*
+*/
+
+#include "res.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+ IDS_NO_MAPI_CLIENT, "설치된 MAPI 메일 클라이언트가 없어서 메일 보내기 실패."
+ IDS_SEND_MAIL, "메일 보내기"
+}
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index e81a99a..f416d5c 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -21,6 +21,7 @@ RC_SRCS = \
Fr.rc \
It.rc \
Ja.rc \
+ Ko.rc \
Lt.rc \
Nl.rc \
Pl.rc \