From julliard at winehq.org  Tue Jun  1 11:02:26 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 11:02:26 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: wineusr: Sync the
	WINEDLLOVERRIDES examples with the manpage.
Message-ID: <E1OJTv8-0000rO-1v@wine.codeweavers.com>

Module: docs
Branch: master
Commit: 77e40b7fec8d419cf4ab38db85b0eaea0ce0828f
URL:    http://source.winehq.org/git/docs.git/?a=commit;h=77e40b7fec8d419cf4ab38db85b0eaea0ce0828f

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon May 31 19:09:56 2010 +0200

wineusr: Sync the WINEDLLOVERRIDES examples with the manpage.

---

 en/wineusr-running.sgml |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml
index dd3d090..9c5ae2f 100644
--- a/en/wineusr-running.sgml
+++ b/en/wineusr-running.sgml
@@ -248,13 +248,32 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
           to use the WINEDLLOVERRIDES environment variable to set them.
         </para>
         <para>
-          For example, if you wanted wine to use native ole32.dll, 
-          oleaut32.dll and rpcrt4 you could run <command>wine</command> like this:
+          Examples:
         </para>
         <screen>
-<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="ole32,oleaut32,rpcrt4=n" wine <replaceable>program_name</replaceable></userinput>
+<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32,shell32=n,b" wine <replaceable>program_name</replaceable></userinput>
         </screen>
         <para>
+          Try to load comdlg32 and shell32 as native windows dll first and try
+          the builtin version if the native load fails.
+        </para>
+        <screen>
+<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32,shell32=n;c:\\foo\\bar\\baz=b" wine <replaceable>program_name</replaceable></userinput>
+        </screen>
+        <para>
+          Try to load the libraries comdlg32 and shell32 as native windows dlls.
+          Furthermore, if an application request to load c:\foo\bar\baz.dll load
+          the builtin library baz.
+        </para>
+        <screen>
+<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n;oleaut32=" wine <replaceable>program_name</replaceable></userinput>
+        </screen>
+        <para>
+          Try to load comdlg32 as builtin first and try the native version if
+          the builtin load fails; load shell32 always as builtin and comctl32
+          always as native. Oleaut32 will be disabled.
+        </para>
+        <para>
           For more information about DLL overrides, please refer to the <link
           linkend="winecfg-dll-overrides">DLL overrides</link> section of this guide.
         </para>



From julliard at winehq.org  Tue Jun  1 12:12:41 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:41 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winemenubuilder: Simplify
	switch cases.
Message-ID: <E1OJV17-000483-Fy@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d6001be3483f8e7bd8fa5f39f4b686b0cc8ffe4c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d6001be3483f8e7bd8fa5f39f4b686b0cc8ffe4c

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon May 31 19:19:29 2010 +0200

winemenubuilder: Simplify switch cases.

---

 programs/winemenubuilder/winemenubuilder.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 413e5de..a40a657 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -505,11 +505,9 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename,
     switch (pIcon->bmiHeader.biBitCount)
     {
     case 4:
-        return SavePalettedIconResAsPNG(pIcon, png_filename, commentW);
     case 8:
         return SavePalettedIconResAsPNG(pIcon, png_filename, commentW);
     case 24:
-        return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW);
     case 32:
         return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW);
     default:



From julliard at winehq.org  Tue Jun  1 12:12:41 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:41 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winetest: Add an else case.
Message-ID: <E1OJV17-00048K-II@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 99a24eaf48d06b37661225eaf11ccf029140ddf1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=99a24eaf48d06b37661225eaf11ccf029140ddf1

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon May 31 19:20:16 2010 +0200

winetest: Add an else case.

---

 programs/winetest/main.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 3eabf5f..01217d2 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -212,6 +212,8 @@ static void print_version (void)
     static const char platform[] = "alpha";
 #elif defined(__powerpc__)
     static const char platform[] = "powerpc";
+#else
+# error CPU unknown
 #endif
     OSVERSIONINFOEX ver;
     BOOL ext, wow64;



From julliard at winehq.org  Tue Jun  1 12:12:41 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:41 -0500
Subject: Henri Verbeet : wined3d: Get rid of some dead code.
Message-ID: <E1OJV17-00048b-LF@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1b5cc39a86256f5d3d582429924fcc6b6bd80400
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1b5cc39a86256f5d3d582429924fcc6b6bd80400

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon May 31 20:40:26 2010 +0200

wined3d: Get rid of some dead code.

---

 dlls/wined3d/drawprim.c        |   40 ----------
 dlls/wined3d/surface.c         |  162 ----------------------------------------
 dlls/wined3d/surface_base.c    |    9 --
 dlls/wined3d/surface_gdi.c     |  136 ---------------------------------
 dlls/wined3d/swapchain.c       |   40 ----------
 dlls/wined3d/wined3d_private.h |   34 --------
 include/wine/wined3d.idl       |    3 -
 7 files changed, 0 insertions(+), 424 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b5cc39a86256f5d3d582429924fcc6b6bd80400


From julliard at winehq.org  Tue Jun  1 12:12:41 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:41 -0500
Subject: Austin English : ntdll: Add signal context function definitions for
	FreeBSD .
Message-ID: <E1OJV17-00048t-Pf@wine.codeweavers.com>

Module: wine
Branch: master
Commit: da77e7456bd90dd7621deba1d97764f31c6af7d3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=da77e7456bd90dd7621deba1d97764f31c6af7d3

Author: Austin English <austinenglish at gmail.com>
Date:   Mon May 31 15:19:38 2010 -0500

ntdll: Add signal context function definitions for FreeBSD.

---

 dlls/ntdll/signal_x86_64.c |   53 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index ccea6df..f509006 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -29,6 +29,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifdef HAVE_UCONTEXT_H
+# include <ucontext.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -132,12 +136,45 @@ extern int arch_prctl(int func, void *ptr);
 
 #define FPU_sig(context)     ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.fpregs))
 
-#endif /* linux */
-
-#if defined(__NetBSD__)
-# include <sys/ucontext.h>
-# include <sys/types.h>
-# include <signal.h>
+#elif defined(__FreeBSD__)
+#include <sys/ucontext.h>
+
+#define RAX_sig(context)     ((context)->uc_mcontext.mc_rax)
+#define RBX_sig(context)     ((context)->uc_mcontext.mc_rbx)
+#define RCX_sig(context)     ((context)->uc_mcontext.mc_rcx)
+#define RDX_sig(context)     ((context)->uc_mcontext.mc_rdx)
+#define RSI_sig(context)     ((context)->uc_mcontext.mc_rsi)
+#define RDI_sig(context)     ((context)->uc_mcontext.mc_rdi)
+#define RBP_sig(context)     ((context)->uc_mcontext.mc_rbp)
+#define R8_sig(context)      ((context)->uc_mcontext.mc_r8)
+#define R9_sig(context)      ((context)->uc_mcontext.mc_r9)
+#define R10_sig(context)     ((context)->uc_mcontext.mc_r10)
+#define R11_sig(context)     ((context)->uc_mcontext.mc_r11)
+#define R12_sig(context)     ((context)->uc_mcontext.mc_r12)
+#define R13_sig(context)     ((context)->uc_mcontext.mc_r13)
+#define R14_sig(context)     ((context)->uc_mcontext.mc_r14)
+#define R15_sig(context)     ((context)->uc_mcontext.mc_r15)
+
+#define CS_sig(context)      ((context)->uc_mcontext.mc_cs)
+#define DS_sig(context)      ((context)->uc_mcontext.mc_ds)
+#define ES_sig(context)      ((context)->uc_mcontext.mc_es)
+#define FS_sig(context)      ((context)->uc_mcontext.mc_fs)
+#define GS_sig(context)      ((context)->uc_mcontext.mc_gs)
+#define SS_sig(context)      ((context)->uc_mcontext.mc_ss)
+
+#define EFL_sig(context)     ((context)->uc_mcontext.mc_rflags)
+
+#define RIP_sig(context)     ((context)->uc_mcontext.mc_rip)
+#define RSP_sig(context)     ((context)->uc_mcontext.mc_rsp)
+#define TRAP_sig(context)    ((context)->uc_mcontext.mc_trapno)
+#define ERROR_sig(context)   ((context)->uc_mcontext.mc_err)
+
+#define FPU_sig(context)   ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.mc_fpstate))
+
+#elif defined(__NetBSD__)
+#include <sys/ucontext.h>
+#include <sys/types.h>
+#include <signal.h>
 
 #define RAX_sig(context)    ((context)->uc_mcontext.__gregs[_REG_RAX])
 #define RBX_sig(context)    ((context)->uc_mcontext.__gregs[_REG_RBX])
@@ -171,7 +208,9 @@ extern int arch_prctl(int func, void *ptr);
 #define ERROR_sig(context)  ((context)->uc_mcontext.__gregs[_REG_ERR])
 
 #define FPU_sig(context)   ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs))
-#endif /* __NetBSD__ */
+#else
+#error You must define the signal context functions for your platform
+#endif
 
 enum i386_trap_code
 {



From julliard at winehq.org  Tue Jun  1 12:12:41 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:41 -0500
Subject: Sven Baars : regedit: Fix Dutch translation.
Message-ID: <E1OJV17-000499-S9@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ce1be8f82770f346bfe30f650eb34f4684918844
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ce1be8f82770f346bfe30f650eb34f4684918844

Author: Sven Baars <sven.wine at gmail.com>
Date:   Mon May 31 22:57:39 2010 +0200

regedit: Fix Dutch translation.

---

 programs/regedit/Nl.rc |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc
index f02ab65..4336de2 100644
--- a/programs/regedit/Nl.rc
+++ b/programs/regedit/Nl.rc
@@ -22,6 +22,7 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
+#pragma code_page(65001)
 
 /*
  * Menu
@@ -56,9 +57,9 @@ BEGIN
         END
         MENUITEM SEPARATOR
         MENUITEM "&Verwijderen\tDel",                 ID_EDIT_DELETE
-        MENUITEM "&Naam wijzigen\tF2"                 ID_EDIT_RENAME
+        MENUITEM "N&aam wijzigen\tF2"                 ID_EDIT_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Sleutelnaam kopi?ren",             ID_EDIT_COPYKEYNAME
+        MENUITEM "&Sleutelnaam kopi??ren",             ID_EDIT_COPYKEYNAME
         MENUITEM SEPARATOR
         MENUITEM "&Zoeken\tCtrl+F",                   ID_EDIT_FIND, GRAYED
         MENUITEM "Volgende Zoeken\tF3",               ID_EDIT_FINDNEXT, GRAYED
@@ -110,7 +111,7 @@ BEGIN
         MENUITEM "&Naam wijzigen\tF2",         ID_EDIT_RENAME
         MENUITEM SEPARATOR
         MENUITEM "&Exporteren...",             ID_EDIT_EXPORT
-        MENUITEM "&Sleutelnaam kopi?ren",      ID_EDIT_COPYKEYNAME
+        MENUITEM "&Sleutelnaam kopi??ren",      ID_EDIT_COPYKEYNAME
         MENUITEM SEPARATOR
         MENUITEM "&Zoeken\tCtrl+F",            ID_EDIT_FIND, GRAYED
   END
@@ -281,7 +282,7 @@ BEGIN
     ID_VIEW_REFRESH         "Het venster vernieuwen"
     ID_EDIT_DELETE          "De selectie verwijderen"
     ID_EDIT_RENAME          "De naam van de selectie wijzigen"
-    ID_EDIT_COPYKEYNAME     "De naam van de geselecteerde sleutel naar het Klembord kopi?ren"
+    ID_EDIT_COPYKEYNAME     "De naam van de geselecteerde sleutel naar het Klembord kopi??ren"
     ID_EDIT_FIND            "Een tekenreeks zoeken in een sleutel, een waarde of gegevens"
     ID_EDIT_FINDNEXT        "De opgegeven tekst nogmaals zoeken"
     ID_EDIT_EXPORT          "Exporteert de geselecteerde subsleutel van het register naar een tekst bestand"



From julliard at winehq.org  Tue Jun  1 12:12:41 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:41 -0500
Subject: Sven Baars : reg: Fix Dutch translation.
Message-ID: <E1OJV17-00049P-Ty@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9ad9012fcf6c37a7e07d9be063f19ef794a03760
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9ad9012fcf6c37a7e07d9be063f19ef794a03760

Author: Sven Baars <sven.wine at gmail.com>
Date:   Mon May 31 23:01:47 2010 +0200

reg: Fix Dutch translation.

---

 programs/reg/Nl.rc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/reg/Nl.rc b/programs/reg/Nl.rc
index c34e395..22a72a4 100644
--- a/programs/reg/Nl.rc
+++ b/programs/reg/Nl.rc
@@ -30,8 +30,8 @@ STRINGTABLE
     STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n"
     STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n"
     STRING_SUCCESS, "De bewerking is succesvol voltooid\n"
-    STRING_INVALID_KEY, "Fout: Foutieve sleutel naam\n"
-    STRING_INVALID_CMDLINE, "Fout: Foutieve commando regel parameters\n"
+    STRING_INVALID_KEY, "Fout: Foutieve sleutelnaam\n"
+    STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n"
     STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n"
-    STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registry sleutel of waarde niet vinden\n"
+    STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n"
 }



From julliard at winehq.org  Tue Jun  1 12:12:41 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:41 -0500
Subject: Nikolay Sivov : oleaut32: Copy bytes instead of WCHARs in VarBstrCat.
Message-ID: <E1OJV17-00049h-WC@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9a5098bbb49c748a93c7a247697b2ac7220dd3be
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9a5098bbb49c748a93c7a247697b2ac7220dd3be

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jun  1 02:20:08 2010 +0400

oleaut32: Copy bytes instead of WCHARs in VarBstrCat.

---

 dlls/oleaut32/tests/vartype.c |   46 +++++++++++++++++++++++++++++++++++++++-
 dlls/oleaut32/vartype.c       |   11 +++++----
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index c46ad8a..361342e 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -5486,12 +5486,17 @@ static void test_VarBstrCat(void)
     static const WCHAR s1[] = { 'a',0 };
     static const WCHAR s2[] = { 'b',0 };
     static const WCHAR s1s2[] = { 'a',0,'b',0 };
+    static const char str1A[] = "Have ";
+    static const char str2A[] = "A Cigar";
     HRESULT ret;
     BSTR str1, str2, res;
+    UINT len;
 
-    /* Crash
+if (0)
+{
+    /* Crash */
     ret = VarBstrCat(NULL, NULL, NULL);
-     */
+}
 
     /* Concatenation of two NULL strings works */
     ret = VarBstrCat(NULL, NULL, &res);
@@ -5543,6 +5548,43 @@ static void test_VarBstrCat(void)
 
     SysFreeString(str2);
     SysFreeString(str1);
+
+    /* Concatenation of ansi BSTRs, both odd byte count not including termination */
+    str1 = SysAllocStringByteLen(str1A, sizeof(str1A)-1);
+    str2 = SysAllocStringByteLen(str2A, sizeof(str2A)-1);
+    len = SysStringLen(str1);
+    ok(len == (sizeof(str1A)-1)/sizeof(WCHAR), "got length %u\n", len);
+    len = SysStringLen(str2);
+    ok(len == (sizeof(str2A)-1)/sizeof(WCHAR), "got length %u\n", len);
+
+    ret = VarBstrCat(str1, str2, &res);
+    ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret);
+    ok(res != NULL, "Expected a string\n");
+    len = (sizeof(str1A) + sizeof(str2A) - 2)/sizeof(WCHAR);
+    ok(SysStringLen(res) == len, "got %d, expected %u\n", SysStringLen(res), len);
+    ok(!memcmp(res, "Have A Cigar", sizeof(str1A) + sizeof(str2A) - 1), "got (%s)\n", (char*)res);
+    SysFreeString(res);
+
+    SysFreeString(str2);
+    SysFreeString(str1);
+
+    /* Concatenation of ansi BSTRs, both 1 byte length not including termination */
+    str1 = SysAllocStringByteLen(str1A, 1);
+    str2 = SysAllocStringByteLen(str2A, 1);
+    len = SysStringLen(str1);
+    ok(len == 0, "got length %u\n", len);
+    len = SysStringLen(str2);
+    ok(len == 0, "got length %u\n", len);
+
+    ret = VarBstrCat(str1, str2, &res);
+    ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret);
+    ok(res != NULL, "Expected a string\n");
+    ok(SysStringLen(res) == 1, "got %d, expected 1\n", SysStringLen(res));
+    ok(!memcmp(res, "HA", 2), "got (%s)\n", (char*)res);
+    SysFreeString(res);
+
+    SysFreeString(str2);
+    SysFreeString(str1);
 }
 
 /* IUnknown */
diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index 1aa71fb..8f54eae 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -6932,20 +6932,21 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft, BSTR pbstrRight, BSTR *pbstrOut)
   if (!pbstrOut)
     return E_INVALIDARG;
 
-  lenLeft = pbstrLeft ? SysStringLen(pbstrLeft) : 0;
-  lenRight = pbstrRight ? SysStringLen(pbstrRight) : 0;
+  /* use byte length here to properly handle ansi-allocated BSTRs */
+  lenLeft = pbstrLeft ? SysStringByteLen(pbstrLeft) : 0;
+  lenRight = pbstrRight ? SysStringByteLen(pbstrRight) : 0;
 
-  *pbstrOut = SysAllocStringLen(NULL, lenLeft + lenRight);
+  *pbstrOut = SysAllocStringByteLen(NULL, lenLeft + lenRight);
   if (!*pbstrOut)
     return E_OUTOFMEMORY;
 
   (*pbstrOut)[0] = '\0';
 
   if (pbstrLeft)
-    memcpy(*pbstrOut, pbstrLeft, lenLeft * sizeof(WCHAR));
+    memcpy(*pbstrOut, pbstrLeft, lenLeft);
 
   if (pbstrRight)
-    memcpy(*pbstrOut + lenLeft, pbstrRight, lenRight * sizeof(WCHAR));
+    memcpy((CHAR*)*pbstrOut + lenLeft, pbstrRight, lenRight);
 
   TRACE("%s\n", debugstr_wn(*pbstrOut, SysStringLen(*pbstrOut)));
   return S_OK;



From julliard at winehq.org  Tue Jun  1 12:12:42 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:42 -0500
Subject: Jose Rostagno : setupapi: Update Spanish translation.
Message-ID: <E1OJV18-00049z-2P@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9ac6eaaa6674bc1786f4cfd71ea9df15b0e0d00f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9ac6eaaa6674bc1786f4cfd71ea9df15b0e0d00f

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Mon May 31 11:34:08 2010 -0300

setupapi: Update Spanish translation.

---

 dlls/setupapi/Es.rc |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/dlls/setupapi/Es.rc b/dlls/setupapi/Es.rc
index 658d2e8..aa8b128 100644
--- a/dlls/setupapi/Es.rc
+++ b/dlls/setupapi/Es.rc
@@ -2,6 +2,7 @@
  * Spanish resources for SETUPAPI
  *
  * Copyright 2003 Jos? Manuel Ferrer Ortiz
+ * Copyright 2010 Jos? Rostagno
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,14 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
+STRINGTABLE DISCARDABLE
+{
+        IDS_PROMPTDISK   "El archivo '%s' en %s es necesario"
+        IDS_UNKNOWN      "Desconocido"
+        IDS_COPYFROM     "Copiar archivos desde:"
+        IDS_INFO         "Escriba la ruta en donde se encuentra el archivo, y luego haga clic en OK."
+}
+
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copiando archivos..."
@@ -34,3 +43,17 @@ BEGIN
 	LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
 	CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
+
+IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Archivos necesarios"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "Inserte el disco de instalaci?n del fabricante, y a continuaci?n\ncompruebe que la unidad seleccionada abajo sea correcta", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "Copiar archivos del fabricante desde:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14
+	PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "Cancelar", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "Buscar...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END



From julliard at winehq.org  Tue Jun  1 12:12:42 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:42 -0500
Subject: David Hedberg : include: Add SID_ExplorerPaneVisibility.
Message-ID: <E1OJV18-0004AG-4K@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cd659eb5470b67f851c223db599fa585d193626d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cd659eb5470b67f851c223db599fa585d193626d

Author: David Hedberg <david.hedberg at gmail.com>
Date:   Tue Jun  1 04:46:46 2010 +0200

include: Add SID_ExplorerPaneVisibility.

---

 include/shobjidl.idl |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index 002ec3e..ddaaafc 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -1644,6 +1644,8 @@ interface IExplorerBrowserEvents : IUnknown
 typedef GUID EXPLORERPANE;
 typedef EXPLORERPANE *REFEXPLORERPANE;
 
+cpp_quote("#define SID_ExplorerPaneVisibility IID_IExplorerPaneVisibility")
+
 /*****************************************************************************
  * IExplorerPaneVisibility interface
  */



From julliard at winehq.org  Tue Jun  1 12:12:42 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:42 -0500
Subject: David Hedberg : include: Update FOLDERVIEWMODE and FOLDERFLAGS.
Message-ID: <E1OJV18-0004AX-6n@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5858a3bc178511b47e92d624f4d9a038f11f2d8c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5858a3bc178511b47e92d624f4d9a038f11f2d8c

Author: David Hedberg <david.hedberg at gmail.com>
Date:   Tue Jun  1 04:46:47 2010 +0200

include: Update FOLDERVIEWMODE and FOLDERFLAGS.

---

 include/shobjidl.idl |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index ddaaafc..f022c78 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -409,11 +409,25 @@ typedef enum
     FWF_SINGLECLICKACTIVATE = 0x00008000,
     FWF_NOWEBVIEW           = 0x00010000,
     FWF_HIDEFILENAMES       = 0x00020000,
-    FWF_CHECKSELECT         = 0x00040000
+    FWF_CHECKSELECT         = 0x00040000,
+    FWF_NOENUMREFRESH       = 0x00080000,
+    FWF_NOGROUPING          = 0x00100000,
+    FWF_FULLROWSELECT       = 0x00200000,
+    FWF_NOFILTERS           = 0x00400000,
+    FWF_NOCOLUMNHEADER      = 0x00800000,
+    FWF_NOHEADERINALLVIEWS  = 0x01000000,
+    FWF_EXTENDEDTILES       = 0x02000000,
+    FWF_TRICHECKSELECT      = 0x04000000,
+    FWF_AUTOCHECKSELECT     = 0x08000000,
+    FWF_NOBROWSERVIEWSTATE  = 0x10000000,
+    FWF_SUBSETGROUPS        = 0x20000000,
+    FWF_USESEARCHFOLDER     = 0x40000000,
+    FWF_ALLOWRTLREADING     = 0x80000000
 } FOLDERFLAGS;
 
 typedef enum
 {
+    FVM_AUTO       =-1,
     FVM_ICON       = 1,
     FVM_FIRST      = FVM_ICON,
     FVM_SMALLICON  = 2,
@@ -422,7 +436,8 @@ typedef enum
     FVM_THUMBNAIL  = 5,
     FVM_TILE       = 6,
     FVM_THUMBSTRIP = 7,
-    FVM_LAST       = FVM_THUMBSTRIP
+    FVM_CONTENT    = 8,
+    FVM_LAST       = FVM_CONTENT
 } FOLDERVIEWMODE;
 
 typedef struct



From julliard at winehq.org  Tue Jun  1 12:12:42 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:42 -0500
Subject: David Hedberg : include: Add new SBSP_* defines.
Message-ID: <E1OJV18-0004Ao-9l@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5c451900bb2e07f23080e749367aa77eceb900fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5c451900bb2e07f23080e749367aa77eceb900fc

Author: David Hedberg <david.hedberg at gmail.com>
Date:   Tue Jun  1 04:46:45 2010 +0200

include: Add new SBSP_* defines.

---

 include/shobjidl.idl |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index f022c78..6bd0244 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -648,8 +648,18 @@ cpp_quote("#define SBSP_PARENT                0x00002000")
 cpp_quote("#define SBSP_NAVIGATEBACK          0x00004000")
 cpp_quote("#define SBSP_NAVIGATEFORWARD       0x00008000")
 cpp_quote("#define SBSP_ALLOW_AUTONAVIGATE    0x00010000")
+cpp_quote("#define SBSP_KEEPSAMETEMPLATE      0x00020000")
+cpp_quote("#define SBSP_KEEPWORDWHEELTEXT     0x00040000")
+cpp_quote("#define SBSP_ACTIVATE_NOFOCUS      0x00080000")
+cpp_quote("#define SBSP_CREATENOHISTORY       0x00100000")
+cpp_quote("#define SBSP_PLAYNOSOUND           0x00200000")
+cpp_quote("#define SBSP_CALLERUNTURUSTED      0x00800000")
+cpp_quote("#define SBSP_TRUSTFIRSTDOWNLOAD    0x01000000")
+cpp_quote("#define SBSP_UNTRUSTEDFORDOWNLOAD  0x02000000")
 cpp_quote("#define SBSP_NOAUTOSELECT          0x04000000")
 cpp_quote("#define SBSP_WRITENOHISTORY        0x08000000")
+cpp_quote("#define SBSP_TRUSTEDFORACTIVEX     0x10000000")
+cpp_quote("#define SBSP_FEEDNAVIGATION        0x20000000")
 cpp_quote("#define SBSP_REDIRECT              0x40000000")
 cpp_quote("#define SBSP_INITIATEDBYHLINKFRAME 0x80000000")
 



From julliard at winehq.org  Tue Jun  1 12:12:42 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:42 -0500
Subject: David Hedberg : shell32: Fix possible memory leak in CreateUnixFolder.
Message-ID: <E1OJV18-0004BE-C7@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c1682eb8eb42fa54c8f4c7860acef10de4eaa474
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c1682eb8eb42fa54c8f4c7860acef10de4eaa474

Author: David Hedberg <david.hedberg at gmail.com>
Date:   Tue Jun  1 04:46:44 2010 +0200

shell32: Fix possible memory leak in CreateUnixFolder.

---

 dlls/shell32/shfldr_unixfs.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index 2951d6a..dfd7255 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -2158,13 +2158,15 @@ static const IDropTargetVtbl UnixFolder_IDropTarget_Vtbl = {
 static HRESULT CreateUnixFolder(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, const CLSID *pCLSID) 
 {
     HRESULT hr = E_FAIL;
-    UnixFolder *pUnixFolder = SHAlloc((ULONG)sizeof(UnixFolder));
+    UnixFolder *pUnixFolder;
    
     if (pUnkOuter) {
         FIXME("Aggregation not yet implemented!\n");
         return CLASS_E_NOAGGREGATION;
     }
     
+    pUnixFolder = SHAlloc((ULONG)sizeof(UnixFolder));
+
     if(pUnixFolder) {
         pUnixFolder->lpIShellFolder2Vtbl = &UnixFolder_IShellFolder2_Vtbl;
         pUnixFolder->lpIPersistFolder3Vtbl = &UnixFolder_IPersistFolder3_Vtbl;



From julliard at winehq.org  Tue Jun  1 12:12:42 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:42 -0500
Subject: Dmitry Timoshkov : hhctrl.ocx: Add a trace for the resulting CHM
	offset to string conversion.
Message-ID: <E1OJV18-0004BV-Ep@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a70e10d03dc40527418f6d96ccf9a74e0338c825
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a70e10d03dc40527418f6d96ccf9a74e0338c825

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Tue Jun  1 15:26:02 2010 +0900

hhctrl.ocx: Add a trace for the resulting CHM offset to string conversion.

---

 dlls/hhctrl.ocx/chm.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c
index cf5b8bf..4c85bd9 100644
--- a/dlls/hhctrl.ocx/chm.c
+++ b/dlls/hhctrl.ocx/chm.c
@@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 /* Reads a string from the #STRINGS section in the CHM file */
 static LPCSTR GetChmString(CHMInfo *chm, DWORD offset)
 {
+    LPCSTR str;
+
     if(!chm->strings_stream)
         return NULL;
 
@@ -72,7 +74,9 @@ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset)
         }
     }
 
-    return chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK);
+    str = chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK);
+    TRACE("offset %#x => %s\n", offset, debugstr_a(str));
+    return str;
 }
 
 static BOOL ReadChmSystem(CHMInfo *chm)



From julliard at winehq.org  Tue Jun  1 12:12:42 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:42 -0500
Subject: Dmitry Timoshkov : hhctrl.ocx: If a CHM file reports window
	dimensions and title but doesn' t really set them use default values.
Message-ID: <E1OJV18-0004Bx-V8@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a314027b4211ddd045e12bd768962c3c47f56d68
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a314027b4211ddd045e12bd768962c3c47f56d68

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Tue Jun  1 15:26:13 2010 +0900

hhctrl.ocx: If a CHM file reports window dimensions and title but doesn't really set them use default values.

---

 dlls/hhctrl.ocx/help.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index 30cb008..2ea0132 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -1260,7 +1260,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
     RECT winPos = info->WinType.rcWindowPos;
     WNDCLASSEXW wcex;
     DWORD dwStyles, dwExStyles;
-    DWORD x, y, width, height;
+    DWORD x, y, width = 0, height = 0;
+    LPCWSTR caption;
 
     static const WCHAR windowClassW[] = {
         'H','H',' ', 'P','a','r','e','n','t',0
@@ -1301,7 +1302,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
         width = winPos.right - x;
         height = winPos.bottom - y;
     }
-    else
+    if (!width || !height)
     {
         x = WINTYPE_DEFAULT_X;
         y = WINTYPE_DEFAULT_Y;
@@ -1309,7 +1310,10 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
         height = WINTYPE_DEFAULT_HEIGHT;
     }
 
-    hWnd = CreateWindowExW(dwExStyles, windowClassW, info->WinType.pszCaption,
+    caption = info->WinType.pszCaption;
+    if (!*caption) caption = info->pCHMInfo->defTitle;
+
+    hWnd = CreateWindowExW(dwExStyles, windowClassW, caption,
                            dwStyles, x, y, width, height, NULL, NULL, hhctrl_hinstance, NULL);
     if (!hWnd)
         return FALSE;



From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : browseui: Add Danish translation.
Message-ID: <E1OJV19-0004CD-4D@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dd3286e6deb9ba128e3328d37fb3f0f3bf76f239
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dd3286e6deb9ba128e3328d37fb3f0f3bf76f239

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Mon May 31 19:48:04 2010 +0200

browseui: Add Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/browseui/Makefile.in |    1 +
 dlls/browseui/rsrc_Da.rc  |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index f22da19..f45afe3 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -15,6 +15,7 @@ C_SRCS = \
 	regsvr.c
 
 RC_SRCS = \
+	rsrc_Da.rc \
 	rsrc_De.rc \
 	rsrc_En.rc \
 	rsrc_Es.rc \
diff --git a/dlls/browseui/rsrc_Da.rc b/dlls/browseui/rsrc_Da.rc
new file mode 100644
index 0000000..6a0a340
--- /dev/null
+++ b/dlls/browseui/rsrc_Da.rc
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "resids.h"
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    IDS_CANCELLING    "Annullering..."
+}
+
+IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+{
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
+    LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    PUSHBUTTON "&Annuller", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
+    LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
+}



From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : comctl32: Add Danish translation.
Message-ID: <E1OJV19-0004CV-6N@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1dbcc0086ed839c01e6e13bd5d01d3a8a7d7fd0f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1dbcc0086ed839c01e6e13bd5d01d3a8a7d7fd0f

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 09:42:54 2010 +0200

comctl32: Add Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/comctl32/Makefile.in  |    1 +
 dlls/comctl32/comctl_Da.rc |   92 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 0 deletions(-)

diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index cb0b947..04e84fa 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -49,6 +49,7 @@ C_SRCS = \
 RC_SRCS = \
 	comctl_Bg.rc \
 	comctl_Cs.rc \
+	comctl_Da.rc \
 	comctl_De.rc \
 	comctl_El.rc \
 	comctl_En.rc \
diff --git a/dlls/comctl32/comctl_Da.rc b/dlls/comctl32/comctl_Da.rc
new file mode 100644
index 0000000..07c177c
--- /dev/null
+++ b/dlls/comctl32/comctl_Da.rc
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "comctl32.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Egenskaber for %s"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  DEFPUSHBUTTON "OK",       IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+  PUSHBUTTON    "Annuller", IDCANCEL,58,122,50,14
+  PUSHBUTTON    "&Anvend",  IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+  PUSHBUTTON    "Hj?lp",    IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+  CONTROL       "Fane",     IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Guide"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  PUSHBUTTON    "< &Tilbage", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&N?ste >",   IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "F?rdig",     IDC_FINISH_BUTTON,121,138,50,14
+  PUSHBUTTON    "Annuller",   IDCANCEL,178,138,50,14
+  PUSHBUTTON    "Hj?lp",      IDHELP,235,138,50,14,WS_GROUP
+  LTEXT         "",           IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+  CONTROL       "Fane",       IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+  LTEXT	        "",           IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Tilpas V?rkt?jslinje"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  DEFPUSHBUTTON "&Luk",       IDCANCEL,308,6,44,14
+  PUSHBUTTON    "N&ulstil",   IDC_RESET_BTN,308,23,44,14
+  PUSHBUTTON    "&Hj?lp",     IDC_HELP_BTN,308,40,44,14
+  PUSHBUTTON    "Flyt &Op",   IDC_MOVEUP_BTN,308,74,44,14
+  PUSHBUTTON    "Flyt &Ned",  IDC_MOVEDN_BTN,308,91,44,14
+  LTEXT         "T&ilg?ngelige knapper:", -1,4,5,84,10
+  LISTBOX       IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+  PUSHBUTTON    "&Tilf?j ->", IDOK, 131, 42, 44, 14
+  PUSHBUTTON    "<- &Fjern",  IDC_REMOVE_BTN,131,62,44,14
+  LTEXT         "&V?rkt?js knapper:", -1,182,5,78,10
+  LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CLOSE    "Luk"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDM_TODAY    "Idag:"
+    IDM_GOTODAY  "G? til i dag"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_SEPARATOR "Separator"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    HKY_NONE "Ingen"
+}



From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : winedbg: Add the Danish translation.
Message-ID: <E1OJV19-0004Cm-9w@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c43cdd1797e61576bac4eaa33fb319728a92b2db
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c43cdd1797e61576bac4eaa33fb319728a92b2db

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 09:53:12 2010 +0200

winedbg: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/winedbg/Makefile.in |    1 +
 programs/winedbg/rsrc_Da.rc  |   57 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index a087b8e..7fba5cc 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -33,6 +33,7 @@ C_SRCS = \
 	winedbg.c
 
 RC_SRCS = \
+	rsrc_Da.rc \
 	rsrc_De.rc \
 	rsrc_En.rc \
 	rsrc_Es.rc \
diff --git a/programs/winedbg/rsrc_Da.rc b/programs/winedbg/rsrc_Da.rc
new file mode 100644
index 0000000..96c70f3
--- /dev/null
+++ b/programs/winedbg/rsrc_Da.rc
@@ -0,0 +1,57 @@
+/*
+ * Danish Language Support
+ *
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "resource.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+IDM_DEBUG_POPUP MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Debug", ID_DEBUG
+    END
+END
+
+IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Program Fejl"
+FONT 8, "Tahoma"
+BEGIN
+    LTEXT           "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0
+    LTEXT           "Programmet %s er st?dt p? et alvorligt problem, og er n?d \
+                    til at lukke. Vi beklager ulejligheden.",
+                    IDC_STATIC_TXT1,27,10,224,30
+    LTEXT           "Dette kan v?re for?rsaget af et problem i programmet, eller en mangel i Wine. \
+                    Du kan evt. tjekke http://appdb.winehq.org for tips til at k?re dette program.\n\n\
+                    Hvis dette problem ikke er til stede under Windows, og ikke har v?ret rapporteret \
+                    endnu, kan du indberette det til http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100
+    DEFPUSHBUTTON   "Luk", IDOK, 205, 151, 60, 16, WS_TABSTOP
+END
+
+STRINGTABLE
+BEGIN
+    IDS_AUTO_CAPTION     "Wine Program Nedbrud"
+    IDS_INVALID_PARAMS   "Interne fejl - ugyldige parametre modtaget."
+    IDS_UNIDENTIFIED     "(Uidentificerede)"
+END



From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : wineconsole: Add Danish translation.
Message-ID: <E1OJV19-0004DK-EX@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d01da5f33ad81fbdc989a84f9c31da647a0abb62
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d01da5f33ad81fbdc989a84f9c31da647a0abb62

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 09:52:43 2010 +0200

wineconsole: Add Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/wineconsole/Makefile.in       |    1 +
 programs/wineconsole/wineconsole_Da.rc |  137 ++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+), 0 deletions(-)

diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index 1763b18..e2ac735 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -17,6 +17,7 @@ C_SRCS = \
 
 RC_SRCS = \
 	wineconsole_Cs.rc \
+	wineconsole_Da.rc \
 	wineconsole_De.rc \
 	wineconsole_En.rc \
 	wineconsole_Eo.rc \
diff --git a/programs/wineconsole/wineconsole_Da.rc b/programs/wineconsole/wineconsole_Da.rc
new file mode 100644
index 0000000..dc3833d
--- /dev/null
+++ b/programs/wineconsole/wineconsole_Da.rc
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "wineconsole_res.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+IDS_EDIT,		"&Rediger"
+IDS_DEFAULT,		"S?t &Standarder  "
+IDS_PROPERTIES,		"&Egenskaber"
+IDS_MARK,		"&Marker"
+IDS_COPY,		"&Kopier"
+IDS_PASTE,		"&Inds?t"
+IDS_SELECTALL,		"&V?lg Alt"
+IDS_SCROLL,		"&Rul"
+IDS_SEARCH,		"&S?g"
+IDS_FNT_DISPLAY,	"Hvert tegn er %ld pixel bred og %ld pixel h?j"
+IDS_FNT_PREVIEW,	"Dette er en test"
+IDS_DLG_TIT_DEFAULT,    "Setup - Standardindstillinger"
+IDS_DLG_TIT_CURRENT,    "Setup - Aktuelle indstillinger"
+IDS_DLG_TIT_ERROR,	"Konfiguration fejl"
+IDS_DLG_ERR_SBWINSIZE,	"Sk?rm buffer st?rrelsen, skal v?re st?rre eller lig med vinduet"
+
+IDS_CMD_INVALID_EVENT_ID   "wineconsole: Kunne ikke fortolke begivenheds id\n"
+IDS_CMD_INVALID_BACKEND    "wineconsole: Ugyldig backend\n"
+IDS_CMD_INVALID_OPTION     "wineconsole: Ukendt kommandolinje valg\n"
+IDS_CMD_ABOUT              "Starter et program i en Wine konsol\n"
+IDS_CMD_LAUNCH_FAILED      "wineconsole: Start af programmet %s mislykkedet.\n"
+
+IDS_USAGE_HEADER           "\nBrug:\n wineconsole [tilvalg] <kommando>\n\nValg:\n"
+IDS_USAGE_BACKEND          "  --backend={user|curses} V?lges user vil det frembringe et nyt vindue. V?lges curses\n"\
+                           "                          vil det pr?ve at ?ndre det nuv?rende terminal vindue til en Wine Konsol\n"
+IDS_USAGE_COMMAND          "  <kommando>              Wine program der skal k?rer i konsollen\n"
+IDS_USAGE_FOOTER           "\nEksempel:\n  wineconsole cmd\nStarter Wine kommandoprompten i en Wine konsol\n\n"
+
+END
+
+IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Valg"
+FONT 8, "MS Shell Dlg"
+{
+	GROUPBOX "Mark?r st?rrelse", -1, 10, 11, 60, 44, BS_GROUPBOX
+	AUTORADIOBUTTON "&Sm?", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP
+	AUTORADIOBUTTON "&Medium", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP
+	AUTORADIOBUTTON "S&tore", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP
+
+	GROUPBOX "Control", -1, 75, 11, 125, 44, BS_GROUPBOX
+	LTEXT "Popup menu", -1, 79, 23, 40, 10
+	AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP
+	AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP
+	LTEXT "Hurtig rediger", -1, 79, 43, 50, 10
+	AUTOCHECKBOX "&Aktiver", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP
+
+	GROUPBOX "Kommando historik", -1, 10, 57, 190, 35, BS_GROUPBOX
+	LTEXT "A&ntal af genkaldte kommandoer:", -1, 14, 67, 78, 18
+	EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
+	CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
+	AUTOCHECKBOX "&Fjern dubletter", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE
+}
+
+IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Skrifttype"
+FONT 8, "MS Shell Dlg"
+{
+	LTEXT "&Skrifttype", -1, 5, 5, 24, 8
+	LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL
+	LTEXT "&Farve", -1, 100, 5, 50, 8
+	CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16
+	CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16
+	LTEXT "S&t?rrelse", -1, 158, 5, 40, 8
+	LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL
+	CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40
+	LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18
+}
+
+IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfiguration"
+FONT 8, "MS Shell Dlg"
+{
+	GROUPBOX "Buffer zone", -1, 10, 11, 100, 42, BS_GROUPBOX
+	LTEXT "&Bredde:", -1, 14, 25, 54, 9
+	EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
+	CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
+	LTEXT "&H?jde:", -1, 14, 39, 54, 9
+	EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
+	CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
+
+	GROUPBOX "Vindue st?rrelse", -1, 10, 55, 100, 42
+	LTEXT "B&redde:", -1, 14, 69, 54, 9
+	EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
+	CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
+	LTEXT "H&?jde:", -1, 14, 83, 54, 9
+	EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
+	CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
+
+	GROUPBOX "Afslutning af program", -1, 115, 11, 80, 42, BS_GROUPBOX
+	AUTOCHECKBOX "&Luk konsol", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP
+
+	GROUPBOX "Version", -1, 115, 55, 80, 42
+	COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
+}
+
+IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 170, 60
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Konsol parametre"
+FONT 8, "MS Shell Dlg"
+{
+	GROUPBOX "", -1, 10, 10, 150, 31, BS_GROUPBOX
+	AUTORADIOBUTTON "Bevar disse indstillinger til senere sessioner", IDC_SAV_SAVE, 14, 15, 140, 10, WS_TABSTOP
+	AUTORADIOBUTTON "Rediger kun nuv?rende session", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP
+
+	PUSHBUTTON "OK", IDOK, 35, 45, 35, 12
+	PUSHBUTTON "Annuller", IDCANCEL, 80, 45, 35, 12
+}



From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : wineboot: Update the Danish translation.
Message-ID: <E1OJV19-0004Db-HE@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 646732ead813476878f11e45456f86da6feb4fe0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=646732ead813476878f11e45456f86da6feb4fe0

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 10:17:15 2010 +0200

wineboot: Update the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/wineboot/wineboot_Da.rc |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/programs/wineboot/wineboot_Da.rc b/programs/wineboot/wineboot_Da.rc
index b2730a4..a88abf8 100644
--- a/programs/wineboot/wineboot_Da.rc
+++ b/programs/wineboot/wineboot_Da.rc
@@ -2,6 +2,7 @@
  * WineBoot Danish resources
  *
  * Copyright (C) 2008 Jens albretsen <jens at albretsen.dk>
+ *               2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,3 +36,13 @@ BEGIN
     LTEXT           "Hvis du afslutter programmet kan du miste de data der ikke er gemt.",
                     IDC_STATIC,7,28,172,15
 END
+
+IDD_WAITDLG DIALOG 0, 0, 200, 50
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED
+CAPTION "Wine"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_WAITICON, 3, 3, 10, 10
+    LTEXT "Wine konfigurationen i %s, er ved at blive opdateret, vent venligst...",
+          IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX
+END



From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : winecfg: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJV19-0004Dt-K8@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4e205f9bda16bc9a65d8ec8789afcf7d55364a15
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4e205f9bda16bc9a65d8ec8789afcf7d55364a15

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 10:37:13 2010 +0200

winecfg: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/winecfg/Da.rc |  101 +++++++++++++++++++++++++++---------------------
 1 files changed, 57 insertions(+), 44 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e205f9bda16bc9a65d8ec8789afcf7d55364a15


From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : taskmgr: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJV19-0004EA-MY@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b645a0bdba7b63aa9988cf81b49cf1e34f2dbeb2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b645a0bdba7b63aa9988cf81b49cf1e34f2dbeb2

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 11:58:33 2010 +0200

taskmgr: Update the Danish translation and convert to UTF-8.

---

 programs/taskmgr/Da.rc |  217 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 153 insertions(+), 64 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=b645a0bdba7b63aa9988cf81b49cf1e34f2dbeb2


From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : shell32: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJV19-0004ER-PY@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7b0319665894f37bf44a0057b80cd8b889c23511
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7b0319665894f37bf44a0057b80cd8b889c23511

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 12:21:41 2010 +0200

shell32: Update the Danish translation and convert to UTF-8.

---

 dlls/shell32/shell32_Da.rc |   91 +++++++++++++++++++++++++------------------
 1 files changed, 53 insertions(+), 38 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b0319665894f37bf44a0057b80cd8b889c23511


From julliard at winehq.org  Tue Jun  1 12:12:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:43 -0500
Subject: Paul Vriens : mshtml: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJV19-0004Ej-Ug@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1e7d03175d948ea2e0ab6edb7032580206682153
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1e7d03175d948ea2e0ab6edb7032580206682153

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 12:52:18 2010 +0200

mshtml: Update the Danish translation and convert to UTF-8.

---

 dlls/mshtml/Da.rc |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/Da.rc b/dlls/mshtml/Da.rc
index 4218b58..c211ff0 100644
--- a/dlls/mshtml/Da.rc
+++ b/dlls/mshtml/Da.rc
@@ -2,6 +2,7 @@
  * Danish language support
  *
  * Copyright (C) 2008 Jens Albretsen <jens at albretsen.dk>
+ *               2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,11 +21,13 @@
 
 #include "resource.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_HTMLDISABLED    "HTML optegning er i ?jeblikket deaktiveret."
+    IDS_HTMLDISABLED    "HTML optegning er i ??jeblikket deaktiveret."
     IDS_HTMLDOCUMENT    "HTML dokument"
     IDS_DOWNLOADING     "Henter..."
     IDS_INSTALLING      "Installerer..."
@@ -35,11 +38,11 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN
 CAPTION "Installere Wine Gecko"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \
-          "to work correctly. Wine can automatically download and install it for you.\n\n" \
-          "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.",
+    LTEXT "Wine kunne ikke finde Gecko Pakken, som er n??dvendig for at f?? applikationers indlejringaf HTML til at fungere korrekt. " \
+          "Wine kan automatisk downloade, og installere det for dig.\n\n" \
+          "Bem??rk: Det anbefales at bruge distributions pakker i stedet. Se http://wiki.winehq.org/Gecko for flere detaljer.",
           ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT
-    CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12
+    CONTROL "Fremgang", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12
     DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "&Annuller", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP
 }
@@ -57,3 +60,14 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Annuller", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP
 }
+
+ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30
+    EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Annuller", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP
+}



From julliard at winehq.org  Tue Jun  1 12:12:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:44 -0500
Subject: Paul Vriens : regedit: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJV1A-0004F0-0N@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 99a92bf255385142fcc66fea016aa75dde9e41c9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=99a92bf255385142fcc66fea016aa75dde9e41c9

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 13:01:15 2010 +0200

regedit: Update the Danish translation and convert to UTF-8.

---

 programs/regedit/Da.rc |  144 ++++++++++++++++++++++++-----------------------
 1 files changed, 74 insertions(+), 70 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=99a92bf255385142fcc66fea016aa75dde9e41c9


From julliard at winehq.org  Tue Jun  1 12:12:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:44 -0500
Subject: Thomas Mullaly : urlmon/tests: Added tests for IUri_GetProperties.
Message-ID: <E1OJV1A-0004FH-4a@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b0739a346e9e3b6da24353d6873f835e72447789
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b0739a346e9e3b6da24353d6873f835e72447789

Author: Thomas Mullaly <thomas.mullaly at gmail.com>
Date:   Mon May 31 14:43:14 2010 -0400

urlmon/tests: Added tests for IUri_GetProperties.

---

 dlls/urlmon/tests/uri.c |  120 ++++++++++++++++++++++++++++++++++++++++++++++-
 dlls/urlmon/uri.c       |    4 ++
 2 files changed, 123 insertions(+), 1 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0739a346e9e3b6da24353d6873f835e72447789


From julliard at winehq.org  Tue Jun  1 12:12:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:44 -0500
Subject: Thomas Mullaly : urlmon/tests: Added tests for IUri_HasProperty.
Message-ID: <E1OJV1A-0004FZ-9Q@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c7459e83f812b4e9723c54276fd003eaa04450cd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c7459e83f812b4e9723c54276fd003eaa04450cd

Author: Thomas Mullaly <thomas.mullaly at gmail.com>
Date:   Mon May 31 15:57:37 2010 -0400

urlmon/tests: Added tests for IUri_HasProperty.

---

 dlls/urlmon/tests/uri.c |   75 +++++++++++++++++++++++++++++++++++++++++++++++
 dlls/urlmon/uri.c       |    4 ++
 2 files changed, 79 insertions(+), 0 deletions(-)

diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index bb97258..9e8b32e 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -1284,6 +1284,78 @@ static void test_IUri_GetProperties(void) {
     }
 }
 
+static void test_IUri_HasProperty(void) {
+    IUri *uri = NULL;
+    HRESULT hr;
+    DWORD i;
+
+    hr = pCreateUri(http_urlW, 0, 0, &uri);
+    ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
+    if(SUCCEEDED(hr)) {
+        hr = IUri_HasProperty(uri, Uri_PROPERTY_RAW_URI, NULL);
+        ok(hr == E_INVALIDARG, "Error: HasProperty returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG);
+    }
+    if(uri) IUri_Release(uri);
+
+    for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) {
+        uri_properties test = uri_tests[i];
+        LPWSTR uriW;
+        uri = NULL;
+
+        uriW = a2w(test.uri);
+
+        hr = pCreateUri(uriW, test.create_flags, 0, &uri);
+        if(test.create_todo) {
+            todo_wine {
+                ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, test.create_expected);
+            }
+        } else {
+            ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, test.create_expected);
+        }
+
+        if(SUCCEEDED(hr)) {
+            DWORD j;
+
+            for(j = 0; j <= Uri_PROPERTY_DWORD_LAST; ++j) {
+                /* Assign -1, then explicitly test for TRUE or FALSE later. */
+                BOOL received = -1;
+
+                hr = IUri_HasProperty(uri, j, &received);
+                if(test.props_todo) {
+                    todo_wine {
+                        ok(hr == S_OK, "Error: HasProperty returned 0x%08x, expected 0x%08x for property %d on uri_tests[%d].\n",
+                                hr, S_OK, j, i);
+                    }
+
+                    /* Check if the property should be true. */
+                    if(test.props & (1 << j)) {
+                        todo_wine {
+                            ok(received == TRUE, "Error: Expected to have property %d on uri_tests[%d].\n", j, i);
+                        }
+                    } else {
+                        todo_wine {
+                            ok(received == FALSE, "Error: Wasn't expecting to have property %d on uri_tests[%d].\n", j, i);
+                        }
+                    }
+                } else {
+                    ok(hr == S_OK, "Error: HasProperty returned 0x%08x, expected 0x%08x for property %d on uri_tests[%d].\n",
+                            hr, S_OK, j, i);
+
+                    if(test.props & (1 << j)) {
+                        ok(received == TRUE, "Error: Expected to have property %d on uri_tests[%d].\n", j, i);
+                    } else {
+                        ok(received == FALSE, "Error: Wasn't expecting to have property %d on uri_tests[%d].\n", j, i);
+                    }
+                }
+            }
+        }
+
+        if(uri) IUri_Release(uri);
+
+        heap_free(uriW);
+    }
+}
+
 START_TEST(uri) {
     HMODULE hurlmon;
 
@@ -1318,4 +1390,7 @@ START_TEST(uri) {
 
     trace("test IUri_GetProperties...\n");
     test_IUri_GetProperties();
+
+    trace("test IUri_HasProperty...\n");
+    test_IUri_HasProperty();
 }
diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c
index 53fbbb4..a46770b 100644
--- a/dlls/urlmon/uri.c
+++ b/dlls/urlmon/uri.c
@@ -147,6 +147,10 @@ static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *p
 {
     Uri *This = URI_THIS(iface);
     FIXME("(%p)->(%d %p)\n", This, uriProp, pfHasProperty);
+
+    if(!pfHasProperty)
+        return E_INVALIDARG;
+
     return E_NOTIMPL;
 }
 



From julliard at winehq.org  Tue Jun  1 12:12:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:44 -0500
Subject: Wolfram Sang : wined3d: Clarify some comments about Intel cards.
Message-ID: <E1OJV1A-0004GM-CV@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ddd1c72574607dc1d87b8927d43e7ba78b5bc4c9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ddd1c72574607dc1d87b8927d43e7ba78b5bc4c9

Author: Wolfram Sang <wolfram at the-dreams.de>
Date:   Mon May 31 16:26:19 2010 +0200

wined3d: Clarify some comments about Intel cards.

---

 dlls/wined3d/directx.c         |    2 +-
 dlls/wined3d/wined3d_private.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ba9e551..088cfe0 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1730,7 +1730,7 @@ static enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_
 {
     if (strstr(gl_renderer, "X3100"))
     {
-        /* MacOS calls the card GMA X3100, Google findings also suggest the name GM965 */
+        /* MacOS calls the card GMA X3100, otherwise known as GM965/GL960 */
         *vidmem = 128;
         return CARD_INTEL_X3100;
     }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 2b048b7..de60cf6 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1327,7 +1327,7 @@ enum wined3d_pci_device
     CARD_INTEL_I915G                = 0x2582,
     CARD_INTEL_I915GM               = 0x2592,
     CARD_INTEL_I945GM               = 0x27a2, /* Same as GMA 950? */
-    CARD_INTEL_X3100                = 0x2a02, /* Found in Macs. Same as GMA 965? */
+    CARD_INTEL_X3100                = 0x2a02, /* Found in Macs. Same as GM965/GL960 */
 };
 
 struct wined3d_fbo_ops



From julliard at winehq.org  Tue Jun  1 12:12:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:44 -0500
Subject: Alexandre Julliard : winex11: Windows with WS_EX_NOACTIVATE style
	shouldn' t be on the taskbar.
Message-ID: <E1OJV1A-0004Gf-HV@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0dd44a3776da2f5a116ac24c8a876bf86517d9ad
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0dd44a3776da2f5a116ac24c8a876bf86517d9ad

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  1 13:37:48 2010 +0200

winex11: Windows with WS_EX_NOACTIVATE style shouldn't be on the taskbar.

---

 dlls/winex11.drv/window.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 3999054..7bdf4e1 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -1252,7 +1252,7 @@ void update_net_wm_states( Display *display, struct x11drv_win_data *data )
     ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE );
     if (ex_style & WS_EX_TOPMOST)
         new_state |= (1 << NET_WM_STATE_ABOVE);
-    if (ex_style & WS_EX_TOOLWINDOW)
+    if (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))
         new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER);
     if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER ))
         new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR);



From julliard at winehq.org  Tue Jun  1 12:12:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:44 -0500
Subject: Alexandre Julliard : services: Start the 32-bit winedevice. exe for
	32-bit kernel drivers.
Message-ID: <E1OJV1A-0004Gx-Kc@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3f6f036b4d3f715be83cd40102f476032b44cb83
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3f6f036b4d3f715be83cd40102f476032b44cb83

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  1 13:38:21 2010 +0200

services: Start the 32-bit winedevice.exe for 32-bit kernel drivers.

---

 programs/services/services.c |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/programs/services/services.c b/programs/services/services.c
index a5eb2f7..59fe8bc 100644
--- a/programs/services/services.c
+++ b/programs/services/services.c
@@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(service);
 HANDLE g_hStartedEvent;
 struct scmdatabase *active_database;
 
+static const int is_win64 = (sizeof(void *) > sizeof(int));
+
 static const WCHAR SZ_LOCAL_SYSTEM[] = {'L','o','c','a','l','S','y','s','t','e','m',0};
 
 /* Registry constants */
@@ -548,25 +550,36 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE *
 
     service_lock_exclusive(service_entry);
 
+    size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0);
+    path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR));
+    if (!path) return ERROR_NOT_ENOUGH_SERVER_MEMORY;
+    ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,path,size);
+
     if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER)
     {
         static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',' ',0};
-        DWORD len = GetSystemDirectoryW( NULL, 0 ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(service_entry->name);
+        WCHAR system_dir[MAX_PATH];
+        DWORD type, len;
 
+        GetSystemDirectoryW( system_dir, MAX_PATH );
+        if (is_win64)
+        {
+            if (!GetBinaryTypeW( path, &type ))
+            {
+                HeapFree( GetProcessHeap(), 0, path );
+                return GetLastError();
+            }
+            if (type == SCS_32BIT_BINARY) GetSystemWow64DirectoryW( system_dir, MAX_PATH );
+        }
+
+        len = strlenW( system_dir ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(service_entry->name);
+        HeapFree( GetProcessHeap(), 0, path );
         if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) )))
             return ERROR_NOT_ENOUGH_SERVER_MEMORY;
-        GetSystemDirectoryW( path, len );
+        lstrcpyW( path, system_dir );
         lstrcatW( path, winedeviceW );
         lstrcatW( path, service_entry->name );
     }
-    else
-    {
-        size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0);
-        path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR));
-        if (!path)
-            return ERROR_NOT_ENOUGH_SERVER_MEMORY;
-        ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,path,size);
-    }
 
     ZeroMemory(&si, sizeof(STARTUPINFOW));
     si.cb = sizeof(STARTUPINFOW);



From julliard at winehq.org  Tue Jun  1 12:12:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:44 -0500
Subject: Alexandre Julliard : comctl32/imagelist: Don' t select the mask
	bitmap into a DC, it may already be selected.
Message-ID: <E1OJV1A-0004HF-NT@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d81ddde230e998c7709884f83ac1499ad3a53e44
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d81ddde230e998c7709884f83ac1499ad3a53e44

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  1 16:25:47 2010 +0200

comctl32/imagelist: Don't select the mask bitmap into a DC, it may already be selected.

---

 dlls/comctl32/imagelist.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index d67672f..f699fb3 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -143,7 +143,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count,
                             int width, int height, HBITMAP hbmImage, HBITMAP hbmMask )
 {
     BOOL ret = FALSE;
-    HDC hdcMask = 0;
     BITMAP bm;
     BITMAPINFO *info, *mask_info = NULL;
     DWORD *bits = NULL;
@@ -184,8 +183,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count,
         mask_info->bmiHeader.biSizeImage = mask_width * height;
         if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done;
         if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done;
-        hdcMask = CreateCompatibleDC( 0 );
-        SelectObject( hdcMask, hbmMask );
     }
 
     for (n = 0; n < count; n++)
@@ -207,8 +204,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count,
                         bits[i * bm.bmWidth + j] |= 0xff000000;
                     else
                         bits[i * bm.bmWidth + j] = 0;
-            if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy,
-                                     hdcMask, n * width, 0, width, height, SRCCOPY );
         }
         else
         {
@@ -222,18 +217,17 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count,
                             mask_bits[i * mask_width + j / 8] &= ~(0x80 >> (j % 8));
                         else
                             mask_bits[i * mask_width + j / 8] |= 0x80 >> (j % 8);
-                StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy,
-                               n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY );
             }
         }
         StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy,
                        n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY );
-
+        if (mask_info)
+            StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy,
+                           n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY );
     }
     ret = TRUE;
 
 done:
-    if (hdcMask) DeleteDC( hdcMask );
     HeapFree( GetProcessHeap(), 0, info );
     HeapFree( GetProcessHeap(), 0, mask_info );
     HeapFree( GetProcessHeap(), 0, bits );



From julliard at winehq.org  Tue Jun  1 12:12:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:44 -0500
Subject: Alexandre Julliard : comctl32/imagelist: Initialize the mask bits to
	zero in case the mask bitmap is smaller than the image bitmap .
Message-ID: <E1OJV1A-0004HW-RS@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 350f0d398275ceec7f17df9c5bab35d10a3b7fd4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=350f0d398275ceec7f17df9c5bab35d10a3b7fd4

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  1 16:26:15 2010 +0200

comctl32/imagelist: Initialize the mask bits to zero in case the mask bitmap is smaller than the image bitmap.

---

 dlls/comctl32/imagelist.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index f699fb3..a73b423 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -181,7 +181,8 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count,
         mask_info->bmiHeader = info->bmiHeader;
         mask_info->bmiHeader.biBitCount = 1;
         mask_info->bmiHeader.biSizeImage = mask_width * height;
-        if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done;
+        if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage )))
+            goto done;
         if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done;
     }
 



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: Matteo Bruni : d3dx9: Fix get_regname debug function.
Message-ID: <E1OJV1B-0004Hq-6x@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a262fde88c39d1a49fcd193e6372f766886c8d2a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a262fde88c39d1a49fcd193e6372f766886c8d2a

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Tue Jun  1 01:27:28 2010 +0200

d3dx9: Fix get_regname debug function.

---

 dlls/d3dx9_36/asmutils.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c
index bd6bcea..4fc73a5 100644
--- a/dlls/d3dx9_36/asmutils.c
+++ b/dlls/d3dx9_36/asmutils.c
@@ -264,13 +264,10 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) {
             return wine_dbg_sprintf("v%u", reg->regnum);
         case BWRITERSPR_CONST:
             return wine_dbg_sprintf("c%u", reg->regnum);
-        /* case BWRITERSPR_ADDR: */
+        case BWRITERSPR_ADDR:
+            return wine_dbg_sprintf("a%u", reg->regnum);
         case BWRITERSPR_TEXTURE:
-            if(st == ST_VERTEX) {
-                return wine_dbg_sprintf("a%u", reg->regnum);
-            } else {
-                return wine_dbg_sprintf("t%u", reg->regnum);
-            }
+            return wine_dbg_sprintf("t%u", reg->regnum);
         case BWRITERSPR_RASTOUT:
             switch(reg->regnum) {
                 case BWRITERSRO_POSITION:   return "oPos";
@@ -280,9 +277,10 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) {
             }
         case BWRITERSPR_ATTROUT:
             return wine_dbg_sprintf("oD%u", reg->regnum);
-        /* case BWRITERSPR_TEXCRDOUT: */
+        case BWRITERSPR_TEXCRDOUT:
+            return wine_dbg_sprintf("oT%u", reg->regnum);
         case BWRITERSPR_OUTPUT:
-            return wine_dbg_sprintf("o[T]%u", reg->regnum);
+            return wine_dbg_sprintf("o%u", reg->regnum);
         case BWRITERSPR_CONSTINT:
             return wine_dbg_sprintf("i%u", reg->regnum);
         case BWRITERSPR_COLOROUT:
@@ -305,7 +303,8 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) {
             return wine_dbg_sprintf("l%u", reg->regnum);
         case BWRITERSPR_PREDICATE:
             return wine_dbg_sprintf("p%u", reg->regnum);
-        default: return "unknown regname";
+        default:
+            return wine_dbg_sprintf("unknown regname %#x", reg->type);
     }
 }
 



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: Matteo Bruni : d3dx9: Remove stray debug trace.
Message-ID: <E1OJV1B-0004I8-9Z@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b45a17c7b3abf98ae7584ac7d892d14a4e3662bb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b45a17c7b3abf98ae7584ac7d892d14a4e3662bb

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Tue Jun  1 01:33:36 2010 +0200

d3dx9: Remove stray debug trace.

---

 dlls/d3dx9_36/bytecodewriter.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c
index 84fefee..7e7cace 100644
--- a/dlls/d3dx9_36/bytecodewriter.c
+++ b/dlls/d3dx9_36/bytecodewriter.c
@@ -829,7 +829,6 @@ static void instr_handler(struct bc_writer *This,
                           const struct instruction *instr,
                           struct bytecode_buffer *buffer) {
     DWORD token = d3d9_opcode(instr->opcode);
-    TRACE("token: %x\n", token);
 
     This->funcs->opcode(This, instr, token, buffer);
     if(instr->has_dst) This->funcs->dstreg(This, &instr->dst, buffer, instr->shift, instr->dstmod);



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: Matteo Bruni : d3dx9: Make D3DXCompileShader stub more verbose.
Message-ID: <E1OJV1B-0004IO-CT@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bc4221740170dbacbda7f27c560e16eb2678ee56
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bc4221740170dbacbda7f27c560e16eb2678ee56

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Mon May 31 20:01:12 2010 +0200

d3dx9: Make D3DXCompileShader stub more verbose.

---

 dlls/d3dx9_36/shader.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 3aeaf78..b226fa6 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -644,9 +644,13 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData,
                                  LPD3DXBUFFER* ppErrorMsgs,
                                  LPD3DXCONSTANTTABLE * ppConstantTable)
 {
-    FIXME("(%p, %d, %p, %p, %p, %p, %d, %p, %p, %p): stub\n",
-          pSrcData, srcDataLen, pDefines, pInclude, pFunctionName,
-          pProfile, Flags, ppShader, ppErrorMsgs, ppConstantTable);
+    FIXME("(%p, %d, %p, %p, %s, %s, %x, %p, %p, %p): stub\n",
+          pSrcData, srcDataLen, pDefines, pInclude, debugstr_a(pFunctionName),
+          debugstr_a(pProfile), Flags, ppShader, ppErrorMsgs, ppConstantTable);
+
+    TRACE("Shader source:\n");
+    TRACE("%s\n", debugstr_an(pSrcData, srcDataLen));
+
     return D3DERR_INVALIDCALL;
 }
 



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: Andrew Nguyen : gdi32/tests: Uncomment and enhance a Win9x-specific
	Restore /SaveDC test.
Message-ID: <E1OJV1B-0004JB-Ez@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 682f0dcf1a8e121461dd98af7d04285ead067812
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=682f0dcf1a8e121461dd98af7d04285ead067812

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun  1 08:03:11 2010 -0500

gdi32/tests: Uncomment and enhance a Win9x-specific Restore/SaveDC test.

---

 dlls/gdi32/tests/dc.c |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
index 193832c..687a98f 100644
--- a/dlls/gdi32/tests/dc.c
+++ b/dlls/gdi32/tests/dc.c
@@ -162,15 +162,35 @@ static void test_savedc(void)
     ret = RestoreDC(hdc, 3);
     ok(!ret, "ret = %d\n", ret);
 
-    /* Under win98 the following two succeed and both clear the save stack
+    /* Under Win9x the following RestoreDC call succeeds and clears the save stack. */
+    ret = RestoreDC(hdc, -3);
+    ok(!ret ||
+       broken(ret), /* Win9x */
+       "ret = %d\n", ret);
+
+    /* Trying to clear an empty save stack fails. */
     ret = RestoreDC(hdc, -3);
     ok(!ret, "ret = %d\n", ret);
+
+    ret = SaveDC(hdc);
+    ok(ret == 3 ||
+       broken(ret == 1), /* Win9x */
+       "ret = %d\n", ret);
+
+    /* Under Win9x the following RestoreDC call succeeds and clears the save stack. */
+    ret = RestoreDC(hdc, 0);
+    ok(!ret ||
+       broken(ret), /* Win9x */
+       "ret = %d\n", ret);
+
+    /* Trying to clear an empty save stack fails. */
     ret = RestoreDC(hdc, 0);
     ok(!ret, "ret = %d\n", ret);
-    */
 
     ret = RestoreDC(hdc, 1);
-    ok(ret, "ret = %d\n", ret);
+    ok(ret ||
+       broken(!ret), /* Win9x */
+       "ret = %d\n", ret);
 
     DeleteDC(hdc);
 }



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: Andrew Nguyen : gdi32: Fix parameter handling of GetBoundsRect.
Message-ID: <E1OJV1B-0004JS-K3@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9d5a848df103e2cb594a259e31897d5f355595bd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9d5a848df103e2cb594a259e31897d5f355595bd

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun  1 08:03:24 2010 -0500

gdi32: Fix parameter handling of GetBoundsRect.

---

 dlls/gdi32/dc.c       |   10 +++++--
 dlls/gdi32/tests/dc.c |   63 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index 5f304a2..f3a62bd 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -1534,9 +1534,13 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags)
 
     if ( !dc ) return 0;
 
-    if (rect) *rect = dc->BoundsRect;
-
-    ret = ((dc->flags & DC_BOUNDS_SET) ? DCB_SET : DCB_RESET);
+    if (rect)
+    {
+        *rect = dc->BoundsRect;
+        ret = ((dc->flags & DC_BOUNDS_SET) ? DCB_SET : DCB_RESET);
+    }
+    else
+        ret = 0;
 
     if (flags & DCB_RESET)
     {
diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
index 687a98f..b081376 100644
--- a/dlls/gdi32/tests/dc.c
+++ b/dlls/gdi32/tests/dc.c
@@ -494,6 +494,68 @@ todo_wine
     ok(ret, "UnregisterClassA failed\n");
 }
 
+static void test_boundsrect_invalid(void)
+{
+    HDC hdc;
+    RECT rect, expect;
+    UINT ret;
+
+    hdc = GetDC(NULL);
+    ok(hdc != NULL, "GetDC failed\n");
+
+    ret = GetBoundsRect(hdc, NULL, 0);
+    ok(ret == 0 ||
+       broken(ret == DCB_RESET), /* Win9x */
+       "Expected GetBoundsRect to return 0, got %u\n", ret);
+
+    ret = GetBoundsRect(hdc, NULL, ~0U);
+    ok(ret == 0 ||
+       broken(ret == DCB_RESET), /* Win9x */
+       "Expected GetBoundsRect to return 0, got %u\n", ret);
+
+    if (GetBoundsRect(hdc, NULL, 0) == DCB_RESET)
+        win_skip("Win9x fails catastrophically with first GetBoundsRect call\n");
+    else
+    {
+        /* Test parameter handling order. */
+        SetRect(&rect, 0, 0, 50, 50);
+        ret = SetBoundsRect(hdc, &rect, DCB_SET);
+        ok(ret & DCB_RESET,
+           "Expected return flag DCB_RESET to be set, got %u\n", ret);
+
+        ret = GetBoundsRect(hdc, NULL, DCB_RESET);
+        ok(ret == 0,
+           "Expected GetBoundsRect to return 0, got %u\n", ret);
+
+        ret = GetBoundsRect(hdc, &rect, 0);
+        ok(ret == DCB_RESET,
+           "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret);
+        SetRect(&expect, 0, 0, 0, 0);
+        ok(EqualRect(&rect, &expect),
+           "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n",
+           rect.left, rect.top, rect.right, rect.bottom);
+    }
+
+    if (GetBoundsRect(hdc, NULL, 0) == DCB_RESET)
+        win_skip("Win9x fails catastrophically with NULL device context parameter\n");
+    else
+    {
+        ret = GetBoundsRect(NULL, NULL, 0);
+        ok(ret == 0, "Expected GetBoundsRect to return 0, got %u\n", ret);
+
+        ret = GetBoundsRect(NULL, NULL, ~0U);
+        ok(ret == 0, "Expected GetBoundsRect to return 0, got %u\n", ret);
+
+        ret = SetBoundsRect(NULL, NULL, 0);
+        ok(ret == 0, "Expected SetBoundsRect to return 0, got %u\n", ret);
+
+        ret = SetBoundsRect(NULL, NULL, ~0U);
+        ok(ret == 0, "Expected SetBoundsRect to return 0, got %u\n", ret);
+    }
+
+    DeleteDC(hdc);
+}
+
 START_TEST(dc)
 {
     test_savedc();
@@ -502,4 +564,5 @@ START_TEST(dc)
     test_CreateCompatibleDC();
     test_DC_bitmap();
     test_DeleteDC();
+    test_boundsrect_invalid();
 }



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: Paul Vriens : notepad: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJV1B-0004Jj-MO@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dd243b7fcf8a676be30db43c3b6f34d3cca72a35
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dd243b7fcf8a676be30db43c3b6f34d3cca72a35

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 14:30:13 2010 +0200

notepad: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/notepad/Da.rc |   59 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc
index d152cfe..1068b87 100644
--- a/programs/notepad/Da.rc
+++ b/programs/notepad/Da.rc
@@ -4,6 +4,7 @@
  *  Copyright 1998 Henrik Olsen <henrik at iaeste.dk>
  *  Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
  *  Copyright 2008 Jens Albretsen <jens at albretsen.dk>
+ *            2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,18 +23,20 @@
 
 #include "notepad_res.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
 {
  POPUP "&Filer" {
   MENUITEM "&Ny\tCtrl+N",            CMD_NEW
-  MENUITEM "?&bn...\tCtrl+O",       CMD_OPEN
+  MENUITEM "??&bn...\tCtrl+O",       CMD_OPEN
   MENUITEM "&Gem\tCtrl+S",              CMD_SAVE
   MENUITEM "Gem so&m...",       CMD_SAVE_AS
   MENUITEM SEPARATOR
   MENUITEM "&Udskriv...\tCtrl+P",          CMD_PRINT
-  MENUITEM "Side&ops?tning...", CMD_PAGE_SETUP
+  MENUITEM "Side&ops??tning...", CMD_PAGE_SETUP
   MENUITEM "&Indstil printer...",       CMD_PRINTER_SETUP
   MENUITEM SEPARATOR
   MENUITEM "&Afslut",           CMD_EXIT
@@ -43,7 +46,7 @@ POPUP "&Rediger" {
   MENUITEM SEPARATOR
   MENUITEM "&Klip\tCtrl+X",     CMD_CUT
   MENUITEM "K&opier\tCtrl+C",   CMD_COPY
-  MENUITEM "&Inds?t\tCtrl+V",  CMD_PASTE
+  MENUITEM "&Inds??t\tCtrl+V",  CMD_PASTE
   MENUITEM "&Slet\tDel",        CMD_DELETE
   MENUITEM SEPARATOR
   MENUITEM "Marker &alt",       CMD_SELECT_ALL
@@ -52,14 +55,15 @@ POPUP "&Rediger" {
   MENUITEM "Automatisk &linjeskift",    CMD_WRAP
   MENUITEM "&Font...",          CMD_FONT
  }
-POPUP "&S?g" {
-  MENUITEM "&S?g...",           CMD_SEARCH
-  MENUITEM "&Find n?ste\tF3",   CMD_SEARCH_NEXT
+POPUP "&S??g" {
+  MENUITEM "&S??g...",           CMD_SEARCH
+  MENUITEM "&Find n??ste\tF3",   CMD_SEARCH_NEXT
+  MENUITEM "&Erstat...\tCtrl+H", CMD_REPLACE
  }
-POPUP "&Hj?lp" {
+POPUP "&Hj??lp" {
   MENUITEM "&Indhold",          CMD_HELP_CONTENTS
-  MENUITEM "&S?g efter hj?lp om...",    CMD_HELP_SEARCH
-  MENUITEM "&Brug af Hj?lp",    CMD_HELP_ON_HELP
+  MENUITEM "&S??g efter hj??lp om...",    CMD_HELP_SEARCH
+  MENUITEM "&Brug af Hj??lp",    CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
   MENUITEM "&Om Notepad", CMD_HELP_ABOUT_NOTEPAD
  }
@@ -70,7 +74,7 @@ POPUP "&Hj
 DIALOG_PAGESETUP DIALOG 0, 0, 225, 95
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
-CAPTION "Sideops?tning"
+CAPTION "Sideops??tning"
 {
 LTEXT    "&Sidehoved:",  0x140,   10, 07, 40, 15
 EDITTEXT IDC_PAGESETUP_HEADERVALUE,   60, 05,110, 12, WS_BORDER | WS_TABSTOP
@@ -82,16 +86,24 @@ LTEXT    "&Venstre:",        0x145,   20, 55, 30, 10, WS_CHILD
 EDITTEXT IDC_PAGESETUP_LEFTVALUE,     50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 LTEXT    "&Top:",         0x148,    20, 73, 30, 10, WS_CHILD
 EDITTEXT IDC_PAGESETUP_TOPVALUE,      50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-LTEXT    "&H?jre:",       0x14B, 100, 55, 30, 10, WS_CHILD
+LTEXT    "&H??jre:",       0x14B, 100, 55, 30, 10, WS_CHILD
 EDITTEXT IDC_PAGESETUP_RIGHTVALUE,   130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 LTEXT    "&Bund:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT IDC_PAGESETUP_BOTTOMVALUE,  130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
 DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
 PUSHBUTTON    "Annuller",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Hj?lp",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Hj??lp",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
+IDD_OFN_TEMPLATE  DIALOG  DISCARDABLE 50,50,300,15
+STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Kodning:", -1, 5,0, 50,12
+  COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST
+END
+
 STRINGTABLE DISCARDABLE
 {
 STRING_PAGESETUP_HEADERVALUE,   "&f"
@@ -110,14 +122,23 @@ STRING_TEXT_FILES_TXT,                  "Tekst filer (*.txt)"
 STRING_TOOLARGE,                                "Filen '%s' er for stor til Notesblok. \
 \nBrug en anden editor til at redigere filen."
 STRING_NOTEXT,                                  "Du har ikke skrevet noget tekst. \
-\nSkriv noget tekst, og pr?v s? igen"
+\nSkriv noget tekst, og pr??v s?? igen"
 STRING_DOESNOTEXIST,                            "Filen '%s'\nfindes ikke\n\n \
-?nsker du at oprette en ny fil ?"
-STRING_NOTSAVED,                                "Filen '%s'\ner blevet ?ndret\n\n \
-Vil du gemme ?ndringerne ?"
+??nsker du at oprette en ny fil ?"
+STRING_NOTSAVED,                                "Filen '%s'\ner blevet ??ndret\n\n \
+Vil du gemme ??ndringerne ?"
 STRING_NOTFOUND,                                        "Kan ikke finde '%s'."
-STRING_OUT_OF_MEMORY,                   "Der er ikke nok hukommelse til at udf?re \
-denne operation.\nAfslut et eller flere aktive programmer for at frig?re \
-hukommelse, og pr?v igen."
+STRING_OUT_OF_MEMORY,                   "Der er ikke nok hukommelse til at udf??re \
+denne operation.\nAfslut et eller flere aktive programmer for at frig??re \
+hukommelse, og pr??v igen."
+
+STRING_UNICODE_LE,     "Unicode (UTF-16)"
+STRING_UNICODE_BE,     "Unicode (UTF-16 big-endian)"
 
+STRING_LOSS_OF_UNICODE_CHARACTERS,         "%s\n\
+Denne fil indeholder Unicode-tegn, som vil g?? tabt, hvis\n\
+du gemmer denne fil med %s som kodning.\n\
+For at beholde disse tegn, skal du klikke p?? Annuller og derefter v??lge\n\
+en af Unicode mulighederne i Kodnings rullelisten.\n\
+Forts??t?"
 }



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: Paul Vriens : setupapi: Update the Danish translation.
Message-ID: <E1OJV1B-0004K0-Os@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f7db14b2fcfc909527569fc8bed3f9e8f5eda907
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f7db14b2fcfc909527569fc8bed3f9e8f5eda907

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 14:48:05 2010 +0200

setupapi: Update the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/setupapi/Da.rc |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/dlls/setupapi/Da.rc b/dlls/setupapi/Da.rc
index 7a83816..00bb261 100644
--- a/dlls/setupapi/Da.rc
+++ b/dlls/setupapi/Da.rc
@@ -2,6 +2,7 @@
  * Danish language support
  *
  * Copyright (C) 2008 Jens Albretsen <jens at albretsen.dk>
+ *               2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,8 +21,18 @@
 
 #include "setupapi_private.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
+STRINGTABLE DISCARDABLE
+{
+        IDS_PROMPTDISK   "Filen '%s' fra %s mangler"
+        IDS_UNKNOWN      "Ukendt"
+        IDS_COPYFROM     "Kopiere filer fra:"
+        IDS_INFO         "Skriv den sti, hvor filen er placeret, og klik derefter p? OK."
+}
+
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Kopierer filer..."
@@ -34,3 +45,17 @@ BEGIN
 	LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
 	CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
+
+IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Mangler Filer"
+FONT 8, "MS Shell Dlg"
+BEGIN
+        LTEXT "Inds?t fabrikantens installation disk, og\ns?rg derefter for at korrekte drev er valgt nedenfor", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+        LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+        LTEXT "Kopiere fabrikantens filer fra:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+        CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14
+        PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "Annuller", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "Gennemse...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: Paul Vriens : reg: Update the Danish translation and convert to UTF-8.
Message-ID: <E1OJV1B-0004KH-Rl@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9c02314d7e60f5c8476cf982fde627a581e240e0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9c02314d7e60f5c8476cf982fde627a581e240e0

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 15:54:14 2010 +0200

reg: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/reg/Da.rc |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/programs/reg/Da.rc b/programs/reg/Da.rc
index 353b94d..ccdcf4c 100644
--- a/programs/reg/Da.rc
+++ b/programs/reg/Da.rc
@@ -3,6 +3,7 @@
  * Danish language support
  *
  * Copyright 2008 Jens Albretsen <jens at albretsen.dk>
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,12 +22,19 @@
 
 #include "reg.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
     STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n"
-    STRING_ADD_USAGE, "REG ADD n?gle_navn [/v v?rdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE n?gle_navn [/v v?rdi | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY n?gle_navn [/v v?rdi | /ve] [/s]\n"
+    STRING_ADD_USAGE, "REG ADD n??gle_navn [/v v??rdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE n??gle_navn [/v v??rdi | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY n??gle_navn [/v v??rdi | /ve] [/s]\n"
+    STRING_SUCCESS, "Operationen blev afsluttet med succes\n"
+    STRING_INVALID_KEY, "Fejl: Ugyldigt n??gle navn\n"
+    STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n"
+    STRING_NO_REMOTE, "Fejl: Kunne ikke tilf??je n??gler til fjern maskinen\n"
+    STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings n??gle eller v??rdi\n"
 }



From julliard at winehq.org  Tue Jun  1 12:12:45 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 01 Jun 2010 12:12:45 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: wine.man: There is no
	configuration file.
Message-ID: <E1OJV1B-0004KY-UN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4ae53250161dd762b6ba289e4a58c90db06380c0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4ae53250161dd762b6ba289e4a58c90db06380c0

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon May 31 19:17:09 2010 +0200

wine.man: There is no configuration file.

---

 loader/wine.de.man.in |    3 +--
 loader/wine.fr.man.in |    5 ++---
 loader/wine.man.in    |    3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/loader/wine.de.man.in b/loader/wine.de.man.in
index ebcb744..1dd2d78 100644
--- a/loader/wine.de.man.in
+++ b/loader/wine.de.man.in
@@ -160,8 +160,7 @@ gesucht.
 .TP
 .I WINEDLLOVERRIDES
 Definiert die Bibliotheks?berschreibung und Ladereihenfolge der DLLs,
-die beim Laden jeder DLL ber?cksichtigt wird. Die Standardwerte sind
-in der Konfigurationsdatei enthalten.  Derzeit gibt es zwei Typen von
+die beim Laden jeder DLL ber?cksichtigt wird. Derzeit gibt es zwei Typen von
 DLLs, die in den Speicher eines Prozesses geladen werden k?nnen:
 Native Windows-DLLs
 .RI ( native ),
diff --git a/loader/wine.fr.man.in b/loader/wine.fr.man.in
index acced60..6096a08 100644
--- a/loader/wine.fr.man.in
+++ b/loader/wine.fr.man.in
@@ -158,9 +158,8 @@ Wine utilisera aussi le r?pertoire
 .TP
 .I WINEDLLOVERRIDES
 D?finit le type de remplacement et l'ordre de chargement des DLL utilis?es lors du
-processus de chargement d'une DLL. Le comportement par d?faut est sp?cifi? dans le
-fichier de configuration. Deux types de biblioth?ques peuvent actuellement ?tre charg?s
-dans l'espace d'adressage d'un processus?: les DLL natives de
+processus de chargement d'une DLL. Deux types de biblioth?ques peuvent actuellement
+?tre charg?s dans l'espace d'adressage d'un processus?: les DLL natives de
 Windows
 .RI ( native ),
 et les DLL fournies par
diff --git a/loader/wine.man.in b/loader/wine.man.in
index 879c36a..7d6953c 100644
--- a/loader/wine.man.in
+++ b/loader/wine.man.in
@@ -160,8 +160,7 @@ Wine will also look in
 .TP
 .I WINEDLLOVERRIDES
 Defines the override type and load order of dlls used in the loading
-process for any dll. The default is set in the configuration
-file. There are currently two types of libraries that can be loaded
+process for any dll. There are currently two types of libraries that can be loaded
 into a process' address space: native windows dlls
 .RI ( native ),
 .B wine 



From julliard at winehq.org  Wed Jun  2 11:16:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:23 -0500
Subject: Paul Vriens : kernel32: Fix the Korean resources.
Message-ID: <E1OJqcB-00042E-OL@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dda58216eae4bd13f4d40fb263eb441f60121ff0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dda58216eae4bd13f4d40fb263eb441f60121ff0

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 18:57:24 2010 +0200

kernel32: Fix the Korean resources.

---

 dlls/kernel32/nls/winerr_kor.mc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc
index 95082e4..289b17e 100644
--- a/dlls/kernel32/nls/winerr_kor.mc
+++ b/dlls/kernel32/nls/winerr_kor.mc
@@ -664,7 +664,7 @@ MessageId=160
 SymbolicName=ERROR_BAD_ARGUMENTS
 Language=KOR
 DosExecPgm?? ???? ????
- 
+.
 MessageId=161
 SymbolicName=ERROR_BAD_PATHNAME
 Language=KOR
@@ -974,7 +974,7 @@ MessageId=534
 SymbolicName=ERROR_ARITHMETIC_OVERFLOW
 Language=KOR
 Arithmetic ??????????
-
+.
 MessageId=535
 SymbolicName=ERROR_PIPE_CONNECTED
 Language=KOR
@@ -3109,7 +3109,7 @@ MessageId=1739
 SymbolicName=RPC_S_UUID_NO_ADDRESS
 Language=KOR
 ???????? ?????? ????????.
-
+.
 MessageId=1740
 SymbolicName=RPC_S_DUPLICATE_ENDPOINT
 Language=KOR
@@ -3489,7 +3489,7 @@ MessageId=1816
 SymbolicName=ERROR_NOT_ENOUGH_QUOTA
 Language=KOR
 ?????? ???????? ????????
-
+.
 MessageId=1817
 SymbolicName=RPC_S_NO_INTERFACES
 Language=KOR
@@ -3579,7 +3579,7 @@ MessageId=1899
 SymbolicName=EPT_S_CANT_CREATE
 Language=KOR
 ?????????? ???? DB?? ???? ?? ????????
-
+.
 MessageId=1900
 SymbolicName=RPC_S_INVALID_OBJECT
 Language=KOR



From julliard at winehq.org  Wed Jun  2 11:16:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:23 -0500
Subject: Paul Vriens : wininet: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJqcB-00042U-Ql@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e7eb9175318073f6d20093eda911d575ede2151b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e7eb9175318073f6d20093eda911d575ede2151b

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 19:07:57 2010 +0200

wininet: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/wininet/wininet_Da.rc |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/dlls/wininet/wininet_Da.rc b/dlls/wininet/wininet_Da.rc
index 6b37857..46efeb6 100644
--- a/dlls/wininet/wininet_Da.rc
+++ b/dlls/wininet/wininet_Da.rc
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 Jens Albretsen
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,11 +19,13 @@
 
 #include "resource.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv netv?rkskodeord"
+CAPTION "Skriv netv??rkskodeord"
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Skriv dit brugernavn og kodeord:", -1, 40, 6, 150, 15
@@ -40,7 +43,27 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
 
+IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Godkendelse P??kr??vet"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Indtast venligst, dit brugernavn og adgangskode:", -1, 40, 6, 150, 15
+ LTEXT "Server", -1, 40, 26, 50, 10
+ LTEXT "Dom??ne", -1, 40, 46, 50, 10
+ LTEXT "Bruger", -1, 40, 66, 50, 10
+ LTEXT "Adgangskode", -1, 40, 86, 50, 10
+ LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "&Gem denne adgangskode (usikker)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
 STRINGTABLE DISCARDABLE
 {
-  IDS_LANCONNECTION "Lokal netv?rksforbindelse"
+  IDS_LANCONNECTION "Lokal netv??rksforbindelse"
 }



From julliard at winehq.org  Wed Jun  2 11:16:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:23 -0500
Subject: Paul Vriens : avifile32: Update the Danish translation and convert to
	UTF-8 .
Message-ID: <E1OJqcB-00042l-SO@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c516ecbf9b9f4f2abeacb8dc031586a6dcf2b836
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c516ecbf9b9f4f2abeacb8dc031586a6dcf2b836

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 20:40:56 2010 +0200

avifile32: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/avifil32/avifile_Da.rc |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/avifil32/avifile_Da.rc b/dlls/avifil32/avifile_Da.rc
index 22f4576..b8a5191 100644
--- a/dlls/avifil32/avifile_Da.rc
+++ b/dlls/avifil32/avifile_Da.rc
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 Jens Albretsen
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,6 +19,8 @@
 
 #include "avifile_private.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
@@ -25,15 +28,15 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Komprimerings indstillinger"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&V?lg en stream:",-1,2,5,154,10
+    LTEXT           "&V??lg stream:",-1,2,5,154,10
     COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
     PUSHBUTTON      "I&ndstillinger...",IDC_OPTIONS,170,17,50,14
     AUTOCHECKBOX    "&Interleave hver",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
     EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "billeder",-1,129,43,36,9
-    LTEXT           "Nuv?rende format:",-1,3,56,53,9
-    LTEXT           "This space for rent",IDC_FORMATTEXT,55,56,90,26
+    LTEXT           "Billeder",-1,129,43,36,9
+    LTEXT           "Nuv??rende format:",-1,3,56,53,9
+    LTEXT           "Denne plads er til leje",IDC_FORMATTEXT,55,56,90,26
     DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
     PUSHBUTTON      "Annuller",IDCANCEL,170,61,50,14
 END
@@ -43,10 +46,10 @@ STRINGTABLE DISCARDABLE
   IDS_WAVESTREAMFORMAT	"Lydkurve: %s"
   IDS_WAVEFILETYPE	"Lydkurve"
   IDS_ALLMULTIMEDIA	"Alle multimedia filer"
-  IDS_ALLFILES		"Alle files (*.*)@*.*"
+  IDS_ALLFILES		"Alle filer (*.*)@*.*"
   IDS_VIDEO		"video"
-  IDS_AUDIO		"audio"
+  IDS_AUDIO		"lyd"
   IDS_AVISTREAMFORMAT	"%s %s #%d"
-  IDS_AVIFILETYPE	"Wine AVI-default-filehandler"
+  IDS_AVIFILETYPE	"Wine AVI-standard-filehandler"
   IDS_UNCOMPRESSED      "ukomprimeret"
 }



From julliard at winehq.org  Wed Jun  2 11:16:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:23 -0500
Subject: Paul Vriens : winecfg: Update the Danish translation.
Message-ID: <E1OJqcB-000431-VB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2e01e4cb3cd9b145477d1d0e340b21583fb666f5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2e01e4cb3cd9b145477d1d0e340b21583fb666f5

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 20:47:02 2010 +0200

winecfg: Update the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/winecfg/Da.rc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index 7b2ae81..126c26d 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -57,11 +57,11 @@ STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        " Program indstillinger ",IDC_STATIC, 8,4,244,240
-    LTEXT           "Wine kan efterligne forskellige versioner af Windows for hvert program.  Tabben h?nger sammen med Biblioteker og Grafik tabbene for at tillade ?ndring af system eller per program indstillinger.",
-                    IDC_STATIC,15,20,227,30
+    LTEXT           "Wine kan efterligne forskellige Windows-versioner for hvert program. Denne fane er knyttet til Biblioteker og Grafik faner, for at give dig mulighed for at ?ndre systemsider eller per program indstillinger i disse faneblade.",
+                    IDC_STATIC,15,20,227,40
     CONTROL         "Programmer",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS,
-                    15,50,230,150
-    PUSHBUTTON	    "&Tilf? program...",IDC_APP_ADDAPP, 90,204,75,14
+                    15,60,230,140
+    PUSHBUTTON	    "&Tilf?j program...",IDC_APP_ADDAPP, 90,204,75,14
     PUSHBUTTON	    "&Fjern program",IDC_APP_REMOVEAPP, 170,204,75,14
     LTEXT           "&Windows version:",IDC_STATIC,17,226,58,8
     COMBOBOX        IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -178,7 +178,7 @@ STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        " Driver valg ",IDC_STATIC,8,4,244,210
-    LTEXT           "V?lg en lyd driver ved at afkrydse den ?nskede driver.  Sl? lyden fra ved at frav?lge alle drivere. Valg af flere drivere er ikke rekommenderet. Konfigur?r driver ved at h?jre klikke p? den.",IDC_STATIC,15,20,227,30
+    LTEXT           "V?lg en lyd driver ved at afkrydse den ?nskede driver. Sl? lyden fra ved at frav?lge alle drivere. Valg af flere drivere er ikke anbefalet. Konfigur?r driver ved at h?jre klikke p? den.",IDC_STATIC,15,20,227,30
     CONTROL         "Enheder",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,155
     PUSHBUTTON      "&Test lyd",IDC_AUDIO_TEST,170,50,59,14
     PUSHBUTTON	    "&Kontrol panel",IDC_AUDIO_CONTROL_PANEL,170,70,59,14



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Paul Vriens : winhlp32: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJqcC-00043H-1A@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 39bf15400e231b430ae4de721655a0e0822f498a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=39bf15400e231b430ae4de721655a0e0822f498a

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 23:26:53 2010 +0200

winhlp32: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/winhlp32/Da.rc |   62 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc
index fc15eeb..20e3331 100644
--- a/programs/winhlp32/Da.rc
+++ b/programs/winhlp32/Da.rc
@@ -4,6 +4,7 @@
  * Copyright 1997 Henrik Olsen
  * Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
  * Copyright 2008 Jens Albretsen<jens at albretsen.dk>
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,12 +23,16 @@
 
 #include "winhelp_res.h"
 
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Filer" {
-  MENUITEM "?&ben...", MNID_FILE_OPEN
+  MENUITEM "??&ben...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Udskriv emne", MNID_FILE_PRINT
   MENUITEM "&Indstil printer", MNID_FILE_SETUP
@@ -37,9 +42,9 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
  POPUP "&Rediger" {
    MENUITEM "K&opier...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Anm?rk...", MNID_EDIT_ANNOTATE
+   MENUITEM "&Anm??rk...", MNID_EDIT_ANNOTATE
  }
- POPUP "Bog&m?rke" {
+ POPUP "Bog&m??rke" {
    MENUITEM "&Definer...", MNID_BKMK_DEFINE
  }
  POPUP "&Options" {
@@ -58,18 +63,18 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
   END
   MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
  }
- POPUP "&Hj?lp" {
-   MENUITEM "&Brug af Hj?lp", MNID_HELP_HELPON
-   MENUITEM "Altid &?verst", MNID_HELP_HELPTOP
+ POPUP "&Hj??lp" {
+   MENUITEM "&Brug af Hj??lp", MNID_HELP_HELPON
+   MENUITEM "Altid &??verst", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
    MENUITEM "&Information...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "Om &WINE", MNID_HELP_WINE
+   MENUITEM "Om &Wine", MNID_HELP_WINE
 #endif
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Index"
@@ -77,21 +82,52 @@ CAPTION "Index"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "S??g"
+{
+    LTEXT  "Er ikke blevet implementeret endnu", -1, 10, 10, 180, 150
+}
+
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
-STID_WINE_HELP, 	"WINE Hj?lp"
+STID_WINE_HELP, 	"Wine Hj??lp"
 STID_WHERROR, 		"FEJL"
 STID_WARNING,  		"ADVARSEL"
 STID_INFO,  		"Information"
 STID_NOT_IMPLEMENTED, 	"Ikke implementeret"
-STID_HLPFILE_ERROR_s, 	"Fejl ved indl?sning af filen `%s'"
+STID_HLPFILE_ERROR_s, 	"Fejl ved indl??sning af filen `%s'"
 STID_INDEX, 		"&Indhold"
 STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Tilbage"
 STID_ALL_FILES, 	"Alle filer (*.*)"
-STID_HELP_FILES_HLP, 	"Hj?lpe filer (*.hlp)"
+STID_HELP_FILES_HLP, 	"Hj??lpe filer (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan ikke finde '%s'. Vil du selv finde filen?"
 STID_NO_RICHEDIT	"Kan ikke finde en 'richedit' implementering... Afbryder"
 STID_PSH_INDEX,		"Help topics: "
 }
+
+CONTEXT_MENU MENU
+BEGIN
+        POPUP ""
+        BEGIN
+                MENUITEM "Notat...",           MNID_CTXT_ANNOTATE
+                MENUITEM "Kopier",             MNID_CTXT_COPY
+                MENUITEM "Udskriv...",         MNID_CTXT_PRINT
+                POPUP    "Skrifttype"
+                BEGIN
+                        MENUITEM "Lille",      MNID_CTXT_FONTS_SMALL
+                        MENUITEM "Normal",     MNID_CTXT_FONTS_NORMAL
+                        MENUITEM "Stor",       MNID_CTXT_FONTS_LARGE
+                END
+                POPUP   "Bevar Hj??lp ??verst"
+                BEGIN
+                        MENUITEM "Standard",   MNID_CTXT_HELP_DEFAULT
+                        MENUITEM "Synlig",     MNID_CTXT_HELP_VISIBLE
+                        MENUITEM "Usynlig",    MNID_CTXT_HELP_NONVISIBLE
+                END
+                MENUITEM "Benyt systemfarver", MNID_CTXT_SYSTEM_COLORS
+        END
+END



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Paul Vriens : wordpad: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OJqcC-00043X-3f@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 96a6e758971e0ec4764d7d6abce128c567540f85
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=96a6e758971e0ec4764d7d6abce128c567540f85

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Jun  1 23:44:53 2010 +0200

wordpad: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/wordpad/Da.rc |   86 ++++++++++++++++++++++++++----------------------
 1 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc
index 882cca7..b3a8e0a 100644
--- a/programs/wordpad/Da.rc
+++ b/programs/wordpad/Da.rc
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 by Jens Albretsen <jens at albretsen.dk>
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,6 +19,8 @@
 
 #include "wordpad.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDM_MAINMENU MENU DISCARDABLE
@@ -25,12 +28,12 @@ BEGIN
     POPUP "&Fil"
     BEGIN
         MENUITEM "&Ny...\tCtrl+N",            ID_FILE_NEW
-        MENUITEM "&?ben...\tCtrl+O",          ID_FILE_OPEN
+        MENUITEM "&??ben...\tCtrl+O",          ID_FILE_OPEN
         MENUITEM "&Gemme\tCtrl+S",            ID_FILE_SAVE
         MENUITEM "Gemme &som...",             ID_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Udskriv...\tCtrl+P",       ID_PRINT
-        MENUITEM "&Forh?ndsvisning...",       ID_PREVIEW
+        MENUITEM "&Forh??ndsvisning...",       ID_PREVIEW
         MENUITEM "&Side indstillinger...",    ID_PRINTSETUP
         MENUITEM SEPARATOR
         MENUITEM "&Afslut",                   ID_FILE_EXIT
@@ -42,20 +45,20 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Klip\tCtrl+X",             ID_EDIT_CUT
         MENUITEM "K&opier\tCtrl+C",           ID_EDIT_COPY
-        MENUITEM "&Inds?t\tCtrl+V",           ID_EDIT_PASTE
+        MENUITEM "&Inds??t\tCtrl+V",           ID_EDIT_PASTE
         MENUITEM "&Fjern\tDEL",               ID_EDIT_CLEAR
         MENUITEM "&Marker alt\tCtrl+A",       ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "&S?g efter...\tCtrl+F",     ID_FIND
-        MENUITEM "S?g efter &n?ste\tF3",      ID_FIND_NEXT
+        MENUITEM "&S??g efter...\tCtrl+F",     ID_FIND
+        MENUITEM "S??g efter &n??ste\tF3",      ID_FIND_NEXT
         MENUITEM "E&rstat...\tCtrl+H",        ID_REPLACE
         MENUITEM SEPARATOR
         MENUITEM "S&krivebeskyttet",          ID_EDIT_READONLY
-        MENUITEM "?&ndret",                   ID_EDIT_MODIFIED
+        MENUITEM "??&ndret",                   ID_EDIT_MODIFIED
         MENUITEM SEPARATOR
         POPUP "&Ekstra"
         BEGIN
-            MENUITEM "&Information om markeret omr?de", ID_EDIT_SELECTIONINFO
+            MENUITEM "&Information om markeret omr??de", ID_EDIT_SELECTIONINFO
             MENUITEM "Tegn&format",           ID_EDIT_CHARFORMAT
             MENUITEM "Stan&dard tegnformat",  ID_EDIT_DEFCHARFORMAT
             MENUITEM "&Afsnitsformat",        ID_EDIT_PARAFORMAT
@@ -64,14 +67,14 @@ BEGIN
     END
     POPUP "&Vis"
     BEGIN
-        MENUITEM "V?rk&t?jslinie",            ID_TOGGLE_TOOLBAR
+        MENUITEM "V??rk&t??jslinie",            ID_TOGGLE_TOOLBAR
         MENUITEM "&Formatteringlinie",        ID_TOGGLE_FORMATBAR
         MENUITEM "&Lineal",                   ID_TOGGLE_RULER
         MENUITEM "&Statuslinie",              ID_TOGGLE_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Alternativer...",          ID_VIEWPROPERTIES
     END
-    POPUP "&Inds?t"
+    POPUP "&Inds??t"
     BEGIN
         MENUITEM "&Dato og tid...",           ID_DATETIME
     END
@@ -87,7 +90,7 @@ BEGIN
             MENUITEM "&Huskeseddel\tCtrl+2",  ID_BACK_2
         END
     END
-    POPUP "&Hj?lp"
+    POPUP "&Hj??lp"
     BEGIN
         MENUITEM "&Om Wine Wordpad"           ID_ABOUT
     END
@@ -99,7 +102,7 @@ BEGIN
     BEGIN
         MENUITEM "&Klip"                ID_EDIT_CUT
         MENUITEM "K&opier"              ID_EDIT_COPY
-        MENUITEM "&Inds?t"              ID_EDIT_PASTE
+        MENUITEM "&Inds??t"              ID_EDIT_PASTE
         MENUITEM SEPARATOR
         MENUITEM "&Bullets"             ID_BULLET
         MENUITEM "&Afsnit..."           ID_PARAFORMAT
@@ -111,18 +114,18 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM "Sort",      ID_COLOR_BLACK
-        MENUITEM "M?rker?d",  ID_COLOR_MAROON
-        MENUITEM "Gr?n",      ID_COLOR_GREEN
+        MENUITEM "M??rker??d",  ID_COLOR_MAROON
+        MENUITEM "Gr??n",      ID_COLOR_GREEN
         MENUITEM "Oliven"     ID_COLOR_OLIVE
         MENUITEM "Navy"       ID_COLOR_NAVY
         MENUITEM "Lilla"      ID_COLOR_PURPLE
         MENUITEM "Teal"       ID_COLOR_TEAL
-        MENUITEM "Gr?"        ID_COLOR_GRAY
-        MENUITEM "S?lv"       ID_COLOR_SILVER
-        MENUITEM "R?d"        ID_COLOR_RED
+        MENUITEM "Gr??"        ID_COLOR_GRAY
+        MENUITEM "S??lv"       ID_COLOR_SILVER
+        MENUITEM "R??d"        ID_COLOR_RED
         MENUITEM "Lime"       ID_COLOR_LIME
         MENUITEM "Gul"        ID_COLOR_YELLOW
-        MENUITEM "Bl?"        ID_COLOR_BLUE
+        MENUITEM "Bl??"        ID_COLOR_BLUE
         MENUITEM "Violet"     ID_COLOR_FUCHSIA
         MENUITEM "Cyan"       ID_COLOR_AQUA
         MENUITEM "Hvid"       ID_COLOR_WHITE
@@ -135,7 +138,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Dato og tid"
 FONT 10, "MS Sans Serif"
 BEGIN
-    LTEXT        "Tilg?ngelige formater",-1,3,2,100,15
+    LTEXT        "Tilg??ngelige formater",-1,3,2,100,15
     LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
     PUSHBUTTON   "&OK",IDOK,87,12,40,12
     PUSHBUTTON   "&Annuller",IDCANCEL,87,26,40,12
@@ -160,9 +163,9 @@ BEGIN
     GROUPBOX "Indryk", -1, 10, 10, 120, 68
     LTEXT "Venstre", -1, 15, 22, 40, 13
     EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "H?jre", -1, 15, 40, 40, 13
+    LTEXT "H??jre", -1, 15, 40, 40, 13
     EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "F?rste linie", -1, 15, 58, 40, 13
+    LTEXT "F??rste linie", -1, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Justering", -1, 15, 87, 40, 13
     COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
@@ -177,7 +180,7 @@ FONT 8, "MS SHell DLg"
 BEGIN
     GROUPBOX "Tabulatorstop", -1, 10, 10, 120, 90
     COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Tilf?j", ID_TAB_ADD, 20, 80, 45, 15
+    DEFPUSHBUTTON "&Tilf??j", ID_TAB_ADD, 20, 80, 45, 15
     PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15
@@ -193,8 +196,8 @@ BEGIN
     RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15
-    GROUPBOX "V?rkt?jslinier", -1, 150, 10, 120, 85
-    CHECKBOX "&V?rkt?jslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15
+    GROUPBOX "V??rkt??jslinier", -1, 150, 10, 120, 85
+    CHECKBOX "&V??rkt??jslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatteringlinie", IDC_PAGEFMT_FB, 160, 38, 80, 15
     CHECKBOX "&Lineal", IDC_PAGEFMT_RU, 160, 56, 80, 15
     CHECKBOX "&Statuslinie", IDC_PAGEFMT_SB, 160, 74, 80, 15
@@ -219,7 +222,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_ALIGN_LEFT,            "Venstrestillet"
-    STRING_ALIGN_RIGHT,           "H?jrestillet"
+    STRING_ALIGN_RIGHT,           "H??jrestillet"
     STRING_ALIGN_CENTER,          "Midterstillet"
 END
 
@@ -238,31 +241,36 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_PREVIEW_PRINT,            "Udskriv"
-    STRING_PREVIEW_NEXTPAGE,         "N?ste side"
+    STRING_PREVIEW_NEXTPAGE,         "N??ste side"
     STRING_PREVIEW_PREVPAGE,         "Forrige side"
     STRING_PREVIEW_TWOPAGES,         "To sider"
-    STRING_PREVIEW_ONEPAGE,          "?n side"
+    STRING_PREVIEW_ONEPAGE,          "??n side"
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Luk"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
+    STRING_PREVIEW_PAGE,             "Side"
+    STRING_PREVIEW_PAGES,            "Sider"
+    STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "tomme"
+    STRING_UNITS_INCH,               "tommer"
+    STRING_UNITS_PT,                 "pkt"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_DEFAULT_FILENAME,     "Dokument"
-    STRING_PROMPT_SAVE_CHANGES,  "Gemme ?ndringer i ?%s??"
-    STRING_SEARCH_FINISHED,      "F?rdig med at s?ge i dokumentet."
-    STRING_LOAD_RICHED_FAILED,   "Kunne ikke indl?se RichEdit-biblioteket."
+    STRING_PROMPT_SAVE_CHANGES,  "Gemme ??ndringer i ??%s???"
+    STRING_SEARCH_FINISHED,      "F??rdig med at s??ge i dokumentet."
+    STRING_LOAD_RICHED_FAILED,   "Kunne ikke indl??se RichEdit-biblioteket."
     STRING_SAVE_LOSEFORMATTING,  "Du har valgt at gemme i rent tekstformat, noget som " \
-                                 "vil medf?re at al formatering g?r tabt. Er du " \
-                                 "sikker p? at du vil forts?tte?"
+                                 "vil medf??re at al formatering g??r tabt. Er du " \
+                                 "sikker p?? at du vil forts??tte?"
     STRING_INVALID_NUMBER,       "Ugyldigt talformat"
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke underst?ttet"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke underst??ttet"
+    STRING_WRITE_FAILED,              "Kunne ikke gemme filen."
+    STRING_WRITE_ACCESS_DENIED,       "Filen kunne ikke gemmes, adgang n??gtet."
+    STRING_OPEN_FAILED,               "Kunne ikke ??bne filen."
+    STRING_OPEN_ACCESS_DENIED,        "Filen kunne ikke ??bnes, adgang n??gtet."
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Udskrivning er endnu ikke implementeret."
+    STRING_MAX_TAB_STOPS,             "Kan ikke tilf??je mere end 32 tabulatorer."
 END



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Sven Baars : progman: Fix Dutch translation.
Message-ID: <E1OJqcC-00043n-5K@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 624dd8456098628cdf63206c3db861c9b77d912d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=624dd8456098628cdf63206c3db861c9b77d912d

Author: Sven Baars <sven.wine at gmail.com>
Date:   Tue Jun  1 21:27:58 2010 +0200

progman: Fix Dutch translation.

---

 programs/progman/Nl.rc |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/programs/progman/Nl.rc b/programs/progman/Nl.rc
index c0c78a3..a575fe6 100644
--- a/programs/progman/Nl.rc
+++ b/programs/progman/Nl.rc
@@ -22,6 +22,8 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
+#pragma code_page(65001)
+
 /* Menu */
 
 MAIN_MENU MENU
@@ -30,7 +32,7 @@ MAIN_MENU MENU
    MENUITEM "&Nieuw...",                    PM_NEW
    MENUITEM "&Openen\tEnter",               PM_OPEN
    MENUITEM "Ve&rplaatsen...\tF7",          PM_MOVE,      GRAYED
-   MENUITEM "&Kopi?ren...\tF8",             PM_COPY,      GRAYED
+   MENUITEM "&Kopi??ren...\tF8",             PM_COPY,      GRAYED
    MENUITEM "&Verwijderen\tEntf",           PM_DELETE
    MENUITEM "&Eigenschappen...\tAlt+Enter", PM_ATTRIBUTES
    MENUITEM SEPARATOR
@@ -50,7 +52,7 @@ MAIN_MENU MENU
  }
  
 POPUP "&Help" {
-   MENUITEM "Help-&onderwerpen", PM_CONTENTS
+   MENUITEM "Help-onder&werpen", PM_CONTENTS
    MENUITEM "&Zoeken...",        PM_SEARCH
    MENUITEM SEPARATOR
    MENUITEM "&Hulp bij Help",    PM_HELPONHELP
@@ -96,9 +98,9 @@ PUSHBUTTON    "&Help",                PM_HELP,           185, 45,  60, 15, WS_TA
 
 DIALOG_COPY DIALOG 0, 0, 250, 65
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Programma kopi?ren"
+CAPTION "Programma kopi??ren"
 {
-LTEXT         "Kopi?er programma:",    -1,            5,  5,  90, 15
+LTEXT         "Kopi??er programma:",    -1,            5,  5,  90, 15
 LTEXT         "",                      PM_PROGRAM,         95,  5,  90, 15
 LTEXT         "Van programmagroep:",   -1,            5, 13,  90, 15
 LTEXT         "",                      PM_FROM_GROUP,      95, 13,  90, 15
@@ -117,7 +119,7 @@ CAPTION "Eigenschappen van de programmagroep"
 {
 LTEXT     "B&eschrijving:", PM_DESCRIPTION_TXT,   05, 18,  50, 10
 EDITTEXT                    PM_DESCRIPTION,       60, 18,  90, 15, WS_TABSTOP
-LTEXT     "&Groepbestand:", PM_FILE_TXT,          05, 38,  50, 10
+LTEXT    "&Groepsbestand:", PM_FILE_TXT,          05, 38,  50, 10
 EDITTEXT                    PM_FILE,              60, 38,  90, 15, WS_TABSTOP
 DEFPUSHBUTTON "OK",         IDOK,                155,  5,  60, 15, WS_TABSTOP
 PUSHBUTTON    "Annuleren",  IDCANCEL,            155, 25,  60, 15, WS_TABSTOP
@@ -192,7 +194,7 @@ IDS_INFO,			"Informatie"
 IDS_DELETE,			"Verwijderen"
 IDS_DELETE_GROUP_s,		"Wilt u groep `%s' verwijderen?"
 IDS_DELETE_PROGRAM_s,		"Wilt u programma `%s' verwijderen?"
-IDS_NOT_IMPLEMENTED,		"Niet ge?mplementeerd"
+IDS_NOT_IMPLEMENTED,		"Niet ge??mplementeerd"
 IDS_FILE_READ_ERROR_s,		"Fout bij het lezen van `%s'."
 IDS_FILE_WRITE_ERROR_s,		"Fout bij het schrijven van `%s'."
 IDS_GRPFILE_READ_ERROR_s,	"\



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Konstantin Kondratyuk : mshtml: Fix typo in Russian resources.
Message-ID: <E1OJqcC-000443-79@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 437cf862f9369f2c8955a617f89c0ff9f47b22a4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=437cf862f9369f2c8955a617f89c0ff9f47b22a4

Author: Konstantin Kondratyuk <kondratyuk at etersoft.ru>
Date:   Tue Jun  1 22:08:51 2010 +0400

mshtml: Fix typo in Russian resources.

---

 dlls/mshtml/Ru.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc
index 6722ddc..c3fede1 100644
--- a/dlls/mshtml/Ru.rc
+++ b/dlls/mshtml/Ru.rc
@@ -36,7 +36,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN
 CAPTION "????????? Wine Gecko"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT "Wine ?? ????? ????? ????? Gecko, ??????? ????????? ??? ?????????? ?????? ??????????"\
+    LTEXT "Wine ?? ????? ????? ????? Gecko, ??????? ????????? ??? ?????????? ?????? ?????????? "\
           "? ?????????? HTML. " \
           "Wine ????? ????????????? ????????? ? ?????????? ??? ??? ???.\n\n" \
           "??????????: ????????????? ???????????? ?????, ??????????????? ????? ?????????????. "\



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: kernel32: Fix a spelling
	error in French locale definitions.
Message-ID: <E1OJqcC-00044Q-9U@wine.codeweavers.com>

Module: wine
Branch: master
Commit: da05cbd8ce81392b950ab00a13349dfb4293c165
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=da05cbd8ce81392b950ab00a13349dfb4293c165

Author: Fr??d??ric Delanoy <frederic.delanoy at gmail.com>
Date:   Tue Jun  1 23:59:51 2010 +0200

kernel32: Fix a spelling error in French locale definitions.

---

 dlls/kernel32/nls/fra.nls |    2 +-
 dlls/kernel32/nls/frb.nls |    2 +-
 dlls/kernel32/nls/frc.nls |    2 +-
 dlls/kernel32/nls/frl.nls |    2 +-
 dlls/kernel32/nls/frm.nls |    2 +-
 dlls/kernel32/nls/frs.nls |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls
index 80b34fb..9ee0137 100644
--- a/dlls/kernel32/nls/fra.nls
+++ b/dlls/kernel32/nls/fra.nls
@@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
   LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien"
   LGRPID_INDIC+LGRPID_RES_BASE "Indien"
   LGRPID_GEORGIAN+LGRPID_RES_BASE "G?orgien"
-  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nian"
+  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nien"
 }
diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls
index caeaa76..1a0480f 100644
--- a/dlls/kernel32/nls/frb.nls
+++ b/dlls/kernel32/nls/frb.nls
@@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN
   LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien"
   LGRPID_INDIC+LGRPID_RES_BASE "Indien"
   LGRPID_GEORGIAN+LGRPID_RES_BASE "G?orgien"
-  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nian"
+  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nien"
 }
diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls
index 5b7730c..a8c07b9 100644
--- a/dlls/kernel32/nls/frc.nls
+++ b/dlls/kernel32/nls/frc.nls
@@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
   LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien"
   LGRPID_INDIC+LGRPID_RES_BASE "Indien"
   LGRPID_GEORGIAN+LGRPID_RES_BASE "G?orgien"
-  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nian"
+  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nien"
 }
diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls
index e0610e2..bc5874c 100644
--- a/dlls/kernel32/nls/frl.nls
+++ b/dlls/kernel32/nls/frl.nls
@@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG
   LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien"
   LGRPID_INDIC+LGRPID_RES_BASE "Indien"
   LGRPID_GEORGIAN+LGRPID_RES_BASE "G?orgien"
-  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nian"
+  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nien"
 }
diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls
index 511bb51..0fc0b57 100644
--- a/dlls/kernel32/nls/frm.nls
+++ b/dlls/kernel32/nls/frm.nls
@@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO
   LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien"
   LGRPID_INDIC+LGRPID_RES_BASE "Indien"
   LGRPID_GEORGIAN+LGRPID_RES_BASE "G?orgien"
-  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nian"
+  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nien"
 }
diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls
index 45f4894..6613776 100644
--- a/dlls/kernel32/nls/frs.nls
+++ b/dlls/kernel32/nls/frs.nls
@@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
   LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien"
   LGRPID_INDIC+LGRPID_RES_BASE "Indien"
   LGRPID_GEORGIAN+LGRPID_RES_BASE "G?orgien"
-  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nian"
+  LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm?nien"
 }



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Jose Rostagno : mshtml: Update Spanish translation.
Message-ID: <E1OJqcC-00044h-Ax@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0b8e214365be921b7e42670628049d82beafd83e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0b8e214365be921b7e42670628049d82beafd83e

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun  1 16:22:39 2010 -0300

mshtml: Update Spanish translation.

---

 dlls/mshtml/Es.rc |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/dlls/mshtml/Es.rc b/dlls/mshtml/Es.rc
index be8fe7d..590cf6a 100644
--- a/dlls/mshtml/Es.rc
+++ b/dlls/mshtml/Es.rc
@@ -57,3 +57,14 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON "Aceptar", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Anular", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP
 }
+
+ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30
+    EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Aceptar", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP
+}



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Jose Rostagno : wininet: Update Spanish translation.
Message-ID: <E1OJqcC-00044z-DL@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2a52bb82f2a4d18c500e2f0d4077140656edd55b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a52bb82f2a4d18c500e2f0d4077140656edd55b

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun  1 16:19:47 2010 -0300

wininet: Update Spanish translation.

---

 dlls/wininet/wininet_Es.rc |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/dlls/wininet/wininet_Es.rc b/dlls/wininet/wininet_Es.rc
index c9ce2ce..8704db6 100644
--- a/dlls/wininet/wininet_Es.rc
+++ b/dlls/wininet/wininet_Es.rc
@@ -40,6 +40,26 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
 
+IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Autentificaci?n Requerida"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Por favor introduzca su nombre de usuario y contrase?a:", -1, 40, 6, 150, 15
+ LTEXT "Servidor", -1, 40, 26, 50, 10
+ LTEXT "Dominio", -1, 40, 46, 50, 10
+ LTEXT "Usuario", -1, 40, 66, 50, 10
+ LTEXT "Contrase?a", -1, 40, 86, 50, 10
+ LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "&Guardar esta contrase?a (inseguro)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Aceptar", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
 STRINGTABLE DISCARDABLE
 {
   IDS_LANCONNECTION "Conexi?n LAN"



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: John Voltz : gdi32: Fix typo in enhanced metafile Arc function.
Message-ID: <E1OJqcC-00045G-Fl@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c9f729c2f7b4017eb136da2bfd285fa1cacae4f7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c9f729c2f7b4017eb136da2bfd285fa1cacae4f7

Author: John Voltz <john.voltz at gmail.com>
Date:   Tue Jun  1 09:16:23 2010 -0400

gdi32: Fix typo in enhanced metafile Arc function.

---

 dlls/gdi32/enhmfdrv/graphics.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c
index 9c9cf6b..e066d0d 100644
--- a/dlls/gdi32/enhmfdrv/graphics.c
+++ b/dlls/gdi32/enhmfdrv/graphics.c
@@ -114,7 +114,7 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
     emr.ptlStart.x    = xstart;
     emr.ptlStart.y    = ystart;
     emr.ptlEnd.x      = xend;
-    emr.ptlEnd.x      = yend;
+    emr.ptlEnd.y      = yend;
 
 
     /* Now calculate the BBox */



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Alexandre Julliard : winex11: Ignore fontconfig and Xft configuration
	if the app explicitly requested antialiasing .
Message-ID: <E1OJqcC-00045X-I3@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 46e231cc85c2940ef98e1f99920775505ffa9525
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=46e231cc85c2940ef98e1f99920775505ffa9525

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  2 10:55:19 2010 +0200

winex11: Ignore fontconfig and Xft configuration if the app explicitly requested antialiasing.

---

 dlls/winex11.drv/xrender.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index cca3321..810b163 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -886,7 +886,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz)
         {
             case ANTIALIASED_QUALITY:
                 entry->aa_default = get_antialias_type( physDev, FALSE, hinter );
-                break;
+                return ret;  /* ignore further configuration */
             case CLEARTYPE_QUALITY:
             case CLEARTYPE_NATURAL_QUALITY:
                 entry->aa_default = get_antialias_type( physDev, subpixel, hinter );



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Henri Verbeet : wined3d: Sampler states are 1-based.
Message-ID: <E1OJqcC-00045o-M0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: eb3c81fd6913385174202a37f47af052b8185d03
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eb3c81fd6913385174202a37f47af052b8185d03

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Jun  2 11:24:54 2010 +0200

wined3d: Sampler states are 1-based.

0 isn't a valid sampler state, and including it would overflow the
stateblock's contained_sampler_states array in
stateblock_init_contained_states().

---

 dlls/wined3d/stateblock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 1696646..181b357 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -262,7 +262,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts,
     stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1);
     stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1);
     for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff;
-    for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff;
+    for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe;
     states->clipplane = 0xffffffff;
     states->pixelShaderConstantsB = 0xffff;
     states->pixelShaderConstantsI = 0xffff;



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Alexandre Julliard : comctl32: Only support an alpha channel for
	32-bpp DIB-based imagelists.
Message-ID: <E1OJqcC-000465-Q7@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 95c529dee6abc68c12837c7b51fd158978f3d96e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95c529dee6abc68c12837c7b51fd158978f3d96e

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  2 12:21:41 2010 +0200

comctl32: Only support an alpha channel for 32-bpp DIB-based imagelists.

---

 dlls/comctl32/imagelist.c |   21 +++++++++++----------
 dlls/comctl32/toolbar.c   |    4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index a73b423..e4249b9 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -153,8 +153,9 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count,
 
     if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE;
 
-    /* if neither the imagelist nor the source bitmap can have an alpha channel, bail out now */
-    if (himl->uBitsPixel != 32 && bm.bmBitsPixel != 32) return FALSE;
+    /* if either the imagelist or the source bitmap don't have an alpha channel, bail out now */
+    if (!himl->has_alpha) return FALSE;
+    if (bm.bmBitsPixel != 32) return FALSE;
 
     SelectObject( hdc, hbmImage );
     mask_width = (bm.bmWidth + 31) / 32 * 4;
@@ -208,7 +209,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count,
         }
         else
         {
-            if (himl->has_alpha) himl->has_alpha[pos + n] = 1;
+            himl->has_alpha[pos + n] = 1;
 
             if (mask_info && himl->hbmMask)  /* generate the mask from the alpha channel */
             {
@@ -751,7 +752,7 @@ ImageList_Create (INT cx, INT cy, UINT flags,
     else
         himl->hbmMask = 0;
 
-    if (himl->uBitsPixel == 32)
+    if (ilc == ILC_COLOR32)
         himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage );
     else
         himl->has_alpha = NULL;
@@ -1204,7 +1205,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des
         }
     }
 
-    if (himl->uBitsPixel == 32)  /* we already have an alpha channel in this case */
+    if (himl->has_alpha)  /* we already have an alpha channel in this case */
     {
         /* pre-multiply by the alpha channel */
         for (i = 0, ptr = bits; i < cx * cy; i++, ptr++)
@@ -2515,7 +2516,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon)
     if (hdcImage == 0)
 	ERR("invalid hdcImage!\n");
 
-    if (himl->uBitsPixel == 32)
+    if (himl->has_alpha)
     {
         if (!ii.hbmColor)
         {
@@ -2525,13 +2526,13 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon)
             SelectObject( hdcImage, color );
             SelectObject( hdcMask, ii.hbmMask );
             BitBlt( hdcImage, 0, 0, bmp.bmWidth, height, hdcMask, 0, height, SRCCOPY );
-            add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask );
+            ret = add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask );
             DeleteDC( hdcMask );
             DeleteObject( color );
+            if (ret) goto done;
         }
-        else add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, ii.hbmColor, ii.hbmMask );
-
-        goto done;
+        else if (add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight,
+                                 ii.hbmColor, ii.hbmMask )) goto done;
     }
 
     imagelist_point_from_index(himl, nIndex, &pt);
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index d24b3dc..684406b 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -2757,7 +2757,7 @@ TOOLBAR_CheckImageListIconSize(TOOLBAR_INFO *infoPtr)
         cx, cy, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
 
     himlNew = ImageList_Create(infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
-                                ILC_COLORDDB|ILC_MASK, 8, 2);
+                                ILC_COLOR32|ILC_MASK, 8, 2);
     for (i = 0; i < infoPtr->nNumBitmapInfos; i++)
         TOOLBAR_AddBitmapToImageList(infoPtr, himlNew, &infoPtr->bitmaps[i]);
     TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlNew, 0);
@@ -2854,7 +2854,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp
 	TRACE ("creating default image list!\n");
 
         himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
-                                    ILC_COLORDDB | ILC_MASK, info.nButtons, 2);
+                                    ILC_COLOR32 | ILC_MASK, info.nButtons, 2);
 	TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0);
         infoPtr->himlInt = himlDef;
     }



From julliard at winehq.org  Wed Jun  2 11:16:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:24 -0500
Subject: Alexandre Julliard : comctl32: Load comctl32 builtin bitmaps as
	32-bit DIBs .
Message-ID: <E1OJqcC-00046M-Tu@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 48e396ea6cdba2cac3d0c1ea3df44c9f3b879f35
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=48e396ea6cdba2cac3d0c1ea3df44c9f3b879f35

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  2 15:51:39 2010 +0200

comctl32: Load comctl32 builtin bitmaps as 32-bit DIBs.

---

 dlls/comctl32/toolbar.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 684406b..fe782c3 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -2710,6 +2710,9 @@ TOOLBAR_AddBitmapToImageList(TOOLBAR_INFO *infoPtr, HIMAGELIST himlDef, const TB
     /* Add bitmaps to the default image list */
     if (bitmap->hInst == NULL)         /* a handle was passed */
         hbmLoad = CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0);
+    else if (bitmap->hInst == COMCTL32_hModule)
+        hbmLoad = LoadImageW( bitmap->hInst, MAKEINTRESOURCEW(bitmap->nID),
+                              IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION );
     else
         hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);
 



From julliard at winehq.org  Wed Jun  2 11:16:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:25 -0500
Subject: Alexandre Julliard : winex11: Fix the X image masks according to the
	pixmap format in Get/SetDIBits.
Message-ID: <E1OJqcD-00046d-19@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5c5c47269b599f5ec1669793e666013519ceaf1d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5c5c47269b599f5ec1669793e666013519ceaf1d

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  2 15:52:20 2010 +0200

winex11: Fix the X image masks according to the pixmap format in Get/SetDIBits.

---

 dlls/winex11.drv/dib.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c
index cf58e8b..11157f1 100644
--- a/dlls/winex11.drv/dib.c
+++ b/dlls/winex11.drv/dib.c
@@ -71,6 +71,7 @@ typedef struct
     WORD                    depth;
     WORD                    infoBpp;
     WORD                    compression;
+    ColorShifts            *shifts;
     RGBQUAD                *colorMap;
     int                     nColorMap;
     Drawable                drawable;
@@ -3541,6 +3542,12 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
             wine_tsx11_unlock();
             return 0;
         }
+        if (descr->shifts)
+        {
+            bmpImage->red_mask = descr->shifts->physicalRed.max << descr->shifts->physicalRed.shift;
+            bmpImage->green_mask = descr->shifts->physicalGreen.max << descr->shifts->physicalGreen.shift;
+            bmpImage->blue_mask = descr->shifts->physicalBlue.max << descr->shifts->physicalBlue.shift;
+        }
     }
     wine_tsx11_unlock();
 
@@ -3698,6 +3705,12 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
             wine_tsx11_unlock();
             return 0;
         }
+        if (descr->shifts)
+        {
+            bmpImage->red_mask = descr->shifts->physicalRed.max << descr->shifts->physicalRed.shift;
+            bmpImage->green_mask = descr->shifts->physicalGreen.max << descr->shifts->physicalGreen.shift;
+            bmpImage->blue_mask = descr->shifts->physicalBlue.max << descr->shifts->physicalBlue.shift;
+        }
     }
 
 #ifdef HAVE_LIBXXSHM
@@ -3930,6 +3943,7 @@ INT CDECL X11DRV_SetDIBitsToDevice( X11DRV_PDEVICE *physDev, INT xDest, INT yDes
     descr.lines      = top_down ? -lines : lines;
     descr.infoWidth  = width;
     descr.depth      = physDev->depth;
+    descr.shifts     = physDev->color_shifts;
     descr.drawable   = physDev->drawable;
     descr.gc         = physDev->gc;
     descr.xSrc       = xSrc;
@@ -4019,6 +4033,7 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start
   descr.infoWidth  = width;
   descr.lines      = tmpheight >= 0 ? lines : -lines;
   descr.depth      = physBitmap->pixmap_depth;
+  descr.shifts     = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL;
   descr.drawable   = physBitmap->pixmap;
   descr.gc         = get_bitmap_gc(physBitmap->pixmap_depth);
   descr.xSrc       = 0;
@@ -4175,6 +4190,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start
   descr.infoWidth  = width;
   descr.lines      = lines;
   descr.depth      = physBitmap->pixmap_depth;
+  descr.shifts     = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL;
   descr.drawable   = physBitmap->pixmap;
   descr.gc         = get_bitmap_gc(physBitmap->pixmap_depth);
   descr.width      = dib.dsBm.bmWidth;
@@ -4250,6 +4266,7 @@ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB,
   descr.nColorMap   = nColorMap;
   descr.bits        = dibSection.dsBm.bmBits;
   descr.depth       = physBitmap->pixmap_depth;
+  descr.shifts      = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL;
   descr.compression = dibSection.dsBmih.biCompression;
   descr.physBitmap  = physBitmap;
 



From julliard at winehq.org  Wed Jun  2 11:16:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:25 -0500
Subject: Hwang YunSong : wordpad: Update Korean resource.
Message-ID: <E1OJqcD-00046u-3Q@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 75cb09fdab6be2df4bce196f5416f2ebc41f7669
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=75cb09fdab6be2df4bce196f5416f2ebc41f7669

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Wed Jun  2 16:09:22 2010 +0900

wordpad: Update Korean resource.

---

 programs/wordpad/Ko.rc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc
index 8111083..8a44194 100644
--- a/programs/wordpad/Ko.rc
+++ b/programs/wordpad/Ko.rc
@@ -242,6 +242,9 @@ BEGIN
     STRING_PREVIEW_PAGE,             "??????"
     STRING_PREVIEW_PAGES,            "????????"
     STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "????"
+    STRING_UNITS_PT,                 "pt"
 END
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Wed Jun  2 11:16:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:25 -0500
Subject: Hwang YunSong : msi: Update Korean resource.
Message-ID: <E1OJqcD-00047B-6L@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 761ce56643a1133200493f28467221d47b0f20f8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=761ce56643a1133200493f28467221d47b0f20f8

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Wed Jun  2 16:10:15 2010 +0900

msi: Update Korean resource.

---

 dlls/msi/msi_Ko.rc |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/dlls/msi/msi_Ko.rc b/dlls/msi/msi_Ko.rc
index 17ab488..04efd83 100644
--- a/dlls/msi/msi_Ko.rc
+++ b/dlls/msi/msi_Ko.rc
@@ -1,7 +1,9 @@
 /*
  * Korean resources for MSI
  *
- * Copyright 2005 YunSong Hwang
+ * Copyright 2005 Mike McCormack
+ * Copyright 2010 Detlef Riekenberg
+ * 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
@@ -28,30 +30,30 @@ STRINGTABLE DISCARDABLE
 	5 "%s  ?????? ?????? ????????"
 	9 "?????? %s ????"
 	10 "Windows Installer %s\n\n" \
-	"Usage:\n" \
-	"msiexec command {required parameter} [optional parammeter]\n\n" \
-	"Install a product:\n" \
+	"??????:\n" \
+	"msiexec ???? {???? ????????}  [?????? ????????]\n\n" \
+	"???? ????:\n" \
 	"\t/i {package|productcode} [property]\n" \
 	"\t/package {package|productcode} [property]\n" \
 	"\t/a package [property]\n" \
-	"Repair an installation:\n" \
+	"???? ????:\n" \
 	"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \
-	"Uninstall a product:\n" \
+	"???? ????:\n" \
 	"\t/uninstall {package|productcode} [property]\n" \
 	"\t/x {package|productcode} [property]\n" \
-	"Advertise a product:\n" \
+	"???? ??????:\n" \
 	"\t/j[u|m] package [/t transform] [/g languageid]\n" \
-	"Apply a patch:\n" \
+	"???? ????:\n" \
 	"\t/p patchpackage [property]\n" \
 	"\t/p patchpackage /a package [property]\n" \
-	"Log and UI Modifiers for above commands:\n" \
+	"???? ???????? ???? Log ?? UI ?????? :\n" \
 	"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \
 	"\t/q{|n|b|r|f|n+|b+|b-}\n" \
-	"Register MSI Service:\n" \
+	"MSI ??????  ????:\n" \
 	"\t/y\n" \
-	"Unregister MSI Service:\n" \
+	"MSI ?????? ???? ????:\n" \
 	"\t/z\n" \
-	"Display this help:\n" \
+	"??????  ????:\n" \
 	"\t/help\n" \
 	"\t/?\n"
 	11 "%s?? ???????? ?????? ??????????"



From julliard at winehq.org  Wed Jun  2 11:16:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 11:16:25 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: wineps.drv: Make the Apply
	button useable.
Message-ID: <E1OJqcD-00047S-9B@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9aa9a1229f2195a8b3ac575645a10242ae6e9bc8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9aa9a1229f2195a8b3ac575645a10242ae6e9bc8

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Wed Jun  2 17:12:22 2010 +0200

wineps.drv: Make the Apply button useable.

---

 dlls/wineps.drv/driver.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index 25cf0eb..b5d1e90 100644
--- a/dlls/wineps.drv/driver.c
+++ b/dlls/wineps.drv/driver.c
@@ -236,26 +236,27 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg,
             if(i >= Cursel) break;
             i++;
         }
-	TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel,
-	      ps->WinPage);
-	di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage;
+        TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, ps->WinPage);
+        di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage;
+        SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0);
       }
       break;
     case IDD_ORIENT_PORTRAIT:
     case IDD_ORIENT_LANDSCAPE:
       TRACE("Setting orientation to %s\n", wParam == IDD_ORIENT_PORTRAIT ?
-	    "portrait" : "landscape");
+            "portrait" : "landscape");
       di->dlgdm->dmPublic.u1.s1.dmOrientation = wParam == IDD_ORIENT_PORTRAIT ?
-	DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE;
+        DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE;
+      SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0);
       break;
     case IDD_DUPLEX:
       if(HIWORD(wParam) == CBN_SELCHANGE) {
 	Cursel = SendDlgItemMessageA(hwnd, LOWORD(wParam), CB_GETCURSEL, 0, 0);
 	for(i = 0, duplex = di->pi->ppd->Duplexes; i < Cursel; i++, duplex = duplex->next)
 	  ;
-	TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel,
-	      duplex->WinDuplex);
-	di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex;
+        TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel, duplex->WinDuplex);
+        di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex;
+        SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0);
       }
       break;
     }



From julliard at winehq.org  Wed Jun  2 13:49:48 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 02 Jun 2010 13:49:48 -0500
Subject: Austin English : wine-dev: Fix broken link.
Message-ID: <E1OJt0e-00029h-JV@wine.codeweavers.com>

Module: docs
Branch: master
Commit: 6b5de87a1bc1558193b92aef3c950d4d727d2401
URL:    http://source.winehq.org/git/docs.git/?a=commit;h=6b5de87a1bc1558193b92aef3c950d4d727d2401

Author: Austin English <austinenglish at gmail.com>
Date:   Tue Jun  1 17:54:06 2010 -0500

wine-dev: Fix broken link.

---

 en/winedev-debugger.sgml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml
index 6aa9503..e4810d3 100644
--- a/en/winedev-debugger.sgml
+++ b/en/winedev-debugger.sgml
@@ -479,7 +479,7 @@ winedbg hl.exe -windowed
         <para>
           Disassembling win32 programs is possible using
           eg. <application>GoVest</> by Ansgar Trimborn.  It can be found
-          <ulink url="http://www.geocities.com/GoVest/">here</>.
+          <ulink url="http://www.oocities.com/govest/">here</>.
         </para>
         <para>
           You can also use the newer and better
@@ -834,7 +834,7 @@ winedbg myprog.exe
             <term>
               <application>GoVest</application>:
               <filename>govest.zip</filename> is available from
-              <ulink url="http://www.geocities.com/GoVest/">http://www.geocities.com/GoVest/</>.
+              <ulink url="http://www.oocities.com/govest/">http://www.oocities.com/govest/</>.
             </term>
             <listitem>
               <para>



From asornes at winehq.org  Thu Jun  3 08:29:59 2010
From: asornes at winehq.org (=?UTF-8?Q?Alexander_Nicolaysen_S=C3=B8rnes?=)
Date: Thu, 03 Jun 2010 08:29:59 -0500
Subject: Alexandru Balut : Fix character encoding for bugzilla query results
Message-ID: <E1OKAUh-0006OT-0r@wine.codeweavers.com>

Module: appdb
Branch: master
Commit: 7a70a03b567daf44d7b16fa953d4659f7fc57a25
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=7a70a03b567daf44d7b16fa953d4659f7fc57a25

Author: Alexandru Balut <alexandru.balut at gmail.com>
Date:   Thu Jun  3 15:24:02 2010 +0200

Fix character encoding for bugzilla query results

---

 include/query.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/query.php b/include/query.php
index 9527fb8..7b02e79 100644
--- a/include/query.php
+++ b/include/query.php
@@ -130,6 +130,12 @@ function query_bugzilladb($sQuery,$sComment="")
         $hBugzillaLink = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS, true);
         if(!$hBugzillaLink) return;
         mysql_select_db(BUGZILLA_DB, $hBugzillaLink);
+        // Tell MySQL to return UTF8-encoded results
+        $sQueryAskingForUtf8Results = "SET SESSION CHARACTER_SET_RESULTS = 'utf8'";
+        if (!mysql_query($sQueryAskingForUtf8Results, $hBugzillaLink))
+        {
+            query_error($sQueryAskingForUtf8Results, "", $hBugzillaLink);
+        }
     }
     
     $hResult = mysql_query($sQuery, $hBugzillaLink);



From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: Juan Lang : comdlg32: No and escape are equivalent.
Message-ID: <E1OLdqD-0007zy-CM@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6f42f596e1f3ab185fb5639fb9d843a866db9f84
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6f42f596e1f3ab185fb5639fb9d843a866db9f84

Author: Juan Lang <juan.lang at gmail.com>
Date:   Wed Jun  2 10:10:07 2010 -0700

comdlg32: No and escape are equivalent.

---

 dlls/comdlg32/filedlg.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 64cb393..ae357f6 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -2303,7 +2303,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
 	  LoadStringW(COMDLG32_hInstance, IDS_OVERWRITEFILE, lpstrOverwrite, 100);
 	  answer = MessageBoxW(hwnd, lpstrOverwrite, fodInfos->title,
 			       MB_YESNO | MB_ICONEXCLAMATION);
-	  if (answer == IDNO)
+	  if (answer == IDNO || answer == IDCANCEL)
 	  {
 	    ret = FALSE;
 	    goto ret;
@@ -2321,7 +2321,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
           LoadStringW(COMDLG32_hInstance, IDS_CREATEFILE, lpstrCreate, 100);
           answer = MessageBoxW(hwnd, lpstrCreate, fodInfos->title,
                                MB_YESNO | MB_ICONEXCLAMATION);
-          if (answer == IDNO)
+          if (answer == IDNO || answer == IDCANCEL)
           {
             ret = FALSE;
             goto ret;



From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: Sven Baars : cmd: Make some help messages more informative.
Message-ID: <E1OLdqD-00080E-FU@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6a88399094d7739cf4baebf71e8b2652b0aad2ac
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6a88399094d7739cf4baebf71e8b2652b0aad2ac

Author: Sven Baars <sven.wine at gmail.com>
Date:   Wed Jun  2 22:14:39 2010 +0200

cmd: Make some help messages more informative.

---

 programs/cmd/En.rc |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc
index 0c31dfb..97f4640 100644
--- a/programs/cmd/En.rc
+++ b/programs/cmd/En.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-  WCMD_ATTRIB, "Help about ATTRIB\n"
+  WCMD_ATTRIB, "ATTRIB shows or changes DOS file attributes.\n"
   WCMD_CALL,
 "CALL <batchfilename> is used within a batch file to execute commands\n\
 from another batch file. When the batch file exits, control returns to\n\
@@ -35,16 +35,17 @@ called procedure.\n\
 Changes to default directory, environment variables etc made within a\n\
 called procedure are inherited by the caller.\n"
 
-  WCMD_CD,     "Help about CD\n"
-  WCMD_CHDIR,  "Help about CHDIR\n"
+  WCMD_CD,     "CD <dir> is the short version of CHDIR. It changes the current\n\
+default directory.\n"
+  WCMD_CHDIR,  "CHDIR <dir> changes the current default directory.\n"
 
-  WCMD_CLS,    "CLS clears the console screen\n"
+  WCMD_CLS,    "CLS clears the console screen.\n"
 
-  WCMD_COPY,   "Help about COPY\n"
-  WCMD_CTTY,   "Help about CTTY\n"
-  WCMD_DATE,   "Help about DATE\n"
-  WCMD_DEL,    "Help about DEL\n"
-  WCMD_DIR,    "Help about DIR\n"
+  WCMD_COPY,   "COPY <filename> copies a file.\n"
+  WCMD_CTTY,   "CTTY changes the input/output device.\n"
+  WCMD_DATE,   "DATE shows or changes the system date.\n"
+  WCMD_DEL,    "DEL <filename> deletes a file or set of files.\n"
+  WCMD_DIR,    "DIR lists the contents of a directory.\n"
 
   WCMD_ECHO,
 "ECHO <string> displays <string> on the current terminal device.\n\
@@ -56,7 +57,7 @@ ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n\
 default). The ECHO OFF command can be prevented from displaying by\n\
 preceding it with an @ sign.\n"
 
-  WCMD_ERASE,  "Help about ERASE\n"
+  WCMD_ERASE,  "ERASE <filename> deletes a file or set of files.\n"
 
   WCMD_FOR,
 "The FOR command is used to execute a command for each of a set of files.\n\
@@ -78,7 +79,8 @@ label terminates the batch file execution.\n\
 \n\
 GOTO has no effect when used interactively.\n"
 
-  WCMD_HELP,   "Help about HELP\n"
+  WCMD_HELP,   "HELP <command> shows brief help details on a topic.\n\
+HELP without an argument shows all CMD built-in commands.\n"
 
   WCMD_IF,
 "IF is used to conditionally execute a command.\n\
@@ -96,8 +98,9 @@ Syntax: LABEL [drive:]\n\
 The command will prompt you for the new volume label for the given drive.\n\
 You can display the disk volume label with the VOL command.\n"
 
-  WCMD_MD,     "Help about MD\n"
-  WCMD_MKDIR,  "Help about MKDIR\n"
+  WCMD_MD,
+"MD <name> is the short version of MKDIR. It creates a subdirectory.\n"
+  WCMD_MKDIR,  "MKDIR <name> creates a subdirectory.\n"
   WCMD_MOVE,
 "MOVE relocates a file or directory to a new point within the file system.\n\
 \n\
@@ -148,10 +151,12 @@ so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'\n"
 "A command line beginning REM (followed by a space) performs no\n\
 action, and can therefore be used as a comment in a batch file.\n"
 
-  WCMD_REN,    "Help about REN\n"
-  WCMD_RENAME, "Help about RENAME\n"
-  WCMD_RD,     "Help about RD\n"
-  WCMD_RMDIR,  "Help about RMDIR\n"
+  WCMD_REN,
+"REN <filename> is the short version of RENAME. It renames a file.\n"
+  WCMD_RENAME, "RENAME <filename> renames a file\n"
+  WCMD_RD,
+"RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n"
+  WCMD_RMDIR,  "RMDIR <dir> deletes a subdirectory.\n"
 
   WCMD_SET,
 "SET displays or changes the cmd environment variables.\n\
@@ -176,7 +181,7 @@ not possible to affect the operating system environment from within cmd.\n"
 the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n\
 if called from the command line.\n"
 
-  WCMD_TIME,   "Help about TIME\n"
+  WCMD_TIME,   "TIME sets or shows the current system time.\n"
 
   WCMD_TITLE,  "Sets the window title for the cmd window, syntax TITLE [string]\n"
 
@@ -187,16 +192,16 @@ if redirected). No check is made that the file is readable text.\n"
   WCMD_VERIFY,
 "VERIFY is used to set, clear or test the verify flag. Valid forms are:\n\
 \n\
-VERIFY ON	Set the flag\n\
-VERIFY OFF	Clear the flag\n\
-VERIFY		Displays ON or OFF as appropriate.\n\
+VERIFY ON\tSet the flag\n\
+VERIFY OFF\tClear the flag\n\
+VERIFY\t\tDisplays ON or OFF as appropriate.\n\
 \n\
 The verify flag has no function in Wine.\n"
 
   WCMD_VER,
 "VER displays the version of cmd you are running\n"
 
-  WCMD_VOL,    "Help about VOL\n"
+  WCMD_VOL,    "VOL shows the volume label of a disk device.\n"
 
   WCMD_PUSHD,  "PUSHD <directoryname> saves the current directory onto a\n\
 stack, and then changes the current directory to the supplied one.\n"



From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: Sven Baars : cmd: Update Dutch translation.
Message-ID: <E1OLdqD-00080U-HL@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ed168704692f95af5b723da70e7b9ac79069826b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ed168704692f95af5b723da70e7b9ac79069826b

Author: Sven Baars <sven.wine at gmail.com>
Date:   Fri Jun  4 16:18:30 2010 +0200

cmd: Update Dutch translation.

---

 programs/cmd/Nl.rc |  194 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 106 insertions(+), 88 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed168704692f95af5b723da70e7b9ac79069826b


From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: msacm32: Remove dead
	"code" from rc files.
Message-ID: <E1OLdqD-00080l-K6@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ffc774c026ab93c04fda7bf10c2e01c064deccbe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ffc774c026ab93c04fda7bf10c2e01c064deccbe

Author: Fr?d?ric Delanoy <frederic.delanoy at gmail.com>
Date:   Thu Jun  3 00:12:07 2010 +0200

msacm32: Remove dead "code" from rc files.

---

 dlls/msacm32/msacm_Cs.rc |    7 +------
 dlls/msacm32/msacm_Da.rc |    7 +------
 dlls/msacm32/msacm_De.rc |    7 +------
 dlls/msacm32/msacm_En.rc |    7 +------
 dlls/msacm32/msacm_Es.rc |    7 +------
 dlls/msacm32/msacm_Fr.rc |    8 ++------
 dlls/msacm32/msacm_Hu.rc |    7 +------
 dlls/msacm32/msacm_It.rc |    7 +------
 dlls/msacm32/msacm_Ja.rc |    7 +------
 dlls/msacm32/msacm_Ko.rc |    7 +------
 dlls/msacm32/msacm_Lt.rc |    7 +------
 dlls/msacm32/msacm_Nl.rc |    7 +------
 dlls/msacm32/msacm_No.rc |    7 +------
 dlls/msacm32/msacm_Pl.rc |    7 +------
 dlls/msacm32/msacm_Pt.rc |   14 ++------------
 dlls/msacm32/msacm_Ru.rc |    7 +------
 dlls/msacm32/msacm_Si.rc |    7 +------
 dlls/msacm32/msacm_Sv.rc |    7 +------
 dlls/msacm32/msacm_Tr.rc |    7 +------
 dlls/msacm32/msacm_Uk.rc |    7 +------
 dlls/msacm32/msacm_Zh.rc |   14 ++------------
 21 files changed, 24 insertions(+), 138 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffc774c026ab93c04fda7bf10c2e01c064deccbe


From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: Henri Verbeet : wined3d: Release the context on an error path in
	buffer_PreLoad().
Message-ID: <E1OLdqD-000811-Lh@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 64e2525ba0e7b7cc38c4f48c7787498ae38d18e0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=64e2525ba0e7b7cc38c4f48c7787498ae38d18e0

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Jun  3 11:25:53 2010 +0200

wined3d: Release the context on an error path in buffer_PreLoad().

---

 dlls/wined3d/buffer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index daece20..7c898cd 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1000,7 +1000,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface)
         if(!buffer_add_dirty_area(This, 0, 0))
         {
             ERR("buffer_add_dirty_area failed, this is not expected\n");
-            return;
+            goto end;
         }
         /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application
          * cleared for unsynchronized updates



From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: Paul Vriens : kernel32: Add the Danish translation.
Message-ID: <E1OLdqD-00081H-P3@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 30d535cf74d656a4a94cd9a7b815cc35eb93694b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=30d535cf74d656a4a94cd9a7b815cc35eb93694b

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 15:01:34 2010 +0200

kernel32: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 .gitignore                      |    1 +
 dlls/kernel32/Makefile.in       |    1 +
 dlls/kernel32/nls/winerr_dan.mc | 3737 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 3739 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=30d535cf74d656a4a94cd9a7b815cc35eb93694b


From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: Paul Vriens : appwiz.cpl: Add the Danish translation.
Message-ID: <E1OLdqD-00081X-Qt@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f65b4332ef22f2e69cad45d833c53e0302c1289e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f65b4332ef22f2e69cad45d833c53e0302c1289e

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 15:17:01 2010 +0200

appwiz.cpl: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/appwiz.cpl/Da.rc       |   88 +++++++++++++++++++++++++++++++++++++++++++
 dlls/appwiz.cpl/Makefile.in |    1 +
 2 files changed, 89 insertions(+), 0 deletions(-)

diff --git a/dlls/appwiz.cpl/Da.rc b/dlls/appwiz.cpl/Da.rc
new file mode 100644
index 0000000..76d0009
--- /dev/null
+++ b/dlls/appwiz.cpl/Da.rc
@@ -0,0 +1,88 @@
+/*
+ * Add/Remove Programs Danish resources
+ *
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ *
+ * 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"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+   IDS_CPL_TITLE,        "Tilf?j/Fjern Programmer"
+   IDS_CPL_DESC,         "Giver dig mulighed for at installere ny software, eller fjerne eksisterende software fra din computer."
+   IDS_TAB1_TITLE,       "Applikationer"
+
+   IDS_UNINSTALL_FAILED, "Er ikke i stand til at starte afinstallationen, '%s'. ?nsker du at fjerne fjernes posten, for dette program fra registreringsdatabasen?"
+   IDS_NOT_SPECIFIED,    "Ikke specificeret"
+
+   IDS_COLUMN_NAME,      "Navn"
+   IDS_COLUMN_PUBLISHER, "Udgiver"
+   IDS_COLUMN_VERSION,   "Version"
+   IDS_INSTALL_FILTER,   "Installations Programmer\\0*instal*.exe;*setup*.exe;*.msi\\0Programmer (*.exe)\\0*.exe\\0Alle Filer (*.*)\\0*.*\\0\\0"
+
+   IDS_REMOVE,           "&Fjern..."
+   IDS_MODIFY_REMOVE,    "&Rediger/Fjern..."
+}
+
+IDD_MAIN DIALOG 0, 0, 320, 220
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Installer/Fjern"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "For at installere et nyt program fra en diskette, cd-rom-drev, eller din harddisk, skal du klikke p? Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20
+ CONTROL "&Installer?", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14
+ CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1
+ CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20
+ CONTROL "F?lgende software kan blive fjernet automatisk. Hvis du vil fjerne et program eller ?ndre dets installerede komponenter, skal du v?lge det fra listen, og klik p? Rediger / Fjern.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30
+ CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100
+ CONTROL "&Support Information", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14
+ CONTROL "&Rediger...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14
+ CONTROL "&Fjern...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14
+ CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20
+}
+
+IDD_INFO DIALOG 0, 0, 256, 138
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Support Information"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14
+ CONTROL "F?lgende oplysninger kan bruges til at f? teknisk support for% s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19
+ CONTROL "Udgiver:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8
+ CONTROL "Version:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8
+ CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8
+ CONTROL "Support Information:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8
+ CONTROL "Support Telefon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8
+ CONTROL "L?s mig:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8
+ CONTROL "Produkt Opdateringer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8
+ CONTROL "Kommentarer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8
+ CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8
+ CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8
+ CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8
+ CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8
+ CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8
+ CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8
+ CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8
+ CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8
+}
diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in
index 92d6e71..7f57ee8 100644
--- a/dlls/appwiz.cpl/Makefile.in
+++ b/dlls/appwiz.cpl/Makefile.in
@@ -9,6 +9,7 @@ C_SRCS = \
 	appwiz.c
 
 RC_SRCS = \
+	Da.rc \
 	De.rc \
 	En.rc \
 	Es.rc \



From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: Paul Vriens : credui: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OLdqD-00081q-T0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1b1997ab834d89078502023ec2a3274e8def12b8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1b1997ab834d89078502023ec2a3274e8def12b8

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 15:29:33 2010 +0200

credui: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/credui/credui_Da.rc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/credui/credui_Da.rc b/dlls/credui/credui_Da.rc
index 26ef991..1bcaec5 100644
--- a/dlls/credui/credui_Da.rc
+++ b/dlls/credui/credui_Da.rc
@@ -2,6 +2,7 @@
  * Danish language resource file for Credentials UI
  *
  * Copyright 2008 Jens Albretsen
+ *           2010 Thomas Larsen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +21,8 @@
 
 #include "credui_resources.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDD_CREDDIALOG DIALOG DISCARDABLE  0, 0, 213, 149
@@ -46,7 +49,7 @@ STRINGTABLE DISCARDABLE
     IDS_TITLEFORMAT     "Tilslut til %s"
     IDS_MESSAGEFORMAT   "Tilslutter til %s"
     IDS_INCORRECTPASSWORDTITLE  "Tilslutning fejlede"
-    IDS_INCORRECTPASSWORD       "V?r sikker p? at dit brugernavn\nog kodeord er korrekt."
-    IDS_CAPSLOCKONTITLE "Caps Lock er p?"
-    IDS_CAPSLOCKON      "Caps Lock kan v?re skyld i at taster dit kodeord forkert.\n\nTryk p? Caps Lock tasten for at sl? det fra\nf?r du indtaster dit kodeord."
+    IDS_INCORRECTPASSWORD       "V??r sikker p?? at dit brugernavn\nog kodeord er korrekt."
+    IDS_CAPSLOCKONTITLE "Caps Lock er p??"
+    IDS_CAPSLOCKON      "Du har sat Caps Lock til, dette kan v??re ??rsagen til at du indtaster kodeordet forkert.\n\nTryk p?? Caps Lock tasten for at sl?? det fra f??r du indtaster dit kodeord."
 }



From julliard at winehq.org  Mon Jun  7 10:02:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:17 -0500
Subject: Paul Vriens : mapi32: Add the Danish translation.
Message-ID: <E1OLdqD-000828-VC@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e3a30e38fc10475570a2c884b954fa9cb89282c7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e3a30e38fc10475570a2c884b954fa9cb89282c7

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 16:10:52 2010 +0200

mapi32: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/mapi32/Da.rc       |   31 +++++++++++++++++++++++++++++++
 dlls/mapi32/Makefile.in |    1 +
 2 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/dlls/mapi32/Da.rc b/dlls/mapi32/Da.rc
new file mode 100644
index 0000000..e22f303
--- /dev/null
+++ b/dlls/mapi32/Da.rc
@@ -0,0 +1,31 @@
+/*
+ * MAPI32 Danish resources
+ *
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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"
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+   IDS_NO_MAPI_CLIENT, "Mail afsendelsen mislykkede, da du ikke har en MAPI mail-klient installeret."
+   IDS_SEND_MAIL,      "Send Mail"
+}
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 9c0fb71..5c3a2a0 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -14,6 +14,7 @@ C_SRCS = \
 	util.c
 
 RC_SRCS = \
+	Da.rc \
 	De.rc \
 	En.rc \
 	Es.rc \



From julliard at winehq.org  Mon Jun  7 10:02:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:18 -0500
Subject: Paul Vriens : write: Add the Danish translation.
Message-ID: <E1OLdqE-00082X-AB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: de4cf25349f9dc214e23bb9d58bf15a4a7e7d4de
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=de4cf25349f9dc214e23bb9d58bf15a4a7e7d4de

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 16:11:31 2010 +0200

write: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/write/Da.rc       |   29 +++++++++++++++++++++++++++++
 programs/write/Makefile.in |    1 +
 2 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/programs/write/Da.rc b/programs/write/Da.rc
new file mode 100644
index 0000000..98b628f
--- /dev/null
+++ b/programs/write/Da.rc
@@ -0,0 +1,29 @@
+/*
+ * Danish language support
+ *
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "resources.h"
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    IDS_FAILED, "Kunne ikke starte Wordpad"
+}
diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in
index e0ffa98..b89f338 100644
--- a/programs/write/Makefile.in
+++ b/programs/write/Makefile.in
@@ -10,6 +10,7 @@ IMPORTS   = user32 gdi32 kernel32
 C_SRCS = write.c
 
 RC_SRCS = \
+	Da.rc \
 	De.rc \
 	En.rc \
 	Fr.rc \



From julliard at winehq.org  Mon Jun  7 10:02:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:18 -0500
Subject: Paul Vriens : jscript: Add the Danish translation.
Message-ID: <E1OLdqE-00082o-F3@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3f03f4636dddd7df04d70e1faca4f45ffe120aea
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3f03f4636dddd7df04d70e1faca4f45ffe120aea

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 21:12:22 2010 +0200

jscript: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/jscript/Makefile.in   |    1 +
 dlls/jscript/jscript_Da.rc |   50 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index 0a20c41..c1053b3 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -6,6 +6,7 @@ MODULE    = jscript.dll
 IMPORTS   = oleaut32 ole32 user32 advapi32 kernel32
 
 RC_SRCS = \
+	jscript_Da.rc \
 	jscript_De.rc \
 	jscript_En.rc \
 	jscript_Fr.rc \
diff --git a/dlls/jscript/jscript_Da.rc b/dlls/jscript/jscript_Da.rc
new file mode 100644
index 0000000..07e2292
--- /dev/null
+++ b/dlls/jscript/jscript_Da.rc
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "resource.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TO_PRIMITIVE        "Fejl ved konvertering af objekt til primitiv type"
+    IDS_INVALID_CALL_ARG    "Ugyldig procedure kald eller argument"
+    IDS_CREATE_OBJ_ERROR    "Automations-serveren kan ikke oprette objektet"
+    IDS_NO_PROPERTY         "Objektet underst?tter ikke denne egenskab eller metode"
+    IDS_ARG_NOT_OPT         "Argument ikke valgfrit"
+    IDS_SYNTAX_ERROR        "Syntaksfejl"
+    IDS_SEMICOLON           "Forventet ';'"
+    IDS_LBRACKET            "Forventet '('"
+    IDS_RBRACKET            "Forventet ')'"
+    IDS_UNTERMINATED_STR    "Uafsluttet streng konstant"
+    IDS_NOT_FUNC            "Funktion forventet"
+    IDS_NOT_DATE            "[objekt]' er ikke en dato objekt"
+    IDS_NOT_NUM             "Nummer forventet"
+    IDS_OBJECT_EXPECTED     "objekt forventet"
+    IDS_ILLEGAL_ASSIGN      "Ulovlig tildeling"
+    IDS_UNDEFINED           "'|' er ikke defineret"
+    IDS_NOT_BOOL            "Boolean objekt forventet"
+    IDS_JSCRIPT_EXPECTED    "JScript objekt forventet"
+    IDS_REGEXP_SYNTAX_ERROR "Syntax fejl i regul?rt udtryk"
+    IDS_URI_INVALID_CHAR    "URI, der skal kodes indeholder ugyldige tegn"
+    IDS_INVALID_LENGTH      "Array l?ngde skal v?re et endeligt positivt heltal"
+    IDS_ARRAY_EXPECTED      "Array objekt forventet"
+}



From julliard at winehq.org  Mon Jun  7 10:02:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:18 -0500
Subject: Paul Vriens : start: Add the Danish translation.
Message-ID: <E1OLdqE-000834-Ge@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c78793b966841711952ec94ca330ff4a4b085fa0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c78793b966841711952ec94ca330ff4a4b085fa0

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 21:57:19 2010 +0200

start: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 programs/start/Da.rc       |   72 ++++++++++++++++++++++++++++++++++++++++++++
 programs/start/Makefile.in |    1 +
 2 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/programs/start/Da.rc b/programs/start/Da.rc
new file mode 100644
index 0000000..912111c
--- /dev/null
+++ b/programs/start/Da.rc
@@ -0,0 +1,72 @@
+/*
+ * Start
+ * Danish Language Support
+ *
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "resources.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+STRING_USAGE,                                   "Start et program, eller ?bn et dokument i programmet, der normalt anvendes til filer med den endelse.\n\
+Vejledning:\n\
+start [Mulighed] program_filnavn [...]\n\
+start [Mulighed] dokument_filnavn\n\
+\n\
+Mulighed:\n\
+/M[inimized] Start programmet minimeret.\n\
+/MAX[imized] Start programmet maksimeret.\n\
+/R[estored]  Start programmet normalt (hverken minimeret eller maksimeret).\n\
+/W[ait]      Vent p? startede program afslutter, afslut derefter med dets afslutnings kode.\n\
+/Unix        Brug en Unix filnavn og starte filen som Windows Stifinder.\n\
+/ProgIDOpen  ?bn et dokument ved hj?lp af f?lgende progID.\n\
+/L           Vis slutbrugerlicensaftalen.\n\
+\n\
+start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\
+Start leveres med ABSOLUT INGEN GARANTI, for detaljer k?r med mulighed /L.\n\
+Det er gratis software, og du er velkommen til at redistribuere det\n\
+under visse betingelser; k?r 'start /L' for yderligere oplysninger.\n\
+"
+
+STRING_LICENSE, "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\
+This program is free software; you can redistribute it and/or\n\
+modify it under the terms of the GNU Lesser Public License\n\
+as published by the Free Software Foundation; either version 2.1\n\
+of the License, or (at your option) any later version.\n\
+\n\
+This program is distributed in the hope that it will be useful,\n\
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
+GNU Lesser Public License for more details.\n\
+\n\
+You should have received a copy of the GNU Lesser Public License\n\
+along with this program; if not, write to the Free Software\n\
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\
+\n\
+Se COPYING.LIB filen for licens information.\n\
+"
+
+STRING_EXECFAIL, "Applikationen kunne ikke starte, eller der ingen applikationer associeret med den specifikke fil.\nShellExecuteEx fejlet"
+
+STRING_UNIXFAIL, "Kunne ikke overs?tte det angivne Unix filnavn til et DOS filnavn."
+}
diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in
index 7fe99cc..d8848a1 100644
--- a/programs/start/Makefile.in
+++ b/programs/start/Makefile.in
@@ -11,6 +11,7 @@ C_SRCS = start.c
 
 RC_SRCS = \
 	Cs.rc \
+	Da.rc \
 	De.rc \
 	En.rc \
 	Es.rc \



From julliard at winehq.org  Mon Jun  7 10:02:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:18 -0500
Subject: Paul Vriens : devenum: Add the Danish translation.
Message-ID: <E1OLdqE-00083M-J2@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7b82143c9754f2fa897621dd55be6ec7b1fecec2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7b82143c9754f2fa897621dd55be6ec7b1fecec2

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 22:20:02 2010 +0200

devenum: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/devenum/Da.rc       |   32 ++++++++++++++++++++++++++++++++
 dlls/devenum/Makefile.in |    1 +
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/dlls/devenum/Da.rc b/dlls/devenum/Da.rc
new file mode 100644
index 0000000..2ad7fa0
--- /dev/null
+++ b/dlls/devenum/Da.rc
@@ -0,0 +1,32 @@
+/*
+ * Resources for Device Enumerator
+ *
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "devenum_private.h"
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_DEVENUM_DSDEFAULT  "Standard DirectSound"
+    IDS_DEVENUM_DS         "DirectSound: %s"
+    IDS_DEVENUM_WODEFAULT  "Standard WaveOut Enhed"
+    IDS_DEVENUM_MIDEFAULT  "Standard MidiOut Enhed"
+}
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index 8d1bc61..df3c136 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -14,6 +14,7 @@ C_SRCS = \
 
 RC_SRCS = \
 	Cs.rc \
+	Da.rc \
 	De.rc \
 	En.rc \
 	Es.rc \



From julliard at winehq.org  Mon Jun  7 10:02:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:18 -0500
Subject: Paul Vriens : cryptdlg: Add the Danish translation.
Message-ID: <E1OLdqE-00083o-Vl@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6608613b868cbb6257313724c32a07056ed651ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6608613b868cbb6257313724c32a07056ed651ef

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Thu Jun  3 23:27:23 2010 +0200

cryptdlg: Add the Danish translation.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/cryptdlg/Makefile.in    |    1 +
 dlls/cryptdlg/cryptdlg_Da.rc |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in
index 177d81a..e4692e2 100644
--- a/dlls/cryptdlg/Makefile.in
+++ b/dlls/cryptdlg/Makefile.in
@@ -9,6 +9,7 @@ C_SRCS = \
 	main.c
 
 RC_SRCS = \
+	cryptdlg_Da.rc \
 	cryptdlg_De.rc \
 	cryptdlg_En.rc \
 	cryptdlg_Fr.rc \
diff --git a/dlls/cryptdlg/cryptdlg_Da.rc b/dlls/cryptdlg/cryptdlg_Da.rc
new file mode 100644
index 0000000..4d6acf0
--- /dev/null
+++ b/dlls/cryptdlg/cryptdlg_Da.rc
@@ -0,0 +1,39 @@
+/*
+ * cryptdlg dll resources
+ *
+ * Copyright 2010 Thomas Larsen
+ *                Paul Vriens
+ *
+ * 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 "cryptres.h"
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CERT_POLICY           "Certifikat Politik"
+    IDS_POLICY_ID             "Politik Identifikation:"
+    IDS_POLICY_QUALIFIER_INFO "Politik Kvalifikations Info"
+    IDS_POLICY_QUALIFIER_ID   "Politik Kvalifikations Id="
+    IDS_CPS                   "CPS" /* Certification Practice Statement */
+    IDS_USER_NOTICE           "Bruger Meddelelse"
+    IDS_QUALIFIER             "Kvalifikation"
+    IDS_NOTICE_REF            "Meddelelses Reference"
+    IDS_ORGANIZATION          "Organisation="
+    IDS_NOTICE_NUM            "Meddelelses Nummer="
+    IDS_NOTICE_TEXT           "Meddelelses Tekst="
+}



From julliard at winehq.org  Mon Jun  7 10:02:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:19 -0500
Subject: Paul Vriens : winhlp32: Define LANGUAGE only once.
Message-ID: <E1OLdqF-000845-2K@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4896c7c91ac541271e1f015cf82b971b4a89cb93
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4896c7c91ac541271e1f015cf82b971b4a89cb93

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Jun  4 21:06:02 2010 +0200

winhlp32: Define LANGUAGE only once.

---

 programs/winhlp32/Nl.rc |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc
index 4988326..0a4594a 100644
--- a/programs/winhlp32/Nl.rc
+++ b/programs/winhlp32/Nl.rc
@@ -23,9 +23,11 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Bestand" {
   MENUITEM "&Openen", MNID_FILE_OPEN
@@ -70,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Index"
@@ -78,7 +80,7 @@ CAPTION "Index"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Zoeken"
@@ -87,7 +89,7 @@ CAPTION "Zoeken"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Wine Help"
 STID_WHERROR, 		"FOUT"
@@ -105,7 +107,7 @@ STID_NO_RICHEDIT	"Kan geen richedit implementatie vinden... Actie afgebroken"
 STID_PSH_INDEX,		"Help-onderwerpen: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN



From julliard at winehq.org  Mon Jun  7 10:02:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:19 -0500
Subject: Sven Baars : winmm: Fix Dutch translation.
Message-ID: <E1OLdqF-00084N-7R@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7dafe8692f2ae45366a739a1b489277ff948bf65
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7dafe8692f2ae45366a739a1b489277ff948bf65

Author: Sven Baars <sven.wine at gmail.com>
Date:   Fri Jun  4 21:53:42 2010 +0200

winmm: Fix Dutch translation.

---

 dlls/winmm/winmm_Nl.rc |   86 ++++++++++++++++++++++++------------------------
 1 files changed, 43 insertions(+), 43 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dafe8692f2ae45366a739a1b489277ff948bf65


From julliard at winehq.org  Mon Jun  7 10:02:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:19 -0500
Subject: Robert McDonald : include: Add missing typedef keyword to avoid
	multiply-defined symbols.
Message-ID: <E1OLdqF-00084g-Hy@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ef6d668d6312b5f2c8423b5b1e596c44f19a1ff3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ef6d668d6312b5f2c8423b5b1e596c44f19a1ff3

Author: Robert McDonald <rmcdonald at bittorrent.com>
Date:   Wed Jun  2 12:07:50 2010 -0700

include: Add missing typedef keyword to avoid multiply-defined symbols.

---

 include/ws2ipdef.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h
index 9818fbd..11b3689 100644
--- a/include/ws2ipdef.h
+++ b/include/ws2ipdef.h
@@ -133,19 +133,19 @@ typedef struct WS(sockaddr_in6)
  * Multicast group information
  */
 
-struct WS(ip_mreq)
+typedef struct WS(ip_mreq)
 {
     struct WS(in_addr) imr_multiaddr;
     struct WS(in_addr) imr_interface;
 } WS(IP_MREQ), *WS(PIP_MREQ);
 
-struct WS(ip_mreq_source) {
+typedef struct WS(ip_mreq_source) {
     struct WS(in_addr) imr_multiaddr;
     struct WS(in_addr) imr_sourceaddr;
     struct WS(in_addr) imr_interface;
 } WS(IP_MREQ_SOURCE), *WS(PIP_MREQ_SOURCE);
 
-struct WS(ip_msfilter) {
+typedef struct WS(ip_msfilter) {
     struct WS(in_addr) imsf_multiaddr;
     struct WS(in_addr) imsf_interface;
     ULONG              imsf_fmode;



From julliard at winehq.org  Mon Jun  7 10:02:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:19 -0500
Subject: Joel Holdsworth : iexplore: Renamed iexplore resource file.
Message-ID: <E1OLdqF-00084x-M0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: da8831be97a8c4292270607ebe845195ff593a67
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=da8831be97a8c4292270607ebe845195ff593a67

Author: Joel Holdsworth <joel at airwebreathe.org.uk>
Date:   Sat Jun  5 11:08:06 2010 +0100

iexplore: Renamed iexplore resource file.

---

 programs/iexplore/Makefile.in                 |    2 +-
 programs/iexplore/{version.rc => iexplore.rc} |    0 
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in
index 9f2b653..0d12f90 100644
--- a/programs/iexplore/Makefile.in
+++ b/programs/iexplore/Makefile.in
@@ -10,6 +10,6 @@ IMPORTS   = shdocvw user32 gdi32 kernel32
 C_SRCS = \
 	main.c
 
-RC_SRCS = version.rc
+RC_SRCS = iexplore.rc
 
 @MAKE_PROG_RULES@
diff --git a/programs/iexplore/version.rc b/programs/iexplore/iexplore.rc
similarity index 100%
rename from programs/iexplore/version.rc
rename to programs/iexplore/iexplore.rc



From julliard at winehq.org  Mon Jun  7 10:02:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:19 -0500
Subject: Joel Holdsworth : iexplore: Added a Tango compliant icon.
Message-ID: <E1OLdqF-00085D-OM@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8703e9c522fdd26e243e150c40e1a50cebbc7f56
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8703e9c522fdd26e243e150c40e1a50cebbc7f56

Author: Joel Holdsworth <joel at airwebreathe.org.uk>
Date:   Sat Jun  5 11:08:10 2010 +0100

iexplore: Added a Tango compliant icon.

---

 programs/iexplore/iexplore.ico |  Bin 0 -> 25214 bytes
 programs/iexplore/iexplore.rc  |    5 +
 programs/iexplore/iexplore.svg |  265 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 270 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=8703e9c522fdd26e243e150c40e1a50cebbc7f56


From julliard at winehq.org  Mon Jun  7 10:02:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:19 -0500
Subject: Eric Pouech : winhelp: Added support for hotspot in images with
	target window embedded.
Message-ID: <E1OLdqF-00085l-UQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3acf62f5e70ea58fab6b6ae91f5b8f5c36b428cd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3acf62f5e70ea58fab6b6ae91f5b8f5c36b428cd

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Wed Jun  2 22:22:42 2010 +0200

winhelp: Added support for hotspot in images with target window embedded.

---

 programs/winhlp32/hlpfile.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c
index 8c0d325..5146c38 100644
--- a/programs/winhlp32/hlpfile.c
+++ b/programs/winhlp32/hlpfile.c
@@ -815,6 +815,34 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file,
                                   file->lpszPath, -1, HLPFILE_Hash(str),
                                   0, 1, -1);
             break;
+
+        case 0xEE:
+        case 0xEF:
+            {
+                const char* win = strchr(str, '>');
+                int wnd = -1;
+                char* tgt = NULL;
+
+                if (win)
+                {
+                    for (wnd = file->numWindows - 1; wnd >= 0; wnd--)
+                    {
+                        if (!strcmp(win + 1, file->windows[wnd].name)) break;
+                    }
+                    if (wnd == -1)
+                        WINE_WARN("Couldn't find window info for %s\n", win);
+                    if ((tgt = HeapAlloc(GetProcessHeap(), 0, win - str + 1)))
+                    {
+                        memcpy(tgt, str, win - str);
+                        tgt[win - str] = '\0';
+                    }
+                }
+                hslink = (HLPFILE_HOTSPOTLINK*)
+                    HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup,
+                                      file->lpszPath, -1, HLPFILE_Hash(tgt ? tgt : str), 0, 1, wnd);
+                HeapFree(GetProcessHeap(), 0, tgt);
+                break;
+            }
         default:
             WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i + 0]);
         }



From julliard at winehq.org  Mon Jun  7 10:02:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:20 -0500
Subject: Eric Pouech : winhelp: When opening a page,
	don'  t reopen the same page from macro, even if requested.
Message-ID: <E1OLdqG-000861-3S@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 79af1859fa9096e45267492afe3abb7081902f74
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79af1859fa9096e45267492afe3abb7081902f74

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Wed Jun  2 22:22:53 2010 +0200

winhelp: When opening a page, don't reopen the same page from macro, even if requested.

---

 programs/winhlp32/winhelp.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index 2396917..1f92514 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -716,6 +716,14 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
                 SIZE    sz = {0, 0};
                 DWORD   flags = SWP_NOSIZE | SWP_NOMOVE;
 
+                if (win->page == wpage->page && win->info == wpage->wininfo)
+                {
+                    /* see #22979, some hlp files have a macro (run at page opening), which
+                     * jumps to the very same page
+                     * Exit gracefully in that case
+                     */
+                    return TRUE;
+                }
                 WINHELP_DeleteButtons(win);
                 bReUsed = TRUE;
                 SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage));



From julliard at winehq.org  Mon Jun  7 10:02:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:20 -0500
Subject: Eric Pouech : winhelp: Don' t reset window position when reusing the
	current window.
Message-ID: <E1OLdqG-00086I-7D@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0865dc7c8cee2698cb885d2986d55f05a86920dc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0865dc7c8cee2698cb885d2986d55f05a86920dc

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Fri Jun  4 21:27:23 2010 +0200

winhelp: Don't reset window position when reusing the current window.

---

 programs/winhlp32/winhelp.c |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index 1f92514..f4742b0 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -712,10 +712,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
         {
             if (!lstrcmpi(win->info->name, wpage->wininfo->name))
             {
-                POINT   pt = {0, 0};
-                SIZE    sz = {0, 0};
-                DWORD   flags = SWP_NOSIZE | SWP_NOMOVE;
-
                 if (win->page == wpage->page && win->info == wpage->wininfo)
                 {
                     /* see #22979, some hlp files have a macro (run at page opening), which
@@ -727,19 +723,26 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
                 WINHELP_DeleteButtons(win);
                 bReUsed = TRUE;
                 SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage));
-                if (wpage->wininfo->origin.x != CW_USEDEFAULT &&
-                    wpage->wininfo->origin.y != CW_USEDEFAULT)
-                {
-                    pt = wpage->wininfo->origin;
-                    flags &= ~SWP_NOSIZE;
-                }
-                if (wpage->wininfo->size.cx != CW_USEDEFAULT &&
-                    wpage->wininfo->size.cy != CW_USEDEFAULT)
+                if (win->info != wpage->wininfo)
                 {
-                    sz = wpage->wininfo->size;
-                    flags &= ~SWP_NOMOVE;
+                    POINT   pt = {0, 0};
+                    SIZE    sz = {0, 0};
+                    DWORD   flags = SWP_NOSIZE | SWP_NOMOVE;
+
+                    if (wpage->wininfo->origin.x != CW_USEDEFAULT &&
+                        wpage->wininfo->origin.y != CW_USEDEFAULT)
+                    {
+                        pt = wpage->wininfo->origin;
+                        flags &= ~SWP_NOSIZE;
+                    }
+                    if (wpage->wininfo->size.cx != CW_USEDEFAULT &&
+                        wpage->wininfo->size.cy != CW_USEDEFAULT)
+                    {
+                        sz = wpage->wininfo->size;
+                        flags &= ~SWP_NOMOVE;
+                    }
+                    SetWindowPos(win->hMainWnd, HWND_TOP, pt.x, pt.y, sz.cx, sz.cy, flags);
                 }
-                SetWindowPos(win->hMainWnd, HWND_TOP, pt.x, pt.y, sz.cx, sz.cy, flags);
 
                 if (wpage->page && win->page && wpage->page->file != win->page->file)
                     WINHELP_DeleteBackSet(win);



From julliard at winehq.org  Mon Jun  7 10:02:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:20 -0500
Subject: Eric Pouech : winhelp: Don't close popup just after they are created.
Message-ID: <E1OLdqG-00086a-B6@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dbab3367a35740f67f0a6037add6254d41d76f47
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dbab3367a35740f67f0a6037add6254d41d76f47

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Fri Jun  4 22:12:39 2010 +0200

winhelp: Don't close popup just after they are created.

---

 programs/winhlp32/winhelp.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index f4742b0..a5a0f31 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -967,7 +967,7 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
         }
         break;
     case WM_ACTIVATE:
-        if (wParam != WA_INACTIVE || (HWND)lParam == Globals.active_win->hMainWnd ||
+        if (LOWORD(wParam) != WA_INACTIVE || (HWND)lParam == Globals.active_win->hMainWnd ||
             (HWND)lParam == Globals.active_popup->hMainWnd ||
             GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd)
             break;
@@ -975,7 +975,6 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
         if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam))
             return FALSE;
         /* fall through */
-    case WM_LBUTTONUP:
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN:
     case WM_NCLBUTTONDOWN:



From julliard at winehq.org  Mon Jun  7 10:02:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:20 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: mshtml: Update the
	Polish translation.
Message-ID: <E1OLdqG-00086x-GJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fe6e58fe0514b366441ef46598e18840f474d84a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fe6e58fe0514b366441ef46598e18840f474d84a

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:14 2010 +0200

mshtml: Update the Polish translation.

---

 dlls/mshtml/Pl.rc |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/Pl.rc b/dlls/mshtml/Pl.rc
index 8aa357e..ed9cd80 100644
--- a/dlls/mshtml/Pl.rc
+++ b/dlls/mshtml/Pl.rc
@@ -1,6 +1,7 @@
 /*
  * Copyright 2005-2006 Jacek Caban
  * Copyright 2008 Mikolaj Zalewski
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,12 +35,12 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN
 CAPTION "Instalator Wine Gecko"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \
-          "to work correctly. Wine can automatically download and install it for you.\n\n" \
-          "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.",
+    LTEXT "Nie znaleziono paczki Gecko potrzebnej do prawid?owego dzia?ania aplikacji " \
+          "zawieraj?cych kod HTML . Wine mo?e automatycznie pobra? i zainstalowa? t? paczk? dla ciebie.\n\n" \
+          "Uwaga: Lepiej jednak u?y? paczki z twojej dystrybucji. Po szczeg??y zajrzyj na http://wiki.winehq.org/Gecko.",
           ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT
-    CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12
-    DEFPUSHBUTTON "&Instaluj", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP
+    CONTROL "Post?p", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12
+    DEFPUSHBUTTON "&Zainstaluj", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "&Anuluj", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP
 }
 
@@ -56,3 +57,14 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Anuluj", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP
 }
+
+ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30
+    EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Anuluj", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP
+}



From julliard at winehq.org  Mon Jun  7 10:02:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:20 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: wineboot: Update the
	Polish translation.
Message-ID: <E1OLdqG-00087E-Mo@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3f79bc74b160847ecc3b1643f3b9704e5ecae7e9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3f79bc74b160847ecc3b1643f3b9704e5ecae7e9

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:18 2010 +0200

wineboot: Update the Polish translation.

---

 programs/wineboot/wineboot_Pl.rc |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/programs/wineboot/wineboot_Pl.rc b/programs/wineboot/wineboot_Pl.rc
index 3172d36..1774d58 100644
--- a/programs/wineboot/wineboot_Pl.rc
+++ b/programs/wineboot/wineboot_Pl.rc
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2007 Robert Shearman for CodeWeavers
  * Copyright (C) 2008 Mikolaj Zalewski
+ * Copyright (C) 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,3 +37,13 @@ BEGIN
     LTEXT           "Je?eli zako?czysz jego proces, mo?esz straci? niezapisane dane.",
                     IDC_STATIC,7,28,172,15
 END
+
+IDD_WAITDLG DIALOG 0, 0, 200, 50
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED
+CAPTION "Wine"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_WAITICON, 3, 3, 10, 10
+    LTEXT "Konfiguracja Wine w %s jest w?a?nie aktualizowana, prosz? czeka?...",
+          IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX
+END



From julliard at winehq.org  Mon Jun  7 10:02:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:20 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: wordpad: Update the
	Polish translation.
Message-ID: <E1OLdqG-00087U-P3@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d13cc63168726c5f3f7c751184e23705730d1bdf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d13cc63168726c5f3f7c751184e23705730d1bdf

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:15 2010 +0200

wordpad: Update the Polish translation.

---

 programs/wordpad/Pl.rc |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc
index 4d40304..053ecf2 100644
--- a/programs/wordpad/Pl.rc
+++ b/programs/wordpad/Pl.rc
@@ -1,6 +1,7 @@
 /*
  * Copyright 2004 by Krzysztof Foltman
  * Copyright 2006 by Mikolaj Zalewski
+ * Copyright 2010 by ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -127,7 +128,7 @@ BEGIN
         MENUITEM "Fuksja"       ID_COLOR_FUCHSIA
         MENUITEM "Akwamaryna"   ID_COLOR_AQUA
         MENUITEM "Bia?y"        ID_COLOR_WHITE
-        MENUITEM "Automatic"    ID_COLOR_AUTOMATIC
+        MENUITEM "Automatycznie"    ID_COLOR_AUTOMATIC
     END
 END
 
@@ -191,7 +192,7 @@ Caption ""
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Zawijanie wierszy", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Bez zawijania wierszy", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Paski narz?dzi", -1, 150, 10, 120, 85
@@ -206,7 +207,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     STRING_RICHTEXT_FILES_RTF,     "Tekst sformatowany - RTF (*.rtf)"
     STRING_TEXT_FILES_TXT,         "Dokument tekstowy (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Dokument tekstowy Unicode (*.txt)"
     STRING_ALL_FILES,              "Wszystkie dokumenty (*.*)"
 END
 
@@ -219,9 +220,9 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Document sformatowany (RTF)"
-    STRING_NEWFILE_TXT,          "Document tekstowy"
-    STRING_NEWFILE_TXT_UNICODE,  "Document tekstowy Unicode"
+    STRING_NEWFILE_RICHTEXT,     "Dokument sformatowany (RTF)"
+    STRING_NEWFILE_TXT,          "Dokument tekstowy"
+    STRING_NEWFILE_TXT_UNICODE,  "Dokument tekstowy Unicode"
 END
 
 STRINGTABLE DISCARDABLE
@@ -241,18 +242,17 @@ BEGIN
     STRING_PREVIEW_PRINT,            "Drukuj"
     STRING_PREVIEW_NEXTPAGE,         "Nast. strona"
     STRING_PREVIEW_PREVPAGE,         "Poprz. strona"
-    STRING_PREVIEW_TWOPAGES,         "Two pages"
-    STRING_PREVIEW_ONEPAGE,          "One page"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
+    STRING_PREVIEW_TWOPAGES,         "Dwie strony"
+    STRING_PREVIEW_ONEPAGE,          "Jedna strona"
+    STRING_PREVIEW_ZOOMIN,           "Zbli?"
+    STRING_PREVIEW_ZOOMOUT,          "Oddal"
     STRING_PREVIEW_CLOSE,            "Zamknij"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
+    STRING_PREVIEW_PAGE,             "Strona"
+    STRING_PREVIEW_PAGES,            "Strony"
+    STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "cal"
+    STRING_UNITS_INCH,               "cal"
+    STRING_UNITS_PT,                 "punkt"
 END
 
 STRINGTABLE DISCARDABLE
@@ -266,4 +266,10 @@ BEGIN
                                  "Czy na pewno chcesz to zrobi??"
     STRING_INVALID_NUMBER,       "Z?y format liczby"
     STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenty typu OLE storage nie s? obs?ugiwane"
+    STRING_WRITE_FAILED,              "Nie mo?na by?o zapisa? pliku."
+    STRING_WRITE_ACCESS_DENIED,       "Nie masz dost?pu do zapisu pliku."
+    STRING_OPEN_FAILED,               "Nie mo?na by?o otworzy? pliku."
+    STRING_OPEN_ACCESS_DENIED,        "Nie masz dost?pu do otwarcia pliku."
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Drukowanie niezaimplementowane"
+    STRING_MAX_TAB_STOPS,             "Nie mo?na doda? wi?cej ni? 32 punkty tabulacji."
 END



From julliard at winehq.org  Mon Jun  7 10:02:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:20 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: taskmgr: Update the
	Polish translation.
Message-ID: <E1OLdqG-00088I-Ud@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 11eef26118866fb1f9f80eae6d2ef2aedbedb61e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=11eef26118866fb1f9f80eae6d2ef2aedbedb61e

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:19 2010 +0200

taskmgr: Update the Polish translation.

---

 programs/taskmgr/Pl.rc |   89 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 insertions(+), 1 deletions(-)

diff --git a/programs/taskmgr/Pl.rc b/programs/taskmgr/Pl.rc
index 9a38b49..031f82c 100644
--- a/programs/taskmgr/Pl.rc
+++ b/programs/taskmgr/Pl.rc
@@ -3,6 +3,7 @@
  *
  *  Copyright 1999-2001 Brian Palmer
  *  Copyright 2006 Mikolaj Zalewski
+ *  Copyright 2010 ?ukasz Wojni?owicz
  *
  *
  * This library is free software; you can redistribute it and/or
@@ -56,7 +57,7 @@ BEGIN
             MENUITEM "&Normalna",                     ID_VIEW_UPDATESPEED_NORMAL
             , CHECKED
             MENUITEM "N&iska",                        ID_VIEW_UPDATESPEED_LOW
-            MENUITEM "&Zapauzowane",                     ID_VIEW_UPDATESPEED_PAUSED
+            MENUITEM "&Wstrzymana",                     ID_VIEW_UPDATESPEED_PAUSED
 
         END
         MENUITEM SEPARATOR
@@ -485,4 +486,90 @@ BEGIN
     ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
                             "Ustala priorytet procesu na poni?ej normalnego"
     ID_PROCESS_PAGE_SETPRIORITY_LOW "Ustala priorytet procesu na niski"
+    ID_PROCESS_PAGE_DEBUGCHANNELS
+                            "Kontroluj kana?y debugowania"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_VIEW_LARGE                     "Du&?e ikony"
+    IDS_VIEW_SMALL                     "M&a?e ikony"
+    IDS_VIEW_DETAILS                   "&Szczeg??y"
+    IDS_WINDOWS                        "&Okna"
+    IDS_VIEW_SELECTCOLUMNS             "&Wybierz kolumny..."
+    IDS_OPTIONS_SHOW16BITTASKS         "&Poka? zadania 16-bitowe"
+    IDS_VIEW_CPUHISTORY                "&Historia u?ycia procesora CPU"
+    IDS_VIEW_CPUHISTORY_ONEGRAPHALL    "&Jeden wykres dla wszystkich procesor?w CPU"
+    IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Jeden wykres dla ka?dego procesora CPU"
+    IDS_VIEW_SHOWKERNELTIMES           "&Poka? czas j?dra"
+    IDS_APPLICATIONS                   "Aplikacje"
+    IDS_PROCESSES                      "Procesy"
+    IDS_PERFORMANCE                    "Wydajno??"
+    IDS_STATUS_BAR_CPU_USAGE           "U?ycie procesora: %3d%%"
+    IDS_STATUS_BAR_PROCESSES           "Procesy: %d"
+    IDS_STATUS_BAR_MEMORY_USAGE        "Pam. zadeklar.: %dK / %dK"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_IMAGENAME         "Nazwa obrazu"
+    IDS_PID               "PID (identyfikator procesu)"
+    IDS_CPUUSAGE          "U?ycie procesora CPU"
+    IDS_CPUTIME           "Czas procesora CPU"
+    IDS_MEMORYUSAGE       "U?ycie pami?ci"
+    IDS_MEMORYUSAGEDELTA  "Zmiana u?ycia pami?ci"
+    IDS_PEAKMEMORYUSAGE   "Szczytowe u?ycie pami?ci"
+    IDS_PAGEFAULTS        "B??dy stron"
+    IDS_USEROBJECTS       "Obiekty USER"
+    IDS_IOREADS           "Odczyty We/Wy"
+    IDS_IOREADBYTES       "Odczyty We/Wy w bajtach"
+    IDS_SESSIONID         "Identyfikator sesji"
+    IDS_USERNAME          "Nazwa u?ytkowinka"
+    IDS_PAGEFAULTSDELTA   "Zmiana b??d?w stron"
+    IDS_VIRTUALMEMORYSIZE "Rozmiar pami?ci wirtualnej"
+    IDS_PAGEDPOOL         "Pula stronnicowania"
+    IDS_NONPAGEDPOOL      "Pula niestronnicowania"
+    IDS_BASEPRIORITY      "Priorytet podstawowy"
+    IDS_HANDLECOUNT       "Liczba doj??"
+    IDS_THREADCOUNT       "Liczba w?tk?w"
+    IDS_GDIOBJECTS        "Obiekty GDI"
+    IDS_IOWRITES          "Zapisy We/Wy"
+    IDS_IOWRITEBYTES      "Zapisy We/Wy w bajtach"
+    IDS_IOOTHER           "Inne We/Wy"
+    IDS_IOOTHERBYTES      "Inne We/Wy w bajtach"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_WARNING_TITLE               "Ostrze?enie menad?era zada?"
+    IDS_PRIORITY_CHANGE_MESSAGE     "OSTRZE?ENIE: Zmiana priorytetu tego rprcesu mo?e przynie??\n\
+                                     nieporz?dane skutki, w tym r?wnie? niestabilno?? systemu\n\
+                                     Czy na pewno chcesz zmieni? priorytet?"
+    IDS_PRIORITY_UNABLE2CHANGE      "Nie mozna zmieni? priorytetu"
+    IDS_TERMINATE_MESSAGE           "OSTRZE?ENIE: Zako?czenie procesu mo?e przynie??\n\
+                                     nieporz?dane skutki, w tym r?wnie?\n\
+                                     utrat? danych i niestabilno?? systemu.\n\
+                                     Proces nie b?dzie mia? szansy na zapisanie danych\n\
+                                     Czy na pewno chcesz zako?czy??"
+    IDS_TERMINATE_UNABLE2TERMINATE  "Nie mo?na zako?czy? procesu"
+    IDS_DEBUG_MESSAGE               "OSTRZE?ENIE: Debugowanie tego procesu mo?e spowodowa? utrat? tanych.\n\
+                                     Czy na pewno chcesz uruchomi? debugera?"
+    IDS_DEBUG_UNABLE2DEBUG          "Nie mo?na debugowa? procesu"
+    IDS_AFFINITY_ERROR_MESSAGE      "Proces musi by? skoligacony z co najmniej jednym procesorem"
+    IDS_AFFINITY_ERROR_TITLE        "Niew?a?ciwa opcja"
+    IDS_AFFINITY_UNABLE2ACCESS      "Nie mo?na uzyska? dost?pu lub ustawi? koligacji procesu"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_SYSTEM_IDLE_PROCESS            "System Idle Process"
+    IDS_APPLICATION_NOT_RESPONDING     "Nie odpowiada"
+    IDS_APPLICATION_RUNNING            "Uruchomiony"
+    IDS_APPLICATION_TASK               "Zadanie"
+    IDS_APPLICATION_STATUS             "Stan"
+    IDS_DEBUG_CHANNEL                  "Kana?y debugowania"
+    IDS_DEBUG_CHANNEL_FIXME            "Fixme"
+    IDS_DEBUG_CHANNEL_ERR              "Err"
+    IDS_DEBUG_CHANNEL_WARN             "Warn"
+    IDS_DEBUG_CHANNEL_TRACE            "Trace"
 END



From julliard at winehq.org  Mon Jun  7 10:02:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:21 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: wininet: Update the
	Polish translation.
Message-ID: <E1OLdqH-00088Y-0W@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 947d18ace75d19e0d640ec93410c96bf600b7500
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=947d18ace75d19e0d640ec93410c96bf600b7500

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:23 2010 +0200

wininet: Update the Polish translation.

---

 dlls/wininet/wininet_Pl.rc |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dlls/wininet/wininet_Pl.rc b/dlls/wininet/wininet_Pl.rc
index 0c76d53..4489c9f 100644
--- a/dlls/wininet/wininet_Pl.rc
+++ b/dlls/wininet/wininet_Pl.rc
@@ -1,6 +1,7 @@
 /*
  * Copyright 2003 Mike McCormack for CodeWeavers
  * Copyright 2006 Mikolaj Zalewski
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,13 +30,33 @@ FONT 8, "MS Shell Dlg"
  LTEXT "Prosz? wprowadzi? nazw? u?ytkownika i has?o:", -1, 40, 6, 150, 15
  LTEXT "Proxy", -1, 40, 26, 50, 10
  LTEXT "Obszar", -1, 40, 46, 50, 10
- LTEXT "U?ytkonik", -1, 40, 66, 50, 10
+ LTEXT "U?ytkownik", -1, 40, 66, 50, 10
  LTEXT "Has?o", -1, 40, 86, 50, 10
  LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
  LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "&Zapami?taj to has?o (nie bezpieczne)", IDC_SAVEPASSWORD,
+ CHECKBOX "&Zapami?taj to has?o (niebezpieczne)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Wymagane uwierzytelnienie "
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Prosz? wprowadzi? nazw? u?ytkownika i has?o:", -1, 40, 6, 150, 15
+ LTEXT "Serwer", -1, 40, 26, 50, 10
+ LTEXT "Obszar", -1, 40, 46, 50, 10
+ LTEXT "U?ytkownik", -1, 40, 66, 50, 10
+ LTEXT "Has?o", -1, 40, 86, 50, 10
+ LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "&Zapami?taj to has?o (niebezpieczne)", IDC_SAVEPASSWORD,
            80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP



From julliard at winehq.org  Mon Jun  7 10:02:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:21 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: shell32: Update the
	Polish translation.
Message-ID: <E1OLdqH-00088q-8q@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3949092a5b49f4a65c3aa4f09aae4b634cc0fd5e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3949092a5b49f4a65c3aa4f09aae4b634cc0fd5e

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:24 2010 +0200

shell32: Update the Polish translation.

---

 dlls/shell32/shell32_Pl.rc |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc
index 31c0a8a..a3abfde 100644
--- a/dlls/shell32/shell32_Pl.rc
+++ b/dlls/shell32/shell32_Pl.rc
@@ -1,6 +1,7 @@
 /*
  * Copyright 1998 Juergen Schmied
  * Copyright 2004 Piotr Caban
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -95,10 +96,10 @@ END
 
 MENU_CPANEL MENU
 BEGIN
-    POPUP "&File"
+    POPUP "&Plik"
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "E&xit", IDM_CPANEL_EXIT
+        MENUITEM "W&yj?cie", IDM_CPANEL_EXIT
     END
 
     POPUP "&View"
@@ -109,9 +110,9 @@ BEGIN
         MENUITEM "&Szczeg??y", FCIDM_SHVIEW_REPORTVIEW
     END
 
-    POPUP "&Help"
+    POPUP "&Pomoc"
     BEGIN
-        MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT
+        MENUITEM "&O panelu sterowania...", IDM_CPANEL_ABOUT
     END
 END
 
@@ -204,14 +205,18 @@ STRINGTABLE
 	IDS_SHV_COLUMN9		"Komentarz"
 	IDS_SHV_COLUMN10        "W?a?ciciel"
 	IDS_SHV_COLUMN11        "Grupa"
-	IDS_SHV_COLUMN_DELFROM	"Lokacja oryginalna"
+	IDS_SHV_COLUMN_DELFROM	"Oryginalne po?o?enie"
 	IDS_SHV_COLUMN_DELDATE	"Data usuni?cia"
+	IDS_SHV_COL_DOCS	"Dokumenty"
+	IDS_SHV_COL_STATUS	"Status"
+	IDS_SHV_COL_LOCATION	"Po?o?enie"
+	IDS_SHV_COL_MODEL	"Model"
 
         /* special folders */
 	IDS_DESKTOP		"Pulpit"
 	IDS_MYCOMPUTER		"M?j komputer"
 	IDS_RECYCLEBIN_FOLDER_NAME	"Kosz"
-	IDS_CONTROLPANEL	"Control Panel"
+	IDS_CONTROLPANEL	"Panel sterowania"
 
 	/* context menus */
 	IDS_VIEW_LARGE		"&Du?e Ikony"
@@ -282,9 +287,11 @@ STRINGTABLE
 
 	IDS_NEWFOLDER		"Nowy Folder"
 
-	IDS_CPANEL_TITLE            "Wine Control Panel"
-	IDS_CPANEL_NAME             "Name"
-	IDS_CPANEL_DESCRIPTION      "Description"
+	IDS_CPANEL_TITLE            "Panel sterowania Wine"
+	IDS_CPANEL_NAME             "Nazwa"
+	IDS_CPANEL_DESCRIPTION      "Opis"
+
+        IDS_SHLEXEC_NOASSOC         "Nie ma przypisanego programu Windowsowego do otwierania tego typu plik?w."
 }
 
 STRINGTABLE



From julliard at winehq.org  Mon Jun  7 10:02:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:21 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: regedit: Update the
	Polish translation.
Message-ID: <E1OLdqH-000897-CR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5e48bfce85e0a3b835aecaffb7348128de27f16d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5e48bfce85e0a3b835aecaffb7348128de27f16d

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:20 2010 +0200

regedit: Update the Polish translation.

---

 programs/regedit/Pl.rc |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/programs/regedit/Pl.rc b/programs/regedit/Pl.rc
index a414438..2ca9550 100644
--- a/programs/regedit/Pl.rc
+++ b/programs/regedit/Pl.rc
@@ -2,6 +2,7 @@
  * Regedit resources
  *
  * Copyright 2002 Robert Dickenson
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -125,7 +126,7 @@ STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
     WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "&Eksportuj registr", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP
+    GROUPBOX "&Eksportuj rejestr", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP
     AUTORADIOBUTTON "&Ca?y rejestr", IDC_EXPORT_ALL, 12, 15, 244, 12
     AUTORADIOBUTTON "&Wybran? ga???:", IDC_EXPORT_SELECTED, 12, 30, 70, 12
     EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12
@@ -266,8 +267,8 @@ BEGIN
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
                             "Od??cza si? od rejestru innego komputera"
     ID_REGISTRY_PRINT       "Drukuje ca?o?? lub cz??? rejestru"
-/*    ID_HELP_HELPTOPICS      "Opens registry editor help" */
-    ID_HELP_ABOUT           "Wy?wietla informacj? o programie, numerze wersji i prawach autorskich"
+/*    ID_HELP_HELPTOPICS      "Otwiera pomoc edytora rejestru" */
+    ID_HELP_ABOUT           "Wy?wietla informacje o programie, numerze wersji i prawach autorskich"
 END
 
 STRINGTABLE DISCARDABLE
@@ -283,18 +284,19 @@ BEGIN
     ID_EDIT_COPYKEYNAME     "Kopiuje nazw? zaznaczonego klucza do schowka"
     ID_EDIT_FIND            "Znajduje ci?g znak?w w kluczu lub danej"
     ID_EDIT_FINDNEXT        "Znajduje nast?pne wyst?pienie ostatnio szukanego ci?gu"
+    ID_EDIT_EXPORT          "Eksportuje zaznaczon? ga??? rejestru do pliku tekstowego"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_ERROR		    "B??d"
-    IDS_BAD_KEY		    "Nie uda?o sie przeczyta? klucza '%s'"
-    IDS_BAD_VALUE           "Nie uda?o sie przeczyta? danej '%s'"
+    IDS_BAD_KEY		    "Nie uda?o si? przeczyta? klucza '%s'"
+    IDS_BAD_VALUE           "Nie uda?o si? przeczyta? danej '%s'"
     IDS_UNSUPPORTED_TYPE    "Nie da si? modyfikowa? kluczy tego typu (%u)"
     IDS_TOO_BIG_VALUE       "Warto?? jest zbyt du?a (%u)"
     IDS_DELETE_BOX_TITLE    "Potwierdzenie kasowania"
     IDS_DELETE_BOX_TEXT     "Jeste? pewien, ?e chcesz usun?? dan? '%s'?"
-    IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?"
+    IDS_DELETE_BOX_TEXT_MULTIPLE "Czy jeste? pewien, ?e chcesz usun?? te warto?ci?"
     IDS_NEWKEY              "Nowy klucz #%d"
     IDS_NEWVALUE            "Nowa dana #%d"
     IDS_NOTFOUND            "Nie uda?o si? wyszuka? ci?gu '%s'"



From julliard at winehq.org  Mon Jun  7 10:02:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:21 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: winecfg: Update the
	Polish translation.
Message-ID: <E1OLdqH-00089O-HB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 639705a7ea568e163756155b35b77bddeaf0607b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=639705a7ea568e163756155b35b77bddeaf0607b

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:17 2010 +0200

winecfg: Update the Polish translation.

---

 programs/winecfg/Pl.rc |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index 9422f34..f2f5e8d 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -6,6 +6,7 @@
  * Copyright 2003 Dimitrie O. Paun
  * Copyright 2003-2004 Mike Hearn
  * Copyright 2007 Mikolaj Zalewski
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,9 +47,9 @@ BEGIN
     LTEXT           "Ta biblioteka jest wolnym oprogramowaniem; mo?esz j? rozpowszechnia? i/lub modyfikowa? pod warunkami licencji GNU Lesser General Public License opublikowanej przez Free Software Foundation; licencji w wersji 2.1, lub (wed?ug w?asnego uznania) dowolnej p??niejszej.",
                     IDC_STATIC,119,44,124,72
     GROUPBOX        " Windows Registration Information ", IDC_STATIC, 15, 110, 230, 55
-    LTEXT           "Owner:", IDC_STATIC, 22, 126, 40, 20
+    LTEXT           "W?a?ciciel:", IDC_STATIC, 22, 126, 40, 20
     EDITTEXT        IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Organization:", IDC_STATIC, 22, 140, 50, 20
+    LTEXT           "Organizacja:", IDC_STATIC, 22, 140, 50, 20
     EDITTEXT        IDC_ABT_ORG, 75, 140, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP
 END
 
@@ -99,12 +100,12 @@ STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        " Regu?y bibliotek DLL ",IDC_STATIC,8,4,244,240
-    LTEXT           "Dla ka?dej biblioteki DLL mo?na wybra? czy nale?y u?y? wersji wbudowanej (dostarczonej z Wine) czy zewn?trzenej (wzi?tej z Windows lub dostarczonej wraz z aplikacj?)."
+    LTEXT           "Dla ka?dej biblioteki DLL mo?na zdecydowa? czy nale?y u?y? wersji wbudowanej (dostarczonej z Wine) czy zewn?trznej (wzi?tej z Windows lub dostarczonej wraz z aplikacj?)."
                     ,IDC_STATIC,16,16,220,32
     LTEXT           "Nowa regu?a dla biblioteki:",IDC_STATIC,16,58,100,8
     COMBOBOX        IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE
     PUSHBUTTON      "&Dodaj",IDC_DLLS_ADDDLL, 164,68,82,13,BS_DEFPUSHBUTTON
-    LTEXT           "Instniej?ce regu?y:",IDC_STATIC,16,86,100,8
+    LTEXT           "Istniej?ce regu?y:",IDC_STATIC,16,86,100,8
     LISTBOX         IDC_DLLS_LIST,16,96,140,140,WS_BORDER | WS_TABSTOP | WS_VSCROLL
     PUSHBUTTON      "&Edycja",IDC_DLLS_EDITDLL,164,96,82,14
     PUSHBUTTON      "&Usu?",IDC_DLLS_REMOVEDLL,164,114,82,14
@@ -125,12 +126,22 @@ BEGIN
     PUSHBUTTON      "&Anuluj",IDCANCEL,87,74,45,14,WS_GROUP
 END
 
+IDD_DRIVECHOOSE DIALOG DISCARDABLE  60, 70, 170, 60
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Wybierz liter? nap?du"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,105,10,45,14,WS_GROUP
+    PUSHBUTTON      "Anuluj",IDCANCEL,105,30,45,14,WS_GROUP
+END
+
 IDD_DRIVECFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        " Przyporz?dkowanie dysk?w ",IDC_STATIC,8,4,244,240
-    LTEXT           "Failed to connect to the mount manager, the drive configuration cannot be edited.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76
+    LTEXT           "Nieudane po??czenie z mened?erem montowania, konfiguracja nap?du nie mo?e by? zmodyfikowana.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76
     CONTROL         "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT |
                     LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76
     PUSHBUTTON      "&Dodaj...",IDC_BUTTON_ADD,15,98,37,14
@@ -173,7 +184,7 @@ BEGIN
     PUSHBUTTON      "Test d?wi?ku",IDC_AUDIO_TEST,165,58,69,14
     PUSHBUTTON	    "Panel sterowania",IDC_AUDIO_CONTROL_PANEL,165,78,69,14
     GROUPBOX        " DirectSound ",IDC_STATIC,8,220,244,45
-    LTEXT	    "Przy?piesznie sprz?towe: ",IDC_STATIC,15,230,90,10
+    LTEXT	    "Przy?pieszenie sprz?towe: ",IDC_STATIC,15,230,90,10
     COMBOBOX	    IDC_DSOUND_HW_ACCEL,100,228,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Domy?lna cz?sto?? pr?bkowania:",IDC_STATIC,15,245,105,8
     COMBOBOX        IDC_DSOUND_RATES,121,243,38,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -237,10 +248,10 @@ BEGIN
     IDS_DLL_WARNING_CAPTION "Uwaga: biblioteka systemowa"
     IDS_DLL_NATIVE          "zewn?trzna"
     IDS_DLL_BUILTIN         "wbudowana"
-    IDS_DLL_NATIVE_BUILTIN  "zewn?trzena, wbudowana"
-    IDS_DLL_BUILTIN_NATIVE  "wbudowana, zewn?trzena"
+    IDS_DLL_NATIVE_BUILTIN  "zewn?trzna, wbudowana"
+    IDS_DLL_BUILTIN_NATIVE  "wbudowana, zewn?trzna"
     IDS_DLL_DISABLED        "wy??czona"
-    IDS_DEFAULT_SETTINGS    "Ustawnienia standardowe"
+    IDS_DEFAULT_SETTINGS    "Ustawienia standardowe"
     IDS_EXECUTABLE_FILTER   "Programy Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
     IDS_USE_GLOBAL_SETTINGS "U?yj ustawie? globalnych"
     IDS_SELECT_EXECUTABLE   "Wybierz plik wykonywalny"
@@ -259,9 +270,9 @@ BEGIN
     IDS_DRIVE_REMOTE            "Zas?b sieciowy"
     IDS_DRIVE_REMOVABLE         "Stacja dyskietek"
     IDS_DRIVE_CDROM             "CD-ROM"
-    IDS_DRIVE_LETTERS_EXCEEDED  "Nie mo?esz doda? nast?pnego dysku.\n\nKa?dy dysk musi mie? liter? od A do Z, wi?c nie mo?e by? ich wi?cej ni? 26"
+    IDS_DRIVE_LETTERS_EXCEEDED  "Nie mo?esz doda? kolejnego dysku.\n\nKa?dy dysk musi mie? liter? od A do Z, co ogranicza ich liczb? do 26"
     IDS_SYSTEM_DRIVE_LABEL      "Dysk systemowy"
-    IDS_CONFIRM_DELETE_C        "Czy na pewno chcesz usun?? dysk C?\n\nWi?kszo?? program?w dla Windows zak?ada, ?e taki dysk istnieje i mog? nie dzia?a? bez niego. Je?eli go skasujesz, nie zapomnij go znowu utworzy?!"
+    IDS_CONFIRM_DELETE_C        "Czy na pewno chcesz usun?? dysk C?\n\nWi?kszo?? program?w dla Windows zak?ada istnienie takiego dysku i mog? przesta? dzia?a? gdy go zabraknie. Je?eli go skasujesz, nie zapomnij o ponownym jego utworzeniu!"
     IDS_COL_DRIVELETTER         "Litera"
     IDS_COL_DRIVEMAPPING        "Przyporz?dkowany do"
     IDS_NO_DRIVE_C              "Nie masz dysku C. To mo?e powodowa? problemy.\n\nNie zapomnij u?y? 'Dodaj' w zak?adce 'Dyski', aby go utworzy?!\n"
@@ -299,7 +310,7 @@ BEGIN
     IDC_SYSPARAMS_DESKTOP           "Pulpit"
     IDC_SYSPARAMS_MENU              "T?o menu"
     IDC_SYSPARAMS_MENU_TEXT         "Tekst menu"
-    IDC_SYSPARAMS_SCROLLBAR         "Paskek przewijania"
+    IDC_SYSPARAMS_SCROLLBAR         "Pasek przewijania"
     IDC_SYSPARAMS_SELECTION         "T?o zaznaczonego obszaru"
     IDC_SYSPARAMS_SELECTION_TEXT    "Zaznaczony tekst"
     IDC_SYSPARAMS_TOOLTIP           "T?o podpowiedzi"



From julliard at winehq.org  Mon Jun  7 10:02:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:21 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: setupapi: Update the
	Polish translation.
Message-ID: <E1OLdqH-00089i-NM@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2d45002857a31e25a51879d51b5f3f836c51ed29
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2d45002857a31e25a51879d51b5f3f836c51ed29

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:25 2010 +0200

setupapi: Update the Polish translation.

---

 dlls/setupapi/Pl.rc |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/dlls/setupapi/Pl.rc b/dlls/setupapi/Pl.rc
index 34d9b46..e08dc6b 100644
--- a/dlls/setupapi/Pl.rc
+++ b/dlls/setupapi/Pl.rc
@@ -2,6 +2,7 @@
  * Polish resources for SETUPAPI
  *
  * Copyright 2005 Sebastian Gasiorek
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,14 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
+STRINGTABLE DISCARDABLE
+{
+        IDS_PROMPTDISK   "Potrzebny plik o nazwie '%s' znajduj?cy si?  na %s"
+        IDS_UNKNOWN      "Nieznany"
+        IDS_COPYFROM     "Kopiuj pliki z:"
+        IDS_INFO         "Podaj ?cie?k? do pliku, a nast?pnie naci?nij przycisk OK."
+}
+
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Kopiowanie plik?w..."
@@ -34,3 +43,17 @@ BEGIN
 	LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
 	CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
+
+IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Potrzebne pliki"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "W??? dysk instalacyjny producenta, a nast?pnie\nupewnij si?, ?e poni?ej zaznaczono poprawny nap?d", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "Kopiuj pliki producenta z:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14
+	PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "Anuluj", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "Przegl?daj...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END



From julliard at winehq.org  Mon Jun  7 10:02:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:21 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: notepad: Update the
	Polish translation.
Message-ID: <E1OLdqH-0008A1-QX@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8fb8ea63334231ac28427d9a0f6fef9c0def8d29
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8fb8ea63334231ac28427d9a0f6fef9c0def8d29

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:22 2010 +0200

notepad: Update the Polish translation.

---

 programs/notepad/Pl.rc |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/programs/notepad/Pl.rc b/programs/notepad/Pl.rc
index f7dbfe0..d4bc43e 100644
--- a/programs/notepad/Pl.rc
+++ b/programs/notepad/Pl.rc
@@ -5,6 +5,7 @@
  *  Proofread 1998 by David Lee Lambert <lamber45 at egr.msu.edu>
  *  Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
  *  Copyright 2004 Jacek Caban <jack at itma.pwr.wroc.pl>
+ *  Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -56,13 +57,14 @@ POPUP "&Edycja" {
 POPUP "&Znajd?" {
   MENUITEM "&Znajd?...\tCtrl+F",   CMD_SEARCH
   MENUITEM "Z&najd? nast?pny\tF3",  CMD_SEARCH_NEXT
+  MENUITEM "&Zamie?...\tCtrl+H", CMD_REPLACE
  }
 POPUP "Pomo&c" {
   MENUITEM "&Tematy pomocy",         CMD_HELP_CONTENTS
   MENUITEM "&Szukaj...",        CMD_HELP_SEARCH
   MENUITEM "&Pomoc",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  MENUITEM "Notepad - &informacje", CMD_HELP_ABOUT_NOTEPAD
+  MENUITEM "Notatnik - &informacje", CMD_HELP_ABOUT_NOTEPAD
  }
 }
 
@@ -93,6 +95,14 @@ PUSHBUTTON    "Anuluj",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
 PUSHBUTTON    "&Pomoc",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
+IDD_OFN_TEMPLATE  DIALOG  DISCARDABLE 50,50,300,15
+STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Kodowanie:", -1, 5,0, 50,12
+  COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST
+END
+
 STRINGTABLE DISCARDABLE
 {
 STRING_PAGESETUP_HEADERVALUE,   "&f"
@@ -120,4 +130,13 @@ STRING_NOTFOUND,                                        "Nie mo
 STRING_OUT_OF_MEMORY,                   "Za ma?o pami?ci do wykonania tego zadania.\n \
 Zamknij jedn? lub wi?cej aplikacji aby zwi?kszy? ilo?? wolnej pami?ci."
 
+STRING_UNICODE_LE,     "Unicode (UTF-16)"
+STRING_UNICODE_BE,     "Unicode (UTF-16 big-endian)"
+
+STRING_LOSS_OF_UNICODE_CHARACTERS,         "%s\n\
+Plik ten zawiera znaki Unicode, kt?re zostan? utracone je?eli\n\
+zapiszesz ten plik przy u?yciu kodowania %s.\n\
+Aby zachowa? te znaki, naci?nij Anuluj, a p??niej zaznacz\n\
+jedn? z opcji Unicode z rozwijalnej listy kodowa?.\n\
+Czy chcesz kontynuowa? mimo tego?"
 }



From julliard at winehq.org  Mon Jun  7 10:02:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:21 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: reg: Update the Polish
	translation.
Message-ID: <E1OLdqH-0008AI-Sq@wine.codeweavers.com>

Module: wine
Branch: master
Commit: da342c72cf12a14c58092f3e9521626e6687af9e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=da342c72cf12a14c58092f3e9521626e6687af9e

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Thu Jun  3 22:46:21 2010 +0200

reg: Update the Polish translation.

---

 programs/reg/Pl.rc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/programs/reg/Pl.rc b/programs/reg/Pl.rc
index 01c4244..ce6e64f 100644
--- a/programs/reg/Pl.rc
+++ b/programs/reg/Pl.rc
@@ -4,6 +4,7 @@
  *
  * Copyright 2008 Andrew Riedi
  * Copyright 2008 Mikolaj Zalewski
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,4 +31,9 @@ STRINGTABLE
     STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_warto?ci | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
     STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_warto?ci | /ve | /va] [/f]\n"
     STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_warto?ci | /ve] [/s]\n"
+    STRING_SUCCESS, "Operacja zako?czona pomy?lnie\n"
+    STRING_INVALID_KEY, "B??d: Niew?a?ciwa nazwa klucza\n"
+    STRING_INVALID_CMDLINE, "B??d: Niew?a?ciwe parametry wiersza polece?\n"
+    STRING_NO_REMOTE, "B??d: Nie mo?na doda? kluczy do zdalnej maszyny\n"
+    STRING_CANNOT_FIND, "B??d: System nie m?g? znale?? podanej warto?ci lub klucza rejestru\n"
 }



From julliard at winehq.org  Mon Jun  7 10:02:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:21 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: appwiz: Add the Polish
	translation.
Message-ID: <E1OLdqH-0008Ak-VJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3153a7eec5d554b275cb5e52a8c68c62117454d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3153a7eec5d554b275cb5e52a8c68c62117454d6

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Fri Jun  4 16:33:24 2010 +0200

appwiz: Add the Polish translation.

---

 dlls/appwiz.cpl/Makefile.in |    1 +
 dlls/appwiz.cpl/Pl.rc       |   84 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 0 deletions(-)

diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in
index 7f57ee8..afa15cc 100644
--- a/dlls/appwiz.cpl/Makefile.in
+++ b/dlls/appwiz.cpl/Makefile.in
@@ -20,6 +20,7 @@ RC_SRCS = \
 	Lt.rc \
 	Nl.rc \
 	No.rc \
+	Pl.rc \
 	Pt.rc \
 	Ro.rc \
 	Ru.rc \
diff --git a/dlls/appwiz.cpl/Pl.rc b/dlls/appwiz.cpl/Pl.rc
new file mode 100644
index 0000000..33b2e89
--- /dev/null
+++ b/dlls/appwiz.cpl/Pl.rc
@@ -0,0 +1,84 @@
+/*
+* Add/Remove Programs Polish resources
+*
+* Copyright 2010 ?ukasz Wojni?owicz
+*
+* 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"
+
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+   IDS_CPL_TITLE, "Dodaj/Usu? programy"
+   IDS_CPL_DESC, "Pozwala na instalacj? nowego lub usuni?cie ju? istniej?cego oprogramowania z twojego komputera."
+   IDS_TAB1_TITLE, "Aplikacje"
+
+   IDS_UNINSTALL_FAILED, "Nie mo?na uruchomi? programu odinstalowuj?cego, '%s'. Czy chcesz usun?? wpis o tym programie z rejestru?"
+   IDS_NOT_SPECIFIED, "Nie okre?lone"
+
+   IDS_COLUMN_NAME, "Nazwa"
+   IDS_COLUMN_PUBLISHER, "Wydawca"
+   IDS_COLUMN_VERSION, "Wersja"
+   IDS_INSTALL_FILTER, "Installation Programs\0*instal*.exe;*setup*.exe;*.msi\0Programs (*.exe)\0*.exe\0All Files (*.*)\0*.*\0\0"
+
+   IDS_REMOVE, "&Usu?..."
+   IDS_MODIFY_REMOVE, "&Zmie?/Usu?..."
+}
+
+IDD_MAIN DIALOG 0, 0, 320, 220
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Zainstaluj/Odinstaluj"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "Aby doda? program z dysku, p?yty CD-ROM lub dyskietki, kliknij przycisk Zainstaluj", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20
+ CONTROL "&Zainstaluj...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14
+ CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1
+ CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20
+ CONTROL "To oprogramowanie mo?e by? usuni?te automatycznie. Aby usun?? program lub zmieni? jego zainstalowane komponenty, zaznacz go z listy i naci?nij Zmie?/Usu?.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30
+ CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100
+ CONTROL "&Informacje o wsparciu...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14
+ CONTROL "&Zmie?...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14
+ CONTROL "&Usu?...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14
+ CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20
+}
+
+IDD_INFO DIALOG 0, 0, 256, 138
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Informacje o wsparciu"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14
+ CONTROL "Podane informacje mog? by? przydatne przy otrzymaniu pomocy technicznej dla %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19
+ CONTROL "Wydawca:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8
+ CONTROL "Wersja:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8
+ CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8
+ CONTROL "Informacje o wsparciu:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8
+ CONTROL "Wsparcie przez telefon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8
+ CONTROL "CzytajTo:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8
+ CONTROL "Aktualizacje produktu:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8
+ CONTROL "Komentarze:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8
+ CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8
+ CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8
+ CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8
+ CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8
+ CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8
+ CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8
+ CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8
+ CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8
+}



From julliard at winehq.org  Mon Jun  7 10:02:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:22 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: crypt32: Add the
	Polish translation.
Message-ID: <E1OLdqI-0008BP-3u@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 208e4ea231a9cd82eecb405bf11b61be88e373ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=208e4ea231a9cd82eecb405bf11b61be88e373ef

Author: ?ukasz Wojni?owicz <lukasz.wojnilowicz at gmail.com>
Date:   Fri Jun  4 16:33:26 2010 +0200

crypt32: Add the Polish translation.

---

 dlls/crypt32/Makefile.in   |    1 +
 dlls/crypt32/crypt32_Pl.rc |  241 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 242 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=208e4ea231a9cd82eecb405bf11b61be88e373ef


From julliard at winehq.org  Mon Jun  7 10:02:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:22 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: serialui: Add the
	Polish translation.
Message-ID: <E1OLdqI-0008Bg-8p@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0de9c158ef3e50f7ea8627fb4dbb70e5bddf3f75
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0de9c158ef3e50f7ea8627fb4dbb70e5bddf3f75

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Sat Jun  5 12:12:49 2010 +0200

serialui: Add the Polish translation.

---

 dlls/serialui/Makefile.in |    1 +
 dlls/serialui/Pl.rc       |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 7534c35..95a04f3 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -26,6 +26,7 @@ RC_SRCS = \
 	Lt.rc \
 	Nl.rc \
 	No.rc \
+	Pl.rc \
 	Pt.rc \
 	Ru.rc \
 	Si.rc \
diff --git a/dlls/serialui/Pl.rc b/dlls/serialui/Pl.rc
new file mode 100644
index 0000000..82dc412
--- /dev/null
+++ b/dlls/serialui/Pl.rc
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010 ?ukasz Wojni?owicz
+ *
+ * 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 "serialui.h"
+
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "W?a?ciwo?ci dla "
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Bit?w na sekund?", -1,5,20,55,10
+  COMBOBOX      IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Parzysto??", -1,5,40,55,10
+  COMBOBOX      IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Kontrola przep?ywu", -1,5,60,55,10
+  COMBOBOX      IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Bity danych", -1,5,80,55,10
+  COMBOBOX      IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Bity zatrzymania", -1,5,100,55,10
+  COMBOBOX      IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  DEFPUSHBUTTON "OK",     IDOK,30,138,50,14
+  PUSHBUTTON    "Anuluj", IDCANCEL,85,138,50,14
+  /* these two buttons are for testing Get/SetDefaultCommConfig */
+  /* PUSHBUTTON    "GetDefault", ID_GETDEFAULT,30,115,50,14 */
+  /* PUSHBUTTON    "SetDefault", ID_SETDEFAULT,85,115,50,14 */
+END



From julliard at winehq.org  Mon Jun  7 10:02:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:22 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: cryptdlg: Add the
	Polish translation.
Message-ID: <E1OLdqI-0008Bx-Fd@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bd4233188c98ba2d2dbe3c374e9eba78b1420e81
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bd4233188c98ba2d2dbe3c374e9eba78b1420e81

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Sat Jun  5 12:12:45 2010 +0200

cryptdlg: Add the Polish translation.

---

 dlls/cryptdlg/Makefile.in    |    1 +
 dlls/cryptdlg/cryptdlg_Pl.rc |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in
index e4692e2..11dcc17 100644
--- a/dlls/cryptdlg/Makefile.in
+++ b/dlls/cryptdlg/Makefile.in
@@ -17,6 +17,7 @@ RC_SRCS = \
 	cryptdlg_Ko.rc \
 	cryptdlg_Lt.rc \
 	cryptdlg_Nl.rc \
+	cryptdlg_Pl.rc \
 	cryptdlg_Pt.rc \
 	cryptdlg_Ro.rc \
 	cryptdlg_Uk.rc
diff --git a/dlls/cryptdlg/cryptdlg_Pl.rc b/dlls/cryptdlg/cryptdlg_Pl.rc
new file mode 100644
index 0000000..fbf52f1
--- /dev/null
+++ b/dlls/cryptdlg/cryptdlg_Pl.rc
@@ -0,0 +1,38 @@
+/*
+ * cryptdlg dll resources
+ *
+ * Copyright 2010 ?ukasz Wojni?owicz
+ *
+ * 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 "cryptres.h"
+
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CERT_POLICY "Zasady certyfikatu"
+    IDS_POLICY_ID "Identyfikator zasad: "
+    IDS_POLICY_QUALIFIER_INFO "Informacje o kwalifikatorze zasad"
+    IDS_POLICY_QUALIFIER_ID "Id kwalifikatora zasad="
+    IDS_CPS "CPS" /* Certification Practice Statement */
+    IDS_USER_NOTICE "Zawiadamianie u?ytkownika"
+    IDS_QUALIFIER "Kwalifikator"
+    IDS_NOTICE_REF "Odniesienie zawiadamiania"
+    IDS_ORGANIZATION "Organizacja="
+    IDS_NOTICE_NUM "Numer zawiadamiaj?cy="
+    IDS_NOTICE_TEXT "Tekst zawiadamiaj?cy="
+}



From julliard at winehq.org  Mon Jun  7 10:02:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:22 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: jscript: Add the
	Polish translation.
Message-ID: <E1OLdqI-0008CH-NN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5b4097acb6ebe73cf1fefee621626a9e6058944d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5b4097acb6ebe73cf1fefee621626a9e6058944d

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Sat Jun  5 12:12:47 2010 +0200

jscript: Add the Polish translation.

---

 dlls/jscript/Makefile.in   |    1 +
 dlls/jscript/jscript_Pl.rc |   47 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index c1053b3..d91c644 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -14,6 +14,7 @@ RC_SRCS = \
 	jscript_Ko.rc \
 	jscript_Lt.rc \
 	jscript_Nl.rc \
+	jscript_Pl.rc \
 	jscript_Pt.rc \
 	jscript_Ru.rc \
 	jscript_Si.rc \
diff --git a/dlls/jscript/jscript_Pl.rc b/dlls/jscript/jscript_Pl.rc
new file mode 100644
index 0000000..8bbbe73
--- /dev/null
+++ b/dlls/jscript/jscript_Pl.rc
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010 ?ukasz Wojni?owicz
+ *
+ * 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 "resource.h"
+
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TO_PRIMITIVE        "B??d przy przekszta?caniu obiektu do typu podstawowego"
+    IDS_INVALID_CALL_ARG    "Niew?a?ciwe wywo?anie procedury lub argument"
+    IDS_CREATE_OBJ_ERROR    "Serwer automatyzacji nie mo?e stworzy? obiektu"
+    IDS_NO_PROPERTY         "Obiekt nie wspiera tej w?a?ciwo?ci lub metody"
+    IDS_ARG_NOT_OPT         "Argument nieopcjonalny"
+    IDS_SYNTAX_ERROR        "B??d sk?adni"
+    IDS_SEMICOLON           "Oczekiwane ';'"
+    IDS_LBRACKET            "Oczekiwane '('"
+    IDS_RBRACKET            "Oczekiwane ')'"
+    IDS_UNTERMINATED_STR    "Niezako?czona sta?a znakowa"
+    IDS_NOT_FUNC            "Oczekiwana funkcja"
+    IDS_NOT_DATE            "'[obiekt]' nie jest obiektem daty"
+    IDS_NOT_NUM             "Oczekiwana liczba"
+    IDS_OBJECT_EXPECTED     "Oczekiwany obiekt"
+    IDS_ILLEGAL_ASSIGN      "Niepoprawne przypisanie"
+    IDS_UNDEFINED           "'|' jest niezdefiniowany"
+    IDS_NOT_BOOL            "Oczekiwany obiekt boolean"
+    IDS_JSCRIPT_EXPECTED    "Oczekiwany obiekt JScript"
+    IDS_REGEXP_SYNTAX_ERROR "B??d sk?adni w regularnym wyra?eniu"
+    IDS_URI_INVALID_CHAR    "Kodowane URI zawiera niew?a?ciwe znaki"
+    IDS_INVALID_LENGTH      "D?ugo?? tablicy musi by? sko?czon? dodatni? liczb? sta??"
+    IDS_ARRAY_EXPECTED      "Oczekiwany obiekt tablicowy"
+}



From julliard at winehq.org  Mon Jun  7 10:02:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:23 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: cryptui: Add the
	Polish translation.
Message-ID: <E1OLdqJ-0008Ce-2K@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 177696890850b0dc83f09985e26e17fa110ac91d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=177696890850b0dc83f09985e26e17fa110ac91d

Author: ?ukasz Wojni?owicz <lukasz.wojnilowicz at gmail.com>
Date:   Sat Jun  5 12:12:46 2010 +0200

cryptui: Add the Polish translation.

---

 dlls/cryptui/Makefile.in   |    1 +
 dlls/cryptui/cryptui_Pl.rc |  464 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 465 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=177696890850b0dc83f09985e26e17fa110ac91d


From julliard at winehq.org  Mon Jun  7 10:02:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:23 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: winedbg: Add the
	Polish translation.
Message-ID: <E1OLdqJ-0008Cv-5e@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 43a5c15a2ecfa4b6c991e99a18304d8a25e75d3f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=43a5c15a2ecfa4b6c991e99a18304d8a25e75d3f

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Sat Jun  5 12:27:58 2010 +0200

winedbg: Add the Polish translation.

---

 programs/winedbg/Makefile.in |    1 +
 programs/winedbg/rsrc_Pl.rc  |   55 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index 7fba5cc..2989457 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -43,6 +43,7 @@ RC_SRCS = \
 	rsrc_Lt.rc \
 	rsrc_Nl.rc \
 	rsrc_No.rc \
+	rsrc_Pl.rc \
 	rsrc_Pt.rc \
 	rsrc_Ru.rc \
 	rsrc_Si.rc \
diff --git a/programs/winedbg/rsrc_Pl.rc b/programs/winedbg/rsrc_Pl.rc
new file mode 100644
index 0000000..5946d5b
--- /dev/null
+++ b/programs/winedbg/rsrc_Pl.rc
@@ -0,0 +1,55 @@
+/*
+ * Polish Language Support
+ *
+ * Copyright 2010 ?ukasz Wojni?owicz
+ *
+ * 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 "resource.h"
+
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+IDM_DEBUG_POPUP MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Debug", ID_DEBUG
+    END
+END
+
+IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "B??d programu"
+FONT 8, "Tahoma"
+BEGIN
+    LTEXT           "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0
+    LTEXT           "Program %s napotka? powa?ny problem i musi \
+                    zako?czy? dzia?anie. Przepraszamy za t? niedogodno??.",
+                    IDC_STATIC_TXT1,27,10,224,30
+    LTEXT           "Powodem b??du mo?e by? problem w programie lub braki w Wine. \
+                    Zajrzyj na http://appdb.winehq.org po wskaz?wki do uruchomienia \
+                    tej aplikacji.\n\n\
+                    Je?eli problem ten nie wyst?puje pod Windowsem i nie zosta? jeszcze zg?oszony \
+                    to mo?esz poinformowa? o tym pod adresem http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100
+    DEFPUSHBUTTON   "Zamknij", IDOK, 205, 151, 60, 16, WS_TABSTOP
+END
+
+STRINGTABLE
+BEGIN
+    IDS_AUTO_CAPTION     "Awaria programu Wine"
+    IDS_INVALID_PARAMS   "Wewn?trzne b??dy ? otrzymano niew?a?ciwe parametry"
+    IDS_UNIDENTIFIED     "(nieznane)"
+END



From julliard at winehq.org  Mon Jun  7 10:02:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:23 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: mapi32: Add the Polish
	translation.
Message-ID: <E1OLdqJ-0008DD-AN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 154e95a6983a301cacfd7e4f4ddf83cde4bd0d4f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=154e95a6983a301cacfd7e4f4ddf83cde4bd0d4f

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Sat Jun  5 12:12:48 2010 +0200

mapi32: Add the Polish translation.

---

 dlls/mapi32/Makefile.in |    1 +
 dlls/mapi32/Pl.rc       |   30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 5c3a2a0..9b3a07b 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -22,6 +22,7 @@ RC_SRCS = \
 	It.rc \
 	Lt.rc \
 	Nl.rc \
+	Pl.rc \
 	Ro.rc \
 	Ru.rc \
 	Si.rc \
diff --git a/dlls/mapi32/Pl.rc b/dlls/mapi32/Pl.rc
new file mode 100644
index 0000000..1c9f2e6
--- /dev/null
+++ b/dlls/mapi32/Pl.rc
@@ -0,0 +1,30 @@
+/*
+* MAPI32 Polish resources
+*
+* Copyright 2010 ?ukasz Wojni?owicz
+*
+* 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"
+
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+   IDS_NO_MAPI_CLIENT, "Wysy?anie maila zako?czy?o si? niepowodzeniem, poniewa? nie masz zainstalowanego klienta mailowego MAPI."
+   IDS_SEND_MAIL, "Wysy?anie maila"
+}



From julliard at winehq.org  Mon Jun  7 10:02:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:23 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: shdoclc: Add the
	Polish translation.
Message-ID: <E1OLdqJ-0008DU-Ee@wine.codeweavers.com>

Module: wine
Branch: master
Commit: db4c92f856bb1456d45968d44448f3d73f4af59c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=db4c92f856bb1456d45968d44448f3d73f4af59c

Author: ?ukasz Wojni?owicz <lukasz.wojnilowicz at gmail.com>
Date:   Sun Jun  6 14:58:21 2010 +0200

shdoclc: Add the Polish translation.

---

 dlls/shdoclc/Makefile.in |    1 +
 dlls/shdoclc/Pl.rc       |  248 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 249 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=db4c92f856bb1456d45968d44448f3d73f4af59c


From julliard at winehq.org  Mon Jun  7 10:02:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:23 -0500
Subject: Akihiro Sagawa : taskmgr: Update Japanese translation.
Message-ID: <E1OLdqJ-0008Dl-LD@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 974301fe904db17f8c7395b214ac6a0b1ff584aa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=974301fe904db17f8c7395b214ac6a0b1ff584aa

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun  5 00:09:48 2010 +0900

taskmgr: Update Japanese translation.

---

 programs/taskmgr/Ja.rc |  111 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc
index 589575d..55825a4 100644
--- a/programs/taskmgr/Ja.rc
+++ b/programs/taskmgr/Ja.rc
@@ -217,10 +217,10 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "CPU ???",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT
-    GROUPBOX        "???",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX        "??????",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT
     GROUPBOX        "??",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT
     GROUPBOX        "???????? (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT
-    GROUPBOX        "?????Physical Memory (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT
+    GROUPBOX        "????? (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT
     GROUPBOX        "???? ??? (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT
     LTEXT           "????",IDS_TOTALS_HANDLE_COUNT,12,131,27,8
     LTEXT           "????",IDS_TOTALS_THREAD_COUNT,12,140,27,8
@@ -259,20 +259,20 @@ BEGIN
     EDITTEXT        IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
     GROUPBOX        "CPU ??????",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT
-    GROUPBOX        "????????????",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT
+    GROUPBOX        "?????????",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT
     PUSHBUTTON      "CPU ???",IDC_CPU_USAGE_GRAPH,12,17,47,37,0,
 		    WS_EX_CLIENTEDGE
     PUSHBUTTON      "??? ???",IDC_MEM_USAGE_GRAPH,12,75,47,37,0,
                     WS_EX_CLIENTEDGE
     PUSHBUTTON      "CPU ??????",IDC_CPU_USAGE_HISTORY_GRAPH,81,17,
                     153,37,0,WS_EX_CLIENTEDGE
-    PUSHBUTTON      "?????????",IDC_MEM_USAGE_HISTORY_GRAPH,81,75,
+    PUSHBUTTON      "?????????",IDC_MEM_USAGE_HISTORY_GRAPH,81,75,
                     153,37,0,WS_EX_CLIENTEDGE
 END
 
 IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE  0, 0, 247, 210
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "????????"
+CAPTION "???? ?????"
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT |
@@ -365,7 +365,7 @@ BEGIN
     PUSHBUTTON      "?????",IDCANCEL,138,178,50,14
     LTEXT           "??? ?????? [????] ????????????????",
                     IDC_STATIC,7,7,181,17
-    CONTROL         "???? ???(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX |
+    CONTROL         "?????(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX |
                     WS_DISABLED | WS_TABSTOP,7,28,56,10
     CONTROL         "PID (???? ID)(&P)",IDC_PID,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10
@@ -373,11 +373,11 @@ BEGIN
                     WS_TABSTOP,7,50,53,10
     CONTROL         "CPU ??(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,61,48,10
-    CONTROL         "??? - ???????(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX |
+    CONTROL         "??????(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,72,63,10
-    CONTROL         "??? - ????? ??? ???(&D)",IDC_MEMORYUSAGEDELTA,"Button",
+    CONTROL         "?????? ???(&D)",IDC_MEMORYUSAGEDELTA,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10
-    CONTROL         "??? - ??? ????? ???(&K)",IDC_PEAKMEMORYUSAGE,"Button",
+    CONTROL         "????????(&K)",IDC_PEAKMEMORYUSAGE,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10
     CONTROL         "??? ????(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,105,53,10
@@ -395,9 +395,9 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10
     CONTROL         "????? ???(&V)",IDC_VIRTUALMEMORYSIZE,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10
-    CONTROL         "??? - ??? ???(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX |
+    CONTROL         "??? ???(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,107,50,53,10
-    CONTROL         "??? - ???? ???(&O)",IDC_NONPAGEDPOOL,"Button",
+    CONTROL         "???? ???(&O)",IDC_NONPAGEDPOOL,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10
     CONTROL         "?????(&R)",IDC_BASEPRIORITY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10
@@ -425,7 +425,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "??? ?????"
     IDC_TASKMGR             "??? ?????"
-    IDS_RUNDLG_CAPTION      "Create New Task"
+    IDS_RUNDLG_CAPTION      "?????????"
 END
 
 STRINGTABLE DISCARDABLE
@@ -436,8 +436,8 @@ BEGIN
                             "[????] ???????????? ??????????????"
     ID_OPTIONS_HIDEWHENMINIMIZED "????????????? ???????????"
     ID_VIEW_REFRESH         "[?????] ???????????????? ????????????"
-    ID_VIEW_LARGE           "??????? ????? ???????"
-    ID_VIEW_SMALL           "??????? ????? ???????"
+    ID_VIEW_LARGE           "??????? ??????? ???????"
+    ID_VIEW_SMALL           "??????? ??????? ???????"
     ID_VIEW_DETAILS         "??????????????"
     ID_VIEW_UPDATESPEED_HIGH "?? 2??????????"
     ID_VIEW_UPDATESPEED_NORMAL "2?? 1??????????"
@@ -491,3 +491,86 @@ BEGIN
     ID_PROCESS_PAGE_SETPRIORITY_LOW "??????????? ? ???????"
     ID_PROCESS_PAGE_DEBUGCHANNELS "?????????????????????"
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_VIEW_LARGE                     "???????(&G)"
+    IDS_VIEW_SMALL                     "???????(&M)"
+    IDS_VIEW_DETAILS                   "??(&D)"
+    IDS_WINDOWS                        "?????(&W)"
+    IDS_VIEW_SELECTCOLUMNS             "??????(&S)..."
+    IDS_OPTIONS_SHOW16BITTASKS         "16??? ??????(&S)"
+    IDS_VIEW_CPUHISTORY                "CPU???(&C)"
+    IDS_VIEW_CPUHISTORY_ONEGRAPHALL    "?CPU???(&O)"
+    IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU?????(&P)"
+    IDS_VIEW_SHOWKERNELTIMES           "?????????(&S)"
+    IDS_APPLICATIONS                   "????????"
+    IDS_PROCESSES                      "????"
+    IDS_PERFORMANCE                    "???????"
+    IDS_STATUS_BAR_CPU_USAGE           "CPU ???: %3d%%"
+    IDS_STATUS_BAR_PROCESSES           "?????: %d"
+    IDS_STATUS_BAR_MEMORY_USAGE        "??????: %dK / %dK"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_IMAGENAME         "?????"
+    IDS_PID               "PID"
+    IDS_CPUUSAGE          "CPU"
+    IDS_CPUTIME           "CPU ??"
+    IDS_MEMORYUSAGE       "??????"
+    IDS_MEMORYUSAGEDELTA  "?????? ???"
+    IDS_PEAKMEMORYUSAGE   "????????"
+    IDS_PAGEFAULTS        "??? ????"
+    IDS_USEROBJECTS       "USER ??????"
+    IDS_IOREADS           "I/O ????"
+    IDS_IOREADBYTES       "I/O ????????"
+    IDS_SESSIONID         "????? ID"
+    IDS_USERNAME          "?????"
+    IDS_PAGEFAULTSDELTA   "??? ???? ???"
+    IDS_VIRTUALMEMORYSIZE "????? ???"
+    IDS_PAGEDPOOL         "??? ???"
+    IDS_NONPAGEDPOOL      "???? ???"
+    IDS_BASEPRIORITY      "?????"
+    IDS_HANDLECOUNT       "????"
+    IDS_THREADCOUNT       "????"
+    IDS_GDIOBJECTS        "GDI ??????"
+    IDS_IOWRITES          "I/O ????"
+    IDS_IOWRITEBYTES      "I/O ????????"
+    IDS_IOOTHER           "I/O ???"
+    IDS_IOOTHERBYTES      "I/O ????????"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_WARNING_TITLE               "??????????????"
+    IDS_PRIORITY_CHANGE_MESSAGE     "??: ?????????????????????????\n\
+                                     ??????????????????????????????\n\
+                                     ??????????????"
+    IDS_PRIORITY_UNABLE2CHANGE      "???????????"
+    IDS_TERMINATE_MESSAGE           "??: ?????????????????????\n\
+                                     ???????????????????\n\
+                                     ???????????????????????????????\n\
+                                     ????????????"
+    IDS_TERMINATE_UNABLE2TERMINATE  "????????????"
+    IDS_DEBUG_MESSAGE               "??: ????????????????????\n\
+                                     ??????????????????????????"
+    IDS_DEBUG_UNABLE2DEBUG          "??????????????"
+    IDS_AFFINITY_ERROR_MESSAGE      "?????????? 1 ?????????????????????"
+    IDS_AFFINITY_ERROR_TITLE        "????????"
+    IDS_AFFINITY_UNABLE2ACCESS      "??????????????????????????"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_SYSTEM_IDLE_PROCESS            "???? ???? ????"
+    IDS_APPLICATION_NOT_RESPONDING     "????"
+    IDS_APPLICATION_RUNNING            "???"
+    IDS_APPLICATION_TASK               "???"
+    IDS_APPLICATION_STATUS             "??"
+    IDS_DEBUG_CHANNEL                  "???? ?????"
+    IDS_DEBUG_CHANNEL_FIXME            "Fixme"
+    IDS_DEBUG_CHANNEL_ERR              "Err"
+    IDS_DEBUG_CHANNEL_WARN             "Warn"
+    IDS_DEBUG_CHANNEL_TRACE            "Trace"
+END



From julliard at winehq.org  Mon Jun  7 10:02:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:23 -0500
Subject: Akihiro Sagawa : oledlg: Update Japanese translation.
Message-ID: <E1OLdqJ-0008E2-Ob@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5d62b286776ca7ace8d73cd17bcfb3ef5923de74
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5d62b286776ca7ace8d73cd17bcfb3ef5923de74

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun  5 00:09:53 2010 +0900

oledlg: Update Japanese translation.

---

 dlls/oledlg/oledlg_Ja.rc |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/dlls/oledlg/oledlg_Ja.rc b/dlls/oledlg/oledlg_Ja.rc
index 0029ff3..a2cb229 100644
--- a/dlls/oledlg/oledlg_Ja.rc
+++ b/dlls/oledlg/oledlg_Ja.rc
@@ -58,3 +58,43 @@ STRINGTABLE DISCARDABLE
   IDS_NOTOLEMOD         "????????OLE??????????????OLE???????????????"
   IDS_NOTOLEMODCAPTION  "?????????"
 }
+
+IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140
+STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "???????????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT         "????:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
+    CONTROL       "????(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
+                  6, 38, 55, 10
+    CONTROL       "???????(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
+                  6, 63, 55, 10
+    LTEXT         "??(&A):", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP
+    LISTBOX       IDC_PS_PASTELIST,     65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_DISPLAYLIST,   65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE
+    CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
+    CONTROL       "?????", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
+    CONTROL       "???(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
+    CONTROL       "?????????(&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
+    CONTROL       "???????(&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
+    CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
+    CONTROL       "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
+    CONTROL       "??", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48
+    CONTROL       "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
+END
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_PS_PASTE_DATA                     "??????????? %s ?????????????"
+    IDS_PS_PASTE_OBJECT                   "???????????????????? %s ?????????????"
+    IDS_PS_PASTE_OBJECT_AS_ICON           "???????????????????? %s ???????????????????????????"
+    IDS_PS_PASTE_LINK_DATA                "??????????? %s ?????????????????????????????????????????????????????????"
+    IDS_PS_PASTE_LINK_OBJECT              "??????????????????????????????????????????????????????????????????"
+    IDS_PS_PASTE_LINK_OBJECT_AS_ICON      "??????????????????????????????????????????????????????????????????????????????"
+    IDS_PS_NON_OLE                        "?????????????????"
+    IDS_PS_UNKNOWN_TYPE                   "?????"
+    IDS_PS_UNKNOWN_SRC                    "??"
+    IDS_PS_UNKNOWN_APP                    "???????"
+}



From julliard at winehq.org  Mon Jun  7 10:02:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:23 -0500
Subject: Akihiro Sagawa : wordpad: Update Japanese translation.
Message-ID: <E1OLdqJ-0008EJ-Tj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 572950b23fdc6931f313651e220e9fbcdda3e6c0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=572950b23fdc6931f313651e220e9fbcdda3e6c0

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun  5 00:09:56 2010 +0900

wordpad: Update Japanese translation.

---

 programs/wordpad/Ja.rc |   47 +++++++++++++++++++----------------------------
 1 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc
index bd5e4c9..09c776f 100644
--- a/programs/wordpad/Ja.rc
+++ b/programs/wordpad/Ja.rc
@@ -129,17 +129,17 @@ BEGIN
         MENUITEM "??"     ID_COLOR_FUCHSIA
         MENUITEM "??"     ID_COLOR_AQUA
         MENUITEM "?"       ID_COLOR_WHITE
-        MENUITEM "Automatic" ID_COLOR_AUTOMATIC
+        MENUITEM "??"     ID_COLOR_AUTOMATIC
     END
 END
 
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "?????"
-FONT 9, "MS Shell Dlg"
+FONT 10, "MS Shell Dlg"
 BEGIN
     LTEXT        "???????",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY
+    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
     PUSHBUTTON   "&OK",IDOK,87,12,40,12
     PUSHBUTTON   "?????(&C)",IDCANCEL,87,26,40,12
 END
@@ -147,7 +147,7 @@ END
 IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "????"
-FONT 9, "MS Shell Dlg"
+FONT 10, "MS Shell Dlg"
 BEGIN
     LTEXT        "???????",-1,3,2,100,15
     LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
@@ -193,7 +193,7 @@ CAPTION ""
 FONT 9, "MS Shell Dlg"
 BEGIN
     GROUPBOX "??????", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "???????", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "?????????????(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "?????????(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "?????", -1, 150, 10, 120, 85
@@ -206,10 +206,14 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "????????? (*.rtf)"
+    STRING_ALL_FILES,              "???????? (*.*)"
     STRING_TEXT_FILES_TXT,         "?????? (*.txt)"
     STRING_TEXT_FILES_UNICODE_TXT, "Unicode??????(*.txt)"
-    STRING_ALL_FILES,              "???????? (*.*)"
+    STRING_RICHTEXT_FILES_RTF,     "????????? (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "?????????"
+    STRING_NEWFILE_TXT,            "??????"
+    STRING_NEWFILE_TXT_UNICODE,    "Unicode??????"
+    STRING_PRINTER_FILES_PRN,      "???????? (*.PRN)"
 END
 
 STRINGTABLE DISCARDABLE
@@ -221,18 +225,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_NEWFILE_RICHTEXT,     "?????????"
-    STRING_NEWFILE_TXT,          "??????"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicode??????"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "???????? (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
     STRING_VIEWPROPS_TITLE,          "?????"
     STRING_VIEWPROPS_TEXT,           "????"
     STRING_VIEWPROPS_RICHTEXT,       "???????"
@@ -245,16 +237,15 @@ BEGIN
     STRING_PREVIEW_PREVPAGE,         "?????"
     STRING_PREVIEW_TWOPAGES,         "2???"
     STRING_PREVIEW_ONEPAGE,          "1???"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
+    STRING_PREVIEW_ZOOMIN,           "??"
+    STRING_PREVIEW_ZOOMOUT,          "??"
     STRING_PREVIEW_CLOSE,            "???"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
+    STRING_PREVIEW_PAGE,             "???"
+    STRING_PREVIEW_PAGES,            "???"
+    STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "???"
+    STRING_UNITS_PT,                 "pt"
 END
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Mon Jun  7 10:02:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:23 -0500
Subject: Akihiro Sagawa : wineboot: Update Japanese translation.
Message-ID: <E1OLdqJ-0008Ec-WB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6356f692d42c0369e56db0658cedee27477a595d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6356f692d42c0369e56db0658cedee27477a595d

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun  5 00:09:50 2010 +0900

wineboot: Update Japanese translation.

---

 programs/wineboot/wineboot_Ja.rc |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/programs/wineboot/wineboot_Ja.rc b/programs/wineboot/wineboot_Ja.rc
index cee0bd2..707a902 100644
--- a/programs/wineboot/wineboot_Ja.rc
+++ b/programs/wineboot/wineboot_Ja.rc
@@ -38,3 +38,13 @@ BEGIN
     LTEXT           "???????????????????????????????",
                     IDC_STATIC,7,28,262,15
 END
+
+IDD_WAITDLG DIALOG 0, 0, 200, 50
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED
+CAPTION "Wine"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_WAITICON, 3, 3, 10, 10
+    LTEXT "%s ??? Wine ???????????\n?????????????",
+          IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX
+END



From julliard at winehq.org  Mon Jun  7 10:02:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:24 -0500
Subject: Akihiro Sagawa : wininet: Update Japanese translation.
Message-ID: <E1OLdqK-0008Ev-6N@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 089de46366ea7b5b76110ba8ba52e7cc9a3fa482
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=089de46366ea7b5b76110ba8ba52e7cc9a3fa482

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun  5 00:09:51 2010 +0900

wininet: Update Japanese translation.

---

 dlls/wininet/wininet_Ja.rc |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/dlls/wininet/wininet_Ja.rc b/dlls/wininet/wininet_Ja.rc
index e179b84..2d12563 100644
--- a/dlls/wininet/wininet_Ja.rc
+++ b/dlls/wininet/wininet_Ja.rc
@@ -30,7 +30,7 @@ FONT 9, "MS Shell Dlg"
 {
  LTEXT "??????????????????:", -1, 40, 6, 150, 15
  LTEXT "????", -1, 40, 26, 50, 10
- LTEXT "??", -1, 40, 46, 50, 10
+ LTEXT "??", -1, 40, 46, 50, 10
  LTEXT "????", -1, 40, 66, 50, 10
  LTEXT "?????", -1, 40, 86, 50, 10
  LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
@@ -43,6 +43,26 @@ FONT 9, "MS Shell Dlg"
  PUSHBUTTON "?????", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
 
+IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "???????"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "??????????????????:", -1, 40, 6, 150, 15
+ LTEXT "???", -1, 40, 26, 50, 10
+ LTEXT "??", -1, 40, 46, 50, 10
+ LTEXT "????", -1, 40, 66, 50, 10
+ LTEXT "?????", -1, 40, 86, 50, 10
+ LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "??????????(&S)(???????????)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "?????", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
 STRINGTABLE DISCARDABLE
 {
   IDS_LANCONNECTION "LAN ??"



From julliard at winehq.org  Mon Jun  7 10:02:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:24 -0500
Subject: Akihiro Sagawa : localui: Add Japanese translation.
Message-ID: <E1OLdqK-0008FC-B4@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5a5ee662a8947d990ef2cbf16f2ce545d1ed5aae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5a5ee662a8947d990ef2cbf16f2ce545d1ed5aae

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun  5 00:09:58 2010 +0900

localui: Add Japanese translation.

---

 dlls/localui/Makefile.in |    1 +
 dlls/localui/ui_Ja.rc    |   59 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in
index 72e1e1d..f3f626e 100644
--- a/dlls/localui/Makefile.in
+++ b/dlls/localui/Makefile.in
@@ -15,6 +15,7 @@ RC_SRCS = \
 	ui_En.rc \
 	ui_Fr.rc \
 	ui_It.rc \
+	ui_Ja.rc \
 	ui_Ko.rc \
 	ui_Lt.rc \
 	ui_Nl.rc \
diff --git a/dlls/localui/ui_Ja.rc b/dlls/localui/ui_Ja.rc
new file mode 100644
index 0000000..757eef8
--- /dev/null
+++ b/dlls/localui/ui_Ja.rc
@@ -0,0 +1,59 @@
+/*
+ * Japanese resources for localui
+ *
+ * Copyright 2007 Detlef Riekenberg
+ *
+ * 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 "localui.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "???? ??????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "??????????(&E):", -1, 7, 13, 194, 13, WS_VISIBLE
+    EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE
+    PUSHBUTTON "?????", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE
+END
+
+
+LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "???? ??????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "?????? (?)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
+    LTEXT "????(&T):", -1, 14, 22, 90, 13, WS_VISIBLE
+    EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
+    DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE
+    PUSHBUTTON "?????", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
+END
+
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_LOCALPORT "???? ???"
+    IDS_INVALIDNAME "'%s' ????????????????"
+    IDS_PORTEXISTS "??? %s ?????????"
+    IDS_NOTHINGTOCONFIG "?????????????????"
+}



From julliard at winehq.org  Mon Jun  7 10:02:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:24 -0500
Subject: Akihiro Sagawa : shell32: Update Japanese translation.
Message-ID: <E1OLdqK-0008FS-DQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 05464849e05d13ae19eaeb6c9a4074b8c0a9d838
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=05464849e05d13ae19eaeb6c9a4074b8c0a9d838

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun  5 00:09:55 2010 +0900

shell32: Update Japanese translation.

---

 dlls/shell32/shell32_Ja.rc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc
index d3ae40a..bb18d41 100644
--- a/dlls/shell32/shell32_Ja.rc
+++ b/dlls/shell32/shell32_Ja.rc
@@ -184,7 +184,7 @@ CAPTION ""
 FONT 9, "MS Shell Dlg"
 {
  ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
- LTEXT "Wine ????????????????????????????????????? ???????????????", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18
+ LTEXT "????????????????????? ???????? ??????? ???????????????", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18
  LTEXT "??(&O):", IDC_RUNDLG_LABEL, 7, 39, 24, 10
  CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
  DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP
@@ -208,6 +208,10 @@ STRINGTABLE
 	IDS_SHV_COLUMN11	"????"
 	IDS_SHV_COLUMN_DELFROM	"????"
 	IDS_SHV_COLUMN_DELDATE	"???"
+	IDS_SHV_COL_DOCS	"??"
+	IDS_SHV_COL_STATUS	"??"
+	IDS_SHV_COL_LOCATION	"??"
+	IDS_SHV_COL_MODEL	"???"
 
         /* special folders */
 	IDS_DESKTOP		"??????"



From julliard at winehq.org  Mon Jun  7 10:02:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:24 -0500
Subject: Sven Baars : wordpad: Fix Dutch translation.
Message-ID: <E1OLdqK-0008Fm-M6@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5f933967b747f6dfc4fb24fe1521b98eeb8a24ee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5f933967b747f6dfc4fb24fe1521b98eeb8a24ee

Author: Sven Baars <sven.wine at gmail.com>
Date:   Sun Jun  6 21:43:39 2010 +0200

wordpad: Fix Dutch translation.

---

 programs/wordpad/Nl.rc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc
index 010f53b..2c363f5 100644
--- a/programs/wordpad/Nl.rc
+++ b/programs/wordpad/Nl.rc
@@ -32,7 +32,7 @@ BEGIN
         MENUITEM "Op&slaan\tCtrl+S",      ID_FILE_SAVE
         MENUITEM "Ops&laan als...",       ID_FILE_SAVEAS
         MENUITEM SEPARATOR
-        MENUITEM "&Afdrukken...\tCtrl+P",     ID_PRINT
+        MENUITEM "Af&drukken...\tCtrl+P",     ID_PRINT
         MENUITEM "Afdruk&voorbeeld...",     ID_PREVIEW
         MENUITEM "Pa&gina-instellingen...",        ID_PRINTSETUP
         MENUITEM SEPARATOR
@@ -41,7 +41,7 @@ BEGIN
     POPUP "Be&werken"
     BEGIN
         MENUITEM "&Ongedaan maken\tCtrl+Z",     ID_EDIT_UNDO
-        MENUITEM "O&pnieuw\tCtrl+Y",            ID_EDIT_REDO
+        MENUITEM "Opn&ieuw\tCtrl+Y",            ID_EDIT_REDO
         MENUITEM SEPARATOR
         MENUITEM "K&nippen\tCtrl+X",            ID_EDIT_CUT
         MENUITEM "&Kopi?ren\tCtrl+C",           ID_EDIT_COPY
@@ -237,8 +237,8 @@ BEGIN
     STRING_PREVIEW_PREVPAGE,         "Vorige pagina"
     STRING_PREVIEW_TWOPAGES,         "Twee pagina's"
     STRING_PREVIEW_ONEPAGE,          "Een pagina"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
+    STRING_PREVIEW_ZOOMIN,           "Inzoomen"
+    STRING_PREVIEW_ZOOMOUT,          "Uitzoomen"
     STRING_PREVIEW_CLOSE,            "Sluiten"
     STRING_PREVIEW_PAGE,             "Pagina"
     STRING_PREVIEW_PAGES,            "Pagina's"



From julliard at winehq.org  Mon Jun  7 10:02:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:25 -0500
Subject: Sven Baars : comdlg32: Fix Dutch translation.
Message-ID: <E1OLdqL-0008GI-37@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3d6ce9cf945877fbd16bfcd9c285672d8f7900de
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3d6ce9cf945877fbd16bfcd9c285672d8f7900de

Author: Sven Baars <sven.wine at gmail.com>
Date:   Sun Jun  6 21:43:44 2010 +0200

comdlg32: Fix Dutch translation.

---

 dlls/comdlg32/cdlg_Nl.rc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc
index 8f29a59..d17ca92 100644
--- a/dlls/comdlg32/cdlg_Nl.rc
+++ b/dlls/comdlg32/cdlg_Nl.rc
@@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg"
  DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Alleen-&lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
@@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg"
  DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Alleen-&lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
@@ -108,7 +108,7 @@ FONT 8, "MS Shell Dlg"
  DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Annuleren", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Afdrukstand", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ GROUPBOX "Ori?ntatie", 1073, 6, 85, 100, 50, BS_GROUPBOX
  RADIOBUTTON "S&taand", 1058, 50, 100, 40, 12
  RADIOBUTTON "&Liggend", 1059, 50, 115, 40, 12
  ICON "LANDSCAP", 1097, 10, 95, 32, 32
@@ -336,7 +336,7 @@ BEGIN
   COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
   LTEXT "La&de:", stc3, 16, 132, 36, 8
   COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Orientatie", grp1, 8, 156, 64, 56, BS_GROUPBOX
+  GROUPBOX "Ori?ntatie", grp1, 8, 156, 64, 56, BS_GROUPBOX
   AUTORADIOBUTTON "&Staand", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
   GROUPBOX "Randen", grp4, 80, 156, 152, 56, BS_GROUPBOX



From julliard at winehq.org  Mon Jun  7 10:02:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:25 -0500
Subject: Luca Bennati : regedit: Update Italian translation.
Message-ID: <E1OLdqL-0008GY-7X@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 707ccc4fd6a0b7c6f7a5cefd28f19d2746b3984f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=707ccc4fd6a0b7c6f7a5cefd28f19d2746b3984f

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Thu Jun  3 19:06:45 2010 +0200

regedit: Update Italian translation.

---

 programs/regedit/It.rc |   56 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc
index dc57e8f..96c562b 100644
--- a/programs/regedit/It.rc
+++ b/programs/regedit/It.rc
@@ -4,6 +4,7 @@
  * Copyright 2002 Robert Dickenson
  * Copyright 2003-2004 Ivan Leo Puoti
  * Copyright 2006 Antonio Codazzi
+ * Copyright 2010 Luca Bennati
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,9 @@
 
 #include "resource.h"
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 /*
@@ -53,7 +57,7 @@ BEGIN
             MENUITEM "Valore &stringa",         ID_EDIT_NEW_STRINGVALUE
             MENUITEM "Valore &binario",         ID_EDIT_NEW_BINARYVALUE
             MENUITEM "Valore &DWORD",           ID_EDIT_NEW_DWORDVALUE
-            MENUITEM "&Multi String Value",     ID_EDIT_NEW_MULTI_STRINGVALUE
+            MENUITEM "Valore &multistringa",     ID_EDIT_NEW_MULTI_STRINGVALUE
         END
         MENUITEM SEPARATOR
         MENUITEM "&Elimina\tDel",                ID_EDIT_DELETE
@@ -104,13 +108,13 @@ BEGIN
             MENUITEM "Valore &stringa",         ID_EDIT_NEW_STRINGVALUE
             MENUITEM "Valore &binario",         ID_EDIT_NEW_BINARYVALUE
             MENUITEM "Valore &DWORD",           ID_EDIT_NEW_DWORDVALUE
-            MENUITEM "&Multi String Value",     ID_EDIT_NEW_MULTI_STRINGVALUE
+            MENUITEM "Valore &multistringa",     ID_EDIT_NEW_MULTI_STRINGVALUE
         END
         MENUITEM SEPARATOR
         MENUITEM "&Elimina\tDel",                ID_EDIT_DELETE
         MENUITEM "&Rinomina\tF2"                 ID_EDIT_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Export...",                  ID_EDIT_EXPORT
+        MENUITEM "&Esporta...",                  ID_EDIT_EXPORT
         MENUITEM "&Copia nome chiave",              ID_EDIT_COPYKEYNAME
         MENUITEM SEPARATOR
         MENUITEM "&Trova\tCtrl+F",               ID_EDIT_FIND, GRAYED
@@ -121,6 +125,17 @@ END
  * Dialog
  */
 
+IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE  50, 50, 278, 54
+STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
+    WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Esporta registro", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP
+    AUTORADIOBUTTON "&Tutti", IDC_EXPORT_ALL, 12, 15, 244, 12
+    AUTORADIOBUTTON "Ramo s&elezionato:", IDC_EXPORT_SELECTED, 12, 30, 70, 12
+    EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12
+END
+
 IDD_FIND DIALOG DISCARDABLE  22, 17, 210, 85
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Trova"
@@ -201,6 +216,19 @@ BEGIN
    PUSHBUTTON   "Annulla",IDCANCEL,175,80,30,11,WS_GROUP
 END
 
+IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE  22, 17, 210, 175
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Modifica Multistringa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Nome del valore:",IDC_STATIC,5,5,119,8
+    EDITTEXT        IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED
+    LTEXT           "Dati del valore:",IDC_STATIC,5,30,119,8
+    EDITTEXT        IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN
+    DEFPUSHBUTTON   "OK",IDOK,120,156,40,15,WS_GROUP
+    PUSHBUTTON   "Annulla",IDCANCEL,165,156,40,15,WS_GROUP
+END
+
 /*
  * String Table
  */
@@ -220,7 +248,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     ID_REGISTRY_MENU        "Contiene i comandi per lavorare su tutto il Registro"
-    ID_EDIT_MENU            "Contiene i comandi per editare valori o chiavi"
+    ID_EDIT_MENU            "Contiene i comandi per modificare valori o chiavi"
     ID_VIEW_MENU            "Contiene i comandi per personalizzare la finestra del Registro"
     ID_FAVORITES_MENU       "Contiene i comandi per accedere alle chiavi usate frequentemente"
     ID_HELP_MENU            "Contiene i comandi per visualizzare la Guida e informazioni sull'editor del Registro"
@@ -234,6 +262,7 @@ BEGIN
     ID_EDIT_NEW_STRINGVALUE "Aggiunge un nuovo valore stringa"
     ID_EDIT_NEW_BINARYVALUE "Aggiunge un nuovo valore binario"
     ID_EDIT_NEW_DWORDVALUE  "Aggiunge un nuovo valore a doppia parola"
+	ID_EDIT_NEW_MULTI_STRINGVALUE "Aggiunge un nuovo valore multistringa"
     ID_REGISTRY_IMPORTREGISTRYFILE "Importa un file di testo nel Registro"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Esporta tutto o parte del Registro in un file di testo"
@@ -250,7 +279,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     ID_REGISTRY_EXIT        "Esce dall'editor del Registro"
     ID_FAVORITES_ADDTOFAVORITES "Aggiunge una chiave alla lista dei Preferiti"
-    ID_FAVORITES_REMOVEFAVORITE "Rimuove una o pi? chiavi dalla lista dei preferiti"
+    ID_FAVORITES_REMOVEFAVORITE "Rimuove una o pi?? chiavi dalla lista dei preferiti"
     ID_VIEW_STATUSBAR       "Mostra o nasconde la barra di stato"
     ID_VIEW_SPLIT           "Cambia la posizione del separatore tra due pannelli"
     ID_VIEW_REFRESH         "Aggiorna la finestra"
@@ -259,6 +288,7 @@ BEGIN
     ID_EDIT_COPYKEYNAME     "Copia il nome della chiave selezionata negli appunti"
     ID_EDIT_FIND            "Trova una stringa di testo in una chiave, un valore o in dei dati"
     ID_EDIT_FINDNEXT        "Trova la volta successiva il testo specificato nella ricerca precedente"
+    ID_EDIT_EXPORT          "Esporta il ramo selezionato del registro in un file di testo"
 END
 
 STRINGTABLE DISCARDABLE
@@ -276,6 +306,22 @@ BEGIN
     IDS_NOTFOUND            "Stringa di ricerca '%s' non trovata"
 END
 
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_FILEDIALOG_IMPORT_TITLE   "Importa file di registro"
+    IDS_FILEDIALOG_EXPORT_TITLE   "Esporta file di registro"
+    IDS_FILEDIALOG_FILTER         "File di registro\0*.reg\0File di registro Win9x/NT4 (REGEDIT4)\0*.reg\0Tutti i file (*.*)\0*.*\0\0"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REGISTRY_ROOT_NAME           "Il mio computer"
+    IDS_REGISTRY_DEFAULT_VALUE       "(Default)"
+    IDS_REGISTRY_VALUE_NOT_SET       "(valore non immesso)"
+    IDS_REGISTRY_VALUE_CANT_DISPLAY  "(impossibile visualizzare valore)"
+    IDS_REGISTRY_UNKNOWN_TYPE        "(%d sconosciuto)"
+END
+
 /*****************************************************************/
 
 /*



From julliard at winehq.org  Mon Jun  7 10:02:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:25 -0500
Subject: Luca Bennati : shell32: Fix Italian translation.
Message-ID: <E1OLdqL-0008Gq-D0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cabff4e2213ee777645539edabdb1611d9d0a3e0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cabff4e2213ee777645539edabdb1611d9d0a3e0

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Thu Jun  3 19:13:02 2010 +0200

shell32: Fix Italian translation.

---

 dlls/shell32/shell32_It.rc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc
index 8efa8c6..a797fda 100644
--- a/dlls/shell32/shell32_It.rc
+++ b/dlls/shell32/shell32_It.rc
@@ -254,6 +254,12 @@ STRINGTABLE
        IDS_SHUTDOWN_TITLE      "Termina sessione"
        IDS_SHUTDOWN_PROMPT     "Vuoi terminare la sessione di Wine?"
 
+        /* Run File dialog */
+        IDS_RUNDLG_ERROR           "Impossibile mostrare la finestra Esegui File (errore interno)"
+        IDS_RUNDLG_BROWSE_ERROR    "Impossibile mostrare la finestra Sfoglia (errore interno)"
+        IDS_RUNDLG_BROWSE_CAPTION  "Sfoglia"
+        IDS_RUNDLG_BROWSE_FILTER   "File eseguibili\0*.exe\0Tutti i files\0*.*\0\0"
+
 	/* shell folder path default values */
 	IDS_STARTMENU               "Start Menu"
 	IDS_PROGRAMS                "Start Menu\\Programmi"



From julliard at winehq.org  Mon Jun  7 10:02:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:25 -0500
Subject: Luca Bennati : shdoclc: Add Italian translation.
Message-ID: <E1OLdqL-0008H8-I4@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ec6c34eeeafc9da56f67b76a93bf0014321db3ff
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ec6c34eeeafc9da56f67b76a93bf0014321db3ff

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Sun Jun  6 16:41:53 2010 +0200

shdoclc: Add Italian translation.

---

 dlls/shdoclc/It.rc       |  253 ++++++++++++++++++++++++++++++++++++++++++++++
 dlls/shdoclc/Makefile.in |    1 +
 2 files changed, 254 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec6c34eeeafc9da56f67b76a93bf0014321db3ff


From julliard at winehq.org  Mon Jun  7 10:02:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:25 -0500
Subject: Luca Bennati : wldap32: Add Italian translation.
Message-ID: <E1OLdqL-0008HS-Mi@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d4b8ca12f21d7befc7ef30da9e41db1a105bb811
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d4b8ca12f21d7befc7ef30da9e41db1a105bb811

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Sun Jun  6 16:44:30 2010 +0200

wldap32: Add Italian translation.

---

 dlls/wldap32/Makefile.in   |    1 +
 dlls/wldap32/wldap32_It.rc |  128 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+), 0 deletions(-)

diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in
index 5942be1..625dd4b 100644
--- a/dlls/wldap32/Makefile.in
+++ b/dlls/wldap32/Makefile.in
@@ -35,6 +35,7 @@ RC_SRCS = \
 	wldap32_En.rc \
 	wldap32_Es.rc \
 	wldap32_Fr.rc \
+	wldap32_It.rc \
 	wldap32_Ko.rc \
 	wldap32_Lt.rc \
 	wldap32_Nl.rc \
diff --git a/dlls/wldap32/wldap32_It.rc b/dlls/wldap32/wldap32_It.rc
new file mode 100644
index 0000000..a7c9b6b
--- /dev/null
+++ b/dlls/wldap32/wldap32_It.rc
@@ -0,0 +1,128 @@
+/*
+ * Italian resources for WLDAP32
+ *
+ * Copyright 2010 Luca Bennati
+ *
+ * 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 "windef.h"
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+    0 "Successo"
+    1 "Errore nelle operazioni"
+    2 "Errore nel protocollo"
+    3 "Superato il tempo limite"
+    4 "Superata la dimensione massima"
+    5 "Compara falso"
+    6 "Compara vero"
+    7 "Metodo di autenticazione non supportato"
+    8 "Autenticazione forte richiesta"
+    9 "Referral (v2)"
+    10 "Referral"
+    11 "Superato il limite di amministrazione"
+    12 "Estensione critica non disponibile"
+    13 "Richiesta confidenzialit?"
+    14 ""
+    15 ""
+    16 "Attributo inesistente"
+    17 "Tipo non definito"
+    18 "Matching inappropriato"
+    19 "Violazione del vincolo"
+    20 "Attributo o valore esistente"
+    21 "Sintassi non valida"
+    22 ""
+    23 ""
+    24 ""
+    25 ""
+    26 ""
+    27 ""
+    28 ""
+    29 ""
+    30 ""
+    31 ""
+    32 "Oggetto inesistente"
+    33 "Problema di alias"
+    34 "Sintassi DN non valida"
+    35 "? foglia"
+    36 "Problema di dereferenziazione di alias"
+    37 ""
+    38 ""
+    39 ""
+    40 ""
+    41 ""
+    42 ""
+    43 ""
+    44 ""
+    45 ""
+    46 ""
+    47 ""
+    48 "Autenticazione non appropriata"
+    49 "Credenziali non valide"
+    50 "Diritti insufficenti"
+    51 "Occupato"
+    52 "Non disponibile"
+    53 "Non intenzionato ad agire"
+    54 "Trovato Loop"
+    55 ""
+    56 ""
+    57 ""
+    58 ""
+    59 ""
+    60 "Controllo dell'ordine mancante"
+    61 "Errore di range dell'indice"
+    62 ""
+    63 ""
+    64 "Violazione di nominazione"
+    65 "Violazione di classe dell'oggetto"
+    66 "Non permesso su non-foglie"
+    67 "Non permesso su RDN"
+    68 "Esiste gi?"
+    69 "Nessuna mod di classi di oggetto"
+    70 "Risultati troppo grandi"
+    71 "Ha effetto su molti DSA"
+    72 ""
+    73 ""
+    74 ""
+    75 ""
+    76 ""
+    77 ""
+    78 ""
+    79 ""
+    80 "Altro"
+    81 "Server irraggiungibile"
+    82 "Errore locale"
+    83 "Errore di codifica"
+    84 "Errore di decodifica"
+    85 "Timeout"
+    86 "Autenticazione sconosciuta"
+    87 "Errore del filtro"
+    88 "Utente eliminato"
+    89 "Errore del parametro"
+    90 "Memoria non disponibile"
+    91 "Impossibile connettersi al server LDAP"
+    92 "Operazione non supportata da questa versione del protocollo LDAP"
+    93 "Il controllo specificato non ? stato trovato nel messaggio"
+    94 "Nessun rislutato presente nel messaggio"
+    95 "Pi? risultati ricevuti"
+    96 "Loop nel gestire i referral"
+    97 "Ecceduto il limite di salti di referral"
+}



From julliard at winehq.org  Mon Jun  7 10:02:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:25 -0500
Subject: Luca Bennati : oleview: Add Italian translation.
Message-ID: <E1OLdqL-0008Hj-Ra@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 522fe9abebbc3fd319254de0bebadbe7200152c9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=522fe9abebbc3fd319254de0bebadbe7200152c9

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Sun Jun  6 16:43:03 2010 +0200

oleview: Add Italian translation.

---

 programs/oleview/It.rc       |  218 ++++++++++++++++++++++++++++++++++++++++++
 programs/oleview/Makefile.in |    1 +
 2 files changed, 219 insertions(+), 0 deletions(-)

diff --git a/programs/oleview/It.rc b/programs/oleview/It.rc
new file mode 100644
index 0000000..0865306
--- /dev/null
+++ b/programs/oleview/It.rc
@@ -0,0 +1,218 @@
+/*
+ * OleView (It.rc)
+ * Italian Language Support
+ *
+ * Copyright 2010 Luca Bennati
+ *
+ * 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 "resource.h"
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+IDM_MENU MENU
+{
+    POPUP "&File"
+    {
+        MENUITEM "Fi&ssa su file...",    IDM_BIND
+        MENUITEM "&Mostra TypeLib...",    IDM_TYPELIB
+        MENUITEM SEPARATOR
+        MENUITEM "Configurazione di &sistema...",    IDM_SYSCONF
+        MENUITEM "Esegui l'editor di &registro",    IDM_REGEDIT
+        MENUITEM SEPARATOR
+        MENUITEM "&Esci",    IDM_EXIT
+    }
+    POPUP "&Elemento"
+    {
+        POPUP "Flag &CoCreateInstance"
+        {
+            MENUITEM "CLSCTX_&INPROC_SERVER",    IDM_FLAG_INSERV,CHECKED
+            MENUITEM "CLSCTX_INPROC_&HANDLER",    IDM_FLAG_INHANDL
+            MENUITEM "CLSCTX_&LOCAL_SERVER",        IDM_FLAG_LOCSERV,CHECKED
+            MENUITEM "CLSCTX_&REMOTE_SERVER",    IDM_FLAG_REMSERV
+        }
+        MENUITEM SEPARATOR
+        MENUITEM "Mostra informazioni sul &tipo",    IDM_TYPEINFO, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Crea &instanza",    IDM_CREATEINST, GRAYED
+        MENUITEM "Crea instanza &su...",    IDM_CREATEINSTON, GRAYED
+        MENUITEM "&Rilascia instanza",    IDM_RELEASEINST, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Copia C&LSID negli appunti",    IDM_COPYCLSID, GRAYED
+        MENUITEM "Copia categoria oggetto &HTML negli appunti", IDM_HTMLTAG, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Mostra...",    IDM_VIEW, GRAYED
+    }
+    POPUP "&Visualizza"
+    {
+        MENUITEM "Modalit? &esperto",    IDM_EXPERT,CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "Categorie di componenti &nascoste",    IDM_HIDDEN, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Barra degli s&trumenti",    IDM_TOOLBAR,CHECKED
+        MENUITEM "Barra dello &stato",    IDM_STATUSBAR,CHECKED
+        MENUITEM SEPARATOR
+        MENUITEM "&Aggiorna\tF5",    IDM_REFRESH
+    }
+    POPUP "&Aiuto"
+    {
+        MENUITEM "&Su OleView",    IDM_ABOUT
+    }
+}
+
+IDM_TYPELIB MENU
+{
+    POPUP "&File"
+    {
+        MENUITEM "&Salva come...",    IDM_SAVEAS
+        MENUITEM "&Chiudi",  IDM_CLOSE
+    }
+    POPUP "&Vista"
+    {
+        MENUITEM "&Raggruppa per tipo", IDM_GROUP
+        MENUITEM SEPARATOR
+        MENUITEM "&Barra degli Strumenti",    IDM_TOOLBAR
+        MENUITEM "Barra di &Stato", IDM_STATUSBAR,CHECKED
+    }
+}
+
+STRINGTABLE
+{
+    IDS_APPNAME            "OleView"
+    IDS_APPTITLE           "OleView"
+    IDS_READY              "Pronto"
+    IDS_ABOUT              "OleView - Visualizzatore di oggetti OLE/COM"
+    IDS_ABOUTVER           "versione 1.0"
+    IDS_TYPELIBTITLE       "Visore ITypeLib"
+    IDS_OPEN               "Apri"
+    IDS_OPEN_TYPELIB_FILTER "File TypeLib (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0Tutti i file (*.*)\0*.*\0\0"
+
+    IDM_BIND,              "Fissa su un file con un File Moniker"
+    IDM_TYPELIB,           "Apri un file TypeLib e visualizza i contenuti"
+    IDM_SYSCONF,           "Cambia le impostazioni per COM Distribuite per l'intera macchina"
+    IDM_REGEDIT,           "Esegui l'editor di registro di Wine"
+    IDM_EXIT,              "Chiudi l'applicazione. Chiede se salvare i cambiamenti"
+    IDM_CREATEINST,        "Crea un'instanza dell'elemento selezionato"
+    IDM_CREATEINSTON,      "Crea un'instanza dell'elemento selezionato su una macchina specifica"
+    IDM_RELEASEINST,       "Rilascia l'istanza dell'elemento correntemente selezionato"
+    IDM_COPYCLSID,         "Copia il GUID dell'elemento correntemente selezionato negli appunti"
+    IDM_VIEW,              "Mostra il visualizzatore per l'elemento selezionato"
+    IDM_FLAG_INSERV,       "Usa CLSCTX_INPROC_SERVER nel chiamare CoGetClassObject"
+    IDM_FLAG_INHANDL,      "Usa CLSCTX_INPROC_HANDLER nel chiamare CoGetClassObject"
+    IDM_FLAG_LOCSERV,      "Usa CLSCTX_LOCAL_SERVER nel chiamare CoGetClassObject"
+    IDM_FLAG_REMSERV,      "Usa CLSCTX_REMOTE_SERVER nel chiamare CoGetClassObject"
+    IDM_EXPERT,            "Cambia tra modalit? visualizzazione esperto e novizio"
+    IDM_HIDDEN,            "Cambia display delle categorie di componenti che non devono essere visibili"
+    IDM_TOOLBAR,           "Mostra o nascondi la barra degli strumenti"
+    IDM_STATUSBAR,         "Mostra o nascondi la barra di stato"
+    IDM_REFRESH,           "Aggiorna tutte le liste"
+    IDM_ABOUT,             "Mostra informazioni, numero di versione e copyright del programma"
+
+    IDM_SAVEAS,            "Salva come file .IDL o .H"
+    IDM_CLOSE,             "Chiudi finestra"
+    IDM_GROUP,             "Raggruppa TypeInfo per tipologia"
+
+    IDS_TREE_OC,           "Classi dell'oggetto"
+    IDS_TREE_GBCC,         "Raggruppati per categoria di componente"
+    IDS_TREE_O1O,          "Oggetti OLE 1.0"
+    IDS_TREE_CLO,          "Oggetti di librerie COM"
+    IDS_TREE_AO,           "Tutti gli oggetti"
+    IDS_TREE_AID,          "ID Applicazione"
+    IDS_TREE_TL,           "TypeLibrary"
+    IDS_TL_VER,            "ver."
+    IDS_TREE_I,            "Interfacce"
+
+    IDS_TAB_REG,           "Registro"
+    IDS_TAB_IMPL,          "Implementazione"
+    IDS_TAB_ACTIV,         "Attivazione"
+
+    IDS_CGCOFAIL,          "CoGetClassObject fallito."
+    IDS_ERROR_UNKN,        "Errore sconosciuto"
+    IDS_TRUE,              "Vero"
+    IDS_FALSE,             "Falso"
+    IDS_BYTES,             "bytes"
+
+    IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) fallito ($%x)"
+    IDS_INHERITINTERFACES, "Interfacce Ereditate"
+}
+
+DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU
+CAPTION "Connetti ad un'altra macchina"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT   "&Nome della macchina:", -1, 5, 6, 190, 8
+    EDITTEXT    IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "&OK", IDOK, 200, 5, 45, 14
+    PUSHBUTTON  "&Annulla", IDCANCEL, 200, 22, 45, 14
+}
+
+DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU
+CAPTION "Configurazione di sistema"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT   "Impostazioni di sistema", -1, 5, 6, 160, 8
+    CHECKBOX    "&Abilita i COM Distribuiti", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX
+    CHECKBOX    "Abilita Connessioni &Remote (solo Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX
+    LTEXT   "Queste impostazioni cambiano solo i valori del registro.\nNon hanno effetto sulle prestazioni di Wine.", -1, 5, 50, 160, 40
+    DEFPUSHBUTTON   "&OK", IDOK, 70, 80, 45, 14
+    PUSHBUTTON  "&Annulla", IDCANCEL, 120, 80, 45, 14
+}
+
+DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU
+CAPTION "Visualizzatore di interfacce predefinito"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT   "Interfaccia", -1, 5, 6, 50, 8
+    LTEXT   "", IDC_LABEL, 60, 6, 145, 8
+    LTEXT   "IID:", -1, 5, 16, 50, 8
+    LTEXT   "", IDC_IDENTIFIER, 60, 16, 165, 8
+    DEFPUSHBUTTON   "&Chiudi", IDCANCEL, 230, 6, 45, 14
+    PUSHBUTTON  "&Vedi informazioni sul tipo", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED
+}
+
+DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU
+CAPTION "Visualizzatore di interfaccia IPersist"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT   "Nome della classe:", -1, 5, 6, 50, 8
+    LTEXT   "", IDC_LABEL, 60, 6, 145, 8
+    LTEXT   "CLSID:", -1, 5, 16, 50, 8
+    LTEXT   "", IDC_IDENTIFIER, 60, 16, 165, 8
+    DEFPUSHBUTTON   "&Chiudi", IDCANCEL, 230, 6, 45, 14
+}
+
+DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU
+CAPTION "Visualizzatore di interfaccia IPersistStream"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT   "Nome della classe:", -1, 5, 6, 50, 8
+    LTEXT   "", IDC_LABEL, 60, 6, 145, 8
+    LTEXT   "CLSID:", -1, 5, 16, 50, 8
+    LTEXT   "", IDC_IDENTIFIER, 60, 16, 165, 8
+    DEFPUSHBUTTON   "&Chiudi", IDCANCEL, 230, 6, 45, 14
+    PUSHBUTTON  "&Sporco", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14
+    LTEXT   "???", IDC_ISDIRTY, 60, 34, 145, 8
+    PUSHBUTTON  "&MassimaDimensione", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14
+    LTEXT   "???", IDC_GETSIZEMAX, 60, 52, 145, 8
+}
diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in
index 3b9ec12..556fa08 100644
--- a/programs/oleview/Makefile.in
+++ b/programs/oleview/Makefile.in
@@ -20,6 +20,7 @@ RC_SRCS = \
 	De.rc \
 	En.rc \
 	Fr.rc \
+	It.rc \
 	Ja.rc \
 	Ko.rc \
 	Lt.rc \



From julliard at winehq.org  Mon Jun  7 10:02:25 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:25 -0500
Subject: Andrew Eikum : msi/tests: Fix install tests for Win9x.
Message-ID: <E1OLdqL-0008I1-VQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c99c5a41e976a4b2ea4493392e6f6d43e2d54742
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c99c5a41e976a4b2ea4493392e6f6d43e2d54742

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Fri Jun  4 09:56:58 2010 -0500

msi/tests: Fix install tests for Win9x.

---

 dlls/msi/tests/install.c |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 22309c2..b78918c 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3218,12 +3218,21 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files)
 
 static BOOL get_user_dirs(void)
 {
-    HRESULT hres;
+    HKEY hkey;
+    DWORD type, size;
 
-    hres = SHGetFolderPathA(NULL, CSIDL_APPDATA, NULL, 0, APP_DATA_DIR);
-    if(FAILED(hres))
+    if(RegOpenKey(HKEY_CURRENT_USER,
+                   "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",
+                   &hkey))
         return FALSE;
 
+    size = MAX_PATH;
+    if(RegQueryValueExA(hkey, "AppData", 0, &type, (LPBYTE)APP_DATA_DIR, &size)){
+        RegCloseKey(hkey);
+        return FALSE;
+    }
+
+    RegCloseKey(hkey);
     return TRUE;
 }
 
@@ -9426,7 +9435,7 @@ static void test_icon_table(void)
     MSIHANDLE hdb = 0, record;
     LPCSTR query;
     UINT res;
-    CHAR path[MAX_PATH];
+    CHAR path[MAX_PATH], win9xpath[MAX_PATH];
     static const char prodcode[] = "{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}";
 
     create_database(msifile, icon_base_tables, sizeof(icon_base_tables) / sizeof(msi_table));
@@ -9473,12 +9482,20 @@ static void test_icon_table(void)
     res = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 ALLUSERS=1");
     ok(res == ERROR_SUCCESS, "Failed to system-wide install: %d\n", res);
 
+    /* win9x with MSI 2.0 installs the icon to a different folder, same as above */
+    lstrcpyA(win9xpath, APP_DATA_DIR);
+    lstrcatA(path, "\\");
+    lstrcatA(path, "Microsoft\\Installer\\");
+    lstrcatA(path, prodcode);
+    lstrcatA(path, "\\testicon");
+
     lstrcpyA(path, WINDOWS_DIR);
     lstrcatA(path, "\\");
     lstrcatA(path, "Installer\\");
     lstrcatA(path, prodcode);
     lstrcatA(path, "\\testicon");
-    ok(file_exists(path), "System-wide icon file isn't where it's expected (%s)\n", path);
+    ok(file_exists(path) || file_exists(win9xpath),
+            "System-wide icon file isn't where it's expected (%s)\n", path);
 
     res = MsiInstallProductA(msifile, "REMOVE=ALL");
     ok(res == ERROR_SUCCESS, "Failed to uninstall system-wide\n");



From julliard at winehq.org  Mon Jun  7 10:02:26 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:26 -0500
Subject: Nikolay Sivov : comctl32/rebar: Fix index check condition for
	RB_SHOWBAND.
Message-ID: <E1OLdqM-0008IM-65@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 60e467a6cd1f1f0936e0979d925495d6bde23981
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=60e467a6cd1f1f0936e0979d925495d6bde23981

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun  7 01:15:43 2010 +0400

comctl32/rebar: Fix index check condition for RB_SHOWBAND.

---

 dlls/comctl32/rebar.c       |    2 +-
 dlls/comctl32/tests/rebar.c |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index cd3abad..7a2995c 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2779,7 +2779,7 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT iBand, BOOL show)
 {
     REBAR_BAND *lpBand;
 
-    if (iBand < 0 || iBand > infoPtr->uNumBands)
+    if (iBand < 0 || iBand >= infoPtr->uNumBands)
 	return FALSE;
 
     lpBand = REBAR_GetBand(infoPtr, iBand);
diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index a75a064..d5f27b9 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -925,6 +925,36 @@ static HWND create_parent_window(void)
     return hwnd;
 }
 
+static void test_showband(void)
+{
+    HWND hRebar;
+    REBARBANDINFOA rbi;
+    BOOL ret;
+
+    hRebar = create_rebar_control();
+
+    /* no bands */
+    ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE);
+    ok(ret == FALSE, "got %d\n", ret);
+
+    rbi.cbSize = REBARBANDINFOA_V6_SIZE;
+    rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD;
+    rbi.cx = 200;
+    rbi.cxMinChild = 100;
+    rbi.cyMinChild = 30;
+    rbi.hwndChild = NULL;
+    SendMessageA(hRebar, RB_INSERTBAND, -1, (LPARAM)&rbi);
+
+    /* index out of range */
+    ret = SendMessageA(hRebar, RB_SHOWBAND, 1, TRUE);
+    ok(ret == FALSE, "got %d\n", ret);
+
+    ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE);
+    ok(ret == TRUE, "got %d\n", ret);
+
+    DestroyWindow(hRebar);
+}
+
 START_TEST(rebar)
 {
     HMODULE hComctl32;
@@ -948,6 +978,7 @@ START_TEST(rebar)
 
     test_bandinfo();
     test_colors();
+    test_showband();
 
     if(!is_font_installed("System") || !is_font_installed("Tahoma"))
     {



From julliard at winehq.org  Mon Jun  7 10:02:26 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:26 -0500
Subject: Jose Rostagno : shell32: Update Spanish translation.
Message-ID: <E1OLdqM-0008Id-AD@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 26e4154629f297c4469bc1824cdb24fda5c58db6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=26e4154629f297c4469bc1824cdb24fda5c58db6

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Sun Jun  6 13:36:58 2010 -0300

shell32: Update Spanish translation.

---

 dlls/shell32/shell32_Es.rc |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc
index 06580d1..176c677 100644
--- a/dlls/shell32/shell32_Es.rc
+++ b/dlls/shell32/shell32_Es.rc
@@ -1,6 +1,7 @@
 /*
  * Copyright 1998 Juergen Schmied
  * Copyright 2003,2004,2007,2008 Jos? Manuel Ferrer Ortiz
+ * Copyright 2010 Jos? Rostagno
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -95,13 +96,13 @@ END
 
 MENU_CPANEL MENU
 BEGIN
-    POPUP "&File"
+    POPUP "&Archivo"
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "E&xit", IDM_CPANEL_EXIT
+        MENUITEM "S&alir", IDM_CPANEL_EXIT
     END
 
-    POPUP "&View"
+    POPUP "&Ver"
     BEGIN
         MENUITEM "Iconos &grandes", FCIDM_SHVIEW_BIGICON
         MENUITEM "Iconos &peque?os", FCIDM_SHVIEW_SMALLICON
@@ -109,9 +110,9 @@ BEGIN
         MENUITEM "&Detalles", FCIDM_SHVIEW_REPORTVIEW
     END
 
-    POPUP "&Help"
+    POPUP "&Ayuda"
     BEGIN
-        MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT
+        MENUITEM "&Acerca de Panel de Control...", IDM_CPANEL_ABOUT
     END
 END
 
@@ -206,12 +207,16 @@ STRINGTABLE
 	IDS_SHV_COLUMN11        "Grupo"
 	IDS_SHV_COLUMN_DELFROM  "Lugar original"
 	IDS_SHV_COLUMN_DELDATE  "Fecha de borrado"
+	IDS_SHV_COL_DOCS        "Documentos"
+	IDS_SHV_COL_STATUS      "Estado"
+	IDS_SHV_COL_LOCATION    "Ubicaci?n"
+	IDS_SHV_COL_MODEL       "Modelo"
 
         /* special folders */
 	IDS_DESKTOP		"Escritorio"
 	IDS_MYCOMPUTER		"Mi PC"
         IDS_RECYCLEBIN_FOLDER_NAME "Papelera de reciclaje"
-	IDS_CONTROLPANEL	"Control Panel"
+	IDS_CONTROLPANEL	"Panel de Control"
 
         /* context menus */
 	IDS_VIEW_LARGE		"Iconos &grandes"
@@ -245,6 +250,12 @@ STRINGTABLE
         IDS_SHUTDOWN_TITLE	"Apagar"
         IDS_SHUTDOWN_PROMPT	"?Desea terminar su sesi?n de Wine?"
 
+        /* Run File dialog */
+        IDS_RUNDLG_ERROR           "No se puede mostrar el cuadro de di?logo ejecutar archivo (error interno)"
+        IDS_RUNDLG_BROWSE_ERROR    "No se puede mostrar el cuadro de di?logo Examinar (error interno)"
+        IDS_RUNDLG_BROWSE_CAPTION  "Examinar"
+        IDS_RUNDLG_BROWSE_FILTER   "Archivos ejecutables\0*.exe\0Todos los archivos\0*.*\0\0"
+
         /* shell folder path default values */
 	IDS_PROGRAMS                "Men? Inicio\\Programas"
 	IDS_PERSONAL                "Mis documentos"



From julliard at winehq.org  Mon Jun  7 10:02:26 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:26 -0500
Subject: Alexander Scott-Johns : msvcrt: Fix comments.
Message-ID: <E1OLdqM-0008Iu-Fg@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 19bff6bda561a14766cd95a6d632dccef4aaf781
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=19bff6bda561a14766cd95a6d632dccef4aaf781

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Sun Jun  6 15:19:14 2010 +0100

msvcrt: Fix comments.

---

 dlls/msvcrt/wcs.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index c26809c..b9ac8f7 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1103,7 +1103,7 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)
 }
 
 /*********************************************************************
- * vsnwsprintf_internal (INTERNAL)
+ * vsnwprintf_internal (INTERNAL)
  */
 static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len,
         const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, BOOL valid,
@@ -1120,7 +1120,7 @@ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len,
 }
 
 /*********************************************************************
- *              _vsnwsprintf (MSVCRT.@)
+ *              _vsnwprintf (MSVCRT.@)
  */
 int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len,
         const MSVCRT_wchar_t *format, __ms_va_list valist)
@@ -1129,7 +1129,7 @@ int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len,
 }
 
 /*********************************************************************
- *              _vsnwsprintf_l (MSVCRT.@)
+ *              _vsnwprintf_l (MSVCRT.@)
  */
 int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len,
         const MSVCRT_wchar_t *format, MSVCRT__locale_t locale,
@@ -1139,7 +1139,7 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len,
 }
 
 /*********************************************************************
- *              _vsnwsprintf_s_l (MSVCRT.@)
+ *              _vsnwprintf_s_l (MSVCRT.@)
  */
 int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer,
         MSVCRT_size_t count, const MSVCRT_wchar_t *format,
@@ -1168,7 +1168,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer
 }
 
 /*********************************************************************
- *              _vsnwsprintf_s (MSVCRT.@)
+ *              _vsnwprintf_s (MSVCRT.@)
  */
 int CDECL MSVCRT_vsnwprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer,
         MSVCRT_size_t count, const MSVCRT_wchar_t *format, __ms_va_list valist)
@@ -1520,7 +1520,7 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_
 }
 
 /*********************************************************************
- *  _wctoi64_l (MSVCRT.@)
+ *  _wcstoi64_l (MSVCRT.@)
  *
  * FIXME: locale parameter is ignored
  */



From julliard at winehq.org  Mon Jun  7 10:02:26 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:26 -0500
Subject: Alexander Scott-Johns : msvcrt/tests: Properly skip if functions are
	not available.
Message-ID: <E1OLdqM-0008JB-J3@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b205fd8108eca2fd29705875e53ed852f56a6b6d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b205fd8108eca2fd29705875e53ed852f56a6b6d

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Sun Jun  6 15:27:47 2010 +0100

msvcrt/tests: Properly skip if functions are not available.

---

 dlls/msvcrt/tests/printf.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c
index cea4db3..eaf248b 100644
--- a/dlls/msvcrt/tests/printf.c
+++ b/dlls/msvcrt/tests/printf.c
@@ -864,6 +864,13 @@ START_TEST(printf)
     p__vscprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscprintf");
     p__vscwprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscwprintf");
 
-    if (p__vscprintf) test_vscprintf();
-    if (p__vscwprintf) test_vscwprintf();
+    if (p__vscprintf)
+        test_vscprintf();
+    else
+        win_skip("_vscprintf not available\n");
+
+    if (p__vscwprintf)
+        test_vscwprintf();
+    else
+        win_skip("_vscwprintf not available\n");
 }



From julliard at winehq.org  Mon Jun  7 10:02:26 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:26 -0500
Subject: Alexander Scott-Johns : msvcrt: Rename _TRUNCATE to MSVCRT__TRUNCATE.
Message-ID: <E1OLdqM-0008JT-LD@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2663079c6036f07053f4627f4dbf1193b579e148
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2663079c6036f07053f4627f4dbf1193b579e148

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Sun Jun  6 16:11:09 2010 +0100

msvcrt: Rename _TRUNCATE to MSVCRT__TRUNCATE.

---

 dlls/msvcrt/heap.c   |    4 ++--
 dlls/msvcrt/mbcs.c   |    4 ++--
 dlls/msvcrt/msvcrt.h |    2 +-
 dlls/msvcrt/wcs.c    |    8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c
index ad6bb37..b1d4076 100644
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -578,7 +578,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements,
         return MSVCRT_EINVAL;
     }
 
-    if(count!=_TRUNCATE && count<numberOfElements)
+    if(count!=MSVCRT__TRUNCATE && count<numberOfElements)
         end = count;
     else
         end = numberOfElements-1;
@@ -586,7 +586,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements,
     for(i=0; i<end && src[i]; i++)
         dest[i] = src[i];
 
-    if(!src[i] || end==count || count==_TRUNCATE) {
+    if(!src[i] || end==count || count==MSVCRT__TRUNCATE) {
         dest[i] = '\0';
         return 0;
     }
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 8fca06d..76d562c 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -1783,7 +1783,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr,
         return MSVCRT_EINVAL;
     }
 
-    if(count==_TRUNCATE || size<count)
+    if(count==MSVCRT__TRUNCATE || size<count)
         conv = size;
     else
         conv = count;
@@ -1791,7 +1791,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr,
     conv = MSVCRT__mbstowcs_l(wcstr, mbstr, conv, locale);
     if(conv<size)
         wcstr[conv++] = '\0';
-    else if(conv==size && (count==_TRUNCATE || wcstr[conv-1]=='\0'))
+    else if(conv==size && (count==MSVCRT__TRUNCATE || wcstr[conv-1]=='\0'))
         wcstr[conv-1] = '\0';
     else {
         MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 8dd8881..f68790b 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -709,7 +709,7 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int);
 #define _MB_CP_ANSI     -3
 #define _MB_CP_LOCALE   -4
 
-#define _TRUNCATE ((MSVCRT_size_t)-1)
+#define MSVCRT__TRUNCATE ((MSVCRT_size_t)-1)
 
 void  __cdecl    MSVCRT_free(void*);
 void* __cdecl    MSVCRT_malloc(MSVCRT_size_t);
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index b9ac8f7..90bc3b8 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -304,7 +304,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr,
         return MSVCRT_EINVAL;
     }
 
-    if(count==_TRUNCATE || size<count)
+    if(count==MSVCRT__TRUNCATE || size<count)
         conv = size;
     else
         conv = count;
@@ -312,7 +312,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr,
     conv = MSVCRT__wcstombs_l(mbstr, wcstr, conv, locale);
     if(conv<size)
         mbstr[conv++] = '\0';
-    else if(conv==size && (count==_TRUNCATE || mbstr[conv-1]=='\0'))
+    else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0'))
         mbstr[conv-1] = '\0';
     else {
         MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
@@ -1043,7 +1043,7 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer,
     ret = vsnprintf_internal(str, len, format, locale, TRUE, valist);
 
     if(ret<0 || ret==len) {
-        if(count!=_TRUNCATE && count>sizeOfBuffer) {
+        if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) {
             MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
             *MSVCRT__errno() = MSVCRT_ERANGE;
             memset(str, 0, sizeOfBuffer);
@@ -1154,7 +1154,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer
     ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist);
 
     if(ret<0 || ret==len) {
-        if(count!=_TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) {
+        if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) {
             MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
             *MSVCRT__errno() = MSVCRT_ERANGE;
             memset(str, 0, sizeOfBuffer);



From julliard at winehq.org  Mon Jun  7 10:02:26 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:26 -0500
Subject: Alexander Scott-Johns : include/msvcrt: Define _TRUNCATE;
	use it in the tests.
Message-ID: <E1OLdqM-0008Jn-Rk@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4e8e2f39c5c028d6812578119885b3edef76d0ec
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4e8e2f39c5c028d6812578119885b3edef76d0ec

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Sun Jun  6 16:24:09 2010 +0100

include/msvcrt: Define _TRUNCATE; use it in the tests.

---

 dlls/msvcrt/tests/string.c |    8 ++++----
 include/msvcrt/stdlib.h    |    2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index f6c0e2c..1a362a1 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -1215,22 +1215,22 @@ static void test_mbstowcs(void)
         return;
     }
 
-    err = pmbstowcs_s(&ret, wOut, 6, mSimple, -1/*_TRUNCATE*/);
+    err = pmbstowcs_s(&ret, wOut, 6, mSimple, _TRUNCATE);
     ok(err == 0, "err = %d\n", err);
     ok(ret == 5, "ret = %d\n", (int)ret);
     ok(!memcmp(wOut, wSimple, sizeof(wSimple)), "wOut = %s\n", wine_dbgstr_w(wOut));
 
-    err = pmbstowcs_s(&ret, wOut, 6, mHiragana, -1/*_TRUNCATE*/);
+    err = pmbstowcs_s(&ret, wOut, 6, mHiragana, _TRUNCATE);
     ok(err == 0, "err = %d\n", err);
     ok(ret == 3, "ret = %d\n", (int)ret);
     ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut));
 
-    err = pwcstombs_s(&ret, mOut, 6, wSimple, -1/*_TRUNCATE*/);
+    err = pwcstombs_s(&ret, mOut, 6, wSimple, _TRUNCATE);
     ok(err == 0, "err = %d\n", err);
     ok(ret == 5, "ret = %d\n", (int)ret);
     ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut);
 
-    err = pwcstombs_s(&ret, mOut, 6, wHiragana, -1/*_TRUNCATE*/);
+    err = pwcstombs_s(&ret, mOut, 6, wHiragana, _TRUNCATE);
     ok(err == 0, "err = %d\n", err);
     ok(ret == 5, "ret = %d\n", (int)ret);
     ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut);
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index 6633ee9..35a9782 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -47,6 +47,8 @@ typedef struct
 #define _MAX_PATH           260
 #endif
 
+/* Make the secure string functions (names end in "_s") truncate their output */
+#define _TRUNCATE  ((size_t)-1)
 
 typedef struct _div_t {
     int quot;



From julliard at winehq.org  Mon Jun  7 10:02:26 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:26 -0500
Subject: Alexander Scott-Johns : msvcrt: The sizeOfBuffer argument of
	_vsnwprintf_s is measured in wide characters, not bytes.
Message-ID: <E1OLdqM-0008K5-Vf@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d56113cd4fba1822984dc5204cb22875ba2eb2e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d56113cd4fba1822984dc5204cb22875ba2eb2e8

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Mon Jun  7 02:54:14 2010 +0100

msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes.

---

 dlls/msvcrt/wcs.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 90bc3b8..78e42b2 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1147,17 +1147,17 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer
 {
     int len, ret;
 
-    len = sizeOfBuffer/sizeof(MSVCRT_wchar_t);
+    len = sizeOfBuffer;
     if(count!=-1 && len>count+1)
         len = count+1;
 
     ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist);
 
     if(ret<0 || ret==len) {
-        if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) {
+        if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) {
             MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
             *MSVCRT__errno() = MSVCRT_ERANGE;
-            memset(str, 0, sizeOfBuffer);
+            memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t));
         } else
             str[len-1] = '\0';
 
@@ -1242,8 +1242,7 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
     int r;
 
     __ms_va_start(ap, format);
-    r = MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t),
-            INT_MAX, format, ap);
+    r = MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, ap);
     __ms_va_end(ap);
 
     return r;
@@ -1271,8 +1270,7 @@ int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args )
 int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements,
         const MSVCRT_wchar_t* format, __ms_va_list args)
 {
-    return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t),
-            INT_MAX, format, args);
+    return MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, args );
 }
 
 /*********************************************************************
@@ -1281,8 +1279,8 @@ int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements
 int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements,
         const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args)
 {
-    return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t),
-            INT_MAX, format, locale, args );
+    return MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX,
+            format, locale, args );
 }
 
 /*********************************************************************



From julliard at winehq.org  Mon Jun  7 10:02:27 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:27 -0500
Subject: Alexander Scott-Johns : msvcrt: Fix spec file.
Message-ID: <E1OLdqN-0008KU-2r@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d3c00aab839e4042095f86f5079906bb9d611bb7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d3c00aab839e4042095f86f5079906bb9d611bb7

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Sun Jun  6 15:51:45 2010 +0100

msvcrt: Fix spec file.

---

 dlls/msvcrt/msvcrt.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 0cc51f5..604a5ce 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -986,9 +986,9 @@
 @ cdecl _vsnprintf_s(ptr long long str ptr) MSVCRT_vsnprintf_s
 @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) MSVCRT_vsnprintf_s_l
 @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
-@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnprintf_l
-@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnprintf_s
-@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnprintf_s_l
+@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l
+@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnwprintf_s
+@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnwprintf_s_l
 # stub _vsprintf_l
 # stub _vsprintf_p
 # stub _vsprintf_p_l



From julliard at winehq.org  Mon Jun  7 10:02:28 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:28 -0500
Subject: Alexander Scott-Johns : msvcrt/test: Add some simple _vsnwprintf_s
	tests.
Message-ID: <E1OLdqO-0008LE-Te@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d313c0b98285fa43fd679dc4d6f9d3d1ab60eafd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d313c0b98285fa43fd679dc4d6f9d3d1ab60eafd

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Mon Jun  7 03:04:53 2010 +0100

msvcrt/test: Add some simple _vsnwprintf_s tests.

---

 dlls/msvcrt/tests/printf.c |   61 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c
index eaf248b..b48db51 100644
--- a/dlls/msvcrt/tests/printf.c
+++ b/dlls/msvcrt/tests/printf.c
@@ -812,6 +812,9 @@ static void test_vsnwprintf(void)
 
 static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist);
 static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist);
+static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer,
+                                      size_t count, const wchar_t *format,
+                                      __ms_va_list valist);
 
 static int __cdecl _vscprintf_wrapper(const char *format, ...)
 {
@@ -852,6 +855,58 @@ static void test_vscwprintf(void)
     ok( ret == 8, "got %d expected 8\n", ret );
 }
 
+static int __cdecl _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer,
+                                 size_t count, const wchar_t *format, ...)
+{
+    int ret;
+    __ms_va_list valist;
+    __ms_va_start(valist, format);
+    ret = p__vsnwprintf_s(str, sizeOfBuffer, count, format, valist);
+    __ms_va_end(valist);
+    return ret;
+}
+
+static void test_vsnwprintf_s(void)
+{
+    const wchar_t format[] = { 'A','B','%','u','C',0 };
+    const wchar_t out7[] = { 'A','B','1','2','3','C',0 };
+    const wchar_t out6[] = { 'A','B','1','2','3',0 };
+    const wchar_t out2[] = { 'A',0 };
+    const wchar_t out1[] = { 0 };
+    wchar_t buffer[14] = { 0 };
+    int exp, got;
+
+    /* Enough room. */
+    exp = wcslen(out7);
+
+    got = _vsnwprintf_s_wrapper(buffer, 14, _TRUNCATE, format, 123);
+    ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
+    ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
+
+    got = _vsnwprintf_s_wrapper(buffer, 12, _TRUNCATE, format, 123);
+    ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
+    ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
+
+    got = _vsnwprintf_s_wrapper(buffer, 7, _TRUNCATE, format, 123);
+    ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
+    ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
+
+    /* Not enough room. */
+    exp = -1;
+
+    got = _vsnwprintf_s_wrapper(buffer, 6, _TRUNCATE, format, 123);
+    ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
+    ok( !wcscmp(out6, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
+
+    got = _vsnwprintf_s_wrapper(buffer, 2, _TRUNCATE, format, 123);
+    ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
+    ok( !wcscmp(out2, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
+
+    got = _vsnwprintf_s_wrapper(buffer, 1, _TRUNCATE, format, 123);
+    ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
+    ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
+}
+
 START_TEST(printf)
 {
     test_sprintf();
@@ -863,6 +918,7 @@ START_TEST(printf)
 
     p__vscprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscprintf");
     p__vscwprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscwprintf");
+    p__vsnwprintf_s = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vsnwprintf_s");
 
     if (p__vscprintf)
         test_vscprintf();
@@ -873,4 +929,9 @@ START_TEST(printf)
         test_vscwprintf();
     else
         win_skip("_vscwprintf not available\n");
+
+    if (p__vsnwprintf_s)
+        test_vsnwprintf_s();
+    else
+        win_skip("_vsnwprintf_s not available\n");
 }



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Nikolay Sivov : comctl32/rebar: Use defined constants as parameters.
Message-ID: <E1OLdqP-0008M1-4J@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fb1d5310ad22af0f01f5ce26fd648b0ccb643571
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb1d5310ad22af0f01f5ce26fd648b0ccb643571

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun  7 12:44:38 2010 +0400

comctl32/rebar: Use defined constants as parameters.

---

 dlls/comctl32/rebar.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 7a2995c..c254e34 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2452,7 +2452,7 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, INT iIndex, LPREBARBANDINFOW lprbbi, BOOL
     REBAR_DumpBand (infoPtr);
 
     REBAR_Layout(infoPtr);
-    InvalidateRect(infoPtr->hwndSelf, 0, TRUE);
+    InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
 
     return TRUE;
 }
@@ -2653,7 +2653,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, INT iBand, LPREBARBANDINFOW lprbbi, BOOL
 
     if (uChanged & (RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE | RBBIM_IMAGE)) {
 	  REBAR_Layout(infoPtr);
-	  InvalidateRect(infoPtr->hwndSelf, 0, 1);
+	  InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
     }
 
     return TRUE;
@@ -2798,7 +2798,7 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT iBand, BOOL show)
     }
 
     REBAR_Layout(infoPtr);
-    InvalidateRect(infoPtr->hwndSelf, 0, 1);
+    InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
 
     return TRUE;
 }
@@ -3399,7 +3399,7 @@ REBAR_SetRedraw (REBAR_INFO *infoPtr, BOOL redraw)
 	if (infoPtr->fStatus & BAND_NEEDS_REDRAW) {
 	    REBAR_MoveChildWindows (infoPtr, 0, infoPtr->uNumBands);
 	    REBAR_ForceResize (infoPtr);
-	    InvalidateRect (infoPtr->hwndSelf, 0, TRUE);
+	    InvalidateRect (infoPtr->hwndSelf, NULL, TRUE);
 	}
 	infoPtr->fStatus &= ~BAND_NEEDS_REDRAW;
     }



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Marcus Meissner : shlwapi: Handle NULL ptr return from allocation
	(Coverity ).
Message-ID: <E1OLdqP-0008MH-7R@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f01c43c47b9fe4bbc64874edb0af3bcd30c2b9a1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f01c43c47b9fe4bbc64874edb0af3bcd30c2b9a1

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Thu Jun  3 13:10:17 2010 +0200

shlwapi: Handle NULL ptr return from allocation (Coverity).

---

 dlls/shlwapi/ordinal.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 18295e4..5f332f3 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -4506,12 +4506,18 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText,
     {
         const WCHAR *ptr;
         UINT len = LoadStringW(hInstance, LOWORD(lpText), (LPWSTR)&ptr, 0);
+
         if (len)
         {
             szText = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR));
             if (szText) LoadStringW(hInstance, LOWORD(lpText), szText, len + 1);
         }
         pszText = szText;
+        if (!pszText) {
+            WARN("Failed to load id %d\n", LOWORD(lpText));
+            __ms_va_end(args);
+            return 0;
+        }
     }
     else
         pszText = lpText;



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Marcus Meissner : mshtml: Add check for doc_obj being NULL (Coverity).
Message-ID: <E1OLdqP-0008MY-9x@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4169d4dfb89cf2c69fdd2050f43e2491f08be6b8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4169d4dfb89cf2c69fdd2050f43e2491f08be6b8

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Sat Jun  5 09:21:36 2010 +0200

mshtml: Add check for doc_obj being NULL (Coverity).

---

 dlls/mshtml/htmlwindow.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 1701b53..1ba1101 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -58,7 +58,7 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node)
             htmldoc_addref(&doc_node->basedoc);
     }
 
-    if(doc_node && window->doc_obj->usermode == EDITMODE) {
+    if(doc_node && window->doc_obj && window->doc_obj->usermode == EDITMODE) {
         nsIDOMNSHTMLDocument *nshtmldoc;
         nsAString mode_str;
         nsresult nsres;



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Vincent Povirk : include: Add definitions for IWICColorContext.
Message-ID: <E1OLdqP-0008Mp-C8@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7862205d3ecbd2dc14351b11fbf1787d46032755
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7862205d3ecbd2dc14351b11fbf1787d46032755

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Sat Jun  5 13:04:52 2010 -0500

include: Add definitions for IWICColorContext.

---

 include/wincodec.idl |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/include/wincodec.idl b/include/wincodec.idl
index 9d3fee1..97fd4ac 100644
--- a/include/wincodec.idl
+++ b/include/wincodec.idl
@@ -108,6 +108,12 @@ typedef enum WICBitmapTransformOptions {
     WICBITMAPTRANSFORMOPTIONS_FORCE_DWORD = CODEC_FORCE_DWORD
 } WICBitmapTransformOptions;
 
+typedef enum WICColorContextType {
+    WICColorContextUninitialized = 0x00000000,
+    WICColorContextProfile = 0x00000001,
+    WICColorContextExifColorSpace = 0x00000002
+} WICColorContextType;
+
 typedef enum WICComponentType {
     WICDecoder = 0x00000001,
     WICEncoder = 0x00000002,
@@ -188,7 +194,6 @@ cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81")
 cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c")
 
 interface IWICPalette;
-interface IWICColorContext;
 interface IWICColorTransform;
 interface IWICFastMetadataEncoder;
 interface IWICMetadataQueryReader;
@@ -196,6 +201,34 @@ interface IWICMetadataQueryWriter;
 
 [
     object,
+    uuid(3c613a02-34b2-44ea-9a7c-45aea9c6fd6d)
+]
+interface IWICColorContext : IUnknown
+{
+    HRESULT InitializeFromFilename(
+        [in] LPCWSTR wzFilename);
+
+    HRESULT InitializeFromMemory(
+        [in, size_is(cbBufferSize)] const BYTE *pbBuffer,
+        [in] UINT cbBufferSize);
+
+    HRESULT InitializeFromExifColorSpace(
+        [in] UINT value);
+
+    HRESULT GetType(
+        [out] WICColorContextType *pType);
+
+    HRESULT GetProfileBytes(
+        [in] UINT cbBuffer,
+        [in, out, unique, size_is(cbBuffer)] BYTE *pbBuffer,
+        [out] UINT *pcbActual);
+
+    HRESULT GetExifColorSpace(
+        [out] UINT *pValue);
+}
+
+[
+    object,
     uuid(00000120-a8f2-4877-ba0a-fd2b6645fb94)
 ]
 interface IWICBitmapSource : IUnknown



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Wolfram Sang : user32: No sanity checks for BITMAPCOREINFO in
	BITMAP_Load.
Message-ID: <E1OLdqP-0008N6-FU@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0dfedd50c38356c8049aef48e69b630204de0f79
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0dfedd50c38356c8049aef48e69b630204de0f79

Author: Wolfram Sang <wolfram at the-dreams.de>
Date:   Sat Jun  5 05:57:19 2010 +0200

user32: No sanity checks for BITMAPCOREINFO in BITMAP_Load.

---

 dlls/user32/cursoricon.c       |   11 ++++++-----
 dlls/user32/tests/cursoricon.c |   40 ++++++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index b54d9fd..0f8d7da 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -2233,11 +2233,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
         if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER);
     }
 
-    if (info->bmiHeader.biHeight > 65535 || info->bmiHeader.biWidth > 65535) {
-        WARN("Broken BitmapInfoHeader!\n");
-        goto end_close;
-    }
-
     size = bitmap_info_size(info, DIB_RGB_COLORS);
     fix_info = HeapAlloc(GetProcessHeap(), 0, size);
     scaled_info = HeapAlloc(GetProcessHeap(), 0, size);
@@ -2269,6 +2264,12 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
     }
     else
     {
+        /* Some sanity checks for BITMAPINFO (not applicable to BITMAPCOREINFO) */
+        if (info->bmiHeader.biHeight > 65535 || info->bmiHeader.biWidth > 65535) {
+            WARN("Broken BitmapInfoHeader!\n");
+            goto end;
+        }
+
         scaled_info->bmiHeader.biWidth = new_width;
         scaled_info->bmiHeader.biHeight = new_height;
     }
diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c
index 8af4126..b2e1d84 100644
--- a/dlls/user32/tests/cursoricon.c
+++ b/dlls/user32/tests/cursoricon.c
@@ -716,6 +716,13 @@ static unsigned char bmpimage[70] = {
 0xFF,0xFF,0x00,0x00,0x00,0x00
 };
 
+/* 1x1 pixel bmp using BITMAPCOREHEADER */
+static unsigned char bmpcoreimage[38] = {
+0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00,
+0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55,
+0x55,0x00,0x00,0x00,0x00,0x00
+};
+
 /* 2x2 pixel gif */
 static unsigned char gif4pixel[42] = {
 0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,
@@ -723,7 +730,7 @@ static unsigned char gif4pixel[42] = {
 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b
 };
 
-static void test_LoadImageBitmap(HBITMAP hbm)
+static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm)
 {
     BITMAP bm;
     BITMAPINFO bmi;
@@ -741,12 +748,12 @@ static void test_LoadImageBitmap(HBITMAP hbm)
     bmi.bmiHeader.biBitCount= 24;
     bmi.bmiHeader.biCompression= BI_RGB;
     ret = GetDIBits(hdc, hbm, 0, bm.bmHeight, &pixel, &bmi, DIB_RGB_COLORS);
-    ok(ret == bm.bmHeight, "%d lines were converted, not %d\n", ret, bm.bmHeight);
+    ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight);
 
-    ok(color_match(pixel, 0x00ffffff), "Pixel is 0x%08x\n", pixel);
+    ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel);
 }
 
-static void test_LoadImageFile(unsigned char * image_data,
+static void test_LoadImageFile(const char * test_desc, unsigned char * image_data,
     unsigned int image_size, const char * ext, BOOL expect_success)
 {
     HANDLE handle;
@@ -768,7 +775,7 @@ static void test_LoadImageFile(unsigned char * image_data,
     /* Load as cursor. For all tested formats, this should fail */
     SetLastError(0xdeadbeef);
     handle = LoadImageA(NULL, filename, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE);
-    ok(handle == NULL, "LoadImage(%s) as IMAGE_CURSOR succeeded incorrectly.\n", ext);
+    ok(handle == NULL, "%s: IMAGE_CURSOR succeeded incorrectly.\n", test_desc);
     error = GetLastError();
     ok(error == 0 ||
         broken(error == 0xdeadbeef) || /* Win9x */
@@ -779,7 +786,7 @@ static void test_LoadImageFile(unsigned char * image_data,
     /* Load as icon. For all tested formats, this should fail */
     SetLastError(0xdeadbeef);
     handle = LoadImageA(NULL, filename, IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
-    ok(handle == NULL, "LoadImage(%s) as IMAGE_ICON succeeded incorrectly.\n", ext);
+    ok(handle == NULL, "%s: IMAGE_ICON succeeded incorrectly.\n", test_desc);
     error = GetLastError();
     ok(error == 0 ||
         broken(error == 0xdeadbeef) || /* Win9x */
@@ -796,10 +803,10 @@ static void test_LoadImageFile(unsigned char * image_data,
         "Last error: %u\n", error);
 
     if (expect_success) {
-        ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext);
-        if (handle != NULL) test_LoadImageBitmap(handle);
+        ok(handle != NULL, "%s: IMAGE_BITMAP failed.\n", test_desc);
+        if (handle != NULL) test_LoadImageBitmap(test_desc, handle);
     }
-    else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext);
+    else ok(handle == NULL, "%s: IMAGE_BITMAP succeeded incorrectly.\n", test_desc);
 
     if (handle != NULL) DeleteObject(handle);
     DeleteFileA(filename);
@@ -892,17 +899,18 @@ static void test_LoadImage(void)
     HeapFree(GetProcessHeap(), 0, icon_data);
     DeleteFileA("icon.ico");
 
-    test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 1);
-    test_LoadImageFile(gifimage, sizeof(gifimage), "gif", 0);
-    test_LoadImageFile(gif4pixel, sizeof(gif4pixel), "gif", 0);
-    test_LoadImageFile(jpgimage, sizeof(jpgimage), "jpg", 0);
-    test_LoadImageFile(pngimage, sizeof(pngimage), "png", 0);
+    test_LoadImageFile("BMP", bmpimage, sizeof(bmpimage), "bmp", 1);
+    test_LoadImageFile("BMP (coreinfo)", bmpcoreimage, sizeof(bmpcoreimage), "bmp", 1);
+    test_LoadImageFile("GIF", gifimage, sizeof(gifimage), "gif", 0);
+    test_LoadImageFile("GIF (2x2 pixel)", gif4pixel, sizeof(gif4pixel), "gif", 0);
+    test_LoadImageFile("JPG", jpgimage, sizeof(jpgimage), "jpg", 0);
+    test_LoadImageFile("PNG", pngimage, sizeof(pngimage), "png", 0);
     /* Check failure for broken BMP images */
     bmpimage[0x14]++; /* biHeight > 65535 */
-    test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 0);
+    test_LoadImageFile("BMP (too high)", bmpimage, sizeof(bmpimage), "bmp", 0);
     bmpimage[0x14]--;
     bmpimage[0x18]++; /* biWidth > 65535 */
-    test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 0);
+    test_LoadImageFile("BMP (too wide)", bmpimage, sizeof(bmpimage), "bmp", 0);
     bmpimage[0x18]--;
 }
 



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Matteo Bruni : d3dx9: Allow D3DXAssembleShader calls with NULL
	parameters.
Message-ID: <E1OLdqP-0008NM-HZ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8094c5563e784697787760563fd519e5cc48acfa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8094c5563e784697787760563fd519e5cc48acfa

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Sat Jun  5 17:12:14 2010 +0200

d3dx9: Allow D3DXAssembleShader calls with NULL parameters.

---

 dlls/d3dx9_36/shader.c    |   70 +++++++++++++++++++++++++-------------------
 dlls/d3dx9_36/tests/asm.c |   19 ++++++++++++
 2 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index b226fa6..3a7824a 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -411,25 +411,28 @@ HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages,
         TRACE("Shader source:\n");
         TRACE("%s\n", debugstr_a(preprocShader));
 
-        size = (messages ? strlen(messages) : 0) +
-            (preprocMessages ? strlen(preprocMessages) : 0) + 1;
-        hr = D3DXCreateBuffer(size, &buffer);
-        if(FAILED(hr))
-        {
-            HeapFree(GetProcessHeap(), 0, messages);
-            if(shader) SlDeleteShader(shader);
-            return hr;
-        }
-        pos = ID3DXBuffer_GetBufferPointer(buffer);
-        if(preprocMessages)
+        if(ppErrorMsgs)
         {
-            CopyMemory(pos, preprocMessages, strlen(preprocMessages) + 1);
-            pos += strlen(preprocMessages);
-        }
-        if(messages)
-            CopyMemory(pos, messages, strlen(messages) + 1);
+            size = (messages ? strlen(messages) : 0) +
+                (preprocMessages ? strlen(preprocMessages) : 0) + 1;
+            hr = D3DXCreateBuffer(size, &buffer);
+            if(FAILED(hr))
+            {
+                HeapFree(GetProcessHeap(), 0, messages);
+                if(shader) SlDeleteShader(shader);
+                return hr;
+            }
+            pos = ID3DXBuffer_GetBufferPointer(buffer);
+            if(preprocMessages)
+            {
+                CopyMemory(pos, preprocMessages, strlen(preprocMessages) + 1);
+                pos += strlen(preprocMessages);
+            }
+            if(messages)
+                CopyMemory(pos, messages, strlen(messages) + 1);
 
-        *ppErrorMsgs = buffer;
+            *ppErrorMsgs = buffer;
+        }
 
         HeapFree(GetProcessHeap(), 0, messages);
     }
@@ -448,15 +451,18 @@ HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages,
         return D3DXERR_INVALIDDATA;
     }
 
-    size = HeapSize(GetProcessHeap(), 0, res);
-    hr = D3DXCreateBuffer(size, &buffer);
-    if(FAILED(hr))
+    if(ppShader)
     {
-        HeapFree(GetProcessHeap(), 0, res);
-        return hr;
+        size = HeapSize(GetProcessHeap(), 0, res);
+        hr = D3DXCreateBuffer(size, &buffer);
+        if(FAILED(hr))
+        {
+            HeapFree(GetProcessHeap(), 0, res);
+            return hr;
+        }
+        CopyMemory(ID3DXBuffer_GetBufferPointer(buffer), res, size);
+        *ppShader = buffer;
     }
-    CopyMemory(ID3DXBuffer_GetBufferPointer(buffer), res, size);
-    *ppShader = buffer;
 
     HeapFree(GetProcessHeap(), 0, res);
 
@@ -500,7 +506,8 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
     }
     current_include = include;
 
-    *shader = *error_messages = NULL;
+    if(shader) *shader = NULL;
+    if(error_messages) *error_messages = NULL;
     wpp_output_size = wpp_output_capacity = 0;
     wpp_output = NULL;
 
@@ -525,11 +532,14 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
             TRACE("Preprocessor messages:\n");
             TRACE("%s", wpp_messages);
 
-            size = strlen(wpp_messages) + 1;
-            hr = D3DXCreateBuffer(size, &buffer);
-            if(FAILED(hr)) goto cleanup;
-            CopyMemory(ID3DXBuffer_GetBufferPointer(buffer), wpp_messages, size);
-            *error_messages = buffer;
+            if(error_messages)
+            {
+                size = strlen(wpp_messages) + 1;
+                hr = D3DXCreateBuffer(size, &buffer);
+                if(FAILED(hr)) goto cleanup;
+                CopyMemory(ID3DXBuffer_GetBufferPointer(buffer), wpp_messages, size);
+                *error_messages = buffer;
+            }
         }
         if(data)
         {
diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c
index cc0b6ae..9ed1be8 100644
--- a/dlls/d3dx9_36/tests/asm.c
+++ b/dlls/d3dx9_36/tests/asm.c
@@ -1435,6 +1435,25 @@ static void assembleshader_test(void) {
     }
     if(shader) ID3DXBuffer_Release(shader);
 
+    /* NULL messages test */
+    shader = NULL;
+    hr = D3DXAssembleShader(test1, strlen(test1),
+                            defines, NULL, D3DXSHADER_SKIPVALIDATION,
+                            &shader, NULL);
+    ok(hr == D3D_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF);
+    if(shader) ID3DXBuffer_Release(shader);
+
+    /* NULL shader test */
+    messages = NULL;
+    hr = D3DXAssembleShader(test1, strlen(test1),
+                            defines, NULL, D3DXSHADER_SKIPVALIDATION,
+                            NULL, &messages);
+    ok(hr == D3D_OK, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF);
+    if(messages) {
+        trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages));
+        ID3DXBuffer_Release(messages);
+    }
+
     /* pInclude test */
     shader = NULL;
     messages = NULL;



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: =?UTF-8?Q?Mariusz=20Pluci=C5=84ski=20?=: gameux: Add initial header
	for gameux.dll.
Message-ID: <E1OLdqP-0008Nb-J7@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 18193428272788aec898c7bee1e86badaf8c60aa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=18193428272788aec898c7bee1e86badaf8c60aa

Author: Mariusz Pluci?ski <vshader at gmail.com>
Date:   Thu May 27 13:33:40 2010 +0200

gameux: Add initial header for gameux.dll.

---

 .gitignore          |    1 +
 include/Makefile.in |    1 +
 include/gameux.idl  |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index bdd4aa8..7ea85a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,6 +160,7 @@ include/dxgitype.h
 include/endpointvolume.h
 include/exdisp.h
 include/fusion.h
+include/gameux.h
 include/hlink.h
 include/htiframe.h
 include/iads.h
diff --git a/include/Makefile.in b/include/Makefile.in
index a064076..d1f653a 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -37,6 +37,7 @@ PUBLIC_IDL_H_SRCS = \
 	endpointvolume.idl \
 	exdisp.idl \
 	fusion.idl \
+	gameux.idl \
 	hlink.idl \
 	htiframe.idl \
 	iads.idl \
diff --git a/include/gameux.idl b/include/gameux.idl
new file mode 100644
index 0000000..639814d
--- /dev/null
+++ b/include/gameux.idl
@@ -0,0 +1,39 @@
+ /*
+ *	Defines the COM interfaces of Game Explorer
+ *
+ * Copyright (C) 2008 Alistair Leslie-Hughes
+ * Copyright (C) 2010 Mariusz Pluci?ski
+ *
+ * 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
+ */
+
+import "oaidl.idl";
+import "ocidl.idl";
+import "shobjidl.idl";
+
+[
+  uuid(1DE6CE3D-EA69-4671-941F-26F789F39C5B),
+  version(1.0),
+  helpstring("gameux public 1.0 Type Library")
+]
+library gameuxLib
+{
+    typedef enum
+    {
+        GIS_NOT_INSTALLED  = 1,
+        GIS_CURRENT_USER   = 2,
+        GIS_ALL_USERS      = 3
+    } GAME_INSTALL_SCOPE;
+}



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: =?UTF-8?Q?Mariusz=20Pluci=C5=84ski=20?=: gameux: Add declaration of
	IGameExplorer interface.
Message-ID: <E1OLdqP-0008Ns-Kl@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1c5006e8f39db693236043e00f2fe3a14626134f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1c5006e8f39db693236043e00f2fe3a14626134f

Author: Mariusz Pluci?ski <vshader at gmail.com>
Date:   Thu May 27 13:50:46 2010 +0200

gameux: Add declaration of IGameExplorer interface.

---

 include/gameux.idl |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/include/gameux.idl b/include/gameux.idl
index 639814d..4700d75 100644
--- a/include/gameux.idl
+++ b/include/gameux.idl
@@ -30,10 +30,38 @@ import "shobjidl.idl";
 ]
 library gameuxLib
 {
+    importlib("stdole2.tlb");
+
     typedef enum
     {
         GIS_NOT_INSTALLED  = 1,
         GIS_CURRENT_USER   = 2,
         GIS_ALL_USERS      = 3
     } GAME_INSTALL_SCOPE;
+
+    [
+      object,
+      uuid(E7B2FB72-D728-49B3-A5F2-18EBF5F1349E)
+    ]
+    interface IGameExplorer : IUnknown
+    {
+        HRESULT AddGame([in] BSTR sGDFBinaryPath,
+                    [in] BSTR sInstallDirectory,
+                    [in] GAME_INSTALL_SCOPE installScope,
+                    [in, out] GUID* pguidInstanceID);
+
+        HRESULT RemoveGame([in] GUID instanceID);
+
+        HRESULT UpdateGame([in] GUID instanceID);
+
+        HRESULT VerifyAccess([in] BSTR sGDFBinaryPath, [out] BOOL* pHasAccess);
+    };
+
+    [
+      uuid(9A5EA990-3034-4D6F-9128-01F3C61022BC)
+    ]
+    coclass GameExplorer
+    {
+        [default] interface IGameExplorer;
+    };
 }



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Thomas Mullaly : urlmon/tests: Added tests for IUri_IsEqual.
Message-ID: <E1OLdqP-0008O9-NC@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 68db56d305cfbe821175d351c334b3737acb4b5a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=68db56d305cfbe821175d351c334b3737acb4b5a

Author: Thomas Mullaly <thomas.mullaly at gmail.com>
Date:   Tue Jun  1 16:43:58 2010 -0400

urlmon/tests: Added tests for IUri_IsEqual.

---

 dlls/urlmon/tests/uri.c |  123 +++++++++++++++++++++++++++++++++++++++++++++++
 dlls/urlmon/uri.c       |   12 +++++
 2 files changed, 135 insertions(+), 0 deletions(-)

diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index 9e8b32e..2351174 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -435,6 +435,46 @@ static const uri_properties uri_tests[] = {
     }
 };
 
+typedef struct _uri_equality {
+    const char* a;
+    DWORD       create_flags_a;
+    BOOL        create_todo_a;
+    const char* b;
+    DWORD       create_flags_b;
+    BOOL        create_todo_b;
+    BOOL        equal;
+    BOOL        todo;
+} uri_equality;
+
+static const uri_equality equality_tests[] = {
+    {
+        "HTTP://www.winehq.org/test dir/./",0,FALSE,
+        "http://www.winehq.org/test dir/../test dir/",0,FALSE,
+        TRUE, TRUE
+    },
+    {
+        /* http://www.winehq.org/test%20dir */
+        "http://%77%77%77%2E%77%69%6E%65%68%71%2E%6F%72%67/%74%65%73%74%20%64%69%72",0,FALSE,
+        "http://www.winehq.org/test dir",0,FALSE,
+        TRUE, TRUE,
+    },
+    {
+        "c:\\test.mp3",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME,FALSE,
+        "file:///c:/test.mp3",0,FALSE,
+        TRUE,TRUE
+    },
+    {
+        "ftp://ftp.winehq.org/",0,FALSE,
+        "ftp://ftp.winehq.org",0,FALSE,
+        TRUE, TRUE
+    },
+    {
+        "ftp://ftp.winehq.org/test/test2/../../testB/",0,FALSE,
+        "ftp://ftp.winehq.org/t%45stB/",0,FALSE,
+        FALSE, TRUE
+    }
+};
+
 static inline LPWSTR a2w(LPCSTR str) {
     LPWSTR ret = NULL;
 
@@ -1356,6 +1396,86 @@ static void test_IUri_HasProperty(void) {
     }
 }
 
+static void test_IUri_IsEqual(void) {
+    IUri *uriA, *uriB;
+    HRESULT hrA, hrB;
+    DWORD i;
+
+    uriA = uriB = NULL;
+
+    /* Make sure IsEqual handles invalid args correctly. */
+    hrA = pCreateUri(http_urlW, 0, 0, &uriA);
+    hrB = pCreateUri(http_urlW, 0, 0, &uriB);
+    ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hrA, S_OK);
+    ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hrB, S_OK);
+    if(SUCCEEDED(hrA) && SUCCEEDED(hrB)) {
+        BOOL equal = -1;
+        hrA = IUri_IsEqual(uriA, NULL, &equal);
+        ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hrA, S_OK);
+        ok(equal == FALSE, "Error: Expected equal to be FALSE, but was %d instead.\n", equal);
+
+        hrA = IUri_IsEqual(uriA, uriB, NULL);
+        ok(hrA == E_POINTER, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hrA, E_POINTER);
+    }
+    if(uriA) IUri_Release(uriA);
+    if(uriB) IUri_Release(uriB);
+
+    for(i = 0; i < sizeof(equality_tests)/sizeof(equality_tests[0]); ++i) {
+        uri_equality test = equality_tests[i];
+        LPWSTR uriA_W, uriB_W;
+
+        uriA = uriB = NULL;
+
+        uriA_W = a2w(test.a);
+        uriB_W = a2w(test.b);
+
+        hrA = pCreateUri(uriA_W, test.create_flags_a, 0, &uriA);
+        if(test.create_todo_a) {
+            todo_wine {
+                ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n",
+                        hrA, S_OK, i);
+            }
+        } else {
+            ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n",
+                    hrA, S_OK, i);
+        }
+
+        hrB = pCreateUri(uriB_W, test.create_flags_b, 0, &uriB);
+        if(test.create_todo_b) {
+            todo_wine {
+                ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n",
+                        hrB, S_OK, i);
+            }
+        } else {
+            ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n",
+                    hrB, S_OK, i);
+        }
+
+        if(SUCCEEDED(hrA) && SUCCEEDED(hrB)) {
+            BOOL equal = -1;
+
+            hrA = IUri_IsEqual(uriA, uriB, &equal);
+            if(test.todo) {
+                todo_wine {
+                    ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n",
+                            hrA, S_OK, i);
+                }
+                todo_wine {
+                    ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i);
+                }
+            } else {
+                ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hrA, S_OK, i);
+                ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i);
+            }
+        }
+        if(uriA) IUri_Release(uriA);
+        if(uriB) IUri_Release(uriB);
+
+        heap_free(uriA_W);
+        heap_free(uriB_W);
+    }
+}
+
 START_TEST(uri) {
     HMODULE hurlmon;
 
@@ -1393,4 +1513,7 @@ START_TEST(uri) {
 
     trace("test IUri_HasProperty...\n");
     test_IUri_HasProperty();
+
+    trace("test IUri_IsEqual...\n");
+    test_IUri_IsEqual();
 }
diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c
index a46770b..b0adb35 100644
--- a/dlls/urlmon/uri.c
+++ b/dlls/urlmon/uri.c
@@ -377,6 +377,18 @@ static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties)
 static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual)
 {
     Uri *This = URI_THIS(iface);
+    TRACE("(%p)->(%p %p)\n", This, pUri, pfEqual);
+
+    if(!pfEqual)
+        return E_POINTER;
+
+    if(!pUri) {
+        *pfEqual = FALSE;
+
+        /* For some reason Windows returns S_OK here... */
+        return S_OK;
+    }
+
     FIXME("(%p)->(%p %p)\n", This, pUri, pfEqual);
     return E_NOTIMPL;
 }



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Thomas Mullaly : urlmon/tests: Added tests for IUri_GetHost.
Message-ID: <E1OLdqP-0008OQ-PC@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d5e0a2edca9f86b6e10e830cb79b11725efebc0d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d5e0a2edca9f86b6e10e830cb79b11725efebc0d

Author: Thomas Mullaly <thomas.mullaly at gmail.com>
Date:   Tue Jun  1 20:32:09 2010 -0400

urlmon/tests: Added tests for IUri_GetHost.

---

 dlls/urlmon/tests/uri.c |   24 ++++++++++++++++++++++++
 dlls/urlmon/uri.c       |    4 ++++
 2 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index 2351174..6a3f306 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -710,6 +710,9 @@ static void test_IUri_GetStrProperties(void) {
         hr = IUri_GetFragment(uri, NULL);
         ok(hr == E_POINTER, "Error: GetFragment returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER);
 
+        hr = IUri_GetHost(uri, NULL);
+        ok(hr == E_POINTER, "Error: GetHost returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER);
+
         hr = IUri_GetPassword(uri, NULL);
         ok(hr == E_POINTER, "Error: GetPassword returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER);
 
@@ -883,6 +886,27 @@ static void test_IUri_GetStrProperties(void) {
             SysFreeString(received);
             received = NULL;
 
+            /* GetHost() tests. */
+            prop = test.str_props[Uri_PROPERTY_HOST];
+            hr = IUri_GetHost(uri, &received);
+            if(prop.todo) {
+                todo_wine {
+                    ok(hr == prop.expected, "Error: GetHost returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
+                            hr, prop.expected, i);
+                }
+                todo_wine {
+                    ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_tests[%d].\n",
+                            prop.value, wine_dbgstr_w(received), i);
+                }
+            } else {
+                ok(hr == prop.expected, "Error: GetHost returned 0x%08x, expected 0x%08x on uri_tests[%d].\n",
+                        hr, prop.expected, i);
+                ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_tests[%d].\n",
+                        prop.value, wine_dbgstr_w(received), i);
+            }
+            SysFreeString(received);
+            received = NULL;
+
             /* GetPassword() tests. */
             prop = test.str_props[Uri_PROPERTY_PASSWORD];
             hr = IUri_GetPassword(uri, &received);
diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c
index b0adb35..df5ca8b 100644
--- a/dlls/urlmon/uri.c
+++ b/dlls/urlmon/uri.c
@@ -224,6 +224,10 @@ static HRESULT WINAPI Uri_GetHost(IUri *iface, BSTR *pstrHost)
 {
     Uri *This = URI_THIS(iface);
     FIXME("(%p)->(%p)\n", This, pstrHost);
+
+    if(!pstrHost)
+        return E_POINTER;
+
     return E_NOTIMPL;
 }
 



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Matijn Woudt : msi/tests: Testcases for CREATE TABLE.
Message-ID: <E1OLdqP-0008Oh-RQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1a159dfddc90fb5a734f58014ef5600dc1f3d78d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1a159dfddc90fb5a734f58014ef5600dc1f3d78d

Author: Matijn Woudt <tijnema at gmail.com>
Date:   Thu Jun  3 15:21:31 2010 +0200

msi/tests: Testcases for CREATE TABLE.

---

 dlls/msi/tests/db.c |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 107 insertions(+), 0 deletions(-)

diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 5571a71..56fa0f0 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -8845,6 +8845,112 @@ static void test_columnorder(void)
     DeleteFileA(msifile);
 }
 
+static void test_createtable(void)
+{
+    MSIHANDLE hdb, htab = 0, hrec = 0;
+    LPCSTR query;
+    UINT res;
+    DWORD size;
+    char buffer[0x20];
+
+    hdb = create_db();
+    ok(hdb, "failed to create db\n");
+
+    query = "CREATE TABLE `blah` (`foo` CHAR(72) NOT NULL PRIMARY KEY `foo`)";
+    res = MsiDatabaseOpenView( hdb, query, &htab );
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+    if(res == ERROR_SUCCESS )
+    {
+        res = MsiViewExecute( htab, hrec );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec );
+        todo_wine ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        size = sizeof(buffer);
+        res = MsiRecordGetString(hrec, 1, buffer, &size );
+        todo_wine ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiViewClose( htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiCloseHandle( htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+    }
+
+    query = "CREATE TABLE `a` (`b` INT PRIMARY KEY `b`)";
+    res = MsiDatabaseOpenView( hdb, query, &htab );
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+    if(res == ERROR_SUCCESS )
+    {
+        res = MsiViewExecute( htab, 0 );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiViewClose( htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiCloseHandle( htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        query = "SELECT * FROM `a`";
+        res = MsiDatabaseOpenView( hdb, query, &htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        size = sizeof(buffer);
+        res = MsiRecordGetString(hrec, 1, buffer, &size );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+        ok(!strcmp(buffer,"b"), "b != %s\n", buffer);
+
+        res = MsiViewClose( htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiCloseHandle( htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiDatabaseCommit(hdb);
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiCloseHandle(hdb);
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiOpenDatabase(msifile, MSIDBOPEN_TRANSACT, &hdb );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        query = "SELECT * FROM `a`";
+        res = MsiDatabaseOpenView( hdb, query, &htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        size = sizeof(buffer);
+        res = MsiRecordGetString(hrec, 1, buffer, &size );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+        todo_wine ok(!strcmp(buffer,"b"), "b != %s\n", buffer);
+
+        res = MsiCloseHandle( hrec );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiViewClose( htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+        res = MsiCloseHandle( htab );
+        ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+    }
+
+    res = MsiDatabaseCommit(hdb);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    res = MsiCloseHandle(hdb);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    DeleteFileA(msifile);
+}
+
+
 START_TEST(db)
 {
     test_msidatabase();
@@ -8896,4 +9002,5 @@ START_TEST(db)
     test_insertorder();
     test_columnorder();
     test_suminfo_import();
+    test_createtable();
 }



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Sylvain Petreolle : mshtml: Allow either REG_SZ or REG_EXPAND_SZ for
	GeckoCabDir.
Message-ID: <E1OLdqP-0008Oy-TS@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cf7de41edc4735819c932bbf719dfc9918851b0a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cf7de41edc4735819c932bbf719dfc9918851b0a

Author: Sylvain Petreolle <spetreolle at yahoo.fr>
Date:   Wed Jun  2 09:44:41 2010 -0700

mshtml: Allow either REG_SZ or REG_EXPAND_SZ for GeckoCabDir.

---

 dlls/mshtml/install.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c
index 4122194..65faa5a 100644
--- a/dlls/mshtml/install.c
+++ b/dlls/mshtml/install.c
@@ -235,13 +235,13 @@ static BOOL install_from_registered_dir(void)
         return FALSE;
 
     file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME));
-    res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size);
+    res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size);
     if(res == ERROR_MORE_DATA) {
         file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME));
-        res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size);
+        res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size);
     }
     RegCloseKey(hkey);
-    if(res != ERROR_SUCCESS || type != REG_SZ) {
+    if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) {
         heap_free(file_name);
         return FALSE;
     }



From julliard at winehq.org  Mon Jun  7 10:02:29 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:29 -0500
Subject: Joel Holdsworth : winecfg: Moved about panel code into about.c.
Message-ID: <E1OLdqP-0008PF-Vu@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7342bce80d2863813255dad7869f1574a90f18bb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7342bce80d2863813255dad7869f1574a90f18bb

Author: Joel Holdsworth <joel at airwebreathe.org.uk>
Date:   Wed Jun  2 23:56:00 2010 +0100

winecfg: Moved about panel code into about.c.

---

 programs/winecfg/Makefile.in |    1 +
 programs/winecfg/about.c     |   92 ++++++++++++++++++++++++++++++++++++++++++
 programs/winecfg/main.c      |   60 ---------------------------
 programs/winecfg/winecfg.h   |    1 +
 4 files changed, 94 insertions(+), 60 deletions(-)

diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index ae8fbd0..73ec486 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -7,6 +7,7 @@ APPMODE   = -mwindows
 IMPORTS   = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
+	about.c \
 	appdefaults.c \
 	audio.c \
 	drive.c \
diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c
new file mode 100644
index 0000000..7a88e4f
--- /dev/null
+++ b/programs/winecfg/about.c
@@ -0,0 +1,92 @@
+/*
+ * WineCfg about panel
+ *
+ * Copyright 2002 Jaco Greeff
+ * Copyright 2003 Dimitrie O. Paun
+ * Copyright 2003 Mike Hearn
+ * Copyright 2010 Joel Holdsworth
+ *
+ * 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 <windows.h>
+#include <commctrl.h>
+#include <wine/debug.h>
+
+#include "resource.h"
+#include "winecfg.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
+
+INT_PTR CALLBACK
+AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    char *owner, *org;
+
+    switch (uMsg)
+    {
+    case WM_NOTIFY:
+        switch(((LPNMHDR)lParam)->code)
+        {
+        case PSN_APPLY:
+            /*save registration info to registry */
+            owner = get_text(hDlg, IDC_ABT_OWNER);
+            org   = get_text(hDlg, IDC_ABT_ORG);
+
+            set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion",
+                        "RegisteredOwner", owner ? owner : "");
+            set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion",
+                        "RegisteredOrganization", org ? org : "");
+            set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion",
+                        "RegisteredOwner", owner ? owner : "");
+            set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion",
+                        "RegisteredOrganization", org ? org : "");
+            apply();
+
+            HeapFree(GetProcessHeap(), 0, owner);
+            HeapFree(GetProcessHeap(), 0, org);
+            break;
+        }
+        break;
+
+    case WM_INITDIALOG:
+        /* read owner and organization info from registry, load it into text box */
+        owner = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion",
+                            "RegisteredOwner", "");
+        org =   get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion",
+                            "RegisteredOrganization", "");
+
+        SetDlgItemText(hDlg, IDC_ABT_OWNER, owner);
+        SetDlgItemText(hDlg, IDC_ABT_ORG, org);
+
+        SendMessage(GetParent(hDlg), PSM_UNCHANGED, 0, 0);
+
+        HeapFree(GetProcessHeap(), 0, owner);
+        HeapFree(GetProcessHeap(), 0, org);
+        break;
+
+    case WM_COMMAND:
+        switch(HIWORD(wParam))
+        {
+        case EN_CHANGE:
+            /* enable apply button */
+            SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);
+            break;
+        }
+        break;
+    }
+    return FALSE;
+}
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index 83a5f05..fdefefb 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -60,66 +60,6 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
     return 0;
 }
 
-static INT_PTR CALLBACK
-AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    char *owner, *org;
-
-    switch (uMsg) {
-
-	case WM_NOTIFY:
-	    switch(((LPNMHDR)lParam)->code)
-	    {
-            case PSN_APPLY:
-                /*save registration info to registry */
-                owner = get_text(hDlg, IDC_ABT_OWNER);
-                org   = get_text(hDlg, IDC_ABT_ORG);
-
-                set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion",
-                            "RegisteredOwner", owner ? owner : "");
-                set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion",
-                            "RegisteredOrganization", org ? org : "");
-                set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion",
-                            "RegisteredOwner", owner ? owner : "");
-                set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion",
-                            "RegisteredOrganization", org ? org : "");
-                apply();
-
-                HeapFree(GetProcessHeap(), 0, owner);
-                HeapFree(GetProcessHeap(), 0, org);
-                break;
-            }
-            break;
-
-        case WM_INITDIALOG:
-            /* read owner and organization info from registry, load it into text box */
-            owner = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion",
-                                "RegisteredOwner", "");
-            org =   get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion",
-                                "RegisteredOrganization", "");
-
-            SetDlgItemText(hDlg, IDC_ABT_OWNER, owner);
-            SetDlgItemText(hDlg, IDC_ABT_ORG, org);
-
-            SendMessage(GetParent(hDlg), PSM_UNCHANGED, 0, 0);
-
-            HeapFree(GetProcessHeap(), 0, owner);
-            HeapFree(GetProcessHeap(), 0, org);
-            break;
-
-	case WM_COMMAND:
-            switch(HIWORD(wParam))
-            {
-            case EN_CHANGE:
-		/* enable apply button */
-                SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);
-                break;
-            }
-            break;
-    }
-    return FALSE;
-}
-
 #define NUM_PROPERTY_PAGES 7
 
 static INT_PTR
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index d730d84..4d4a92f 100644
--- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h
@@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* Drive management  */
 BOOL load_drives(void);



From julliard at winehq.org  Mon Jun  7 10:02:30 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:30 -0500
Subject: Marcus Meissner : dbghelp: Add 2 new darf defines and implement
	DW_OP_stack_value.
Message-ID: <E1OLdqQ-0008Q4-4n@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4f2e15d053564b457d93492f2c04f1d4fddd2de5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4f2e15d053564b457d93492f2c04f1d4fddd2de5

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Mon May 31 22:08:28 2010 +0200

dbghelp: Add 2 new darf defines and implement DW_OP_stack_value.

---

 dlls/dbghelp/dwarf.c  |    4 ++++
 dlls/dbghelp/dwarf.h  |    3 +++
 dlls/dbghelp/symbol.c |    4 ++++
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 35c01a6..f3e2f12 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -847,6 +847,10 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc,
                loc->kind = loc_dwarf2_block;
             }
             break;
+        case DW_OP_stack_value:
+            /* Expected behaviour is that this is the last instruction of this
+             * expression and just the "top of stack" value should be put to loc->offset. */
+            break;
         default:
             if (op < DW_OP_lo_user) /* as DW_OP_hi_user is 0xFF, we don't need to test against it */
                 FIXME("Unhandled attr op: %x\n", op);
diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h
index 23493d6..4ecb816 100644
--- a/dlls/dbghelp/dwarf.h
+++ b/dlls/dbghelp/dwarf.h
@@ -379,6 +379,9 @@ typedef enum dwarf_operation_e
   DW_OP_form_tls_address                = 0x9b,
   DW_OP_call_frame_cfa                  = 0x9c,
   DW_OP_bit_piece                       = 0x9d,
+  /** Dwarf4 new values */
+  DW_OP_implicit_value                  = 0x9e,
+  DW_OP_stack_value                     = 0x9f,
 
   /* Implementation defined extensions */
   DW_OP_lo_user                         = 0xe0,
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 0eac098..0607278 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -724,6 +724,10 @@ static void symt_fill_sym_info(struct module_pair* pair,
                         sym_info->Register = loc.reg ? loc.reg : CV_REG_EBP;
                         sym_info->Address = loc.offset;
                         break;
+                    case loc_absolute:
+                        sym_info->Flags |= SYMFLAG_VALUEPRESENT;
+                        sym_info->Value = loc.offset;
+                        break;
                     default:
                         FIXME("Shouldn't happen (kind=%d), debug reader backend is broken\n", loc.kind);
                         assert(0);



From julliard at winehq.org  Mon Jun  7 10:02:30 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:30 -0500
Subject: Dylan Smith : richedit: Keep default char format on WM_SETFONT in
	plain text mode.
Message-ID: <E1OLdqQ-0008QO-8K@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6072a69d384f27f434c52bc1018ace311b75acfa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6072a69d384f27f434c52bc1018ace311b75acfa

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Sun Jun  6 14:57:44 2010 -0400

richedit: Keep default char format on WM_SETFONT in plain text mode.

---

 dlls/riched20/editor.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 5bed094..b4bff4f 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -3502,16 +3502,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
     CHARFORMAT2W fmt;
     HDC hDC;
     BOOL bRepaint = LOWORD(lParam);
-    ME_Cursor start;
 
     if (!wParam)
-      wParam = (WPARAM)GetStockObject(SYSTEM_FONT); 
+      wParam = (WPARAM)GetStockObject(SYSTEM_FONT);
     GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf);
     hDC = ITextHost_TxGetDC(editor->texthost);
-    ME_CharFormatFromLogFont(hDC, &lf, &fmt); 
+    ME_CharFormatFromLogFont(hDC, &lf, &fmt);
     ITextHost_TxReleaseDC(editor->texthost, hDC);
-    ME_SetCursorToStart(editor, &start);
-    ME_SetCharFormat(editor, &start, NULL, &fmt);
+    if (editor->mode & TM_RICHTEXT) {
+      ME_Cursor start;
+      ME_SetCursorToStart(editor, &start);
+      ME_SetCharFormat(editor, &start, NULL, &fmt);
+    }
     ME_SetDefaultCharFormat(editor, &fmt);
 
     ME_CommitUndo(editor);



From julliard at winehq.org  Mon Jun  7 10:02:30 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:30 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: comdlg32: Correctly report the
	filter.
Message-ID: <E1OLdqQ-0008Qg-EQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 31b9fefe0e0eeca5042742814926454d92e0de1f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=31b9fefe0e0eeca5042742814926454d92e0de1f

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Fri Jun  4 18:00:12 2010 +0200

comdlg32: Correctly report the filter.

---

 dlls/comdlg32/filedlg31.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c
index 29c6310..fd2ef36 100644
--- a/dlls/comdlg32/filedlg31.c
+++ b/dlls/comdlg32/filedlg31.c
@@ -629,10 +629,12 @@ static LRESULT FD31_FileTypeChange( const FD31_DATA *lfs )
     lRet = SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETCURSEL, 0, 0);
     if (lRet == LB_ERR)
         return TRUE;
+    lfs->ofnW->nFilterIndex = lRet + 1;
+    lfs->ofnA->nFilterIndex = lRet + 1;
     pstr = (LPWSTR)SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETITEMDATA, lRet, 0);
     TRACE("Selected filter : %s\n", debugstr_w(pstr));
 
-    return FD31_Validate( lfs, NULL, cmb1, lRet, TRUE );
+    return FD31_Validate( lfs, pstr, cmb1, lRet, TRUE );
 }
 
 /***********************************************************************



From julliard at winehq.org  Mon Jun  7 10:02:30 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:30 -0500
Subject: Alex Balut : comctl32/tests: Added a test that checks whether setting
	a custom default button in a property sheet works .
Message-ID: <E1OLdqQ-0008Qy-LK@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 32f240bfc13edaf81f772aa7f378681e3dbfe696
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=32f240bfc13edaf81f772aa7f378681e3dbfe696

Author: Alex Balut <alexandru.balut at gmail.com>
Date:   Sat May 29 23:12:06 2010 +0200

comctl32/tests: Added a test that checks whether setting a custom default button in a property sheet works.

---

 dlls/comctl32/tests/propsheet.c |   90 +++++++++++++++++++++++++++++++++++++++
 dlls/comctl32/tests/resources.h |    5 ++
 dlls/comctl32/tests/rsrc.rc     |    8 +++
 3 files changed, 103 insertions(+), 0 deletions(-)

diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c
index bf40db4..bfbaaa0 100644
--- a/dlls/comctl32/tests/propsheet.c
+++ b/dlls/comctl32/tests/propsheet.c
@@ -371,6 +371,7 @@ static void test_wiznavigation(void)
 
     DestroyWindow(hdlg);
 }
+
 static void test_buttons(void)
 {
     HPROPSHEETPAGE hpsp[1];
@@ -436,6 +437,94 @@ static void test_buttons(void)
     DestroyWindow(hdlg);
 }
 
+static BOOL add_button_has_been_pressed;
+
+static INT_PTR CALLBACK
+page_with_custom_default_button_dlg_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+    switch (msg)
+    {
+    case WM_COMMAND:
+        switch(LOWORD(wparam))
+        {
+        case IDC_PS_PUSHBUTTON1:
+            switch(HIWORD(wparam))
+            {
+            case BN_CLICKED:
+                add_button_has_been_pressed = TRUE;
+                return TRUE;
+            }
+            break;
+        }
+        break;
+    }
+    return FALSE;
+}
+
+static void test_custom_default_button(void)
+{
+    HWND hdlg;
+    PROPSHEETPAGEA psp[1];
+    PROPSHEETHEADERA psh;
+    MSG msg;
+    LRESULT result;
+
+    psp[0].dwSize = sizeof (PROPSHEETPAGEA);
+    psp[0].dwFlags = PSP_USETITLE;
+    psp[0].hInstance = GetModuleHandleA(NULL);
+    U(psp[0]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON);
+    U2(psp[0]).pszIcon = NULL;
+    psp[0].pfnDlgProc = page_with_custom_default_button_dlg_proc;
+    psp[0].pszTitle = "Page1";
+    psp[0].lParam = 0;
+
+    psh.dwSize = sizeof (PROPSHEETHEADERA);
+    psh.dwFlags = PSH_PROPSHEETPAGE | PSH_MODELESS;
+    psh.hwndParent = GetDesktopWindow();
+    psh.hInstance = GetModuleHandleA(NULL);
+    U(psh).pszIcon = NULL;
+    psh.pszCaption =  "PropertySheet1";
+    psh.nPages = 1;
+    U3(psh).ppsp = psp;
+    U2(psh).nStartPage = 0;
+
+    /* The goal of the test is to make sure that the Add button is pressed
+     * when the ENTER key is pressed and a different control, a combobox,
+     * has the keyboard focus. */
+    add_button_has_been_pressed = FALSE;
+
+    /* Create the modeless property sheet. */
+    hdlg = (HWND)PropertySheetA(&psh);
+    ok(hdlg != INVALID_HANDLE_VALUE, "Cannot create the property sheet\n");
+
+    /* Set the Add button as the default button. */
+    SendMessage(hdlg, DM_SETDEFID, (WPARAM)IDC_PS_PUSHBUTTON1, 0);
+
+    /* Make sure the default button is the Add button. */
+    result = SendMessage(hdlg, DM_GETDEFID, 0, 0);
+    ok(DC_HASDEFID == HIWORD(result), "The property sheet does not have a default button\n");
+    ok(IDC_PS_PUSHBUTTON1 == LOWORD(result), "The default button is not the Add button\n");
+
+    /* At this point, the combobox should have keyboard focus, so we press ENTER.
+     * Pull the lever, Kronk! */
+    keybd_event(VK_RETURN, 0, 0, 0);
+
+    /* Process all the messages in the queue for this thread. */
+    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+    {
+        if (!PropSheet_IsDialogMessage(hdlg, &msg))
+        {
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
+    }
+
+    todo_wine
+    ok(add_button_has_been_pressed, "The Add button has not been pressed!\n");
+
+    DestroyWindow(hdlg);
+}
+
 START_TEST(propsheet)
 {
     test_title();
@@ -443,4 +532,5 @@ START_TEST(propsheet)
     test_disableowner();
     test_wiznavigation();
     test_buttons();
+    test_custom_default_button();
 }
diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h
index 8459fc8..beabce5 100644
--- a/dlls/comctl32/tests/resources.h
+++ b/dlls/comctl32/tests/resources.h
@@ -36,9 +36,14 @@
 #define IDD_PROP_PAGE_RADIO 32
 #define IDD_PROP_PAGE_EXIT 33
 
+#define IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON 34
+
 #define IDC_PS_EDIT1 1000
 #define IDC_PS_EDIT2 1001
 #define IDC_PS_RADIO1 1010
 #define IDC_PS_RADIO2 1011
 
+#define IDC_PS_COMBO1 1020
+#define IDC_PS_PUSHBUTTON1 1021
+
 #endif  /* __WINE_COMCTL32_TEST_RESOURCES_H */
diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc
index 06e382e..c817acd 100644
--- a/dlls/comctl32/tests/rsrc.rc
+++ b/dlls/comctl32/tests/rsrc.rc
@@ -79,3 +79,11 @@ IDB_BITMAP_128x15 BITMAP bmp128x15.bmp
 
 /* @makedep: bmp80x15.bmp */
 IDB_BITMAP_80x15 BITMAP bmp80x15.bmp
+
+IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON DIALOG DISCARDABLE  5, 43, 227, 215
+STYLE WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+{
+    COMBOBOX        IDC_PS_COMBO1, 16, 68, 140, 14, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Add", IDC_PS_PUSHBUTTON1, 164, 68, 40, 13
+}



From julliard at winehq.org  Mon Jun  7 10:02:30 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:30 -0500
Subject: Alexandre Julliard : winapi: Get the list of files from git-ls-files
	if possible.
Message-ID: <E1OLdqQ-0008RM-NF@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 84ff0631d41e0d9c32180e88f4792a37085f9181
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=84ff0631d41e0d9c32180e88f4792a37085f9181

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun  7 16:46:33 2010 +0200

winapi: Get the list of files from git-ls-files if possible.

---

 tools/winapi/options.pm |   68 ++++++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm
index 232de7f..749b9b7 100644
--- a/tools/winapi/options.pm
+++ b/tools/winapi/options.pm
@@ -236,38 +236,46 @@ sub parse_files($) {
 	}
     }
 
-    if($#c_files == -1 && $#h_files == -1 && $#paths == -1)
+    if($#c_files == -1 && $#h_files == -1 && $#paths == -1 && -d ".git")
     {
-        @paths = ".";
-    }
-
-    if($#paths != -1 || $#c_files != -1) {
-	my $c_command = "find " . join(" ", @paths, @c_files) . " -name \\*.c";
-	my %found;
-	@$c_files = sort(map {
-	    s/^\.\/(.*)$/$1/;
-	    if(defined($found{$_})) {
-		();
-	    } else {
-		$found{$_}++;
-		$_;
-	    }
-	} split(/\n/, `$c_command`));
+	@$c_files = sort split /\0/, `git ls-files -z \\*.c`;
+	@$h_files = sort split /\0/, `git ls-files -z \\*.h`;
     }
+    else
+    {
+        if($#c_files == -1 && $#h_files == -1 && $#paths == -1)
+        {
+            @paths = ".";
+        }
+
+        if($#paths != -1 || $#c_files != -1) {
+            my $c_command = "find " . join(" ", @paths, @c_files) . " -name \\*.c";
+            my %found;
+            @$c_files = sort(map {
+                s/^\.\/(.*)$/$1/;
+                if(defined($found{$_})) {
+                    ();
+                } else {
+                    $found{$_}++;
+                    $_;
+                }
+                             } split(/\n/, `$c_command`));
+        }
 
-    if($#paths != -1 || $#h_files != -1) {
-	my $h_command = "find " . join(" ", @paths, @h_files) . " -name \\*.h";
-	my %found;
+        if($#paths != -1 || $#h_files != -1) {
+            my $h_command = "find " . join(" ", @paths, @h_files) . " -name \\*.h";
+            my %found;
 
-	@$h_files = sort(map {
-	    s/^\.\/(.*)$/$1/;
-	    if(defined($found{$_})) {
-		();
-	    } else {
-		$found{$_}++;
-		$_;
-	    }
-	} split(/\n/, `$h_command`));
+            @$h_files = sort(map {
+                s/^\.\/(.*)$/$1/;
+                if(defined($found{$_})) {
+                    ();
+                } else {
+                    $found{$_}++;
+                    $_;
+                }
+                             } split(/\n/, `$h_command`));
+        }
     }
 
     my %dirs;



From julliard at winehq.org  Mon Jun  7 10:02:30 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 07 Jun 2010 10:02:30 -0500
Subject: Alexandre Julliard : winapi: Fix a few C parser bugs.
Message-ID: <E1OLdqQ-0008Rc-R6@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e1fd4390bf7eba7de7b5c9cf039123dab992147d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e1fd4390bf7eba7de7b5c9cf039123dab992147d

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun  7 16:46:44 2010 +0200

winapi: Fix a few C parser bugs.

---

 tools/winapi/c_parser.pm |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm
index 189f780..8bb40d5 100644
--- a/tools/winapi/c_parser.pm
+++ b/tools/winapi/c_parser.pm
@@ -513,6 +513,12 @@ sub parse_c_declaration($$$$)
 	if(s/\)//) {
 	    $column++;
 	}
+    } elsif(s/^__ASM_STDCALL_FUNC\(\s*(\w+)\s*,\s*\d+\s*,\s*//s) { # FIXME: Wine specific kludge
+	$self->_update_c_position($&, \$line, \$column);
+	$self->_parse_c_until_one_of("\)", \$_, \$line, \$column);
+	if(s/\)//) {
+	    $column++;
+	}
     } elsif(s/^(?:DEFINE_AVIGUID|DEFINE_OLEGUID)\s*(?=\()//s) { # FIXME: Wine specific kludge
 	$self->_update_c_position($&, \$line, \$column);
 
@@ -934,7 +940,7 @@ sub parse_c_file($$$$)
 		$self->_parse_c_error($_, $line, $column, "file", ") without (");
 	    }
 	    $declaration .= $&;
-	    if($plevel == 1 && $declaration =~ /^__ASM_GLOBAL_FUNC/) {
+	    if($plevel == 1 && $declaration =~ /^(__ASM_GLOBAL_FUNC|__ASM_STDCALL_FUNC)/) {
 		if(!$self->parse_c_declaration(\$declaration, \$declaration_line, \$declaration_column)) {
 		    return 0;
 		}
@@ -1390,11 +1396,11 @@ sub parse_c_struct_union($$$$$$$$$)
 
     $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column);
 
-    if (!s/^(interface|struct|union)\s+((?:MSVCRT|WS)\(\s*\w+\s*\)|\w+)?\s*\{\s*//s) {
+    if (!s/^(interface|struct|union)(\s+((?:MSVCRT|WS)\(\s*\w+\s*\)|\w+))?\s*\{\s*//s) {
 	return 0;
     }
     $kind = $1;
-    $_name = $2 || "";
+    $_name = $3 || "";
 
     $self->_update_c_position($&, \$line, \$column);
 



From julliard at winehq.org  Tue Jun  8 10:08:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:21 -0500
Subject: Alexandre Julliard : kernel32/tests: Fix the process title tests to
	actually test something.
Message-ID: <E1OM0Pd-00027O-HN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e091c12b669e7013aabcca301a586255e445d8d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e091c12b669e7013aabcca301a586255e445d8d6

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  8 11:50:20 2010 +0200

kernel32/tests: Fix the process title tests to actually test something.

---

 dlls/kernel32/tests/process.c |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 065a94a..77293c6 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -527,6 +527,7 @@ static void test_Startup(void)
     char                buffer[MAX_PATH];
     PROCESS_INFORMATION	info;
     STARTUPINFOA	startup,si;
+    char *result;
     static CHAR title[]   = "I'm the title string",
                 desktop[] = "winsta0\\default",
                 empty[]   = "";
@@ -699,8 +700,9 @@ static void test_Startup(void)
 
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop);
-    ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname),
-        "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle);
+    result = getChildString( "StartupInfoA", "lpTitle" );
+    todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
+                  "expected '%s' or null, got '%s'\n", selfname, result );
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);
@@ -1185,6 +1187,7 @@ static  void    test_SuspendFlag(void)
     PROCESS_INFORMATION	info;
     STARTUPINFOA       startup, us;
     DWORD               exit_status;
+    char *result;
 
     /* let's start simplistic */
     memset(&startup, 0, sizeof(startup));
@@ -1210,8 +1213,9 @@ static  void    test_SuspendFlag(void)
 
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
-    ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname),
-        "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle);
+    result = getChildString( "StartupInfoA", "lpTitle" );
+    todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
+                  "expected '%s' or null, got '%s'\n", selfname, result );
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);
@@ -1233,6 +1237,7 @@ static  void    test_DebuggingFlag(void)
     STARTUPINFOA       startup, us;
     DEBUG_EVENT         de;
     unsigned            dbg = 0;
+    char *result;
 
     /* let's start simplistic */
     memset(&startup, 0, sizeof(startup));
@@ -1270,8 +1275,9 @@ static  void    test_DebuggingFlag(void)
 
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
-    ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname),
-        "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle);
+    result = getChildString( "StartupInfoA", "lpTitle" );
+    todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
+                  "expected '%s' or null, got '%s'\n", selfname, result );
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);
@@ -1304,6 +1310,7 @@ static void test_Console(void)
     const char*         msg = "This is a std-handle inheritance test.";
     unsigned            msg_len;
     BOOL                run_tests = TRUE;
+    char *result;
 
     memset(&startup, 0, sizeof(startup));
     startup.cb = sizeof(startup);
@@ -1381,8 +1388,9 @@ static void test_Console(void)
 
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
-    ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname),
-        "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle);
+    result = getChildString( "StartupInfoA", "lpTitle" );
+    todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
+                  "expected '%s' or null, got '%s'\n", selfname, result );
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);



From julliard at winehq.org  Tue Jun  8 10:08:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:21 -0500
Subject: Alexandre Julliard : kernel32: Make sure we always have a valid
	process title.
Message-ID: <E1OM0Pd-00027f-KR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2b99e1c17d73ebdbf422d529046266f0e2bb5fb9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2b99e1c17d73ebdbf422d529046266f0e2bb5fb9

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  8 11:53:58 2010 +0200

kernel32: Make sure we always have a valid process title.

---

 dlls/kernel32/environ.c       |    6 ++----
 dlls/kernel32/process.c       |    6 ++++--
 dlls/kernel32/tests/process.c |   24 ++++++++++++------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c
index b11f7bf..39c1470 100644
--- a/dlls/kernel32/environ.c
+++ b/dlls/kernel32/environ.c
@@ -468,11 +468,9 @@ void ENV_CopyStartupInformation(void)
 
     startup_infoA.cb                   = sizeof(startup_infoA);
     startup_infoA.lpReserved           = NULL;
-    startup_infoA.lpDesktop = (rupp->Desktop.Length &&
-                               RtlUnicodeStringToAnsiString( &ansi, &rupp->Desktop, TRUE) == STATUS_SUCCESS) ?
+    startup_infoA.lpDesktop = RtlUnicodeStringToAnsiString( &ansi, &rupp->Desktop, TRUE ) == STATUS_SUCCESS ?
         ansi.Buffer : NULL;
-    startup_infoA.lpTitle = (rupp->WindowTitle.Length &&
-                             RtlUnicodeStringToAnsiString( &ansi, &rupp->WindowTitle, TRUE) == STATUS_SUCCESS) ?
+    startup_infoA.lpTitle = RtlUnicodeStringToAnsiString( &ansi, &rupp->WindowTitle, TRUE ) == STATUS_SUCCESS ?
         ansi.Buffer : NULL;
     startup_infoA.dwX                  = rupp->dwX;
     startup_infoA.dwY                  = rupp->dwY;
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index da99ab9..cc2a6ba 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -1481,6 +1481,7 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline,
                                             const STARTUPINFOW *startup, DWORD *info_size )
 {
     const RTL_USER_PROCESS_PARAMETERS *cur_params;
+    const WCHAR *title;
     startup_info_t *info;
     DWORD size;
     void *ptr;
@@ -1510,13 +1511,14 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline,
         else
             cur_dir = cur_params->CurrentDirectory.DosPath.Buffer;
     }
+    title = startup->lpTitle ? startup->lpTitle : imagepath;
 
     size = sizeof(*info);
     size += strlenW( cur_dir ) * sizeof(WCHAR);
     size += cur_params->DllPath.Length;
     size += strlenW( imagepath ) * sizeof(WCHAR);
     size += strlenW( cmdline ) * sizeof(WCHAR);
-    if (startup->lpTitle) size += strlenW( startup->lpTitle ) * sizeof(WCHAR);
+    size += strlenW( title ) * sizeof(WCHAR);
     if (startup->lpDesktop) size += strlenW( startup->lpDesktop ) * sizeof(WCHAR);
     /* FIXME: shellinfo */
     if (startup->lpReserved2 && startup->cbReserved2) size += startup->cbReserved2;
@@ -1575,7 +1577,7 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline,
     ptr = (char *)ptr + cur_params->DllPath.Length;
     info->imagepath_len = append_string( &ptr, imagepath );
     info->cmdline_len = append_string( &ptr, cmdline );
-    if (startup->lpTitle) info->title_len = append_string( &ptr, startup->lpTitle );
+    info->title_len = append_string( &ptr, title );
     if (startup->lpDesktop) info->desktop_len = append_string( &ptr, startup->lpDesktop );
     if (startup->lpReserved2 && startup->cbReserved2)
     {
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 77293c6..b4a048a 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -661,7 +661,7 @@ static void test_Startup(void)
     WritePrivateProfileStringA(NULL, NULL, NULL, resfile);
 
     okChildInt("StartupInfoA", "cb", startup.cb);
-    todo_wine okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop);
+    okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop);
     okChildString("StartupInfoA", "lpTitle", startup.lpTitle);
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
@@ -701,8 +701,8 @@ static void test_Startup(void)
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop);
     result = getChildString( "StartupInfoA", "lpTitle" );
-    todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
-                  "expected '%s' or null, got '%s'\n", selfname, result );
+    ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
+        "expected '%s' or null, got '%s'\n", selfname, result );
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);
@@ -740,7 +740,7 @@ static void test_Startup(void)
 
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop);
-    todo_wine okChildString("StartupInfoA", "lpTitle", startup.lpTitle);
+    okChildString("StartupInfoA", "lpTitle", startup.lpTitle);
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);
@@ -777,8 +777,8 @@ static void test_Startup(void)
     WritePrivateProfileStringA(NULL, NULL, NULL, resfile);
 
     okChildInt("StartupInfoA", "cb", startup.cb);
-    todo_wine okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop);
-    todo_wine okChildString("StartupInfoA", "lpTitle", startup.lpTitle);
+    okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop);
+    okChildString("StartupInfoA", "lpTitle", startup.lpTitle);
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);
@@ -1214,8 +1214,8 @@ static  void    test_SuspendFlag(void)
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
     result = getChildString( "StartupInfoA", "lpTitle" );
-    todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
-                  "expected '%s' or null, got '%s'\n", selfname, result );
+    ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
+        "expected '%s' or null, got '%s'\n", selfname, result );
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);
@@ -1276,8 +1276,8 @@ static  void    test_DebuggingFlag(void)
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
     result = getChildString( "StartupInfoA", "lpTitle" );
-    todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
-                  "expected '%s' or null, got '%s'\n", selfname, result );
+    ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
+        "expected '%s' or null, got '%s'\n", selfname, result );
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);
@@ -1389,8 +1389,8 @@ static void test_Console(void)
     okChildInt("StartupInfoA", "cb", startup.cb);
     okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
     result = getChildString( "StartupInfoA", "lpTitle" );
-    todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
-                  "expected '%s' or null, got '%s'\n", selfname, result );
+    ok( broken(!result) || (result && !strCmp( result, selfname, 0 )),
+        "expected '%s' or null, got '%s'\n", selfname, result );
     okChildInt("StartupInfoA", "dwX", startup.dwX);
     okChildInt("StartupInfoA", "dwY", startup.dwY);
     okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);



From julliard at winehq.org  Tue Jun  8 10:08:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:21 -0500
Subject: Alexandre Julliard : ntdll: Set a valid process title for the initial
	process.
Message-ID: <E1OM0Pd-00027v-Pp@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 28e13982370fbe4b281679542f6cab80d0de871b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=28e13982370fbe4b281679542f6cab80d0de871b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  8 11:55:23 2010 +0200

ntdll: Set a valid process title for the initial process.

---

 dlls/ntdll/loader.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 74e873b..4a2641b 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -2639,6 +2639,8 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
 
     peb->LoaderLock = &loader_section;
     peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName;
+    if (!peb->ProcessParameters->WindowTitle.Buffer)
+        peb->ProcessParameters->WindowTitle = wm->ldr.FullDllName;
     version_init( wm->ldr.FullDllName.Buffer );
 
     LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW,



From julliard at winehq.org  Tue Jun  8 10:08:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:21 -0500
Subject: Alexandre Julliard : comctl32/imagelist: Grow the has_alpha array
	also in ImageList_SetImageCount.
Message-ID: <E1OM0Pd-00028B-TA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9eea385a0ead738a78590bb60c1dca93ba366475
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9eea385a0ead738a78590bb60c1dca93ba366475

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  8 12:45:48 2010 +0200

comctl32/imagelist: Grow the has_alpha array also in ImageList_SetImageCount.

---

 dlls/comctl32/imagelist.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index e4249b9..6e445b5 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -2853,6 +2853,17 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount)
 
     DeleteDC (hdcBitmap);
 
+    if (himl->has_alpha)
+    {
+        char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->has_alpha, nNewCount );
+        if (new_alpha) himl->has_alpha = new_alpha;
+        else
+        {
+            HeapFree( GetProcessHeap(), 0, himl->has_alpha );
+            himl->has_alpha = NULL;
+        }
+    }
+
     /* Update max image count and current image count */
     himl->cMaxImage = nNewCount;
     himl->cCurImage = iImageCount;



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: Alexandre Julliard : krnl386: Load gdi.exe and user. exe also when
	initializing universal thunks.
Message-ID: <E1OM0Pe-00028R-0g@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a8c4edc8dc3a92d63b034ef7699927928f695e51
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a8c4edc8dc3a92d63b034ef7699927928f695e51

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  8 12:46:28 2010 +0200

krnl386: Load gdi.exe and user.exe also when initializing universal thunks.

---

 dlls/krnl386.exe16/utthunk.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/dlls/krnl386.exe16/utthunk.c b/dlls/krnl386.exe16/utthunk.c
index a1889fa..a21342e 100644
--- a/dlls/krnl386.exe16/utthunk.c
+++ b/dlls/krnl386.exe16/utthunk.c
@@ -241,6 +241,14 @@ BOOL WINAPI UTRegister( HMODULE hModule, LPSTR lpsz16BITDLL,
     UTINFO *ut;
     HMODULE16 hModule16;
     FARPROC16 target16, init16;
+    static int done;
+
+    if (!done)
+    {
+        LoadLibrary16( "gdi.exe" );
+        LoadLibrary16( "user.exe" );
+        done = TRUE;
+    }
 
     /* Load 16-bit DLL and get UTProc16 entry point */
 



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: Igor Paliychuk : winhlp32: Add Ukrainian translations.
Message-ID: <E1OM0Pe-00028h-40@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bdd1ddd16bfaa7a5894490ef7113cb6c1a1c0618
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bdd1ddd16bfaa7a5894490ef7113cb6c1a1c0618

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Mon Jun  7 14:41:47 2010 +0300

winhlp32: Add Ukrainian translations.

---

 programs/winhlp32/Makefile.in |    1 +
 programs/winhlp32/Uk.rc       |  202 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 203 insertions(+), 0 deletions(-)

diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in
index 039c065..48e96bf 100644
--- a/programs/winhlp32/Makefile.in
+++ b/programs/winhlp32/Makefile.in
@@ -44,6 +44,7 @@ RC_SRCS = \
 	Sk.rc \
 	Sv.rc \
 	Tr.rc \
+	Uk.rc \
 	Wa.rc \
 	Zh.rc \
 	rsrc.rc
diff --git a/programs/winhlp32/Uk.rc b/programs/winhlp32/Uk.rc
new file mode 100644
index 0000000..bf026b0
--- /dev/null
+++ b/programs/winhlp32/Uk.rc
@@ -0,0 +1,202 @@
+/*
+ * Help Viewer
+ *
+ * Copyright 1996 Ulrich Schmid
+ * Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
+ *
+ * Ukrainian language support
+ *
+ * Copyright (C) 2010 Igor Paliychuk
+ *
+ * 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 "winhelp_res.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+/* Menu */
+
+MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+{
+ POPUP "&????" {
+  MENUITEM "&????????", MNID_FILE_OPEN
+  MENUITEM SEPARATOR
+  MENUITEM "&????", MNID_FILE_PRINT
+  MENUITEM "???????????? &????????...", MNID_FILE_SETUP
+   MENUITEM SEPARATOR
+  MENUITEM "?&????", MNID_FILE_EXIT
+ }
+ POPUP "&??????" {
+   MENUITEM "&?????????...", MNID_EDIT_COPYDLG
+   MENUITEM SEPARATOR
+   MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
+ }
+ POPUP "&????????" {
+   MENUITEM "&Define...", MNID_BKMK_DEFINE
+ }
+ POPUP "&????????????" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "?? ?????????????",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "???????",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "?????????",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "???????",		MNID_OPTS_HISTORY
+  POPUP    "??????"
+  BEGIN
+    MENUITEM "?????",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "??????????",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "???????",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "??????????? ???????? ???????",	MNID_OPTS_SYSTEM_COLORS
+ }
+ POPUP "&???????" {
+   MENUITEM "Help &on help", MNID_HELP_HELPON
+   MENUITEM "?????? &??????", MNID_HELP_HELPTOP
+   MENUITEM SEPARATOR
+   MENUITEM "&??????????...", MNID_HELP_ABOUT
+#ifdef WINELIB
+   MENUITEM "&??? Wine", MNID_HELP_WINE
+#endif
+ }
+}
+
+MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL
+{
+ POPUP "&????" {
+  MENUITEM "&????????", MNID_FILE_OPEN
+  MENUITEM SEPARATOR
+  MENUITEM "&????", MNID_FILE_PRINT
+  MENUITEM "???????????? &????????...", MNID_FILE_SETUP
+   MENUITEM SEPARATOR
+  MENUITEM "?&????", MNID_FILE_EXIT
+ }
+ POPUP "&??????" {
+   MENUITEM "&?????????...", MNID_EDIT_COPYDLG
+   MENUITEM SEPARATOR
+   MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
+ }
+ POPUP "&????????" {
+   MENUITEM "&Define...", MNID_BKMK_DEFINE
+ }
+ POPUP "&????????????" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "?? ?????????????",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "???????",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "?????????",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "???????",		MNID_OPTS_HISTORY
+  POPUP    "??????"
+  BEGIN
+    MENUITEM "?????",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "??????????",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "???????",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "??????????? ???????? ???????",	MNID_OPTS_SYSTEM_COLORS
+ }
+ POPUP "&???????" {
+   MENUITEM "Help &on help", MNID_HELP_HELPON
+   MENUITEM "?????? &??????", MNID_HELP_HELPTOP
+   MENUITEM SEPARATOR
+   MENUITEM "&??????????...", MNID_HELP_ABOUT
+#ifdef WINELIB
+   MENUITEM "&??? Wine", MNID_HELP_WINE
+#endif
+ }
+}
+
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Index"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+}
+
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Search"
+{
+    LTEXT  "?? ?? ???????????", -1, 10, 10, 180, 150
+}
+
+/* Strings */
+STRINGTABLE DISCARDABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+{
+STID_WINE_HELP, 	"??????? Wine"
+STID_WHERROR, 		"???????"
+STID_WARNING,  		"?????"
+STID_INFO,  		"??????????"
+STID_NOT_IMPLEMENTED, 	"?? ???????????"
+STID_HLPFILE_ERROR_s, 	"??????? ??????? ????? ??????? `%s'"
+STID_INDEX, 		"&Index"
+STID_CONTENTS,		"Summary"
+STID_BACK, 		"&?????"
+STID_ALL_FILES, 	"??? ????? (*.*)"
+STID_HELP_FILES_HLP, 	"????? ??????? (*.hlp)"
+STID_FILE_NOT_FOUND_s	"?? ???? ?????? '%s'. ?????? ?????? ??? ???? ??????????"
+STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"??????? ???????: "
+}
+
+CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+BEGIN
+	POPUP ""
+	BEGIN
+		MENUITEM "Annotation...",       MNID_CTXT_ANNOTATE
+		MENUITEM "?????????",                MNID_CTXT_COPY
+		MENUITEM "????...",            MNID_CTXT_PRINT
+		POPUP    "??????"
+		BEGIN
+			MENUITEM "?????",       MNID_CTXT_FONTS_SMALL
+			MENUITEM "??????????",      MNID_CTXT_FONTS_NORMAL
+			MENUITEM "???????",       MNID_CTXT_FONTS_LARGE
+		END
+		POPUP   "??????? ?????? ??????"
+		BEGIN
+			MENUITEM "?? ?????????????",     MNID_CTXT_HELP_DEFAULT
+			MENUITEM "??????",     MNID_CTXT_HELP_VISIBLE
+			MENUITEM "????????", MNID_CTXT_HELP_NONVISIBLE
+		END
+		MENUITEM "??????????? ???????? ???????",   MNID_CTXT_SYSTEM_COLORS
+	END
+END
+
+CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL
+BEGIN
+	POPUP ""
+	BEGIN
+		MENUITEM "Annotation...",       MNID_CTXT_ANNOTATE
+		MENUITEM "?????????",                MNID_CTXT_COPY
+		MENUITEM "????...",            MNID_CTXT_PRINT
+		POPUP    "??????"
+		BEGIN
+			MENUITEM "?????",       MNID_CTXT_FONTS_SMALL
+			MENUITEM "??????????",      MNID_CTXT_FONTS_NORMAL
+			MENUITEM "???????",       MNID_CTXT_FONTS_LARGE
+		END
+		POPUP   "??????? ?????? ??????"
+		BEGIN
+			MENUITEM "?? ?????????????",     MNID_CTXT_HELP_DEFAULT
+			MENUITEM "??????",     MNID_CTXT_HELP_VISIBLE
+			MENUITEM "????????", MNID_CTXT_HELP_NONVISIBLE
+		END
+		MENUITEM "??????????? ??????? ???????",   MNID_CTXT_SYSTEM_COLORS
+	END
+END



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: Igor Paliychuk : oledlg: Add Ukrainian translations.
Message-ID: <E1OM0Pe-00028y-7I@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cfff865a303736725a58ca580d71ae32834177b9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cfff865a303736725a58ca580d71ae32834177b9

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Mon Jun  7 14:39:19 2010 +0300

oledlg: Add Ukrainian translations.

---

 dlls/oledlg/Makefile.in  |    1 +
 dlls/oledlg/oledlg_Uk.rc |  100 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 0 deletions(-)

diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 7b696bd..6f9a3bf 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -31,6 +31,7 @@ RC_SRCS = \
 	oledlg_Si.rc \
 	oledlg_Sv.rc \
 	oledlg_Tr.rc \
+	oledlg_Uk.rc \
 	oledlg_Zh.rc
 
 @MAKE_DLL_RULES@
diff --git a/dlls/oledlg/oledlg_Uk.rc b/dlls/oledlg/oledlg_Uk.rc
new file mode 100644
index 0000000..2563ac2
--- /dev/null
+++ b/dlls/oledlg/oledlg_Uk.rc
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2007 Artem Reznikov
+ *
+ * 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 "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "??????? ??'????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
+                    LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
+                    WS_TABSTOP
+    LTEXT           "??? ??'????:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
+    DEFPUSHBUTTON   "OK",IDOK,221,7,66,14
+    PUSHBUTTON      "?????????",IDCANCEL,221,24,66,14
+    GROUPBOX        "?????????",IDC_RESULT,7,103,208,41
+    CONTROL         "???????? ?????",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON |
+                    WS_GROUP,7,20,62,10
+    CONTROL         "???????? ??????? ??????????",IDC_CREATECONTROL,"Button",
+                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
+    CONTROL         "???????? ? ?????",IDC_CREATEFROMFILE,"Button",
+                    BS_AUTORADIOBUTTON,7,37,67,10
+    LTEXT           "",IDC_RESULTDESC,49,112,159,23
+    PUSHBUTTON      "&?????? ??????? ??????????...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
+    CONTROL         "? ??????? ??????",IDC_ASICON,"Button",BS_AUTOCHECKBOX |
+                    WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
+    PUSHBUTTON      "?????...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
+    LTEXT           "????:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE
+    EDITTEXT        IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE
+END
+
+STRINGTABLE DISCARDABLE
+{
+  IDS_RESULTOBJDESC	"??????? ? ???????? ?????? ??'???? ???? %s"
+  IDS_RESULTFILEOBJDESC	"??????? ? ???????? ?????? ????? ? ??????? ??'????, ?? ????????????? ?? ????????? ????????, ?? ???????? ????."
+  IDS_BROWSE            "?????"
+  IDS_NOTOLEMOD         "???? ?? ? ??????? ?????????? OLE.  ?? ???????? ????????????? ??????? ?????????? OLE."
+  IDS_NOTOLEMODCAPTION  "?????? ??????? ??????????"
+}
+
+IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140
+STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "?????????? ???????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT         "???????:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
+    CONTROL       "???&?????", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
+                  6, 38, 55, 10
+    CONTROL       "&??'?????", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
+                  6, 63, 55, 10
+    LTEXT         "&??:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP
+    LISTBOX       IDC_PS_PASTELIST,     65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_DISPLAYLIST,   65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE
+    CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
+    CONTROL       "?????????", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
+    CONTROL       "&???????", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
+    CONTROL       "&? ??????? ??????", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
+    CONTROL       "?&?????? ??????...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
+    CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
+    CONTROL       "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
+    CONTROL       "?????????", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48
+    CONTROL       "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
+END
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_PS_PASTE_DATA                     "??????? ?? ????????? ?????? ?????? ? ???????: %s."
+    IDS_PS_PASTE_OBJECT                   "??????? ?? ????????? ?????? ??????, ?? ??? ????? ?????????? ??'??? ?? ????????? %s."
+    IDS_PS_PASTE_OBJECT_AS_ICON           "??????? ?? ????????? ?????? ??????, ?? ??? ????? ?????????? ??'??? ?? ????????? %s. ??'??? ???? ???????? ?? ??????."
+    IDS_PS_PASTE_LINK_DATA                "??????? ?? ????????? ?????? ?????? ? ???????: %s. ???? ?????? ??'????? ? ???????? ??????, ?? ????? ????? ????????????? ? ????????? ??????? ?????."
+    IDS_PS_PASTE_LINK_OBJECT              "??????? ?? ????????? ?????????? ?????? ??????. ?????????? ???? ??'????? ? ???????? ??????, ?? ????? ????? ????????????? ? ????????? ??????? ?????."
+    IDS_PS_PASTE_LINK_OBJECT_AS_ICON      "??????? ?? ????????? ??????, ???? ?????? ?? ??????? ?????? ??????. ????? ???? ??'?????? ?? ???????? ??????, ?? ????? ????? ????????????? ? ????????? ??????? ?????."
+    IDS_PS_NON_OLE                        "??????? ?????? ?????? ?? ?????????."
+    IDS_PS_UNKNOWN_TYPE                   "????????? ???"
+    IDS_PS_UNKNOWN_SRC                    "???????? ???????"
+    IDS_PS_UNKNOWN_APP                    "????????, ??? ???? ????????"
+}



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: kernel32/tests: Add a test
	about unicode collation.
Message-ID: <E1OM0Pe-00029E-9q@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b8ff44e627d96a5ecf718ca7261469b9646217e7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b8ff44e627d96a5ecf718ca7261469b9646217e7

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon Jun  7 17:29:16 2010 +0200

kernel32/tests: Add a test about unicode collation.

---

 dlls/kernel32/tests/locale.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index a462a14..f37d503 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1347,6 +1347,9 @@ static void test_CompareStringA(void)
     ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1);
     todo_wine ok(ret == CSTR_LESS_THAN, "\"#\" vs \".\" expected CSTR_LESS_THAN, got %d\n", ret);
 
+    ret = CompareStringA(lcid, NORM_IGNORECASE, "_", -1, ".", -1);
+    todo_wine ok(ret == CSTR_GREATER_THAN, "\"_\" vs \".\" expected CSTR_GREATER_THAN, got %d\n", ret);
+
     ret = lstrcmpi("#", ".");
     todo_wine ok(ret == -1, "\"#\" vs \".\" expected -1, got %d\n", ret);
 }



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: =?UTF-8?Q?Aurimas=20Fi=C5=A1eras=20?=: cmd: Update Lithuanian
	translation.
Message-ID: <E1OM0Pe-00029U-BU@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3a119953fd714f138796457ea51098ce8a3bc5cb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3a119953fd714f138796457ea51098ce8a3bc5cb

Author: Aurimas Fi?eras <aurimas at gmail.com>
Date:   Mon Jun  7 18:53:07 2010 +0300

cmd: Update Lithuanian translation.

---

 programs/cmd/Lt.rc |   61 ++++++++++++++++++++++++++-------------------------
 1 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/programs/cmd/Lt.rc b/programs/cmd/Lt.rc
index 1a335fa..d3eccb9 100644
--- a/programs/cmd/Lt.rc
+++ b/programs/cmd/Lt.rc
@@ -2,7 +2,7 @@
  * Wine command prompt
  * Lithuanian Language Support
  *
- * Copyright 2009 Aurimas Fi?eras <aurimas at gmail.com>
+ * Copyright 2009-2010 Aurimas Fi?eras <aurimas at gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
-  WCMD_ATTRIB, "Informacija apie ATTRIB\n"
+  WCMD_ATTRIB, "ATTRIB parodo arba pakei?ia DOS atributus.\n"
   WCMD_CALL,
 "CALL <komand?failovardas> yra naudojama komand? failo viduje komandoms i?\n\
 kito komand? failo vykdyti. Kai komand? failas egzistuoja, valdymas\n\
@@ -38,16 +38,17 @@ kvie?iamai proced?rai.\n\
 Numatytojo katalogo, aplinkos kintam?j? ir pan. pakeitimai atlikti\n\
 i?kviestoje proced?roje yra paveldimi kvie?ian?iosios proced?ros.\n"
 
-  WCMD_CD,     "Informacija apie CD\n"
-  WCMD_CHDIR,  "Informacija apie CHDIR\n"
+  WCMD_CD,     "CD <direktorija> yra trumpa CHDIR versija. Pakei?ia dabartin?\n\
+numatyt? katalog?.\n"
+  WCMD_CHDIR,  "CHDIR <direktorija> pakei?ia dabartin? numatyt? katalog?.\n"
 
-  WCMD_CLS,    "CLS i?valo pulto ekran?\n"
+  WCMD_CLS,    "CLS i?valo pulto ekran?.\n"
 
-  WCMD_COPY,   "Informacija apie COPY\n"
-  WCMD_CTTY,   "Informacija apie CTTY\n"
-  WCMD_DATE,   "Informacija apie DATE\n"
-  WCMD_DEL,    "Informacija apie DEL\n"
-  WCMD_DIR,    "Informacija apie DIR\n"
+  WCMD_COPY,   "COPY <failas> kopijuoja fail?.\n"
+  WCMD_CTTY,   "CTTY pakei?ia ?vedimo/i?vedimo ?rengin?.\n"
+  WCMD_DATE,   "DATE parodo arba pakei?ia sistemos dat?.\n"
+  WCMD_DEL,    "DEL <failas> pa?alina fail? ar fail? rinkin?.\n"
+  WCMD_DIR,    "DIR parodo katalogo turin?.\n"
 
   WCMD_ECHO,
 "ECHO <eilut?> parodo <eilut?> dabartiniame terminale.\n\
@@ -59,7 +60,7 @@ ECHO OFF panaikina ankstesn?s ECHO ON komandos veikim? (ECHO OFF yra\n\
 numatyta). ECHO OFF komandos rodymo galima i?vengti prie? j? pridedant\n\
 simbol? @.\n"
 
-  WCMD_ERASE,  "Informacija apie ERASE\n"
+  WCMD_ERASE,  "ERASE <failas> pa?alina fail? ar fail? rinkin?.\n"
 
   WCMD_FOR,
 "FOR komanda yra naudojama ?vykdyti komand? kiekvienam fail? aib?s elementui.\n\
@@ -80,7 +81,8 @@ komand? failo vykdym?.\n\
 \n\
 GOTO neturi poveikio naudojant interaktyviai.\n"
 
-  WCMD_HELP,   "Informacija apie HELP\n"
+  WCMD_HELP,   "HELP <komanda> parodo trump? informacij? apie komand?.\n\
+HELP be argument? parodo visas ?taisytas CMD komandas.\n"
 
   WCMD_IF,
 "IF yra naudojama vykdyti komand? su s?lyga.\n\
@@ -98,8 +100,8 @@ Sintaks?: LABEL [diskas:]\n\
 Komanda paklaus naujo tomo vardo duotam diskui.\n\
 Parodyti disko tomo vard? galima su komanda VOL.\n"
 
-  WCMD_MD,     "Informacija apie MD\n"
-  WCMD_MKDIR,  "Informacija apie MKDIR\n"
+  WCMD_MD,     "MD <vardas> yra trumpa MKDIR versija. Sukuria katalog?.\n"
+  WCMD_MKDIR,  "MKDIR <vardas> sukuria katalog?.\n"
   WCMD_MOVE,
 "MOVE perkelia fail? ar katalog? ? nauj? fail? sistemos viet?.\n\
 \n\
@@ -144,16 +146,16 @@ dabartinio disko raid?) ir daugiau-u? (>) simbolis.\n\
 (Taip pat, kaip komanda PROMPT $p$g).\n\
 \n\
 Raginimas taip pat gali b?ti pakeistas kei?iant PROMPT aplinkos kintam?j?,\n\
-taigi, komanda ?SET PROMPT=tekstas? turi t? pat? efekt? kaip ?PROMPT tekstas?\n"
+taigi, komanda ?SET PROMPT=tekstas? turi t? pat? efekt? kaip ?PROMPT tekstas?.\n"
 
   WCMD_REM,
 "Komandos eilut? prasidedanti REM (ir tarpu) neatlieka jokio veiksmo\n\
 ir tod?l gali b?ti naudojama kaip komentaras komand? faile.\n"
 
-  WCMD_REN,    "Informacija apie REN\n"
-  WCMD_RENAME, "Informacija apie RENAME\n"
-  WCMD_RD,     "Informacija apie RD\n"
-  WCMD_RMDIR,  "Informacija apie RMDIR\n"
+  WCMD_REN,    "REN <failas> yra trumpa RENAME versija. Pervadina fail?.\n"
+  WCMD_RENAME, "RENAME <failas> pervadina fail?.\n"
+  WCMD_RD,     "RD <katalogas> yra trumpa RMDIR versija. Pa?alina katalog?.\n"
+  WCMD_RMDIR,  "RMDIR <katalogas> pa?alina katalog?.\n"
 
   WCMD_SET,
 "SET parodo ar pakei?ia CMD aplinkos kintamuosius.\n\
@@ -174,12 +176,12 @@ aplinkos i? komand? interpretatoriaus.\n"
 
   WCMD_SHIFT,
 "SHIFT yra naudojamas komand? faile pa?alinti vienam parametrui i? s?ra?o\n\
-priekio, taip parametras 2 tampa parametru 1 ir t.t. ?i komanda neturi\n\
+priekio, taip parametras 2 tampa parametru 1 ir t. t. ?i komanda neturi\n\
 jokio poveikio, kai kvie?iama i? komandos eilut?s.\n"
 
-  WCMD_TIME,   "Informacija apie TIME\n"
+  WCMD_TIME,   "TIME parodo arba nustato sistemos laik?.\n"
 
-  WCMD_TITLE,  "Nustato CMD lango antra?t?, sintaks? TITLE [tekstas]\n"
+  WCMD_TITLE,  "Nustato CMD lango antra?t?, sintaks? TITLE [tekstas].\n"
 
   WCMD_TYPE,
 "TYPE <failas> nukopijuoja <fail?> ? pulto ?rengin? (arba kitur, jei\n\
@@ -189,16 +191,15 @@ nukreipta). N?ra tikrinama ar faile yra skaitomas tekstas.\n"
 "VERIFY yra naudojama nustatyti, i?valyti ar testuoti tikrinimo ?ymos bit?.\n\
 Galimos formos yra:\n\
 \n\
-VERIFY ON	Nustatyti ?ymos bit?\n\
-VERIFY OFF	I?valyti ?ymos bit?\n\
-VERIFY		Parodo ON arba OFF, kuris tinkamas.\n\
+VERIFY ON\tNustatyti ?ymos bit?\n\
+VERIFY OFF\tI?valyti ?ymos bit?\n\
+VERIFY\t\tParodo ON arba OFF, kuris tinkamas.\n\
 \n\
 Tikrinimo ?ymos bitas neturi jokios funkcijos Wine.\n"
 
-  WCMD_VER,
-"VER parodo dabar vykdomo CMD versij?\n"
+  WCMD_VER,    "VER parodo dabar vykdomo CMD versij?.\n"
 
-  WCMD_VOL,    "Informacija apie VOL\n"
+  WCMD_VOL,    "VOL parodo disko ?renginio tomo vard?.\n"
 
   WCMD_PUSHD,  "PUSHD <katalogas> i?saugo dabartin? katalog? ? d?kl?,\n\
 o po to pakei?ia dabartin? katalog? ? nurodyt?.\n"
@@ -239,7 +240,7 @@ TYPE\t\tI?vesti tekstinio failo turin?\n\
 VER\t\tParodyti dabartin? CMD versij?\n\
 VOL\t\tParodyti tomo vard?\n\
 EXIT\t\tU?veria CMD\n\n\
-?veskite HELP <komanda> platesnei informacijai apie i?vardintas komandas gauti\n"
+?veskite HELP <komanda> platesnei informacijai apie i?vardintas komandas gauti.\n"
 
   WCMD_CONFIRM,       "Ar tikrai"
   WCMD_YES,           "T"
@@ -263,7 +264,7 @@ EXIT\t\tU?veria CMD\n\n\
   WCMD_READFAIL,      "Nepavyko atverti ?%s?\n"
   WCMD_CALLINSCRIPT,  "Negalima i?kviesti ?ym?s esan?ios u? komandos failo rib?\n"
   WCMD_ALL,           "V"
-  WCMD_DELPROMPT,     "%s, trinti"
+  WCMD_DELPROMPT,     "%s, ?alinti"
   WCMD_ECHOPROMPT,    "ECHO yra %s\n"
   WCMD_VERIFYPROMPT,  "VERIFY yra %s\n"
   WCMD_VERIFYERR,     "VERIFY turi b?ti ON arba OFF\n";



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: Paul Vriens : resources: Fix some copy-paste mistakes in resource
	files.
Message-ID: <E1OM0Pe-00029k-Dd@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1edc58eae97ce56f83afeac109971af018b6c807
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1edc58eae97ce56f83afeac109971af018b6c807

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Mon Jun  7 21:36:35 2010 +0200

resources: Fix some copy-paste mistakes in resource files.

---

 dlls/appwiz.cpl/It.rc         |    2 +-
 dlls/appwiz.cpl/Pt.rc         |    2 +-
 dlls/gphoto2.ds/gphoto2_Sv.rc |    2 +-
 dlls/hhctrl.ocx/Ko.rc         |    2 +-
 dlls/localspl/spl_Sv.rc       |    2 +-
 dlls/msrle32/msrle_Pl.rc      |    2 +-
 dlls/oleacc/oleacc_Ko.rc      |    2 +-
 dlls/shlwapi/shlwapi_Da.rc    |    2 +-
 dlls/shlwapi/shlwapi_Pl.rc    |    2 +-
 programs/cmd/It.rc            |    2 +-
 programs/start/De.rc          |    2 +-
 programs/uninstaller/Pl.rc    |    2 +-
 programs/winecfg/Cs.rc        |    2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/appwiz.cpl/It.rc b/dlls/appwiz.cpl/It.rc
index 7939f61..dd0299f 100644
--- a/dlls/appwiz.cpl/It.rc
+++ b/dlls/appwiz.cpl/It.rc
@@ -1,5 +1,5 @@
 /*
-* Add/Remove Programs English resources
+* Add/Remove Programs Italian resources
 *
 * Copyright 2001-2002, 2008 Owen Rudge
 * Copyright 2009 Luca Bennati
diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc
index 4abcb50..cf013cf 100644
--- a/dlls/appwiz.cpl/Pt.rc
+++ b/dlls/appwiz.cpl/Pt.rc
@@ -1,5 +1,5 @@
 /*
-* Add/Remove Programs English resources
+* Add/Remove Programs Portuguese resources
 *
 * Copyright 2001-2002, 2008 Ricardo Filipe
 *
diff --git a/dlls/gphoto2.ds/gphoto2_Sv.rc b/dlls/gphoto2.ds/gphoto2_Sv.rc
index 1c3593b..d2e14a6 100644
--- a/dlls/gphoto2.ds/gphoto2_Sv.rc
+++ b/dlls/gphoto2.ds/gphoto2_Sv.rc
@@ -1,5 +1,5 @@
 /*
- * English resources for Twain
+ * Swedish resources for Twain
  *
  * Copyright 2007 Daniel Nylander
  *
diff --git a/dlls/hhctrl.ocx/Ko.rc b/dlls/hhctrl.ocx/Ko.rc
index 37831df..c641404 100644
--- a/dlls/hhctrl.ocx/Ko.rc
+++ b/dlls/hhctrl.ocx/Ko.rc
@@ -1,6 +1,6 @@
 /*
  * HTML Help resources
- * English Language Support
+ * Korean Language Support
  *
  * Copyright 2005 James Hawkins
  * Copyright 2005 YunSong Hwang
diff --git a/dlls/localspl/spl_Sv.rc b/dlls/localspl/spl_Sv.rc
index 2831da6..8839f34 100644
--- a/dlls/localspl/spl_Sv.rc
+++ b/dlls/localspl/spl_Sv.rc
@@ -1,5 +1,5 @@
 /*
- * English resources for localspl
+ * Swedish resources for localspl
  *
  * Copyright 2007 Daniel Nylander
  *
diff --git a/dlls/msrle32/msrle_Pl.rc b/dlls/msrle32/msrle_Pl.rc
index 9394da1..b5b233b 100644
--- a/dlls/msrle32/msrle_Pl.rc
+++ b/dlls/msrle32/msrle_Pl.rc
@@ -1,5 +1,5 @@
 /*
- * English resource file for MS-RLE
+ * Polish resource file for MS-RLE
  *
  * Copyright 2002 Michael Gnnewig
  * Copyright 2006 Mikolaj Zalewski
diff --git a/dlls/oleacc/oleacc_Ko.rc b/dlls/oleacc/oleacc_Ko.rc
index 919b8d4..7013875 100644
--- a/dlls/oleacc/oleacc_Ko.rc
+++ b/dlls/oleacc/oleacc_Ko.rc
@@ -1,5 +1,5 @@
 /*
- * English resources for oleacc
+ * Korean resources for oleacc
  *
  * Copyright 2008 Nikolay Sivov
  * Copyright 2008 YunSong Hwang
diff --git a/dlls/shlwapi/shlwapi_Da.rc b/dlls/shlwapi/shlwapi_Da.rc
index 3bb418d..d757692 100644
--- a/dlls/shlwapi/shlwapi_Da.rc
+++ b/dlls/shlwapi/shlwapi_Da.rc
@@ -1,5 +1,5 @@
 /*
- * English resources for shlwapi
+ * Danish resources for shlwapi
  *
  * Copyright 2008 Jens Albretsen
  *
diff --git a/dlls/shlwapi/shlwapi_Pl.rc b/dlls/shlwapi/shlwapi_Pl.rc
index 8a0032c..c5b6639 100644
--- a/dlls/shlwapi/shlwapi_Pl.rc
+++ b/dlls/shlwapi/shlwapi_Pl.rc
@@ -1,5 +1,5 @@
 /*
- * English resources for shlwapi
+ * Polish resources for shlwapi
  *
  * Copyright 2004 Jon Griffiths
  * Copyright 2006 Mikolaj Zalewski
diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc
index 8eb2a33..ecccebe 100644
--- a/programs/cmd/It.rc
+++ b/programs/cmd/It.rc
@@ -1,6 +1,6 @@
 /*
  * Wine command prompt
- * English Language Support
+ * Italian Language Support
  *
  * Copyright (C) 1999 D A Pickles
  * Copyright (C) 2009 Luca Bennati
diff --git a/programs/start/De.rc b/programs/start/De.rc
index af2058b..8b44b07 100644
--- a/programs/start/De.rc
+++ b/programs/start/De.rc
@@ -1,6 +1,6 @@
 /*
  * Start
- * English Language Support
+ * German Language Support
  *
  * Copyright 2003 Dan Kegel
  * Copyright 2004 Henning Gerhardt
diff --git a/programs/uninstaller/Pl.rc b/programs/uninstaller/Pl.rc
index 174759a..d719e49 100644
--- a/programs/uninstaller/Pl.rc
+++ b/programs/uninstaller/Pl.rc
@@ -1,5 +1,5 @@
 /*
- * Uninstaller (English Resources)
+ * Uninstaller (Polish Resources)
  *
  * Copyright 2005 Jonathan Ernst
  * Copyright 2006 Mikolaj Zalewski
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index f3116d7..196ba93 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -1,7 +1,7 @@
 /* Hey, Emacs, open this file with -*- coding: cp1250 -*-
  *
  * WineCfg resources
- * English Language Support
+ * Czech Language Support
  *
  * Copyright 2002 Jaco Greeff
  * Copyright 2003 Dimitrie O. Paun



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: Juan Lang : winhttp/tests: Skip tests when a connection fails.
Message-ID: <E1OM0Pe-0002A0-I8@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f3968fdf80fc15f12f8000640873b059adfd75ad
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f3968fdf80fc15f12f8000640873b059adfd75ad

Author: Juan Lang <juan.lang at gmail.com>
Date:   Mon Jun  7 13:41:40 2010 -0700

winhttp/tests: Skip tests when a connection fails.

---

 dlls/winhttp/tests/winhttp.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index 26477ee..05c548c 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -211,6 +211,11 @@ static void test_OpenRequest (void)
     ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError());
 
     ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0);
+    if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT)
+    {
+        skip("Connection failed, skipping.\n");
+        goto done;
+    }
     ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError());
     ret = WinHttpCloseHandle(request);
     ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret);
@@ -781,6 +786,11 @@ static void test_secure_connection(void)
     ok(req != NULL, "failed to open a request %u\n", GetLastError());
 
     ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0);
+    if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT)
+    {
+        skip("Connection failed, skipping.\n");
+        goto cleanup;
+    }
     ok(ret, "failed to send request %u\n", GetLastError());
 
     ret = WinHttpReceiveResponse(req, NULL);



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: Eric Pouech : dbghelp: In dwarf parser,
	properly handle array without size specified.
Message-ID: <E1OM0Pe-0002AI-MJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8c7cc491abb7a7a31c7f87a02bd6550a1405c0ff
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8c7cc491abb7a7a31c7f87a02bd6550a1405c0ff

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Mon Jun  7 21:48:36 2010 +0200

dbghelp: In dwarf parser, properly handle array without size specified.

---

 dlls/dbghelp/dwarf.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index f3e2f12..6daf7d7 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -1122,14 +1122,17 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx,
 
     TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di));
 
+    ref_type = dwarf2_lookup_type(ctx, di);
+
     if (!di->abbrev->have_child)
     {
-        FIXME("array without range information\n");
-        return NULL;
+        /* fake an array with unknown size */
+        /* FIXME: int4 even on 64bit machines??? */
+        idx_type = ctx->symt_cache[sc_int4];
+        min.u.uvalue = 0;
+        max.u.uvalue = -1;
     }
-    ref_type = dwarf2_lookup_type(ctx, di);
-
-    for (i=0; i<vector_length(&di->children); i++)
+    else for (i = 0; i < vector_length(&di->children); i++)
     {
         child = *(dwarf2_debug_info_t**)vector_at(&di->children, i);
         switch (child->abbrev->tag)



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: Eric Pouech : dbghelp: Ensure that local variables and parameter
	actually have a container.
Message-ID: <E1OM0Pe-0002AY-OQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 99a5488a18f5e334841103fdcfd5b49437409f92
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=99a5488a18f5e334841103fdcfd5b49437409f92

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Mon Jun  7 21:50:37 2010 +0200

dbghelp: Ensure that local variables and parameter actually have a container.

---

 dlls/dbghelp/symbol.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 0607278..b399b66 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -476,7 +476,7 @@ struct symt_data* symt_add_func_local(struct module* module,
     locsym->hash_elt.name = pool_strdup(&module->pool, name);
     locsym->hash_elt.next = NULL;
     locsym->kind          = dt;
-    locsym->container     = &block->symt;
+    locsym->container     = block ? &block->symt : &func->symt;
     locsym->type          = type;
     locsym->u.var         = *loc;
     if (block)



From julliard at winehq.org  Tue Jun  8 10:08:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:22 -0500
Subject: Eric Pouech : dbghelp: Properly manage in dbghelp interfaces local
	variables and parameters that are constant .
Message-ID: <E1OM0Pe-0002Ao-SD@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 083eca072d24a2b2b61632082de2e899f5af0f54
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=083eca072d24a2b2b61632082de2e899f5af0f54

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Mon Jun  7 21:50:46 2010 +0200

dbghelp: Properly manage in dbghelp interfaces local variables and parameters that are constant.

---

 dlls/dbghelp/dbghelp_private.h |    1 +
 dlls/dbghelp/module.c          |    1 +
 dlls/dbghelp/type.c            |   32 +++++++++++++++++++++++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index de764ae..f4c88a0 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -347,6 +347,7 @@ struct module_format
 
 struct module
 {
+    struct process*             process;
     IMAGEHLP_MODULEW64          module;
     /* ANSI copy of module.ModuleName for efficiency */
     char                        module_name[MAX_PATH];
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index e99bd7f..89422a9 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -142,6 +142,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name,
 
     pool_init(&module->pool, 65536);
 
+    module->process = pcs;
     module->module.SizeOfStruct = sizeof(module->module);
     module->module.BaseOfImage = mod_addr;
     module->module.ImageSize = size;
diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c
index 2ef4bb4..e933e19 100644
--- a/dlls/dbghelp/type.c
+++ b/dlls/dbghelp/type.c
@@ -803,9 +803,35 @@ BOOL symt_get_info(struct module* module, const struct symt* type,
         break;
 
     case TI_GET_VALUE:
-        if (type->tag != SymTagData || ((const struct symt_data*)type)->kind != DataIsConstant)
-            return FALSE;
-        X(VARIANT) = ((const struct symt_data*)type)->u.value;
+        if (type->tag != SymTagData) return FALSE;
+        switch (((const struct symt_data*)type)->kind)
+        {
+        case DataIsConstant: X(VARIANT) = ((const struct symt_data*)type)->u.value; break;
+        case DataIsLocal:
+        case DataIsParam:
+            {
+                struct location loc = ((const struct symt_data*)type)->u.var;
+                unsigned                i;
+                struct module_format*   modfmt;
+
+                if (loc.kind < loc_user) return FALSE;
+                for (i = 0; i < DFI_LAST; i++)
+                {
+                    modfmt = module->format_info[i];
+                    if (modfmt && modfmt->loc_compute)
+                    {
+                        modfmt->loc_compute(module->process, modfmt,
+                                            (const struct symt_function*)((const struct symt_data*)type)->container, &loc);
+                        break;
+                    }
+                }
+                if (loc.kind != loc_absolute) return FALSE;
+                X(VARIANT).n1.n2.vt = VT_UI4; /* FIXME */
+                X(VARIANT).n1.n2.n3.uiVal = loc.offset;
+            }
+            break;
+        default: return FALSE;
+        }
         break;
 
     case TI_GET_CALLING_CONVENTION:



From julliard at winehq.org  Tue Jun  8 10:08:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:23 -0500
Subject: Luca Bennati : shdoclc: Fix Italian translation.
Message-ID: <E1OM0Pf-0002B4-0C@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ca1bdfe511178e7429c0ff09bed601f0154943a7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ca1bdfe511178e7429c0ff09bed601f0154943a7

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Mon Jun  7 19:34:51 2010 +0200

shdoclc: Fix Italian translation.

---

 dlls/shdoclc/It.rc |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/shdoclc/It.rc b/dlls/shdoclc/It.rc
index 5d4e28e..bcd08bf 100644
--- a/dlls/shdoclc/It.rc
+++ b/dlls/shdoclc/It.rc
@@ -37,9 +37,9 @@ STRINGTABLE DISCARDABLE
 
 IDR_BROWSE_CONTEXT_MENU MENU
 {
-    POPUP "Default"
+    POPUP "Predefinito"
     {
-        MENUITEM "&Indietra",                  IDM_GOBACKWARD
+        MENUITEM "&Indietro",                  IDM_GOBACKWARD
         MENUITEM "&Avanti",               IDM_GOFORWARD
         MENUITEM SEPARATOR
         MENUITEM "&Salva sfondo come...", IDM_SAVEBACKGROUND
@@ -194,7 +194,6 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM SEPARATOR
         MENUITEM "Aggiungi ai &Preferiti...",     IDM_ADDFAVORITES
         MENUITEM SEPARATOR
-        MENUITEM SEPARATOR
         MENUITEM "Riproduci",                     IDM_DYNSRCPLAY
         MENUITEM "Ferma",                     IDM_DYNSRCSTOP
         MENUITEM "Indietro",                   IDM_IMGARTREWIND



From julliard at winehq.org  Tue Jun  8 10:08:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:23 -0500
Subject: Jose Rostagno : msvidc32: Add Spanish translation.
Message-ID: <E1OM0Pf-0002BU-3Y@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b20b58250f8a48b7ab7528a512dbfb905939de1b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b20b58250f8a48b7ab7528a512dbfb905939de1b

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Mon Jun  7 17:44:45 2010 -0300

msvidc32: Add Spanish translation.

---

 dlls/msvidc32/Makefile.in    |    1 +
 dlls/msvidc32/msvidc32_Es.rc |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in
index 7cb9142..dcf323b 100644
--- a/dlls/msvidc32/Makefile.in
+++ b/dlls/msvidc32/Makefile.in
@@ -12,6 +12,7 @@ RC_SRCS = \
 	msvidc32_Da.rc \
 	msvidc32_De.rc \
 	msvidc32_En.rc \
+	msvidc32_Es.rc \
 	msvidc32_Fr.rc \
 	msvidc32_Hu.rc \
 	msvidc32_It.rc \
diff --git a/dlls/msvidc32/msvidc32_Es.rc b/dlls/msvidc32/msvidc32_Es.rc
new file mode 100644
index 0000000..889e898
--- /dev/null
+++ b/dlls/msvidc32/msvidc32_Es.rc
@@ -0,0 +1,31 @@
+/*
+ *
+ * Copyright 2010 Jos? Rostagno
+ *
+ * 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 "msvidc32_private.h"
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_NAME "MS-CRAM"
+    IDS_DESCRIPTION "c?dec de video Wine Video 1"
+}



From julliard at winehq.org  Tue Jun  8 10:08:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:23 -0500
Subject: Jose Rostagno : winecfg: Update Spanish translation.
Message-ID: <E1OM0Pf-0002CN-D2@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f5edb4aea311fe8e83f4c300b2cc8b4ff16abaec
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f5edb4aea311fe8e83f4c300b2cc8b4ff16abaec

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Mon Jun  7 17:56:32 2010 -0300

winecfg: Update Spanish translation.

---

 programs/winecfg/Es.rc |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 423c783..6985979 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -3,6 +3,7 @@
  * Spanish Language Support
  *
  * Copyright 2003-2009 Jos? Manuel Ferrer Ortiz
+ * Copyright 2010 Jos? Rostagno
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -122,6 +123,16 @@ BEGIN
     PUSHBUTTON      "Cancelar",IDCANCEL,62,74,50,14,WS_GROUP
 END
 
+IDD_DRIVECHOOSE DIALOG DISCARDABLE  60, 70, 170, 60
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Seleccionar letra de la unidad"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "Aceptar",IDOK,105,10,45,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",IDCANCEL,105,30,45,14,WS_GROUP
+END
+
 IDD_DRIVECFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
@@ -164,8 +175,8 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        " Selecci?n de manejador ",IDC_STATIC,8,4,244,210
-    LTEXT           "Seleccione un manejador de sonido marcando la casilla del deseado. Para deshabilitar el sonido no seleccione ninguno. No se recomienda la selecci?n de m?s de un manejador. Para configurar un manejador haga doble click sobre ?l.",IDC_STATIC,15,15,227,35
+    GROUPBOX        "Selecci?n de controlador ",IDC_STATIC,8,4,244,210
+    LTEXT           " Seleccione un controlador de sonido marcando la casilla del deseado. Para deshabilitar el sonido no seleccione ninguno. No se recomienda la selecci?n de m?s de un controlador. Para configurar un controlador haga doble click sobre ?l.",IDC_STATIC,15,15,227,35
     CONTROL         "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,155
     PUSHBUTTON      "Probar sonido",IDC_AUDIO_TEST,170,50,59,14
     PUSHBUTTON      "Panel de control",IDC_AUDIO_CONTROL_PANEL,170,70,59,14
@@ -223,7 +234,7 @@ BEGIN
     IDS_WINECFG_TITLE_APP   "Configuraci?n de Wine para %s"
     IDS_THEMEFILE           "Ficheros de tema (*.msstyles; *.theme)"
     IDS_THEMEFILE_SELECT    "Seleccione un fichero de tema"
-    IDS_AUDIO_MISSING       "Actualmente no hay ning?n manejador de audio especificado en el registro.\n\nSe ha seleccionado para usted un manejador recomendado. Puede usar ?ste o seleccionar otro manejador disponible.\n\nDebe pulsar Aplicar para que la selecci?n surja efecto."
+    IDS_AUDIO_MISSING       "Actualmente no hay ning?n controlador de audio especificado en el registro.\n\nSe ha seleccionado para usted un controlador recomendado. Puede usar ?ste o seleccionar otro controlador disponible.\n\nDebe pulsar Aplicar para que la selecci?n surja efecto."
     IDS_SHELL_FOLDER        "Carpeta del sistema"
     IDS_LINKS_TO            "Enlaza a"
 END
@@ -270,22 +281,22 @@ BEGIN
     IDS_ACCEL_STANDARD          "Est?ndar"
     IDS_ACCEL_BASIC             "B?sica"
     IDS_ACCEL_EMULATION         "Emulaci?n"
-    IDS_DRIVER_ALSA             "Manejador ALSA"
-    IDS_DRIVER_ESOUND           "Manejador EsounD"
-    IDS_DRIVER_OSS              "Manejador OSS"
-    IDS_DRIVER_JACK             "Manejador JACK"
-    IDS_DRIVER_NAS              "Manejador NAS"
-    IDS_DRIVER_AUDIOIO          "Manejador Audio IO (Solaris)"
-    IDS_DRIVER_COREAUDIO        "Manejador CoreAudio"
+    IDS_DRIVER_ALSA             "Controlador ALSA"
+    IDS_DRIVER_ESOUND           "Controlador EsounD"
+    IDS_DRIVER_OSS              "Controlador OSS"
+    IDS_DRIVER_JACK             "Controlador JACK"
+    IDS_DRIVER_NAS              "Controlador NAS"
+    IDS_DRIVER_AUDIOIO          "Controlador Audio IO (Solaris)"
+    IDS_DRIVER_COREAUDIO        "Controlador CoreAudio"
     IDS_OPEN_DRIVER_ERROR       "?No se ha podido abrir %s!"
-    IDS_SOUNDDRIVERS            "Manejadores de sonido"
+    IDS_SOUNDDRIVERS            "Controladores de sonido"
     IDS_DEVICES_WAVEOUT         "Dispositivos de salida de onda"
     IDS_DEVICES_WAVEIN          "Dispositivos de entrada de onda"
     IDS_DEVICES_MIDIOUT         "Dispositivos de salida MIDI"
     IDS_DEVICES_MIDIIN          "Dispositivos de entrada MIDI"
     IDS_DEVICES_AUX             "Dispositivos auxiliares"
     IDS_DEVICES_MIXER           "Dispositivos mezcladores"
-    IDS_UNAVAILABLE_DRIVER      "?Se ha encontrado en el registro un manejador que no est? disponible!\n\n?Eliminar \"%s\" del registro?"
+    IDS_UNAVAILABLE_DRIVER      "?Se ha encontrado en el registro un Controlador que no est? disponible!\n\n?Eliminar \"%s\" del registro?"
     IDS_WARNING                 "Advertencia"
 END
 



From julliard at winehq.org  Tue Jun  8 10:08:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:23 -0500
Subject: Maarten Lankhorst : dsound: Unofficially support 5.1 sound.
Message-ID: <E1OM0Pf-0002Ce-IG@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2d5c4944c13900b5d16b306de94a2f49371bd0d1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2d5c4944c13900b5d16b306de94a2f49371bd0d1

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Tue Jun  8 00:28:56 2010 +0200

dsound: Unofficially support 5.1 sound.

---

 dlls/dsound/mixer.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index 698e586..185df6e 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -277,7 +277,8 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf
     DirectSoundDevice *device = dsb->device;
     INT istep = dsb->pwfx->wBitsPerSample / 8, ostep = device->pwfx->wBitsPerSample / 8;
 
-    if (device->pwfx->nChannels == dsb->pwfx->nChannels) {
+    if (device->pwfx->nChannels == dsb->pwfx->nChannels ||
+        (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6)) {
         dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj);
         if (device->pwfx->nChannels == 2)
             dsb->convert(ibuf + istep, obuf + ostep, istride, ostride, count, freqAcc, adj);



From julliard at winehq.org  Tue Jun  8 10:08:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:23 -0500
Subject: Nikolay Sivov : comctl32/treeview: Activate tree verification only
	when TRACE() is on.
Message-ID: <E1OM0Pf-0002Cv-LL@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 767754031dc37a41d62718cdede5bdcf062d4972
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=767754031dc37a41d62718cdede5bdcf062d4972

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jun  8 01:07:06 2010 +0400

comctl32/treeview: Activate tree verification only when TRACE() is on.

---

 dlls/comctl32/treeview.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index f1ff9c5..b3c283d 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -213,21 +213,11 @@ static VOID TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr);
 static LRESULT TREEVIEW_HScroll(TREEVIEW_INFO *, WPARAM);
 
 /* Random Utilities *****************************************************/
-
-#ifndef NDEBUG
-static inline void
-TREEVIEW_VerifyTree(TREEVIEW_INFO *infoPtr)
-{
-    (void)infoPtr;
-}
-#else
-/* The definition is at the end of the file. */
 static void TREEVIEW_VerifyTree(TREEVIEW_INFO *infoPtr);
-#endif
 
 /* Returns the treeview private data if hwnd is a treeview.
  * Otherwise returns an undefined value. */
-static TREEVIEW_INFO *
+static inline TREEVIEW_INFO *
 TREEVIEW_GetInfoPtr(HWND hwnd)
 {
     return (TREEVIEW_INFO *)GetWindowLongPtrW(hwnd, 0);
@@ -5818,7 +5808,6 @@ TREEVIEW_Unregister(void)
 
 /* Tree Verification ****************************************************/
 
-#ifdef NDEBUG
 static inline void
 TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item);
 
@@ -5905,8 +5894,8 @@ TREEVIEW_VerifyRoot(TREEVIEW_INFO *infoPtr)
 static void
 TREEVIEW_VerifyTree(TREEVIEW_INFO *infoPtr)
 {
-    assert(infoPtr != NULL);
+    if (!TRACE_ON(treeview)) return;
 
+    assert(infoPtr != NULL);
     TREEVIEW_VerifyRoot(infoPtr);
 }
-#endif



From julliard at winehq.org  Tue Jun  8 10:08:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:23 -0500
Subject: Nikolay Sivov : comctl32/treeview: Remove commented out lines.
Message-ID: <E1OM0Pf-0002DG-OT@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b3549350924149d79ac7c2b71c36b52271b71650
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b3549350924149d79ac7c2b71c36b52271b71650

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jun  8 04:51:47 2010 +0400

comctl32/treeview: Remove commented out lines.

---

 dlls/comctl32/treeview.c |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index b3c283d..11b4520 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -852,15 +852,9 @@ static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND hwndFrom, UINT nC
 static VOID
 TREEVIEW_ComputeItemInternalMetrics(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item)
 {
-    /* Same effect, different optimisation. */
-#if 0
-    BOOL lar = ((infoPtr->dwStyle & TVS_LINESATROOT)
-		&& (infoPtr->dwStyle & (TVS_HASLINES|TVS_HASBUTTONS)));
-#else
-    BOOL lar = ((infoPtr->dwStyle
-		 & (TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS))
+    /* has TVS_LINESATROOT and (TVS_HASLINES|TVS_HASBUTTONS) */
+    BOOL lar = ((infoPtr->dwStyle & (TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS))
 		> TVS_LINESATROOT);
-#endif
 
     item->linesOffset = infoPtr->uIndent * (lar ? item->iLevel : item->iLevel - 1)
 	- infoPtr->scrollX;
@@ -3451,10 +3445,6 @@ TREEVIEW_ExpandMsg(TREEVIEW_INFO *infoPtr, UINT flag, HTREEITEM wineItem)
     default:
 	return 0;
     }
-
-#if 0
-    TRACE("Exiting, Item %p state is now %d...\n", wineItem, wineItem->state);
-#endif
 }
 
 /* Hit-Testing **********************************************************/
@@ -5028,10 +5018,6 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
     infoPtr->root->visibleOrder = -1;
 
     infoPtr->hwndNotify = lpcs->hwndParent;
-#if 0
-    infoPtr->bTransparent = ( GetWindowLongW( hwnd, GWL_STYLE) & TBSTYLE_FLAT);
-#endif
-
     infoPtr->hwndToolTip = 0;
 
     infoPtr->bNtfUnicode = IsWindowUnicode (hwnd);



From julliard at winehq.org  Tue Jun  8 10:08:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:23 -0500
Subject: Nikolay Sivov : comctl32/treeview: Remove some casts.
Message-ID: <E1OM0Pf-0002DW-RH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 16973508e7f4989513f79a568bc695bd7b840967
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=16973508e7f4989513f79a568bc695bd7b840967

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jun  8 05:16:15 2010 +0400

comctl32/treeview: Remove some casts.

---

 dlls/comctl32/treeview.c |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 11b4520..8022556 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -482,7 +482,7 @@ static INT get_notifycode(const TREEVIEW_INFO *infoPtr, INT code)
     return code;
 }
 
-static LRESULT
+static inline BOOL
 TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
     TRACE("wParam=%ld, lParam=%ld\n", wParam, lParam);
@@ -500,7 +500,7 @@ TREEVIEW_SendSimpleNotify(const TREEVIEW_INFO *infoPtr, UINT code)
     nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID);
     nmhdr.code = get_notifycode(infoPtr, code);
 
-    return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, (LPARAM)&nmhdr);
+    return TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, (LPARAM)&nmhdr);
 }
 
 static VOID
@@ -563,7 +563,7 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action
     nmhdr.ptDrag.x = 0;
     nmhdr.ptDrag.y = 0;
 
-    ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr);
+    ret = TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr);
     if (!infoPtr->bNtfUnicode)
     {
 	Free(nmhdr.itemOld.pszText);
@@ -593,7 +593,7 @@ TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code,
     nmhdr.ptDrag.x = pt.x;
     nmhdr.ptDrag.y = pt.y;
 
-    return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr);
+    return TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr);
 }
 
 
@@ -621,7 +621,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage,
     nmcdhdr.clrTextBk = infoPtr->clrBk;
     nmcdhdr.iLevel = 0;
 
-    return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)&nmcdhdr);
+    return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)&nmcdhdr);
 }
 
 
@@ -638,7 +638,6 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc,
     DWORD dwDrawStage;
     DWORD_PTR dwItemSpec;
     UINT uItemState;
-    INT retval;
 
     dwDrawStage = CDDS_ITEM | uItemDrawState;
     dwItemSpec = (DWORD_PTR)wineItem;
@@ -666,9 +665,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc,
 	  nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec,
 	  nmcd->uItemState, nmcd->lItemlParam);
 
-    retval = TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)nmcdhdr);
-
-    return retval;
+    return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)nmcdhdr);
 }
 
 static BOOL
@@ -685,7 +682,7 @@ TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editI
     TREEVIEW_TVItemFromItem(infoPtr, TVIF_HANDLE | TVIF_STATE | TVIF_PARAM | TVIF_TEXT,
                             &tvdi.item, editItem);
 
-    ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi);
+    ret = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi);
 
     if (!infoPtr->bNtfUnicode)
 	Free(tvdi.item.pszText);
@@ -3836,7 +3833,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel)
 	tvdi.item.cchTextMax = 0;
     }
 
-    bCommit = (BOOL)TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi);
+    bCommit = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi);
 
     if (!bCancel && bCommit)	/* Apply the changes */
     {



From julliard at winehq.org  Tue Jun  8 10:08:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:23 -0500
Subject: Damjan Jovanovic : winemenubuilder: Also extract .lnk icons from file
	types .
Message-ID: <E1OM0Pf-0002Do-VA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f26b663172d80c300df993465b6a01369795a76f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f26b663172d80c300df993465b6a01369795a76f

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Mon Jun  7 21:40:26 2010 +0200

winemenubuilder: Also extract .lnk icons from file types.

---

 programs/winemenubuilder/winemenubuilder.c |   38 ++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index a40a657..276c4e4 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -172,6 +172,9 @@ static char *xdg_config_dir;
 static char *xdg_data_dir;
 static char *xdg_desktop_dir;
 
+static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra);
+static char *extract_icon(LPCWSTR path, int index, const char *destFilename, BOOL bWait);
+
 /* Icon extraction routines
  *
  * FIXME: should use PrivateExtractIcons and friends
@@ -814,6 +817,39 @@ static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName)
     return 0;
 }
 
+static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName)
+{
+    int ret = 1;
+    WCHAR *extension;
+    WCHAR *icon = NULL;
+    WCHAR *comma;
+    int index = 0;
+    char *output_path = NULL;
+
+    extension = strrchrW(szFileName, '.');
+    if (extension == NULL)
+        goto end;
+
+    icon = assoc_query(ASSOCSTR_DEFAULTICON, extension, NULL);
+    if (icon == NULL)
+        goto end;
+
+    comma = strrchrW(icon, ',');
+    if (comma)
+    {
+        *comma = 0;
+        index = atoiW(comma + 1);
+    }
+    output_path = extract_icon(icon, index, NULL, FALSE);
+    if (output_path)
+        ret = rename(output_path, szXPMFileName);
+
+end:
+    HeapFree(GetProcessHeap(), 0, icon);
+    HeapFree(GetProcessHeap(), 0, output_path);
+    return ret;
+}
+
 static BOOL create_default_icon( const char *filename, const char* comment )
 {
     FILE *fXPM;
@@ -1031,6 +1067,8 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO
         sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name);
     if (ExtractFromICO( path, xpm_path))
         goto end;
+    if (ExtractFromFileType( path, xpm_path ))
+        goto end;
     if (!bWait)
     {
         if (destFilename)



From julliard at winehq.org  Tue Jun  8 10:08:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:24 -0500
Subject: =?UTF-8?Q?Mariusz=20Pluci=C5=84ski=20?=: gameux: Add declaration of
	IGameStatistics interface.
Message-ID: <E1OM0Pg-0002EN-9N@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f2ad630540c5c7029c339e7d93acc2bba0e08056
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f2ad630540c5c7029c339e7d93acc2bba0e08056

Author: Mariusz Pluci?ski <vshader at gmail.com>
Date:   Sat May 29 20:17:26 2010 +0200

gameux: Add declaration of IGameStatistics interface.

---

 include/gameux.idl |   62 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/include/gameux.idl b/include/gameux.idl
index 4700d75..b531fed 100644
--- a/include/gameux.idl
+++ b/include/gameux.idl
@@ -54,7 +54,59 @@ library gameuxLib
 
         HRESULT UpdateGame([in] GUID instanceID);
 
-        HRESULT VerifyAccess([in] BSTR sGDFBinaryPath, [out] BOOL* pHasAccess);
+        HRESULT VerifyAccess([in] BSTR sGDFBinaryPath,
+                    [out] BOOL* pHasAccess);
+    };
+
+    [
+      object,
+      uuid(3887C9CA-04A0-42ae-BC4C-5FA6C7721145)
+    ]
+    interface IGameStatistics : IUnknown
+    {
+        HRESULT GetMaxCategoryLength(
+                    [retval, out] UINT* cch);
+
+        HRESULT GetMaxNameLength(
+                    [retval, out] UINT* cch);
+
+        HRESULT GetMaxValueLength(
+                    [retval, out] UINT* cch);
+
+        HRESULT GetMaxCategories(
+                    [retval, out] WORD* pMax);
+
+        HRESULT GetMaxStatsPerCategory(
+                    [retval, out] WORD* pMax);
+
+        HRESULT SetCategoryTitle(
+                    [in] WORD categoryIndex,
+                    [string, in] LPCWSTR title);
+
+        HRESULT GetCategoryTitle(
+                    [in] WORD categoryIndex,
+                    [retval, string, out] LPWSTR* pTitle);
+
+        HRESULT GetStatistic(
+                    [in] WORD categoryIndex,
+                    [in] WORD statIndex,
+                    [string, unique, out, in] LPWSTR* pName,
+                    [string, unique, out, in] LPWSTR* pValue);
+
+        HRESULT SetStatistic(
+                    [in] WORD categoryIndex,
+                    [in] WORD statIndex,
+                    [string, in] LPCWSTR name,
+                    [string, in] LPCWSTR value);
+
+        HRESULT Save(
+                    [in] BOOL trackChanges);
+
+        HRESULT SetLastPlayedCategory(
+                    [in] UINT categoryIndex);
+
+        HRESULT GetLastPlayedCategory(
+                    [retval, out] UINT* pCategoryIndex);
     };
 
     [
@@ -64,4 +116,12 @@ library gameuxLib
     {
         [default] interface IGameExplorer;
     };
+
+    [
+      uuid(DBC85A2C-C0DC-4961-B6E2-D28B62C11AD4)
+    ]
+    coclass GameStatistics
+    {
+        [default] interface IGameStatistics;
+    };
 }



From julliard at winehq.org  Tue Jun  8 10:08:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:24 -0500
Subject: Andrew Eikum : regedit: Escape the value name portion during export.
Message-ID: <E1OM0Pg-0002E7-5Y@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4a6ed21094214b96373c8efc9786b1ae8a65550b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4a6ed21094214b96373c8efc9786b1ae8a65550b

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Mon Jun  7 16:07:48 2010 -0500

regedit: Escape the value name portion during export.

---

 programs/regedit/regproc.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index c46edc6..f210879 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -1126,6 +1126,11 @@ static void export_hkey(FILE *file, HKEY key,
             if ((*val_name_buf)[0]) {
                 const WCHAR val_start[] = {'"','%','s','"','=',0};
 
+                line_len = 0;
+                REGPROC_export_string(line_buf, line_buf_size, &line_len, *val_name_buf, lstrlenW(*val_name_buf));
+                REGPROC_resize_char_buffer(val_name_buf, val_name_size, lstrlenW(*line_buf) + 1);
+                lstrcpyW(*val_name_buf, *line_buf);
+
                 line_len = 3 + lstrlenW(*val_name_buf);
                 REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len);
                 sprintfW(*line_buf, val_start, *val_name_buf);



From julliard at winehq.org  Tue Jun  8 10:08:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:24 -0500
Subject: =?UTF-8?Q?Mariusz=20Pluci=C5=84ski=20?=: gameux: Add declaration of
	IGameStatisticsMgr interface.
Message-ID: <E1OM0Pg-0002Ef-Cd@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 10a5414afe5513956f2f30adda0fa93c687a154c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=10a5414afe5513956f2f30adda0fa93c687a154c

Author: Mariusz Pluci?ski <vshader at gmail.com>
Date:   Sat May 29 20:28:26 2010 +0200

gameux: Add declaration of IGameStatisticsMgr interface.

---

 include/gameux.idl |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/include/gameux.idl b/include/gameux.idl
index b531fed..07b9870 100644
--- a/include/gameux.idl
+++ b/include/gameux.idl
@@ -39,6 +39,18 @@ library gameuxLib
         GIS_ALL_USERS      = 3
     } GAME_INSTALL_SCOPE;
 
+    typedef enum
+    {
+        GAMESTATS_OPEN_OPENORCREATE = 0,
+        GAMESTATS_OPEN_OPENONLY = 1
+    } GAMESTATS_OPEN_TYPE;
+
+    typedef enum
+    {
+        GAMESTATS_OPEN_CREATED = 0,
+        GAMESTATS_OPEN_OPENED = 1
+    } GAMESTATS_OPEN_RESULT;
+
     [
       object,
       uuid(E7B2FB72-D728-49B3-A5F2-18EBF5F1349E)
@@ -110,6 +122,22 @@ library gameuxLib
     };
 
     [
+      object,
+      uuid(AFF3EA11-E70E-407d-95DD-35E612C41CE2)
+    ]
+    interface IGameStatisticsMgr : IUnknown
+    {
+        HRESULT GetGameStatistics(
+                    [string, in] LPCWSTR GDFBinaryPath,
+                    [in] GAMESTATS_OPEN_TYPE openType,
+                    [out] GAMESTATS_OPEN_RESULT* pOpenResult,
+                    [retval, out] IGameStatistics** ppiStats);
+
+        HRESULT RemoveGameStatistics(
+                    [string, in] LPCWSTR GDFBinaryPath);
+    };
+
+    [
       uuid(9A5EA990-3034-4D6F-9128-01F3C61022BC)
     ]
     coclass GameExplorer



From julliard at winehq.org  Tue Jun  8 10:08:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:24 -0500
Subject: =?UTF-8?Q?Mariusz=20Pluci=C5=84ski=20?=: gameux: Add declaration of
	IGameExplorer2 interface.
Message-ID: <E1OM0Pg-0002Ew-HQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d77c7d1047e61a765338c1d260a7d8bd359a2ad4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d77c7d1047e61a765338c1d260a7d8bd359a2ad4

Author: Mariusz Pluci?ski <vshader at gmail.com>
Date:   Mon May 31 20:10:58 2010 +0200

gameux: Add declaration of IGameExplorer2 interface.

---

 include/gameux.idl |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/include/gameux.idl b/include/gameux.idl
index 07b9870..f9ec1e5 100644
--- a/include/gameux.idl
+++ b/include/gameux.idl
@@ -138,6 +138,26 @@ library gameuxLib
     };
 
     [
+      object,
+      uuid(86874AA7-A1ED-450d-A7EB-B89E20B2FFF3)
+    ]
+    interface IGameExplorer2 : IUnknown
+    {
+       HRESULT InstallGame(
+                    [string, in] LPCWSTR binaryGDFPath,
+                    [unique, in] LPCWSTR installDirectory,
+                    [in] GAME_INSTALL_SCOPE installScope);
+
+        HRESULT UninstallGame(
+                    [string, in] LPCWSTR binaryGDFPath);
+
+        HRESULT CheckAccess(
+                    [string, in] LPCWSTR binaryGDFPath,
+                    [retval, out] BOOL* pHasAccess);
+
+    }
+
+    [
       uuid(9A5EA990-3034-4D6F-9128-01F3C61022BC)
     ]
     coclass GameExplorer



From julliard at winehq.org  Tue Jun  8 10:08:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 08 Jun 2010 10:08:24 -0500
Subject: Alexandre Julliard : oleaut32: Fix handling of 'c' format for
	non-date variants in VarTokenizeFormatString.
Message-ID: <E1OM0Pg-0002FC-J9@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a2791a0919d27bf49f783595f78eff06e8223468
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a2791a0919d27bf49f783595f78eff06e8223468

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun  8 15:34:59 2010 +0200

oleaut32: Fix handling of 'c' format for non-date variants in VarTokenizeFormatString.

---

 dlls/oleaut32/tests/varformat.c |    1 +
 dlls/oleaut32/varformat.c       |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c
index fd598cb..2d4ef62 100644
--- a/dlls/oleaut32/tests/varformat.c
+++ b/dlls/oleaut32/tests/varformat.c
@@ -328,6 +328,7 @@ static void test_VarFormat(void)
   VARFMT(VT_I4,V_I4,1,"000###",S_OK,"000001");
   VARFMT(VT_I4,V_I4,1,"#00##00#0",S_OK,"00000001");
   VARFMT(VT_I4,V_I4,1,"1#####0000",S_OK,"10001");
+  VARFMT(VT_I4,V_I4,1,"##abcdefghijklmnopqrstuvwxyz",S_OK,"1abcdefghijklmnopqrstuvwxyz");
   VARFMT(VT_I4,V_I4,100000,"#,###,###,###",S_OK,"100,000");
   VARFMT(VT_I4,V_I4,1,"0,000,000,000",S_OK,"0,000,000,001");
   VARFMT(VT_I4,V_I4,123456789,"#,#.#",S_OK,"123,456,789.");
diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c
index 10f5038..f297641 100644
--- a/dlls/oleaut32/varformat.c
+++ b/dlls/oleaut32/varformat.c
@@ -852,7 +852,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
       *pOut++ = FMT_DATE_AMPM_UPPER;
       TRACE("AM/PM\n");
     }
-    else if (*pFormat == 'c' || *pFormat == 'C')
+    else if ((*pFormat == 'c' || *pFormat == 'C') && COULD_BE(FMT_TYPE_DATE))
     {
       /* Date formats: General date format
        * Other formats: Literal



From julliard at winehq.org  Wed Jun  9 13:38:12 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:12 -0500
Subject: Damjan Jovanovic : winemenubuilder: Also extract .lnk icons from file
	types 's open handler.
Message-ID: <E1OMQAG-0007Ry-Df@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9954735e430ea09f0dd6cd640bdafff8b410544a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9954735e430ea09f0dd6cd640bdafff8b410544a

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Tue Jun  8 22:05:04 2010 +0200

winemenubuilder: Also extract .lnk icons from file types's open handler.

---

 programs/winemenubuilder/winemenubuilder.c |   30 ++++++++++++++++++---------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 276c4e4..3abfc39 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -819,10 +819,11 @@ static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName)
 
 static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName)
 {
-    int ret = 1;
+    int ret = 0;
     WCHAR *extension;
     WCHAR *icon = NULL;
     WCHAR *comma;
+    WCHAR *executable = NULL;
     int index = 0;
     char *output_path = NULL;
 
@@ -831,21 +832,30 @@ static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName)
         goto end;
 
     icon = assoc_query(ASSOCSTR_DEFAULTICON, extension, NULL);
-    if (icon == NULL)
-        goto end;
-
-    comma = strrchrW(icon, ',');
-    if (comma)
+    if (icon)
+    {
+        comma = strrchrW(icon, ',');
+        if (comma)
+        {
+            *comma = 0;
+            index = atoiW(comma + 1);
+        }
+        output_path = extract_icon(icon, index, NULL, FALSE);
+        WINE_TRACE("defaulticon %s -> icon %s\n", wine_dbgstr_w(icon), wine_dbgstr_a(output_path));
+    }
+    else
     {
-        *comma = 0;
-        index = atoiW(comma + 1);
+        executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, NULL);
+        if (executable)
+            output_path = extract_icon(executable, 0, NULL, FALSE);
+        WINE_TRACE("executable %s -> icon %s\n", wine_dbgstr_w(executable), wine_dbgstr_a(output_path));
     }
-    output_path = extract_icon(icon, index, NULL, FALSE);
     if (output_path)
-        ret = rename(output_path, szXPMFileName);
+        ret = (rename(output_path, szXPMFileName) == 0);
 
 end:
     HeapFree(GetProcessHeap(), 0, icon);
+    HeapFree(GetProcessHeap(), 0, executable);
     HeapFree(GetProcessHeap(), 0, output_path);
     return ret;
 }



From julliard at winehq.org  Wed Jun  9 13:38:12 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:12 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: user32: Update the
	Polish translation.
Message-ID: <E1OMQAG-0007SI-GZ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c2f55b3434168464408c83e78c25f7dd3655db07
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c2f55b3434168464408c83e78c25f7dd3655db07

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Tue Jun  8 15:50:26 2010 +0200

user32: Update the Polish translation.

---

 dlls/user32/resources/user32_Pl.rc |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/resources/user32_Pl.rc b/dlls/user32/resources/user32_Pl.rc
index 9ccb96d..884c15a 100644
--- a/dlls/user32/resources/user32_Pl.rc
+++ b/dlls/user32/resources/user32_Pl.rc
@@ -1,5 +1,6 @@
 /*
  * Copyright 1997 Mikolaj Zalewski
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -42,7 +43,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 		MENUITEM "W&ytnij", WM_CUT
 		MENUITEM "&Kopiuj", WM_COPY
 		MENUITEM "&Wklej", WM_PASTE
-		MENUITEM "&Usu\xf1", WM_CLEAR
+		MENUITEM "&Usu?", WM_CLEAR
 		MENUITEM SEPARATOR
 		MENUITEM "&Zaznacz wszystko", EM_SETSEL
 	END
@@ -60,9 +61,9 @@ BEGIN
 	PUSHBUTTON "&Ignoruj", 5, 215, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	PUSHBUTTON "&Tak", 6, 263, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	PUSHBUTTON "&Nie", 7, 311, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	PUSHBUTTON "&Try Again", 10, 359, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	PUSHBUTTON "&Continue", 11, 407, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	PUSHBUTTON "Help", 9, 455, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "&Spr?buj ponownie", 10, 359, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "&Kontynuuj", 11, 407, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "Pomoc", 9, 455, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122



From julliard at winehq.org  Wed Jun  9 13:38:12 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:12 -0500
Subject: Jose Rostagno : shell32: Fix Spanish translation.
Message-ID: <E1OMQAG-0007SX-I5@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 15b6f4df03d53032a07687f5c86a63af62a59ea3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=15b6f4df03d53032a07687f5c86a63af62a59ea3

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun  8 14:29:08 2010 -0300

shell32: Fix Spanish translation.

---

 dlls/shell32/shell32_Es.rc |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc
index 176c677..9873c28 100644
--- a/dlls/shell32/shell32_Es.rc
+++ b/dlls/shell32/shell32_Es.rc
@@ -287,9 +287,11 @@ STRINGTABLE
 
 	IDS_NEWFOLDER		"Nueva carpeta"
 
-	IDS_CPANEL_TITLE            "Wine Control Panel"
-	IDS_CPANEL_NAME             "Name"
-	IDS_CPANEL_DESCRIPTION      "Description"
+	IDS_CPANEL_TITLE            "Panel de Control de Wine"
+	IDS_CPANEL_NAME             "Nombre"
+	IDS_CPANEL_DESCRIPTION      "Descripci?n"
+
+        IDS_SHLEXEC_NOASSOC         "No hay un programa de Windows configurado para abrir este tipo de archivo."
 }
 
 STRINGTABLE



From julliard at winehq.org  Wed Jun  9 13:38:12 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:12 -0500
Subject: Jose Rostagno : write: Add Spanish translation.
Message-ID: <E1OMQAG-0007Sp-Ls@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1f97fbcbbce711b95f24365abd3cb909d43ab731
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f97fbcbbce711b95f24365abd3cb909d43ab731

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun  8 14:38:54 2010 -0300

write: Add Spanish translation.

---

 programs/write/Es.rc       |   32 ++++++++++++++++++++++++++++++++
 programs/write/Makefile.in |    1 +
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/programs/write/Es.rc b/programs/write/Es.rc
new file mode 100644
index 0000000..6e41bd0
--- /dev/null
+++ b/programs/write/Es.rc
@@ -0,0 +1,32 @@
+/*
+ * Spanish language support
+ *
+ * Copyright 2010 Jos? Rostagno
+ *
+ * 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 "resources.h"
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    IDS_FAILED, "Fallo inicio Wordpad"
+}
diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in
index b89f338..5ac2c78 100644
--- a/programs/write/Makefile.in
+++ b/programs/write/Makefile.in
@@ -13,6 +13,7 @@ RC_SRCS = \
 	Da.rc \
 	De.rc \
 	En.rc \
+	Es.rc \
 	Fr.rc \
 	It.rc \
 	Ja.rc \



From julliard at winehq.org  Wed Jun  9 13:38:12 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:12 -0500
Subject: Jose Rostagno : jscript: Add Spanish translation.
Message-ID: <E1OMQAG-0007TG-VH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bd992d3aebb5c86c6bf1e3ef965899b07e59fc74
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bd992d3aebb5c86c6bf1e3ef965899b07e59fc74

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun  8 15:00:32 2010 -0300

jscript: Add Spanish translation.

---

 dlls/jscript/Makefile.in   |    1 +
 dlls/jscript/jscript_Es.rc |   50 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index d91c644..647412c 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -9,6 +9,7 @@ RC_SRCS = \
 	jscript_Da.rc \
 	jscript_De.rc \
 	jscript_En.rc \
+	jscript_Es.rc \
 	jscript_Fr.rc \
 	jscript_It.rc \
 	jscript_Ko.rc \
diff --git a/dlls/jscript/jscript_Es.rc b/dlls/jscript/jscript_Es.rc
new file mode 100644
index 0000000..4808109
--- /dev/null
+++ b/dlls/jscript/jscript_Es.rc
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010 Jos? Rostagno
+ *
+ * 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 "resource.h"
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TO_PRIMITIVE        "Error al convertir objeto a tipo primitivo"
+    IDS_INVALID_CALL_ARG    "Llamada a procedimiento no v?lido o argumento"
+    IDS_CREATE_OBJ_ERROR    "Servidor de automatizaci?n no puede crear el objeto"
+    IDS_NO_PROPERTY         "El objeto no acepta esta propiedad o m?todo"
+    IDS_ARG_NOT_OPT         "Argumento no opcional"
+    IDS_SYNTAX_ERROR        "Error de sintaxis"
+    IDS_SEMICOLON           "Esperado ';'"
+    IDS_LBRACKET            "Esperado '('"
+    IDS_RBRACKET            "Esperado ')'"
+    IDS_UNTERMINATED_STR    "Constante de cadena no terminada"
+    IDS_NOT_FUNC            "Funci?n esperada"
+    IDS_NOT_DATE            "'[objeto]' no es un objeto fecha"
+    IDS_NOT_NUM             "Numero esperado"
+    IDS_OBJECT_EXPECTED     "Objeto esperado"
+    IDS_ILLEGAL_ASSIGN      "Asignaci?n ilegal"
+    IDS_UNDEFINED           "'|' no est? definido"
+    IDS_NOT_BOOL            "Objeto Booleano esperado"
+    IDS_JSCRIPT_EXPECTED    "Objeto JScript esperado"
+    IDS_REGEXP_SYNTAX_ERROR "Error de sintaxis en la expresion regular"
+    IDS_URI_INVALID_CHAR    "URI a codificar contiene caracteres no v?lidos"
+    IDS_INVALID_LENGTH      "La longitud del arreglo debe ser un entero positivo finito"
+    IDS_ARRAY_EXPECTED      "Objeto Arreglo esperado"
+}



From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Luca Bennati : shdoclc: Fix again Italian translation.
Message-ID: <E1OMQAH-0007TW-0f@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 53bf33a5f5c0f511975ecbc3c0018a8f28804a8d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=53bf33a5f5c0f511975ecbc3c0018a8f28804a8d

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Tue Jun  8 23:52:09 2010 +0200

shdoclc: Fix again Italian translation.

---

 dlls/shdoclc/It.rc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shdoclc/It.rc b/dlls/shdoclc/It.rc
index bcd08bf..08a3b47 100644
--- a/dlls/shdoclc/It.rc
+++ b/dlls/shdoclc/It.rc
@@ -194,8 +194,8 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM SEPARATOR
         MENUITEM "Aggiungi ai &Preferiti...",     IDM_ADDFAVORITES
         MENUITEM SEPARATOR
-        MENUITEM "Riproduci",                     IDM_DYNSRCPLAY
-        MENUITEM "Ferma",                     IDM_DYNSRCSTOP
+        MENUITEM "Riproduci",                     IDM_IMGARTPLAY
+        MENUITEM "Ferma",                     IDM_IMGARTSTOP
         MENUITEM "Indietro",                   IDM_IMGARTREWIND
         MENUITEM SEPARATOR
         MENUITEM SEPARATOR
@@ -204,7 +204,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
 
     POPUP "Debug"
     {
-        MENUITEM "Traccia etichette",         IDM_TRACETAGS
+        MENUITEM "Etichette di trace",         IDM_TRACETAGS
         MENUITEM "Fallimenti della risorsa",  IDM_RESOURCEFAILURES
         MENUITEM "Dump Tracking Info", IDM_DUMPTRACKINGINFO
         MENUITEM "Break del Debug",        IDM_DEBUGBREAK



From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Joel Holdsworth : winecfg: Added new logo graphics.
Message-ID: <E1OMQAH-0007Tn-3u@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 15cc7f98119e743d085e075b992ad69d9ff40b0b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=15cc7f98119e743d085e075b992ad69d9ff40b0b

Author: Joel Holdsworth <joel at airwebreathe.org.uk>
Date:   Wed Jun  9 00:03:23 2010 +0100

winecfg: Added new logo graphics.

Original image designed by Jon Parshall.

---

 programs/winecfg/Makefile.in |    1 +
 programs/winecfg/logo.ico    |  Bin 0 -> 361838 bytes
 programs/winecfg/logo.svg    |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=15cc7f98119e743d085e075b992ad69d9ff40b0b


From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Joel Holdsworth : winecfg: Cosmetic improvements to the about panel.
Message-ID: <E1OMQAH-0007U4-6b@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 54b4ac174bb60d80200891fe0d283ebe31990aa1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=54b4ac174bb60d80200891fe0d283ebe31990aa1

Author: Joel Holdsworth <joel at airwebreathe.org.uk>
Date:   Wed Jun  9 00:03:50 2010 +0100

winecfg: Cosmetic improvements to the about panel.

---

 programs/winecfg/Bg.rc        |   19 +++++----
 programs/winecfg/Cs.rc        |   19 +++++----
 programs/winecfg/Da.rc        |   19 +++++----
 programs/winecfg/De.rc        |   19 +++++----
 programs/winecfg/En.rc        |   19 +++++----
 programs/winecfg/Es.rc        |   19 +++++----
 programs/winecfg/Fi.rc        |   19 +++++----
 programs/winecfg/Fr.rc        |   19 +++++----
 programs/winecfg/Hu.rc        |   19 +++++----
 programs/winecfg/It.rc        |   19 +++++----
 programs/winecfg/Ja.rc        |   19 +++++----
 programs/winecfg/Ko.rc        |   19 +++++----
 programs/winecfg/Lt.rc        |   19 +++++----
 programs/winecfg/Nl.rc        |   19 +++++----
 programs/winecfg/No.rc        |   19 +++++----
 programs/winecfg/Pl.rc        |   19 +++++----
 programs/winecfg/Pt.rc        |   32 +++++++-------
 programs/winecfg/Ro.rc        |   19 +++++----
 programs/winecfg/Ru.rc        |   19 +++++----
 programs/winecfg/Si.rc        |   19 +++++----
 programs/winecfg/Sv.rc        |   19 +++++----
 programs/winecfg/Tr.rc        |   19 +++++----
 programs/winecfg/Zh.rc        |   38 +++++++++--------
 programs/winecfg/about.c      |   89 +++++++++++++++++++++++++++++++++++++++++
 programs/winecfg/idb_wine.bmp |  Bin 14614 -> 0 bytes
 programs/winecfg/resource.h   |    7 +++-
 programs/winecfg/winecfg.rc   |    4 +-
 27 files changed, 343 insertions(+), 226 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=54b4ac174bb60d80200891fe0d283ebe31990aa1


From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Alexandre Julliard : winecfg: Remove the unimplemented device
	autodetect radio buttons.
Message-ID: <E1OMQAH-0007UL-9S@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c8920482bd5705419f228b393e94c5978d1ba0bf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c8920482bd5705419f228b393e94c5978d1ba0bf

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  9 13:26:23 2010 +0200

winecfg: Remove the unimplemented device autodetect radio buttons.

---

 programs/winecfg/Bg.rc      |   29 ++++------
 programs/winecfg/Cs.rc      |   29 ++++------
 programs/winecfg/Da.rc      |   29 ++++------
 programs/winecfg/De.rc      |   29 ++++------
 programs/winecfg/En.rc      |   33 +++++------
 programs/winecfg/Es.rc      |   35 +++++------
 programs/winecfg/Fi.rc      |   29 ++++------
 programs/winecfg/Fr.rc      |   31 ++++------
 programs/winecfg/Hu.rc      |   33 +++++------
 programs/winecfg/It.rc      |   29 ++++------
 programs/winecfg/Ja.rc      |   33 +++++------
 programs/winecfg/Ko.rc      |   33 +++++------
 programs/winecfg/Lt.rc      |   33 +++++------
 programs/winecfg/Nl.rc      |   29 ++++------
 programs/winecfg/No.rc      |   29 ++++------
 programs/winecfg/Pl.rc      |   33 +++++------
 programs/winecfg/Pt.rc      |   58 ++++++++-----------
 programs/winecfg/Ro.rc      |   29 ++++------
 programs/winecfg/Ru.rc      |   33 +++++------
 programs/winecfg/Si.rc      |   29 ++++------
 programs/winecfg/Sv.rc      |   33 +++++------
 programs/winecfg/Tr.rc      |   33 +++++------
 programs/winecfg/Zh.rc      |   56 +++++++-----------
 programs/winecfg/driveui.c  |  135 ++++---------------------------------------
 programs/winecfg/resource.h |    4 +-
 25 files changed, 333 insertions(+), 573 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8920482bd5705419f228b393e94c5978d1ba0bf


From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Alexandre Julliard : winecfg: Reduce the height of the audio tab.
Message-ID: <E1OMQAH-0007Ud-Dx@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a6bf24fbe9c8e63268d20f1590a6a32c286527de
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a6bf24fbe9c8e63268d20f1590a6a32c286527de

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  9 14:53:27 2010 +0200

winecfg: Reduce the height of the audio tab.

---

 programs/winecfg/Bg.rc |   20 ++++++++++----------
 programs/winecfg/Cs.rc |   20 ++++++++++----------
 programs/winecfg/Da.rc |   20 ++++++++++----------
 programs/winecfg/De.rc |   20 ++++++++++----------
 programs/winecfg/En.rc |   24 ++++++++++++------------
 programs/winecfg/Es.rc |   20 ++++++++++----------
 programs/winecfg/Fi.rc |   20 ++++++++++----------
 programs/winecfg/Fr.rc |   20 ++++++++++----------
 programs/winecfg/Hu.rc |   20 ++++++++++----------
 programs/winecfg/It.rc |   20 ++++++++++----------
 programs/winecfg/Ja.rc |   20 ++++++++++----------
 programs/winecfg/Ko.rc |   20 ++++++++++----------
 programs/winecfg/Lt.rc |   20 ++++++++++----------
 programs/winecfg/Nl.rc |   20 ++++++++++----------
 programs/winecfg/No.rc |   20 ++++++++++----------
 programs/winecfg/Pl.rc |   20 ++++++++++----------
 programs/winecfg/Pt.rc |   20 ++++++++++----------
 programs/winecfg/Ro.rc |   20 ++++++++++----------
 programs/winecfg/Ru.rc |   20 ++++++++++----------
 programs/winecfg/Si.rc |   20 ++++++++++----------
 programs/winecfg/Sv.rc |   20 ++++++++++----------
 programs/winecfg/Tr.rc |   20 ++++++++++----------
 programs/winecfg/Zh.rc |   40 ++++++++++++++++++++--------------------
 23 files changed, 242 insertions(+), 242 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6bf24fbe9c8e63268d20f1590a6a32c286527de


From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Alexandre Julliard : winecfg: Reduce the height of the applications
	tab.
Message-ID: <E1OMQAH-0007V3-Io@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 416af372dfd14657f8e55c2e9512f08c5c354a1d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=416af372dfd14657f8e55c2e9512f08c5c354a1d

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  9 15:08:14 2010 +0200

winecfg: Reduce the height of the applications tab.

---

 programs/winecfg/Bg.rc |   14 +++++++-------
 programs/winecfg/Cs.rc |   14 +++++++-------
 programs/winecfg/Da.rc |   14 +++++++-------
 programs/winecfg/De.rc |   14 +++++++-------
 programs/winecfg/En.rc |   14 +++++++-------
 programs/winecfg/Es.rc |   14 +++++++-------
 programs/winecfg/Fi.rc |   14 +++++++-------
 programs/winecfg/Fr.rc |   14 +++++++-------
 programs/winecfg/Hu.rc |   14 +++++++-------
 programs/winecfg/It.rc |   14 +++++++-------
 programs/winecfg/Ja.rc |   14 +++++++-------
 programs/winecfg/Ko.rc |   14 +++++++-------
 programs/winecfg/Lt.rc |   14 +++++++-------
 programs/winecfg/Nl.rc |   14 +++++++-------
 programs/winecfg/No.rc |   14 +++++++-------
 programs/winecfg/Pl.rc |   14 +++++++-------
 programs/winecfg/Pt.rc |   24 ++++++++++++------------
 programs/winecfg/Ro.rc |   14 +++++++-------
 programs/winecfg/Ru.rc |   14 +++++++-------
 programs/winecfg/Si.rc |   14 +++++++-------
 programs/winecfg/Sv.rc |   14 +++++++-------
 programs/winecfg/Tr.rc |   14 +++++++-------
 programs/winecfg/Zh.rc |   28 ++++++++++++++--------------
 23 files changed, 173 insertions(+), 173 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=416af372dfd14657f8e55c2e9512f08c5c354a1d


From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Alexandre Julliard : winecfg: Reduce the height of the remaining tabs
	to make the window fit in a 640x480 desktop .
Message-ID: <E1OMQAH-0007VK-LQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4dff55bb349fa9793692d1ba2b3d9f1cd4cffba4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4dff55bb349fa9793692d1ba2b3d9f1cd4cffba4

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  9 16:03:44 2010 +0200

winecfg: Reduce the height of the remaining tabs to make the window fit in a 640x480 desktop.

---

 programs/winecfg/Bg.rc |   16 ++++++++--------
 programs/winecfg/Cs.rc |   20 ++++++++++----------
 programs/winecfg/Da.rc |   16 ++++++++--------
 programs/winecfg/De.rc |   18 +++++++++---------
 programs/winecfg/En.rc |   18 +++++++++---------
 programs/winecfg/Es.rc |   16 ++++++++--------
 programs/winecfg/Fi.rc |   24 ++++++++++++------------
 programs/winecfg/Fr.rc |   28 ++++++++++++++--------------
 programs/winecfg/Hu.rc |   16 ++++++++--------
 programs/winecfg/It.rc |   16 ++++++++--------
 programs/winecfg/Ja.rc |   16 ++++++++--------
 programs/winecfg/Ko.rc |   16 ++++++++--------
 programs/winecfg/Lt.rc |   18 +++++++++---------
 programs/winecfg/Nl.rc |   16 ++++++++--------
 programs/winecfg/No.rc |   16 ++++++++--------
 programs/winecfg/Pl.rc |   16 ++++++++--------
 programs/winecfg/Pt.rc |   26 +++++++++++++-------------
 programs/winecfg/Ro.rc |   16 ++++++++--------
 programs/winecfg/Ru.rc |   16 ++++++++--------
 programs/winecfg/Si.rc |   16 ++++++++--------
 programs/winecfg/Sv.rc |   16 ++++++++--------
 programs/winecfg/Tr.rc |   16 ++++++++--------
 programs/winecfg/Zh.rc |   32 ++++++++++++++++----------------
 23 files changed, 212 insertions(+), 212 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dff55bb349fa9793692d1ba2b3d9f1cd4cffba4


From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Alexander Scott-Johns : msvcrt/tests: Move function pointer
	initialization code in printf. c into separate init function.
Message-ID: <E1OMQAH-0007Vb-QP@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f2229e6de0d180e2e3f84f214a1f6a47b55bb01a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f2229e6de0d180e2e3f84f214a1f6a47b55bb01a

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Tue Jun  8 19:20:15 2010 +0100

msvcrt/tests: Move function pointer initialization code in printf.c into separate init function.

---

 dlls/msvcrt/tests/printf.c |   63 ++++++++++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c
index b48db51..19e21f9 100644
--- a/dlls/msvcrt/tests/printf.c
+++ b/dlls/msvcrt/tests/printf.c
@@ -33,6 +33,21 @@
 
 #include "wine/test.h"
 
+static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist);
+static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist);
+static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer,
+                                      size_t count, const wchar_t *format,
+                                      __ms_va_list valist);
+
+static void init( void )
+{
+    HMODULE hmod = GetModuleHandleA("msvcrt.dll");
+
+    p__vscprintf = (void *)GetProcAddress(hmod, "_vscprintf");
+    p__vscwprintf = (void *)GetProcAddress(hmod, "_vscwprintf");
+    p__vsnwprintf_s = (void *)GetProcAddress(hmod, "_vsnwprintf_s");
+}
+
 static void test_sprintf( void )
 {
     char buffer[100];
@@ -810,12 +825,6 @@ static void test_vsnwprintf(void)
     ok( !strcmp(buf, "onetwothree"), "got %s expected 'onetwothree'\n", buf );
 }
 
-static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist);
-static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist);
-static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer,
-                                      size_t count, const wchar_t *format,
-                                      __ms_va_list valist);
-
 static int __cdecl _vscprintf_wrapper(const char *format, ...)
 {
     int ret;
@@ -830,6 +839,12 @@ static void test_vscprintf(void)
 {
     int ret;
 
+    if (!p__vscprintf)
+    {
+       win_skip("_vscprintf not available\n");
+       return;
+    }
+
     ret = _vscprintf_wrapper( "%s %d", "number", 1 );
     ok( ret == 8, "got %d expected 8\n", ret );
 }
@@ -851,6 +866,12 @@ static void test_vscwprintf(void)
 
     int ret;
 
+    if (!p__vscwprintf)
+    {
+        win_skip("_vscwprintf not available\n");
+        return;
+    }
+
     ret = _vscwprintf_wrapper( format, number, 1 );
     ok( ret == 8, "got %d expected 8\n", ret );
 }
@@ -876,6 +897,12 @@ static void test_vsnwprintf_s(void)
     wchar_t buffer[14] = { 0 };
     int exp, got;
 
+    if (!p__vsnwprintf_s)
+    {
+        win_skip("_vsnwprintf_s not available\n");
+        return;
+    }
+
     /* Enough room. */
     exp = wcslen(out7);
 
@@ -909,29 +936,15 @@ static void test_vsnwprintf_s(void)
 
 START_TEST(printf)
 {
+    init();
+
     test_sprintf();
     test_swprintf();
     test_snprintf();
     test_fcvt();
     test_xcvt();
     test_vsnwprintf();
-
-    p__vscprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscprintf");
-    p__vscwprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscwprintf");
-    p__vsnwprintf_s = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vsnwprintf_s");
-
-    if (p__vscprintf)
-        test_vscprintf();
-    else
-        win_skip("_vscprintf not available\n");
-
-    if (p__vscwprintf)
-        test_vscwprintf();
-    else
-        win_skip("_vscwprintf not available\n");
-
-    if (p__vsnwprintf_s)
-        test_vsnwprintf_s();
-    else
-        win_skip("_vsnwprintf_s not available\n");
+    test_vscprintf();
+    test_vscwprintf();
+    test_vsnwprintf_s();
 }



From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Hans Leidekker : msi: Create directories right before installing
	files.
Message-ID: <E1OMQAH-0007Vr-TJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dcb501decd8a40032200c917b5017f75cf362ca6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dcb501decd8a40032200c917b5017f75cf362ca6

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Jun  9 12:08:42 2010 +0200

msi: Create directories right before installing files.

---

 dlls/msi/action.c        |   37 -------------------------------------
 dlls/msi/files.c         |   29 +++++++++++++++++++++--------
 dlls/msi/msipriv.h       |    1 -
 dlls/msi/tests/install.c |    5 +----
 4 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 0505d33..565ef66 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1003,43 +1003,6 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param)
     return ERROR_SUCCESS;
 }
 
-/* FIXME: probably should merge this with the above function */
-static UINT msi_create_directory( MSIPACKAGE* package, LPCWSTR dir )
-{
-    UINT rc = ERROR_SUCCESS;
-    MSIFOLDER *folder;
-    LPWSTR install_path;
-
-    install_path = resolve_folder(package, dir, FALSE, FALSE, TRUE, &folder);
-    if (!install_path)
-        return ERROR_FUNCTION_FAILED; 
-
-    /* create the path */
-    if (folder->State == 0)
-    {
-        create_full_pathW(install_path);
-        folder->State = 2;
-    }
-    msi_free(install_path);
-
-    return rc;
-}
-
-UINT msi_create_component_directories( MSIPACKAGE *package )
-{
-    MSICOMPONENT *comp;
-
-    /* create all the folders required by the components are going to install */
-    LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry )
-    {
-        if (comp->ActionRequest != INSTALLSTATE_LOCAL)
-            continue;
-        msi_create_directory( package, comp->Directory );
-    }
-
-    return ERROR_SUCCESS;
-}
-
 static UINT ACTION_CreateFolders(MSIPACKAGE *package)
 {
     static const WCHAR ExecSeqQuery[] =
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 052a158..91ec43e 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -174,6 +174,24 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
     return gle;
 }
 
+static UINT msi_create_directory( MSIPACKAGE *package, const WCHAR *dir )
+{
+    MSIFOLDER *folder;
+    WCHAR *install_path;
+
+    install_path = resolve_folder( package, dir, FALSE, FALSE, TRUE, &folder );
+    if (!install_path)
+        return ERROR_FUNCTION_FAILED;
+
+    if (folder->State == 0)
+    {
+        create_full_pathW( install_path );
+        folder->State = 2;
+    }
+    msi_free( install_path );
+    return ERROR_SUCCESS;
+}
+
 static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
                             LPWSTR *path, DWORD *attrs, PVOID user)
 {
@@ -193,6 +211,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
             return FALSE;
 
         msi_file_update_ui(package, f, szInstallFiles);
+        msi_create_directory(package, f->Component->Directory);
 
         *path = strdupW(f->TargetPath);
         *attrs = f->Attributes;
@@ -224,14 +243,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
 
     schedule_install_files(package);
 
-    /*
-     * Despite MSDN specifying that the CreateFolders action
-     * should be called before InstallFiles, some installers don't
-     * do that, and they seem to work correctly.  We need to create
-     * directories here to make sure that the files can be copied.
-     */
-    msi_create_component_directories( package );
-
     mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) );
 
     LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
@@ -273,6 +284,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
                   debugstr_w(file->TargetPath));
 
             msi_file_update_ui(package, file, szInstallFiles);
+            msi_create_directory(package, file->Component->Directory);
+
             rc = copy_install_file(package, file, source);
             if (rc != ERROR_SUCCESS)
             {
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index cf9e690..819d8bc 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -1002,7 +1002,6 @@ extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature)
 extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR);
 extern BOOL check_unique_action(const MSIPACKAGE *, LPCWSTR);
 extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... );
-extern UINT msi_create_component_directories( MSIPACKAGE *package );
 extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid,
                         MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value);
 extern UINT msi_get_local_package_name(LPWSTR path, LPCWSTR suffix);
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index b78918c..6702f13 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3981,10 +3981,7 @@ static void test_caborder(void)
     ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n");
     ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n");
     ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n");
-    todo_wine
-    {
-        ok(!delete_pf("msitest", FALSE), "File is installed\n");
-    }
+    ok(!delete_pf("msitest", FALSE), "File is installed\n");
 
     delete_cab_files();
     DeleteFile(msifile);



From julliard at winehq.org  Wed Jun  9 13:38:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:13 -0500
Subject: Hans Leidekker : msi: Directly pass the disk id to installfiles_cb.
Message-ID: <E1OMQAH-0007WA-W9@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5ecbc4f8cad6a277c4edc9f397be31a765bc804d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5ecbc4f8cad6a277c4edc9f397be31a765bc804d

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Jun  9 12:09:06 2010 +0200

msi: Directly pass the disk id to installfiles_cb.

The MEDIAINFO structure is modified by the cabinet_next_cabinet
callback if there's a continuous cabinet in the installer.

---

 dlls/msi/files.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 91ec43e..fc92f14 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -196,7 +196,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
                             LPWSTR *path, DWORD *attrs, PVOID user)
 {
     static MSIFILE *f = NULL;
-    MSIMEDIAINFO *mi = user;
+    UINT_PTR disk_id = (UINT_PTR)user;
 
     if (action == MSICABEXTRACT_BEGINEXTRACT)
     {
@@ -207,7 +207,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
             return FALSE;
         }
 
-        if (f->disk_id != mi->disk_id || (f->state != msifs_missing && f->state != msifs_overwrite))
+        if (f->disk_id != disk_id || (f->state != msifs_missing && f->state != msifs_overwrite))
             return FALSE;
 
         msi_file_update_ui(package, f, szInstallFiles);
@@ -265,7 +265,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
             data.mi = mi;
             data.package = package;
             data.cb = installfiles_cb;
-            data.user = mi;
+            data.user = (PVOID)(UINT_PTR)mi->disk_id;
 
             if (file->IsCompressed &&
                 !msi_cabextract(package, mi, &data))



From julliard at winehq.org  Wed Jun  9 13:38:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:14 -0500
Subject: Hans Leidekker : msi: Display the directory identifier instead of the
	full path in standard actions .
Message-ID: <E1OMQAI-0007WR-5g@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b8ac327e7e967deeb3179aa90c67f81edf2bbd5c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b8ac327e7e967deeb3179aa90c67f81edf2bbd5c

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Jun  9 12:09:21 2010 +0200

msi: Display the directory identifier instead of the full path in standard actions.

---

 dlls/msi/action.c |   18 +++++-------------
 dlls/msi/files.c  |   25 ++++++-------------------
 2 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 565ef66..48948fb 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1063,7 +1063,7 @@ static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param )
     TRACE("folder is %s\n", debugstr_w(full_path));
 
     uirow = MSI_CreateRecord( 1 );
-    MSI_RecordSetStringW( uirow, 1, full_path );
+    MSI_RecordSetStringW( uirow, 1, dir );
     ui_actiondata( package, szRemoveFolders, uirow );
     msiobj_release( &uirow->hdr );
 
@@ -4257,7 +4257,6 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)
     PROCESS_INFORMATION info;
     BOOL brc;
     MSIRECORD *uirow;
-    LPWSTR uipath, p;
 
     memset(&si,0,sizeof(STARTUPINFOW));
 
@@ -4290,14 +4289,11 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)
 
     uirow = MSI_CreateRecord( 2 );
     MSI_RecordSetStringW( uirow, 1, filename );
-    uipath = strdupW( file->TargetPath );
-    if ((p = strrchrW( uipath,'\\' ))) *p = 0;
-    MSI_RecordSetStringW( uirow, 2, uipath );
+    MSI_RecordSetStringW( uirow, 2, file->Component->Directory );
     ui_actiondata( package, szSelfRegModules, uirow );
     msiobj_release( &uirow->hdr );
 
     msi_free( FullName );
-    msi_free( uipath );
     return ERROR_SUCCESS;
 }
 
@@ -4336,7 +4332,6 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param )
     PROCESS_INFORMATION pi;
     BOOL ret;
     MSIRECORD *uirow;
-    LPWSTR uipath, p;
 
     memset( &si, 0, sizeof(STARTUPINFOW) );
 
@@ -4368,14 +4363,11 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param )
 
     uirow = MSI_CreateRecord( 2 );
     MSI_RecordSetStringW( uirow, 1, filename );
-    uipath = strdupW( file->TargetPath );
-    if ((p = strrchrW( uipath,'\\' ))) *p = 0;
-    MSI_RecordSetStringW( uirow, 2, uipath );
+    MSI_RecordSetStringW( uirow, 2, file->Component->Directory );
     ui_actiondata( package, szSelfUnregModules, uirow );
     msiobj_release( &uirow->hdr );
 
     msi_free( cmdline );
-    msi_free( uipath );
     return ERROR_SUCCESS;
 }
 
@@ -5761,7 +5753,7 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param )
     uirow = MSI_CreateRecord( 5 );
     MSI_RecordSetStringW( uirow, 1, desc );
     MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) );
-    MSI_RecordSetStringW( uirow, 3, driver_path );
+    MSI_RecordSetStringW( uirow, 3, driver_file->Component->Directory );
     ui_actiondata( package, szInstallODBC, uirow );
     msiobj_release( &uirow->hdr );
 
@@ -5834,7 +5826,7 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param )
     uirow = MSI_CreateRecord( 5 );
     MSI_RecordSetStringW( uirow, 1, desc );
     MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) );
-    MSI_RecordSetStringW( uirow, 3, translator_path );
+    MSI_RecordSetStringW( uirow, 3, translator_file->Component->Directory );
     ui_actiondata( package, szInstallODBC, uirow );
     msiobj_release( &uirow->hdr );
 
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index fc92f14..f21cd28 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -50,21 +50,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi);
 static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *action )
 {
     MSIRECORD *uirow;
-    LPWSTR uipath, p;
 
-    /* the UI chunk */
     uirow = MSI_CreateRecord( 9 );
     MSI_RecordSetStringW( uirow, 1, f->FileName );
-    uipath = strdupW( f->TargetPath );
-    p = strrchrW(uipath,'\\');
-    if (p)
-        p[1]=0;
-    MSI_RecordSetStringW( uirow, 9, uipath);
+    MSI_RecordSetStringW( uirow, 9, f->Component->Directory );
     MSI_RecordSetInteger( uirow, 6, f->FileSize );
-    ui_actiondata( package, action, uirow);
+    ui_actiondata( package, action, uirow );
     msiobj_release( &uirow->hdr );
-    msi_free( uipath );
-    ui_progress( package, 2, f->FileSize, 0, 0);
+    ui_progress( package, 2, f->FileSize, 0, 0 );
 }
 
 /* compares the version of a file read from the filesystem and
@@ -987,7 +980,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
     LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
     {
         MSIRECORD *uirow;
-        LPWSTR dir, uipath, p;
+        LPWSTR dir, p;
 
         if ( file->state == msifs_installed )
             ERR("removing installed file %s\n", debugstr_w(file->TargetPath));
@@ -1016,17 +1009,11 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
         }
         file->state = msifs_missing;
 
-        /* the UI chunk */
         uirow = MSI_CreateRecord( 9 );
         MSI_RecordSetStringW( uirow, 1, file->FileName );
-        uipath = strdupW( file->TargetPath );
-        p = strrchrW(uipath,'\\');
-        if (p)
-            p[1]=0;
-        MSI_RecordSetStringW( uirow, 9, uipath);
-        ui_actiondata( package, szRemoveFiles, uirow);
+        MSI_RecordSetStringW( uirow, 9, file->Component->Directory );
+        ui_actiondata( package, szRemoveFiles, uirow );
         msiobj_release( &uirow->hdr );
-        msi_free( uipath );
         /* FIXME: call ui_progress here? */
     }
 



From julliard at winehq.org  Wed Jun  9 13:38:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:14 -0500
Subject: Paul Vriens : winecfg: Update the Danish translation.
Message-ID: <E1OMQAI-0007Wj-BY@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 17811a81c9fc40b52f4a33e15f49ad568c59b669
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=17811a81c9fc40b52f4a33e15f49ad568c59b669

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Jun  9 15:23:42 2010 +0200

winecfg: Update the Danish translation.

---

 programs/winecfg/Da.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index 9e3b875..6e594cc 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -232,7 +232,7 @@ BEGIN
     IDS_WINECFG_TITLE_APP   "Wine configurering for %s"
     IDS_THEMEFILE           "Tema filer (*.msstyles; *.theme)"
     IDS_THEMEFILE_SELECT    "V?lg en tema fil"
-    IDS_AUDIO_MISSING       "Der er ikke nogen lyd driver valgt i registrings databasen.\n\nEn rekommenderet driver er blevet valgt for dig.\nDu kan bruge denne driver eller v?lge en anden.\nDu skal klikke anvend for at valget bliver taget i brug."
+    IDS_AUDIO_MISSING       "Der er ?jeblikket ingen lyd driver angivet i registreringsdatabasen.\n\nEn anbefalet driver er blevet valgt for dig.\nDu kan bruge denne driver eller v?lge en anden.\nDu skal klikke p? 'Anvend' for at f? dit valg til at tr?de i kraft."
     IDS_SHELL_FOLDER        "Shell folder"
     IDS_LINKS_TO            "Links to"
 END



From julliard at winehq.org  Wed Jun  9 13:38:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:14 -0500
Subject: Paul Vriens : regedit: Update the Danish translation.
Message-ID: <E1OMQAI-0007X0-F1@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b0f32c551ab17297ae01053912c808815e711dea
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b0f32c551ab17297ae01053912c808815e711dea

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Jun  9 15:25:31 2010 +0200

regedit: Update the Danish translation.

---

 programs/regedit/Da.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/regedit/Da.rc b/programs/regedit/Da.rc
index 99eda33..48ff820 100644
--- a/programs/regedit/Da.rc
+++ b/programs/regedit/Da.rc
@@ -298,10 +298,10 @@ BEGIN
     IDS_TOO_BIG_VALUE       "V?rdien er for stor (%u)"
     IDS_DELETE_BOX_TITLE    "Bekr?ft sletning af v?rdi"
     IDS_DELETE_BOX_TEXT     "Er du sikker p? at ville slette v?rdien '%s'?"
-    IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?"
+    IDS_DELETE_BOX_TEXT_MULTIPLE "Er du sikker p? du vil slette disse v?rdier?"
     IDS_NEWKEY              "Ny n?gle #%d"
     IDS_NEWVALUE            "Ny v?rdi #%d"
-    IDS_NOTFOUND            "Fandt ikke s?gestrengen ?%s?"
+    IDS_NOTFOUND            "Fandt ikke s?gestrengen '%s'"
 END
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Wed Jun  9 13:38:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:14 -0500
Subject: Paul Vriens : user32: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OMQAI-0007XZ-Mn@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fa5fe06ca14b31cad023d3117d07c0efab42e04e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fa5fe06ca14b31cad023d3117d07c0efab42e04e

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Jun  9 15:28:30 2010 +0200

user32: Update the Danish translation and convert to UTF-8.

---

 dlls/user32/resources/user32_Da.rc |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dlls/user32/resources/user32_Da.rc b/dlls/user32/resources/user32_Da.rc
index 3b5b480..3401e12 100644
--- a/dlls/user32/resources/user32_Da.rc
+++ b/dlls/user32/resources/user32_Da.rc
@@ -19,15 +19,17 @@
 
 #include "resources.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 {
- MENUITEM "&Genopret", 61728
+ MENUITEM "&Gendan", 61728
  MENUITEM "&Flyt", 61456
- MENUITEM "&St?rrelse", 61440
+ MENUITEM "&St??rrelse", 61440
  MENUITEM "Mi&nimer", 61472
- MENUITEM "Ma&ximer", 61488
+ MENUITEM "Ma&ksimer", 61488
  MENUITEM SEPARATOR
  MENUITEM "&Luk\tAlt-F4", 61536
  MENUITEM SEPARATOR
@@ -42,7 +44,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
 		MENUITEM SEPARATOR
 		MENUITEM "&Klip", WM_CUT
 		MENUITEM "K&opier", WM_COPY
-		MENUITEM "&Inds?t", WM_PASTE
+		MENUITEM "&Inds??t", WM_PASTE
 		MENUITEM "&Slet", WM_CLEAR
 		MENUITEM SEPARATOR
 		MENUITEM "Marker &Alt", EM_SETSEL
@@ -54,21 +56,21 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 BEGIN
         ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
         LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX
-        PUSHBUTTON "&Ok", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&Annuller", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "Af&bryd", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&Gentag", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&Ignorer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&Nej", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "&Pr?v igen", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "&Forts?t", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Pr??v igen", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Forts??t", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "Hj??lp", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "V?lg vindue"
+CAPTION "V??lg vindue"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX         MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */



From julliard at winehq.org  Wed Jun  9 13:38:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:14 -0500
Subject: Paul Vriens : shell32: Update the Danish translation.
Message-ID: <E1OMQAI-0007Xq-QR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a60131e126a369ef033c31e07b711ac4bb3933d2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a60131e126a369ef033c31e07b711ac4bb3933d2

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Jun  9 15:30:30 2010 +0200

shell32: Update the Danish translation.

---

 dlls/shell32/shell32_Da.rc |   82 ++++++++++++++++++++++----------------------
 1 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/dlls/shell32/shell32_Da.rc b/dlls/shell32/shell32_Da.rc
index 424ed84..2700213 100644
--- a/dlls/shell32/shell32_Da.rc
+++ b/dlls/shell32/shell32_Da.rc
@@ -39,7 +39,7 @@ MENU_002 MENU DISCARDABLE
 BEGIN
         POPUP ""
         BEGIN
-          POPUP "&View"
+          POPUP "&Vis"
           BEGIN
             MENUITEM "&Store Ikoner",   FCIDM_SHVIEW_BIGICON
             MENUITEM "S&m? Ikoner",     FCIDM_SHVIEW_SMALLICON
@@ -47,26 +47,26 @@ BEGIN
             MENUITEM "&Detaljer",       FCIDM_SHVIEW_REPORTVIEW
           END
           MENUITEM SEPARATOR
-          POPUP "Arrang?r &Ikoner"
+          POPUP "Sortere &Ikoner"
           BEGIN
-            MENUITEM "efter &navn",        0x30    /* column 0 */
-            MENUITEM "efter &type",        0x32    /* column 2 */
-            MENUITEM "efter &st?rrelse",        0x31    /* ... */
-            MENUITEM "efter &dato",        0x33
+            MENUITEM "Efter &Navn",         0x30    /* column 0 */
+            MENUITEM "Efter &Type",         0x32    /* column 2 */
+            MENUITEM "Efter &St?rrelse",    0x31    /* ... */
+            MENUITEM "Efter &?ndringsdato", 0x33
             MENUITEM SEPARATOR
-            MENUITEM "&Autoarrang?r",   FCIDM_SHVIEW_AUTOARRANGE
+            MENUITEM "&Arranger Automatisk", FCIDM_SHVIEW_AUTOARRANGE
           END
-          MENUITEM "Opstil ikoner",     FCIDM_SHVIEW_SNAPTOGRID
+          MENUITEM "A&rranger ikoner i forhold til gitter", FCIDM_SHVIEW_SNAPTOGRID
           MENUITEM SEPARATOR
           MENUITEM "Opdater",           FCIDM_SHVIEW_REFRESH
           MENUITEM SEPARATOR
           MENUITEM "Inds?t",            FCIDM_SHVIEW_INSERT
           MENUITEM "Inds?t som genvej", FCIDM_SHVIEW_INSERTLINK
           MENUITEM SEPARATOR
-          POPUP "New"
+          POPUP "Ny"
           BEGIN
-            MENUITEM "Ny &folder",      FCIDM_SHVIEW_NEWFOLDER
-            MENUITEM "Ny &genvej",      FCIDM_SHVIEW_NEWLINK
+            MENUITEM "&Mappe",      FCIDM_SHVIEW_NEWFOLDER
+            MENUITEM "&Genvej",     FCIDM_SHVIEW_NEWLINK
             MENUITEM SEPARATOR
           END
           MENUITEM SEPARATOR
@@ -104,7 +104,7 @@ BEGIN
         MENUITEM "E&xit", IDM_CPANEL_EXIT
     END
 
-    POPUP "&View"
+    POPUP "&Vis"
     BEGIN
         MENUITEM "&Store Ikoner", FCIDM_SHVIEW_BIGICON
         MENUITEM "S&m? Ikoner", FCIDM_SHVIEW_SMALLICON
@@ -112,15 +112,15 @@ BEGIN
         MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW
     END
 
-    POPUP "&Help"
+    POPUP "&Hj?lp"
     BEGIN
-        MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT
+        MENUITEM "&Om Kontrolpanelet...", IDM_CPANEL_ABOUT
     END
 END
 
 SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
-CAPTION "V?lg folder"
+CAPTION "S?g efter mappe"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
@@ -185,8 +185,8 @@ CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
  ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
- LTEXT "Skriv navnet p? et Program, Mappe, Document eller Internet Ressource, for at f? Wine til at ?bne det.", 12289, 36, 11, 182, 18
- LTEXT "&?ben:", 12305, 7, 39, 24, 10
+ LTEXT "Skriv navnet p? et program, en mappe, et dokument eller Internet ressource, og Wine ?bner det for dig.", 12289, 36, 11, 182, 18
+ LTEXT "&?bn:", 12305, 7, 39, 24, 10
  CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
  DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP
  PUSHBUTTON "Annuller", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP
@@ -217,7 +217,7 @@ STRINGTABLE
         /* special folders */
         IDS_DESKTOP             "Skrivebord"
         IDS_MYCOMPUTER          "Min Computer"
-        IDS_RECYCLEBIN_FOLDER_NAME "Skraldespand"
+        IDS_RECYCLEBIN_FOLDER_NAME "Papirkurven"
 	IDS_CONTROLPANEL	"Control Panel"
 
         /* context menus */
@@ -228,23 +228,23 @@ STRINGTABLE
         IDS_SELECT              "V?lg"
         IDS_OPEN                "?ben"
 
-        IDS_CREATEFOLDER_DENIED "Kan ikke lave ny folder: Ingen rettigheder."
-        IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder"
-        IDS_DELETEITEM_CAPTION "Confirm file deletion"
-        IDS_DELETEFOLDER_CAPTION "Confirm folder deletion"
-        IDS_DELETEITEM_TEXT "Er du sikker p? at du vil slette '%1'?"
-        IDS_DELETEMULTIPLE_TEXT "Er du sikker p? at du vil slette disse %1 filer?"
-        IDS_DELETESELECTED_TEXT "Er du sikker p? at du vil slette de markede filer?"
-        IDS_TRASHITEM_TEXT "Er du sikker p? at du vil smide '%1' i skraldespanden?"
-        IDS_TRASHFOLDER_TEXT "Er du sikker p? at du vil smide '%1' og al dens indhold ned i skraldespanden?"
-        IDS_TRASHMULTIPLE_TEXT "Er du sikker p? at du vil smide disse %1 filer ned i skraldespanden?"
-        IDS_CANTTRASH_TEXT "filen '%1' kan ikke smides i skraldespanden. Vil du slette den istedet for?"
-        IDS_OVERWRITEFILE_TEXT "Folderen har allerede en fil kaldt '%1'.\n\nVil du overskrive den?"
-        IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
-        IDS_OVERWRITEFOLDER_TEXT "Denne folder har allerede en folder med navnet '%1'.\n\n"\
-            "Hvis filerne i destination folderen har de samme navne som filerne i den\n"\
-            "markerede folder vil de blive overskrevet. Vil du stadig rykke eller kopiere\n"\
-            "denne folder?"
+        IDS_CREATEFOLDER_DENIED "Kunne ikke oprette en ny mappe: Adgang n?gtet."
+        IDS_CREATEFOLDER_CAPTION "Fejl ved oprettelse af ny mappe"
+        IDS_DELETEITEM_CAPTION "Bekr?ft sletning af fil"
+        IDS_DELETEFOLDER_CAPTION "Bekr?ft sletning af mappe"
+        IDS_DELETEITEM_TEXT "Er du sikker p? du vil slette '%1'?"
+        IDS_DELETEMULTIPLE_TEXT "Er du sikker p? du vil slette disse %1 filer?"
+        IDS_DELETESELECTED_TEXT "Er du sikker p? du vil slette de(n) valgte fil(er)?"
+        IDS_TRASHITEM_TEXT "Er du sikker p? at du vil sende '%1' til papirkurven?"
+        IDS_TRASHFOLDER_TEXT "Er du sikker p? at du vil sende '%1' og alt dens indhold til papirkurven?"
+        IDS_TRASHMULTIPLE_TEXT "Er du sikker p? at du vil sende disse %1 filer til papirkurven?"
+        IDS_CANTTRASH_TEXT "Filen '%1' kunne ikke sendes til papirkurven. ?nsker du at slette den permanent istedet for?"
+        IDS_OVERWRITEFILE_TEXT "Denne mappe indeholder allerede en fil kaldet '%1'.\n\nVil du overskrive den?"
+        IDS_OVERWRITEFILE_CAPTION "Bekr?ft overskrivning af fil"
+        IDS_OVERWRITEFOLDER_TEXT "Denne mappe indeholder allerede en mappe med navnet '%1'.\n\n"\
+            "Hvis filerne i destinationsmappen har de samme navne som filerne i\n"\
+            "den markerede mappe, vil de blive erstattet. ?nsker du stadig at flytte eller kopiere\n"\
+            "mappen?"
 
         /* message box strings */
         IDS_RESTART_TITLE       "Genstart"
@@ -278,18 +278,18 @@ STRINGTABLE
         IDS_COOKIES                 "Cookies"
         IDS_HISTORY                 "Lokale indstillinger\\History"
         IDS_PROGRAM_FILES           "Program Files"
-        IDS_MYPICTURES              "My Pictures"
-        IDS_PROGRAM_FILES_COMMON    "Programmer\\Common Files"
+        IDS_MYPICTURES              "Mine Billeder"
+        IDS_PROGRAM_FILES_COMMON    "Programmer\F?lles Filer"
         IDS_COMMON_DOCUMENTS        "Documenter"
-        IDS_ADMINTOOLS              "Start Menu\\Programs\\Administrative Tools"
+        IDS_ADMINTOOLS              "Start Menu\Programmer\Administrative V?rkt?jer"
         IDS_COMMON_MUSIC            "Dokumenter\\Min Musik"
         IDS_COMMON_PICTURES         "Dokumenter\\Mine Billeder"
         IDS_COMMON_VIDEO            "Dokumenter\\Mine Film"
-        IDS_CDBURN_AREA             "Lokale indstillinger\\Application Data\\Microsoft\\CD Burning"
+        IDS_CDBURN_AREA             "Lokale indstillinger\Applikations Data\Microsoft\CD Br?ndning"
 
-        IDS_NEWFOLDER           "Ny Folder"
+        IDS_NEWFOLDER               "Ny Mappe"
 
-        IDS_CPANEL_TITLE            "Wine Control Panel"
+        IDS_CPANEL_TITLE            "Wine Kontrolpanel"
         IDS_CPANEL_NAME             "Name"
         IDS_CPANEL_DESCRIPTION      "Description"
 



From julliard at winehq.org  Wed Jun  9 13:38:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:14 -0500
Subject: Paul Vriens : notepad: Update the Danish translation.
Message-ID: <E1OMQAI-0007Y6-Uk@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6f01ab7eb13135fbb11d2db8683e1b8062d29b79
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6f01ab7eb13135fbb11d2db8683e1b8062d29b79

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Jun  9 15:26:49 2010 +0200

notepad: Update the Danish translation.

---

 programs/notepad/Da.rc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc
index 1068b87..1ab5bac 100644
--- a/programs/notepad/Da.rc
+++ b/programs/notepad/Da.rc
@@ -49,11 +49,11 @@ POPUP "&Rediger" {
   MENUITEM "&Inds?t\tCtrl+V",  CMD_PASTE
   MENUITEM "&Slet\tDel",        CMD_DELETE
   MENUITEM SEPARATOR
-  MENUITEM "Marker &alt",       CMD_SELECT_ALL
-  MENUITEM "&Dato/tid\tF5",     CMD_TIME_DATE
+  MENUITEM "Marker &alt\tCtrl+A",       CMD_SELECT_ALL
+  MENUITEM "&Dato og klokkesl?t\tF5",     CMD_TIME_DATE
   MENUITEM SEPARATOR
-  MENUITEM "Automatisk &linjeskift",    CMD_WRAP
-  MENUITEM "&Font...",          CMD_FONT
+  MENUITEM "&Tekstombrydning",    CMD_WRAP
+  MENUITEM "&Skrifttype...",          CMD_FONT
  }
 POPUP "&S?g" {
   MENUITEM "&S?g...",           CMD_SEARCH
@@ -65,7 +65,7 @@ POPUP "&Hj?lp" {
   MENUITEM "&S?g efter hj?lp om...",    CMD_HELP_SEARCH
   MENUITEM "&Brug af Hj?lp",    CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  MENUITEM "&Om Notepad", CMD_HELP_ABOUT_NOTEPAD
+  MENUITEM "&Om Notesblok", CMD_HELP_ABOUT_NOTEPAD
  }
 }
 



From julliard at winehq.org  Wed Jun  9 13:38:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:15 -0500
Subject: Paul Vriens : comdlg32: Update the Danish translation and convert to
	UTF-8.
Message-ID: <E1OMQAJ-0007YP-3l@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a2b21781e30d6b0addc324040f406ce6af1370ba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a2b21781e30d6b0addc324040f406ce6af1370ba

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Jun  9 17:25:38 2010 +0200

comdlg32: Update the Danish translation and convert to UTF-8.

Translation by Thomas Larsen <sikker2004 at yahoo.com>

---

 dlls/comdlg32/cdlg_Da.rc |  151 +++++++++++++++++++++++----------------------
 1 files changed, 77 insertions(+), 74 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2b21781e30d6b0addc324040f406ce6af1370ba


From julliard at winehq.org  Wed Jun  9 13:38:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:15 -0500
Subject: Matteo Bruni : d3dx9: Mark builtin compatibility declarations in the
	shader assembler.
Message-ID: <E1OMQAJ-0007Yh-7e@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9a8ffc916cb1f65e2118c7deba11bc91a4e7cc42
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9a8ffc916cb1f65e2118c7deba11bc91a4e7cc42

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Tue Jun  8 00:35:10 2010 +0200

d3dx9: Mark builtin compatibility declarations in the shader assembler.

This way we can output declarations in the bytecode without polluting
them with the builtin ones.

---

 dlls/d3dx9_36/asmparser.c        |   50 +++++++++++++++++++-------------------
 dlls/d3dx9_36/bytecodewriter.c   |   12 ++++++++-
 dlls/d3dx9_36/d3dx9_36_private.h |    5 +++-
 3 files changed, 40 insertions(+), 27 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a8ffc916cb1f65e2118c7deba11bc91a4e7cc42


From julliard at winehq.org  Wed Jun  9 13:38:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:15 -0500
Subject: Matteo Bruni : d3dx9: Support ps_2_0-style dcl instruction in the
	shader assembler.
Message-ID: <E1OMQAJ-0007Yy-Bh@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 00951f84ed6acddc79230bde63edbbda0dba7e68
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=00951f84ed6acddc79230bde63edbbda0dba7e68

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Tue Jun  8 00:50:57 2010 +0200

d3dx9: Support ps_2_0-style dcl instruction in the shader assembler.

---

 dlls/d3dx9_36/asmparser.c      |   23 +++++++++++++++++++++--
 dlls/d3dx9_36/asmshader.y      |   34 ++++++++++++++++++++++++++++++++++
 dlls/d3dx9_36/bytecodewriter.c |   25 ++++++++++++++-----------
 dlls/d3dx9_36/tests/asm.c      |   13 +++++++++++++
 4 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c
index 071a1b8..b20479a 100644
--- a/dlls/d3dx9_36/asmparser.c
+++ b/dlls/d3dx9_36/asmparser.c
@@ -133,6 +133,25 @@ static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num,
     }
 }
 
+static void asmparser_dcl_input_ps_2(struct asm_parser *This, DWORD usage, DWORD num,
+                                     DWORD mod, const struct shader_reg *reg) {
+    struct instruction instr;
+
+    if(!This->shader) return;
+    if(usage != 0) {
+        asmparser_message(This, "Line %u: Unsupported usage in dcl instruction\n", This->line_no);
+        set_parse_status(This, PARSE_ERR);
+        return;
+    }
+    instr.dstmod = mod;
+    instr.shift = 0;
+    This->funcs->dstreg(This, &instr, reg);
+    if(!record_declaration(This->shader, usage, num, mod, FALSE, instr.dst.regnum, instr.dst.writemask, FALSE)) {
+        ERR("Out of memory\n");
+        set_parse_status(This, PARSE_ERR);
+    }
+}
+
 static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype,
                                   DWORD mod, DWORD regnum,
                                   unsigned int line_no) {
@@ -811,7 +830,7 @@ static const struct asmparser_backend parser_ps_2 = {
     asmparser_coissue_unsupported,
 
     asmparser_dcl_output,
-    asmparser_dcl_input,
+    asmparser_dcl_input_ps_2,
     asmparser_dcl_sampler,
 
     asmparser_end,
@@ -831,7 +850,7 @@ static const struct asmparser_backend parser_ps_2_x = {
     asmparser_coissue_unsupported,
 
     asmparser_dcl_output,
-    asmparser_dcl_input,
+    asmparser_dcl_input_ps_2,
     asmparser_dcl_sampler,
 
     asmparser_end,
diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y
index 9bd84a3..fa6d00c 100644
--- a/dlls/d3dx9_36/asmshader.y
+++ b/dlls/d3dx9_36/asmshader.y
@@ -573,6 +573,40 @@ instruction:          INSTR_ADD omods dreg ',' sregs
                                 reg.writemask = $5;
                                 asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg);
                             }
+                    | INSTR_DCL omods REG_INPUT
+                            {
+                                struct shader_reg reg;
+                                TRACE("Input reg declaration\n");
+                                if($2.shift != 0) {
+                                    asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n",
+                                                      asm_ctx.line_no);
+                                    set_parse_status(&asm_ctx, PARSE_ERR);
+                                }
+                                ZeroMemory(&reg, sizeof(reg));
+                                reg.type = BWRITERSPR_INPUT;
+                                reg.regnum = $3;
+                                reg.rel_reg = NULL;
+                                reg.srcmod = 0;
+                                reg.writemask = BWRITERSP_WRITEMASK_ALL;
+                                asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg);
+                            }
+                    | INSTR_DCL omods REG_INPUT writemask
+                            {
+                                struct shader_reg reg;
+                                TRACE("Input reg declaration\n");
+                                if($2.shift != 0) {
+                                    asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n",
+                                                      asm_ctx.line_no);
+                                    set_parse_status(&asm_ctx, PARSE_ERR);
+                                }
+                                ZeroMemory(&reg, sizeof(reg));
+                                reg.type = BWRITERSPR_INPUT;
+                                reg.regnum = $3;
+                                reg.rel_reg = NULL;
+                                reg.srcmod = 0;
+                                reg.writemask = $4;
+                                asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg);
+                            }
                     | INSTR_DCL sampdcl omods REG_SAMPLER
                             {
                                 TRACE("Sampler declared\n");
diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c
index 5fcc248..b444365 100644
--- a/dlls/d3dx9_36/bytecodewriter.c
+++ b/dlls/d3dx9_36/bytecodewriter.c
@@ -343,11 +343,15 @@ static void put_dword(struct bytecode_buffer *buffer, DWORD value) {
 /******************************************************
  * Implementation of the writer functions starts here *
  ******************************************************/
-static void write_declarations(struct bytecode_buffer *buffer, BOOL len,
+static void write_declarations(struct bc_writer *This,
+                               struct bytecode_buffer *buffer, BOOL len,
                                const struct declaration *decls, unsigned int num, DWORD type) {
     DWORD i;
     DWORD instr_dcl = D3DSIO_DCL;
     DWORD token;
+    struct shader_reg reg;
+
+    ZeroMemory(&reg, sizeof(reg));
 
     if(len) {
         instr_dcl |= 2 << D3DSI_INSTLENGTH_SHIFT;
@@ -366,12 +370,10 @@ static void write_declarations(struct bytecode_buffer *buffer, BOOL len,
         put_dword(buffer, token);
 
         /* Write the dest register */
-        token = (1 << 31); /* Bit 31 of non-instruction opcodes is 1 */
-        token |= (type << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK;
-        token |= (d3d9_writemask(decls[i].writemask)) & D3DSP_WRITEMASK_ALL;
-        token |= decls[i].regnum & D3DSP_REGNUM_MASK;
-        token |= d3d9_dstmod(decls[i].mod);
-        put_dword(buffer, token);
+        reg.type = type;
+        reg.regnum = decls[i].regnum;
+        reg.writemask = decls[i].writemask;
+        This->funcs->dstreg(This, &reg, buffer, 0, decls[i].mod);
     }
 }
 
@@ -514,7 +516,7 @@ static void vs_1_x_header(struct bc_writer *This, const struct bwriter_shader *s
     /* Declare the shader type and version */
     put_dword(buffer, This->version);
 
-    write_declarations(buffer, FALSE, shader->inputs, shader->num_inputs, D3DSPR_INPUT);
+    write_declarations(This, buffer, FALSE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT);
     write_constF(shader, buffer, FALSE);
     return;
 }
@@ -908,7 +910,7 @@ static void vs_2_header(struct bc_writer *This,
     /* Declare the shader type and version */
     put_dword(buffer, This->version);
 
-    write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT);
+    write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT);
     write_constF(shader, buffer, TRUE);
     write_constB(shader, buffer, TRUE);
     write_constI(shader, buffer, TRUE);
@@ -1187,6 +1189,7 @@ static void ps_2_header(struct bc_writer *This, const struct bwriter_shader *sha
 
     /* Declare the shader type and version */
     put_dword(buffer, This->version);
+    write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT);
     write_samplers(shader, buffer);
     write_constF(shader, buffer, TRUE);
     write_constB(shader, buffer, TRUE);
@@ -1424,8 +1427,8 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha
     /* Declare the shader type and version */
     put_dword(buffer, This->version);
 
-    write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT);
-    write_declarations(buffer, TRUE, shader->outputs, shader->num_outputs, D3DSPR_OUTPUT);
+    write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT);
+    write_declarations(This, buffer, TRUE, shader->outputs, shader->num_outputs, BWRITERSPR_OUTPUT);
     write_constF(shader, buffer, TRUE);
     write_constB(shader, buffer, TRUE);
     write_constI(shader, buffer, TRUE);
diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c
index 9ed1be8..5ed286e 100644
--- a/dlls/d3dx9_36/tests/asm.c
+++ b/dlls/d3dx9_36/tests/asm.c
@@ -886,6 +886,11 @@ static void ps_2_0_test(void) {
             {0xffff0200, 0x0200001f, 0x90000000, 0xa00f0802, 0x03020042, 0x800f0000,
              0xb0e40001, 0xa0e40802, 0x0000ffff}
         },
+        {   /* shader 11 */
+            "ps_2_0\n"
+            "dcl v0\n",
+            {0xffff0200, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff}
+        },
     };
 
     exec_tests("ps_2_0", tests, sizeof(tests) / sizeof(tests[0]));
@@ -1195,6 +1200,11 @@ static void ps_3_0_test(void) {
             "dcl_2d_pp s0\n",
             {0xffff0300, 0x0200001f, 0x90000000, 0xa02f0800, 0x0000ffff}
         },
+        {   /* shader 15 */
+            "ps_3_0\n"
+            "dcl v0\n",
+            {0xffff0300, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff}
+        },
     };
 
     exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0]));
@@ -1336,6 +1346,9 @@ static void failure_test(void) {
         /* shader 42: no modifiers with vs dcl sampler instruction */
         "vs_3_0\n"
         "dcl_2d_pp s0\n",
+        /* shader 43: can't explicitely declare input registers in ps_2_0 */
+        "ps_2_0\n"
+        "dcl_texcoord0 t0\n",
     };
     HRESULT hr;
     unsigned int i;



From julliard at winehq.org  Wed Jun  9 13:38:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:15 -0500
Subject: Matteo Bruni : d3dx9: Accept texture coordinate registers in dcl
	instruction.
Message-ID: <E1OMQAJ-0007ZE-ET@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2fa119f765c005d63a5ad0d9e96d7076a24192c6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2fa119f765c005d63a5ad0d9e96d7076a24192c6

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Tue Jun  8 00:53:23 2010 +0200

d3dx9: Accept texture coordinate registers in dcl instruction.

---

 dlls/d3dx9_36/asmshader.y |   36 +++++++++++++++++++++++-------------
 dlls/d3dx9_36/tests/asm.c |   11 +++++++++++
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y
index fa6d00c..0c335b4 100644
--- a/dlls/d3dx9_36/asmshader.y
+++ b/dlls/d3dx9_36/asmshader.y
@@ -255,6 +255,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) {
 %type <modshift> omodifier
 %type <comptype> comp
 %type <declaration> dclusage
+%type <reg> dcl_inputreg
 %type <samplertype> sampdcl
 %type <rel_reg> rel_reg
 %type <reg> predicate
@@ -539,7 +540,7 @@ instruction:          INSTR_ADD omods dreg ',' sregs
                                 reg.writemask = $4;
                                 asm_ctx.funcs->dcl_output(&asm_ctx, $2.dclusage, $2.regnum, &reg);
                             }
-                    | INSTR_DCL dclusage omods REG_INPUT
+                    | INSTR_DCL dclusage omods dcl_inputreg
                             {
                                 struct shader_reg reg;
                                 TRACE("Input reg declaration\n");
@@ -549,14 +550,14 @@ instruction:          INSTR_ADD omods dreg ',' sregs
                                     set_parse_status(&asm_ctx, PARSE_ERR);
                                 }
                                 ZeroMemory(&reg, sizeof(reg));
-                                reg.type = BWRITERSPR_INPUT;
-                                reg.regnum = $4;
+                                reg.type = $4.type;
+                                reg.regnum = $4.regnum;
                                 reg.rel_reg = NULL;
                                 reg.srcmod = 0;
                                 reg.writemask = BWRITERSP_WRITEMASK_ALL;
                                 asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg);
                             }
-                    | INSTR_DCL dclusage omods REG_INPUT writemask
+                    | INSTR_DCL dclusage omods dcl_inputreg writemask
                             {
                                 struct shader_reg reg;
                                 TRACE("Input reg declaration\n");
@@ -566,14 +567,14 @@ instruction:          INSTR_ADD omods dreg ',' sregs
                                     set_parse_status(&asm_ctx, PARSE_ERR);
                                 }
                                 ZeroMemory(&reg, sizeof(reg));
-                                reg.type = BWRITERSPR_INPUT;
-                                reg.regnum = $4;
+                                reg.type = $4.type;
+                                reg.regnum = $4.regnum;
                                 reg.rel_reg = NULL;
                                 reg.srcmod = 0;
                                 reg.writemask = $5;
                                 asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg);
                             }
-                    | INSTR_DCL omods REG_INPUT
+                    | INSTR_DCL omods dcl_inputreg
                             {
                                 struct shader_reg reg;
                                 TRACE("Input reg declaration\n");
@@ -583,14 +584,14 @@ instruction:          INSTR_ADD omods dreg ',' sregs
                                     set_parse_status(&asm_ctx, PARSE_ERR);
                                 }
                                 ZeroMemory(&reg, sizeof(reg));
-                                reg.type = BWRITERSPR_INPUT;
-                                reg.regnum = $3;
+                                reg.type = $3.type;
+                                reg.regnum = $3.regnum;
                                 reg.rel_reg = NULL;
                                 reg.srcmod = 0;
                                 reg.writemask = BWRITERSP_WRITEMASK_ALL;
                                 asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg);
                             }
-                    | INSTR_DCL omods REG_INPUT writemask
+                    | INSTR_DCL omods dcl_inputreg writemask
                             {
                                 struct shader_reg reg;
                                 TRACE("Input reg declaration\n");
@@ -600,8 +601,8 @@ instruction:          INSTR_ADD omods dreg ',' sregs
                                     set_parse_status(&asm_ctx, PARSE_ERR);
                                 }
                                 ZeroMemory(&reg, sizeof(reg));
-                                reg.type = BWRITERSPR_INPUT;
-                                reg.regnum = $3;
+                                reg.type = $3.type;
+                                reg.regnum = $3.regnum;
                                 reg.rel_reg = NULL;
                                 reg.srcmod = 0;
                                 reg.writemask = $4;
@@ -617,7 +618,7 @@ instruction:          INSTR_ADD omods dreg ',' sregs
                                 }
                                 asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3.mod, $4, asm_ctx.line_no);
                             }
-                    | INSTR_DCL sampdcl omods REG_INPUT
+                    | INSTR_DCL sampdcl omods dcl_inputreg
                             {
                                 TRACE("Error rule: sampler decl of input reg\n");
                                 asmparser_message(&asm_ctx, "Line %u: Sampler declarations of input regs is not valid\n",
@@ -1342,6 +1343,15 @@ dclusage:             USAGE_POSITION
                             $$.dclusage = BWRITERDECLUSAGE_SAMPLE;
                         }
 
+dcl_inputreg:         REG_INPUT
+                        {
+                            $$.regnum = $1; $$.type = BWRITERSPR_INPUT;
+                        }
+                    | REG_TEXTURE
+                        {
+                            $$.regnum = $1; $$.type = BWRITERSPR_TEXTURE;
+                        }
+
 sampdcl:              SAMPTYPE_1D
                         {
                             $$ = BWRITERSTT_1D;
diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c
index 5ed286e..dda0e2b 100644
--- a/dlls/d3dx9_36/tests/asm.c
+++ b/dlls/d3dx9_36/tests/asm.c
@@ -891,6 +891,17 @@ static void ps_2_0_test(void) {
             "dcl v0\n",
             {0xffff0200, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff}
         },
+        {   /* shader 12 */
+            "ps_2_0\n"
+            "dcl t0.xyz\n"
+            "dcl t1\n",
+            {0xffff0200, 0x0200001f, 0x80000000, 0xb0070000, 0x0200001f, 0x80000000, 0xb00f0001, 0x0000ffff}
+        },
+        {   /* shader 13 */
+            "ps_2_0\n"
+            "dcl_pp t0\n",
+            {0xffff0200, 0x0200001f, 0x80000000, 0xb02f0000, 0x0000ffff}
+        },
     };
 
     exec_tests("ps_2_0", tests, sizeof(tests) / sizeof(tests[0]));



From julliard at winehq.org  Wed Jun  9 13:38:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 09 Jun 2010 13:38:15 -0500
Subject: Damjan Jovanovic : wine.inf: Also install winhlp32 into
	\windows\system32.
Message-ID: <E1OMQAJ-0007a7-KW@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 950919ee33898b9ed495f1d549243a3841a97623
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=950919ee33898b9ed495f1d549243a3841a97623

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Tue Jun  8 21:42:24 2010 +0200

wine.inf: Also install winhlp32 into \windows\system32.

---

 tools/wine.inf.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index a8b3e6b..8a1a871 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2549,6 +2549,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,ddhelp.exe
 11,,dosx.exe
 11,,dsound.vxd
+11,,winhlp32.exe
 
 ; Wow64-only fake dlls
 [FakeDllsWow64]



From jnewman at winehq.org  Wed Jun  9 17:24:33 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Wed, 09 Jun 2010 17:24:33 -0500
Subject: Michael Stefaniuc : Update the mailing lists traffic stats.
Message-ID: <E1OMThJ-00071r-Q9@wine.codeweavers.com>

Module: website
Branch: master
Commit: a5b773a734e2911315e23fb52cf5cee74837fbd7
URL:    http://source.winehq.org/git/website.git/?a=commit;h=a5b773a734e2911315e23fb52cf5cee74837fbd7

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jun 10 00:00:07 2010 +0200

Update the mailing lists traffic stats.

Traffic stats gathered from the archives for the last 12 months.
The wine-bugs number was waay off.

---

 templates/en/forums.template |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/en/forums.template b/templates/en/forums.template
index f8a04a0..e427d50 100644
--- a/templates/en/forums.template
+++ b/templates/en/forums.template
@@ -57,7 +57,7 @@ mailing list software.</p>
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>]
     [<a href="http://forum.winehq.org">via web forums</a>]
     <a href="mailto:wine-users at winehq.org">wine-users at winehq.org</a><br>
-    A high traffic (50/day) open list for end-user discussions.<br><br>
+    A medium traffic (50/day) open list for end-user discussions.<br><br>
 
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>]
@@ -74,7 +74,7 @@ mailing list software.</p>
    [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>]
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>]
    <a href="mailto:wine-patches at winehq.org">wine-patches at winehq.org</a><br>
-   A medium traffic (30/day) open list for submitting patches only.<br><br>
+   A medium traffic (45/day) open list for submitting patches only.<br><br>
 
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>]
@@ -82,7 +82,7 @@ mailing list software.</p>
     [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>]
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>]
     <a href="mailto:wine-cvs at winehq.org">wine-cvs at winehq.org</a><br>
-    A medium traffic (25/day) read only list which tracks commits to the Git
+    A medium traffic (35/day) read only list which tracks commits to the Git
     tree.<br><br>
 
   <li>
@@ -105,7 +105,7 @@ mailing list software.</p>
     [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>]
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>]
     <a href="mailto:wine-bugs at winehq.org">wine-bugs at winehq.org</a><br>
-    A medium traffic (10/day) read-only list for monitoring submissions to the
+    A high traffic (150/day) read-only list for monitoring activity on the
     <a href="http://bugs.winehq.org/">Bug Tracking Database</a>.<br><br>
 
   <li>



From jnewman at winehq.org  Thu Jun 10 09:40:30 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Thu, 10 Jun 2010 09:40:30 -0500
Subject: =?UTF-8?Q?Alexandru=20B=C4=83lu=C8=9B=20?=: Removed references to
	obsolete bugzilla keywords: tasklet, tasklist
Message-ID: <E1OMivm-0001El-3Q@wine.codeweavers.com>

Module: website
Branch: master
Commit: 2ca6afbabf71f16fcfc55fd4d52be6ad5ee42857
URL:    http://source.winehq.org/git/website.git/?a=commit;h=2ca6afbabf71f16fcfc55fd4d52be6ad5ee42857

Author: Alexandru B?lu? <alexandru.balut at gmail.com>
Date:   Thu Jun 10 10:22:11 2010 +0200

Removed references to obsolete bugzilla keywords: tasklet, tasklist

--001485eb01d047e1d60488a8b90a
Content-Type: text/plain; charset=UTF-8

<br>


From alexandru.balut at gmail.com  Thu Jun 10 02:57:25 2010
From: alexandru.balut at gmail.com (Alex Balut)
Date: Thu, 10 Jun 2010 09:57:25 +0200
Subject: Removed references to obsolete bugzilla keywords: tasklet, tasklist
Message-ID: <mailman.569.1276180831.27605.wine-cvs@winehq.org>

---

 templates/de/contributing.template |   64 ------------------------------------
 templates/en/contributing.template |   58 --------------------------------
 templates/en/status/todo.template  |    2 -
 templates/pt/contributing.template |   28 ----------------
 4 files changed, 0 insertions(+), 152 deletions(-)

Diff:   http://source.winehq.org/git/website.git/?a=commitdiff;h=2ca6afbabf71f16fcfc55fd4d52be6ad5ee42857


From julliard at winehq.org  Thu Jun 10 12:22:49 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:49 -0500
Subject: Alexandre Julliard : advapi32: Fix Unicode string lengths in
	LsaLookupSids.
Message-ID: <E1OMlSr-0001xN-HH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ffb29fd3351f5181a8418de3245753e15dc0119d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ffb29fd3351f5181a8418de3245753e15dc0119d

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun  9 20:52:13 2010 +0200

advapi32: Fix Unicode string lengths in LsaLookupSids.

Found by Louis Lenders.

---

 dlls/advapi32/lsa.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
index 50877cc..e12e312 100644
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -491,9 +491,9 @@ NTSTATUS WINAPI LsaLookupSids(
 
             if (domain_size)
             {
-                domain.Length = domain_size*sizeof(WCHAR);
+                domain.Length = (domain_size - 1) * sizeof(WCHAR);
                 domain.MaximumLength = domain_size*sizeof(WCHAR);
-                domain.Buffer = HeapAlloc(GetProcessHeap(),0,domain.Length);
+                domain.Buffer = HeapAlloc(GetProcessHeap(),0,domain.MaximumLength);
             }
             else
             {
@@ -503,7 +503,7 @@ NTSTATUS WINAPI LsaLookupSids(
             }
 
             (*Names)[i].Use = use;
-            (*Names)[i].Name.Length = name_size * sizeof(WCHAR);
+            (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR);
             (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR);
             (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(),0,name_size * sizeof(WCHAR));
             LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, domain.Buffer, &domain_size, &use);



From julliard at winehq.org  Thu Jun 10 12:22:49 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:49 -0500
Subject: Alexandre Julliard : xcopy: Do not ignore errors caused by processing
	parameters.
Message-ID: <E1OMlSr-0001xh-KA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b7da23eb29a3f68b6acf0d0e884e54f546241bab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b7da23eb29a3f68b6acf0d0e884e54f546241bab

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 10 11:24:06 2010 +0200

xcopy: Do not ignore errors caused by processing parameters.

---

 programs/xcopy/xcopy.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c
index f996144..4572374 100644
--- a/programs/xcopy/xcopy.c
+++ b/programs/xcopy/xcopy.c
@@ -261,11 +261,13 @@ int wmain (int argc, WCHAR *argvW[])
     WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination));
 
     /* Extract required information from source specification */
-    XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags);
+    rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags);
+    if (rc != RC_OK) return rc;
 
     /* Extract required information from destination specification */
-    XCOPY_ProcessDestParm(supplieddestination, destinationstem,
+    rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem,
                                destinationspec, sourcespec, flags);
+    if (rc != RC_OK) return rc;
 
     /* Trace out the resulting information */
     WINE_TRACE("Resolved parameters:\n");



From julliard at winehq.org  Thu Jun 10 12:22:49 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:49 -0500
Subject: Eric Pouech : winhelp: Implemented ExecFile macro.
Message-ID: <E1OMlSr-0001xx-MI@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d18d25115bf4a17976cea51ded33c022989feacf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d18d25115bf4a17976cea51ded33c022989feacf

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Wed Jun  9 21:22:22 2010 +0200

winhelp: Implemented ExecFile macro.

---

 programs/winhlp32/macro.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c
index 0e48ca8..cd497ef 100644
--- a/programs/winhlp32/macro.c
+++ b/programs/winhlp32/macro.c
@@ -25,6 +25,7 @@
 
 #include "windows.h"
 #include "commdlg.h"
+#include "shellapi.h"
 #include "winhelp.h"
 
 #include "wine/debug.h"
@@ -64,6 +65,9 @@ static WINHELP_BUTTON**        MACRO_LookupButton(WINHELP_WINDOW* win, LPCSTR na
     return b;
 }
 
+/******* some forward declarations *******/
+static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id);
+
 /******* real macro implementation *******/
 
 void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro)
@@ -352,9 +356,20 @@ static void CALLBACK MACRO_EndMPrint(void)
     WINE_FIXME("()\n");
 }
 
-static void CALLBACK MACRO_ExecFile(LPCSTR str1, LPCSTR str2, LONG u, LPCSTR str3)
+static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCSTR topic)
 {
-    WINE_FIXME("(\"%s\", \"%s\", %u, \"%s\")\n", str1, str2, u, str3);
+    HINSTANCE ret;
+
+    WINE_TRACE("(%s, %s, %u, %s)\n",
+               wine_dbgstr_a(pgm), wine_dbgstr_a(args), cmd_show, wine_dbgstr_a(topic));
+
+    ret = ShellExecuteA(Globals.active_win ? Globals.active_win->hMainWnd : NULL, "open",
+                        pgm, args, ".", cmd_show);
+    if ((DWORD_PTR)ret < 32)
+    {
+        WINE_WARN("Failed with %p\n", ret);
+        if (topic) MACRO_JumpID(NULL, topic);
+    }
 }
 
 static void CALLBACK MACRO_ExecProgram(LPCSTR str, LONG u)



From julliard at winehq.org  Thu Jun 10 12:22:49 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:49 -0500
Subject: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: cmd: Update French
	translation .
Message-ID: <E1OMlSr-0001yD-OQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f8db2a8ef858d428d671b438323cef7d41252e86
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f8db2a8ef858d428d671b438323cef7d41252e86

Author: Fr?d?ric Delanoy <frederic.delanoy at gmail.com>
Date:   Wed Jun  9 23:04:06 2010 +0200

cmd: Update French translation.

---

 programs/cmd/Fr.rc |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc
index 1f3837c..6ee1e1d 100644
--- a/programs/cmd/Fr.rc
+++ b/programs/cmd/Fr.rc
@@ -4,6 +4,7 @@
  *
  * Copyright 2003 Sylvain Petreolle
  * Copyright 2007 Jonathan Ernst
+ * Copyright 2009-2010 Fr?d?ric Delanoy
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,7 +30,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
-  WCMD_ATTRIB, "Aide d'ATTRIB\n"
+  WCMD_ATTRIB, "ATTRIB affiche ou modifie les attributs de fichiers DOS.\n"
   WCMD_CALL,
 "CALL <fichierbatch> sert ? appeler un fichier batch\n\
 depuis un autre fichier batch. Quand le fichier batch sort, le contr?le revient\n\
@@ -39,17 +40,18 @@ de la proc?dure appel?e.\n\
 Les changements de r?pertoire courant, de variables d'environnement etc. faits\n\
 dans une proc?dure appel?e sont transmis ? l'appelant.\n"
 
-  WCMD_CD,     "Aide de CD\n"
-  WCMD_CHDIR,  "Aide de CHDIR\n"
+  WCMD_CD,     "CD <r?p> est la version courte de CHDIR. Elle change le\
+r?pertoire courant par d?faut.\n"
+  WCMD_CHDIR,  "CHDIR <r?p> change le r?pertoire courant par d?faut.\n"
 
   WCMD_CLS,
-"CLS efface l'?cran de la console\n"
+"CLS efface l'?cran de la console.\n"
 
-  WCMD_COPY,   "Aide de COPY\n"
-  WCMD_CTTY,   "Aide de CTTY\n"
-  WCMD_DATE,   "Aide de DATE\n"
-  WCMD_DEL,    "Aide de DEL\n"
-  WCMD_DIR,    "Aide de DIR\n"
+  WCMD_COPY,   "COPY copie un ou plusieurs fichiers.\n"
+  WCMD_CTTY,   "CTTY change le p?riph?rique d'entr?e/sortie.\n"
+  WCMD_DATE,   "DATE affiche ou modifie la date syst?me.\n"
+  WCMD_DEL,    "DEL <fichiers> efface un fichier ou un groupe de fichiers.\n"
+  WCMD_DIR,    "DIR liste le contenu d'un r?pertoire.\n"
 
   WCMD_ECHO,
 "ECHO <cha?ne> affiche <cha?ne> sur la console courante.\n\
@@ -61,7 +63,7 @@ ECHO OFF annule l'effet de tout ECHO ON ant?rieur (ECHO est OFF par\n\
 d?faut). On peut emp?cher l'affichage de ECHO OFF en le faisant\n\
 pr?c?der d'un signe @.\n"
 
-  WCMD_ERASE,  "Aide de ERASE\n"
+  WCMD_ERASE,  "ERASE <fichiers> efface un ou plusieurs fichiers.\n"
 
   WCMD_FOR,
 "La commande FOR sert ? ex?cuter une commande pour chaque fichier d'un groupe de fichiers.\n\
@@ -101,8 +103,8 @@ Syntaxe?: LABEL [lecteur:]\n\
 La commande demande le nouveau nom de volume pour le lecteur sp?cifi?.\n\
 Vous pouvez afficher le nom de volume avec la commande VOL.\n"
 
-  WCMD_MD,     "Aide de MD\n"
-  WCMD_MKDIR,  "Aide de MKDIR\n"
+  WCMD_MD,     "MD est la version courte de MKDIR. Elle cr?e un r?pertoire.\n"
+  WCMD_MKDIR,  "MKDIR <r?p> cr?e un r?pertoire.\n"
   WCMD_MOVE,
 "MOVE d?place un fichier, un groupe de fichiers ou un r?pertoire\n\
 ? un autre endroit dans le syst?me de fichiers. Si l'objet d?plac? est un r?pertoire, alors\n\
@@ -150,10 +152,10 @@ L'invite peut aussi ?tre adapt?e en modifiant la variable d'environnement\n\
 "Une ligne de commande commen?ant par REM (suivi d'une espace) n'engendre\n\
 aucune action, et peut donc servir de commentaire dans un fichier batch.\n"
 
-  WCMD_REN,    "Aide de REN\n"
-  WCMD_RENAME, "Aide de RENAME\n"
-  WCMD_RD,     "Aide de RD.\n"
-  WCMD_RMDIR,  "Aide de RMDIR.\n"
+  WCMD_REN,    "REN est la version courte de RENAME. Elle renomme un fichier.\n"
+  WCMD_RENAME, "RENAME renomme un fichier.\n"
+  WCMD_RD,     "RD est la version courte de RMDIR. Elle efface un r?pertoire.\n"
+  WCMD_RMDIR,  "RMDIR efface un sous-r?pertoire.\n"
 
   WCMD_SET,
 "SET affiche ou change les variables d'environnement de cmd.\n\
@@ -178,7 +180,7 @@ n'est pas possible de modifier l'environnement du syst?me d'exploitation dans c
 liste ; ainsi, le param?tre 2 devient param?tre 1 et ainsi de suite. Il est sans effet\n\
 s'il est appel? depuis la ligne de commande.\n"
 
-  WCMD_TIME,   "Aide de TIME\n"
+  WCMD_TIME,   "TIME r?gle ou affiche l'heure syst?me courante.\n"
 
   WCMD_TITLE,
 "D?finit le titre de la fen?tre pour la session cmd, Syntaxe?: TITLE [cha?ne]\n"



From julliard at winehq.org  Thu Jun 10 12:22:49 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:49 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: oleacc: Update the
	Polish translation.
Message-ID: <E1OMlSr-0001yT-R5@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c52a4c5314fc360099613c831c486e92f2836774
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c52a4c5314fc360099613c831c486e92f2836774

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Wed Jun  9 21:36:31 2010 +0200

oleacc: Update the Polish translation.

---

 dlls/oleacc/oleacc_Pl.rc |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/oleacc/oleacc_Pl.rc b/dlls/oleacc/oleacc_Pl.rc
index 5d45368..4248577 100644
--- a/dlls/oleacc/oleacc_Pl.rc
+++ b/dlls/oleacc/oleacc_Pl.rc
@@ -28,7 +28,7 @@ STRINGTABLE DISCARDABLE
     ROLE_SYSTEM_TITLEBAR    "pasek tytu?u"
     ROLE_SYSTEM_MENUBAR     "pasek menu"
     ROLE_SYSTEM_SCROLLBAR   "pasek przewijania"
-    ROLE_SYSTEM_GRIP        "grip"
+    ROLE_SYSTEM_GRIP        "uchwyt"
     ROLE_SYSTEM_SOUND       "d?wi?k"
     ROLE_SYSTEM_CURSOR      "kursor"
     ROLE_SYSTEM_CARET       "daszek"
@@ -40,7 +40,7 @@ STRINGTABLE DISCARDABLE
     ROLE_SYSTEM_TOOLTIP     "podpowied?"
     ROLE_SYSTEM_APPLICATION "aplikacja"
     ROLE_SYSTEM_DOCUMENT    "dokument"
-    ROLE_SYSTEM_PANE        "pane"
+    ROLE_SYSTEM_PANE        "wycinek"
     ROLE_SYSTEM_CHART       "wykres"
     ROLE_SYSTEM_DIALOG      "dialog"
     ROLE_SYSTEM_BORDER      "obramowanie"
@@ -54,14 +54,14 @@ STRINGTABLE DISCARDABLE
     ROLE_SYSTEM_COLUMN       "kolumna"
     ROLE_SYSTEM_ROW          "wiersz"
     ROLE_SYSTEM_CELL         "kom?rka"
-    ROLE_SYSTEM_LINK         "link"
+    ROLE_SYSTEM_LINK         "dowi?zanie"
     ROLE_SYSTEM_HELPBALLOON  "dymek pomocy"
     ROLE_SYSTEM_CHARACTER    "znak"
     ROLE_SYSTEM_LIST         "lista"
     ROLE_SYSTEM_LISTITEM     "element listy"
     ROLE_SYSTEM_OUTLINE      "zarys"
     ROLE_SYSTEM_OUTLINEITEM  "element zarysu"
-    ROLE_SYSTEM_PAGETAB      "page tab"
+    ROLE_SYSTEM_PAGETAB      "zak?adka strony"
     ROLE_SYSTEM_PROPERTYPAGE "strona w?a?ciwo?ci"
     ROLE_SYSTEM_INDICATOR    "wska?nik"
     ROLE_SYSTEM_GRAPHIC      "grafika"
@@ -73,10 +73,10 @@ STRINGTABLE DISCARDABLE
     ROLE_SYSTEM_COMBOBOX     "pole kombi"
     ROLE_SYSTEM_DROPLIST     "lista rozwijana"
     ROLE_SYSTEM_PROGRESSBAR  "pasek post?pu"
-    ROLE_SYSTEM_DIAL         "dial"
-    ROLE_SYSTEM_HOTKEYFIELD  "hot key field"
+    ROLE_SYSTEM_DIAL         "wybieranie"
+    ROLE_SYSTEM_HOTKEYFIELD  "pole gor?cego klawisza"
     ROLE_SYSTEM_SLIDER       "suwak"
-    ROLE_SYSTEM_SPINBUTTON   "spin box"
+    ROLE_SYSTEM_SPINBUTTON   "pole przewijane"
     ROLE_SYSTEM_DIAGRAM      "diagram"
     ROLE_SYSTEM_ANIMATION    "animacja"
     ROLE_SYSTEM_EQUATION     "r?wnanie"
@@ -84,7 +84,7 @@ STRINGTABLE DISCARDABLE
     ROLE_SYSTEM_BUTTONMENU   "przycisk menu"
     ROLE_SYSTEM_BUTTONDROPDOWNGRID "siatka przycisk?w rozwijanych"
     ROLE_SYSTEM_WHITESPACE   "bia?a spacja"
-    ROLE_SYSTEM_PAGETABLIST  "page tab list"
+    ROLE_SYSTEM_PAGETABLIST  "lista zak?adek stron"
     ROLE_SYSTEM_CLOCK        "zegar"
     ROLE_SYSTEM_SPLITBUTTON  "przycisk rozdzielania"
     ROLE_SYSTEM_IPADDRESS    "adres IP"



From julliard at winehq.org  Thu Jun 10 12:22:49 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:49 -0500
Subject: Jose Rostagno : reg: Add Spanish translation.
Message-ID: <E1OMlSr-0001yi-Se@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 294f4e2ff1a795d74fc5d437e0ed37dd02b5144f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=294f4e2ff1a795d74fc5d437e0ed37dd02b5144f

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Wed Jun  9 17:46:33 2010 -0300

reg: Add Spanish translation.

---

 programs/reg/Es.rc       |   40 ++++++++++++++++++++++++++++++++++++++++
 programs/reg/Makefile.in |    1 +
 2 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/programs/reg/Es.rc b/programs/reg/Es.rc
new file mode 100644
index 0000000..9155327
--- /dev/null
+++ b/programs/reg/Es.rc
@@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ * Spanish language support
+ *
+ * Copyright 2010 Jos? Rostagno
+ *
+ * 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 "reg.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    STRING_USAGE, "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
+    STRING_ADD_USAGE, "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s separador] [/d datos] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nombre_clave [/v nombre_valor | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nombre_clave [/v nombre_valor | /ve] [/s]\n"
+    STRING_SUCCESS, "La operaci?n finaliz? con ?xito\n"
+    STRING_INVALID_KEY, "Error: nombre de clave no v?lido\n"
+    STRING_INVALID_CMDLINE, "Error: par?metros de l?nea de comandos inv?lidos\n"
+    STRING_NO_REMOTE, "Error: No se puede agregar claves al equipo remoto\n"
+    STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n"
+}
diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in
index c746d0f..90ae143 100644
--- a/programs/reg/Makefile.in
+++ b/programs/reg/Makefile.in
@@ -14,6 +14,7 @@ RC_SRCS = \
 	Da.rc \
 	De.rc \
 	En.rc \
+	Es.rc \
 	Fr.rc \
 	It.rc \
 	Ja.rc \



From julliard at winehq.org  Thu Jun 10 12:22:49 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:49 -0500
Subject: Alexandre Julliard : msi: Don' t allow entering text in a scroll text
	richedit control.
Message-ID: <E1OMlSr-0001z3-V0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 04a6a14c1ff47d71b5a1a0edfd98328e121dea0b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=04a6a14c1ff47d71b5a1a0edfd98328e121dea0b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 10 14:48:28 2010 +0200

msi: Don't allow entering text in a scroll text richedit control.

---

 dlls/msi/dialog.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 1b129e0..e0e27d1 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1010,6 +1010,8 @@ MSIScrollText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
     switch( msg )
     {
+    case WM_GETDLGCODE:
+        return DLGC_WANTARROWS;
     case WM_NCDESTROY:
         msi_free( info );
         RemovePropW( hWnd, szButtonData );



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Jacek Caban : iexplore: Use 1 as default icon ID.
Message-ID: <E1OMlSs-0001zK-0j@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5a8f2073ca4d56eb78b45f3acb6998e094bc23e1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5a8f2073ca4d56eb78b45f3acb6998e094bc23e1

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jun 10 12:50:38 2010 +0200

iexplore: Use 1 as default icon ID.

---

 dlls/shdocvw/iexplore.c       |    2 +-
 programs/iexplore/iexplore.rc |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c
index 9c14cfc..5ef0b36 100644
--- a/dlls/shdocvw/iexplore.c
+++ b/dlls/shdocvw/iexplore.c
@@ -37,7 +37,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
-#define IDI_APPICON 101
+#define IDI_APPICON 1
 
 static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 };
 
diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc
index 80286c4..f37481a 100644
--- a/programs/iexplore/iexplore.rc
+++ b/programs/iexplore/iexplore.rc
@@ -26,7 +26,5 @@
 
 #include "wine/wine_common_ver.rc"
 
-#define IDI_APPICON 101
-
 /* @makedep: iexplore.ico */
-IDI_APPICON ICON iexplore.ico
+1 ICON iexplore.ico



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Jacek Caban : mshtml: Uncomment iexplore.exe registries.
Message-ID: <E1OMlSs-0001zd-45@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4fe2dca81149927d07e1c6c90117afe4bbff91ea
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4fe2dca81149927d07e1c6c90117afe4bbff91ea

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jun 10 12:51:12 2010 +0200

mshtml: Uncomment iexplore.exe registries.

---

 dlls/mshtml/mshtml.inf |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf
index dccd736..7789334 100644
--- a/dlls/mshtml/mshtml.inf
+++ b/dlls/mshtml/mshtml.inf
@@ -91,7 +91,7 @@ HKCR,"CLSID\%CLSID_CRecalcEngine%\InProcServer32","ThreadingModel",,"Apartment"
 ;; CrSource
 HKCR,"CLSID\%CLSID_CrSource%",,,"Microsoft CrSource 4.0"
 HKCR,"CLSID\%CLSID_CrSource%\BrowseInPlace",,16
-;; HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
+HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
 HKCR,"CLSID\%CLSID_CrSource%\EnablePlugin\.css",,,"PointPlus plugin"
 HKCR,"CLSID\%CLSID_CrSource%\InProcServer32",,,"mshtml.dll"
 HKCR,"CLSID\%CLSID_CrSource%\InProcServer32","ThreadingModel",,"Apartment"
@@ -122,7 +122,7 @@ HKCR,"CLSID\%CLSID_HTADocument%\Version",,,"6.0"
 ;; HTMLDocument
 HKCR,"CLSID\%CLSID_HTMLDocument%",,,"HTML Document"
 HKCR,"CLSID\%CLSID_HTMLDocument%\BrowseInPlace",,16
-;; HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
+HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
 HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32",,,"mshtml.dll"
 HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32","ThreadingModel",,"Apartment"
 HKCR,"CLSID\%CLSID_HTMLDocument%\MiscStatus",,,"2228625"
@@ -215,7 +215,7 @@ HKCR,"CLSID\%CLSID_MailtoProtocol%\InProcServer32","ThreadingModel",,"Apartment"
 ;; MHTMLDocument
 HKCR,"CLSID\%CLSID_MHTMLDocument%",,,"MHTML Document"
 HKCR,"CLSID\%CLSID_MHTMLDocument%\BrowseInPlace",,16
-;; HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
+HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
 HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32",,,"mshtml.dll"
 HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32","ThreadingModel",,"Apartment"
 HKCR,"CLSID\%CLSID_MHTMLDocument%\MiscStatus",,,"2228625"
@@ -236,7 +236,7 @@ HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus",,,"0"
 HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus\1",,,"131473"
 HKCR,"CLSID\%CLSID_Scriptlet%\ProgID",,,"ScriptBridge.ScriptBridge.1"
 HKCR,"CLSID\%CLSID_Scriptlet%\Programmable",,16
-;; HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%IEXPLORE%,1"
+HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%IEXPLORE%,1"
 HKCR,"CLSID\%CLSID_Scriptlet%\TypeLib",,,"%LIBID_MSHTML%"
 HKCR,"CLSID\%CLSID_Scriptlet%\Version",,,"4.0"
 HKCR,"CLSID\%CLSID_Scriptlet%\VersionIndependentProgID",,,"ScriptBridge.ScriptBridge"
@@ -312,9 +312,9 @@ HKCR,".gif",,2,"giffile"
 HKCR,".gif","Content Type",,"image/gif"
 HKCR,"giffile",,,"GIF Image"
 HKCR,"giffile\CLSID",,,"%CLSID_HTMLDocument%"
-;; HKCR,"giffile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"giffile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
 HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
-;; HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore"
+HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; HKCR,"giffile\DefaultIcon",,,"%IEXPLORE%,9"
 
@@ -339,7 +339,7 @@ HKCR,"htmlfile\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%%1
 HKCR,"htmlfile",,,"HTML Document"
 HKCR,"htmlfile\BrowseInPlace",,16
 HKCR,"htmlfile\CLSID",,,"%CLSID_HTMLDocument%"
-;; HKCR,"htmlfile\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
+HKCR,"htmlfile\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
 HKCR,"htmlfile_FullWindowEmbed",,,"HTML Plugin Document"
 HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,16
 HKCR,"htmlfile_FullWindowEmbed\CLSID",,,"%CLSID_HTMLPluginDocument%"
@@ -359,9 +359,9 @@ HKCR,".jpe",,2,"jpegfile"
 HKCR,".jpe","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
-;; HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
 HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
-;; HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
+HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8"
 
@@ -374,9 +374,9 @@ HKCR,".jpeg",,2,"jpegfile"
 HKCR,".jpeg","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
-;; HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
 HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
-;; HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
+HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8"
 
@@ -385,9 +385,9 @@ HKCR,".jpg",,2,"jpegfile"
 HKCR,".jpg","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
-;; HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
 HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
-;; HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
+HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8"
 
@@ -422,9 +422,9 @@ HKCR,".jfif",,2,"pjpegfile"
 HKCR,".jfif","Content Type",,"image/jpeg"
 HKCR,"pjpegfile",,,"JPEG Image"
 HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%"
-;; HKCR,"pjpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"pjpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
 HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
-;; HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore"
+HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; HKCR,"pjpegfile\DefaultIcon",,,"%IEXPLORE%,8"
 
@@ -435,9 +435,9 @@ HKCR,".png",,2,"pngfile"
 HKCR,".png","Content Type",,"image/png"
 HKCR,"pngfile",,,"PNG Image"
 HKCR,"pngfile\CLSID",,,"%CLSID_HTMLDocument%"
-;; HKCR,"pngfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"pngfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
 HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
-;; HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore"
+HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; HKCR,"pngfile\DefaultIcon",,,"%IEXPLORE%,9"
 
@@ -478,9 +478,9 @@ HKCR,"MIME\Database\Content Type\image/x-xbitmap","CLSID",,"%CLSID_HTMLDocument%
 HKCR,".xbm","Content Type",,"image/x-xbitmap"
 HKCR,"xbmfile",,,"XBM Image"
 HKCR,"xbmfile\CLSID",,,"%CLSID_HTMLDocument%"
-;; HKCR,"xbmfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"xbmfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
 HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
-;; HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore"
+HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; HKCR,"xbmfile\DefaultIcon",,,"%IEXPLORE%,9"
 



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Jacek Caban : winbase.h: Added missing COPY_FILE_* flags.
Message-ID: <E1OMlSs-0001zs-5p@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 75912afabdec583be7f89141ea1326509a0ebdd1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=75912afabdec583be7f89141ea1326509a0ebdd1

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jun 10 13:01:19 2010 +0200

winbase.h: Added missing COPY_FILE_* flags.

---

 include/winbase.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/include/winbase.h b/include/winbase.h
index 6bb4866..c3dc64c 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -187,6 +187,9 @@ typedef struct _OFSTRUCT
 #define COPY_FILE_FAIL_IF_EXISTS        0x00000001
 #define COPY_FILE_RESTARTABLE           0x00000002
 #define COPY_FILE_OPEN_SOURCE_FOR_WRITE 0x00000004
+#define COPY_FILE_ALLOW_DECRYPTED_DESTINATION  0x00000008
+#define COPY_FILE_COPY_SYMLINK          0x00000800
+#define COPY_FILE_NO_BUFFERING          0x00001000
 
 /* return values for CopyProgressRoutine */
 #define PROGRESS_CONTINUE   0



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Nikolay Sivov : comctl32/tests: Some expand notifications tests.
Message-ID: <E1OMlSs-00020B-9J@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 138b2435f9880072dccb1f11272fd889e5462804
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=138b2435f9880072dccb1f11272fd889e5462804

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Jun 10 01:32:06 2010 +0400

comctl32/tests: Some expand notifications tests.

---

 dlls/comctl32/tests/treeview.c |  229 +++++++++++++++++++++++++++++++---------
 dlls/comctl32/treeview.c       |   10 +-
 2 files changed, 185 insertions(+), 54 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=138b2435f9880072dccb1f11272fd889e5462804


From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Marcus Meissner : wininet: Fixed buffer lengths in InternetCrackUrlW
	tests.
Message-ID: <E1OMlSs-00020S-DU@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3d5a3a32ce7536041fce9b07e265404c2e112b35
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3d5a3a32ce7536041fce9b07e265404c2e112b35

Author: Marcus Meissner <meissner at suse.de>
Date:   Thu Jun 10 13:52:33 2010 +0200

wininet: Fixed buffer lengths in InternetCrackUrlW tests.

---

 dlls/wininet/tests/url.c |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c
index 1f012f0..6dc1369 100644
--- a/dlls/wininet/tests/url.c
+++ b/dlls/wininet/tests/url.c
@@ -200,7 +200,7 @@ static void test_crack_url(const crack_url_test_t *test)
     urlw.dwUrlPathLength = 1;
     urlw.dwExtraInfoLength = 1;
 
-    MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf));
+    MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf)/sizeof(buf[0]));
     b = InternetCrackUrlW(buf, lstrlenW(buf), 0, &urlw);
     if(!b && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) {
         win_skip("InternetCrackUrlW is not implemented\n");
@@ -416,19 +416,19 @@ static void InternetCrackUrlW_test(void)
     user[0]=0;
     pwd[0]=0;
     memset(&comp, 0, sizeof comp);
-    comp.dwStructSize = sizeof comp;
+    comp.dwStructSize = sizeof(comp);
     comp.lpszScheme = scheme;
-    comp.dwSchemeLength = sizeof scheme;
+    comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]);
     comp.lpszHostName = host;
-    comp.dwHostNameLength = sizeof host;
+    comp.dwHostNameLength = sizeof(host)/sizeof(host[0]);
     comp.lpszUserName = user;
-    comp.dwUserNameLength = sizeof user;
+    comp.dwUserNameLength = sizeof(user)/sizeof(user[0]);
     comp.lpszPassword = pwd;
-    comp.dwPasswordLength = sizeof pwd;
+    comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]);
     comp.lpszUrlPath = urlpart;
-    comp.dwUrlPathLength = sizeof urlpart;
+    comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]);
     comp.lpszExtraInfo = extra;
-    comp.dwExtraInfoLength = sizeof extra;
+    comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]);
 
     SetLastError(0xdeadbeef);
     r = InternetCrackUrlW(NULL, 0, 0, &comp );
@@ -471,9 +471,9 @@ static void InternetCrackUrlW_test(void)
     memset(&comp, 0, sizeof comp);
     comp.dwStructSize = sizeof comp;
     comp.lpszHostName = host;
-    comp.dwHostNameLength = sizeof host;
+    comp.dwHostNameLength = sizeof(host)/sizeof(host[0]);
     comp.lpszUrlPath = urlpart;
-    comp.dwUrlPathLength = sizeof urlpart;
+    comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]);
 
     r = InternetCrackUrlW(url, 0, 0, &comp );
     ok( r, "failed to crack url\n");
@@ -493,11 +493,11 @@ static void InternetCrackUrlW_test(void)
     memset(&comp, 0, sizeof comp);
     comp.dwStructSize = sizeof comp;
     comp.lpszHostName = host;
-    comp.dwHostNameLength = sizeof host;
+    comp.dwHostNameLength = sizeof(host)/sizeof(host[0]);
     comp.lpszUrlPath = urlpart;
-    comp.dwUrlPathLength = sizeof urlpart;
+    comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]);
     comp.lpszExtraInfo = NULL;
-    comp.dwExtraInfoLength = sizeof extra;
+    comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]);
 
     r = InternetCrackUrlW(url, 0, 0, &comp );
     ok( r, "failed to crack url\n");
@@ -547,17 +547,17 @@ static void InternetCrackUrlW_test(void)
     memset(&comp, 0, sizeof comp);
     comp.dwStructSize = sizeof comp;
     comp.lpszScheme = scheme;
-    comp.dwSchemeLength = sizeof scheme;
+    comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]);
     comp.lpszHostName = host;
-    comp.dwHostNameLength = sizeof host;
+    comp.dwHostNameLength = sizeof(host)/sizeof(host[0]);
     comp.lpszUserName = user;
-    comp.dwUserNameLength = sizeof user;
+    comp.dwUserNameLength = sizeof(user)/sizeof(user[0]);
     comp.lpszPassword = pwd;
-    comp.dwPasswordLength = sizeof pwd;
+    comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]);
     comp.lpszUrlPath = urlpart;
-    comp.dwUrlPathLength = sizeof urlpart;
+    comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]);
     comp.lpszExtraInfo = extra;
-    comp.dwExtraInfoLength = sizeof extra;
+    comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]);
     r = InternetCrackUrlW(url3, 0, 0, &comp );
     ok( r, "InternetCrackUrlW failed unexpectedly\n");
     ok( host[0] == 'x', "host should be x.org\n");



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Matteo Bruni : d3dx9: Allow sampler declaration without sampler type.
Message-ID: <E1OMlSs-00020i-GY@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5bb403ceb2be5f727c24a87bee35e72fdd6b41aa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5bb403ceb2be5f727c24a87bee35e72fdd6b41aa

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Tue Jun  8 03:20:20 2010 +0200

d3dx9: Allow sampler declaration without sampler type.

---

 dlls/d3dx9_36/asmshader.y |   15 +++++++++++++++
 dlls/d3dx9_36/tests/asm.c |    5 +++++
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y
index 0c335b4..689a8fd 100644
--- a/dlls/d3dx9_36/asmshader.y
+++ b/dlls/d3dx9_36/asmshader.y
@@ -618,6 +618,21 @@ instruction:          INSTR_ADD omods dreg ',' sregs
                                 }
                                 asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3.mod, $4, asm_ctx.line_no);
                             }
+                    | INSTR_DCL omods REG_SAMPLER
+                            {
+                                TRACE("Sampler declared\n");
+                                if($2.shift != 0) {
+                                    asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n",
+                                                      asm_ctx.line_no);
+                                    set_parse_status(&asm_ctx, PARSE_ERR);
+                                }
+                                if(asm_ctx.shader->type != ST_PIXEL) {
+                                    asmparser_message(&asm_ctx, "Line %u: Declaration needs a sampler type\n",
+                                                      asm_ctx.line_no);
+                                    set_parse_status(&asm_ctx, PARSE_ERR);
+                                }
+                                asm_ctx.funcs->dcl_sampler(&asm_ctx, BWRITERSTT_UNKNOWN, $2.mod, $3, asm_ctx.line_no);
+                            }
                     | INSTR_DCL sampdcl omods dcl_inputreg
                             {
                                 TRACE("Error rule: sampler decl of input reg\n");
diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c
index dda0e2b..5f2e49a 100644
--- a/dlls/d3dx9_36/tests/asm.c
+++ b/dlls/d3dx9_36/tests/asm.c
@@ -1216,6 +1216,11 @@ static void ps_3_0_test(void) {
             "dcl v0\n",
             {0xffff0300, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff}
         },
+        {   /* shader 16 */
+            "ps_3_0\n"
+            "dcl s2\n",
+            {0xffff0300, 0x0200001f, 0x80000000, 0xa00f0802, 0x0000ffff}
+        },
     };
 
     exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0]));



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Matteo Bruni : d3dx9: Check register type in dcl input instruction.
Message-ID: <E1OMlSs-00021C-Id@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a74978dfefb1eea2ab0dda2df086f372b896fb6f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a74978dfefb1eea2ab0dda2df086f372b896fb6f

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Tue Jun  8 03:21:43 2010 +0200

d3dx9: Check register type in dcl input instruction.

---

 dlls/d3dx9_36/asmparser.c |    8 ++++++++
 dlls/d3dx9_36/tests/asm.c |    9 +++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c
index b20479a..528e6b3 100644
--- a/dlls/d3dx9_36/asmparser.c
+++ b/dlls/d3dx9_36/asmparser.c
@@ -118,6 +118,8 @@ static void asmparser_dcl_output(struct asm_parser *This, DWORD usage, DWORD num
 
 static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num,
                                 DWORD mod, const struct shader_reg *reg) {
+    struct instruction instr;
+
     if(!This->shader) return;
     if(mod != 0 &&
        (This->shader->version != BWRITERPS_VERSION(3, 0) ||
@@ -127,6 +129,12 @@ static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num,
         set_parse_status(This, PARSE_ERR);
         return;
     }
+
+    /* Check register type and modifiers */
+    instr.dstmod = mod;
+    instr.shift = 0;
+    This->funcs->dstreg(This, &instr, reg);
+
     if(!record_declaration(This->shader, usage, num, mod, FALSE, reg->regnum, reg->writemask, FALSE)) {
         ERR("Out of memory\n");
         set_parse_status(This, PARSE_ERR);
diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c
index 5f2e49a..6255d02 100644
--- a/dlls/d3dx9_36/tests/asm.c
+++ b/dlls/d3dx9_36/tests/asm.c
@@ -1365,6 +1365,15 @@ static void failure_test(void) {
         /* shader 43: can't explicitely declare input registers in ps_2_0 */
         "ps_2_0\n"
         "dcl_texcoord0 t0\n",
+        /* shader 44: can't implicitely declare registers in vs */
+        "vs_2_0\n"
+        "dcl o0\n",
+        /* shader 45: can't implicitely declare samplers in vs */
+        "vs_3_0\n"
+        "dcl s2\n",
+        /* shader 46: no tx registers in ps_3_0 */
+        "ps_3_0\n"
+        "dcl t2\n",
     };
     HRESULT hr;
     unsigned int i;



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Matteo Bruni : d3dx9: Disallow sampler declarations where not
	supported.
Message-ID: <E1OMlSs-00021W-Kd@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5a5844d45864201d3be01055035f5fe4f7ae1310
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5a5844d45864201d3be01055035f5fe4f7ae1310

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Tue Jun  8 16:13:59 2010 +0200

d3dx9: Disallow sampler declarations where not supported.

---

 dlls/d3dx9_36/asmparser.c |   11 +++++++++--
 dlls/d3dx9_36/tests/asm.c |    3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c
index 528e6b3..4e7f018 100644
--- a/dlls/d3dx9_36/asmparser.c
+++ b/dlls/d3dx9_36/asmparser.c
@@ -178,6 +178,13 @@ static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype,
     }
 }
 
+static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, DWORD samptype,
+					      DWORD mod, DWORD regnum,
+					      unsigned int line_no) {
+    asmparser_message(This, "Line %u: Sampler declaration unsupported in this shader version\n", This->line_no);
+    set_parse_status(This, PARSE_ERR);
+}
+
 static void asmparser_sincos(struct asm_parser *This, DWORD mod, DWORD shift,
                              const struct shader_reg *dst,
                              const struct src_regs *srcs) {
@@ -779,7 +786,7 @@ static const struct asmparser_backend parser_vs_1 = {
 
     asmparser_dcl_output,
     asmparser_dcl_input,
-    asmparser_dcl_sampler,
+    asmparser_dcl_sampler_unsupported,
 
     asmparser_end,
 
@@ -799,7 +806,7 @@ static const struct asmparser_backend parser_vs_2 = {
 
     asmparser_dcl_output,
     asmparser_dcl_input,
-    asmparser_dcl_sampler,
+    asmparser_dcl_sampler_unsupported,
 
     asmparser_end,
 
diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c
index 6255d02..276a6e2 100644
--- a/dlls/d3dx9_36/tests/asm.c
+++ b/dlls/d3dx9_36/tests/asm.c
@@ -1374,6 +1374,9 @@ static void failure_test(void) {
         /* shader 46: no tx registers in ps_3_0 */
         "ps_3_0\n"
         "dcl t2\n",
+        /* shader 47: no samplers in vs_2_0 */
+        "vs_2_0\n"
+        "dcl_2d s2\n",
     };
     HRESULT hr;
     unsigned int i;



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Alexandre Julliard : wine.inf: Avoid creating empty registry values.
Message-ID: <E1OMlSs-00021o-Nj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 314171535cf6fa86511ca950831a4c0648fec08f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=314171535cf6fa86511ca950831a4c0648fec08f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 10 17:10:19 2010 +0200

wine.inf: Avoid creating empty registry values.

---

 tools/wine.inf.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index 8a1a871..b8f4a82 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -483,10 +483,10 @@ HKCU,%Desktop%,"LowPowerActive",,"0"
 HKCU,%Desktop%,"MenuShowDelay",2,"400"
 
 [DotNet]
-HKLM,Software\Microsoft\.NETFramework\policy\v1.0
-HKLM,Software\Microsoft\.NETFramework\policy\v1.1
-HKLM,Software\Microsoft\.NETFramework\policy\v2.0
-HKLM,Software\Microsoft\.NETFramework\policy\v3.0
+HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16
+HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16
+HKLM,Software\Microsoft\.NETFramework\policy\v2.0,,16
+HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16
 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1
 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1
 HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1



From julliard at winehq.org  Thu Jun 10 12:22:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 10 Jun 2010 12:22:50 -0500
Subject: Alexandre Julliard : include: Set the oleautomation attribute on XML
	interfaces so that they get registered properly .
Message-ID: <E1OMlSs-000224-PS@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7c520469362879e95da891fd52c06a74442c4c25
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7c520469362879e95da891fd52c06a74442c4c25

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 10 18:07:42 2010 +0200

include: Set the oleautomation attribute on XML interfaces so that they get registered properly.

---

 include/msxml2.idl |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 78 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c520469362879e95da891fd52c06a74442c4c25


From julliard at winehq.org  Fri Jun 11 09:58:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:32 -0500
Subject: Nikolay Sivov : msvcrt: Add _snprintf_s implementation.
Message-ID: <E1ON5gm-0002e6-0m@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 59bddde594a9bca91de4f09914c092c37efe6200
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=59bddde594a9bca91de4f09914c092c37efe6200

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Jun 10 23:12:20 2010 +0400

msvcrt: Add _snprintf_s implementation.

---

 dlls/msvcr100/msvcr100.spec |    2 +-
 dlls/msvcr80/msvcr80.spec   |    2 +-
 dlls/msvcr90/msvcr90.spec   |    2 +-
 dlls/msvcrt/msvcrt.spec     |    2 +-
 dlls/msvcrt/wcs.c           |   14 ++++++++++++++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 2117c05..e6524d6 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1044,7 +1044,7 @@
 @ stub _snprintf_c
 @ stub _snprintf_c_l
 @ stub _snprintf_l
-@ stub _snprintf_s
+@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s
 @ stub _snprintf_s_l
 @ stub _snscanf
 @ stub _snscanf_l
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 0249277..db65318 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -891,7 +891,7 @@
 @ stub _snprintf_c
 @ stub _snprintf_c_l
 @ stub _snprintf_l
-@ stub _snprintf_s
+@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s
 @ stub _snprintf_s_l
 @ stub _snscanf
 @ stub _snscanf_l
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 6592e7c..1da6e82 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -877,7 +877,7 @@
 @ stub _snprintf_c
 @ stub _snprintf_c_l
 @ stub _snprintf_l
-@ stub _snprintf_s
+@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s
 @ stub _snprintf_s_l
 @ stub _snscanf
 @ stub _snscanf_l
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 604a5ce..ff19519 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -830,7 +830,7 @@
 # stub _snprintf_c
 # stub _snprintf_c_l
 # stub _snprintf_l
-# stub _snprintf_s
+@ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s
 # stub _snprintf_s_l
 # stub _snscanf
 # stub _snscanf_l
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 78e42b2..9571928 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1103,6 +1103,20 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)
 }
 
 /*********************************************************************
+ *		_snprintf_s (MSVCRT.@)
+ */
+int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,
+    const char *format, ...)
+{
+    int retval;
+    __ms_va_list valist;
+    __ms_va_start(valist, format);
+    retval = MSVCRT_vsnprintf_s_l(str, len, count, format, NULL, valist);
+    __ms_va_end(valist);
+    return retval;
+}
+
+/*********************************************************************
  * vsnwprintf_internal (INTERNAL)
  */
 static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len,



From julliard at winehq.org  Fri Jun 11 09:58:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:32 -0500
Subject: Nikolay Sivov : msvcrt: Add _snwprintf_s implementation.
Message-ID: <E1ON5gm-0002eM-81@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1a234159fe1e5fc24a0035f43265f70672abd41f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1a234159fe1e5fc24a0035f43265f70672abd41f

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Jun 10 23:28:01 2010 +0400

msvcrt: Add _snwprintf_s implementation.

---

 dlls/msvcr100/msvcr100.spec |    2 +-
 dlls/msvcr80/msvcr80.spec   |    2 +-
 dlls/msvcr90/msvcr90.spec   |    2 +-
 dlls/msvcrt/msvcrt.spec     |    2 +-
 dlls/msvcrt/wcs.c           |   14 ++++++++++++++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index e6524d6..b0b8172 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1052,7 +1052,7 @@
 @ stub _snscanf_s_l
 @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf
 @ stub _snwprintf_l
-@ stub _snwprintf_s
+@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s
 @ stub _snwprintf_s_l
 @ stub _snwscanf
 @ stub _snwscanf_l
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index db65318..a8ba61e 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -899,7 +899,7 @@
 @ stub _snscanf_s_l
 @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf
 @ stub _snwprintf_l
-@ stub _snwprintf_s
+@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s
 @ stub _snwprintf_s_l
 @ stub _snwscanf
 @ stub _snwscanf_l
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 1da6e82..df65a5c 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -885,7 +885,7 @@
 @ stub _snscanf_s_l
 @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf
 @ stub _snwprintf_l
-@ stub _snwprintf_s
+@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s
 @ stub _snwprintf_s_l
 @ stub _snwscanf
 @ stub _snwscanf_l
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index ff19519..88a2ab9 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -838,7 +838,7 @@
 # stub _snscanf_s_l
 @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
 # stub _snwprintf_l
-# stub _snwprintf_s
+@ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s
 # stub _snwprintf_s_l
 # stub _snwscanf
 # stub _snwscanf_l
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 9571928..4485db3 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1205,6 +1205,20 @@ int CDECL MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT
 }
 
 /*********************************************************************
+ *		_snwprintf_s (MSVCRT.@)
+ */
+int CDECL MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned int count,
+    const MSVCRT_wchar_t *format, ...)
+{
+    int retval;
+    __ms_va_list valist;
+    __ms_va_start(valist, format);
+    retval = MSVCRT_vsnwprintf_s_l(str, len, count, format, NULL, valist);
+    __ms_va_end(valist);
+    return retval;
+}
+
+/*********************************************************************
  *		sprintf (MSVCRT.@)
  */
 int CDECL MSVCRT_sprintf( char *str, const char *format, ... )



From julliard at winehq.org  Fri Jun 11 09:58:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:32 -0500
Subject: Nikolay Sivov : msvcrt: Add _scwprintf implementation.
Message-ID: <E1ON5gm-0002ed-HS@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 97807760cad4bbbb06a072faa0c34b66ba952d55
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=97807760cad4bbbb06a072faa0c34b66ba952d55

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Jun 10 23:54:30 2010 +0400

msvcrt: Add _scwprintf implementation.

---

 dlls/msvcr100/msvcr100.spec |    2 +-
 dlls/msvcr80/msvcr80.spec   |    2 +-
 dlls/msvcr90/msvcr90.spec   |    2 +-
 dlls/msvcrt/msvcrt.spec     |    2 +-
 dlls/msvcrt/wcs.c           |   14 ++++++++++++++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index b0b8172..44c5b31 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1012,7 +1012,7 @@
 @ stub _scprintf_l
 @ stub _scprintf_p
 @ stub _scprintf_p_l
-@ stub _scwprintf
+@ varargs _scwprintf(wstr) msvcrt._scwprintf
 @ stub _scwprintf_l
 @ stub _scwprintf_p
 @ stub _scwprintf_p_l
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index a8ba61e..256031c 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -857,7 +857,7 @@
 @ stub _scprintf_l
 @ stub _scprintf_p
 @ stub _scprintf_p_l
-@ stub _scwprintf
+@ varargs _scwprintf(wstr) msvcrt._scwprintf
 @ stub _scwprintf_l
 @ stub _scwprintf_p
 @ stub _scwprintf_p_l
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index df65a5c..a2bed36 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -843,7 +843,7 @@
 @ stub _scprintf_l
 @ stub _scprintf_p
 @ stub _scprintf_p_l
-@ stub _scwprintf
+@ varargs _scwprintf(wstr) msvcrt._scwprintf
 @ stub _scwprintf_l
 @ stub _scwprintf_p
 @ stub _scwprintf_p_l
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 88a2ab9..bba06d6 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -801,7 +801,7 @@
 # stub _scprintf
 # stub _scprintf_l
 # stub _scprintf_p_l
-# stub _scwprintf
+@ varargs _scwprintf(wstr) MSVCRT__scwprintf
 # stub _scwprintf_l
 # stub _scwprintf_p_l
 @ cdecl _searchenv(str str ptr)
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 4485db3..03ecc7f 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1247,6 +1247,20 @@ int CDECL MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format, ..
 }
 
 /*********************************************************************
+ *		_scwprintf (MSVCRT.@)
+ */
+int CDECL MSVCRT__scwprintf( const MSVCRT_wchar_t *format, ... )
+{
+    __ms_va_list ap;
+    int r;
+
+    __ms_va_start( ap, format );
+    r = MSVCRT_vsnwprintf( NULL, INT_MAX, format, ap );
+    __ms_va_end( ap );
+    return r;
+}
+
+/*********************************************************************
  *		swprintf (MSVCRT.@)
  */
 int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ... )



From julliard at winehq.org  Fri Jun 11 09:58:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:32 -0500
Subject: Damjan Jovanovic : kernel32: CopyFile cannot overwrite a file with
	itself.
Message-ID: <E1ON5gm-0002eu-KF@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3f1404bf29676d79dd76ffd31e2630bb9f2b0b60
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3f1404bf29676d79dd76ffd31e2630bb9f2b0b60

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Thu Jun 10 22:14:13 2010 +0200

kernel32: CopyFile cannot overwrite a file with itself.

---

 dlls/kernel32/path.c       |    2 +-
 dlls/kernel32/tests/file.c |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index c319cb5..2bfd062 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -911,7 +911,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists )
         return FALSE;
     }
 
-    if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+    if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ, NULL,
                              fail_if_exists ? CREATE_NEW : CREATE_ALWAYS,
                              info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE)
     {
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index b6f066e..fcc7fc0 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -598,6 +598,10 @@ static void test_CopyFileA(void)
     ok( retok && ret == sizeof(prefix),
        "WriteFile error %d\n", GetLastError());
     ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n");
+    /* copying a file to itself must fail */
+    retok = CopyFileA(source, source, FALSE);
+    ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */),
+        "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError());
     /* get the file time and change it to prove the difference */
     ret = GetFileTime(hfile, NULL, NULL, &ft1);
     ok( ret, "GetFileTime error %d\n", GetLastError());
@@ -618,6 +622,14 @@ static void test_CopyFileA(void)
     ret = CopyFileA(source, dest, FALSE);
     ok(ret, "CopyFileA: error %d\n", GetLastError());
 
+    /* destination file is write-locked during copy */
+    hfile = CreateFileA(dest, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
+    ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError());
+    retok = CopyFileA(source, dest, FALSE);
+    ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION,
+        "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", ret, GetLastError());
+    CloseHandle(hfile);
+
     /* make sure that destination has correct size */
     hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");



From julliard at winehq.org  Fri Jun 11 09:58:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:32 -0500
Subject: Igor Paliychuk : kernel32: Update Ukrainian translations.
Message-ID: <E1ON5gm-0002fk-MF@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4801209c5c1a2eda950d1c89e53d9e907be79c63
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4801209c5c1a2eda950d1c89e53d9e907be79c63

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Thu Jun 10 19:05:34 2010 +0300

kernel32: Update Ukrainian translations.

---

 dlls/kernel32/nls/ukr.nls |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls
index 865fd2d..a32aac5 100644
--- a/dlls/kernel32/nls/ukr.nls
+++ b/dlls/kernel32/nls/ukr.nls
@@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
   LOCALE_S2359 ""
   LOCALE_SABBREVCTRYNAME "UKR"
   LOCALE_SABBREVDAYNAME1 "??"
-  LOCALE_SABBREVDAYNAME2 "??"
+  LOCALE_SABBREVDAYNAME2 "??"
   LOCALE_SABBREVDAYNAME3 "??"
   LOCALE_SABBREVDAYNAME4 "??"
   LOCALE_SABBREVDAYNAME5 "??"
@@ -82,7 +82,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
   LOCALE_SABBREVMONTHNAME9 "???"
   LOCALE_SABBREVMONTHNAME10 "???"
   LOCALE_SABBREVMONTHNAME11 "???"
-  LOCALE_SABBREVMONTHNAME12 "???"
+  LOCALE_SABBREVMONTHNAME12 "???"
   LOCALE_SABBREVMONTHNAME13 ""
   LOCALE_SCOUNTRY "Ukraine"
   LOCALE_SCURRENCY "???."
@@ -107,18 +107,18 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
   LOCALE_SLONGDATE "d MMMM yyyy' ?.'"
   LOCALE_SMONDECIMALSEP ","
   LOCALE_SMONGROUPING "3;0"
-  LOCALE_SMONTHNAME1 "??????"
-  LOCALE_SMONTHNAME2 "?????"
-  LOCALE_SMONTHNAME3 "????????"
-  LOCALE_SMONTHNAME4 "???????"
-  LOCALE_SMONTHNAME5 "???????"
-  LOCALE_SMONTHNAME6 "???????"
-  LOCALE_SMONTHNAME7 "??????"
-  LOCALE_SMONTHNAME8 "???????"
-  LOCALE_SMONTHNAME9 "????????"
-  LOCALE_SMONTHNAME10 "???????"
-  LOCALE_SMONTHNAME11 "????????"
-  LOCALE_SMONTHNAME12 "???????"
+  LOCALE_SMONTHNAME1 "??????\0?????"
+  LOCALE_SMONTHNAME2 "?????\0??????"
+  LOCALE_SMONTHNAME3 "????????\0???????"
+  LOCALE_SMONTHNAME4 "???????\0??????"
+  LOCALE_SMONTHNAME5 "???????\0??????"
+  LOCALE_SMONTHNAME6 "???????\0??????"
+  LOCALE_SMONTHNAME7 "??????\0?????"
+  LOCALE_SMONTHNAME8 "???????\0??????"
+  LOCALE_SMONTHNAME9 "????????\0???????"
+  LOCALE_SMONTHNAME10 "???????\0??????"
+  LOCALE_SMONTHNAME11 "????????\0?????????"
+  LOCALE_SMONTHNAME12 "???????\0??????"
   LOCALE_SMONTHNAME13 ""
   LOCALE_SMONTHOUSANDSEP "?"
   LOCALE_SNAME "uk-UA"



From julliard at winehq.org  Fri Jun 11 09:58:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:32 -0500
Subject: Nikolay Sivov : msvcrt: Fix __lconv_init() prototype.
Message-ID: <E1ON5gm-0002g1-Op@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 90013af6f932d7553290f1eb42490ec7f4d94f46
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=90013af6f932d7553290f1eb42490ec7f4d94f46

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Jun 11 03:57:53 2010 +0400

msvcrt: Fix __lconv_init() prototype.

---

 dlls/msvcr90/msvcr90.c |    1 +
 dlls/msvcrt/locale.c   |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c
index 43a1834..0d7d101 100644
--- a/dlls/msvcr90/msvcr90.c
+++ b/dlls/msvcr90/msvcr90.c
@@ -93,6 +93,7 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end)
 
     while (!res && table < end) {
         if (*table) {
+            TRACE("calling %p\n", **table);
             res = (**table)();
             if (res)
                 TRACE("function %p failed: 0x%x\n", *table, res);
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index a347962..5a27de0 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -541,10 +541,11 @@ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void)
 /*********************************************************************
  *		__lconv_init (MSVCRT.@)
  */
-void CDECL __lconv_init(void)
+int CDECL __lconv_init(void)
 {
     /* this is used to make chars unsigned */
     charmax = 255;
+    return 0;
 }
 
 /*********************************************************************



From julliard at winehq.org  Fri Jun 11 09:58:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:32 -0500
Subject: Dylan Smith : wordpad: Native RegisterClassExW requires cbSize to be
	set.
Message-ID: <E1ON5gm-0002gH-QX@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d10ce5df2654dc483d7bc44554e062562a220fa9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d10ce5df2654dc483d7bc44554e062562a220fa9

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Fri Jun 11 00:43:44 2010 -0400

wordpad: Native RegisterClassExW requires cbSize to be set.

---

 programs/wordpad/wordpad.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index c90e7b5..0bf5d0c 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -2671,6 +2671,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar
 
     hAccel = LoadAcceleratorsW(hInstance, wszAccelTable);
 
+    wc.cbSize = sizeof(wc);
     wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.lpfnWndProc = WndProc;
     wc.cbClsExtra = 0;



From julliard at winehq.org  Fri Jun 11 09:58:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:32 -0500
Subject: Dylan Smith : wordpad: Provide buffer for replace with text.
Message-ID: <E1ON5gm-0002gY-UD@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 975dd904ef8c1ddf6c08ebe465cc382c073dd1a0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=975dd904ef8c1ddf6c08ebe465cc382c073dd1a0

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Fri Jun 11 00:44:16 2010 -0400

wordpad: Provide buffer for replace with text.

---

 programs/wordpad/wordpad.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 0bf5d0c..3b8b6bc 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -1302,6 +1302,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr)
 static void dialog_find(LPFINDREPLACEW fr, BOOL replace)
 {
     static WCHAR findBuffer[MAX_STRING_LEN];
+    static WCHAR replaceBuffer[MAX_STRING_LEN];
 
     /* Allow only one search/replace dialog to open */
     if(hFindWnd != NULL)
@@ -1315,8 +1316,10 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace)
     fr->hwndOwner = hMainWnd;
     fr->Flags = FR_HIDEUPDOWN;
     fr->lpstrFindWhat = findBuffer;
+    fr->lpstrReplaceWith = replaceBuffer;
     fr->lCustData = -1;
-    fr->wFindWhatLen = MAX_STRING_LEN*sizeof(WCHAR);
+    fr->wFindWhatLen = sizeof(findBuffer);
+    fr->wReplaceWithLen = sizeof(replaceBuffer);
 
     if(replace)
         hFindWnd = ReplaceTextW(fr);



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: Louis Lenders : xinput1_3: Quiet a noisy fixme.
Message-ID: <E1ON5gn-0002gw-2Z@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ba1659762ee1d4dfec3c9b4909699befc29e98b6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ba1659762ee1d4dfec3c9b4909699befc29e98b6

Author: Louis Lenders <xerox_xerox2000 at yahoo.co.uk>
Date:   Fri May 28 20:44:51 2010 +0200

xinput1_3: Quiet a noisy fixme.

---

 dlls/xinput1_3/xinput1_3_main.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c
index fc55cef..6d6399f 100644
--- a/dlls/xinput1_3/xinput1_3_main.c
+++ b/dlls/xinput1_3/xinput1_3_main.c
@@ -93,7 +93,10 @@ DWORD WINAPI XInputGetKeystroke(DWORD dwUserIndex, DWORD dwReserve, PXINPUT_KEYS
 
 DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities)
 {
-    FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities);
+    static int warn_once;
+
+    if (!warn_once++)
+        FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities);
 
     if (dwUserIndex < XUSER_MAX_COUNT)
     {



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: Andrew Nguyen : configure: Avoid breaking compilation if
	AC_PACKAGE_URL is unavailable when regenerating with older autoconf .
Message-ID: <E1ON5gn-0002hC-4y@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dd12cf71100c9ab98439834ac2c54fb0483a2376
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dd12cf71100c9ab98439834ac2c54fb0483a2376

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Fri Jun 11 03:20:38 2010 -0500

configure: Avoid breaking compilation if AC_PACKAGE_URL is unavailable when regenerating with older autoconf.

---

 configure.ac |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 21c0203..eed1487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,10 @@ m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF],
   [AS_IF([test "x$$1" = x""$2], [$3], [$4])],
   [eval as_val=\$$1
    AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl
+dnl autoconf versions before 2.64 don't have AC_PACKAGE_URL
+m4_ifdef([AC_PACKAGE_URL],,
+  [AC_DEFINE([PACKAGE_URL], ["http://www.winehq.org"], [Define to the home page for this package.])
+   AC_SUBST([PACKAGE_URL], ["http://www.winehq.org"])])dnl
 
 dnl **** Command-line arguments ****
 



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: Andrew Nguyen : winealsa.drv: Replicate the snd_pcm_recover alsa-lib
	implementation to cope with older alsa-lib versions .
Message-ID: <E1ON5gn-0002hU-8V@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 13a7708abb481f2903db6b62efcf53a0a7f7b79e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=13a7708abb481f2903db6b62efcf53a0a7f7b79e

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Fri Jun 11 03:54:24 2010 -0500

winealsa.drv: Replicate the snd_pcm_recover alsa-lib implementation to cope with older alsa-lib versions.

---

 dlls/winealsa.drv/alsa.c     |   45 +++++++++++++++++++++++++++++------------
 dlls/winealsa.drv/alsa.h     |    2 +-
 dlls/winealsa.drv/dsoutput.c |    2 +-
 dlls/winealsa.drv/waveout.c  |    4 +-
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 9eb50cd..4f0f1ce 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -2,6 +2,7 @@
  * Wine Driver for ALSA
  *
  * Copyright	2002 Eric Pouech
+ * Copyright	2006 Jaroslav Kysela
  * Copyright	2007 Maarten Lankhorst
  *
  * This file has a few shared generic subroutines shared among the alsa
@@ -556,24 +557,42 @@ out:
 
 
 /**************************************************************************
- * 			ALSA_XRUNRecovery		[internal]
+ * 			wine_snd_pcm_recover		[internal]
  *
- * used to recovery from XRUN errors (buffer underflow/overflow)
+ * Code slightly modified from alsa-lib v1.0.23 snd_pcm_recover implementation.
+ * used to recover from XRUN errors (buffer underflow/overflow)
  */
-int ALSA_XRUNRecovery(WINE_WAVEDEV * wwo, int err)
+int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent)
 {
-    if (err == -EPIPE) {    /* under-run */
-        err = snd_pcm_prepare(wwo->pcm);
-        if (err < 0)
-             ERR( "underrun recovery failed. prepare failed: %s\n", snd_strerror(err));
+    if (err > 0)
+        err = -err;
+    if (err == -EINTR)	/* nothing to do, continue */
         return 0;
-    } else if (err == -ESTRPIPE) {
-        while ((err = snd_pcm_resume(wwo->pcm)) == -EAGAIN)
-            sleep(1);       /* wait until the suspend flag is released */
+    if (err == -EPIPE) {
+        const char *s;
+        if (snd_pcm_stream(pcm) == SND_PCM_STREAM_PLAYBACK)
+            s = "underrun";
+        else
+            s = "overrun";
+        if (!silent)
+            ERR("%s occurred", s);
+        err = snd_pcm_prepare(pcm);
+        if (err < 0) {
+            ERR("cannot recover from %s, prepare failed: %s", s, snd_strerror(err));
+            return err;
+        }
+        return 0;
+    }
+    if (err == -ESTRPIPE) {
+        while ((err = snd_pcm_resume(pcm)) == -EAGAIN)
+            /* wait until suspend flag is released */
+            poll(NULL, 0, 1000);
         if (err < 0) {
-            err = snd_pcm_prepare(wwo->pcm);
-            if (err < 0)
-                ERR("recovery from suspend failed, prepare failed: %s\n", snd_strerror(err));
+            err = snd_pcm_prepare(pcm);
+            if (err < 0) {
+                ERR("cannot recover from suspend, prepare failed: %s", snd_strerror(err));
+                return err;
+            }
         }
         return 0;
     }
diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h
index 7c2f0f4..d961dce 100644
--- a/dlls/winealsa.drv/alsa.h
+++ b/dlls/winealsa.drv/alsa.h
@@ -187,7 +187,7 @@ const char * ALSA_getFormat(WORD wFormatTag);
 BOOL	ALSA_NearMatch(int rate1, int rate2);
 DWORD	ALSA_bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format);
 void	ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * sw, int full);
-int	ALSA_XRUNRecovery(WINE_WAVEDEV * wwo, int err);
+int	wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent);
 void	ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2);
 BOOL	ALSA_supportedFormat(LPWAVEFORMATEX wf);
 
diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c
index bb81621..8a277de 100644
--- a/dlls/winealsa.drv/dsoutput.c
+++ b/dlls/winealsa.drv/dsoutput.c
@@ -406,7 +406,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface,
             if (ret == -EPIPE)
             {
                 WARN("Underrun occurred\n");
-                snd_pcm_recover(This->pcm, -EPIPE, 1);
+                wine_snd_pcm_recover(This->pcm, -EPIPE, 1);
                 ret = snd_pcm_writei(This->pcm, pvAudio1, writelen);
 
                 /* Advance mmap pointer a little to make dsound notice the underrun and respond to it */
diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index 4001f26..18693c1 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -110,7 +110,7 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps)
     if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED)
     {
         WARN("Unexpected state (%d) while updating Total Played, resetting\n", state);
-        snd_pcm_recover(wwo->pcm, -EPIPE, 0);
+        wine_snd_pcm_recover(wwo->pcm, -EPIPE, 0);
         delay=0;
     }
 
@@ -244,7 +244,7 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEDEV* wwo, DWORD* frames)
 	written = (wwo->write)(wwo->pcm, lpWaveHdr->lpData + wwo->dwPartialOffset, toWrite);
 	if ( written < 0) {
 	    /* XRUN occurred. let's try to recover */
-	    ALSA_XRUNRecovery(wwo, written);
+	    wine_snd_pcm_recover(wwo->pcm, written, 0);
 	    written = (wwo->write)(wwo->pcm, lpWaveHdr->lpData + wwo->dwPartialOffset, toWrite);
 	}
 	if (written <= 0) {



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: Octavian Voicu : ntdll: Show one-time ERR if NOFILE limit is reached.
Message-ID: <E1ON5gn-0002hx-DD@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0d8e7983c14cd0c8f0672dfd16b5a452ded7849e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0d8e7983c14cd0c8f0672dfd16b5a452ded7849e

Author: Octavian Voicu <octavian.voicu at gmail.com>
Date:   Fri Jun 11 12:13:17 2010 +0300

ntdll: Show one-time ERR if NOFILE limit is reached.

---

 dlls/ntdll/file.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index b5d1c14..30b93aa 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -87,6 +87,7 @@
 #include "ddk/ntddser.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
+WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
 mode_t FILE_umask = 0;
 
@@ -203,6 +204,11 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT
             break;
         }
     }
+    else if (io->u.Status == STATUS_TOO_MANY_OPENED_FILES)
+    {
+        static int once;
+        if (!once++) ERR_(winediag)( "Too many open files, ulimit -n probably needs to be increased\n" );
+    }
 
     return io->u.Status;
 }



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: Dmitry Timoshkov : server: Make layered windows transparent for mouse
	messages.
Message-ID: <E1ON5gn-0002iF-Ib@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 66e981ec8d31efd13932f37ac7da0ceebb677e6a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=66e981ec8d31efd13932f37ac7da0ceebb677e6a

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Fri Jun 11 19:20:41 2010 +0900

server: Make layered windows transparent for mouse messages.

---

 server/queue.c  |    2 +-
 server/user.h   |    1 +
 server/window.c |    7 +++++++
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/server/queue.c b/server/queue.c
index 755d3c1..ae11901 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1252,7 +1252,7 @@ static user_handle_t find_hardware_message_window( struct thread_input *input, s
     {
         if (!input || !(win = input->capture))
         {
-            if (!(win = msg->win) || !is_window_visible( win ))
+            if (!(win = msg->win) || !is_window_visible( win ) || is_window_transparent( win ))
             {
                 if (input) win = window_from_point( input->desktop, data->x, data->y );
             }
diff --git a/server/user.h b/server/user.h
index e9ad116..1f0d909 100644
--- a/server/user.h
+++ b/server/user.h
@@ -135,6 +135,7 @@ extern void destroy_thread_windows( struct thread *thread );
 extern int is_child_window( user_handle_t parent, user_handle_t child );
 extern int is_top_level_window( user_handle_t window );
 extern int is_window_visible( user_handle_t window );
+extern int is_window_transparent( user_handle_t window );
 extern int make_window_active( user_handle_t window );
 extern struct thread *get_window_thread( user_handle_t handle );
 extern user_handle_t window_from_point( struct desktop *desktop, int x, int y );
diff --git a/server/window.c b/server/window.c
index 5fd6f71..3b912b0 100644
--- a/server/window.c
+++ b/server/window.c
@@ -602,6 +602,13 @@ int is_window_visible( user_handle_t window )
     return is_visible( win );
 }
 
+int is_window_transparent( user_handle_t window )
+{
+    struct window *win = get_user_object( window, USER_WINDOW );
+    if (!win) return 0;
+    return (win->ex_style & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == (WS_EX_LAYERED|WS_EX_TRANSPARENT);
+}
+
 /* check if point is inside the window */
 static inline int is_point_in_window( struct window *win, int x, int y )
 {



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: David Hedberg : include: Add PIDLIST_ABSOLUTE typedef.
Message-ID: <E1ON5gn-0002iW-K4@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4a47033a864436bd07189ec9daa9789589fb2185
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4a47033a864436bd07189ec9daa9789589fb2185

Author: David Hedberg <david.hedberg at gmail.com>
Date:   Fri Jun 11 13:19:49 2010 +0200

include: Add PIDLIST_ABSOLUTE typedef.

---

 include/shtypes.idl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/shtypes.idl b/include/shtypes.idl
index 5ed8daf..41aa236 100644
--- a/include/shtypes.idl
+++ b/include/shtypes.idl
@@ -39,6 +39,7 @@ typedef const PITEMID_CHILD PCITEMID_CHILD;
 typedef LPCITEMIDLIST PCUITEMID_CHILD;
 typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY;
 typedef LPCITEMIDLIST PCUIDLIST_RELATIVE;
+typedef LPITEMIDLIST PIDLIST_ABSOLUTE;
 typedef LPCITEMIDLIST PCIDLIST_ABSOLUTE;
 cpp_quote("#include <poppack.h>")
 



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: David Hedberg : include: Add extended treeview style (TVS_EX_)
	definitions.
Message-ID: <E1ON5gn-0002ip-P9@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 341daad86152a36dcfa473c6979f99f947d11ad3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=341daad86152a36dcfa473c6979f99f947d11ad3

Author: David Hedberg <david.hedberg at gmail.com>
Date:   Fri Jun 11 13:19:50 2010 +0200

include: Add extended treeview style (TVS_EX_) definitions.

---

 include/commctrl.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/commctrl.h b/include/commctrl.h
index 27bd745..56f0029 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -2463,6 +2463,16 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s',
 #define TVS_SHAREDIMAGELISTS  0x0000
 #define TVS_PRIVATEIMAGELISTS 0x0400
 
+#define TVS_EX_MULTISELECT         0x0002
+#define TVS_EX_DOUBLEBUFFER        0x0004
+#define TVS_EX_NOINDENTSTATE       0x0008
+#define TVS_EX_RICHTOOLTIP         0x0010
+#define TVS_EX_AUTOHSCROLL         0x0020
+#define TVS_EX_FADEINOUTEXPANDOS   0x0040
+#define TVS_EX_PARTIALCHECKBOXES   0x0080
+#define TVS_EX_EXCLUSIONCHECKBOXES 0x0100
+#define TVS_EX_DIMMEDCHECKBOXES    0x0200
+#define TVS_EX_DRAWIMAGEASYNC      0x0400
 
 #define TVE_COLLAPSE          0x0001
 #define TVE_EXPAND            0x0002



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: Hans Leidekker : msi: Compare file versions as numbers instead of
	strings.
Message-ID: <E1ON5gn-0002j5-Sl@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 15f5b9dca3cbb1d97d65fa7ef02887846ca71915
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=15f5b9dca3cbb1d97d65fa7ef02887846ca71915

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Fri Jun 11 15:19:15 2010 +0200

msi: Compare file versions as numbers instead of strings.

---

 dlls/msi/action.c    |   55 +++++++++++++++++++++++++++----------------------
 dlls/msi/appsearch.c |    6 ++--
 dlls/msi/files.c     |   35 ++++++++++--------------------
 dlls/msi/msipriv.h   |    5 ++++
 4 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 48948fb..7ae8286 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1964,16 +1964,12 @@ static UINT ITERATE_CostFinalizeConditions(MSIRECORD *row, LPVOID param)
     return ERROR_SUCCESS;
 }
 
-static LPWSTR get_disk_file_version( LPCWSTR filename )
+VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename )
 {
-    static const WCHAR name_fmt[] =
-        {'%','u','.','%','u','.','%','u','.','%','u',0};
     static const WCHAR name[] = {'\\',0};
-    VS_FIXEDFILEINFO *lpVer;
-    WCHAR filever[0x100];
+    VS_FIXEDFILEINFO *ret;
     LPVOID version;
-    DWORD versize;
-    DWORD handle;
+    DWORD versize, handle;
     UINT sz;
 
     TRACE("%s\n", debugstr_w(filename));
@@ -1983,23 +1979,32 @@ static LPWSTR get_disk_file_version( LPCWSTR filename )
         return NULL;
 
     version = msi_alloc( versize );
+    if (!version)
+        return NULL;
+
     GetFileVersionInfoW( filename, 0, versize, version );
 
-    if (!VerQueryValueW( version, name, (LPVOID*)&lpVer, &sz ))
+    if (!VerQueryValueW( version, name, (LPVOID *)&ret, &sz ))
     {
         msi_free( version );
         return NULL;
     }
 
-    sprintfW( filever, name_fmt,
-        HIWORD(lpVer->dwFileVersionMS),
-        LOWORD(lpVer->dwFileVersionMS),
-        HIWORD(lpVer->dwFileVersionLS),
-        LOWORD(lpVer->dwFileVersionLS));
-
     msi_free( version );
+    return ret;
+}
 
-    return strdupW( filever );
+int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version )
+{
+    DWORD ms, ls;
+
+    msi_parse_version_string( version, &ms, &ls );
+
+    if (fi->dwFileVersionMS > ms) return 1;
+    else if (fi->dwFileVersionMS < ms) return -1;
+    else if (fi->dwFileVersionLS > ls) return 1;
+    else if (fi->dwFileVersionLS < ls) return -1;
+    return 0;
 }
 
 static DWORD get_disk_file_size( LPCWSTR filename )
@@ -2033,7 +2038,7 @@ static BOOL hash_matches( MSIFILE *file )
 
 static UINT set_file_install_states( MSIPACKAGE *package )
 {
-    LPWSTR file_version;
+    VS_FIXEDFILEINFO *file_version;
     MSIFILE *file;
 
     LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
@@ -2050,18 +2055,14 @@ static UINT set_file_install_states( MSIPACKAGE *package )
 
         /* calculate target */
         p = resolve_folder(package, comp->Directory, FALSE, FALSE, TRUE, NULL);
-
         msi_free(file->TargetPath);
 
-        TRACE("file %s is named %s\n",
-               debugstr_w(file->File), debugstr_w(file->FileName));
+        TRACE("file %s is named %s\n", debugstr_w(file->File), debugstr_w(file->FileName));
 
         file->TargetPath = build_directory_name(2, p, file->FileName);
-
         msi_free(p);
 
-        TRACE("file %s resolves to %s\n",
-               debugstr_w(file->File), debugstr_w(file->TargetPath));
+        TRACE("file %s resolves to %s\n", debugstr_w(file->File), debugstr_w(file->TargetPath));
 
         if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES)
         {
@@ -2069,11 +2070,15 @@ static UINT set_file_install_states( MSIPACKAGE *package )
             comp->Cost += file->FileSize;
             continue;
         }
-        if (file->Version && (file_version = get_disk_file_version( file->TargetPath )))
+        if (file->Version && (file_version = msi_get_disk_file_version( file->TargetPath )))
         {
-            TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(file_version));
+            TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version),
+                  HIWORD(file_version->dwFileVersionMS),
+                  LOWORD(file_version->dwFileVersionMS),
+                  HIWORD(file_version->dwFileVersionLS),
+                  LOWORD(file_version->dwFileVersionLS));
 
-            if (strcmpiW(file_version, file->Version) < 0)
+            if (msi_compare_file_versions( file_version, file->Version ) < 0)
             {
                 file->state = msifs_overwrite;
                 comp->Cost += file->FileSize;
diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index 336bfca..34130b6 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -50,7 +50,7 @@ typedef struct tagMSISIGNATURE
     LPWSTR   Languages;
 }MSISIGNATURE;
 
-static void ACTION_VerStrToInteger(LPCWSTR verStr, PDWORD ms, PDWORD ls)
+void msi_parse_version_string(LPCWSTR verStr, PDWORD ms, PDWORD ls)
 {
     const WCHAR *ptr;
     int x1 = 0, x2 = 0, x3 = 0, x4 = 0;
@@ -109,13 +109,13 @@ static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig,
     minVersion = msi_dup_record_field(row,3);
     if (minVersion)
     {
-        ACTION_VerStrToInteger(minVersion, &sig->MinVersionMS, &sig->MinVersionLS);
+        msi_parse_version_string( minVersion, &sig->MinVersionMS, &sig->MinVersionLS );
         msi_free( minVersion );
     }
     maxVersion = msi_dup_record_field(row,4);
     if (maxVersion)
     {
-        ACTION_VerStrToInteger(maxVersion, &sig->MaxVersionMS, &sig->MaxVersionLS);
+        msi_parse_version_string( maxVersion, &sig->MaxVersionMS, &sig->MaxVersionLS );
         msi_free( maxVersion );
     }
     sig->MinSize = MSI_RecordGetInteger(row,5);
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index f21cd28..79d7814 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -60,24 +60,6 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac
     ui_progress( package, 2, f->FileSize, 0, 0 );
 }
 
-/* compares the version of a file read from the filesystem and
- * the version specified in the File table
- */
-static int msi_compare_file_version(MSIFILE *file)
-{
-    WCHAR version[MAX_PATH];
-    DWORD size;
-    UINT r;
-
-    size = MAX_PATH;
-    version[0] = '\0';
-    r = MsiGetFileVersionW(file->TargetPath, version, &size, NULL, NULL);
-    if (r != ERROR_SUCCESS)
-        return 0;
-
-    return lstrcmpW(version, file->Version);
-}
-
 static void schedule_install_files(MSIPACKAGE *package)
 {
     MSIFILE *file;
@@ -981,6 +963,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
     {
         MSIRECORD *uirow;
         LPWSTR dir, p;
+        VS_FIXEDFILEINFO *ver;
 
         if ( file->state == msifs_installed )
             ERR("removing installed file %s\n", debugstr_w(file->TargetPath));
@@ -989,11 +972,17 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
              file->Component->Installed == INSTALLSTATE_SOURCE )
             continue;
 
-        /* don't remove a file if the old file
-         * is strictly newer than the version to be installed
-         */
-        if ( msi_compare_file_version( file ) < 0 )
-            continue;
+        if (file->Version)
+        {
+            ver = msi_get_disk_file_version( file->TargetPath );
+            if (ver && msi_compare_file_versions( ver, file->Version ) > 0)
+            {
+                TRACE("newer version detected, not removing file\n");
+                msi_free( ver );
+                continue;
+            }
+            msi_free( ver );
+        }
 
         TRACE("removing %s\n", debugstr_w(file->File) );
         if (!DeleteFileW( file->TargetPath ))
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 819d8bc..9f029f3 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -32,6 +32,7 @@
 #include "objbase.h"
 #include "objidl.h"
 #include "winnls.h"
+#include "winver.h"
 #include "wine/list.h"
 #include "wine/debug.h"
 
@@ -811,6 +812,10 @@ extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name );
 extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val);
 
 extern DWORD msi_version_str_to_dword(LPCWSTR p);
+extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD);
+extern VS_FIXEDFILEINFO *msi_get_disk_file_version(LPCWSTR);
+extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *);
+
 
 extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value );
 extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value );



From julliard at winehq.org  Fri Jun 11 09:58:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:33 -0500
Subject: Hans Leidekker : msi: Disable an optimization in the execution of
	WHERE clauses.
Message-ID: <E1ON5gn-0002jM-Ul@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 73774b3ef8b4f5af226b1c7dd929aeec85688894
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=73774b3ef8b4f5af226b1c7dd929aeec85688894

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Fri Jun 11 15:19:46 2010 +0200

msi: Disable an optimization in the execution of WHERE clauses.

There's no guarantee that the condition strings are in the string table.

---

 dlls/msi/tests/db.c |    2 +-
 dlls/msi/where.c    |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 56fa0f0..5e8505a 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -1933,7 +1933,7 @@ static void test_where(void)
     rec = 0;
     query = "SELECT * FROM `Media` WHERE `DiskPrompt` <> 'Cabinet'";
     r = do_query(hdb, query, &rec);
-    todo_wine ok( r == ERROR_SUCCESS, "query failed: %d\n", r );
+    ok( r == ERROR_SUCCESS, "query failed: %d\n", r );
     MsiCloseHandle( rec );
 
     rec = 0;
diff --git a/dlls/msi/where.c b/dlls/msi/where.c
index 545d6a8..4c4db49 100644
--- a/dlls/msi/where.c
+++ b/dlls/msi/where.c
@@ -397,6 +397,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
         return ERROR_OUTOFMEMORY;
 
     wv->row_count = 0;
+
+if (0) /* disable optimization, there's no guarantee that strings are in the string table */
+{
     if (wv->cond->type == EXPR_STRCMP)
     {
         MSIITERHANDLE handle = NULL;
@@ -441,6 +444,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
         }
         /* else fallback to slow case */
     }
+}
 
     for( i=0; i<count; i++ )
     {



From julliard at winehq.org  Fri Jun 11 09:58:34 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:34 -0500
Subject: Hans Leidekker : msi: Update an existing record even if the low bit
	in the transform mask is set .
Message-ID: <E1ON5go-0002jf-2O@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6b1a1579f6ea53d3c18faaedb2f1d94222c9fccf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6b1a1579f6ea53d3c18faaedb2f1d94222c9fccf

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Fri Jun 11 15:20:12 2010 +0200

msi: Update an existing record even if the low bit in the transform mask is set.

---

 dlls/msi/table.c       |   95 ++++++++++++++++++++++++++----------------------
 dlls/msi/tests/patch.c |    2 +-
 2 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index 3b117ae..72d1f21 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -2742,63 +2742,72 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg,
         rec = msi_get_transform_record( tv, st, stg, &rawdata[n], bytes_per_strref );
         if (rec)
         {
-            if ( mask & 1 )
-            {
-                WCHAR table[32];
-                DWORD sz = 32;
-                UINT number = MSI_NULL_INTEGER;
-
-                TRACE("inserting record\n");
+            WCHAR table[32];
+            DWORD sz = 32;
+            UINT number = MSI_NULL_INTEGER;
+            UINT row = 0;
 
-                if (!lstrcmpW(name, szColumns))
+            if (!lstrcmpW( name, szColumns ))
+            {
+                MSI_RecordGetStringW( rec, 1, table, &sz );
+                number = MSI_RecordGetInteger( rec, 2 );
+
+                /*
+                 * Native msi seems writes nul into the Number (2nd) column of
+                 * the _Columns table, only when the columns are from a new table
+                 */
+                if ( number == MSI_NULL_INTEGER )
                 {
-                    MSI_RecordGetStringW( rec, 1, table, &sz );
-                    number = MSI_RecordGetInteger( rec, 2 );
-
-                    /*
-                     * Native msi seems writes nul into the Number (2nd) column of
-                     * the _Columns table, only when the columns are from a new table
-                     */
-                    if ( number == MSI_NULL_INTEGER )
+                    /* reset the column number on a new table */
+                    if (lstrcmpW( coltable, table ))
                     {
-                        /* reset the column number on a new table */
-                        if ( lstrcmpW(coltable, table) )
-                        {
-                            colcol = 0;
-                            lstrcpyW( coltable, table );
-                        }
-
-                        /* fix nul column numbers */
-                        MSI_RecordSetInteger( rec, 2, ++colcol );
+                        colcol = 0;
+                        lstrcpyW( coltable, table );
                     }
+
+                    /* fix nul column numbers */
+                    MSI_RecordSetInteger( rec, 2, ++colcol );
                 }
+            }
 
-                r = TABLE_insert_row( &tv->view, rec, -1, FALSE );
-                if (r != ERROR_SUCCESS)
-                    WARN("insert row failed\n");
+            if (TRACE_ON(msidb)) dump_record( rec );
 
-                if ( number != MSI_NULL_INTEGER && !lstrcmpW(name, szColumns) )
-                    msi_update_table_columns( db, table );
-            }
-            else
+            r = msi_table_find_row( tv, rec, &row );
+            if (r == ERROR_SUCCESS)
             {
-                UINT row = 0;
-
-                r = msi_table_find_row( tv, rec, &row );
-                if (r != ERROR_SUCCESS)
-                    WARN("no matching row to transform\n");
-                else if ( mask )
+                if (!mask)
                 {
-                    TRACE("modifying row [%d]:\n", row);
-                    TABLE_set_row( &tv->view, row, rec, mask );
+                    TRACE("deleting row [%d]:\n", row);
+                    r = TABLE_delete_row( &tv->view, row );
+                    if (r != ERROR_SUCCESS)
+                        WARN("failed to delete row %u\n", r);
+                }
+                else if (mask & 1)
+                {
+                    TRACE("modifying full row [%d]:\n", row);
+                    r = TABLE_set_row( &tv->view, row, rec, (1 << tv->num_cols) - 1 );
+                    if (r != ERROR_SUCCESS)
+                        WARN("failed to modify row %u\n", r);
                 }
                 else
                 {
-                    TRACE("deleting row [%d]:\n", row);
-                    TABLE_delete_row( &tv->view, row );
+                    TRACE("modifying masked row [%d]:\n", row);
+                    r = TABLE_set_row( &tv->view, row, rec, mask );
+                    if (r != ERROR_SUCCESS)
+                        WARN("failed to modify row %u\n", r);
                 }
             }
-            if( TRACE_ON(msidb) ) dump_record( rec );
+            else
+            {
+                TRACE("inserting row\n");
+                r = TABLE_insert_row( &tv->view, rec, -1, FALSE );
+                if (r != ERROR_SUCCESS)
+                    WARN("failed to insert row %u\n", r);
+            }
+
+            if (number != MSI_NULL_INTEGER && !lstrcmpW( name, szColumns ))
+                msi_update_table_columns( db, table );
+
             msiobj_release( &rec->hdr );
         }
 
diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c
index 4de2fd0..3a35e35 100644
--- a/dlls/msi/tests/patch.c
+++ b/dlls/msi/tests/patch.c
@@ -794,7 +794,7 @@ static void test_simple_patch( void )
     ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );
 
     r = MsiViewFetch( hview, &hrec );
-    todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );
+    ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );
 
     MsiCloseHandle( hrec );
     MsiViewClose( hview );



From julliard at winehq.org  Fri Jun 11 09:58:34 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:34 -0500
Subject: Hans Leidekker : msi: Implement MsiGetFeatureCostA/W.
Message-ID: <E1ON5go-0002jw-6L@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 67f15e7149e9c25c8098831e45a29c983d3e15bb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=67f15e7149e9c25c8098831e45a29c983d3e15bb

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Fri Jun 11 15:20:46 2010 +0200

msi: Implement MsiGetFeatureCostA/W.

---

 dlls/msi/install.c |   63 +++++++++++++++++++++++++++++++++++++++++++++++-----
 dlls/msi/msipriv.h |    1 -
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index fda49b9..fa3e4f9 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -993,13 +993,64 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature,
     return rc;
 }
 
-UINT MSI_GetFeatureCost(MSIPACKAGE *package, MSIFEATURE *feature,
-                        MSICOSTTREE iCostTree, INSTALLSTATE iState,
-                        LPINT piCost)
+static INT feature_cost( MSIFEATURE *feature )
 {
-    FIXME("(%s %i %i %p): not implemented yet\n",
-        debugstr_w(feature->Feature), iCostTree, iState, piCost);
-    if (piCost) *piCost = 0;
+    INT cost = 0;
+    MSICOMPONENT *comp;
+
+    LIST_FOR_EACH_ENTRY( comp, &feature->Components, MSICOMPONENT, entry )
+    {
+        cost += comp->Cost;
+    }
+    return cost;
+}
+
+UINT MSI_GetFeatureCost( MSIPACKAGE *package, MSIFEATURE *feature, MSICOSTTREE tree,
+                         INSTALLSTATE state, LPINT cost )
+{
+    TRACE("%s, %u, %d, %p\n", debugstr_w(feature->Feature), tree, state, cost);
+
+    *cost = 0;
+    switch (tree)
+    {
+    case MSICOSTTREE_CHILDREN:
+    {
+        MSIFEATURE *child;
+
+        LIST_FOR_EACH_ENTRY( child, &feature->Children, MSIFEATURE, entry )
+        {
+            if (child->ActionRequest == state)
+                *cost += feature_cost( child );
+        }
+        break;
+    }
+    case MSICOSTTREE_PARENTS:
+    {
+        const WCHAR *feature_parent = feature->Feature_Parent;
+        for (;;)
+        {
+            MSIFEATURE *parent = get_loaded_feature( package, feature_parent );
+            if (!parent)
+                break;
+
+            if (parent->ActionRequest == state)
+                *cost += feature_cost( parent );
+
+            feature_parent = parent->Feature_Parent;
+        }
+        break;
+    }
+    case MSICOSTTREE_SELFONLY:
+        if (feature->ActionRequest == state)
+            *cost = feature_cost( feature );
+        break;
+
+    default:
+        WARN("unhandled cost tree %u\n", tree);
+        break;
+    }
+
+    *cost /= 512;
     return ERROR_SUCCESS;
 }
 
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 9f029f3..d1e8113 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -381,7 +381,6 @@ typedef struct tagMSIFEATURE
     INSTALLSTATE Action;
     struct list Children;
     struct list Components;
-    INT Cost;
 } MSIFEATURE;
 
 typedef struct tagMSICOMPONENT



From julliard at winehq.org  Fri Jun 11 09:58:34 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:34 -0500
Subject: Henri Verbeet : wined3d: Also flip the point sprite coordinate origin
	when rendering offscreen.
Message-ID: <E1ON5go-0002kD-AC@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b1abafcf8d227ad890522f30008eca6ecdef366b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b1abafcf8d227ad890522f30008eca6ecdef366b

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jun 11 16:05:23 2010 +0200

wined3d: Also flip the point sprite coordinate origin when rendering offscreen.

---

 dlls/wined3d/context.c    |   12 ++++++++++++
 dlls/wined3d/directx.c    |    2 ++
 dlls/wined3d/drawprim.c   |    7 +++++++
 dlls/wined3d/wined3d_gl.h |    3 +++
 4 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 5304af2..f21c805 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1482,6 +1482,12 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3
         checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)");
     }
 
+    if (gl_info->supported[WINED3D_GL_VERSION_2_0])
+    {
+        glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT);
+        checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)");
+    }
+
     if (gl_info->supported[ARB_PROVOKING_VERTEX])
     {
         GL_EXTCALL(glProvokingVertex(GL_FIRST_VERTEX_CONVENTION));
@@ -1939,6 +1945,12 @@ static inline void context_set_render_offscreen(struct wined3d_context *context,
 {
     if (context->render_offscreen == offscreen) return;
 
+    if (context->gl_info->supported[WINED3D_GL_VERSION_2_0])
+    {
+        glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT);
+        checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)");
+    }
+
     Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable);
     Context_MarkStateDirty(context, STATE_VDECL, StateTable);
     Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable);
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 088cfe0..424271b 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2287,6 +2287,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter)
         }
     }
 
+    if (gl_version >= MAKEDWORD_VERSION(2, 0)) gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE;
+
     if (gl_info->supported[APPLE_FENCE])
     {
         /* GL_NV_fence and GL_APPLE_fence provide the same functionality basically.
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 1671e7b..304ab23 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -644,6 +644,13 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT
         }
     }
 
+    if (!context->gl_info->supported[WINED3D_GL_VERSION_2_0] && context->render_offscreen
+            && This->stateBlock->renderState[WINED3DRS_POINTSPRITEENABLE]
+            && This->stateBlock->gl_primitive_type == GL_POINTS)
+    {
+        FIXME("Point sprite coordinate origin switching not supported.\n");
+    }
+
     /* Ok, we will be updating the screen from here onwards so grab the lock */
     ENTER_GL();
     {
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 4ece7e7..b2dfddf 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -1353,6 +1353,7 @@ void (WINE_GLAPI *glVertex4sv)(const GLshort *v) DECLSPEC_HIDDEN;
 void (WINE_GLAPI *glVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) DECLSPEC_HIDDEN;
 void (WINE_GLAPI *glViewport)(GLint x, GLint y, GLsizei width, GLsizei height) DECLSPEC_HIDDEN;
 void (WINE_GLAPI *glPointParameterfv)(GLenum pname, const GLfloat *params) DECLSPEC_HIDDEN;
+void (WINE_GLAPI *glPointParameteri)(GLenum name, GLint value) DECLSPEC_HIDDEN;
 
 /* glFinish and glFlush are always loaded from opengl32.dll, thus they always have
  * __stdcall calling convention.
@@ -1708,6 +1709,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN;
     USE_GL_FUNC(glVertexPointer) \
     USE_GL_FUNC(glViewport) \
     USE_GL_FUNC(glPointParameterfv) \
+    USE_GL_FUNC(glPointParameteri) \
 
 #define WGL_FUNCS_GEN \
     USE_WGL_FUNC(wglCreateContext) \
@@ -1835,6 +1837,7 @@ typedef enum wined3d_gl_extension
     WGL_WINE_PIXEL_FORMAT_PASSTHROUGH,
     /* Internally used */
     WINE_NORMALIZED_TEXRECT,
+    WINED3D_GL_VERSION_2_0,
 
     WINED3D_GL_EXT_COUNT,
 } GL_SupportedExt;



From julliard at winehq.org  Fri Jun 11 09:58:34 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 09:58:34 -0500
Subject: Henri Verbeet : d3d9/tests: Add a test for offscreen point sprites.
Message-ID: <E1ON5go-0002kT-E6@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 95aaaf2f121657bb37b8f3d61818b03c16e4c229
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95aaaf2f121657bb37b8f3d61818b03c16e4c229

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jun 11 16:05:24 2010 +0200

d3d9/tests: Add a test for offscreen point sprites.

---

 dlls/d3d9/tests/visual.c |   49 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index b749494..1da7cca 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -8797,7 +8797,9 @@ static void pointsize_test(IDirect3DDevice9 *device)
     D3DMATRIX identity;
     float ptsize, ptsize_orig, ptsizemax_orig, ptsizemin_orig;
     DWORD color;
+    IDirect3DSurface9 *rt, *backbuffer;
     IDirect3DTexture9 *tex1, *tex2;
+    RECT rect = {0, 0, 128, 128};
     D3DLOCKED_RECT lr;
     const DWORD tex1_data[4] = {0x00ff0000, 0x00ff0000,
                                 0x00000000, 0x00000000};
@@ -9007,6 +9009,53 @@ static void pointsize_test(IDirect3DDevice9 *device)
     ok(color == 0x00ffff00, "pSprite: Pixel (64+4),(64-4) has color 0x%08x, expected 0x00ffff00\n", color);
     IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
 
+    U(matrix).m[0][0] =  1.0f / 64.0f;
+    U(matrix).m[1][1] = -1.0f / 64.0f;
+    hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &matrix);
+    ok(SUCCEEDED(hr), "SetTransform failed, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuffer);
+    ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8,
+            D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL );
+    ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt);
+    ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr);
+    hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 0.0f, 0);
+    ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_BeginScene(device);
+    ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr);
+    hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, &vertices[0], sizeof(float) * 3);
+    ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr);
+    hr = IDirect3DDevice9_EndScene(device);
+    ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr);
+
+    hr = IDirect3DDevice9_StretchRect(device, rt, &rect, backbuffer, &rect, D3DTEXF_NONE);
+    ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr);
+    hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer);
+    ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr);
+    IDirect3DSurface9_Release(backbuffer);
+    IDirect3DSurface9_Release(rt);
+
+    color = getPixelColor(device, 64-4, 64-4);
+    ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00), 0),
+            "Expected color 0x00ff0000, got 0x%08x.\n", color);
+    color = getPixelColor(device, 64+4, 64-4);
+    ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00), 0),
+            "Expected color 0x0000ff00, got 0x%08x.\n", color);
+    color = getPixelColor(device, 64-4, 64+4);
+    ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00), 0),
+            "Expected color 0x00000000, got 0x%08x.\n", color);
+    color = getPixelColor(device, 64+4, 64+4);
+    ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 0),
+            "Expected color 0x0000ff00, got 0x%08x.\n", color);
+
+    hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
+    ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);
+
     hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE);
     ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr);
     hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE);



From julliard at winehq.org  Fri Jun 11 12:48:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 12:48:13 -0500
Subject: Alexandre Julliard : Release 1.2-rc3.
Message-ID: <E1ON8Kz-00011y-FR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6517462ac0fb8a637f2401e00e076276b191f499
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6517462ac0fb8a637f2401e00e076276b191f499

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 11 19:40:31 2010 +0200

Release 1.2-rc3.

---

 ANNOUNCE  |  825 ++++++++++++++++++++++++++++++++++++++-----------------------
 VERSION   |    2 +-
 configure |   18 +-
 3 files changed, 529 insertions(+), 316 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=6517462ac0fb8a637f2401e00e076276b191f499


From julliard at winehq.org  Fri Jun 11 12:48:13 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 12:48:13 -0500
Subject: Tag wine-1.2-rc3 : Alexandre Julliard : Release 1.2-rc3
Message-ID: <E1ON8Kz-00012C-HQ@wine.codeweavers.com>

Module: wine
Branch: refs/tags/wine-1.2-rc3
Tag:    40c8e1688651ab221b5f8c4dfd65d1c6956e2ab3
URL:    http://source.winehq.org/git/wine.git/?a=tag;h=40c8e1688651ab221b5f8c4dfd65d1c6956e2ab3

Tagger: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 11 19:40:32 2010 +0200

Release 1.2-rc3


From julliard at winehq.org  Fri Jun 11 12:48:40 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 11 Jun 2010 12:48:40 -0500
Subject: Alexandre Julliard : Wine release 1.2-rc3
Message-ID: <E1ON8LQ-0001BS-7Q@wine.codeweavers.com>

Module: website
Branch: master
Commit: a005c1a2594bea3c96c5d99ec5d34c19fe617940
URL:    http://source.winehq.org/git/website.git/?a=commit;h=a005c1a2594bea3c96c5d99ec5d34c19fe617940

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 11 19:48:36 2010 +0200

Wine release 1.2-rc3

---

 news/en/2010061101.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/news/en/2010061101.xml b/news/en/2010061101.xml
new file mode 100644
index 0000000..ee83536
--- /dev/null
+++ b/news/en/2010061101.xml
@@ -0,0 +1,13 @@
+<news>
+<date>June 11, 2010</date>
+<title>Wine 1.2-rc3 Released</title>
+<body>
+<p> The Wine development release 1.2-rc3 is now available.</p>
+<p> <a href="{$root}/announce/1.2-rc3">What's new</a> in this release:
+<ul>
+  <li>Many translation updates.</li>
+  <li>A lot of bug fixes.</li>
+</ul></p>
+<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc3.tar.bz2">available now</a>.
+Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>.
+</p></body></news>



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Sven Baars : wldap32: Fix Dutch translation.
Message-ID: <E1OODyE-00034Q-5S@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 307aa290aaa4643df042d8c0278fa0b443568cfe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=307aa290aaa4643df042d8c0278fa0b443568cfe

Author: Sven Baars <sven.wine at gmail.com>
Date:   Fri Jun 11 19:22:45 2010 +0200

wldap32: Fix Dutch translation.

---

 dlls/wldap32/wldap32_Nl.rc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wldap32/wldap32_Nl.rc b/dlls/wldap32/wldap32_Nl.rc
index 58ac2ef..7de79d2 100644
--- a/dlls/wldap32/wldap32_Nl.rc
+++ b/dlls/wldap32/wldap32_Nl.rc
@@ -41,7 +41,7 @@ STRINGTABLE DISCARDABLE
     14 ""
     15 ""
     16 "Attribuut bestaat niet"
-    17 "Ongedefini?erd type"
+    17 "Ongedefinieerd type"
     18 "Foutieve vergelijking"
     19 "Schending van restrictie"
     20 "Attribuut of waarde bestaat"
@@ -58,7 +58,7 @@ STRINGTABLE DISCARDABLE
     31 ""
     32 "Object bestaat niet"
     33 "Aliasprobleem"
-    34 "Ongeldige DN syntax"
+    34 "Ongeldige DN-syntax"
     35 "Eindknoop"
     36 "Alias volgprobleem"
     37 ""
@@ -78,7 +78,7 @@ STRINGTABLE DISCARDABLE
     51 "Bezig"
     52 "Niet beschikbaar"
     53 "Uitvoering geweigerd"
-    54 "Cirkel gedetecteerd"
+    54 "Lus gedetecteerd"
     55 ""
     56 ""
     57 ""
@@ -95,7 +95,7 @@ STRINGTABLE DISCARDABLE
     68 "Bestaat reeds"
     69 "Geen objectklassemodificaties"
     70 "Resultaten te groot"
-    71 "Betreft meerdere DSAs"
+    71 "Betreft meerdere DSA's"
     72 ""
     73 ""
     74 ""
@@ -120,6 +120,6 @@ STRINGTABLE DISCARDABLE
     93 "Opgegeven besturingselement niet gevonden in bericht"
     94 "Geen resultaat aanwezig in bericht"
     95 "Meer resultaten teruggekregen"
-    96 "Cirkel gevonden bij het verwerken van verwijzingen"
+    96 "Lus gevonden bij het verwerken van verwijzingen"
     97 "Overschrijding van limiet op verwijzingen"
 }



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Igor Paliychuk : localui: Add Ukrainian translations.
Message-ID: <E1OODyE-00034g-8N@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c1407cb21de0ee2d1f425c206f3cc7235cb7a429
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c1407cb21de0ee2d1f425c206f3cc7235cb7a429

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Fri Jun 11 19:48:33 2010 +0300

localui: Add Ukrainian translations.

---

 dlls/localui/Makefile.in |    1 +
 dlls/localui/ui_Uk.rc    |   59 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in
index f3f626e..5f5f0b9 100644
--- a/dlls/localui/Makefile.in
+++ b/dlls/localui/Makefile.in
@@ -26,6 +26,7 @@ RC_SRCS = \
 	ui_Ru.rc \
 	ui_Si.rc \
 	ui_Sv.rc \
+	ui_Uk.rc \
 	ui_Zh.rc
 
 @MAKE_DLL_RULES@
diff --git a/dlls/localui/ui_Uk.rc b/dlls/localui/ui_Uk.rc
new file mode 100644
index 0000000..9deda65
--- /dev/null
+++ b/dlls/localui/ui_Uk.rc
@@ -0,0 +1,59 @@
+/*
+ * Ukrainian resources for localui
+ *
+ * Copyright 2010 Igor Paliychuk
+ *
+ * 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 "localui.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "?????? ????????? ????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "??????? &????? ?????????? ?????:", -1, 7, 13, 194, 13, WS_VISIBLE
+    EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE
+    PUSHBUTTON "?????????", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE
+END
+
+
+LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "???????????? LPT ?????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "????-??? (??????)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
+    LTEXT "&????? ???????????:", -1, 14, 22, 90, 13, WS_VISIBLE
+    EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
+    DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE
+    PUSHBUTTON "?????????", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
+END
+
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_LOCALPORT "????????? ????"
+    IDS_INVALIDNAME "'%s' ?? ?????? ????? ?????"
+    IDS_PORTEXISTS "???? '%s' ??? ?????"
+    IDS_NOTHINGTOCONFIG "??? ???? ?? ??? ???????????"
+}



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Igor Paliychuk : iccvid: Add Ukrainian translations.
Message-ID: <E1OODyE-00034w-B4@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b9b6dab27b5493c6428903e1df2483f5c6146f42
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b9b6dab27b5493c6428903e1df2483f5c6146f42

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Fri Jun 11 19:54:35 2010 +0300

iccvid: Add Ukrainian translations.

---

 dlls/iccvid/Makefile.in  |    3 ++-
 dlls/iccvid/iccvid_Uk.rc |   30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in
index 5381d11..b134a56 100644
--- a/dlls/iccvid/Makefile.in
+++ b/dlls/iccvid/Makefile.in
@@ -27,6 +27,7 @@ RC_SRCS = \
 	iccvid_Ru.rc \
 	iccvid_Si.rc \
 	iccvid_Sv.rc \
-	iccvid_Tr.rc
+	iccvid_Tr.rc \
+	iccvid_Uk.rc
 
 @MAKE_DLL_RULES@
diff --git a/dlls/iccvid/iccvid_Uk.rc b/dlls/iccvid/iccvid_Uk.rc
new file mode 100644
index 0000000..3bf3fbf
--- /dev/null
+++ b/dlls/iccvid/iccvid_Uk.rc
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010 Igor Paliychuk
+ *
+ * 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 "iccvid_private.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_NAME "????? ????? Cinepak"
+    IDS_DESCRIPTION "????? ????? Cinepak"
+}



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Igor Paliychuk : localspl: Add Ukrainian translations.
Message-ID: <E1OODyE-00035D-DR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 30bc0298793f7adbd475160f8dcb3b566dc0197f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=30bc0298793f7adbd475160f8dcb3b566dc0197f

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Fri Jun 11 19:56:10 2010 +0300

localspl: Add Ukrainian translations.

---

 dlls/localspl/Makefile.in |    1 +
 dlls/localspl/spl_Uk.rc   |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in
index a9e37a4..42991a8 100644
--- a/dlls/localspl/Makefile.in
+++ b/dlls/localspl/Makefile.in
@@ -28,6 +28,7 @@ RC_SRCS = \
 	spl_Ru.rc \
 	spl_Si.rc \
 	spl_Sv.rc \
+	spl_Uk.rc \
 	spl_Zh.rc
 
 @MAKE_DLL_RULES@
diff --git a/dlls/localspl/spl_Uk.rc b/dlls/localspl/spl_Uk.rc
new file mode 100644
index 0000000..50232bb
--- /dev/null
+++ b/dlls/localspl/spl_Uk.rc
@@ -0,0 +1,32 @@
+/*
+ * Ukrainian resources for localspl
+ *
+ * Copyright 2010 Igor Paliychuk
+ *
+ * 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 "localspl_private.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_LOCALPORT "????????? ????"
+    IDS_LOCALMONITOR "????????? ???????"
+}



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Ricardo Filipe : jscript: Update Portuguese Portugal translation.
Message-ID: <E1OODyE-00035V-Fi@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7fe6ec89ece1fd31c7bc29839f904e6ee1ee7680
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7fe6ec89ece1fd31c7bc29839f904e6ee1ee7680

Author: Ricardo Filipe <ricardojdfilipe at gmail.com>
Date:   Fri Jun 11 10:11:28 2010 -0700

jscript: Update Portuguese Portugal translation.

---

 dlls/jscript/jscript_Pt.rc |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/jscript_Pt.rc b/dlls/jscript/jscript_Pt.rc
index 87a7914..0ac712b 100644
--- a/dlls/jscript/jscript_Pt.rc
+++ b/dlls/jscript/jscript_Pt.rc
@@ -26,17 +26,24 @@ STRINGTABLE DISCARDABLE
 {
     IDS_TO_PRIMITIVE        "Erro ao converter objecto em tipo primitivo"
     IDS_INVALID_CALL_ARG    "Argumento ou chamada de procedimento inv?lida"
+    IDS_CREATE_OBJ_ERROR    "O servidor de automa??o n?o conseguiu criar o objecto"
     IDS_NO_PROPERTY         "O objecto n?o suporta esta propriedade ou m?todo"
     IDS_ARG_NOT_OPT         "Argumento n?o opcional"
     IDS_SYNTAX_ERROR        "Erro de sintaxe"
     IDS_SEMICOLON           "';' esperado"
     IDS_LBRACKET            "'(' esperado"
     IDS_RBRACKET            "')' esperado"
+    IDS_UNTERMINATED_STR    "Constante de string n?o terminada"
     IDS_NOT_FUNC            "Fun??o esperada"
     IDS_NOT_DATE            "'[object]' n?o ? um objecto de data"
     IDS_NOT_NUM             "N?mero esperado"
+    IDS_OBJECT_EXPECTED     "Objecto esperado"
     IDS_ILLEGAL_ASSIGN      "Atribui??o ilegal"
     IDS_UNDEFINED           "'|' ? indefinido"
     IDS_NOT_BOOL            "Objecto boleano esperado"
+    IDS_JSCRIPT_EXPECTED    "Objecto JScript esperado"
+    IDS_REGEXP_SYNTAX_ERROR "Erro de sintaxe na express?o regular"
+    IDS_URI_INVALID_CHAR    "URI a ser codificado cont?m caracteres inv?lidos"
     IDS_INVALID_LENGTH      "Tamanho do vector tem de ser um inteiro finito positivo"
+    IDS_ARRAY_EXPECTED      "Objecto Array esperado"
 }



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Ricardo Filipe : shell32: Update Portuguese Portugal translation.
Message-ID: <E1OODyE-00035n-LR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 73db6a74bd20e4cb7fa34c6281060b1c03d2ff72
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=73db6a74bd20e4cb7fa34c6281060b1c03d2ff72

Author: Ricardo Filipe <ricardojdfilipe at gmail.com>
Date:   Fri Jun 11 10:17:35 2010 -0700

shell32: Update Portuguese Portugal translation.

---

 dlls/shell32/shell32_Pt.rc |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc
index f3133b9..28f5129 100644
--- a/dlls/shell32/shell32_Pt.rc
+++ b/dlls/shell32/shell32_Pt.rc
@@ -441,6 +441,10 @@ STRINGTABLE
 	IDS_SHV_COLUMN11	"Grupo"
 	IDS_SHV_COLUMN_DELFROM	"Localiza??o original"
 	IDS_SHV_COLUMN_DELDATE	"Data de exclus?o"
+	IDS_SHV_COL_DOCS	"Documentos"
+	IDS_SHV_COL_STATUS	"Estado"
+	IDS_SHV_COL_LOCATION	"Localiza??o"
+	IDS_SHV_COL_MODEL	"Modelo"
 
         /* special folders */
 	IDS_DESKTOP		"Ambiente de trabalho"



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Ricardo Filipe : wineboot: Update Portuguese Portugal translation.
Message-ID: <E1OODyE-000363-Np@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2ea4d93fd2128c728d9debc26a9df7eee4cfa014
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2ea4d93fd2128c728d9debc26a9df7eee4cfa014

Author: Ricardo Filipe <ricardojdfilipe at gmail.com>
Date:   Fri Jun 11 10:21:06 2010 -0700

wineboot: Update Portuguese Portugal translation.

---

 programs/wineboot/wineboot_Pt.rc |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/programs/wineboot/wineboot_Pt.rc b/programs/wineboot/wineboot_Pt.rc
index a0338ca..33f2ccc 100644
--- a/programs/wineboot/wineboot_Pt.rc
+++ b/programs/wineboot/wineboot_Pt.rc
@@ -35,3 +35,13 @@ BEGIN
     LTEXT           "Se terminar o processo pode perder todos os dados n?o guardados.",
                     IDC_STATIC,7,28,172,15
 END
+
+IDD_WAITDLG DIALOG 0, 0, 200, 50
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED
+CAPTION "Wine"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON "", IDC_WAITICON, 3, 3, 10, 10
+    LTEXT "A configura??o do Wine em %s est? a ser actualizada, por favor aguarde...",
+          IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX
+END



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Ricardo Filipe : winecfg: Update Portuguese Portugal translation.
Message-ID: <E1OODyE-00036L-RH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: aa3fa47ef7bbe2fac89ee0035a610f656399db4d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aa3fa47ef7bbe2fac89ee0035a610f656399db4d

Author: Ricardo Filipe <ricardojdfilipe at gmail.com>
Date:   Fri Jun 11 10:42:15 2010 -0700

winecfg: Update Portuguese Portugal translation.

---

 programs/winecfg/Pt.rc |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index a4929d6..9918f6f 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -62,14 +62,15 @@ STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "", IDC_ABT_PANEL, "STATIC", SS_OWNERDRAW, 0, 0, 260, 140
-    CONTROL         IDB_WINE,IDC_STATIC,"Static", SS_BITMAP, 15,17,157,111
+    LTEXT           PACKAGE_NAME,IDC_ABT_TITLE_TEXT,105,30,55,30
+    LTEXT           PACKAGE_VERSION,IDC_ABT_PANEL_TEXT,160,43,140,8
     CONTROL         "",IDC_ABT_WEB_LINK,"SysLink", LWS_TRANSPARENT, 105,53,106,8
     LTEXT           "Esta biblioteca ? de c?digo livre; pode-a redistribuir e/ou modificar nos termos da Licen?a Publica Geral Lesser GNU como publicado pela Funda??o de Programas Livres; tamb?m a vers?o 2.1 da Licen?a, ou (na sua opini?o) qualquer vers?o posterior.",
-                    IDC_ABT_PANEL_TEXT,105,64,145,60
-    GROUPBOX        " Informa??es de registro do Windows ", IDC_STATIC, 15, 155, 230, 55
-    LTEXT           "Propriet?rio:", IDC_STATIC, 22, 171, 40, 20
+                    IDC_ABT_LICENSE_TEXT,105,64,145,60
+    GROUPBOX        " &Informa??es de registro do Windows ", IDC_STATIC, 15, 155, 230, 55
+    LTEXT           "&Propriet?rio:", IDC_STATIC, 22, 171, 40, 20
     EDITTEXT        IDC_ABT_OWNER, 75, 171, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Organiza??o:", IDC_STATIC, 22, 185, 50, 20
+    LTEXT           "&Organiza??o:", IDC_STATIC, 22, 185, 50, 20
     EDITTEXT        IDC_ABT_ORG, 75, 185, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP
 END
 
@@ -242,6 +243,18 @@ END
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
+IDD_DRIVECHOOSE DIALOG DISCARDABLE  60, 70, 170, 60
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Seleccione a letra da drive"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,105,10,45,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",IDCANCEL,105,30,45,14,WS_GROUP
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDD_DRIVECFG DIALOG DISCARDABLE  0, 0, 260, 220
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"



From julliard at winehq.org  Mon Jun 14 13:01:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:14 -0500
Subject: Ricardo Filipe : wordpad: Update Portuguese Portugal translation.
Message-ID: <E1OODyE-00036b-To@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f5fba7563effd090efbd6d36422566ba64a595fb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f5fba7563effd090efbd6d36422566ba64a595fb

Author: Ricardo Filipe <ricardojdfilipe at gmail.com>
Date:   Fri Jun 11 10:47:06 2010 -0700

wordpad: Update Portuguese Portugal translation.

---

 programs/wordpad/Pt.rc |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc
index 2a2ae4b..3f14049 100644
--- a/programs/wordpad/Pt.rc
+++ b/programs/wordpad/Pt.rc
@@ -249,13 +249,12 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Fechar"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
+    STRING_PREVIEW_PAGE,             "P?gina"
+    STRING_PREVIEW_PAGES,            "P?ginas"
+    STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "inch"
+    STRING_UNITS_PT,                 "pt"
 END
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Ricardo Filipe : mapi32: Add Portuguese Portugal translation.
Message-ID: <E1OODyF-00036u-1V@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 579ebdb4cbeefec30d629f8cc0b4c2e112bac693
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=579ebdb4cbeefec30d629f8cc0b4c2e112bac693

Author: Ricardo Filipe <ricardojdfilipe at gmail.com>
Date:   Fri Jun 11 10:52:14 2010 -0700

mapi32: Add Portuguese Portugal translation.

---

 dlls/mapi32/Makefile.in |    1 +
 dlls/mapi32/Pt.rc       |   30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 9b3a07b..e8d0a71 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -23,6 +23,7 @@ RC_SRCS = \
 	Lt.rc \
 	Nl.rc \
 	Pl.rc \
+	Pt.rc \
 	Ro.rc \
 	Ru.rc \
 	Si.rc \
diff --git a/dlls/mapi32/Pt.rc b/dlls/mapi32/Pt.rc
new file mode 100644
index 0000000..4772bcf
--- /dev/null
+++ b/dlls/mapi32/Pt.rc
@@ -0,0 +1,30 @@
+/*
+* MAPI32 Portuguese resources
+*
+* Copyright 2010 Ricardo Filipe
+*
+* 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"
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE
+{
+   IDS_NO_MAPI_CLIENT, "O envio de correio falhou porque n?o existe um cliente de correio MAPI instalado."
+   IDS_SEND_MAIL, "Enviar Correio"
+}



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Alexandre Julliard : atl: Fix parsing of extended dialog templates.
Message-ID: <E1OODyF-00037Q-50@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 650231516290b99cf0e9f1e0b5fe275f4ac4c3c6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=650231516290b99cf0e9f1e0b5fe275f4ac4c3c6

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat Jun 12 12:08:07 2010 +0200

atl: Fix parsing of extended dialog templates.

---

 dlls/atl/atl_ax.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c
index 616713c..cf654e1 100644
--- a/dlls/atl/atl_ax.c
+++ b/dlls/atl/atl_ax.c
@@ -1150,7 +1150,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl)
 
         tmp = src;
         if (ext)
-            src += 11;
+            src += 12;
         else
             src += 9;
         PUT_BLOCK(tmp, src-tmp);
@@ -1236,7 +1236,7 @@ HWND WINAPI AtlAxCreateDialogW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPRO
     LPDLGTEMPLATEW newptr;
     HWND res;
 
-    FIXME("(%p %s %p %p %lx) - not tested\n", hInst, debugstr_w(name), owner, dlgProc, param);
+    TRACE("(%p %s %p %p %lx)\n", hInst, debugstr_w(name), owner, dlgProc, param);
 
     hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG );
     if ( !hrsrc )



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Alexandre Julliard : atl: Implemented AtlCreateTargetDC.
Message-ID: <E1OODyF-00037h-8V@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 40ac96d762f3315d050e66083aec3e59fa41d651
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=40ac96d762f3315d050e66083aec3e59fa41d651

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 14 14:13:52 2010 +0200

atl: Implemented AtlCreateTargetDC.

---

 dlls/atl/atl.spec   |    2 +-
 dlls/atl/atl_main.c |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec
index 73d6ae6..1a0966d 100644
--- a/dlls/atl/atl.spec
+++ b/dlls/atl/atl.spec
@@ -18,7 +18,7 @@
 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr)
 24 stub AtlWaitWithMessageLoop
 25 stub AtlSetErrorInfo
-26 stub AtlCreateTargetDC
+26 stdcall AtlCreateTargetDC(long ptr)
 27 stdcall AtlHiMetricToPixel(ptr ptr)
 28 stdcall AtlPixelToHiMetric(ptr ptr)
 29 stub AtlDevModeW2A
diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index f168d54..fedfc1a 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -545,6 +545,32 @@ void WINAPI AtlPixelToHiMetric(const SIZEL* lpPix, SIZEL* lpHiMetric)
 }
 
 /***********************************************************************
+ *           AtlCreateTargetDC         [ATL.@]
+ */
+HDC WINAPI AtlCreateTargetDC( HDC hdc, DVTARGETDEVICE *dv )
+{
+    static const WCHAR displayW[] = {'d','i','s','p','l','a','y',0};
+    const WCHAR *driver = NULL, *device = NULL, *port = NULL;
+    DEVMODEW *devmode = NULL;
+
+    TRACE( "(%p, %p)\n", hdc, dv );
+
+    if (dv)
+    {
+        if (dv->tdDriverNameOffset) driver  = (WCHAR *)((char *)dv + dv->tdDriverNameOffset);
+        if (dv->tdDeviceNameOffset) device  = (WCHAR *)((char *)dv + dv->tdDeviceNameOffset);
+        if (dv->tdPortNameOffset)   port    = (WCHAR *)((char *)dv + dv->tdPortNameOffset);
+        if (dv->tdExtDevmodeOffset) devmode = (DEVMODEW *)((char *)dv + dv->tdExtDevmodeOffset);
+    }
+    else
+    {
+        if (hdc) return hdc;
+        driver = displayW;
+    }
+    return CreateDCW( driver, device, port, devmode );
+}
+
+/***********************************************************************
  *           AtlModuleAddCreateWndData          [ATL.@]
  */
 void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject)



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Alexandre Julliard : krnl386: Defined the SMapLS/ UnMapLS_IP_EBP
	functions explicitly to make life easier for winapi_check.
Message-ID: <E1OODyF-000381-Bx@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 86e2494f9b292a1d8ac49d5ca3da24303407d351
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=86e2494f9b292a1d8ac49d5ca3da24303407d351

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat Jun 12 12:08:45 2010 +0200

krnl386: Defined the SMapLS/UnMapLS_IP_EBP functions explicitly to make life easier for winapi_check.

---

 dlls/krnl386.exe16/selector.c |  202 ++++++++++++++++++++++++++++++++--------
 1 files changed, 161 insertions(+), 41 deletions(-)

diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c
index 3d04d6e..ec9bb2a 100644
--- a/dlls/krnl386.exe16/selector.c
+++ b/dlls/krnl386.exe16/selector.c
@@ -553,65 +553,185 @@ __ASM_STDCALL_FUNC( SUnMapLS, 0,
 
 /***********************************************************************
  *		SMapLS_IP_EBP_8 (KERNEL32.@)
+ *
+ * These functions map linear pointers at [EBP+xxx] to segmented pointers
+ * and return them.
+ * Win95 uses some kind of alias structs, which it stores in [EBP+x] to
+ * unravel them at SUnMapLS. We just store the segmented pointer there.
+ */
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_8, 0,
+                    "movl 8(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,8(%ebp)\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SMapLS_IP_EBP_12 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_12, 0,
+                    "movl 12(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,12(%ebp)\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SMapLS_IP_EBP_16 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_16, 0,
+                    "movl 16(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,16(%ebp)\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SMapLS_IP_EBP_20 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_20, 0,
+                    "movl 20(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,20(%ebp)\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SMapLS_IP_EBP_24 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_24, 0,
+                    "movl 24(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,24(%ebp)\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SMapLS_IP_EBP_28 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_28, 0,
+                    "movl 28(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,28(%ebp)\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SMapLS_IP_EBP_32 (KERNEL32.@)
- *		SMapLS_IP_EBP_36 (KERNEL32.@)
- *		SMapLS_IP_EBP_40 (KERNEL32.@)
- *
- * These functions map linear pointers at [EBP+xxx] to segmented pointers
- * and return them.
- * Win95 uses some kind of alias structs, which it stores in [EBP+x] to
- * unravel them at SUnMapLS. We just store the segmented pointer there.
  */
-#define DEFINE_SMapLS(n) \
-  __ASM_STDCALL_FUNC( SMapLS_IP_EBP_ ## n, 0, \
-                     "movl " #n "(%ebp),%eax\n\t" \
-                     "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" \
-                     "movl %edx," #n "(%ebp)\n\t" \
-                     "ret" )
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_32, 0,
+                    "movl 32(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,32(%ebp)\n\t"
+                    "ret" )
 
-DEFINE_SMapLS(8)
-DEFINE_SMapLS(12)
-DEFINE_SMapLS(16)
-DEFINE_SMapLS(20)
-DEFINE_SMapLS(24)
-DEFINE_SMapLS(28)
-DEFINE_SMapLS(32)
-DEFINE_SMapLS(36)
-DEFINE_SMapLS(40)
+/***********************************************************************
+ *		SMapLS_IP_EBP_36 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_36, 0,
+                    "movl 36(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,36(%ebp)\n\t"
+                    "ret" )
 
+/***********************************************************************
+ *		SMapLS_IP_EBP_40 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SMapLS_IP_EBP_40, 0,
+                    "movl 40(%ebp),%eax\n\t"
+                    "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl %edx,40(%ebp)\n\t"
+                    "ret" )
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_8 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_8, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 8(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,8(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SUnMapLS_IP_EBP_12 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_12, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 12(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,12(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SUnMapLS_IP_EBP_16 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_16, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 16(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,16(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SUnMapLS_IP_EBP_20 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_20, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 20(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,20(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SUnMapLS_IP_EBP_24 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_24, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 24(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,24(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SUnMapLS_IP_EBP_28 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_28, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 28(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,28(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SUnMapLS_IP_EBP_32 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_32, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 32(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,32(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )
+
+/***********************************************************************
  *		SUnMapLS_IP_EBP_36 (KERNEL32.@)
- *		SUnMapLS_IP_EBP_40 (KERNEL32.@)
  */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_36, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 36(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,36(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )
 
-#define DEFINE_SUnMapLS(n) \
-  __ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_ ## n, 0, \
-                     "pushl %eax\n\t"  /* preserve eax */ \
-                     "pushl " #n "(%ebp)\n\t" \
-                     "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" \
-                     "movl $0," #n "(%ebp)\n\t" \
-                     "popl %eax\n\t" \
-                     "ret" )
-
-DEFINE_SUnMapLS(8)
-DEFINE_SUnMapLS(12)
-DEFINE_SUnMapLS(16)
-DEFINE_SUnMapLS(20)
-DEFINE_SUnMapLS(24)
-DEFINE_SUnMapLS(28)
-DEFINE_SUnMapLS(32)
-DEFINE_SUnMapLS(36)
-DEFINE_SUnMapLS(40)
+/***********************************************************************
+ *		SUnMapLS_IP_EBP_40 (KERNEL32.@)
+ */
+__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_40, 0,
+                    "pushl %eax\n\t"  /* preserve eax */
+                    "pushl 40(%ebp)\n\t"
+                    "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t"
+                    "movl $0,40(%ebp)\n\t"
+                    "popl %eax\n\t"
+                    "ret" )



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Alexandre Julliard : shell32: Create a 32-bpp image list to get alpha
	blended icons.
Message-ID: <E1OODyF-00038F-FH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8932fe2a84832264cf7210f981a6034540d10d76
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8932fe2a84832264cf7210f981a6034540d10d76

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sun Jun 13 16:50:43 2010 +0200

shell32: Create a 32-bpp image list to get alpha blended icons.

---

 dlls/shell32/control.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index b0d4089..aabe89e 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -216,9 +216,9 @@ static BOOL Control_CreateListView (CPanel *panel)
 
     /* Create image lists for list view */
     panel->hImageListSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON),
-        GetSystemMetrics(SM_CYSMICON), ILC_MASK, 1, 1);
+        GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 1, 1);
     panel->hImageListLarge = ImageList_Create(GetSystemMetrics(SM_CXICON),
-        GetSystemMetrics(SM_CYICON), ILC_MASK, 1, 1);
+        GetSystemMetrics(SM_CYICON), ILC_COLOR32 | ILC_MASK, 1, 1);
 
     SendMessageW(panel->hWndListView, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)panel->hImageListSmall);
     SendMessageW(panel->hWndListView, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)panel->hImageListLarge);



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Alexandre Julliard : appwiz.cpl: Create a 32-bpp image list to get
	alpha blended icons.
Message-ID: <E1OODyF-00038Y-Hb@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 14d1b7a51dbbade26517beb84c489ec1ee615049
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=14d1b7a51dbbade26517beb84c489ec1ee615049

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sun Jun 13 16:50:49 2010 +0200

appwiz.cpl: Create a 32-bpp image list to get alpha blended icons.

---

 dlls/appwiz.cpl/appwiz.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c
index 2b68ee7..ffd2b24 100644
--- a/dlls/appwiz.cpl/appwiz.c
+++ b/dlls/appwiz.cpl/appwiz.c
@@ -745,7 +745,7 @@ static HIMAGELIST AddListViewImageList(HWND hWnd)
     HICON hDefaultIcon;
 
     hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
-        ILC_MASK, 1, 1);
+                              ILC_COLOR32 | ILC_MASK, 1, 1);
 
     /* Add default icon to image list */
     hDefaultIcon = LoadIconW(hInst, MAKEINTRESOURCEW(ICO_MAIN));



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Nikolay Sivov : gdi32: Add CreateFontIndirectEx implementation.
Message-ID: <E1OODyF-00038q-Kf@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cd43ff167bd85d39aeb31ab41b6ccef29e7dfafe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cd43ff167bd85d39aeb31ab41b6ccef29e7dfafe

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Jun 11 19:39:40 2010 +0400

gdi32: Add CreateFontIndirectEx implementation.

---

 dlls/gdi32/font.c       |   78 ++++++++++++++++++++++++++++++++++++++++------
 dlls/gdi32/gdi32.spec   |    4 +-
 dlls/gdi32/tests/font.c |   34 ++++++++++++++++++++
 include/wingdi.h        |   27 ++++++++++++++++
 4 files changed, 130 insertions(+), 13 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 17fb381..637c7d6 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -180,7 +180,7 @@ static void FONT_LogFontWToA( const LOGFONTW *fontW, LPLOGFONTA fontA )
 
 static void FONT_EnumLogFontExWToA( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTEXA fontA )
 {
-    FONT_LogFontWToA( (const LOGFONTW *)fontW, (LPLOGFONTA)fontA);
+    FONT_LogFontWToA( &fontW->elfLogFont, &fontA->elfLogFont );
 
     WideCharToMultiByte( CP_ACP, 0, fontW->elfFullName, -1,
 			 (LPSTR) fontA->elfFullName, LF_FULLFACESIZE, NULL, NULL );
@@ -193,6 +193,21 @@ static void FONT_EnumLogFontExWToA( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTEX
     fontA->elfScript[LF_FACESIZE-1] = '\0';
 }
 
+static void FONT_EnumLogFontExAToW( const ENUMLOGFONTEXA *fontA, LPENUMLOGFONTEXW fontW )
+{
+    FONT_LogFontAToW( &fontA->elfLogFont, &fontW->elfLogFont );
+
+    MultiByteToWideChar( CP_ACP, 0, (LPCSTR)fontA->elfFullName, -1,
+			 fontW->elfFullName, LF_FULLFACESIZE );
+    fontW->elfFullName[LF_FULLFACESIZE-1] = '\0';
+    MultiByteToWideChar( CP_ACP, 0, (LPCSTR)fontA->elfStyle, -1,
+			 fontW->elfStyle, LF_FACESIZE );
+    fontW->elfStyle[LF_FACESIZE-1] = '\0';
+    MultiByteToWideChar( CP_ACP, 0, (LPCSTR)fontA->elfScript, -1,
+			 fontW->elfScript, LF_FACESIZE );
+    fontW->elfScript[LF_FACESIZE-1] = '\0';
+}
+
 /***********************************************************************
  *              TEXTMETRIC conversion functions.
  */
@@ -287,30 +302,42 @@ static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP)
     return strW;
 }
 
-
 /***********************************************************************
- *           CreateFontIndirectA   (GDI32.@)
+ *           CreateFontIndirectExA   (GDI32.@)
  */
-HFONT WINAPI CreateFontIndirectA( const LOGFONTA *plfA )
+HFONT WINAPI CreateFontIndirectExA( const ENUMLOGFONTEXDVA *penumexA )
 {
-    LOGFONTW lfW;
+    ENUMLOGFONTEXDVW enumexW;
 
-    if (!plfA) return 0;
+    if (!penumexA) return 0;
 
-    FONT_LogFontAToW( plfA, &lfW );
-    return CreateFontIndirectW( &lfW );
+    FONT_EnumLogFontExAToW( &penumexA->elfEnumLogfontEx, &enumexW.elfEnumLogfontEx );
+    enumexW.elfDesignVector = penumexA->elfDesignVector;
+    return CreateFontIndirectExW( &enumexW );
 }
 
 /***********************************************************************
- *           CreateFontIndirectW   (GDI32.@)
+ *           CreateFontIndirectExA   (GDI32.@)
  */
-HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf )
+HFONT WINAPI CreateFontIndirectExW( const ENUMLOGFONTEXDVW *penumex )
 {
     HFONT hFont;
     FONTOBJ *fontPtr;
+    const LOGFONTW *plf;
 
-    if (!plf) return 0;
+    if (!penumex) return 0;
+
+    if (penumex->elfEnumLogfontEx.elfFullName[0] ||
+        penumex->elfEnumLogfontEx.elfStyle[0] ||
+        penumex->elfEnumLogfontEx.elfScript[0])
+    {
+        FIXME("some fields ignored. fullname=%s, style=%s, script=%s\n",
+            debugstr_w(penumex->elfEnumLogfontEx.elfFullName),
+            debugstr_w(penumex->elfEnumLogfontEx.elfStyle),
+            debugstr_w(penumex->elfEnumLogfontEx.elfScript));
+    }
 
+    plf = &penumex->elfEnumLogfontEx.elfLogFont;
     if (!(fontPtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*fontPtr) ))) return 0;
 
     fontPtr->logfont = *plf;
@@ -344,6 +371,35 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf )
     return hFont;
 }
 
+/***********************************************************************
+ *           CreateFontIndirectA   (GDI32.@)
+ */
+HFONT WINAPI CreateFontIndirectA( const LOGFONTA *plfA )
+{
+    LOGFONTW lfW;
+
+    if (!plfA) return 0;
+
+    FONT_LogFontAToW( plfA, &lfW );
+    return CreateFontIndirectW( &lfW );
+}
+
+/***********************************************************************
+ *           CreateFontIndirectW   (GDI32.@)
+ */
+HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf )
+{
+    ENUMLOGFONTEXDVW exdv;
+
+    if (!plf) return 0;
+
+    exdv.elfEnumLogfontEx.elfLogFont = *plf;
+    exdv.elfEnumLogfontEx.elfFullName[0] = 0;
+    exdv.elfEnumLogfontEx.elfStyle[0] = 0;
+    exdv.elfEnumLogfontEx.elfScript[0] = 0;
+    return CreateFontIndirectExW( &exdv );
+}
+
 /*************************************************************************
  *           CreateFontA    (GDI32.@)
  */
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec
index e33a7ae..d3843e6 100644
--- a/dlls/gdi32/gdi32.spec
+++ b/dlls/gdi32/gdi32.spec
@@ -58,8 +58,8 @@
 @ stdcall CreateEnhMetaFileW(long wstr ptr wstr)
 @ stdcall CreateFontA(long long long long long long long long long long long long long str)
 @ stdcall CreateFontIndirectA(ptr)
-# @ stub CreateFontIndirectExA
-# @ stub CreateFontIndirectExW
+@ stdcall CreateFontIndirectExA(ptr)
+@ stdcall CreateFontIndirectExW(ptr)
 @ stdcall CreateFontIndirectW(ptr)
 @ stdcall CreateFontW(long long long long long long long long long long long long long wstr)
 @ stdcall CreateHalftonePalette(long)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 6ef98c8..d89132d 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -43,6 +43,7 @@ DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs);
 DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags);
 DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags);
 BOOL  (WINAPI *pGdiRealizationInfo)(HDC hdc, DWORD *);
+HFONT (WINAPI *pCreateFontIndirectExA)(const ENUMLOGFONTEXDV *);
 
 static HMODULE hgdi32 = 0;
 
@@ -57,6 +58,7 @@ static void init(void)
     pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA");
     pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW");
     pGdiRealizationInfo = (void *)GetProcAddress(hgdi32, "GdiRealizationInfo");
+    pCreateFontIndirectExA = (void *)GetProcAddress(hgdi32, "CreateFontIndirectExA");
 }
 
 static INT CALLBACK is_truetype_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam)
@@ -3109,6 +3111,37 @@ static void test_CreateFontIndirect(void)
     }
 }
 
+static void test_CreateFontIndirectEx(void)
+{
+    ENUMLOGFONTEXDVA lfex;
+    HFONT hfont;
+
+    if (!pCreateFontIndirectExA)
+    {
+        win_skip("CreateFontIndirectExA is not available\n");
+        return;
+    }
+
+    if (!is_truetype_font_installed("Arial"))
+    {
+        skip("Arial is not installed\n");
+        return;
+    }
+
+    SetLastError(0xdeadbeef);
+    hfont = pCreateFontIndirectExA(NULL);
+    ok(hfont == NULL, "got %p\n", hfont);
+    ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError());
+
+    memset(&lfex, 0, sizeof(lfex));
+    lstrcpyA(lfex.elfEnumLogfontEx.elfLogFont.lfFaceName, "Arial");
+    hfont = pCreateFontIndirectExA(&lfex);
+    ok(hfont != 0, "CreateFontIndirectEx failed\n");
+    if (hfont)
+        check_font("Arial", &lfex.elfEnumLogfontEx.elfLogFont, hfont);
+    DeleteObject(hfont);
+}
+
 START_TEST(font)
 {
     init();
@@ -3155,5 +3188,6 @@ START_TEST(font)
     test_GetTextMetrics2("Arial", -55);
     test_GetTextMetrics2("Arial", -110);
     test_CreateFontIndirect();
+    test_CreateFontIndirectEx();
     test_oemcharset();
 }
diff --git a/include/wingdi.h b/include/wingdi.h
index 99fd2bc..e7aafb2 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -610,6 +610,30 @@ typedef struct
 DECL_WINELIB_TYPE_AW(ENUMLOGFONTEX)
 DECL_WINELIB_TYPE_AW(LPENUMLOGFONTEX)
 
+#define MM_MAX_NUMAXES    16
+
+typedef struct
+{
+  DWORD      dvReserved;
+  DWORD      dvNumAxes;
+  LONG       dvValues[MM_MAX_NUMAXES];
+} DESIGNVECTOR, *PDESIGNVECTOR;
+
+typedef struct
+{
+  ENUMLOGFONTEXA    elfEnumLogfontEx;
+  DESIGNVECTOR      elfDesignVector;
+} ENUMLOGFONTEXDVA, *PENUMLOGFONTEXDVA;
+
+typedef struct
+{
+  ENUMLOGFONTEXW    elfEnumLogfontEx;
+  DESIGNVECTOR      elfDesignVector;
+} ENUMLOGFONTEXDVW, *PENUMLOGFONTEXDVW;
+
+DECL_WINELIB_TYPE_AW(ENUMLOGFONTEXDV)
+DECL_WINELIB_TYPE_AW(PENUMLOGFONTEXDV)
+
 /*
  * The FONTSIGNATURE tells which Unicode ranges and which code pages
  * have glyphs in a font.
@@ -3356,6 +3380,9 @@ WINGDIAPI HFONT       WINAPI CreateFontW(INT,INT,INT,INT,INT,DWORD,DWORD,DWORD,D
 WINGDIAPI HFONT       WINAPI CreateFontIndirectA(const LOGFONTA*);
 WINGDIAPI HFONT       WINAPI CreateFontIndirectW(const LOGFONTW*);
 #define                      CreateFontIndirect WINELIB_NAME_AW(CreateFontIndirect)
+WINGDIAPI HFONT       WINAPI CreateFontIndirectExA(const ENUMLOGFONTEXDVA*);
+WINGDIAPI HFONT       WINAPI CreateFontIndirectExW(const ENUMLOGFONTEXDVW*);
+#define                      CreateFontIndirectEx WINELIB_NAME_AW(CreateFontIndirectEx)
 WINGDIAPI HPALETTE    WINAPI CreateHalftonePalette(HDC);
 WINGDIAPI HBRUSH      WINAPI CreateHatchBrush(INT,COLORREF);
 WINGDIAPI HDC         WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Eric Pouech : winhelp: Fix trailing space in window name for JumpID
	macro.
Message-ID: <E1OODyF-000398-R9@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2d20a1aa536aefc09f96ec90827efeb63fa5ac7b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2d20a1aa536aefc09f96ec90827efeb63fa5ac7b

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sat Jun 12 21:54:59 2010 +0200

winhelp: Fix trailing space in window name for JumpID macro.

---

 programs/winhlp32/macro.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c
index cd497ef..f75b63d 100644
--- a/programs/winhlp32/macro.c
+++ b/programs/winhlp32/macro.c
@@ -575,13 +575,17 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id)
     if ((ptr = strchr(lpszPathWindow, '>')) != NULL)
     {
         LPSTR   tmp;
-        size_t  sz = ptr - lpszPathWindow;
+        size_t  sz;
 
-        tmp = HeapAlloc(GetProcessHeap(), 0, sz + 1);
+        tmp = HeapAlloc(GetProcessHeap(), 0, strlen(lpszPathWindow) + 1);
         if (tmp)
         {
-            memcpy(tmp, lpszPathWindow, sz);
-            tmp[sz] = '\0';
+            strcpy(tmp, lpszPathWindow);
+            tmp[ptr - lpszPathWindow] = '\0';
+            ptr += tmp - lpszPathWindow; /* ptr now points to '>' in tmp buffer */
+            /* in some cases, we have a trailing space that we need to get rid of */
+            /* FIXME: check if it has to be done in lexer rather than here */
+            for (sz = strlen(ptr + 1); sz >= 1 && ptr[sz] == ' '; sz--) ptr[sz] = '\0';
             MACRO_JumpHash(tmp, ptr + 1, HLPFILE_Hash(topic_id));
             HeapFree(GetProcessHeap(), 0, tmp);
         }



From julliard at winehq.org  Mon Jun 14 13:01:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:15 -0500
Subject: Eric Pouech : winhelp: Avoid accessing a window in global window list
	after it has been freed.
Message-ID: <E1OODyF-00039P-UJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3b07c851f84792689f97fc9036a08d40c4d1d3c2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3b07c851f84792689f97fc9036a08d40c4d1d3c2

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sat Jun 12 21:55:05 2010 +0200

winhelp: Avoid accessing a window in global window list after it has been freed.

---

 programs/winhlp32/macro.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c
index f75b63d..ca0fc8c 100644
--- a/programs/winhlp32/macro.c
+++ b/programs/winhlp32/macro.c
@@ -281,24 +281,32 @@ static void CALLBACK MACRO_CheckItem(LPCSTR str)
 static void CALLBACK MACRO_CloseSecondarys(void)
 {
     WINHELP_WINDOW *win;
+    WINHELP_WINDOW *next;
 
     WINE_TRACE("()\n");
-    for (win = Globals.win_list; win; win = win->next)
+    for (win = Globals.win_list; win; win = next)
+    {
+        next = win->next;
         if (lstrcmpi(win->info->name, "main"))
             WINHELP_ReleaseWindow(win);
+    }
 }
 
 static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow)
 {
     WINHELP_WINDOW *win;
+    WINHELP_WINDOW *next;
 
     WINE_TRACE("(\"%s\")\n", lpszWindow);
 
     if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main";
 
-    for (win = Globals.win_list; win; win = win->next)
+    for (win = Globals.win_list; win; win = next)
+    {
+        next = win->next;
         if (!lstrcmpi(win->info->name, lpszWindow))
             WINHELP_ReleaseWindow(win);
+    }
 }
 
 static void CALLBACK MACRO_Compare(LPCSTR str)



From julliard at winehq.org  Mon Jun 14 13:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:16 -0500
Subject: Eric Pouech : winhelp: When following a link, don't do it into a popup,
	but its parent.
Message-ID: <E1OODyG-0003AC-4C@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0f234ce461a32f87939a44e29577bf213669a14f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0f234ce461a32f87939a44e29577bf213669a14f

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sun Jun 13 15:39:35 2010 +0200

winhelp: When following a link, don't do it into a popup, but its parent.

---

 programs/winhlp32/winhelp.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index a5a0f31..582ab3e 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -912,7 +912,10 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam
                 if ((hlpfile = WINHELP_LookupHelpFile(link->string)))
                 {
                     if (link->window == -1)
+                    {
                         wi = win->info;
+                        if (wi->win_style & WS_POPUP) wi = Globals.active_win->info;
+                    }
                     else if (link->window < hlpfile->numWindows)
                         wi = &hlpfile->windows[link->window];
                     else
@@ -971,9 +974,10 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
             (HWND)lParam == Globals.active_popup->hMainWnd ||
             GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd)
             break;
+        /* fall through */
     case WM_LBUTTONDOWN:
-        if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam))
-            return FALSE;
+        if (msg == WM_LBUTTONDOWN)
+            WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam);
         /* fall through */
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN:



From julliard at winehq.org  Mon Jun 14 13:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:16 -0500
Subject: Eric Pouech : winmm: Only compute dwFileSize for MMIO objects with a
	DOS ioproc.
Message-ID: <E1OODyG-0003AS-6g@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 258d42982cf526b3d9c59ccb522b27db3f519541
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=258d42982cf526b3d9c59ccb522b27db3f519541

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sun Jun 13 15:41:01 2010 +0200

winmm: Only compute dwFileSize for MMIO objects with a DOS ioproc.

---

 dlls/winmm/mmio.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index 75439a4..f13e090 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -667,7 +667,13 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags,
                                         (LPARAM)szFileName, 0, FALSE);
 
     /* grab file size, when possible */
-    if ((pos = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_CUR)) != -1)
+    /* FIXME: the code around dwFileSize is:
+     * - probably broken
+     * - needs to be tested when the app installs its own IOproc
+     * - likely to be removed
+     * So, restrict dwFileSize usage to DOS ioprocs
+     */
+    if (wm->info.fccIOProc == FOURCC_DOS && (pos = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_CUR)) != -1)
     {
         wm->dwFileSize = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_END);
         _llseek((HFILE)wm->info.adwInfo[0], pos, SEEK_SET);



From julliard at winehq.org  Mon Jun 14 13:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:16 -0500
Subject: Jose Rostagno : localui: Add Spanish translation.
Message-ID: <E1OODyG-0003Ai-8M@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2fbbc384a00557fab0bfc3b2a525add02abeae81
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2fbbc384a00557fab0bfc3b2a525add02abeae81

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Sat Jun 12 14:50:09 2010 -0300

localui: Add Spanish translation.

---

 dlls/localui/Makefile.in |    1 +
 dlls/localui/ui_Es.rc    |   58 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 0 deletions(-)

diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in
index 5f5f0b9..d104f98 100644
--- a/dlls/localui/Makefile.in
+++ b/dlls/localui/Makefile.in
@@ -13,6 +13,7 @@ RC_SRCS = \
 	ui_Da.rc \
 	ui_De.rc \
 	ui_En.rc \
+	ui_Es.rc \
 	ui_Fr.rc \
 	ui_It.rc \
 	ui_Ja.rc \
diff --git a/dlls/localui/ui_Es.rc b/dlls/localui/ui_Es.rc
new file mode 100644
index 0000000..f3f1bce
--- /dev/null
+++ b/dlls/localui/ui_Es.rc
@@ -0,0 +1,58 @@
+/*
+ * Spanish resources for localui
+ *
+ * Copyright 2010 Jos? Rostagno
+ *
+ * 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 "localui.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Agregar un puerto local"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Ingrese el nombre del puerto a agregar:", -1, 7, 13, 194, 13, WS_VISIBLE
+    EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "Aceptar", IDOK, 199, 10, 40, 14, WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE
+END
+
+
+LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Configurar puerto LPT"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Tiempo de espera (segundos)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
+    LTEXT "&Reintentar transmisi?n:", -1, 14, 22, 90, 13, WS_VISIBLE
+    EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
+    DEFPUSHBUTTON "Aceptar", IDOK, 164, 10, 50, 14, WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
+END
+
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_LOCALPORT "Puerto local"
+    IDS_INVALIDNAME "'%s' no es un nombre de puerto v?lido"
+    IDS_PORTEXISTS "El puerto %s ya existe"
+    IDS_NOTHINGTOCONFIG "Este puerto no tiene opciones para configurar"
+}



From julliard at winehq.org  Mon Jun 14 13:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:16 -0500
Subject: Jose Rostagno : notepad: Update Spanish translation.
Message-ID: <E1OODyG-0003B1-AT@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b0d1c2ff60eaa6164bcbfc670c1be4ec1a1aa3e0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b0d1c2ff60eaa6164bcbfc670c1be4ec1a1aa3e0

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Sat Jun 12 15:02:24 2010 -0300

notepad: Update Spanish translation.

---

 programs/notepad/Es.rc |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc
index d73f167..cd1f95b 100644
--- a/programs/notepad/Es.rc
+++ b/programs/notepad/Es.rc
@@ -6,6 +6,7 @@
  *  Proofread 1999 by Jose Marcos Lopez <jose.lopez at upcnet.upc.es>
  *  Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
  *  Copyright 2003,2004 Jos? Manuel Ferrer Ortiz
+ *  Copyright 2010 Jos? Rostagno
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -95,6 +96,14 @@ PUSHBUTTON    "Cancelar",     IDCANCEL,               180, 21, 40, 15, WS_TABSTO
 PUSHBUTTON    "&Ayuda",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
+IDD_OFN_TEMPLATE  DIALOG  DISCARDABLE 50,50,300,15
+STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Codificaci?n:", -1, 5,0, 50,12
+  COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST
+END
+
 STRINGTABLE DISCARDABLE
 {
 STRING_PAGESETUP_HEADERVALUE,   "&f"
@@ -123,4 +132,13 @@ STRING_OUT_OF_MEMORY,           "No hay suficiente memoria para terminar esta \
                                  tarea.\nCierre una o m?s aplicaciones para \
                                  aumentar la cantidad\nde memoria libre."
 
+STRING_UNICODE_LE,     "Unicode (UTF-16)"
+STRING_UNICODE_BE,     "Unicode (UTF-16 big-endian)"
+
+STRING_LOSS_OF_UNICODE_CHARACTERS,         "%s\n\
+Este archivo contiene caracteres Unicode que se perder?n si\n\
+guarda este archivo en la codificaci?n %s.\n\
+Para mantener estos caracteres, haga clic en Cancelar y, a continuaci?n, seleccione\n\
+una de las opciones de Unicode en la lista desplegable de codificaciones.\n\
+Continuar?"
 }



From julliard at winehq.org  Mon Jun 14 13:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:16 -0500
Subject: Nikolay Sivov : kernel32: Export RtlPcToFileHeader on x86-64 platform.
Message-ID: <E1OODyG-0003BI-DX@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 43d9c9bb41af86bbb151d228240c44cb25211267
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=43d9c9bb41af86bbb151d228240c44cb25211267

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sat Jun 12 15:13:07 2010 +0400

kernel32: Export RtlPcToFileHeader on x86-64 platform.

---

 dlls/kernel32/kernel32.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 1dd449b..f08e752 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -933,6 +933,7 @@
 @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory
 @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry
 @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory
+@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader
 @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind
 @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx
 @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind



From julliard at winehq.org  Mon Jun 14 13:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:16 -0500
Subject: Nikolay Sivov : msxml3: Avoid SysStringLen() testing for an empty
	string in ::createNode().
Message-ID: <E1OODyG-0003Bb-KJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 36117911171dc30fd1c64ce972ecf7cc479bb63f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=36117911171dc30fd1c64ce972ecf7cc479bb63f

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sun Jun 13 04:23:23 2010 +0400

msxml3: Avoid SysStringLen() testing for an empty string in ::createNode().

---

 dlls/msxml3/domdoc.c       |    2 +-
 dlls/msxml3/tests/domdoc.c |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index d72d20b..e24077e 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -1368,7 +1368,7 @@ static HRESULT WINAPI domdoc_createNode(
     case NODE_ATTRIBUTE:
     case NODE_ENTITY_REFERENCE:
     case NODE_PROCESSING_INSTRUCTION:
-        if (!name || SysStringLen(name) == 0) return E_FAIL;
+        if (!name || *name == 0) return E_FAIL;
     default:
         break;
     }
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index a743e51..cbba0cd 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -1988,6 +1988,17 @@ static void test_create(void)
     if( SUCCEEDED(r) ) IXMLDOMNode_Release( node );
     SysFreeString(str);
 
+    /* a name is required for attribute, try a BSTR with first null wchar */
+    V_VT(&var) = VT_I1;
+    V_I1(&var) = NODE_ATTRIBUTE;
+    str = SysAllocString( szstr1 );
+    str[0] = 0;
+    node = (IXMLDOMNode*)0x1;
+    r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node );
+    ok( r == E_FAIL, "returns %08x\n", r );
+    ok( node == (void*)0x1, "expected same ptr, got %p\n", node);
+    SysFreeString(str);
+
     /* NODE_PROCESSING_INSTRUCTION */
     V_VT(&var) = VT_I1;
     V_I1(&var) = NODE_PROCESSING_INSTRUCTION;



From julliard at winehq.org  Mon Jun 14 13:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:16 -0500
Subject: Nikolay Sivov : msxml3: Use defined macros to access internal XPath
	structures.
Message-ID: <E1OODyG-0003Bs-QS@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bc3337f86f926c9e0899f1792eab5380eee6c3b2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bc3337f86f926c9e0899f1792eab5380eee6c3b2

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sun Jun 13 01:45:52 2010 +0400

msxml3: Use defined macros to access internal XPath structures.

---

 dlls/msxml3/queryresult.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
index eab83a9..2c6f23e 100644
--- a/dlls/msxml3/queryresult.c
+++ b/dlls/msxml3/queryresult.c
@@ -227,7 +227,7 @@ static HRESULT WINAPI queryresult_get_item(
     if (index < 0 || index >= xmlXPathNodeSetGetLength(This->result->nodesetval))
         return S_FALSE;
 
-    *listItem = create_node(This->result->nodesetval->nodeTab[index]);
+    *listItem = create_node(xmlXPathNodeSetItem(This->result->nodesetval, index));
     This->resultPos = index + 1;
 
     return S_OK;
@@ -264,7 +264,7 @@ static HRESULT WINAPI queryresult_nextNode(
     if (This->resultPos >= xmlXPathNodeSetGetLength(This->result->nodesetval))
         return S_FALSE;
 
-    *nextItem = create_node(This->result->nodesetval->nodeTab[This->resultPos]);
+    *nextItem = create_node(xmlXPathNodeSetItem(This->result->nodesetval, This->resultPos));
     This->resultPos++;
     return S_OK;
 }
@@ -379,7 +379,6 @@ HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **ou
     xmlChar *str = xmlChar_from_wchar(szQuery);
     HRESULT hr;
 
-
     TRACE("(%p, %s, %p)\n", node, wine_dbgstr_w(szQuery), out);
 
     *out = NULL;
@@ -412,8 +411,7 @@ HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **ou
 cleanup:
     if (This != NULL && FAILED(hr))
         IXMLDOMNodeList_Release( (IXMLDOMNodeList*) &This->lpVtbl );
-    if (ctxt != NULL)
-        xmlXPathFreeContext(ctxt);
+    xmlXPathFreeContext(ctxt);
     heap_free(str);
     return hr;
 }



From julliard at winehq.org  Mon Jun 14 13:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:16 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: winhlp32: Update the
	Polish translation.
Message-ID: <E1OODyG-0003C9-Uj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1145b29debcfccba417d99e127a5338cac0399e9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1145b29debcfccba417d99e127a5338cac0399e9

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Sun Jun 13 21:54:58 2010 +0200

winhlp32: Update the Polish translation.

---

 programs/winhlp32/Pl.rc |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc
index 7504789..f549b25 100644
--- a/programs/winhlp32/Pl.rc
+++ b/programs/winhlp32/Pl.rc
@@ -4,6 +4,7 @@
  * Copyright 1996 Ulrich Schmid
  * Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
  * Copyright 2004 Piotr Caban
+ * Copyright 2010 ?ukasz Wojni?owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,9 +23,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Plik" {
   MENUITEM "&Otw?rz", MNID_FILE_OPEN
@@ -43,20 +46,20 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
    MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE
  }
  POPUP "&Options" {
-   POPUP	"Help always visible"
+   POPUP	"Pomoc zawsze widoczna"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "Domy?lnie",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Widoczna",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Niewidoczna",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  MENUITEM "Historia",		MNID_OPTS_HISTORY
+  POPUP    "Czcionki"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
-    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Ma?e",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normalne",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Du?e",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "U?yj kolor?w systemowych",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "Pomo&c" {
    MENUITEM "&Pomoc", MNID_HELP_HELPON
@@ -69,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Indeks"
@@ -77,8 +80,16 @@ CAPTION "Indeks"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Szukaj"
+{
+    LTEXT  "Nie zaimplementowane", -1, 10, 10, 180, 150
+}
+
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE - Pomoc"
 STID_WHERROR, 		"B??D"
@@ -92,12 +103,12 @@ STID_BACK, 		"&Wstecz"
 STID_ALL_FILES, 	"Wszystkie pliki (*.*)"
 STID_HELP_FILES_HLP, 	"Pliki pomocy (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Nie znaleziono pliku '%s'. Czy chcesz poszuka? tego pliku samodzielnie?"
-STID_NO_RICHEDIT	"Nie uda?o si? znale?? modu?u richedit... Wy?wietlenie pomocy nie jest mo?liwe"
-STID_PSH_INDEX,		"Help topics: "
+STID_NO_RICHEDIT	"Nie znaleziono implementacji richedit... Wy?wietlenie pomocy nie jest mo?liwe"
+STID_PSH_INDEX,		"Tematy pomocy: "
 }
 
 
-CONTEXT_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Damjan Jovanovic : kernel32: Revert
	3f1404bf29676d79dd76ffd31e2630bb9f2b0b60 and add better
	CopyFile tests .
Message-ID: <E1OODyH-0003CQ-28@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 44aa45036b2f4b4b367644a821c09453e1a4c432
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=44aa45036b2f4b4b367644a821c09453e1a4c432

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Mon Jun 14 07:48:10 2010 +0200

kernel32: Revert 3f1404bf29676d79dd76ffd31e2630bb9f2b0b60 and add better CopyFile tests.

---

 dlls/kernel32/path.c       |    2 +-
 dlls/kernel32/tests/file.c |   59 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index 2bfd062..c319cb5 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -911,7 +911,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists )
         return FALSE;
     }
 
-    if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ, NULL,
+    if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                              fail_if_exists ? CREATE_NEW : CREATE_ALWAYS,
                              info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE)
     {
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index fcc7fc0..550fc95 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -591,6 +591,11 @@ static void test_CopyFileA(void)
     ret = MoveFileA(source, source);
     todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError());
 
+    /* copying a file to itself must fail */
+    retok = CopyFileA(source, source, FALSE);
+    todo_wine ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */),
+        "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError());
+
     /* make the source have not zero size */
     hfile = CreateFileA(source, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 );
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file\n");
@@ -598,10 +603,6 @@ static void test_CopyFileA(void)
     ok( retok && ret == sizeof(prefix),
        "WriteFile error %d\n", GetLastError());
     ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n");
-    /* copying a file to itself must fail */
-    retok = CopyFileA(source, source, FALSE);
-    ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */),
-        "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError());
     /* get the file time and change it to prove the difference */
     ret = GetFileTime(hfile, NULL, NULL, &ft1);
     ok( ret, "GetFileTime error %d\n", GetLastError());
@@ -622,7 +623,35 @@ static void test_CopyFileA(void)
     ret = CopyFileA(source, dest, FALSE);
     ok(ret, "CopyFileA: error %d\n", GetLastError());
 
-    /* destination file is write-locked during copy */
+    /* copying from a read-locked source fails */
+    hfile = CreateFileA(source, GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0);
+    ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError());
+    retok = CopyFileA(source, dest, FALSE);
+    ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION,
+        "copying from a read-locked file succeeded when it shouldn't have\n");
+    /* in addition, the source is opened before the destination */
+    retok = CopyFileA("25f99d3b-4ba4-4f66-88f5-2906886993cc", dest, FALSE);
+    ok(!retok && GetLastError() == ERROR_FILE_NOT_FOUND,
+        "copying from a file that doesn't exist failed in an unexpected way (ret=%d, err=%d)\n", retok, GetLastError());
+    CloseHandle(hfile);
+
+    /* copying from a r+w opened, r shared source succeeds */
+    hfile = CreateFileA(source, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
+    ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError());
+    retok = CopyFileA(source, dest, FALSE);
+    ok(retok,
+        "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", ret, GetLastError());
+    CloseHandle(hfile);
+
+    /* copying from a delete-locked source is unreliable */
+    hfile = CreateFileA(source, DELETE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
+    ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError());
+    retok = CopyFileA(source, dest, FALSE);
+    ok((!retok && GetLastError() == ERROR_SHARING_VIOLATION) || broken(retok) /* 98, Vista, 2k8, 7 */,
+        "copying from a delete-locked file failed (ret=%d, err=%d)\n", ret, GetLastError());
+    CloseHandle(hfile);
+
+    /* copying to a write-locked destination fails */
     hfile = CreateFileA(dest, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError());
     retok = CopyFileA(source, dest, FALSE);
@@ -630,6 +659,26 @@ static void test_CopyFileA(void)
         "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", ret, GetLastError());
     CloseHandle(hfile);
 
+    /* copying to a r+w opened, w shared destination mostly succeeds */
+    hfile = CreateFileA(dest, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0);
+    ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError());
+    retok = CopyFileA(source, dest, FALSE);
+    ok(retok || broken(!retok && GetLastError() == ERROR_SHARING_VIOLATION) /* Win 9x */,
+        "copying to a r+w opened and w shared file failed (ret=%d, err=%d)\n", ret, GetLastError());
+    CloseHandle(hfile);
+
+    /* copying to a delete-locked destination fails, even when the destination is delete-shared */
+    hfile = CreateFileA(dest, DELETE, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0);
+    ok(hfile != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* Win 9x */,
+        "failed to open destination file, error %d\n", GetLastError());
+    if (hfile != INVALID_HANDLE_VALUE)
+    {
+        retok = CopyFileA(source, dest, FALSE);
+        ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION,
+            "copying to a delete-locked shared file didn't fail (ret=%d, err=%d)\n", ret, GetLastError());
+        CloseHandle(hfile);
+    }
+
     /* make sure that destination has correct size */
     hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Jacek Caban : shobjidl.idl: Added INewWindowManager declaration.
Message-ID: <E1OODyH-0003DC-3u@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5432c5d091f0ed69d888c093672172d6f238dc88
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5432c5d091f0ed69d888c093672172d6f238dc88

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 14 02:18:52 2010 +0200

shobjidl.idl: Added INewWindowManager declaration.

---

 include/shobjidl.idl |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index 6bd0244..c8d91b3 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -384,6 +384,25 @@ typedef enum tagNWMF {
     NWMF_USERALLOWED      = 0x0100
 } NWMF;
 
+[
+    uuid(d2bc4c84-3f72-4a52-a604-7bcbf3982cbb),
+    object,
+    pointer_default(unique)
+]
+interface INewWindowManager : IUnknown
+{
+    HRESULT EvaluateNewWindow(
+        [in, string] LPCWSTR pszUrl,
+        [in, string] LPCWSTR pszName,
+        [in, string] LPCWSTR pszUrlContext,
+        [in, string] LPCWSTR pszFeatures,
+        [in]         BOOL fReplace,
+        [in]         DWORD dwFlags,
+        [in]         DWORD dwUserActionTime);
+}
+
+cpp_quote("#define SID_SNewWindowManager IID_INewWindowManager")
+
 /*****************************************************************************
  * FOLDERSETTINGS
  */



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Jacek Caban : docobj.idl: Added
	OLECMDID_UPDATETRAVELENTRY_DATARECOVERY declaration.
Message-ID: <E1OODyH-0003DU-6N@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e4bfae8306eb20230fec6412f63c10760f4413f3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e4bfae8306eb20230fec6412f63c10760f4413f3

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 14 02:19:02 2010 +0200

docobj.idl: Added OLECMDID_UPDATETRAVELENTRY_DATARECOVERY declaration.

---

 include/docobj.idl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/include/docobj.idl b/include/docobj.idl
index c47d111..bc14b1d 100644
--- a/include/docobj.idl
+++ b/include/docobj.idl
@@ -274,7 +274,8 @@ interface IOleCommandTarget : IUnknown
         OLECMDID_OPTICAL_ZOOM = 63,
         OLECMDID_OPTICAL_GETZOOMRANGE = 64,
         OLECMDID_WINDOWSTATECHANGED = 65,
-        OLECMDID_ACTIVEXINSTALLSCOPE = 66
+        OLECMDID_ACTIVEXINSTALLSCOPE = 66,
+        OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67
     } OLECMDID;
 
     HRESULT QueryStatus(



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Jacek Caban : mshtml: Don' t crash in on_start_uri_open on
	nscontainer without associated document.
Message-ID: <E1OODyH-0003Dl-8D@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 95d98bdb537adb13d931c5104d1afe7da8e4ff7a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95d98bdb537adb13d931c5104d1afe7da8e4ff7a

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 14 02:19:12 2010 +0200

mshtml: Don't crash in on_start_uri_open on nscontainer without associated document.

---

 dlls/mshtml/nsio.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 63c9a6a..d9e822d 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -222,13 +222,15 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva
     }
 
     if(!wine_uri->is_doc_uri) {
+        wine_uri->is_doc_uri = TRUE;
+
         if(!wine_uri->container) {
             nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer));
             wine_uri->container = nscontainer;
         }
 
-        wine_uri->is_doc_uri = TRUE;
-        *_retval = translate_url(nscontainer->doc, wine_uri);
+        if(nscontainer->doc)
+            *_retval = translate_url(nscontainer->doc, wine_uri);
     }
 
     nsIURI_Release(NSURI(wine_uri));



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Jacek Caban : shdocvw: Silence QueryService traces in non-interactive
	runs.
Message-ID: <E1OODyH-0003E2-A0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ddaf9171a136696af6c42e2a75798165462358a9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ddaf9171a136696af6c42e2a75798165462358a9

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 14 02:20:38 2010 +0200

shdocvw: Silence QueryService traces in non-interactive runs.

They only pollute output making it harder to find useful informations.

---

 dlls/shdocvw/tests/webbrowser.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c
index f396373..17189fc 100644
--- a/dlls/shdocvw/tests/webbrowser.c
+++ b/dlls/shdocvw/tests/webbrowser.c
@@ -1350,6 +1350,9 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface,
 {
     *ppv = NULL;
 
+    if(!winetest_interactive)
+        return E_NOINTERFACE;
+
     if (IsEqualGUID(&SID_STopLevelBrowser, guidService))
         trace("Service SID_STopLevelBrowser\n");
     else if (IsEqualGUID(&SID_SEditCommandTarget, guidService))



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Jacek Caban : mshtml: Added IHTMLWindow2::open test.
Message-ID: <E1OODyH-0003EJ-CA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 77a994db4216ed01b46b09b44926516d7cbf0c91
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=77a994db4216ed01b46b09b44926516d7cbf0c91

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 14 02:20:50 2010 +0200

mshtml: Added IHTMLWindow2::open test.

---

 dlls/mshtml/tests/htmldoc.c |  100 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 7e0d437..319e5fd 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -38,6 +38,7 @@
 #include "idispids.h"
 #include "shlguid.h"
 #include "perhist.h"
+#include "shobjidl.h"
 #include "mshtml_test.h"
 
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
@@ -155,6 +156,7 @@ DEFINE_EXPECT(Frame_GetWindow);
 DEFINE_EXPECT(TranslateUrl);
 DEFINE_EXPECT(Advise_Close);
 DEFINE_EXPECT(OnViewChange);
+DEFINE_EXPECT(EvaluateNewWindow);
 
 static IUnknown *doc_unk;
 static IMoniker *doc_mon;
@@ -164,7 +166,7 @@ static BOOL ipsex, ipsw;
 static BOOL set_clientsite, container_locked, navigated_load;
 static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream;
 static BOOL editmode = FALSE, show_failed;
-static BOOL inplace_deactivated;
+static BOOL inplace_deactivated, open_call;
 static int stream_read, protocol_read;
 static enum load_state_t {
     LD_DOLOAD,
@@ -296,6 +298,9 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, L
     BSTR doc_url = (void*)0xdeadbeef;
     HRESULT hres;
 
+    if(open_call)
+        return; /* FIXME */
+
     hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon);
     ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08x\n", hres);
     if(FAILED(hres))
@@ -332,7 +337,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, L
     }else if(exurl) {
         LPOLESTR url;
 
-        ok(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres);
+        ok_(__FILE__,line)(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres);
 
         hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url);
         ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres);
@@ -737,6 +742,48 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = {
 
 static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl };
 
+static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv)
+{
+    ok(0, "unexpected call\n");
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI NewWindowManager_AddRef(INewWindowManager *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI NewWindowManager_Release(INewWindowManager *iface)
+{
+    return 1;
+}
+
+static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *iface, LPCWSTR pszUrl,
+        LPCWSTR pszName, LPCWSTR pszUrlContext, LPCWSTR pszFeatures, BOOL fReplace, DWORD dwFlags,
+        DWORD dwUserActionTime)
+{
+    CHECK_EXPECT(EvaluateNewWindow);
+
+    ok(!strcmp_wa(pszUrl, "about:blank"), "pszUrl = %s\n", wine_dbgstr_w(pszUrl));
+    ok(!strcmp_wa(pszName, "test"), "pszName = %s\n", wine_dbgstr_w(pszName));
+    ok(!strcmp_wa(pszUrlContext, "about:blank"), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext));
+    ok(!pszFeatures, "pszFeatures = %s\n", wine_dbgstr_w(pszFeatures));
+    ok(!fReplace, "fReplace = %x\n", fReplace);
+    ok(dwFlags == NWMF_FIRST, "dwFlags = %x\n", dwFlags);
+    ok(!dwUserActionTime, "dwUserActionime = %d\n", dwUserActionTime);
+
+    return E_FAIL;
+}
+
+static const INewWindowManagerVtbl NewWindowManagerVtbl = {
+    NewWindowManager_QueryInterface,
+    NewWindowManager_AddRef,
+    NewWindowManager_Release,
+    NewWindowManager_EvaluateNewWindow
+};
+
+static INewWindowManager NewWindowManager = { &NewWindowManagerVtbl };
+
 static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface,
         REFIID riid, void**ppv)
 {
@@ -2423,6 +2470,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
             ok(V_BSTR(pvaIn) != NULL, "V_BSTR(pvaIn) = NULL\n");
             test_readyState(NULL);
             return S_OK;
+        case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY:
+            return E_FAIL; /* FIXME */
         default:
             ok(0, "unexpected command %d\n", nCmdID);
             return E_FAIL;
@@ -2701,6 +2750,12 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG
         return S_OK;
     }
 
+    if(IsEqualGUID(&SID_SNewWindowManager, guidService)) {
+        ok(IsEqualGUID(&IID_INewWindowManager, riid), "unexpected riid\n");
+        *ppv = &NewWindowManager;
+        return S_OK;
+    }
+
     return E_NOINTERFACE;
 }
 
@@ -2941,6 +2996,9 @@ static void _test_readyState(unsigned line, IUnknown *unk)
         "uninitialized"
     };
 
+    if(open_call)
+        return; /* FIXME */
+
     if(!unk)
         unk = doc_unk;
 
@@ -3405,6 +3463,43 @@ static void test_put_href(IHTMLDocument2 *doc)
     test_download(DWL_VERBDONE);
 }
 
+static void test_open_window(IHTMLDocument2 *doc)
+{
+    IHTMLWindow2 *window, *new_window;
+    BSTR name, url;
+    HRESULT hres;
+
+    hres = IHTMLDocument2_get_parentWindow(doc, &window);
+    ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres);
+
+    url = a2bstr("about:blank");
+    name = a2bstr("test");
+    new_window = (void*)0xdeadbeef;
+
+    open_call = TRUE;
+
+    SET_EXPECT(TranslateUrl);
+    SET_EXPECT(EvaluateNewWindow);
+
+    hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window);
+    todo_wine
+    ok(hres == S_OK, "open failed: %08x\n", hres);
+    todo_wine
+    ok(new_window == NULL, "new_window != NULL\n");
+
+    todo_wine
+    CHECK_CALLED(TranslateUrl);
+    todo_wine
+    CHECK_CALLED(EvaluateNewWindow);
+
+    open_call = FALSE;
+    SysFreeString(url);
+    SysFreeString(name);
+
+    IHTMLWindow2_Release(window);
+    SysFreeString(name);
+}
+
 static void test_clear(IHTMLDocument2 *doc)
 {
     HRESULT hres;
@@ -4678,6 +4773,7 @@ static void test_HTMLDocument_http(void)
     test_GetCurMoniker((IUnknown*)doc, http_mon, NULL);
 
     test_put_href(doc);
+    test_open_window(doc);
 
     test_InPlaceDeactivate(doc, TRUE);
     test_Close(doc, FALSE);



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Alexandre Julliard : winecfg: Fix pointer truncation in audio setup.
Message-ID: <E1OODyH-0003Ea-EH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d57ab26840b83f44a695e76855bba6faeb9a12a8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d57ab26840b83f44a695e76855bba6faeb9a12a8

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 14 13:23:57 2010 +0200

winecfg: Fix pointer truncation in audio setup.

---

 programs/winecfg/audio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 5cf2b34..c5cebcd 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
 #define DEVICE_MASK 0x40000000
 #define MAX_NAME_LENGTH 64
 
-typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD, DWORD, DWORD);
+typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR);
 
 static struct DSOUNDACCEL
 {



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Hans Leidekker : propsys: Return success from
	PSRegisterPropertySchema.
Message-ID: <E1OODyH-0003Es-GA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e7d8fd126beec24377f1e0e0a57e202ac527eae4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e7d8fd126beec24377f1e0e0a57e202ac527eae4

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Jun 14 14:20:49 2010 +0200

propsys: Return success from PSRegisterPropertySchema.

---

 dlls/propsys/propsys_main.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c
index c5bcab7..d2b1744 100644
--- a/dlls/propsys/propsys_main.c
+++ b/dlls/propsys/propsys_main.c
@@ -50,14 +50,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
 HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path)
 {
-    FIXME("stub\n");
+    FIXME("%s\n", debugstr_w(path));
 
-    return E_NOTIMPL;
+    return S_OK;
 }
 
-HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR pszPath)
+HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR path)
 {
-    FIXME("stub\n");
+    FIXME("%s\n", debugstr_w(path));
 
     return E_NOTIMPL;
 }



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Hans Leidekker : msi: Don't trace the contents of an output buffer.
Message-ID: <E1OODyH-0003FA-J1@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b4674a3c2b9cde2c2c24dee38475290ac2e6ec6e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b4674a3c2b9cde2c2c24dee38475290ac2e6ec6e

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Jun 14 14:21:12 2010 +0200

msi: Don't trace the contents of an output buffer.

---

 dlls/msi/msi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index def6a00..3e6a556 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -825,7 +825,7 @@ UINT WINAPI MsiGetProductCodeA(LPCSTR szComponent, LPSTR szBuffer)
     UINT r;
     WCHAR szwBuffer[GUID_SIZE];
 
-    TRACE("%s %s\n",debugstr_a(szComponent), debugstr_a(szBuffer));
+    TRACE("%s %p\n", debugstr_a(szComponent), szBuffer);
 
     if( szComponent )
     {



From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Hans Leidekker : msi: Add tests for MsiLocateComponent and make them
	pass.
Message-ID: <E1OODyH-0003FR-LB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ff0f2b35e134cf56a753cb3e049ccc164f253c35
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ff0f2b35e134cf56a753cb3e049ccc164f253c35

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Jun 14 14:21:31 2010 +0200

msi: Add tests for MsiLocateComponent and make them pass.

---

 dlls/msi/msi.c       |    6 ++
 dlls/msi/tests/msi.c |  164 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff0f2b35e134cf56a753cb3e049ccc164f253c35


From julliard at winehq.org  Mon Jun 14 13:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:17 -0500
Subject: Detlef Riekenberg : msvcr7x: Sync exports to msvcrt.
Message-ID: <E1OODyH-0003Fl-SB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 717bb348187811e412b368fdaf62037f80130c34
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=717bb348187811e412b368fdaf62037f80130c34

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Mon Jun 14 14:32:27 2010 +0200

msvcr7x: Sync exports to msvcrt.

---

 dlls/msvcr70/msvcr70.spec |    2 +-
 dlls/msvcr71/msvcr71.spec |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index edf3da4..7c84705 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -475,7 +475,7 @@
 @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
 @ cdecl _scalb( double long) msvcrt._scalb
 @ stub _scprintf
-@ stub _scwprintf
+@ varargs _scwprintf(wstr) msvcrt._scwprintf
 @ cdecl _searchenv(str str ptr) msvcrt._searchenv
 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind
 @ stub _set_SSE2_enable
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index f0d6255..8599efa 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -470,7 +470,7 @@
 @ cdecl _safe_fprem1() msvcrt._safe_fprem1
 @ cdecl _scalb( double long) msvcrt._scalb
 @ stub _scprintf
-@ stub _scwprintf
+@ varargs _scwprintf(wstr) msvcrt._scwprintf
 @ cdecl _searchenv(str str ptr) msvcrt._searchenv
 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind
 @ stub _set_SSE2_enable



From julliard at winehq.org  Mon Jun 14 13:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:18 -0500
Subject: Detlef Riekenberg : msvcr100: Sync exports to msvcr90.
Message-ID: <E1OODyI-0003G2-1B@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4e1b0da81462c0b31853d8c7e9f67d598ecbe3b7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4e1b0da81462c0b31853d8c7e9f67d598ecbe3b7

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Mon Jun 14 14:32:29 2010 +0200

msvcr100: Sync exports to msvcr90.

---

 dlls/msvcr100/msvcr100.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 44c5b31..0d05c28 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -607,7 +607,7 @@
 @ stub _fstat32
 @ stub _fstat32i64
 @ cdecl _fstat64(long ptr) msvcrt._fstat64
-@ stub _fstat64i32
+@ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32
 @ stub _ftell_nolock
 @ stub _ftelli64
 @ stub _ftelli64_nolock
@@ -1079,7 +1079,7 @@
 @ stub _stat32
 @ stub _stat32i64
 @ cdecl _stat64(str ptr) msvcrt._stat64
-@ stub _stat64i32
+@ cdecl _stat64i32(str ptr) msvcr90._stat64i32
 @ cdecl _statusfp() msvcrt._statusfp
 @ stub _statusfp2
 @ stub _strcoll_l



From julliard at winehq.org  Mon Jun 14 13:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:18 -0500
Subject: Detlef Riekenberg : msvcr80: Sync exports to msvcr90.
Message-ID: <E1OODyI-0003Gq-9Q@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d1a939bbdc6102334b44f222d3c8e3540dbfe3de
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d1a939bbdc6102334b44f222d3c8e3540dbfe3de

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Mon Jun 14 14:32:28 2010 +0200

msvcr80: Sync exports to msvcr90.

---

 dlls/msvcr80/msvcr80.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 256031c..b4c168a 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -441,7 +441,7 @@
 @ stub _fstat32
 @ stub _fstat32i64
 @ cdecl _fstat64(long ptr) msvcrt._fstat64
-@ stub _fstat64i32
+@ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32
 @ stub _ftell_nolock
 @ stub _ftelli64
 @ stub _ftelli64_nolock
@@ -926,7 +926,7 @@
 @ stub _stat32
 @ stub _stat32i64
 @ cdecl _stat64(str ptr) msvcrt._stat64
-@ stub _stat64i32
+@ cdecl _stat64i32(str ptr) msvcr90._stat64i32
 @ cdecl _statusfp() msvcrt._statusfp
 @ stub _statusfp2
 @ stub _strcoll_l



From julliard at winehq.org  Mon Jun 14 13:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:18 -0500
Subject: Andrew Nguyen : msxml3: Add proper skips when msxml3 DOM interfaces
	are unavailable.
Message-ID: <E1OODyI-0003H6-BM@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 341f878cbc376a51efddd04787990ce33ac64ecb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=341f878cbc376a51efddd04787990ce33ac64ecb

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Mon Jun 14 07:54:16 2010 -0500

msxml3: Add proper skips when msxml3 DOM interfaces are unavailable.

---

 dlls/msxml3/tests/domdoc.c |  117 +++++++++++++++++++++++++++++---------------
 1 files changed, 78 insertions(+), 39 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=341f878cbc376a51efddd04787990ce33ac64ecb


From julliard at winehq.org  Mon Jun 14 13:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:18 -0500
Subject: Andrew Nguyen : msxml3: Ignore the encoding attribute when loading a
	new XML document in IXMLDOMDocument ::loadXML.
Message-ID: <E1OODyI-0003HM-DP@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9f1fb46543fccc9075a2dd6fea9f16423ba60728
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9f1fb46543fccc9075a2dd6fea9f16423ba60728

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Mon Jun 14 07:54:40 2010 -0500

msxml3: Ignore the encoding attribute when loading a new XML document in IXMLDOMDocument::loadXML.

---

 dlls/msxml3/domdoc.c       |    2 +-
 dlls/msxml3/tests/domdoc.c |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index e24077e..34be70c 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -148,7 +148,7 @@ static xmlDocPtr doparse( char *ptr, int len )
      * use xmlReadMemory if possible so we can suppress
      * writing errors to stderr
      */
-    return xmlReadMemory( ptr, len, NULL, NULL,
+    return xmlReadMemory( ptr, len, NULL, "UTF-8",
                           XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS );
 #else
     return xmlParseMemory( ptr, len );
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index c04078c..818f628 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -90,6 +90,16 @@ static const WCHAR szComplete5[] = {
     '<','/','S',':','s','e','a','r','c','h','>',0
 };
 
+static const WCHAR szComplete6[] = {
+    '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\'','1','.','0','\'',' ',
+    'e','n','c','o','d','i','n','g','=','\'','W','i','n','d','o','w','s','-','1','2','5','2','\'','?','>','\n',
+    '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0
+};
+
+static const CHAR szNonUnicodeXML[] =
+"<?xml version='1.0' encoding='Windows-1252'?>\n"
+"<open></open>\n";
+
 static const CHAR szExampleXML[] =
 "<?xml version='1.0' encoding='utf-8'?>\n"
 "<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n"
@@ -618,6 +628,22 @@ if (0)
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
 
+    /* loadXML ignores the encoding attribute and always expects Unicode */
+    b = VARIANT_FALSE;
+    str = SysAllocString( szComplete6 );
+    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    ok( r == S_OK, "loadXML failed\n");
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    SysFreeString( str );
+
+    /* try a BSTR containing a Windows-1252 document */
+    b = VARIANT_TRUE;
+    str = SysAllocStringByteLen( szNonUnicodeXML, sizeof(szNonUnicodeXML) - 1 );
+    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    ok( r == S_FALSE, "loadXML succeeded\n");
+    ok( b == VARIANT_FALSE, "succeeded in loading XML string\n");
+    SysFreeString( str );
+
     /* try to load something valid */
     b = VARIANT_FALSE;
     str = SysAllocString( szComplete1 );



From julliard at winehq.org  Mon Jun 14 13:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:18 -0500
Subject: Andrew Nguyen : msxml3/tests: Correct the sense of a few test failure
	messages.
Message-ID: <E1OODyI-0003Hf-LP@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6002cb06fbe60dea7c3fb91ee006b4c88e0e86ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6002cb06fbe60dea7c3fb91ee006b4c88e0e86ef

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Mon Jun 14 07:54:48 2010 -0500

msxml3/tests: Correct the sense of a few test failure messages.

---

 dlls/msxml3/tests/domdoc.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 818f628..605628f 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -563,11 +563,11 @@ if (0)
 
     /* try some stupid things */
     r = IXMLDOMDocument_loadXML( doc, NULL, NULL );
-    ok( r == S_FALSE, "loadXML failed\n");
+    ok( r == S_FALSE, "loadXML succeeded\n");
 
     b = VARIANT_TRUE;
     r = IXMLDOMDocument_loadXML( doc, NULL, &b );
-    ok( r == S_FALSE, "loadXML failed\n");
+    ok( r == S_FALSE, "loadXML succeeded\n");
     ok( b == VARIANT_FALSE, "failed to load XML string\n");
 
     /* try to load a document from a nonexistent file */
@@ -578,16 +578,16 @@ if (0)
     V_BSTR(&var) = str;
 
     r = IXMLDOMDocument_load( doc, var, &b);
-    ok( r == S_FALSE, "load (from file) failed\n");
-    ok( b == VARIANT_FALSE, "failed to load XML file\n");
+    ok( r == S_FALSE, "loadXML succeeded\n");
+    ok( b == VARIANT_FALSE, "succeeded in loading XML string\n");
     SysFreeString( str );
 
     /* try load an empty document */
     b = VARIANT_TRUE;
     str = SysAllocString( szEmpty );
     r = IXMLDOMDocument_loadXML( doc, str, &b );
-    ok( r == S_FALSE, "loadXML failed\n");
-    ok( b == VARIANT_FALSE, "failed to load XML string\n");
+    ok( r == S_FALSE, "loadXML succeeded\n");
+    ok( b == VARIANT_FALSE, "succeeded in loading XML string\n");
     SysFreeString( str );
 
     r = IXMLDOMDocument_get_async( doc, &b );
@@ -609,8 +609,8 @@ if (0)
     b = VARIANT_TRUE;
     str = SysAllocString( szIncomplete );
     r = IXMLDOMDocument_loadXML( doc, str, &b );
-    ok( r == S_FALSE, "loadXML failed\n");
-    ok( b == VARIANT_FALSE, "failed to load XML string\n");
+    ok( r == S_FALSE, "loadXML succeeded\n");
+    ok( b == VARIANT_FALSE, "succeeded in loading XML string\n");
     SysFreeString( str );
 
     /* check that there's no document element */



From julliard at winehq.org  Mon Jun 14 13:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 14 Jun 2010 13:01:18 -0500
Subject: Alexandre Julliard : winegcc: Add explicit support for the Cygwin
	platform.
Message-ID: <E1OODyI-0003Hw-O9@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ba9ec152e17f436fb3e73d8e08af811ba3520cef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ba9ec152e17f436fb3e73d8e08af811ba3520cef

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 14 15:58:07 2010 +0200

winegcc: Add explicit support for the Cygwin platform.

On Cygwin we want to use Wine's msvcrt, unlike on Mingw.

---

 tools/winegcc/utils.c   |    2 +-
 tools/winegcc/utils.h   |    2 +-
 tools/winegcc/winegcc.c |   18 +++++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c
index 411a9c1..05b9a65 100644
--- a/tools/winegcc/utils.c
+++ b/tools/winegcc/utils.c
@@ -261,7 +261,7 @@ static char* try_lib_path(const char* dir, const char* pre,
 static file_type guess_lib_type(enum target_platform platform, const char* dir,
                                 const char* library, const char *suffix, char** file)
 {
-    if (platform != PLATFORM_WINDOWS)
+    if (platform != PLATFORM_WINDOWS && platform != PLATFORM_CYGWIN)
     {
         /* Unix shared object */
         if ((*file = try_lib_path(dir, "lib", library, ".so", file_so)))
diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h
index 31cc3b9..d819415 100644
--- a/tools/winegcc/utils.h
+++ b/tools/winegcc/utils.h
@@ -38,7 +38,7 @@ enum target_cpu
 
 enum target_platform
 {
-    PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS
+    PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS, PLATFORM_CYGWIN
 };
 
 void error(const char* s, ...) DECLSPEC_NORETURN;
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 7e9c3f6..0dc7cc4 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -173,6 +173,7 @@ static const struct
     { "macos",   PLATFORM_APPLE },
     { "darwin",  PLATFORM_APPLE },
     { "solaris", PLATFORM_SOLARIS },
+    { "cygwin",  PLATFORM_CYGWIN },
     { "mingw32", PLATFORM_WINDOWS },
     { "windows", PLATFORM_WINDOWS },
     { "winnt",   PLATFORM_WINDOWS }
@@ -230,6 +231,8 @@ static const enum target_cpu build_cpu = CPU_ARM;
 static enum target_platform build_platform = PLATFORM_APPLE;
 #elif defined(__sun)
 static enum target_platform build_platform = PLATFORM_SOLARIS;
+#elif defined(__CYGWIN__)
+static enum target_platform build_platform = PLATFORM_CYGWIN;
 #elif defined(_WIN32)
 static enum target_platform build_platform = PLATFORM_WINDOWS;
 #else
@@ -332,7 +335,8 @@ static void compile(struct options* opts, const char* lang)
             break;
     }
 
-    if (opts->target_platform == PLATFORM_WINDOWS) goto no_compat_defines;
+    if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN)
+        goto no_compat_defines;
 
     if (opts->processor != proc_cpp)
     {
@@ -678,7 +682,7 @@ static void build(struct options* opts)
 
     /* building for Windows is completely different */
 
-    if (opts->target_platform == PLATFORM_WINDOWS)
+    if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN)
     {
         strarray *resources = strarray_alloc();
         char *res_o_name = NULL;
@@ -732,6 +736,7 @@ static void build(struct options* opts)
 
         if (!opts->nostartfiles) add_library(opts, lib_dirs, files, "winecrt0");
         if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine");
+        if (!opts->shared && opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt");
 
         for ( j = 0; j < files->size; j++ )
         {
@@ -763,8 +768,12 @@ static void build(struct options* opts)
 
                         if (ext) *ext = 0;
                         p += 3;
-                        strarray_add(link_args, strmake("-L%s", lib ));
-                        strarray_add(link_args, strmake("-l%s", p ));
+                        /* don't use Wine's msvcrt on mingw */
+                        if (strcmp( p, "msvcrt" ) || opts->target_platform == PLATFORM_CYGWIN)
+                        {
+                            strarray_add(link_args, strmake("-L%s", lib ));
+                            strarray_add(link_args, strmake("-l%s", p ));
+                        }
                         free( lib );
                         break;
                     }
@@ -782,7 +791,6 @@ static void build(struct options* opts)
                 break;
             }
         }
-        if (!opts->shared && (opts->use_msvcrt || opts->unicode_app)) strarray_add(link_args, "-lmsvcrt");
 
         if (res_o_name) compile_resources_to_object( opts, resources, res_o_name );
 



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Alexandre Julliard : include: Define the SPLREG winspool string
	constants.
Message-ID: <E1OOb9u-00048K-0h@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 44fedb5404d24d9771222b460ecae12bc883fb19
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=44fedb5404d24d9771222b460ecae12bc883fb19

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 14 17:25:56 2010 +0200

include: Define the SPLREG winspool string constants.

---

 include/winspool.h |  292 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 292 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=44fedb5404d24d9771222b460ecae12bc883fb19


From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Nikolay Sivov : winhlp32: Added missed Russian resource.
Message-ID: <E1OOb9u-00048a-3Z@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5c5b9a69334117c369c8f7e6759f426e8e4145ad
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5c5b9a69334117c369c8f7e6759f426e8e4145ad

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun 14 23:54:50 2010 +0400

winhlp32: Added missed Russian resource.

---

 programs/winhlp32/Ru.rc |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc
index 165094f..e1a7d25 100644
--- a/programs/winhlp32/Ru.rc
+++ b/programs/winhlp32/Ru.rc
@@ -80,6 +80,14 @@ CAPTION "?????????"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "?????"
+{
+    LTEXT  "?? ???????????", -1, 10, 10, 180, 150
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE
 {



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Damjan Jovanovic : kernel32: Add a CopyFile test.
Message-ID: <E1OOb9u-00048q-5V@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6e5a22c733282a767c0d306d82b88de9520431bf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6e5a22c733282a767c0d306d82b88de9520431bf

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Tue Jun 15 07:22:43 2010 +0200

kernel32: Add a CopyFile test.

---

 dlls/kernel32/tests/file.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 550fc95..7e6b3de 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -640,7 +640,7 @@ static void test_CopyFileA(void)
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError());
     retok = CopyFileA(source, dest, FALSE);
     ok(retok,
-        "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", ret, GetLastError());
+        "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", retok, GetLastError());
     CloseHandle(hfile);
 
     /* copying from a delete-locked source is unreliable */
@@ -648,7 +648,7 @@ static void test_CopyFileA(void)
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError());
     retok = CopyFileA(source, dest, FALSE);
     ok((!retok && GetLastError() == ERROR_SHARING_VIOLATION) || broken(retok) /* 98, Vista, 2k8, 7 */,
-        "copying from a delete-locked file failed (ret=%d, err=%d)\n", ret, GetLastError());
+        "copying from a delete-locked file failed (ret=%d, err=%d)\n", retok, GetLastError());
     CloseHandle(hfile);
 
     /* copying to a write-locked destination fails */
@@ -656,7 +656,7 @@ static void test_CopyFileA(void)
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError());
     retok = CopyFileA(source, dest, FALSE);
     ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION,
-        "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", ret, GetLastError());
+        "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", retok, GetLastError());
     CloseHandle(hfile);
 
     /* copying to a r+w opened, w shared destination mostly succeeds */
@@ -664,7 +664,7 @@ static void test_CopyFileA(void)
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError());
     retok = CopyFileA(source, dest, FALSE);
     ok(retok || broken(!retok && GetLastError() == ERROR_SHARING_VIOLATION) /* Win 9x */,
-        "copying to a r+w opened and w shared file failed (ret=%d, err=%d)\n", ret, GetLastError());
+        "copying to a r+w opened and w shared file failed (ret=%d, err=%d)\n", retok, GetLastError());
     CloseHandle(hfile);
 
     /* copying to a delete-locked destination fails, even when the destination is delete-shared */
@@ -675,10 +675,18 @@ static void test_CopyFileA(void)
     {
         retok = CopyFileA(source, dest, FALSE);
         ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION,
-            "copying to a delete-locked shared file didn't fail (ret=%d, err=%d)\n", ret, GetLastError());
+            "copying to a delete-locked shared file didn't fail (ret=%d, err=%d)\n", retok, GetLastError());
         CloseHandle(hfile);
     }
 
+    /* copy to a file that's opened the way Wine opens the source */
+    hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0);
+    ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError());
+    retok = CopyFileA(source, dest, FALSE);
+    ok(retok || broken(GetLastError() == ERROR_SHARING_VIOLATION) /* Win 9x */,
+        "copying to a file opened the way Wine opens the source failed (ret=%d, err=%d)\n", retok, GetLastError());
+    CloseHandle(hfile);
+
     /* make sure that destination has correct size */
     hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
     ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Dylan Smith : wordpad: Fix failing GetDlgItem that forced screen
	repaint.
Message-ID: <E1OOb9u-000497-92@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 250855bfb0fd5535757bc4707cae7b36c321afac
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=250855bfb0fd5535757bc4707cae7b36c321afac

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Tue Jun 15 00:07:40 2010 -0400

wordpad: Fix failing GetDlgItem that forced screen repaint.

The rebar is the parent of the ruler, not the top level window, so
GetDlgItem was returning NULL when the window is resized.  As a result the
screen was being invalidated and repainted instead of the ruler.

---

 programs/wordpad/wordpad.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 3b8b6bc..d73a79b 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -2546,7 +2546,7 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam )
     HWND hwndEditor = preview_isactive() ? GetDlgItem(hWnd, IDC_PREVIEW) : GetDlgItem(hWnd, IDC_EDITOR);
     HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR);
     HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR);
-    HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER);
+    HWND hRulerWnd = GetDlgItem(hwndReBar, IDC_RULER);
     int rebarHeight = 0;
 
     if (hwndStatusBar)



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: propsys: Mention that the
	functions are stubs.
Message-ID: <E1OOb9u-00049M-AQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 164369736521bc6c2c9e5ea762a0c77b48465757
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=164369736521bc6c2c9e5ea762a0c77b48465757

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon Jun 14 21:26:39 2010 +0200

propsys: Mention that the functions are stubs.

---

 dlls/propsys/propsys_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c
index d2b1744..cdda06d 100644
--- a/dlls/propsys/propsys_main.c
+++ b/dlls/propsys/propsys_main.c
@@ -50,14 +50,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
 HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path)
 {
-    FIXME("%s\n", debugstr_w(path));
+    FIXME("%s stub\n", debugstr_w(path));
 
     return S_OK;
 }
 
 HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR path)
 {
-    FIXME("%s\n", debugstr_w(path));
+    FIXME("%s stub\n", debugstr_w(path));
 
     return E_NOTIMPL;
 }



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Alexandre Julliard : ntdll: Make the DOS area accessible even when
	not using it to hide bugs in broken apps .
Message-ID: <E1OOb9u-00049g-D0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 903488b35470604212d4d3f8ce5a176a7161ba7f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=903488b35470604212d4d3f8ce5a176a7161ba7f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 15 11:36:40 2010 +0200

ntdll: Make the DOS area accessible even when not using it to hide bugs in broken apps.

---

 dlls/ntdll/virtual.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index a9e25c8..23a5d4c 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1355,6 +1355,10 @@ void virtual_init(void)
     virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, heap_base, VIRTUAL_HEAP_SIZE,
                                   VIRTUAL_HEAP_SIZE, NULL, NULL );
     create_view( &heap_view, heap_base, VIRTUAL_HEAP_SIZE, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE );
+
+    /* make the DOS area accessible to hide bugs in broken apps like Excel 2003 */
+    if (wine_mmap_is_in_reserved_area( (void *)0x10000, 0x100000 ) == 1)
+        wine_anon_mmap( (void *)0x10000, 0x100000, PROT_READ | PROT_WRITE, MAP_FIXED );
 }
 
 



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Alexandre Julliard : winedevice: Fix up protections before writing to
	the NT header.
Message-ID: <E1OOb9u-00049x-Et@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fe1360252fea60fc0b0fe55635e53aaaf793de99
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fe1360252fea60fc0b0fe55635e53aaaf793de99

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 15 14:29:25 2010 +0200

winedevice: Fix up protections before writing to the NT header.

---

 programs/winedevice/device.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index bd65654..e0cd07b 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -100,7 +100,10 @@ static HMODULE load_driver_module( const WCHAR *name )
                 if (!rel) goto error;
             }
             /* make sure we don't try again */
+            size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader;
+            VirtualProtect( nt, size, PAGE_READWRITE, &old );
             nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0;
+            VirtualProtect( nt, size, old, NULL );
         }
     }
 



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Alexandre Julliard : winegcc: Load the Unicode argv dynamically from
	the generated stub.
Message-ID: <E1OOb9u-0004AM-GX@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5f7bbb2ab2ce4f2d66e610e8f5039733dea2653e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5f7bbb2ab2ce4f2d66e610e8f5039733dea2653e

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 15 18:28:29 2010 +0200

winegcc: Load the Unicode argv dynamically from the generated stub.

---

 tools/winegcc/winegcc.c |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 0dc7cc4..fd31060 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -561,10 +561,17 @@ static const char *mingw_unicode_hack( struct options *opts )
     char *main_stub = get_temp_file( opts->output_name, ".c" );
 
     create_file( main_stub, 0644,
-                 "#include <stdlib.h>\n"
-                 "extern int wmain(int,wchar_t**);\n"
+                 "#include <stdarg.h>\n"
+                 "#include <windef.h>\n"
+                 "#include <winbase.h>\n"
                  "int main( int argc, char *argv[] )\n{\n"
-                 "    return wmain( argc, __wargv );\n}\n" );
+                 "    int wargc;\n"
+                 "    wchar_t **wargv, **wenv;\n"
+                 "    HMODULE msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n"
+                 "    void __cdecl (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n"
+                 "                                   int *new_mode) = (void *)GetProcAddress( msvcrt, \"__wgetmainargs\" );\n"
+                 "    __wgetmainargs( &wargc, &wargv, &wenv, 0, NULL );\n"
+                 "    return wmain( wargc, wargv );\n}\n" );
     return compile_to_object( opts, main_stub, NULL );
 }
 
@@ -736,7 +743,8 @@ static void build(struct options* opts)
 
         if (!opts->nostartfiles) add_library(opts, lib_dirs, files, "winecrt0");
         if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine");
-        if (!opts->shared && opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt");
+        if (!opts->shared && opts->use_msvcrt && opts->target_platform == PLATFORM_CYGWIN)
+            add_library(opts, lib_dirs, files, "msvcrt");
 
         for ( j = 0; j < files->size; j++ )
         {
@@ -768,12 +776,8 @@ static void build(struct options* opts)
 
                         if (ext) *ext = 0;
                         p += 3;
-                        /* don't use Wine's msvcrt on mingw */
-                        if (strcmp( p, "msvcrt" ) || opts->target_platform == PLATFORM_CYGWIN)
-                        {
-                            strarray_add(link_args, strmake("-L%s", lib ));
-                            strarray_add(link_args, strmake("-l%s", p ));
-                        }
+                        strarray_add(link_args, strmake("-L%s", lib ));
+                        strarray_add(link_args, strmake("-l%s", p ));
                         free( lib );
                         break;
                     }



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Andrew Nguyen : winex11.drv: Report a non-zero COLORRES capability
	value.
Message-ID: <E1OOb9u-0004Ad-Ii@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b4d58fe58faf960f6914a91b4f9ca0052f90689a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b4d58fe58faf960f6914a91b4f9ca0052f90689a

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 15 00:26:20 2010 -0500

winex11.drv: Report a non-zero COLORRES capability value.

---

 dlls/gdi32/tests/dc.c   |   40 ++++++++++++++++++++++++++++++++++++++++
 dlls/winex11.drv/init.c |   10 +++++++++-
 2 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
index b081376..5d56caa 100644
--- a/dlls/gdi32/tests/dc.c
+++ b/dlls/gdi32/tests/dc.c
@@ -556,6 +556,45 @@ static void test_boundsrect_invalid(void)
     DeleteDC(hdc);
 }
 
+static void test_desktop_colorres(void)
+{
+    HDC hdc = GetDC(NULL);
+    int bitspixel, colorres;
+
+    bitspixel = GetDeviceCaps(hdc, BITSPIXEL);
+    ok(bitspixel != 0, "Expected to get valid BITSPIXEL capability value\n");
+
+    colorres = GetDeviceCaps(hdc, COLORRES);
+    ok(colorres != 0 ||
+       broken(colorres == 0), /* Win9x */
+       "Expected to get valid COLORRES capability value\n");
+
+    if (colorres)
+    {
+        switch (bitspixel)
+        {
+        case 8:
+            ok(colorres == 18,
+               "Expected COLORRES to be 18, got %d\n", colorres);
+            break;
+        case 16:
+            ok(colorres == 16,
+               "Expected COLORRES to be 16, got %d\n", colorres);
+            break;
+        case 24:
+        case 32:
+            ok(colorres == 24,
+               "Expected COLORRES to be 24, got %d\n", bitspixel);
+            break;
+        default:
+            ok(0, "Got unknown BITSPIXEL %d with COLORRES %d\n", bitspixel, colorres);
+            break;
+        }
+    }
+
+    DeleteDC(hdc);
+}
+
 START_TEST(dc)
 {
     test_savedc();
@@ -565,4 +604,5 @@ START_TEST(dc)
     test_DC_bitmap();
     test_DeleteDC();
     test_boundsrect_invalid();
+    test_desktop_colorres();
 }
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index ba6cc51..1462b5e 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -235,6 +235,15 @@ INT CDECL X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap )
         return text_caps;
     case CLIPCAPS:
         return CP_REGION;
+    case COLORRES:
+        /* The observed correspondence between BITSPIXEL and COLORRES is:
+         * BITSPIXEL: 8  -> COLORRES: 18
+         * BITSPIXEL: 16 -> COLORRES: 16
+         * BITSPIXEL: 24 -> COLORRES: 24
+         * (note that depth_to_bpp never chooses a bpp of 24)
+         * BITSPIXEL: 32 -> COLORRES: 24 */
+        return (screen_bpp <= 8) ? 18 :
+               (screen_bpp == 32) ? 24 : screen_bpp;
     case RASTERCAPS:
         return (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP |
                 RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS |
@@ -258,7 +267,6 @@ INT CDECL X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap )
     case SIZEPALETTE:
         return palette_size;
     case NUMRESERVED:
-    case COLORRES:
     case PHYSICALWIDTH:
     case PHYSICALHEIGHT:
     case PHYSICALOFFSETX:



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: =?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: wined3d: Improve fglrx glsl spam
	filter.
Message-ID: <E1OOb9u-0004Aw-Mv@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c223e73bbb6dad17123f5bb5fd3f3c34c9bb282d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c223e73bbb6dad17123f5bb5fd3f3c34c9bb282d

Author: Rico Sch?ller <kgbricola at web.de>
Date:   Tue Jun 15 17:20:39 2010 +0200

wined3d: Improve fglrx glsl spam filter.

---

 dlls/wined3d/glsl_shader.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ba16eae..9781a4b 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -203,10 +203,13 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA
         "Fragment shader was successfully compiled to run on hardware.\n",  /* fglrx, with \n */
         "Fragment shader was successfully compiled to run on hardware.",    /* fglrx, no \n   */
         "Fragment shader(s) linked, vertex shader(s) linked. \n ",          /* fglrx, with \n */
+        "Fragment shader(s) linked, vertex shader(s) linked. \n",           /* fglrx, with \n */
         "Fragment shader(s) linked, vertex shader(s) linked.",              /* fglrx, no \n   */
         "Vertex shader(s) linked, no fragment shader(s) defined. \n ",      /* fglrx, with \n */
+        "Vertex shader(s) linked, no fragment shader(s) defined. \n",       /* fglrx, with \n */
         "Vertex shader(s) linked, no fragment shader(s) defined.",          /* fglrx, no \n   */
         "Fragment shader(s) linked, no vertex shader(s) defined. \n ",      /* fglrx, with \n */
+        "Fragment shader(s) linked, no vertex shader(s) defined. \n",       /* fglrx, with \n */
         "Fragment shader(s) linked, no vertex shader(s) defined.",          /* fglrx, no \n   */
     };
 



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Sven Baars : oleacc: Fix Dutch translation.
Message-ID: <E1OOb9u-0004BC-PW@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ec25a446cd45de6be6deffa95b04973fe217e4a3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ec25a446cd45de6be6deffa95b04973fe217e4a3

Author: Sven Baars <sven.wine at gmail.com>
Date:   Tue Jun 15 17:40:05 2010 +0200

oleacc: Fix Dutch translation.

---

 dlls/oleacc/oleacc_Nl.rc |   66 +++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/dlls/oleacc/oleacc_Nl.rc b/dlls/oleacc/oleacc_Nl.rc
index 47daa1f..8c9552b 100644
--- a/dlls/oleacc/oleacc_Nl.rc
+++ b/dlls/oleacc/oleacc_Nl.rc
@@ -25,44 +25,44 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 STRINGTABLE DISCARDABLE
 {
     0 "onbekend object" /* undocumented */
-    ROLE_SYSTEM_TITLEBAR    "titel balk"
-    ROLE_SYSTEM_MENUBAR     "menu balk"
-    ROLE_SYSTEM_SCROLLBAR   "scroll balk"
+    ROLE_SYSTEM_TITLEBAR    "titelbalk"
+    ROLE_SYSTEM_MENUBAR     "menubalk"
+    ROLE_SYSTEM_SCROLLBAR   "scrollbalk"
     ROLE_SYSTEM_GRIP        "handvat"
     ROLE_SYSTEM_SOUND       "geluid"
     ROLE_SYSTEM_CURSOR      "cursor"
-    ROLE_SYSTEM_CARET       "tekst cursor"
-    ROLE_SYSTEM_ALERT       "alarm"
+    ROLE_SYSTEM_CARET       "tekstcursor"
+    ROLE_SYSTEM_ALERT       "waarschuwing"
     ROLE_SYSTEM_WINDOW      "venster"
     ROLE_SYSTEM_CLIENT      "client"
-    ROLE_SYSTEM_MENUPOPUP   "popup menu"
-    ROLE_SYSTEM_MENUITEM    "menu item"
-    ROLE_SYSTEM_TOOLTIP     "tool tip"
+    ROLE_SYSTEM_MENUPOPUP   "popupmenu"
+    ROLE_SYSTEM_MENUITEM    "menu-item"
+    ROLE_SYSTEM_TOOLTIP     "tooltip"
     ROLE_SYSTEM_APPLICATION "programma"
     ROLE_SYSTEM_DOCUMENT    "document"
     ROLE_SYSTEM_PANE        "sectie"
     ROLE_SYSTEM_CHART       "diagram"
-    ROLE_SYSTEM_DIALOG      "keuze"
-    ROLE_SYSTEM_BORDER      "randen"
+    ROLE_SYSTEM_DIALOG      "dialoog"
+    ROLE_SYSTEM_BORDER      "rand"
     ROLE_SYSTEM_GROUPING    "groepering"
-    ROLE_SYSTEM_SEPARATOR   "separator"
-    ROLE_SYSTEM_TOOLBAR     "knoppen balk"
-    ROLE_SYSTEM_STATUSBAR   "status balk"
+    ROLE_SYSTEM_SEPARATOR   "scheidingsteken"
+    ROLE_SYSTEM_TOOLBAR     "gereedschapsbalk"
+    ROLE_SYSTEM_STATUSBAR   "statusbalk"
     ROLE_SYSTEM_TABLE        "tabel"
-    ROLE_SYSTEM_COLUMNHEADER "kolom hoofd"
-    ROLE_SYSTEM_ROWHEADER    "rij hoofd"
+    ROLE_SYSTEM_COLUMNHEADER "kolomtitel"
+    ROLE_SYSTEM_ROWHEADER    "rij-titel"
     ROLE_SYSTEM_COLUMN       "kolom"
     ROLE_SYSTEM_ROW          "rij"
     ROLE_SYSTEM_CELL         "cel"
     ROLE_SYSTEM_LINK         "link"
-    ROLE_SYSTEM_HELPBALLOON  "help ballon"
+    ROLE_SYSTEM_HELPBALLOON  "help-ballon"
     ROLE_SYSTEM_CHARACTER    "karakter"
     ROLE_SYSTEM_LIST         "lijst"
-    ROLE_SYSTEM_LISTITEM     "lijst onderdeel"
-    ROLE_SYSTEM_OUTLINE      "outline"
-    ROLE_SYSTEM_OUTLINEITEM  "outline onderdeel"
-    ROLE_SYSTEM_PAGETAB      "pagina tab"
-    ROLE_SYSTEM_PROPERTYPAGE "eigenschappen pagina"
+    ROLE_SYSTEM_LISTITEM     "lijstonderdeel"
+    ROLE_SYSTEM_OUTLINE      "omtrek"
+    ROLE_SYSTEM_OUTLINEITEM  "omtrekonderdeel"
+    ROLE_SYSTEM_PAGETAB      "paginatab"
+    ROLE_SYSTEM_PROPERTYPAGE "eigenschap-pagina"
     ROLE_SYSTEM_INDICATOR    "indicator"
     ROLE_SYSTEM_GRAPHIC      "grafisch"
     ROLE_SYSTEM_STATICTEXT   "vaste tekst"
@@ -70,23 +70,23 @@ STRINGTABLE DISCARDABLE
     ROLE_SYSTEM_PUSHBUTTON   "drukknop"
     ROLE_SYSTEM_CHECKBUTTON  "aankruisvakje"
     ROLE_SYSTEM_RADIOBUTTON  "radioknop"
-    ROLE_SYSTEM_COMBOBOX     "combo box"
-    ROLE_SYSTEM_DROPLIST     "selectie box"
+    ROLE_SYSTEM_COMBOBOX     "combinatievak"
+    ROLE_SYSTEM_DROPLIST     "selectievak"
     ROLE_SYSTEM_PROGRESSBAR  "voortgangsbalk"
-    ROLE_SYSTEM_DIAL         "draaiknop"
-    ROLE_SYSTEM_HOTKEYFIELD  "hotkey veld"
+    ROLE_SYSTEM_DIAL         "bellen"
+    ROLE_SYSTEM_HOTKEYFIELD  "sneltoetsveld"
     ROLE_SYSTEM_SLIDER       "schuifknop"
-    ROLE_SYSTEM_SPINBUTTON   "spin box"
+    ROLE_SYSTEM_SPINBUTTON   "draaischijf"
     ROLE_SYSTEM_DIAGRAM      "diagram"
     ROLE_SYSTEM_ANIMATION    "animatie"
     ROLE_SYSTEM_EQUATION     "formule"
-    ROLE_SYSTEM_BUTTONDROPDOWN "dropdown knop"
-    ROLE_SYSTEM_BUTTONMENU   "menu knop"
-    ROLE_SYSTEM_BUTTONDROPDOWNGRID "dropdown grid knop"
+    ROLE_SYSTEM_BUTTONDROPDOWN "dropdownknop"
+    ROLE_SYSTEM_BUTTONMENU   "menuknop"
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid dropdownknop"
     ROLE_SYSTEM_WHITESPACE   "lege ruimte"
-    ROLE_SYSTEM_PAGETABLIST  "pagina tab lijst"
+    ROLE_SYSTEM_PAGETABLIST  "paginatablijst"
     ROLE_SYSTEM_CLOCK        "klok"
-    ROLE_SYSTEM_SPLITBUTTON  "splits knop"
-    ROLE_SYSTEM_IPADDRESS    "IP adres"
-    ROLE_SYSTEM_OUTLINEBUTTON "outline knop"
+    ROLE_SYSTEM_SPLITBUTTON  "splitsknop"
+    ROLE_SYSTEM_IPADDRESS    "IP-adres"
+    ROLE_SYSTEM_OUTLINEBUTTON "omtrekknop"
 }



From julliard at winehq.org  Tue Jun 15 13:46:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:50 -0500
Subject: Detlef Riekenberg : winspool: Support the spooler in GetPrinterData.
Message-ID: <E1OOb9u-0004BU-Sw@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ce51d9d0c966c542851940a11c415a085ea436d2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ce51d9d0c966c542851940a11c415a085ea436d2

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Tue Jun 15 17:25:16 2010 +0200

winspool: Support the spooler in GetPrinterData.

---

 dlls/winspool.drv/info.c |   78 ++++++++++++++++++++++++++++++---------------
 tools/wine.inf.in        |    1 +
 2 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 4993a78..3f97ebd 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -5354,27 +5354,40 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
 			       LPCSTR pValueName, LPDWORD pType,
 			       LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded)
 {
-    HKEY hkeyPrinter, hkeySubkey;
+    opened_printer_t *printer;
+    HKEY hkeyPrinters, hkeyPrinter = 0, hkeySubkey = 0;
     DWORD ret;
 
-    TRACE("(%p, %s, %s %p, %p, %08x, %p)\n", hPrinter,
-	  debugstr_a(pKeyName), debugstr_a(pValueName), pType, pData, nSize,
-	  pcbNeeded);
+    TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_a(pKeyName),
+            debugstr_a(pValueName), pType, pData, nSize, pcbNeeded);
 
-    if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter))
-       != ERROR_SUCCESS)
-        return ret;
+    printer = get_opened_printer(hPrinter);
+    if(!printer) return ERROR_INVALID_HANDLE;
 
-    if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey))
-       != ERROR_SUCCESS) {
-        WARN("Can't open subkey %s\n", debugstr_a(pKeyName));
-	RegCloseKey(hkeyPrinter);
-	return ret;
+    ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters);
+    if (ret) return ret;
+
+    if (printer->name) {
+
+        ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter);
+        if (ret) {
+            RegCloseKey(hkeyPrinters);
+            return ret;
+        }
+        if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) {
+            WARN("Can't open subkey %s: %d\n", debugstr_a(pKeyName), ret);
+            RegCloseKey(hkeyPrinter);
+            RegCloseKey(hkeyPrinters);
+            return ret;
+        }
     }
     *pcbNeeded = nSize;
-    ret = RegQueryValueExA(hkeySubkey, pValueName, 0, pType, pData, pcbNeeded);
+    ret = RegQueryValueExA(printer->name ? hkeySubkey : hkeyPrinters, pValueName,
+                          0, pType, pData, pcbNeeded);
+
     RegCloseKey(hkeySubkey);
     RegCloseKey(hkeyPrinter);
+    RegCloseKey(hkeyPrinters);
     return ret;
 }
 
@@ -5385,27 +5398,40 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
 			       LPCWSTR pValueName, LPDWORD pType,
 			       LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded)
 {
-    HKEY hkeyPrinter, hkeySubkey;
+    opened_printer_t *printer;
+    HKEY hkeyPrinters, hkeyPrinter = 0, hkeySubkey = 0;
     DWORD ret;
 
-    TRACE("(%p, %s, %s %p, %p, %08x, %p)\n", hPrinter,
-	  debugstr_w(pKeyName), debugstr_w(pValueName), pType, pData, nSize,
-	  pcbNeeded);
+    TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_w(pKeyName),
+            debugstr_w(pValueName), pType, pData, nSize, pcbNeeded);
 
-    if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter))
-       != ERROR_SUCCESS)
-        return ret;
+    printer = get_opened_printer(hPrinter);
+    if(!printer) return ERROR_INVALID_HANDLE;
 
-    if((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey))
-       != ERROR_SUCCESS) {
-        WARN("Can't open subkey %s\n", debugstr_w(pKeyName));
-	RegCloseKey(hkeyPrinter);
-	return ret;
+    ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters);
+    if (ret) return ret;
+
+    if (printer->name) {
+
+        ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter);
+        if (ret) {
+            RegCloseKey(hkeyPrinters);
+            return ret;
+        }
+        if((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) {
+            WARN("Can't open subkey %s: %d\n", debugstr_w(pKeyName), ret);
+            RegCloseKey(hkeyPrinter);
+            RegCloseKey(hkeyPrinters);
+            return ret;
+        }
     }
     *pcbNeeded = nSize;
-    ret = RegQueryValueExW(hkeySubkey, pValueName, 0, pType, pData, pcbNeeded);
+    ret = RegQueryValueExW(printer->name ? hkeySubkey : hkeyPrinters, pValueName,
+                          0, pType, pData, pcbNeeded);
+
     RegCloseKey(hkeySubkey);
     RegCloseKey(hkeyPrinter);
+    RegCloseKey(hkeyPrinters);
     return ret;
 }
 
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index b8f4a82..63a78d2 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -1009,6 +1009,7 @@ HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"
 
 [Printing]
 HKLM,%Control%\Print\Monitors\Local Port,"Driver",2,"localspl.dll"
+HKLM,%Control%\Print\Printers,"DefaultSpoolDirectory",2,"%11%\spool\printers"
 HKLM,%CurrentVersionNT%\Ports,"FILE:",,""
 HKLM,%CurrentVersionNT%\Ports,"LPT1:",,""
 HKLM,%CurrentVersionNT%\Ports,"LPT2:",,""



From julliard at winehq.org  Tue Jun 15 13:46:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:51 -0500
Subject: Detlef Riekenberg : winspool/tests: Test GetPrinterData/ Ex for the
	print spooler.
Message-ID: <E1OOb9v-0004Bm-63@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fa69a8b1b2be8feb6a60e5ca3e6165822e8b0942
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fa69a8b1b2be8feb6a60e5ca3e6165822e8b0942

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Tue Jun 15 17:25:17 2010 +0200

winspool/tests: Test GetPrinterData/Ex for the print spooler.

---

 dlls/winspool.drv/tests/info.c |  146 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 139 insertions(+), 7 deletions(-)

diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index 1b552fe..be7be7d 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -38,6 +38,7 @@
 #define MAGIC_DEAD  0xdeadbeef
 #define DEFAULT_PRINTER_SIZE 1000
 
+static CHAR defaultspooldirectory[] = "DefaultSpoolDirectory";
 static CHAR does_not_exist_dll[]= "does_not_exist.dll";
 static CHAR does_not_exist[]    = "does_not_exist";
 static CHAR empty[]             = "";
@@ -66,13 +67,14 @@ static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0};
 static WCHAR portname_lpt2W[] = {'L','P','T','2',':',0};
 
 static HANDLE  hwinspool;
-static BOOL  (WINAPI * pGetDefaultPrinterA)(LPSTR, LPDWORD);
-static BOOL  (WINAPI * pSetDefaultPrinterA)(LPCSTR);
-static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD);
 static BOOL  (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR);
+static BOOL  (WINAPI * pEnumPrinterDriversW)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+static BOOL  (WINAPI * pGetDefaultPrinterA)(LPSTR, LPDWORD);
+static DWORD (WINAPI * pGetPrinterDataExA)(HANDLE, LPCSTR, LPCSTR, LPDWORD, LPBYTE, DWORD, LPDWORD);
 static BOOL  (WINAPI * pGetPrinterDriverW)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD);
 static BOOL  (WINAPI * pGetPrinterW)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD);
-static BOOL  (WINAPI * pEnumPrinterDriversW)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+static BOOL  (WINAPI * pSetDefaultPrinterA)(LPCSTR);
+static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD);
 
 
 /* ################################ */
@@ -2329,6 +2331,133 @@ static void test_GetPrinter(void)
 
 /* ########################### */
 
+static void test_GetPrinterData(void)
+{
+    HANDLE hprn = 0;
+    DWORD res;
+    DWORD type;
+    CHAR  buffer[MAX_PATH + 1];
+    DWORD needed;
+    DWORD len;
+
+    /* ToDo: test parameter validation, test with the default printer */
+
+    SetLastError(0xdeadbeef);
+    res = OpenPrinter(NULL, &hprn, NULL);
+    if (!res)
+    {
+        /* printserver not available on win9x */
+        if (!on_win9x)
+            win_skip("Unable to open the printserver: %d\n", GetLastError());
+        return;
+    }
+
+    memset(buffer, '#', sizeof(buffer));
+    buffer[MAX_PATH] = 0;
+    type = 0xdeadbeef;
+    needed = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    res = GetPrinterDataA(hprn, defaultspooldirectory, &type, (LPBYTE) buffer, sizeof(buffer), &needed);
+
+    len = lstrlenA(buffer) + sizeof(CHAR);
+    /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */
+    ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+        "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n",
+        res, type, needed, buffer, len, len * sizeof(WCHAR));
+    /* ToDo: test SPLREG_*  */
+
+    SetLastError(0xdeadbeef);
+    res = ClosePrinter(hprn);
+    ok(res, "ClosePrinter error %d\n", GetLastError());
+}
+
+/* ########################### */
+
+static void test_GetPrinterDataEx(void)
+{
+    HANDLE hprn = 0;
+    DWORD res;
+    DWORD type;
+    CHAR  buffer[MAX_PATH + 1];
+    DWORD needed;
+    DWORD len;
+
+    /* not present before w2k */
+    if (!pGetPrinterDataExA) {
+        win_skip("GetPrinterDataEx not found\n");
+        return;
+    }
+
+    /* ToDo: test parameter validation, test with the default printer */
+
+    SetLastError(0xdeadbeef);
+    res = OpenPrinter(NULL, &hprn, NULL);
+    if (!res)
+    {
+        win_skip("Unable to open the printserver: %d\n", GetLastError());
+        return;
+    }
+
+    /* keyname is ignored, when hprn is a HANDLE for a printserver */
+    memset(buffer, '#', sizeof(buffer));
+    buffer[MAX_PATH] = 0;
+    type = 0xdeadbeef;
+    needed = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, &type,
+                             (LPBYTE) buffer, sizeof(buffer), &needed);
+
+    len = lstrlenA(buffer) + sizeof(CHAR);
+    /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */
+    ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+        "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n",
+        res, type, needed, buffer, len, len * sizeof(WCHAR));
+
+    memset(buffer, '#', sizeof(buffer));
+    buffer[MAX_PATH] = 0;
+    type = 0xdeadbeef;
+    needed = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    res = pGetPrinterDataExA(hprn, "", defaultspooldirectory, &type,
+                             (LPBYTE) buffer, sizeof(buffer), &needed);
+    len = lstrlenA(buffer) + sizeof(CHAR);
+    ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+        "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n",
+        res, type, needed, buffer, len, len * sizeof(WCHAR));
+
+    memset(buffer, '#', sizeof(buffer));
+    buffer[MAX_PATH] = 0;
+    type = 0xdeadbeef;
+    needed = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    /* Wine uses GetPrinterDataEx with "PrinterDriverData" to implement GetPrinterData */
+    res = pGetPrinterDataExA(hprn, "PrinterDriverData", defaultspooldirectory,
+                             &type, (LPBYTE) buffer, sizeof(buffer), &needed);
+    len = lstrlenA(buffer) + sizeof(CHAR);
+    ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+        "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n",
+        res, type, needed, buffer, len, len * sizeof(WCHAR));
+
+
+    memset(buffer, '#', sizeof(buffer));
+    buffer[MAX_PATH] = 0;
+    type = 0xdeadbeef;
+    needed = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    res = pGetPrinterDataExA(hprn, does_not_exist, defaultspooldirectory, &type,
+                             (LPBYTE) buffer, sizeof(buffer), &needed);
+    len = lstrlenA(buffer) + sizeof(CHAR);
+    ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+        "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n",
+        res, type, needed, buffer, len, len * sizeof(WCHAR));
+
+    SetLastError(0xdeadbeef);
+    res = ClosePrinter(hprn);
+    ok(res, "ClosePrinter error %d\n", GetLastError());
+}
+
+/* ########################### */
+
 static void test_GetPrinterDriver(void)
 {
     HANDLE hprn;
@@ -2691,13 +2820,14 @@ static void test_DeviceCapabilities(void)
 START_TEST(info)
 {
     hwinspool = GetModuleHandleA("winspool.drv");
+    pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA");
+    pEnumPrinterDriversW = (void *) GetProcAddress(hwinspool, "EnumPrinterDriversW");
     pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA");
-    pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA");
+    pGetPrinterDataExA = (void *) GetProcAddress(hwinspool, "GetPrinterDataExA");
     pGetPrinterDriverW = (void *) GetProcAddress(hwinspool, "GetPrinterDriverW");
-    pEnumPrinterDriversW = (void *) GetProcAddress(hwinspool, "EnumPrinterDriversW");
     pGetPrinterW = (void *) GetProcAddress(hwinspool, "GetPrinterW");
+    pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA");
     pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW");
-    pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA");
 
     on_win9x = check_win9x();
     if (on_win9x)
@@ -2727,6 +2857,8 @@ START_TEST(info)
     test_GetPrintProcessorDirectory();
     test_OpenPrinter();
     test_GetPrinter();
+    test_GetPrinterData();
+    test_GetPrinterDataEx();
     test_GetPrinterDriver();
     test_SetDefaultPrinter();
     test_XcvDataW_MonitorUI();



From julliard at winehq.org  Tue Jun 15 13:46:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 15 Jun 2010 13:46:51 -0500
Subject: Marcus Meissner : atl: Also handle struct sizes for 64bit.
Message-ID: <E1OOb9v-0004CL-Gi@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b3f042558035c2f98714d833ed3bae66fd608a1e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b3f042558035c2f98714d833ed3bae66fd608a1e

Author: Marcus Meissner <meissner at suse.de>
Date:   Tue Jun 15 11:04:33 2010 +0200

atl: Also handle struct sizes for 64bit.

---

 configure                  |    1 +
 configure.ac               |    1 +
 dlls/atl/atl_main.c        |   13 ++++-
 dlls/atl/tests/Makefile.in |   11 +++++
 dlls/atl/tests/module.c    |  104 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 5e20b93..a01d5f6 100755
--- a/configure
+++ b/configure
@@ -14288,6 +14288,7 @@ wine_fn_config_dll amstream enable_amstream
 wine_fn_config_test dlls/amstream/tests amstream_test
 wine_fn_config_dll appwiz.cpl enable_appwiz_cpl
 wine_fn_config_dll atl enable_atl atl
+wine_fn_config_test dlls/atl/tests atl_test
 wine_fn_config_dll authz enable_authz
 wine_fn_config_dll avicap32 enable_avicap32 avicap32
 wine_fn_config_dll avifil32 enable_avifil32 avifil32
diff --git a/configure.ac b/configure.ac
index eed1487..61f376e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2224,6 +2224,7 @@ WINE_CONFIG_DLL(amstream)
 WINE_CONFIG_TEST(dlls/amstream/tests)
 WINE_CONFIG_DLL(appwiz.cpl)
 WINE_CONFIG_DLL(atl,,[atl])
+WINE_CONFIG_TEST(dlls/atl/tests)
 WINE_CONFIG_DLL(authz)
 WINE_CONFIG_DLL(avicap32,,[avicap32])
 WINE_CONFIG_DLL(avifil32,,[avifil32])
diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index fedfc1a..ea8be78 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -53,7 +53,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     return TRUE;
 }
 
-#define ATLVer1Size 100
+#define ATLVer1Size FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer)
 
 HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h)
 {
@@ -63,9 +63,16 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE
     FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h);
 
     size = pM->cbSize;
-    if  (size != sizeof(_ATL_MODULEW) && size != ATLVer1Size)
+    switch (size)
     {
-        FIXME("Unknown structure version (size %i)\n",size);
+    case ATLVer1Size:
+    case sizeof(_ATL_MODULEW):
+#ifdef _WIN64
+    case sizeof(_ATL_MODULEW) + sizeof(void *):
+#endif
+        break;
+    default:
+        WARN("Unknown structure version (size %i)\n",size);
         return E_INVALIDARG;
     }
 
diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in
new file mode 100644
index 0000000..b9752d4
--- /dev/null
+++ b/dlls/atl/tests/Makefile.in
@@ -0,0 +1,11 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = atl.dll
+IMPORTS   = atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
+
+C_SRCS = \
+	module.c
+
+ at MAKE_TEST_RULES@
diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c
new file mode 100644
index 0000000..294d87b
--- /dev/null
+++ b/dlls/atl/tests/module.c
@@ -0,0 +1,104 @@
+/*
+ * ATL test program
+ *
+ * Copyright 2010 Marcus Meissner
+ *
+ *
+ * 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 <stdarg.h>
+#include <stdio.h>
+
+#define COBJMACROS
+
+#include <wine/test.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wingdi.h>
+#include <winnls.h>
+#include <winerror.h>
+#include <winnt.h>
+#include <initguid.h>
+#include <wtypes.h>
+#include <olectl.h>
+#include <ocidl.h>
+
+struct _ATL_OBJMAP_ENTRYW;
+struct _AtlCreateWndData;
+struct _ATL_TERMFUNC_ELEM;
+
+struct _ATL_MODULEW
+{
+    UINT cbSize;
+    HINSTANCE m_hInst;
+    HINSTANCE m_hInstResource;
+    HINSTANCE m_hInstTypeLib;
+    struct _ATL_OBJMAP_ENTRYW* m_pObjMap;
+    LONG m_nLockCnt;
+    HANDLE m_hHeap;
+    union
+    {
+        CRITICAL_SECTION m_csTypeInfoHolder;
+        CRITICAL_SECTION m_csStaticDataInit;
+    } u;
+    CRITICAL_SECTION m_csWindowCreate;
+    CRITICAL_SECTION m_csObjMap;
+
+    DWORD dwAtlBuildVer;
+    struct _AtlCreateWndData* m_pCreateWndList;
+    BOOL m_bDestroyHeap;
+    GUID* pguidVer;
+    DWORD m_dwHeaps;
+    HANDLE* m_phHeaps;
+    int m_nHeap;
+    struct _ATL_TERMFUNC_ELEM* m_pTermFuncs;
+};
+
+HRESULT WINAPI AtlModuleInit(struct _ATL_MODULEW* pM, struct _ATL_OBJMAP_ENTRYW* p, HINSTANCE h);
+
+#define MAXSIZE 512
+static void test_StructSize(void)
+{
+        struct _ATL_MODULEW  *tst;
+        HRESULT              hres;
+	int i;
+
+        tst = HeapAlloc (GetProcessHeap(),HEAP_ZERO_MEMORY,MAXSIZE);
+
+	for (i=0;i<MAXSIZE;i++) {
+		tst->cbSize = i;
+		hres = AtlModuleInit(tst, NULL, NULL);
+
+		switch (i)  {
+                case FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer ):
+		case sizeof(struct _ATL_MODULEW):
+#ifdef _WIN64
+		case sizeof(struct _ATL_MODULEW) + sizeof(void *):
+#endif
+			ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres);
+			break;
+		default:
+			ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres);
+			break;
+		}
+	}
+}
+
+START_TEST(module)
+{
+        test_StructSize();
+}



From julliard at winehq.org  Wed Jun 16 13:23:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:20 -0500
Subject: Alexandre Julliard : ws2_32/tests: Reorder includes so that winsock.
	h is included before system headers.
Message-ID: <E1OOxGi-0008LE-BI@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 76efc82860b4d2d53e81370e67207d0a842d5e75
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=76efc82860b4d2d53e81370e67207d0a842d5e75

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 15 22:55:48 2010 +0200

ws2_32/tests: Reorder includes so that winsock.h is included before system headers.

---

 dlls/ws2_32/tests/sock.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 6356d9f..c405053 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -20,20 +20,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "ntstatus.h"
+#include <ntstatus.h>
 #define WIN32_NO_STATUS
-#include <windef.h>
-#include <winbase.h>
-#include <winsock2.h>
+#include <windows.h>
 #include <ws2tcpip.h>
 #include <mswsock.h>
+#include <stdio.h>
 #include "wine/test.h"
-#include <winnt.h>
-#include <winerror.h>
-#include <winuser.h>
 
 #define MAX_CLIENTS 4      /* Max number of clients */
 #define NUM_TESTS   4      /* Number of tests performed */



From julliard at winehq.org  Wed Jun 16 13:23:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:20 -0500
Subject: Juan Lang : crypt32: Add support for szCERT_STORE_PROV_PKCS7 to
	CertOpenStore.
Message-ID: <E1OOxGi-0008LU-Dd@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1cff4f5229104d91cc87b84b415587c9c400014a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1cff4f5229104d91cc87b84b415587c9c400014a

Author: Juan Lang <juan.lang at gmail.com>
Date:   Tue Jun 15 10:37:45 2010 -0700

crypt32: Add support for szCERT_STORE_PROV_PKCS7 to CertOpenStore.

---

 dlls/crypt32/store.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c
index da3de56..dc18786 100644
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@@ -799,6 +799,8 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider,
         openFunc = CRYPT_FileOpenStore;
     else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM))
         openFunc = CRYPT_SysOpenStoreW;
+    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7))
+        openFunc = CRYPT_PKCSOpenStore;
     else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION))
         openFunc = CRYPT_CollectionOpenStore;
     else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY))



From julliard at winehq.org  Wed Jun 16 13:23:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:20 -0500
Subject: Juan Lang : crypt32/tests: Test opening serialized stores.
Message-ID: <E1OOxGi-0008Lj-FT@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ecbb3c3f18f261aa4a1e5532af9267dbed6cef3a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ecbb3c3f18f261aa4a1e5532af9267dbed6cef3a

Author: Juan Lang <juan.lang at gmail.com>
Date:   Tue Jun 15 11:23:35 2010 -0700

crypt32/tests: Test opening serialized stores.

---

 dlls/crypt32/tests/store.c |   67 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 67 insertions(+), 0 deletions(-)

diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index de5a9d4..652eac9 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -1764,6 +1764,72 @@ static void testMessageStore(void)
      "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError());
 }
 
+static void testSerializedStore(void)
+{
+    HCERTSTORE store;
+    CRYPT_DATA_BLOB blob;
+
+    if (0)
+    {
+        /* Crash */
+        store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, NULL);
+        store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0,
+         CERT_STORE_DELETE_FLAG, NULL);
+    }
+    blob.cbData = sizeof(serializedStoreWithCert);
+    blob.pbData = (BYTE *)serializedStoreWithCert;
+    store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0,
+     CERT_STORE_DELETE_FLAG, &blob);
+    todo_wine
+    ok(!store && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED,
+     "Expected ERROR_CALL_NOT_IMPLEMENTED, got %08x\n", GetLastError());
+    store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob);
+    todo_wine
+    ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError());
+    if (store)
+    {
+        PCCERT_CONTEXT cert;
+        PCCRL_CONTEXT crl;
+
+        cert = CertEnumCertificatesInStore(store, NULL);
+        ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n",
+         GetLastError());
+        cert = CertEnumCertificatesInStore(store, cert);
+        ok(!cert, "Expected only one cert\n");
+        if (pCertEnumCRLsInStore)
+        {
+            crl = pCertEnumCRLsInStore(store, NULL);
+            ok(!crl, "Expected no CRLs\n");
+        }
+        CertCloseStore(store, 0);
+    }
+    blob.cbData = sizeof(serializedStoreWithCertAndCRL);
+    blob.pbData = (BYTE *)serializedStoreWithCertAndCRL;
+    store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob);
+    todo_wine
+    ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError());
+    if (store)
+    {
+        PCCERT_CONTEXT cert;
+        PCCRL_CONTEXT crl;
+
+        cert = CertEnumCertificatesInStore(store, NULL);
+        ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n",
+         GetLastError());
+        cert = CertEnumCertificatesInStore(store, cert);
+        ok(!cert, "Expected only one cert\n");
+        if (pCertEnumCRLsInStore)
+        {
+            crl = pCertEnumCRLsInStore(store, NULL);
+            ok(crl != NULL, "CertEnumCRLsInStore failed: %08x\n",
+             GetLastError());
+            crl = pCertEnumCRLsInStore(store, crl);
+            ok(!crl, "Expected only one CRL\n");
+        }
+        CertCloseStore(store, 0);
+    }
+}
+
 static void testCertOpenSystemStore(void)
 {
     HCERTSTORE store;
@@ -2520,6 +2586,7 @@ START_TEST(store)
     testFileStore();
     testFileNameStore();
     testMessageStore();
+    testSerializedStore();
 
     testCertOpenSystemStore();
     testCertEnumSystemStore();



From julliard at winehq.org  Wed Jun 16 13:23:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:20 -0500
Subject: Juan Lang : crypt32: Terminate reading a serialized store upon
	reading an empty property.
Message-ID: <E1OOxGi-0008M1-Je@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 02b9e3198aa5a62c4f5b9b885365b699088d8e60
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=02b9e3198aa5a62c4f5b9b885365b699088d8e60

Author: Juan Lang <juan.lang at gmail.com>
Date:   Tue Jun 15 12:17:30 2010 -0700

crypt32: Terminate reading a serialized store upon reading an empty property.

---

 dlls/crypt32/serialize.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c
index 0c366bf..095a492 100644
--- a/dlls/crypt32/serialize.c
+++ b/dlls/crypt32/serialize.c
@@ -472,7 +472,9 @@ static BOOL CRYPT_ReadSerializedStore(void *handle,
                         buf = CryptMemAlloc(propHdr.cb);
                         bufSize = propHdr.cb;
                     }
-                    if (buf)
+                    if (!propHdr.cb)
+                        ; /* Property is empty, nothing to do */
+                    else if (buf)
                     {
                         ret = read_func(handle, buf, propHdr.cb, &read);
                         if (ret && read == propHdr.cb)
@@ -516,7 +518,7 @@ static BOOL CRYPT_ReadSerializedStore(void *handle,
                     else
                         ret = FALSE;
                 }
-            } while (ret && read > 0);
+            } while (ret && read > 0 && propHdr.cb);
             if (contextInterface && context)
             {
                 /* Free the last context added */



From julliard at winehq.org  Wed Jun 16 13:23:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:20 -0500
Subject: Juan Lang : crypt32: Increment current pointer on successful reads
	from memory.
Message-ID: <E1OOxGi-0008MI-Mi@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 06a3cea1cd5dd122b66f6a77feef4c62d5cb91f7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=06a3cea1cd5dd122b66f6a77feef4c62d5cb91f7

Author: Juan Lang <juan.lang at gmail.com>
Date:   Tue Jun 15 11:53:22 2010 -0700

crypt32: Increment current pointer on successful reads from memory.

---

 dlls/crypt32/serialize.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c
index 095a492..ab4c48a 100644
--- a/dlls/crypt32/serialize.c
+++ b/dlls/crypt32/serialize.c
@@ -562,6 +562,12 @@ static BOOL read_blob_wrapper(void *handle, void *buffer, DWORD bytesToRead,
     {
         *bytesRead = min(bytesToRead, reader->blob->cbData - reader->current);
         memcpy(buffer, reader->blob->pbData + reader->current, *bytesRead);
+        reader->current += *bytesRead;
+        ret = TRUE;
+    }
+    else if (reader->current == reader->blob->cbData)
+    {
+        *bytesRead = 0;
         ret = TRUE;
     }
     else



From julliard at winehq.org  Wed Jun 16 13:23:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:20 -0500
Subject: Juan Lang : crypt32: Add support for CERT_STORE_PROV_SERIALIZED to
	CertOpenStore.
Message-ID: <E1OOxGi-0008Ma-RN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 88a016184dcd6a88bfdf046da971fcaf7a8efce1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=88a016184dcd6a88bfdf046da971fcaf7a8efce1

Author: Juan Lang <juan.lang at gmail.com>
Date:   Tue Jun 15 11:54:23 2010 -0700

crypt32: Add support for CERT_STORE_PROV_SERIALIZED to CertOpenStore.

---

 dlls/crypt32/store.c       |   33 +++++++++++++++++++++++++++++++++
 dlls/crypt32/tests/store.c |    3 ---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c
index dc18786..df12e3e 100644
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@@ -724,6 +724,34 @@ static PWINECRYPT_CERTSTORE CRYPT_PKCSOpenStore(HCRYPTPROV hCryptProv,
     return store;
 }
 
+static PWINECRYPT_CERTSTORE CRYPT_SerializedOpenStore(HCRYPTPROV hCryptProv,
+ DWORD dwFlags, const void *pvPara)
+{
+    HCERTSTORE store;
+    const CRYPT_DATA_BLOB *data = pvPara;
+
+    TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);
+
+    if (dwFlags & CERT_STORE_DELETE_FLAG)
+    {
+        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+        return NULL;
+    }
+
+    store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
+     CERT_STORE_CREATE_NEW_FLAG, NULL);
+    if (store)
+    {
+        if (!CRYPT_ReadSerializedStoreFromBlob(data, store))
+        {
+            CertCloseStore(store, 0);
+            store = NULL;
+        }
+    }
+    TRACE("returning %p\n", store);
+    return (PWINECRYPT_CERTSTORE)store;
+}
+
 static PWINECRYPT_CERTSTORE CRYPT_PhysOpenStoreW(HCRYPTPROV hCryptProv,
  DWORD dwFlags, const void *pvPara)
 {
@@ -761,6 +789,9 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider,
         case LOWORD(CERT_STORE_PROV_PKCS7):
             openFunc = CRYPT_PKCSOpenStore;
             break;
+        case LOWORD(CERT_STORE_PROV_SERIALIZED):
+            openFunc = CRYPT_SerializedOpenStore;
+            break;
         case LOWORD(CERT_STORE_PROV_REG):
             openFunc = CRYPT_RegOpenStore;
             break;
@@ -801,6 +832,8 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider,
         openFunc = CRYPT_SysOpenStoreW;
     else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7))
         openFunc = CRYPT_PKCSOpenStore;
+    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SERIALIZED))
+        openFunc = CRYPT_SerializedOpenStore;
     else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION))
         openFunc = CRYPT_CollectionOpenStore;
     else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY))
diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index 652eac9..3d55935 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -1780,11 +1780,9 @@ static void testSerializedStore(void)
     blob.pbData = (BYTE *)serializedStoreWithCert;
     store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0,
      CERT_STORE_DELETE_FLAG, &blob);
-    todo_wine
     ok(!store && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED,
      "Expected ERROR_CALL_NOT_IMPLEMENTED, got %08x\n", GetLastError());
     store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob);
-    todo_wine
     ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError());
     if (store)
     {
@@ -1806,7 +1804,6 @@ static void testSerializedStore(void)
     blob.cbData = sizeof(serializedStoreWithCertAndCRL);
     blob.pbData = (BYTE *)serializedStoreWithCertAndCRL;
     store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob);
-    todo_wine
     ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError());
     if (store)
     {



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winegcc: Add detection for
	--param options.
Message-ID: <E1OOxGj-0008Ms-17@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7d7562d7394c55ac0bc472890e1d5f092e47fba2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7d7562d7394c55ac0bc472890e1d5f092e47fba2

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 15 21:30:01 2010 +0200

winegcc: Add detection for --param options.

---

 tools/winegcc/winegcc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index fd31060..40f44c3 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1189,6 +1189,10 @@ int main(int argc, char **argv)
 		    if (strcmp("-framework", argv[i]) == 0)
 			next_is_arg = 1;
 		    break;
+		case '-':
+		    if (strcmp("--param", argv[i]) == 0)
+			next_is_arg = 1;
+		    break;
 	    }
 	    if (next_is_arg) option_arg = argv[i+1];
 



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Michael Stefaniuc : mapi32: The Portuguese translation is in UTF-8.
Message-ID: <E1OOxGj-0008NG-43@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8e151f51260598f2bbd1e6e9290edaa1ad950696
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8e151f51260598f2bbd1e6e9290edaa1ad950696

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Jun 15 23:12:11 2010 +0200

mapi32: The Portuguese translation is in UTF-8.

---

 dlls/mapi32/Pt.rc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/mapi32/Pt.rc b/dlls/mapi32/Pt.rc
index 4772bcf..ab8a8d1 100644
--- a/dlls/mapi32/Pt.rc
+++ b/dlls/mapi32/Pt.rc
@@ -23,6 +23,8 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
+#pragma code_page(65001)
+
 STRINGTABLE
 {
    IDS_NO_MAPI_CLIENT, "O envio de correio falhou porque n?o existe um cliente de correio MAPI instalado."



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Detlef Riekenberg : winspool: Return ERROR_MORE_DATA,
	when the app probe for the needed buffer size.
Message-ID: <E1OOxGj-0008NX-79@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 18193b193bd80190b51b57ef8312e7e38369ad9a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=18193b193bd80190b51b57ef8312e7e38369ad9a

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Wed Jun 16 00:42:23 2010 +0200

winspool: Return ERROR_MORE_DATA, when the app probe for the needed buffer size.

---

 dlls/winspool.drv/info.c       |   12 ++++++++++++
 dlls/winspool.drv/tests/info.c |   15 +++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 3f97ebd..885b8df 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -5367,6 +5367,8 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
     ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters);
     if (ret) return ret;
 
+    TRACE("printer->name: %s\n", debugstr_w(printer->name));
+
     if (printer->name) {
 
         ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter);
@@ -5385,9 +5387,13 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
     ret = RegQueryValueExA(printer->name ? hkeySubkey : hkeyPrinters, pValueName,
                           0, pType, pData, pcbNeeded);
 
+    if (!ret && !pData) ret = ERROR_MORE_DATA;
+
     RegCloseKey(hkeySubkey);
     RegCloseKey(hkeyPrinter);
     RegCloseKey(hkeyPrinters);
+
+    TRACE("--> %d\n", ret);
     return ret;
 }
 
@@ -5411,6 +5417,8 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
     ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters);
     if (ret) return ret;
 
+    TRACE("printer->name: %s\n", debugstr_w(printer->name));
+
     if (printer->name) {
 
         ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter);
@@ -5429,9 +5437,13 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
     ret = RegQueryValueExW(printer->name ? hkeySubkey : hkeyPrinters, pValueName,
                           0, pType, pData, pcbNeeded);
 
+    if (!ret && !pData) ret = ERROR_MORE_DATA;
+
     RegCloseKey(hkeySubkey);
     RegCloseKey(hkeyPrinter);
     RegCloseKey(hkeyPrinters);
+
+    TRACE("--> %d\n", ret);
     return ret;
 }
 
diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index be7be7d..b86d367 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -2364,6 +2364,14 @@ static void test_GetPrinterData(void)
     ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
         "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n",
         res, type, needed, buffer, len, len * sizeof(WCHAR));
+
+    needed = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    res = GetPrinterDataA(hprn, defaultspooldirectory, NULL, NULL, 0, &needed);
+    ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+        "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n",
+        res, needed, len, len * sizeof(WCHAR));
+
     /* ToDo: test SPLREG_*  */
 
     SetLastError(0xdeadbeef);
@@ -2451,6 +2459,13 @@ static void test_GetPrinterDataEx(void)
         "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n",
         res, type, needed, buffer, len, len * sizeof(WCHAR));
 
+    needed = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed);
+    ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+        "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n",
+        res, needed, len, len * sizeof(WCHAR));
+
     SetLastError(0xdeadbeef);
     res = ClosePrinter(hprn);
     ok(res, "ClosePrinter error %d\n", GetLastError());



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Aric Stewart : usp10/tests: Having numbers in the ScriptStringXtoCP
	tests causes unpredictable behavior .
Message-ID: <E1OOxGj-0008Np-A2@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 25f45df11d6c1ae4d5889d2ccd09751f8741052c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=25f45df11d6c1ae4d5889d2ccd09751f8741052c

Author: Aric Stewart <aric at codeweavers.com>
Date:   Wed Jun 16 15:12:44 2010 +0900

usp10/tests: Having numbers in the ScriptStringXtoCP tests causes unpredictable behavior.

---

 dlls/usp10/tests/usp10.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index e47d7c5..8b1f603 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -1243,7 +1243,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc)
  */
 
     HRESULT         hr;
-    WCHAR           teststr1[] = {'T', 'e', 's', 't', 'e', '1', '2', ' ', 'a', '\0'};
+    WCHAR           teststr1[] = {'T', 'e', 's', 't', 'e', 'a', 'b', ' ', 'a', '\0'};
     void            *String = (WCHAR *) &teststr1;      /* ScriptStringAnalysis needs void */
     int             String_len = (sizeof(teststr1)/sizeof(WCHAR))-1;
     int             Glyphs = String_len * 2 + 16;       /* size of buffer as recommended  */



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Luca Bennati : cryptui: Add Italian translation.
Message-ID: <E1OOxGj-0008O6-Ea@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fd421c34c19013c90ca3ccae4ff17e01d875f725
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fd421c34c19013c90ca3ccae4ff17e01d875f725

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Wed Jun 16 10:06:14 2010 +0200

cryptui: Add Italian translation.

---

 dlls/cryptui/Makefile.in   |    1 +
 dlls/cryptui/cryptui_It.rc |  467 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 468 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd421c34c19013c90ca3ccae4ff17e01d875f725


From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: =?UTF-8?Q?J=C3=B6rg=20H=C3=B6hle=20?=: mmsystem: Log MCI command name
	again .
Message-ID: <E1OOxGj-0008OM-GF@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8f5ec326e11362d73a27af4b6c098c14af38cd0c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8f5ec326e11362d73a27af4b6c098c14af38cd0c

Author: J?rg H?hle <hoehle at users.sourceforge.net>
Date:   Mon Jun 14 20:21:22 2010 +0200

mmsystem: Log MCI command name again.

---

 dlls/mmsystem.dll16/mci16.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c
index f09923a..914636d 100644
--- a/dlls/mmsystem.dll16/mci16.c
+++ b/dlls/mmsystem.dll16/mci16.c
@@ -627,7 +627,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD
     BOOL                to32;
     DWORD_PTR           dwParam2 = p2;
 
-    TRACE("(%04X, %u, %08X, %08lX)\n", wDevID, wMsg, dwParam1, dwParam2);
+    TRACE("(%04X, %s, %08X, %08lX)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2);
 
     switch (wMsg) {
     case MCI_CLOSE:
@@ -651,11 +651,11 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD
 
         switch (res = MCI_MapMsg16To32W(wMsg, dwParam1, &dwParam2)) {
         case MMSYSTEM_MAP_MSGERROR:
-            TRACE("Not handled yet (%u)\n", wMsg);
+            TRACE("%s not handled yet\n", MCI_MessageToString(wMsg));
             dwRet = MCIERR_DRIVER_INTERNAL;
             break;
         case MMSYSTEM_MAP_NOMEM:
-            TRACE("Problem mapping msg=%u from 16 to 32a\n", wMsg);
+            TRACE("Problem mapping %s from 16 to 32a\n", MCI_MessageToString(wMsg));
             dwRet = MCIERR_OUT_OF_MEMORY;
             break;
         case MMSYSTEM_MAP_OK:



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Henri Verbeet : winealsa.drv: Add some missing newlines.
Message-ID: <E1OOxGj-0008Oe-JQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 555e21307e9634c7259734ba70dba965407e8b30
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=555e21307e9634c7259734ba70dba965407e8b30

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Jun 16 10:56:54 2010 +0200

winealsa.drv: Add some missing newlines.

---

 dlls/winealsa.drv/alsa.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 4f0f1ce..5ebb8b7 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -575,10 +575,10 @@ int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent)
         else
             s = "overrun";
         if (!silent)
-            ERR("%s occurred", s);
+            ERR("%s occurred\n", s);
         err = snd_pcm_prepare(pcm);
         if (err < 0) {
-            ERR("cannot recover from %s, prepare failed: %s", s, snd_strerror(err));
+            ERR("cannot recover from %s, prepare failed: %s\n", s, snd_strerror(err));
             return err;
         }
         return 0;
@@ -590,7 +590,7 @@ int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent)
         if (err < 0) {
             err = snd_pcm_prepare(pcm);
             if (err < 0) {
-                ERR("cannot recover from suspend, prepare failed: %s", snd_strerror(err));
+                ERR("cannot recover from suspend, prepare failed: %s\n", snd_strerror(err));
                 return err;
             }
         }



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Paul Chitescu : winex11.drv: Post a WM_SYSCOMMAND SC_CLOSE when the
	window manager asks to close a window .
Message-ID: <E1OOxGj-0008Ow-Nt@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 02674b2b95a4a9125af44470c14ccbcef9608c8d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=02674b2b95a4a9125af44470c14ccbcef9608c8d

Author: Paul Chitescu <paulc at voip.null.ro>
Date:   Wed Jun 16 11:06:15 2010 +0300

winex11.drv: Post a WM_SYSCOMMAND SC_CLOSE when the window manager asks to close a window.

---

 dlls/winex11.drv/event.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 5bb1ecf..64d1992 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -553,11 +553,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
                 }
             }
 
-            /* Simulate pressing Alt+F4 */
-            keybd_event(VK_MENU, 0, 0, 0);
-            keybd_event(VK_F4, 0, 0, 0);
-            keybd_event(VK_F4, 0, KEYEVENTF_KEYUP, 0);
-            keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0);
+            PostMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 );
         }
     }
     else if (protocol == x11drv_atom(WM_TAKE_FOCUS))



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Alexandre Julliard : wrc: Avoid use of toupper/isupper on signed
	chars.
Message-ID: <E1OOxGj-0008PC-Pd@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cdf6947080695a288fec566506cb3dac99e915fd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cdf6947080695a288fec566506cb3dac99e915fd

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 16 12:02:34 2010 +0200

wrc: Avoid use of toupper/isupper on signed chars.

---

 tools/wrc/parser.l |    9 ++++++---
 tools/wrc/parser.y |   10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l
index e048665..834c568 100644
--- a/tools/wrc/parser.l
+++ b/tools/wrc/parser.l
@@ -397,9 +397,12 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base)
 \{			return tBEGIN;
 \}			return tEND;
 
-[0-9]+[lL]?		{ parser_lval.num = xstrtoul(yytext,  0, 10); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; }
-0[xX][0-9A-Fa-f]+[lL]?	{ parser_lval.num = xstrtoul(yytext,  0, 16); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; }
-0[oO][0-7]+[lL]?	{ parser_lval.num = xstrtoul(yytext+2, 0, 8); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; }
+[0-9]+[lL]?		{ parser_lval.num = xstrtoul(yytext,  0, 10);
+                          return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; }
+0[xX][0-9A-Fa-f]+[lL]?	{ parser_lval.num = xstrtoul(yytext,  0, 16);
+                          return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; }
+0[oO][0-7]+[lL]?	{ parser_lval.num = xstrtoul(yytext+2, 0, 8);
+                          return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; }
 
 	/*
 	 * The next two rules scan identifiers and filenames.
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index a62bccf..cfc02f9 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -2172,7 +2172,9 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev
 
     if(key->type == str_char)
     {
-	if((flags & WRC_AF_VIRTKEY) && (!isupper(key->str.cstr[0] & 0xff) && !isdigit(key->str.cstr[0] & 0xff)))
+	if((flags & WRC_AF_VIRTKEY) &&
+           !((key->str.cstr[0] >= 'A' && key->str.cstr[0] <= 'Z') ||
+             (key->str.cstr[0] >= '0' && key->str.cstr[0] <= '9')))
 		yyerror("VIRTKEY code is not equal to ascii value");
 
 	if(key->str.cstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0)
@@ -2181,7 +2183,7 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev
 	}
 	else if(key->str.cstr[0] == '^')
 	{
-		keycode = toupper(key->str.cstr[1]) - '@';
+		keycode = toupper((unsigned char)key->str.cstr[1]) - '@';
 		if(keycode >= ' ')
 			yyerror("Control-code out of range");
 	}
@@ -2190,7 +2192,9 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev
     }
     else
     {
-	if((flags & WRC_AF_VIRTKEY) && !isupperW(key->str.wstr[0]) && !isdigitW(key->str.wstr[0]))
+	if((flags & WRC_AF_VIRTKEY) &&
+           !((key->str.wstr[0] >= 'A' && key->str.wstr[0] <= 'Z') ||
+             (key->str.wstr[0] >= '0' && key->str.wstr[0] <= '9')))
 		yyerror("VIRTKEY code is not equal to ascii value");
 
 	if(key->str.wstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0)



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Alexandre Julliard : user32: Don' t try to alpha blend icons when
	drawing to a monochrome device.
Message-ID: <E1OOxGj-0008PS-Re@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d87715c831de95cd4ba572db275ac2f0e856dfac
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d87715c831de95cd4ba572db275ac2f0e856dfac

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 16 14:54:37 2010 +0200

user32: Don't try to alpha blend icons when drawing to a monochrome device.

---

 dlls/user32/cursoricon.c |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 0f8d7da..9a1810e 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -2054,11 +2054,21 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon,
 
     if (ptr->alpha && (flags & DI_IMAGE))
     {
-        BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
+        BOOL is_mono = FALSE;
 
-        SelectObject( hMemDC, ptr->alpha );
-        if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC,
-                           0, 0, ptr->width, ptr->height, pixelblend )) goto done;
+        if (GetObjectType( hdc_dest ) == OBJ_MEMDC)
+        {
+            BITMAP bm;
+            HBITMAP bmp = GetCurrentObject( hdc_dest, OBJ_BITMAP );
+            is_mono = GetObjectW( bmp, sizeof(bm), &bm ) && bm.bmBitsPixel == 1;
+        }
+        if (!is_mono)
+        {
+            BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
+            SelectObject( hMemDC, ptr->alpha );
+            if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC,
+                               0, 0, ptr->width, ptr->height, pixelblend )) goto done;
+        }
     }
 
     if (flags & DI_MASK)



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Damjan Jovanovic : kernel32: Stop CopyFile from overwriting a file
	with itself.
Message-ID: <E1OOxGj-0008Pk-Tr@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 06de0195d0ac02aabd03beaaffb29cb5b438791e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=06de0195d0ac02aabd03beaaffb29cb5b438791e

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Wed Jun 16 12:00:59 2010 +0200

kernel32: Stop CopyFile from overwriting a file with itself.

---

 dlls/kernel32/path.c       |   37 +++++++++++++++++++++++++++++++++++++
 dlls/kernel32/tests/file.c |    2 +-
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index c319cb5..f0da96c 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -869,6 +869,24 @@ DWORD WINAPI SearchPathA( LPCSTR path, LPCSTR name, LPCSTR ext,
     return ret;
 }
 
+static BOOL is_same_file(HANDLE h1, HANDLE h2)
+{
+    int fd1;
+    BOOL ret = FALSE;
+    if (wine_server_handle_to_fd(h1, 0, &fd1, NULL) == STATUS_SUCCESS)
+    {
+        int fd2;
+        if (wine_server_handle_to_fd(h2, 0, &fd2, NULL) == STATUS_SUCCESS)
+        {
+            struct stat stat1, stat2;
+            if (fstat(fd1, &stat1) == 0 && fstat(fd2, &stat2) == 0)
+                ret = (stat1.st_dev == stat2.st_dev && stat1.st_ino == stat2.st_ino);
+            wine_server_release_fd(h2, fd2);
+        }
+        wine_server_release_fd(h1, fd1);
+    }
+    return ret;
+}
 
 /**************************************************************************
  *           CopyFileW   (KERNEL32.@)
@@ -911,6 +929,25 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists )
         return FALSE;
     }
 
+    if (!fail_if_exists)
+    {
+        BOOL same_file = FALSE;
+        h2 = CreateFileW( dest, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+                         OPEN_EXISTING, 0, 0);
+        if (h2 != INVALID_HANDLE_VALUE)
+        {
+            same_file = is_same_file( h1, h2 );
+            CloseHandle( h2 );
+        }
+        if (same_file)
+        {
+            HeapFree( GetProcessHeap(), 0, buffer );
+            CloseHandle( h1 );
+            SetLastError( ERROR_SHARING_VIOLATION );
+            return FALSE;
+        }
+    }
+
     if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                              fail_if_exists ? CREATE_NEW : CREATE_ALWAYS,
                              info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 7e6b3de..c0a36c7 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -593,7 +593,7 @@ static void test_CopyFileA(void)
 
     /* copying a file to itself must fail */
     retok = CopyFileA(source, source, FALSE);
-    todo_wine ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */),
+    ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */),
         "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError());
 
     /* make the source have not zero size */



From julliard at winehq.org  Wed Jun 16 13:23:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:21 -0500
Subject: Alexandre Julliard : ntdll: Print a warning when failing to set
	execute permissions on a section.
Message-ID: <E1OOxGj-0008Q1-Vh@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b9a13d6d819ac265b1a75005045b42edfecfb704
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b9a13d6d819ac265b1a75005045b42edfecfb704

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 16 20:06:47 2010 +0200

ntdll: Print a warning when failing to set execute permissions on a section.

---

 dlls/ntdll/virtual.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 23a5d4c..84427fb 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1285,7 +1285,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
             (nt->OptionalHeader.AddressOfEntryPoint < sec->VirtualAddress + size))
             vprot |= VPROT_EXEC;
 
-        VIRTUAL_SetProt( view, ptr + sec->VirtualAddress, size, vprot );
+        if (!VIRTUAL_SetProt( view, ptr + sec->VirtualAddress, size, vprot ) && (vprot & VPROT_EXEC))
+            ERR( "failed to set %08x protection on section %.8s, noexec filesystem?\n",
+                 sec->Characteristics, sec->Name );
     }
 
  done:



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi: Avoid useless initializations in
	SetupIterateCabinetA/W.
Message-ID: <E1OOxGk-0008QI-1k@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7057637ff060d423259d109fd42760bfcb8d8b7b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7057637ff060d423259d109fd42760bfcb8d8b7b

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 15 05:20:08 2010 -0500

setupapi: Avoid useless initializations in SetupIterateCabinetA/W.

---

 dlls/setupapi/setupcab.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index d879f9d..0dd2d86 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -563,13 +563,9 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
   TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n",
         debugstr_a(CabinetFile), Reserved, MsgHandler, Context);
 
-  if (! LoadCABINETDll()) 
+  if (!LoadCABINETDll())
     return FALSE;
 
-  memset(&my_hsc, 0, sizeof(SC_HSC_A));
-  pszCabinet[0] = '\0';
-  pszCabPath[0] = '\0';
-
   fpnsize = strlen(CabinetFile);
   if (fpnsize >= MAX_PATH) {
     SetLastError(ERROR_BAD_PATHNAME);
@@ -633,8 +629,6 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved,
 
   if (!CabinetFile) return FALSE;
 
-  memset(&my_hsc, 0, sizeof(SC_HSC_W));
-
   fpnsize = GetFullPathNameW(CabinetFile, MAX_PATH, pszCabPathW, &p);
   if (fpnsize > MAX_PATH) {
     SetLastError(ERROR_BAD_PATHNAME);



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi: Validate the cabinet filename parameter in
	SetupIterateCabinetA.
Message-ID: <E1OOxGk-0008Qa-3r@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bc21be89ab01f56fb9cd337759f45173ab73b28c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bc21be89ab01f56fb9cd337759f45173ab73b28c

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Wed Jun 16 07:34:51 2010 -0500

setupapi: Validate the cabinet filename parameter in SetupIterateCabinetA.

---

 dlls/setupapi/setupcab.c        |    9 ++-
 dlls/setupapi/tests/Makefile.in |    1 +
 dlls/setupapi/tests/setupcab.c  |  121 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index 0dd2d86..185fe17 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -555,17 +555,22 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
 
   SC_HSC_A my_hsc;
   ERF erf;
-  CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p;
+  CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL;
   DWORD fpnsize;
   BOOL ret;
 
-
   TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n",
         debugstr_a(CabinetFile), Reserved, MsgHandler, Context);
 
   if (!LoadCABINETDll())
     return FALSE;
 
+  if (!CabinetFile)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+  }
+
   fpnsize = strlen(CabinetFile);
   if (fpnsize >= MAX_PATH) {
     SetLastError(ERROR_BAD_PATHNAME);
diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in
index ed3a4c0..332d8a0 100644
--- a/dlls/setupapi/tests/Makefile.in
+++ b/dlls/setupapi/tests/Makefile.in
@@ -11,6 +11,7 @@ C_SRCS = \
 	misc.c \
 	parser.c \
 	query.c \
+	setupcab.c \
 	stringtable.c
 
 @MAKE_TEST_RULES@
diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c
new file mode 100644
index 0000000..6e211ce
--- /dev/null
+++ b/dlls/setupapi/tests/setupcab.c
@@ -0,0 +1,121 @@
+/*
+ * Unit tests for SetupIterateCabinet
+ *
+ * Copyright 2007 Hans Leidekker
+ * Copyright 2010 Andrew Nguyen
+ *
+ * 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 <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "setupapi.h"
+#include "wine/test.h"
+
+static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size)
+{
+    HANDLE handle;
+    DWORD written;
+
+    handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+                         FILE_ATTRIBUTE_NORMAL, NULL);
+    WriteFile(handle, data, size, &written, NULL);
+    CloseHandle(handle);
+}
+
+static UINT CALLBACK dummy_callbackA(PVOID Context, UINT Notification,
+                                     UINT_PTR Param1, UINT_PTR Param2)
+{
+    ok(0, "Received unexpected notification (%p, %u, %lu, %lu)\n", Context,
+       Notification, Param1, Param2);
+    return 0;
+}
+
+static void test_invalid_parametersA(void)
+{
+    BOOL ret;
+    char source[MAX_PATH], temp[MAX_PATH];
+    int i;
+
+    const struct
+    {
+        PCSTR CabinetFile;
+        PSP_FILE_CALLBACK MsgHandler;
+        DWORD expected_lasterror;
+        int todo_lasterror;
+    } invalid_parameters[] =
+    {
+        {NULL,                  NULL,            ERROR_INVALID_PARAMETER},
+        {NULL,                  dummy_callbackA, ERROR_INVALID_PARAMETER},
+        {"c:\\nonexistent.cab", NULL,            ERROR_FILE_NOT_FOUND},
+        {"c:\\nonexistent.cab", dummy_callbackA, ERROR_FILE_NOT_FOUND},
+        {source,                NULL,            ERROR_INVALID_DATA, 1},
+        {source,                dummy_callbackA, ERROR_INVALID_DATA, 1},
+    };
+
+    GetTempPathA(sizeof(temp), temp);
+    GetTempFileNameA(temp, "doc", 0, source);
+
+    create_source_fileA(source, NULL, 0);
+
+    for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++)
+    {
+        SetLastError(0xdeadbeef);
+        ret = SetupIterateCabinetA(invalid_parameters[i].CabinetFile, 0,
+                                   invalid_parameters[i].MsgHandler, NULL);
+        ok(!ret, "[%d] Expected SetupIterateCabinetA to return 0, got %d\n", i, ret);
+        if (invalid_parameters[i].todo_lasterror)
+        {
+            todo_wine
+            ok(GetLastError() == invalid_parameters[i].expected_lasterror,
+               "[%d] Expected GetLastError() to return %u, got %u\n",
+               i, invalid_parameters[i].expected_lasterror, GetLastError());
+        }
+        else
+        {
+            ok(GetLastError() == invalid_parameters[i].expected_lasterror,
+               "[%d] Expected GetLastError() to return %u, got %u\n",
+               i, invalid_parameters[i].expected_lasterror, GetLastError());
+        }
+    }
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetA("", 0, NULL, NULL);
+    ok(!ret, "Expected SetupIterateCabinetA to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY ||
+       GetLastError() == ERROR_FILE_NOT_FOUND, /* Win9x/NT4/Win2k */
+       "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n",
+       GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetA("", 0, dummy_callbackA, NULL);
+    ok(!ret, "Expected SetupIterateCabinetA to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY ||
+       GetLastError() == ERROR_FILE_NOT_FOUND, /* Win9x/NT4/Win2k */
+       "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n",
+       GetLastError());
+
+    DeleteFileA(source);
+}
+
+START_TEST(setupcab)
+{
+    test_invalid_parametersA();
+}



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi: Validate the cabinet filename parameter in
	SetupIterateCabinetW.
Message-ID: <E1OOxGk-0008Qr-6E@wine.codeweavers.com>

Module: wine
Branch: master
Commit: debe525f3fa8a5e80994dc9fca46d88f6db49e79
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=debe525f3fa8a5e80994dc9fca46d88f6db49e79

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Wed Jun 16 07:35:57 2010 -0500

setupapi: Validate the cabinet filename parameter in SetupIterateCabinetW.

---

 dlls/setupapi/setupcab.c       |    8 ++-
 dlls/setupapi/tests/setupcab.c |  112 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index 185fe17..4a54ae4 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -622,7 +622,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved,
   UINT len;
   SC_HSC_W my_hsc;
   ERF erf;
-  WCHAR pszCabPathW[MAX_PATH], *p;
+  WCHAR pszCabPathW[MAX_PATH], *p = NULL;
   DWORD fpnsize;
   BOOL ret;
 
@@ -632,7 +632,11 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved,
   if (!LoadCABINETDll())
     return FALSE;
 
-  if (!CabinetFile) return FALSE;
+  if (!CabinetFile)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+  }
 
   fpnsize = GetFullPathNameW(CabinetFile, MAX_PATH, pszCabPathW, &p);
   if (fpnsize > MAX_PATH) {
diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c
index 6e211ce..3c126c9 100644
--- a/dlls/setupapi/tests/setupcab.c
+++ b/dlls/setupapi/tests/setupcab.c
@@ -40,6 +40,17 @@ static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size)
     CloseHandle(handle);
 }
 
+static void create_source_fileW(LPWSTR filename, const BYTE *data, DWORD size)
+{
+    HANDLE handle;
+    DWORD written;
+
+    handle = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+                         FILE_ATTRIBUTE_NORMAL, NULL);
+    WriteFile(handle, data, size, &written, NULL);
+    CloseHandle(handle);
+}
+
 static UINT CALLBACK dummy_callbackA(PVOID Context, UINT Notification,
                                      UINT_PTR Param1, UINT_PTR Param2)
 {
@@ -48,6 +59,14 @@ static UINT CALLBACK dummy_callbackA(PVOID Context, UINT Notification,
     return 0;
 }
 
+static UINT CALLBACK dummy_callbackW(PVOID Context, UINT Notification,
+                                     UINT_PTR Param1, UINT_PTR Param2)
+{
+    ok(0, "Received unexpected notification (%p, %u, %lu, %lu)\n", Context,
+       Notification, Param1, Param2);
+    return 0;
+}
+
 static void test_invalid_parametersA(void)
 {
     BOOL ret;
@@ -115,7 +134,100 @@ static void test_invalid_parametersA(void)
     DeleteFileA(source);
 }
 
+static void test_invalid_parametersW(void)
+{
+    static const WCHAR nonexistentW[] = {'c',':','\\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0};
+    static const WCHAR docW[] = {'d','o','c',0};
+    static const WCHAR emptyW[] = {0};
+
+    BOOL ret;
+    WCHAR source[MAX_PATH], temp[MAX_PATH];
+    int i;
+
+    const struct
+    {
+        PCWSTR CabinetFile;
+        PSP_FILE_CALLBACK MsgHandler;
+        DWORD expected_lasterror;
+        int todo_lasterror;
+    } invalid_parameters[] =
+    {
+        {nonexistentW, NULL,            ERROR_FILE_NOT_FOUND},
+        {nonexistentW, dummy_callbackW, ERROR_FILE_NOT_FOUND},
+        {source,       NULL,            ERROR_INVALID_DATA, 1},
+        {source,       dummy_callbackW, ERROR_INVALID_DATA, 1},
+    };
+
+    ret = SetupIterateCabinetW(NULL, 0, NULL, NULL);
+    if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+    {
+        win_skip("SetupIterateCabinetW is not available\n");
+        return;
+    }
+
+    GetTempPathW(sizeof(temp)/sizeof(WCHAR), temp);
+    GetTempFileNameW(temp, docW, 0, source);
+
+    create_source_fileW(source, NULL, 0);
+
+    for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++)
+    {
+        SetLastError(0xdeadbeef);
+        ret = SetupIterateCabinetW(invalid_parameters[i].CabinetFile, 0,
+                                   invalid_parameters[i].MsgHandler, NULL);
+        ok(!ret, "[%d] Expected SetupIterateCabinetW to return 0, got %d\n", i, ret);
+        if (invalid_parameters[i].todo_lasterror)
+        {
+            todo_wine
+            ok(GetLastError() == invalid_parameters[i].expected_lasterror,
+               "[%d] Expected GetLastError() to return %u, got %u\n",
+               i, invalid_parameters[i].expected_lasterror, GetLastError());
+        }
+        else
+        {
+            ok(GetLastError() == invalid_parameters[i].expected_lasterror,
+               "[%d] Expected GetLastError() to return %u, got %u\n",
+               i, invalid_parameters[i].expected_lasterror, GetLastError());
+        }
+    }
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetW(NULL, 0, NULL, NULL);
+    ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_PARAMETER ||
+       GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Vista/Win2k8 */
+       "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n",
+       GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetW(NULL, 0, dummy_callbackW, NULL);
+    ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_PARAMETER ||
+       GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Vista/Win2k8 */
+       "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n",
+       GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetW(emptyW, 0, NULL, NULL);
+    ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY ||
+       GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */
+       "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n",
+       GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetW(emptyW, 0, dummy_callbackW, NULL);
+    ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY ||
+       GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */
+       "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n",
+       GetLastError());
+
+    DeleteFileW(source);
+}
+
 START_TEST(setupcab)
 {
     test_invalid_parametersA();
+    test_invalid_parametersW();
 }



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi/tests: Add simple enumeration tests for
	SetupIterateCabinetA.
Message-ID: <E1OOxGk-0008RR-Cx@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d0e93cd3ab9955c9b61a8e61498f0c769d829184
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d0e93cd3ab9955c9b61a8e61498f0c769d829184

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 15 05:20:57 2010 -0500

setupapi/tests: Add simple enumeration tests for SetupIterateCabinetA.

---

 dlls/setupapi/tests/setupcab.c |   59 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 deletions(-)

diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c
index 8a4dc9e..801d111 100644
--- a/dlls/setupapi/tests/setupcab.c
+++ b/dlls/setupapi/tests/setupcab.c
@@ -316,6 +316,63 @@ static void test_invalid_callbackW(void)
     DeleteFileW(source);
 }
 
+static const char *expected_files[] = {"tristram", "wine", "shandy"};
+
+static UINT CALLBACK simple_callbackA(PVOID Context, UINT Notification,
+                                      UINT_PTR Param1, UINT_PTR Param2)
+{
+    static int index;
+    int *file_count = Context;
+
+    switch (Notification)
+    {
+    case SPFILENOTIFY_CABINETINFO:
+        index = 0;
+        return NO_ERROR;
+    case SPFILENOTIFY_FILEINCABINET:
+    {
+        FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)Param1;
+
+        (*file_count)++;
+
+        if (index < sizeof(expected_files)/sizeof(char *))
+        {
+            ok(!strcmp(expected_files[index], info->NameInCabinet),
+               "[%d] Expected file \"%s\", got \"%s\"\n",
+               index, expected_files[index], info->NameInCabinet);
+            index++;
+            return FILEOP_SKIP;
+        }
+        else
+        {
+            ok(0, "Unexpectedly enumerated more than number of files in cabinet, index = %d\n", index);
+            return FILEOP_ABORT;
+        }
+    }
+    default:
+        return NO_ERROR;
+    }
+}
+
+static void test_simple_enumerationA(void)
+{
+    BOOL ret;
+    char source[MAX_PATH], temp[MAX_PATH];
+    int enum_count = 0;
+
+    GetTempPathA(sizeof(temp), temp);
+    GetTempFileNameA(temp, "doc", 0, source);
+
+    create_source_fileA(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi));
+
+    ret = SetupIterateCabinetA(source, 0, simple_callbackA, &enum_count);
+    ok(ret == 1, "Expected SetupIterateCabinetA to return 1, got %d\n", ret);
+    ok(enum_count == sizeof(expected_files)/sizeof(char *),
+       "Unexpectedly enumerated %d files\n", enum_count);
+
+    DeleteFileA(source);
+}
+
 START_TEST(setupcab)
 {
     test_invalid_parametersA();
@@ -327,4 +384,6 @@ START_TEST(setupcab)
         test_invalid_callbackA();
         test_invalid_callbackW();
     }
+
+    test_simple_enumerationA();
 }



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi/tests: Add tests to show that
	SetupIterateCabinet handles callback exceptions on newer Windows .
Message-ID: <E1OOxGk-0008R8-9R@wine.codeweavers.com>

Module: wine
Branch: master
Commit: abf63710da2cdca9779fbb60fa38627625b1788b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=abf63710da2cdca9779fbb60fa38627625b1788b

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 15 05:20:45 2010 -0500

setupapi/tests: Add tests to show that SetupIterateCabinet handles callback exceptions on newer Windows.

---

 dlls/setupapi/tests/setupcab.c |   97 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 97 insertions(+), 0 deletions(-)

diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c
index 3c126c9..8a4dc9e 100644
--- a/dlls/setupapi/tests/setupcab.c
+++ b/dlls/setupapi/tests/setupcab.c
@@ -29,6 +29,19 @@
 #include "setupapi.h"
 #include "wine/test.h"
 
+static const BYTE comp_cab_zip_multi[] = {
+    0x4d, 0x53, 0x43, 0x46, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, 0x38, 0xf0, 0x48, 0x20, 0x00, 0x74, 0x72, 0x69, 0x73,
+    0x74, 0x72, 0x61, 0x6d, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1,
+    0x38, 0xf0, 0x48, 0x20, 0x00, 0x77, 0x69, 0x6e, 0x65, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xd1, 0x38, 0xf0, 0x48, 0x20, 0x00, 0x73, 0x68, 0x61, 0x6e, 0x64, 0x79,
+    0x00, 0x67, 0x2c, 0x03, 0x85, 0x23, 0x00, 0x20, 0x00, 0x43, 0x4b, 0xcb, 0x49, 0x2c, 0x2d, 0x4a,
+    0xcd, 0x4b, 0x4e, 0xe5, 0xe5, 0x2a, 0xcd, 0x4b, 0xce, 0xcf, 0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0x4e,
+    0x4d, 0xe1, 0xe5, 0x2a, 0x2e, 0x49, 0x2d, 0xca, 0x03, 0x8a, 0x02, 0x00
+};
+
 static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size)
 {
     HANDLE handle;
@@ -226,8 +239,92 @@ static void test_invalid_parametersW(void)
     DeleteFileW(source);
 }
 
+static UINT CALLBACK crash_callbackA(PVOID Context, UINT Notification,
+                                     UINT_PTR Param1, UINT_PTR Param2)
+{
+    *(volatile char*)0 = 2;
+    return 0;
+}
+
+static UINT CALLBACK crash_callbackW(PVOID Context, UINT Notification,
+                                     UINT_PTR Param1, UINT_PTR Param2)
+{
+    *(volatile char*)0 = 2;
+    return 0;
+}
+
+static void test_invalid_callbackA(void)
+{
+    BOOL ret;
+    char source[MAX_PATH], temp[MAX_PATH];
+
+    GetTempPathA(sizeof(temp), temp);
+    GetTempFileNameA(temp, "doc", 0, source);
+
+    create_source_fileA(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi));
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetA(source, 0, NULL, NULL);
+    ok(!ret, "Expected SetupIterateCabinetA to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_DATA,
+       "Expected GetLastError() to return ERROR_INVALID_DATA, got %u\n",
+       GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetA(source, 0, crash_callbackA, NULL);
+    ok(!ret, "Expected SetupIterateCabinetA to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_DATA,
+       "Expected GetLastError() to return ERROR_INVALID_DATA, got %u\n",
+       GetLastError());
+
+    DeleteFileA(source);
+}
+
+static void test_invalid_callbackW(void)
+{
+    static const WCHAR docW[] = {'d','o','c',0};
+
+    BOOL ret;
+    WCHAR source[MAX_PATH], temp[MAX_PATH];
+
+    ret = SetupIterateCabinetW(NULL, 0, NULL, NULL);
+    if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+    {
+        win_skip("SetupIterateCabinetW is not available\n");
+        return;
+    }
+
+    GetTempPathW(sizeof(temp)/sizeof(WCHAR), temp);
+    GetTempFileNameW(temp, docW, 0, source);
+
+    create_source_fileW(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi));
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetW(source, 0, NULL, NULL);
+    ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_DATA,
+       "Expected GetLastError() to return ERROR_INVALID_DATA, got %u\n",
+       GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = SetupIterateCabinetW(source, 0, crash_callbackW, NULL);
+    ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret);
+    ok(GetLastError() == ERROR_INVALID_DATA,
+       "Expected GetLastError() to return ERROR_INVALID_DATA, got %u\n",
+       GetLastError());
+
+    DeleteFileW(source);
+}
+
 START_TEST(setupcab)
 {
     test_invalid_parametersA();
     test_invalid_parametersW();
+
+    /* Tests crash on NT4/Win9x/Win2k and Wine. */
+    if (0)
+    {
+        test_invalid_callbackA();
+        test_invalid_callbackW();
+    }
 }



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi/tests: Add simple enumeration tests for
	SetupIterateCabinetW.
Message-ID: <E1OOxGk-0008Rh-EP@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 813024d4923c633da5e755ff993d0e3662365a6b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=813024d4923c633da5e755ff993d0e3662365a6b

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 15 05:21:07 2010 -0500

setupapi/tests: Add simple enumeration tests for SetupIterateCabinetW.

---

 dlls/setupapi/tests/setupcab.c |   73 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c
index 801d111..47a9ab9 100644
--- a/dlls/setupapi/tests/setupcab.c
+++ b/dlls/setupapi/tests/setupcab.c
@@ -42,6 +42,8 @@ static const BYTE comp_cab_zip_multi[] = {
     0x4d, 0xe1, 0xe5, 0x2a, 0x2e, 0x49, 0x2d, 0xca, 0x03, 0x8a, 0x02, 0x00
 };
 
+static const WCHAR docW[] = {'d','o','c',0};
+
 static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size)
 {
     HANDLE handle;
@@ -150,7 +152,6 @@ static void test_invalid_parametersA(void)
 static void test_invalid_parametersW(void)
 {
     static const WCHAR nonexistentW[] = {'c',':','\\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0};
-    static const WCHAR docW[] = {'d','o','c',0};
     static const WCHAR emptyW[] = {0};
 
     BOOL ret;
@@ -282,8 +283,6 @@ static void test_invalid_callbackA(void)
 
 static void test_invalid_callbackW(void)
 {
-    static const WCHAR docW[] = {'d','o','c',0};
-
     BOOL ret;
     WCHAR source[MAX_PATH], temp[MAX_PATH];
 
@@ -373,6 +372,73 @@ static void test_simple_enumerationA(void)
     DeleteFileA(source);
 }
 
+static const WCHAR tristramW[] = {'t','r','i','s','t','r','a','m',0};
+static const WCHAR wineW[] = {'w','i','n','e',0};
+static const WCHAR shandyW[] = {'s','h','a','n','d','y',0};
+static const WCHAR *expected_filesW[] = {tristramW, wineW, shandyW};
+
+static UINT CALLBACK simple_callbackW(PVOID Context, UINT Notification,
+                                      UINT_PTR Param1, UINT_PTR Param2)
+{
+    static int index;
+    int *file_count = Context;
+
+    switch (Notification)
+    {
+    case SPFILENOTIFY_CABINETINFO:
+        index = 0;
+        return NO_ERROR;
+    case SPFILENOTIFY_FILEINCABINET:
+    {
+        FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)Param1;
+
+        (*file_count)++;
+
+        if (index < sizeof(expected_filesW)/sizeof(WCHAR *))
+        {
+            ok(!lstrcmpW(expected_filesW[index], info->NameInCabinet),
+               "[%d] Expected file %s, got %s\n",
+               index, wine_dbgstr_w(expected_filesW[index]), wine_dbgstr_w(info->NameInCabinet));
+            index++;
+            return FILEOP_SKIP;
+        }
+        else
+        {
+            ok(0, "Unexpectedly enumerated more than number of files in cabinet, index = %d\n", index);
+            return FILEOP_ABORT;
+        }
+    }
+    default:
+        return NO_ERROR;
+    }
+}
+
+static void test_simple_enumerationW(void)
+{
+    BOOL ret;
+    WCHAR source[MAX_PATH], temp[MAX_PATH];
+    int enum_count = 0;
+
+    ret = SetupIterateCabinetW(NULL, 0, NULL, NULL);
+    if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+    {
+        win_skip("SetupIterateCabinetW is not available\n");
+        return;
+    }
+
+    GetTempPathW(sizeof(temp)/sizeof(WCHAR), temp);
+    GetTempFileNameW(temp, docW, 0, source);
+
+    create_source_fileW(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi));
+
+    ret = SetupIterateCabinetW(source, 0, simple_callbackW, &enum_count);
+    ok(ret == 1, "Expected SetupIterateCabinetW to return 1, got %d\n", ret);
+    ok(enum_count == sizeof(expected_files)/sizeof(WCHAR *),
+       "Unexpectedly enumerated %d files\n", enum_count);
+
+    DeleteFileW(source);
+}
+
 START_TEST(setupcab)
 {
     test_invalid_parametersA();
@@ -386,4 +452,5 @@ START_TEST(setupcab)
     }
 
     test_simple_enumerationA();
+    test_simple_enumerationW();
 }



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi: Exhaustively test the invalid parameter
	handling of SetupDecompressOrCopyFileA .
Message-ID: <E1OOxGk-0008Ry-G5@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 53a563bb384548a5f93ffc34df11b26449d653a4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=53a563bb384548a5f93ffc34df11b26449d653a4

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 15 05:21:19 2010 -0500

setupapi: Exhaustively test the invalid parameter handling of SetupDecompressOrCopyFileA.

---

 dlls/setupapi/tests/misc.c |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index a3abde4..20f2683 100644
--- a/dlls/setupapi/tests/misc.c
+++ b/dlls/setupapi/tests/misc.c
@@ -506,6 +506,22 @@ static void test_SetupDecompressOrCopyFile(void)
     DWORD ret;
     char source[MAX_PATH], target[MAX_PATH], temp[MAX_PATH], *p;
     UINT type;
+    int i;
+
+    const struct
+    {
+        PCSTR source;
+        PCSTR target;
+        PUINT type;
+    } invalid_parameters[] =
+    {
+        {NULL,   NULL,   NULL},
+        {NULL,   NULL,   &type},
+        {NULL,   target, NULL},
+        {NULL,   target, &type},
+        {source, NULL,   NULL},
+        {source, NULL,   &type},
+    };
 
     GetTempPathA(sizeof(temp), temp);
     GetTempFileNameA(temp, "doc", 0, source);
@@ -515,15 +531,25 @@ static void test_SetupDecompressOrCopyFile(void)
 
     create_source_file(source, uncompressed, sizeof(uncompressed));
 
-    ret = SetupDecompressOrCopyFileA(NULL, NULL, NULL);
-    ok(ret == ERROR_INVALID_PARAMETER, "SetupDecompressOrCopyFile failed unexpectedly\n");
-
-    type = FILE_COMPRESSION_NONE;
-    ret = SetupDecompressOrCopyFileA(NULL, target, &type);
-    ok(ret == ERROR_INVALID_PARAMETER, "SetupDecompressOrCopyFile failed unexpectedly\n");
-
-    ret = SetupDecompressOrCopyFileA(source, NULL, &type);
-    ok(ret == ERROR_INVALID_PARAMETER, "SetupDecompressOrCopyFile failed unexpectedly\n");
+    for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++)
+    {
+        type = FILE_COMPRESSION_NONE;
+        ret = SetupDecompressOrCopyFileA(invalid_parameters[i].source,
+                                         invalid_parameters[i].target,
+                                         invalid_parameters[i].type);
+        ok(ret == ERROR_INVALID_PARAMETER,
+           "[%d] Expected SetupDecompressOrCopyFileA to return ERROR_INVALID_PARAMETER, got %u\n",
+           i, ret);
+
+        /* try an invalid compression type */
+        type = 5;
+        ret = SetupDecompressOrCopyFileA(invalid_parameters[i].source,
+                                         invalid_parameters[i].target,
+                                         invalid_parameters[i].type);
+        ok(ret == ERROR_INVALID_PARAMETER,
+           "[%d] Expected SetupDecompressOrCopyFileA to return ERROR_INVALID_PARAMETER, got %u\n",
+           i, ret);
+    }
 
     type = 5; /* try an invalid compression type */
     ret = SetupDecompressOrCopyFileA(source, target, &type);



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi: Only extract the first MSZIP cabinet file
	in SetupDecompressOrExtractFile.
Message-ID: <E1OOxGk-0008SG-J1@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a44506b563af5a1f852c3c26478adb75ffe01b38
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a44506b563af5a1f852c3c26478adb75ffe01b38

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 15 22:05:36 2010 -0500

setupapi: Only extract the first MSZIP cabinet file in SetupDecompressOrExtractFile.

---

 dlls/setupapi/misc.c       |   26 +++++++++++---------
 dlls/setupapi/tests/misc.c |   54 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index 3343cd2..6e83962 100644
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -1456,26 +1456,27 @@ static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target )
     return ret;
 }
 
+struct callback_context
+{
+    int has_extracted;
+    LPCWSTR target;
+};
+
 static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 )
 {
+    struct callback_context *context_info = context;
     FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1;
 
     switch (notification)
     {
     case SPFILENOTIFY_FILEINCABINET:
     {
-        LPCWSTR filename, targetname = context;
-        WCHAR *p;
-
-        if ((p = strrchrW( targetname, '\\' ))) filename = p + 1;
-        else filename = targetname;
+        if (context_info->has_extracted)
+            return FILEOP_ABORT;
 
-        if (!lstrcmpiW( filename, info->NameInCabinet ))
-        {
-            strcpyW( info->FullTargetName, targetname );
-            return FILEOP_DOIT;
-        }
-        return FILEOP_SKIP;
+        strcpyW( info->FullTargetName, context_info->target );
+        context_info->has_extracted = 1;
+        return FILEOP_DOIT;
     }
     default: return NO_ERROR;
     }
@@ -1483,9 +1484,10 @@ static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notificati
 
 static DWORD decompress_file_cab( LPCWSTR source, LPCWSTR target )
 {
+    struct callback_context context = {0, target};
     BOOL ret;
 
-    ret = SetupIterateCabinetW( source, 0, decompress_or_copy_callback, (PVOID)target );
+    ret = SetupIterateCabinetW( source, 0, decompress_or_copy_callback, &context );
 
     if (ret) return ERROR_SUCCESS;
     else return GetLastError();
diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index 20f2683..f2d885d 100644
--- a/dlls/setupapi/tests/misc.c
+++ b/dlls/setupapi/tests/misc.c
@@ -361,6 +361,9 @@ static BOOL compare_file_data(LPSTR file, const BYTE *data, DWORD size)
 static const BYTE uncompressed[] = {
     'u','n','c','o','m','p','r','e','s','s','e','d','\r','\n'
 };
+static const BYTE laurence[] = {
+    'l','a','u','r','e','n','c','e','\r','\n'
+};
 static const BYTE comp_lzx[] = {
     0x53, 0x5a, 0x44, 0x44, 0x88, 0xf0, 0x27, 0x33, 0x41, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xff, 0x00,
     0x00, 0x75, 0x6e, 0x63, 0x6f, 0x6d, 0x70, 0x3f, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64
@@ -394,6 +397,18 @@ static const BYTE comp_cab_zip[] =  {
     0x00, 0x7c, 0x80, 0x26, 0x2b, 0x12, 0x00, 0x0e, 0x00, 0x43, 0x4b, 0x2b, 0xcd, 0x4b, 0xce, 0xcf,
     0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0x4e, 0x4d, 0xe1, 0xe5, 0x02, 0x00
 };
+static const BYTE comp_cab_zip_multi[] = {
+    0x4d, 0x53, 0x43, 0x46, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, 0x38, 0xf0, 0x48, 0x20, 0x00, 0x74, 0x72, 0x69, 0x73,
+    0x74, 0x72, 0x61, 0x6d, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1,
+    0x38, 0xf0, 0x48, 0x20, 0x00, 0x77, 0x69, 0x6e, 0x65, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xd1, 0x38, 0xf0, 0x48, 0x20, 0x00, 0x73, 0x68, 0x61, 0x6e, 0x64, 0x79,
+    0x00, 0x67, 0x2c, 0x03, 0x85, 0x23, 0x00, 0x20, 0x00, 0x43, 0x4b, 0xcb, 0x49, 0x2c, 0x2d, 0x4a,
+    0xcd, 0x4b, 0x4e, 0xe5, 0xe5, 0x2a, 0xcd, 0x4b, 0xce, 0xcf, 0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0x4e,
+    0x4d, 0xe1, 0xe5, 0x2a, 0x2e, 0x49, 0x2d, 0xca, 0x03, 0x8a, 0x02, 0x00
+};
 
 static void test_SetupGetFileCompressionInfo(void)
 {
@@ -523,6 +538,23 @@ static void test_SetupDecompressOrCopyFile(void)
         {source, NULL,   &type},
     };
 
+    const struct
+    {
+        const char *filename;
+        const BYTE *expected_buffer;
+        const size_t buffer_size;
+    } zip_multi_tests[] =
+    {
+        {"tristram",     laurence, sizeof(laurence)},
+        {"tristram.txt", laurence, sizeof(laurence)},
+        {"wine",         laurence, sizeof(laurence)},
+        {"wine.txt",     laurence, sizeof(laurence)},
+        {"shandy",       laurence, sizeof(laurence)},
+        {"shandy.txt",   laurence, sizeof(laurence)},
+        {"deadbeef",     laurence, sizeof(laurence)},
+        {"deadbeef.txt", laurence, sizeof(laurence)},
+    };
+
     GetTempPathA(sizeof(temp), temp);
     GetTempFileNameA(temp, "doc", 0, source);
     GetTempFileNameA(temp, "doc", 0, target);
@@ -624,7 +656,27 @@ static void test_SetupDecompressOrCopyFile(void)
     ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret);
     ok(compare_file_data(target, comp_cab_zip, sizeof(comp_cab_zip)), "incorrect target file\n");
 
-    DeleteFileA(target);
+    /* Show that SetupDecompressOrCopyFileA simply extracts the first file it
+     * finds within the compressed cabinet. Contents are:
+     * tristram -> "laurence\r\n"
+     * wine     -> "uncompressed\r\n"
+     * shandy   -> "sterne\r\n" */
+
+    create_source_file(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi));
+
+    p = strrchr(target, '\\');
+
+    for (i = 0; i < sizeof(zip_multi_tests)/sizeof(zip_multi_tests[0]); i++)
+    {
+        lstrcpyA(p + 1, zip_multi_tests[i].filename);
+
+        ret = SetupDecompressOrCopyFileA(source, target, NULL);
+        ok(!ret, "[%d] SetupDecompressOrCopyFile failed unexpectedly: %d\n", i, ret);
+        ok(compare_file_data(target, zip_multi_tests[i].expected_buffer, zip_multi_tests[i].buffer_size),
+           "[%d] incorrect target file\n", i);
+        DeleteFileA(target);
+    }
+
     DeleteFileA(source);
 }
 



From julliard at winehq.org  Wed Jun 16 13:23:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 16 Jun 2010 13:23:22 -0500
Subject: Andrew Nguyen : setupapi: Add a few traces for
	SetupDecompressOrCopyFileW.
Message-ID: <E1OOxGk-0008SX-Kh@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6456e14055584db1d67238a5e70c3bc42c881695
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6456e14055584db1d67238a5e70c3bc42c881695

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 15 22:06:56 2010 -0500

setupapi: Add a few traces for SetupDecompressOrCopyFileW.

---

 dlls/setupapi/misc.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index 6e83962..e7ccfe6 100644
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -1474,6 +1474,8 @@ static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notificati
         if (context_info->has_extracted)
             return FILEOP_ABORT;
 
+        TRACE("Requesting extraction of cabinet file %s\n",
+              wine_dbgstr_w(info->NameInCabinet));
         strcpyW( info->FullTargetName, context_info->target );
         context_info->has_extracted = 1;
         return FILEOP_DOIT;
@@ -1537,10 +1539,20 @@ DWORD WINAPI SetupDecompressOrCopyFileW( PCWSTR source, PCWSTR target, PUINT typ
     UINT comp;
     DWORD ret = ERROR_INVALID_PARAMETER;
 
+    TRACE("(%s, %s, %p)\n", debugstr_w(source), debugstr_w(target), type);
+
     if (!source || !target) return ERROR_INVALID_PARAMETER;
 
-    if (!type) comp = detect_compression_type( source );
-    else comp = *type;
+    if (!type)
+    {
+        comp = detect_compression_type( source );
+        TRACE("Detected compression type %u\n", comp);
+    }
+    else
+    {
+        comp = *type;
+        TRACE("Using specified compression type %u\n", comp);
+    }
 
     switch (comp)
     {



From julliard at winehq.org  Thu Jun 17 11:17:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:14 -0500
Subject: Michael Stefaniuc : wordpad: Remove untranslated resources from the
	Hungarian translation.
Message-ID: <E1OPHmE-0001uH-Ph@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 31f8cbd513f1ab5dc5e80369a53e867677ea45bf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=31f8cbd513f1ab5dc5e80369a53e867677ea45bf

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jun 17 00:18:08 2010 +0200

wordpad: Remove untranslated resources from the Hungarian translation.

---

 programs/wordpad/Hu.rc |  148 ------------------------------------------------
 1 files changed, 0 insertions(+), 148 deletions(-)

diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc
index 3694062..5f5cb2f 100644
--- a/programs/wordpad/Hu.rc
+++ b/programs/wordpad/Hu.rc
@@ -105,151 +105,3 @@ BEGIN
         MENUITEM "&Paragraph..."      ID_PARAFORMAT
     END
 END
-
-IDM_COLOR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Black",      ID_COLOR_BLACK
-        MENUITEM "Maroon",     ID_COLOR_MAROON
-        MENUITEM "Green",      ID_COLOR_GREEN
-        MENUITEM "Olive"       ID_COLOR_OLIVE
-        MENUITEM "Navy"        ID_COLOR_NAVY
-        MENUITEM "Purple"      ID_COLOR_PURPLE
-        MENUITEM "Teal"        ID_COLOR_TEAL
-        MENUITEM "Gray"        ID_COLOR_GRAY
-        MENUITEM "Silver"      ID_COLOR_SILVER
-        MENUITEM "Red"         ID_COLOR_RED
-        MENUITEM "Lime"        ID_COLOR_LIME
-        MENUITEM "Yellow"      ID_COLOR_YELLOW
-        MENUITEM "Blue"        ID_COLOR_BLUE
-        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
-        MENUITEM "Aqua"        ID_COLOR_AQUA
-        MENUITEM "White"       ID_COLOR_WHITE
-        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
-    END
-END
-
-IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Date and time"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "Available formats",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
-    PUSHBUTTON   "&OK",IDOK,87,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,87,26,40,12
-END
-
-IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "New"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "New document type",-1,3,2,100,15
-    LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
-    PUSHBUTTON   "&OK",IDOK,97,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,97,26,40,12
-END
-
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Paragraph format"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Indentation", -1, 10, 10, 120, 68
-    LTEXT "Left", -1, 15, 22, 40, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Right", -1, 15, 40, 40, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "First line", -1, 15, 58, 40, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alignment", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-END
-
-IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Tabs"
-FONT 8, "MS SHell DLg"
-BEGIN
-    GROUPBOX "Tab stops", -1, 10, 10, 120, 90
-    COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15
-END
-
-IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
-STYLE DS_SYSMODAL
-Caption ""
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Line wrapping", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15
-    GROUPBOX "Toolbars", -1, 150, 10, 120, 85
-    CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
-    LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
-    STRING_TEXT_FILES_TXT,         "Text documents (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
-    STRING_ALL_FILES,              "All documents (*.*)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Left"
-    STRING_ALIGN_RIGHT,           "Right"
-    STRING_ALIGN_CENTER,          "Center"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Text document"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicode text document"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Printer files (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_VIEWPROPS_TITLE,          "Options"
-    STRING_VIEWPROPS_TEXT,           "Text"
-    STRING_VIEWPROPS_RICHTEXT,       "Rich text"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PREVIEW_PRINT,            "Print"
-    STRING_PREVIEW_NEXTPAGE,         "Next page"
-    STRING_PREVIEW_PREVPAGE,         "Previous page"
-    STRING_PREVIEW_TWOPAGES,         "Two pages"
-    STRING_PREVIEW_ONEPAGE,          "One page"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
-    STRING_PREVIEW_CLOSE,            "Close"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END



From julliard at winehq.org  Thu Jun 17 11:17:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:14 -0500
Subject: Michael Stefaniuc : wordpad: "Fix" two errors in the Chinese
	translations.
Message-ID: <E1OPHmE-0001uX-Rs@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fa2b3b1af273597bfe8cc2b5d5c64d02c940f5b6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fa2b3b1af273597bfe8cc2b5d5c64d02c940f5b6

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jun 17 00:17:30 2010 +0200

wordpad: "Fix" two errors in the Chinese translations.

By removing two stale copies of an English STRINGTABLE resource.

---

 programs/wordpad/Zh.rc |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc
index 6adb30a..135f00c 100644
--- a/programs/wordpad/Zh.rc
+++ b/programs/wordpad/Zh.rc
@@ -250,13 +250,6 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "??"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE
@@ -480,11 +473,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_UNITS_CM,             "cm"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
     STRING_PROMPT_SAVE_CHANGES,  "????? '%s'?"
     STRING_SEARCH_FINISHED,      "??????."



From julliard at winehq.org  Thu Jun 17 11:17:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:14 -0500
Subject: Detlef Riekenberg : winspool/tests: Handle the Windows bug in
	GetPrinterDataEx.
Message-ID: <E1OPHmE-0001un-UQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2cbb9a1ee5bca8c0e83d769391469c66aaf7b351
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2cbb9a1ee5bca8c0e83d769391469c66aaf7b351

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Thu Jun 17 00:38:24 2010 +0200

winspool/tests: Handle the Windows bug in GetPrinterDataEx.

---

 dlls/winspool.drv/tests/info.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index b86d367..b81bde4 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -2461,8 +2461,19 @@ static void test_GetPrinterDataEx(void)
 
     needed = 0xdeadbeef;
     SetLastError(0xdeadbeef);
+    /* vista and w2k8 have a bug in GetPrinterDataEx:
+       the current LastError value is returned as result */
     res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed);
-    ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+    ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeadbeef)) &&
+        ((needed == len) || (needed == (len * sizeof(WCHAR)))),
+        "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n",
+        res, needed, len, len * sizeof(WCHAR));
+
+    needed = 0xdeadbeef;
+    SetLastError(0xdeaddead);
+    res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed);
+    ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeaddead)) &&
+        ((needed == len) || (needed == (len * sizeof(WCHAR)))),
         "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n",
         res, needed, len, len * sizeof(WCHAR));
 



From julliard at winehq.org  Thu Jun 17 11:17:14 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:14 -0500
Subject: Luca Bennati : crypt32: Add Italian translation.
Message-ID: <E1OPHmE-0001v3-WD@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 10a61681739f14119a4fdb243e6d3c7d85ed23bc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=10a61681739f14119a4fdb243e6d3c7d85ed23bc

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Wed Jun 16 16:50:37 2010 +0200

crypt32: Add Italian translation.

---

 dlls/crypt32/Makefile.in   |    1 +
 dlls/crypt32/crypt32_It.rc |  244 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 245 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=10a61681739f14119a4fdb243e6d3c7d85ed23bc


From julliard at winehq.org  Thu Jun 17 11:17:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:15 -0500
Subject: Luca Bennati : oleacc: Add Italian translation.
Message-ID: <E1OPHmF-0001vM-71@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 660ead08476b6e5712ab3caf408cb2ac0574de02
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=660ead08476b6e5712ab3caf408cb2ac0574de02

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Wed Jun 16 21:52:27 2010 +0200

oleacc: Add Italian translation.

---

 dlls/oleacc/Makefile.in  |    1 +
 dlls/oleacc/oleacc_It.rc |   96 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 0 deletions(-)

diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in
index 96689a5..2f1a67d 100644
--- a/dlls/oleacc/Makefile.in
+++ b/dlls/oleacc/Makefile.in
@@ -13,6 +13,7 @@ RC_SRCS = \
 	oleacc_De.rc \
 	oleacc_En.rc \
 	oleacc_Fr.rc \
+	oleacc_It.rc \
 	oleacc_Ko.rc \
 	oleacc_Lt.rc \
 	oleacc_Nl.rc \
diff --git a/dlls/oleacc/oleacc_It.rc b/dlls/oleacc/oleacc_It.rc
new file mode 100644
index 0000000..3f99e65
--- /dev/null
+++ b/dlls/oleacc/oleacc_It.rc
@@ -0,0 +1,96 @@
+/*
+ * Italian resources for oleacc
+ *
+ * Copyright 2008 Nikolay Sivov
+ * Copyright 2010 Luca Bennati
+ *
+ * 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 "oleacc.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+    0 "oggetto sconosciuto" /* undocumented */
+    ROLE_SYSTEM_TITLEBAR    "barra del titolo"
+    ROLE_SYSTEM_MENUBAR     "barra dei men?"
+    ROLE_SYSTEM_SCROLLBAR   "barra dello scorrimento"
+    ROLE_SYSTEM_GRIP        "maniglia"
+    ROLE_SYSTEM_SOUND       "suono"
+    ROLE_SYSTEM_CURSOR      "cursore"
+    ROLE_SYSTEM_CARET       "cursore di testo"
+    ROLE_SYSTEM_ALERT       "allarme"
+    ROLE_SYSTEM_WINDOW      "finestra"
+    ROLE_SYSTEM_CLIENT      "client"
+    ROLE_SYSTEM_MENUPOPUP   "men? a comparsa"
+    ROLE_SYSTEM_MENUITEM    "elemento del men?"
+    ROLE_SYSTEM_TOOLTIP     "tooltip"
+    ROLE_SYSTEM_APPLICATION "applicazione"
+    ROLE_SYSTEM_DOCUMENT    "documento"
+    ROLE_SYSTEM_PANE        "pannello"
+    ROLE_SYSTEM_CHART       "diagramma"
+    ROLE_SYSTEM_DIALOG      "dialogo"
+    ROLE_SYSTEM_BORDER      "bordo"
+    ROLE_SYSTEM_GROUPING    "raggruppamento"
+    ROLE_SYSTEM_SEPARATOR   "separatore"
+    ROLE_SYSTEM_TOOLBAR     "barra degli strumenti"
+    ROLE_SYSTEM_STATUSBAR   "barra dello stato"
+    ROLE_SYSTEM_TABLE        "tabella"
+    ROLE_SYSTEM_COLUMNHEADER "intestazione di colonna"
+    ROLE_SYSTEM_ROWHEADER    "intestazione di riga"
+    ROLE_SYSTEM_COLUMN       "colonna"
+    ROLE_SYSTEM_ROW          "riga"
+    ROLE_SYSTEM_CELL         "cella"
+    ROLE_SYSTEM_LINK         "collegamento"
+    ROLE_SYSTEM_HELPBALLOON  "balloon d'aiuto"
+    ROLE_SYSTEM_CHARACTER    "carattere"
+    ROLE_SYSTEM_LIST         "lista"
+    ROLE_SYSTEM_LISTITEM     "elemento della lista"
+    ROLE_SYSTEM_OUTLINE      "schema"
+    ROLE_SYSTEM_OUTLINEITEM  "elemento dello schema"
+    ROLE_SYSTEM_PAGETAB      "linguetta di pagina"
+    ROLE_SYSTEM_PROPERTYPAGE "pagina delle propriet?"
+    ROLE_SYSTEM_INDICATOR    "indicatore"
+    ROLE_SYSTEM_GRAPHIC      "immagine"
+    ROLE_SYSTEM_STATICTEXT   "testo statico"
+    ROLE_SYSTEM_TEXT         "testo"
+    ROLE_SYSTEM_PUSHBUTTON   "pulsante"
+    ROLE_SYSTEM_CHECKBUTTON  "pulsante di controllo"
+    ROLE_SYSTEM_RADIOBUTTON  "pulsante radio"
+    ROLE_SYSTEM_COMBOBOX     "casella combinata"
+    ROLE_SYSTEM_DROPLIST     "lista a discesa"
+    ROLE_SYSTEM_PROGRESSBAR  "barra del progresso"
+    ROLE_SYSTEM_DIAL         "quadrante"
+    ROLE_SYSTEM_HOTKEYFIELD  "campo con scorciatoia da tastiera"
+    ROLE_SYSTEM_SLIDER       "diapositiva"
+    ROLE_SYSTEM_SPINBUTTON   "casella di selezione"
+    ROLE_SYSTEM_DIAGRAM      "diagramma"
+    ROLE_SYSTEM_ANIMATION    "animazione"
+    ROLE_SYSTEM_EQUATION     "equazione"
+    ROLE_SYSTEM_BUTTONDROPDOWN "pulsante a discesa"
+    ROLE_SYSTEM_BUTTONMENU   "bottone men?"
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID "griglia con pulsante a discesa"
+    ROLE_SYSTEM_WHITESPACE   "spazio bianco"
+    ROLE_SYSTEM_PAGETABLIST  "lista delle linguette di pagina"
+    ROLE_SYSTEM_CLOCK        "orologio"
+    ROLE_SYSTEM_SPLITBUTTON  "pulsante di men? combinato"
+    ROLE_SYSTEM_IPADDRESS    "indirizzo IP"
+    ROLE_SYSTEM_OUTLINEBUTTON "pulsante dello schema"
+}



From julliard at winehq.org  Thu Jun 17 11:17:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:15 -0500
Subject: Aric Stewart : usp10/tests: Remove a test for a bug corrected in
	later versions of usp10.
Message-ID: <E1OPHmF-0001vb-9f@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5c5e6a5fc94169e2a26d39ece0cc6fb81d59be79
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5c5e6a5fc94169e2a26d39ece0cc6fb81d59be79

Author: Aric Stewart <aric at codeweavers.com>
Date:   Thu Jun 17 11:23:49 2010 +0900

usp10/tests: Remove a test for a bug corrected in later versions of usp10.
    
The undocumented interaction with ScriptStringCPtoX causing
ScriptStringFree is an undocumented bug that appears to have been
fixed in later versions of Uniscribe. We should not be trying to
conform to that.

---

 dlls/usp10/tests/usp10.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index 8b1f603..7d0f3eb 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -1388,13 +1388,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc)
         hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X);
         ok(hr == E_INVALIDARG, "ScriptStringCPtoX should return E_INVALIDARG not %08x\n", hr);
 
-        hr = ScriptStringFree(&ssa);
-        /*
-         * ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail
-         */
-        ok(hr == E_INVALIDARG ||
-           hr == E_FAIL, /* win2k3 */
-           "ScriptStringFree should return E_INVALIDARG or E_FAIL not %08x\n", hr);
+        ScriptStringFree(&ssa);
     }
 }
 



From julliard at winehq.org  Thu Jun 17 11:17:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:15 -0500
Subject: Aric Stewart : usp10/tests: Windows 95 does not set invalid glyphs to
	0 but instead 0x80.
Message-ID: <E1OPHmF-0001vu-CS@wine.codeweavers.com>

Module: wine
Branch: master
Commit: baaaee823f7f8285b40f07e1a42074aeb155928e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=baaaee823f7f8285b40f07e1a42074aeb155928e

Author: Aric Stewart <aric at codeweavers.com>
Date:   Thu Jun 17 13:11:25 2010 +0900

usp10/tests: Windows 95 does not set invalid glyphs to 0 but instead 0x80.

---

 dlls/usp10/tests/usp10.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index 7d0f3eb..522e035 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -262,8 +262,8 @@ static void test_ScriptShape(HDC hdc)
     hr = ScriptShape(hdc, &sc, test2, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb);
     ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr);
     ok(nb == 4, "Wrong number of items\n");
-    ok(glyphs2[0] == 0, "Incorrect glyph for 0x202B\n");
-    ok(glyphs2[3] == 0, "Incorrect glyph for 0x202C\n");
+    ok(glyphs2[0] == 0 || broken(glyphs2[0] == 0x80), "Incorrect glyph for 0x202B\n");
+    ok(glyphs2[3] == 0 || broken(glyphs2[3] == 0x80), "Incorrect glyph for 0x202C\n");
     ok(logclust[0] == 0, "clusters out of order\n");
     ok(logclust[1] == 1, "clusters out of order\n");
     ok(logclust[2] == 2, "clusters out of order\n");
@@ -640,8 +640,8 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256])
     hr = ScriptGetCMap(hdc, &psc, TestItem2, cInChars, dwFlags, pwOutGlyphs3);
     ok (hr == S_FALSE, "ScriptGetCMap should return S_FALSE not (%08x)\n", hr);
     ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n");
-    ok(pwOutGlyphs3[0] == 0, "Glyph 0 should be default glyph\n");
-    ok(pwOutGlyphs3[3] == 0, "Glyph 0 should be default glyph\n");
+    ok(pwOutGlyphs3[0] == 0 || broken(pwOutGlyphs3[0] == 0x80), "Glyph 0 should be default glyph\n");
+    ok(pwOutGlyphs3[3] == 0 || broken(pwOutGlyphs3[0] == 0x80), "Glyph 0 should be default glyph\n");
 
 
     cInChars = cChars = 9;



From julliard at winehq.org  Thu Jun 17 11:17:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:15 -0500
Subject: Andrew Nguyen : ntdll/tests: Add tests to examine output file part
	pointer behavior for RtlGetFullPathName_U .
Message-ID: <E1OPHmF-0001wB-F9@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bdf583b349a6c721a968ccee66358fc59f24e3fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bdf583b349a6c721a968ccee66358fc59f24e3fc

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Wed Jun 16 23:40:04 2010 -0500

ntdll/tests: Add tests to examine output file part pointer behavior for RtlGetFullPathName_U.

---

 dlls/ntdll/tests/path.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c
index 9d39cdc..90db536 100644
--- a/dlls/ntdll/tests/path.c
+++ b/dlls/ntdll/tests/path.c
@@ -226,6 +226,9 @@ static void test_RtlIsNameLegalDOS8Dot3(void)
 }
 static void test_RtlGetFullPathName_U(void)
 {
+    static const WCHAR emptyW[] = {0};
+    static const WCHAR deadbeefW[] = {'d','e','a','d','b','e','e','f',0};
+
     struct test
     {
         const char *path;
@@ -269,6 +272,26 @@ static void test_RtlGetFullPathName_U(void)
     DWORD reslen;
     UINT len;
 
+    file_part = (WCHAR *)0xdeadbeef;
+    lstrcpyW(rbufferW, deadbeefW);
+    ret = pRtlGetFullPathName_U(NULL, MAX_PATH, rbufferW, &file_part);
+    ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret);
+    ok(!lstrcmpW(rbufferW, deadbeefW),
+       "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW));
+    ok(file_part == (WCHAR *)0xdeadbeef ||
+       file_part == NULL, /* Win7 */
+       "Expected file part pointer to be untouched, got %p\n", file_part);
+
+    file_part = (WCHAR *)0xdeadbeef;
+    lstrcpyW(rbufferW, deadbeefW);
+    ret = pRtlGetFullPathName_U(emptyW, MAX_PATH, rbufferW, &file_part);
+    ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret);
+    ok(!lstrcmpW(rbufferW, deadbeefW),
+       "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW));
+    ok(file_part == (WCHAR *)0xdeadbeef ||
+       file_part == NULL, /* Win7 */
+       "Expected file part pointer to be untouched, got %p\n", file_part);
+
     for (test = tests; test->path; test++)
     {
         len= strlen(test->rname) * sizeof(WCHAR);



From julliard at winehq.org  Thu Jun 17 11:17:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:15 -0500
Subject: Andrew Nguyen : kernel32/tests: Add tests to examine output file part
	pointer behavior for GetFullPathNameA .
Message-ID: <E1OPHmF-0001wU-HE@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 70099e897199ebfc5c4baf48c50fd34ccfcb7e6f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=70099e897199ebfc5c4baf48c50fd34ccfcb7e6f

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Wed Jun 16 23:40:17 2010 -0500

kernel32/tests: Add tests to examine output file part pointer behavior for GetFullPathNameA.

---

 dlls/kernel32/tests/path.c |   56 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
index 8232fdf..6fa4d93 100644
--- a/dlls/kernel32/tests/path.c
+++ b/dlls/kernel32/tests/path.c
@@ -1569,6 +1569,61 @@ if (0)
       "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError());
 }
 
+static void test_GetFullPathNameA(void)
+{
+    char output[MAX_PATH], *filepart;
+    DWORD ret;
+    int is_win9x, i;
+
+    const struct
+    {
+        LPCSTR name;
+        DWORD len;
+        LPSTR buffer;
+        LPSTR *lastpart;
+        int win9x_crash;
+    } invalid_parameters[] =
+    {
+        {NULL, 0,        NULL,   NULL,      1},
+        {NULL, MAX_PATH, NULL,   NULL,      1},
+        {NULL, MAX_PATH, output, NULL,      1},
+        {NULL, MAX_PATH, output, &filepart, 1},
+        {"",   0,        NULL,   NULL},
+        {"",   MAX_PATH, NULL,   NULL},
+        {"",   MAX_PATH, output, NULL},
+        {"",   MAX_PATH, output, &filepart},
+    };
+
+    SetLastError(0xdeadbeef);
+    ret = GetFullPathNameW(NULL, 0, NULL, NULL);
+    is_win9x = !ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED;
+
+    if (is_win9x)
+        win_skip("Skipping some tests that cause GetFullPathNameA to crash on Win9x\n");
+
+    for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++)
+    {
+        if (is_win9x && invalid_parameters[i].win9x_crash)
+            continue;
+
+        SetLastError(0xdeadbeef);
+        strcpy(output, "deadbeef");
+        filepart = (char *)0xdeadbeef;
+        ret = GetFullPathNameA(invalid_parameters[i].name,
+                               invalid_parameters[i].len,
+                               invalid_parameters[i].buffer,
+                               invalid_parameters[i].lastpart);
+        ok(!ret, "[%d] Expected GetFullPathNameA to return 0, got %u\n", i, ret);
+        ok(!strcmp(output, "deadbeef"), "[%d] Expected the output buffer to be unchanged, got \"%s\"\n", i, output);
+        ok(filepart == (char *)0xdeadbeef, "[%d] Expected output file part pointer to be untouched, got %p\n", i, filepart);
+        ok(GetLastError() == 0xdeadbeef ||
+           GetLastError() == ERROR_BAD_PATHNAME || /* Win9x */
+           GetLastError() == ERROR_INVALID_NAME, /* Win7 */
+           "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n",
+           i, GetLastError());
+    }
+}
+
 static void init_pointers(void)
 {
     HMODULE hKernel32 = GetModuleHandleA("kernel32.dll");
@@ -1610,4 +1665,5 @@ START_TEST(path)
     test_drive_letter_case();
     test_SearchPathA();
     test_SearchPathW();
+    test_GetFullPathNameA();
 }



From julliard at winehq.org  Thu Jun 17 11:17:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:15 -0500
Subject: Andrew Nguyen : kernel32/tests: Add tests to examine output file part
	pointer behavior for GetFullPathNameW .
Message-ID: <E1OPHmF-0001wl-JK@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1029167232fa7b5492f3cc0537120a911cbf4080
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1029167232fa7b5492f3cc0537120a911cbf4080

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Wed Jun 16 23:40:26 2010 -0500

kernel32/tests: Add tests to examine output file part pointer behavior for GetFullPathNameW.

---

 dlls/kernel32/tests/path.c |   60 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
index 6fa4d93..e6d7e56 100644
--- a/dlls/kernel32/tests/path.c
+++ b/dlls/kernel32/tests/path.c
@@ -1624,6 +1624,65 @@ static void test_GetFullPathNameA(void)
     }
 }
 
+static void test_GetFullPathNameW(void)
+{
+    static const WCHAR emptyW[] = {0};
+    static const WCHAR deadbeefW[] = {'d','e','a','d','b','e','e','f',0};
+
+    WCHAR output[MAX_PATH], *filepart;
+    DWORD ret;
+    int i;
+
+    const struct
+    {
+        LPCWSTR name;
+        DWORD len;
+        LPWSTR buffer;
+        LPWSTR *lastpart;
+        int win7_expect;
+    } invalid_parameters[] =
+    {
+        {NULL,   0,        NULL,   NULL},
+        {NULL,   0,        NULL,   &filepart, 1},
+        {NULL,   MAX_PATH, NULL,   NULL},
+        {NULL,   MAX_PATH, output, NULL},
+        {NULL,   MAX_PATH, output, &filepart, 1},
+        {emptyW, 0,        NULL,   NULL},
+        {emptyW, 0,        NULL,   &filepart, 1},
+        {emptyW, MAX_PATH, NULL,   NULL},
+        {emptyW, MAX_PATH, output, NULL},
+        {emptyW, MAX_PATH, output, &filepart, 1},
+    };
+
+    SetLastError(0xdeadbeef);
+    ret = GetFullPathNameW(NULL, 0, NULL, NULL);
+    if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+    {
+        win_skip("GetFullPathNameW is not available\n");
+        return;
+    }
+
+    for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++)
+    {
+        SetLastError(0xdeadbeef);
+        lstrcpyW(output, deadbeefW);
+        filepart = (WCHAR *)0xdeadbeef;
+        ret = GetFullPathNameW(invalid_parameters[i].name,
+                               invalid_parameters[i].len,
+                               invalid_parameters[i].buffer,
+                               invalid_parameters[i].lastpart);
+        ok(!ret, "[%d] Expected GetFullPathNameW to return 0, got %u\n", i, ret);
+        ok(!lstrcmpW(output, deadbeefW), "[%d] Expected the output buffer to be unchanged, got %s\n", i, wine_dbgstr_w(output));
+        ok(filepart == (WCHAR *)0xdeadbeef ||
+           (invalid_parameters[i].win7_expect && filepart == NULL),
+           "[%d] Expected output file part pointer to be untouched, got %p\n", i, filepart);
+        ok(GetLastError() == 0xdeadbeef ||
+           GetLastError() == ERROR_INVALID_NAME, /* Win7 */
+           "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n",
+           i, GetLastError());
+    }
+}
+
 static void init_pointers(void)
 {
     HMODULE hKernel32 = GetModuleHandleA("kernel32.dll");
@@ -1666,4 +1725,5 @@ START_TEST(path)
     test_SearchPathA();
     test_SearchPathW();
     test_GetFullPathNameA();
+    test_GetFullPathNameW();
 }



From julliard at winehq.org  Thu Jun 17 11:17:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:15 -0500
Subject: Henri Verbeet : ntdll: The FPU control word for newly created threads
	is 0x27f.
Message-ID: <E1OPHmF-0001x3-PJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 772a5c7c09a2568cd0ad2358f307c3eaa5fe4912
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=772a5c7c09a2568cd0ad2358f307c3eaa5fe4912

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Jun 17 10:17:15 2010 +0200

ntdll: The FPU control word for newly created threads is 0x27f.

This fixes a regression introduced by
e6611e22fb037a879205f1330d1a3485f9f18705.

---

 dlls/kernel32/tests/thread.c |   84 ++++++++++++++++++++++++++++++++++++++++++
 dlls/ntdll/signal_i386.c     |   10 +++++
 dlls/ntdll/signal_x86_64.c   |   10 +++++
 3 files changed, 104 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index 4c4e764..df87ae0 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -1329,6 +1329,87 @@ static void test_ThreadErrorMode(void)
     pSetThreadErrorMode(oldmode, NULL);
 }
 
+static inline void set_fpu_cw(WORD cw)
+{
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+    __asm__ volatile ("fnclex; fldcw %0" : : "m" (cw));
+#endif
+}
+
+static inline WORD get_fpu_cw(void)
+{
+    WORD cw = 0;
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+    __asm__ volatile ("fnstcw %0" : "=m" (cw));
+#endif
+    return cw;
+}
+
+struct fpu_thread_ctx
+{
+    WORD cw;
+    HANDLE finished;
+};
+
+static DWORD WINAPI fpu_thread(void *param)
+{
+    struct fpu_thread_ctx *ctx = param;
+    BOOL ret;
+
+    ctx->cw = get_fpu_cw();
+
+    ret = SetEvent(ctx->finished);
+    ok(ret, "SetEvent failed, last error %#x.\n", GetLastError());
+
+    return 0;
+}
+
+static WORD get_thread_fpu_cw(void)
+{
+    struct fpu_thread_ctx ctx;
+    DWORD tid, res;
+    HANDLE thread;
+
+    ctx.finished = CreateEvent(NULL, FALSE, FALSE, NULL);
+    ok(!!ctx.finished, "Failed to create event, last error %#x.\n", GetLastError());
+
+    thread = CreateThread(NULL, 0, fpu_thread, &ctx, 0, &tid);
+    ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError());
+
+    res = WaitForSingleObject(ctx.finished, INFINITE);
+    ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError());
+
+    res = CloseHandle(ctx.finished);
+    ok(!!res, "Failed to close event handle, last error %#x.\n", GetLastError());
+
+    return ctx.cw;
+}
+
+static void test_thread_fpu_cw(void)
+{
+    WORD initial_cw, cw;
+
+    initial_cw = get_fpu_cw();
+    ok(initial_cw == 0x37f, "Expected FPU control word 0x37f, got %#x.\n", initial_cw);
+
+    cw = get_thread_fpu_cw();
+    ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw);
+
+    set_fpu_cw(0xf60);
+    cw = get_fpu_cw();
+    ok(cw == 0xf60, "Expected FPU control word 0xf60, got %#x.\n", cw);
+
+    cw = get_thread_fpu_cw();
+    ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw);
+
+    cw = get_fpu_cw();
+    ok(cw == 0xf60, "Expected FPU control word 0xf60, got %#x.\n", cw);
+
+    set_fpu_cw(initial_cw);
+    cw = get_fpu_cw();
+    ok(cw == initial_cw, "Expected FPU control word %#x, got %#x.\n", initial_cw, cw);
+}
+
 START_TEST(thread)
 {
    HINSTANCE lib;
@@ -1401,4 +1482,7 @@ START_TEST(thread)
    test_RegisterWaitForSingleObject();
    test_TLS();
    test_ThreadErrorMode();
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+   test_thread_fpu_cw();
+#endif
 }
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 7a60c2a..b003436 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2177,6 +2177,16 @@ void signal_init_thread( TEB *teb )
     wine_ldt_set_flags( &fs_entry, WINE_LDT_FLAGS_DATA|WINE_LDT_FLAGS_32BIT );
     wine_ldt_init_fs( thread_data->fs, &fs_entry );
     thread_data->gs = wine_get_gs();
+
+    if (teb->Peb->ProcessHeap) /* Not for the inital thread. */
+    {
+        const WORD fpu_cw = 0x27f;
+#ifdef __GNUC__
+        __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw));
+#else
+        FIXME("FPU setup not implemented for this platform.\n");
+#endif
+    }
 }
 
 /**********************************************************************
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index f509006..188224d 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2344,6 +2344,16 @@ void signal_init_thread( TEB *teb )
     ss.ss_size  = signal_stack_size;
     ss.ss_flags = 0;
     if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" );
+
+    if (teb->Peb->ProcessHeap) /* Not for the inital thread. */
+    {
+        const WORD fpu_cw = 0x27f;
+#ifdef __GNUC__
+        __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw));
+#else
+        FIXME("FPU setup not implemented for this platform.\n");
+#endif
+    }
 }
 
 /**********************************************************************



From julliard at winehq.org  Thu Jun 17 11:17:15 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:15 -0500
Subject: Michael Stefaniuc : notepad: Fix an error in the Czech translation.
Message-ID: <E1OPHmF-0001xL-Uq@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1734d098c9e34affde6fca6c30385bffb76e830b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1734d098c9e34affde6fca6c30385bffb76e830b

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jun 17 11:38:53 2010 +0200

notepad: Fix an error in the Czech translation.

Translation by Radek Vokal.

---

 programs/notepad/Cs.rc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/programs/notepad/Cs.rc b/programs/notepad/Cs.rc
index 745062d..016f61e 100644
--- a/programs/notepad/Cs.rc
+++ b/programs/notepad/Cs.rc
@@ -59,6 +59,7 @@ POPUP "U&pravit" {
 POPUP "&Hled?n?" {
   MENUITEM "&Hledej...\tCtrl+F",   CMD_SEARCH
   MENUITEM "&Najdi dal??\tF3",  CMD_SEARCH_NEXT
+  MENUITEM "Nah&radit...\tCtrl+H", CMD_REPLACE
  }
 POPUP "&N?pov?da" {
   MENUITEM "&Obsah",         CMD_HELP_CONTENTS



From julliard at winehq.org  Thu Jun 17 11:17:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:16 -0500
Subject: Michael Stefaniuc : notepad: Fix an error in the Portuguese (Brazil)
	translation.
Message-ID: <E1OPHmG-0001xb-03@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d47628739e769b04a1fadfd495270afe67525a35
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d47628739e769b04a1fadfd495270afe67525a35

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jun 17 11:39:51 2010 +0200

notepad: Fix an error in the Portuguese (Brazil) translation.

Translation by Mauricio Teixeira.

---

 programs/notepad/Pt.rc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc
index 194225c..a9f244a 100644
--- a/programs/notepad/Pt.rc
+++ b/programs/notepad/Pt.rc
@@ -59,13 +59,14 @@ POPUP "&Editar" {
 POPUP "&Pesquisa" {
   MENUITEM "&Localizar...",	CMD_SEARCH
   MENUITEM "Localizar &pr?xima\tF3",	CMD_SEARCH_NEXT
+  MENUITEM "&Substituir...\tCtrl+H", CMD_REPLACE
  }
 POPUP "&Ajuda" {
   MENUITEM "&Conte?do",		CMD_HELP_CONTENTS
   MENUITEM "&Procurar...",	CMD_HELP_SEARCH
   MENUITEM "&Ajuda na ajuda",	CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD
+  MENUITEM "&Sobre o Notepad", CMD_HELP_ABOUT_NOTEPAD
  }
 }
 



From julliard at winehq.org  Thu Jun 17 11:17:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:16 -0500
Subject: Alexandre Julliard : user32/tests: Expand the DCX_NORESETATTR test to
	make sure we check the correct DC.
Message-ID: <E1OPHmG-0001xt-42@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d8867fa7180a64ed5a1f366e1564e03f9a0d73bb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d8867fa7180a64ed5a1f366e1564e03f9a0d73bb

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 17 12:56:25 2010 +0200

user32/tests: Expand the DCX_NORESETATTR test to make sure we check the correct DC.

---

 dlls/user32/tests/dce.c |   75 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c
index 31c6ec0..cfa07e5 100644
--- a/dlls/user32/tests/dce.c
+++ b/dlls/user32/tests/dce.c
@@ -40,7 +40,8 @@ static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2;
 static void test_dc_attributes(void)
 {
     HDC hdc, old_hdc;
-    INT rop, def_rop;
+    HDC hdcs[20];
+    INT i, rop, def_rop, found_dc;
 
     /* test cache DC */
 
@@ -57,26 +58,60 @@ static void test_dc_attributes(void)
     ok( rop == def_rop, "wrong ROP2 %d after release\n", rop );
     SetROP2( hdc, R2_WHITE );
     ReleaseDC( hwnd_cache, hdc );
+    old_hdc = hdc;
 
-    hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS );
-    rop = GetROP2( hdc );
-    /* Win9x seems to silently ignore DCX_NORESETATTRS */
-    ok( rop == def_rop || rop == R2_WHITE, "wrong ROP2 %d\n", rop );
-
-    SetROP2( hdc, R2_WHITE );
-    rop = GetROP2( hdc );
-    ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop );
-
-    ReleaseDC( hwnd_cache, hdc );
-    hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS );
-    rop = GetROP2( hdc );
-    ok( rop == def_rop || rop == R2_WHITE, "wrong ROP2 %d after release\n", rop );
-    ReleaseDC( hwnd_cache, hdc );
-
-    hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE );
-    rop = GetROP2( hdc );
-    ok( rop == def_rop, "wrong ROP2 %d after release\n", rop );
-    ReleaseDC( hwnd_cache, hdc );
+    found_dc = 0;
+    for (i = 0; i < 20; i++)
+    {
+        hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS );
+        if (!hdc) break;
+        rop = GetROP2( hdc );
+        if (hdc == old_hdc)
+            todo_wine ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc );
+        else
+            ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc );
+        if (hdc == old_hdc)
+        {
+            found_dc = 1;
+            SetROP2( hdc, R2_WHITE );
+        }
+    }
+    if (!found_dc)
+    {
+        trace( "hdc %p not found in cache using %p\n", old_hdc, hdcs[0] );
+        old_hdc = hdcs[0];
+        SetROP2( old_hdc, R2_WHITE );
+    }
+    while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] );
+
+    for (i = 0; i < 20; i++)
+    {
+        hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS );
+        if (!hdc) break;
+        rop = GetROP2( hdc );
+        if (hdc == old_hdc)
+            ok( rop == R2_WHITE || broken( rop == def_rop),  /* win9x doesn't support DCX_NORESETATTRS */
+                "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc );
+        else
+            ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc );
+    }
+    while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] );
+
+    for (i = 0; i < 20; i++)
+    {
+        hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE );
+        if (!hdc) break;
+        rop = GetROP2( hdc );
+        if (hdc == old_hdc)
+        {
+            todo_wine ok( rop == R2_WHITE || broken( rop == def_rop),
+                          "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc );
+            SetROP2( old_hdc, def_rop );
+        }
+        else
+            ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc );
+    }
+    while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] );
 
     /* test own DC */
 



From julliard at winehq.org  Thu Jun 17 11:17:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:16 -0500
Subject: Alexandre Julliard : user32/tests: Ignore repeat key flag that causes
	occasional failures on Windows.
Message-ID: <E1OPHmG-0001yB-BA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fec9dc41f994542f1c9fe889a4380edb5e7ef559
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fec9dc41f994542f1c9fe889a4380edb5e7ef559

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 17 13:37:42 2010 +0200

user32/tests: Ignore repeat key flag that causes occasional failures on Windows.

---

 dlls/user32/tests/msg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 6d67e5c..eb27800 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -11663,7 +11663,7 @@ static const struct message wm_popup_menu_1[] =
     { WM_MENUSELECT, sent|wparam, MAKEWPARAM(200,MF_HILITE) },
     { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'E', 0xf0000001 },
     { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 },
-    { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001 },
+    { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001, 0, 0x40000000 },
     { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't create a window */
     { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 },
     { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 },



From julliard at winehq.org  Thu Jun 17 11:17:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:16 -0500
Subject: Alexandre Julliard : user32/tests: Fix some class tests that behave
	differently on WoW64.
Message-ID: <E1OPHmG-0001yS-Ez@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2649f769a52de4aeef17fb29f06572baf963dc36
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2649f769a52de4aeef17fb29f06572baf963dc36

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 17 14:05:42 2010 +0200

user32/tests: Fix some class tests that behave differently on WoW64.

---

 dlls/user32/tests/class.c |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c
index b11b5d2..33c78bf 100644
--- a/dlls/user32/tests/class.c
+++ b/dlls/user32/tests/class.c
@@ -320,6 +320,7 @@ static void test_instances(void)
     HINSTANCE kernel32 = GetModuleHandleA("kernel32");
     HINSTANCE user32 = GetModuleHandleA("user32");
     HINSTANCE main_module = GetModuleHandleA(NULL);
+    HINSTANCE zero_instance = 0;
     DWORD r;
     char buffer[0x10];
 
@@ -397,15 +398,19 @@ static void test_instances(void)
     /* GetClassInfo with instance 0 finds user32 instance */
     SetClassLongPtrA( hwnd, GCLP_HMODULE, (LONG_PTR)user32 );
     ok( RegisterClassA( &cls ), "Failed to register local class for kernel32\n" );
+    if (!GetClassInfo( 0, name, &wc )) zero_instance = user32; /* instance 0 not supported on wow64 */
+    else
+    {
+        check_instance( name, 0, 0, kernel32 );
+        check_thread_instance( name, 0, 0, kernel32 );
+    }
     check_class( kernel32, name, "kernel32" );
     check_class( user32, name, "main_module" );
-    check_class( 0, name, "main_module" );
+    check_class( zero_instance, name, "main_module" );
     check_instance( name, kernel32, kernel32, kernel32 );
-    check_instance( name, user32, 0, user32 );
-    check_instance( name, 0, 0, kernel32 );
+    check_instance( name, user32, zero_instance, user32 );
     check_thread_instance( name, kernel32, kernel32, kernel32 );
-    check_thread_instance( name, user32, 0, user32 );
-    check_thread_instance( name, 0, 0, kernel32 );
+    check_thread_instance( name, user32, zero_instance, user32 );
     ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" );
 
     SetClassLongPtrA( hwnd, GCLP_HMODULE, 0x12345678 );
@@ -551,10 +556,10 @@ static void test_instances(void)
     /* GetClassInfo sets instance to passed value for global classes */
     check_instance( "BUTTON", 0, 0, user32 );
     check_instance( "BUTTON", (HINSTANCE)0xdeadbeef, (HINSTANCE)0xdeadbeef, user32 );
-    check_instance( "BUTTON", user32, 0, user32 );
+    check_instance( "BUTTON", user32, zero_instance, user32 );
     check_thread_instance( "BUTTON", 0, 0, user32 );
     check_thread_instance( "BUTTON", (HINSTANCE)0xdeadbeef, (HINSTANCE)0xdeadbeef, user32 );
-    check_thread_instance( "BUTTON", user32, 0, user32 );
+    check_thread_instance( "BUTTON", user32, zero_instance, user32 );
 
     /* we can unregister system classes */
     ok( GetClassInfo( 0, "BUTTON", &wc ), "Button class not found with null instance\n" );
@@ -656,8 +661,16 @@ static void test_builtinproc(void)
     ok(IsWindowUnicode(hwnd), "Windows should be Unicode\n");
     SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)pDefWindowProcA);
     ok(IsWindowUnicode(hwnd), "Windows should have remained Unicode\n");
-    ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Invalid ANSI winproc\n");
-    ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Invalid Unicode winproc\n");
+    if (GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA)
+    {
+        /* DefWindowProc isn't magic on wow64 */
+        ok(IS_WNDPROC_HANDLE(GetWindowLongPtrA(hwnd, GWLP_WNDPROC)), "Ansi winproc is not a handle\n");
+    }
+    else
+    {
+        ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Invalid Unicode winproc\n");
+        ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Invalid Ansi winproc\n");
+    }
     SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc);
     ok(IsWindowUnicode(hwnd) == FALSE, "SetWindowLongPtrA should have switched window to ANSI\n");
 



From julliard at winehq.org  Thu Jun 17 11:17:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:16 -0500
Subject: Alexander Scott-Johns : msvcrt/tests: Rename a variable.
Message-ID: <E1OPHmG-0001yk-MN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5fd1409c6a82e01d2cb1cf664095ea5d26783f28
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5fd1409c6a82e01d2cb1cf664095ea5d26783f28

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Wed Jun 16 22:34:06 2010 +0100

msvcrt/tests: Rename a variable.

---

 dlls/msvcrt/tests/misc.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c
index 68f47f8..82dda5d 100644
--- a/dlls/msvcrt/tests/misc.c
+++ b/dlls/msvcrt/tests/misc.c
@@ -23,7 +23,7 @@
 #include "msvcrt.h"
 
 static int (__cdecl *prand_s)(unsigned int *);
-static int (__cdecl *memcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t);
+static int (__cdecl *pmemcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t);
 static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*);
 
 static void init(void)
@@ -31,7 +31,7 @@ static void init(void)
     HMODULE hmod = GetModuleHandleA("msvcrt.dll");
 
     prand_s = (void *)GetProcAddress(hmod, "rand_s");
-    memcpy_s = (void*)GetProcAddress(hmod, "memcpy_s");
+    pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s");
     pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT");
 }
 
@@ -61,46 +61,46 @@ static void test_memcpy_s(void)
     static char dest[32];
     int ret;
 
-    if(!memcpy_s)
+    if(!pmemcpy_s)
     {
-        win_skip("memcpy_s in not available\n");
+        win_skip("memcpy_s is not available\n");
         return;
     }
 
     errno = 0xdeadbeef;
-    ret = memcpy_s(NULL, 0, NULL, 0);
+    ret = pmemcpy_s(NULL, 0, NULL, 0);
     ok(ret == 0, "ret = %x\n", ret);
     ok(errno == 0xdeadbeef, "errno = %x\n", errno);
 
     errno = 0xdeadbeef;
     dest[0] = 'x';
-    ret = memcpy_s(dest, 10, NULL, 0);
+    ret = pmemcpy_s(dest, 10, NULL, 0);
     ok(ret == 0, "ret = %x\n", ret);
     ok(errno == 0xdeadbeef, "errno = %x\n", errno);
     ok(dest[0] == 'x', "dest[0] != \'x\'\n");
 
     errno = 0xdeadbeef;
-    ret = memcpy_s(NULL, 10, data, 10);
+    ret = pmemcpy_s(NULL, 10, data, 10);
     ok(ret == EINVAL, "ret = %x\n", ret);
     ok(errno == EINVAL, "errno = %x\n", errno);
 
     errno = 0xdeadbeef;
     dest[7] = 'x';
-    ret = memcpy_s(dest, 10, data, 5);
+    ret = pmemcpy_s(dest, 10, data, 5);
     ok(ret == 0, "ret = %x\n", ret);
     ok(errno == 0xdeadbeef, "errno = %x\n", errno);
     ok(memcmp(dest, data, 10), "All data copied\n");
     ok(!memcmp(dest, data, 5), "First five bytes are different\n");
 
     errno = 0xdeadbeef;
-    ret = memcpy_s(data, 10, data, 10);
+    ret = pmemcpy_s(data, 10, data, 10);
     ok(ret == 0, "ret = %x\n", ret);
     ok(errno == 0xdeadbeef, "errno = %x\n", errno);
     ok(!memcmp(dest, data, 5), "data was destroyed during overwritting\n");
 
     errno = 0xdeadbeef;
     dest[0] = 'x';
-    ret = memcpy_s(dest, 5, data, 10);
+    ret = pmemcpy_s(dest, 5, data, 10);
     ok(ret == ERANGE, "ret = %x\n", ret);
     ok(errno == ERANGE, "errno = %x\n", errno);
     ok(dest[0] == '\0', "dest[0] != \'\\0\'\n");



From julliard at winehq.org  Thu Jun 17 11:17:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:16 -0500
Subject: Alexander Scott-Johns : include/msvcrt: Update a bit.
Message-ID: <E1OPHmG-0001z2-P6@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5361263bdbc95b33e9c99f4c775773e2b8946b4c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5361263bdbc95b33e9c99f4c775773e2b8946b4c

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Wed Jun 16 22:42:49 2010 +0100

include/msvcrt: Update a bit.

---

 include/msvcrt/crtdefs.h |    5 ++++
 include/msvcrt/memory.h  |   13 +++++----
 include/msvcrt/stddef.h  |    2 -
 include/msvcrt/stdio.h   |   16 ++++++++++++
 include/msvcrt/stdlib.h  |    7 +++++
 include/msvcrt/string.h  |   58 +++++++++++++++++++++++++++-------------------
 include/msvcrt/wchar.h   |   16 ++++++++++++
 7 files changed, 85 insertions(+), 32 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=5361263bdbc95b33e9c99f4c775773e2b8946b4c


From julliard at winehq.org  Thu Jun 17 11:17:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:16 -0500
Subject: Piotr Caban : atl: Pass correct arguments to fuctions executed by
	AtlInternalQueryInterface.
Message-ID: <E1OPHmG-0001zK-Rp@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 981fcc897cd4dacf96b40ac892db61aae8ced702
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=981fcc897cd4dacf96b40ac892db61aae8ced702

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Jun 17 12:53:48 2010 +0200

atl: Pass correct arguments to fuctions executed by AtlInternalQueryInterface.

---

 dlls/atl/atl_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index ea8be78..7780b41 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -272,7 +272,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE
             else
             {
                 TRACE("Function\n");
-                rc = pEntries[i].pFunc(this, iid, ppvObject,0);
+                rc = pEntries[i].pFunc(this, iid, ppvObject, pEntries[i].dw);
             }
             break;
         }



From julliard at winehq.org  Thu Jun 17 11:17:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:17 -0500
Subject: Alexandre Julliard : shell32: Flesh out the stub DDE query for
	Progman groups a little.
Message-ID: <E1OPHmH-0001zd-1Z@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 30feb19d1967aad35b3a1eeb7234e995c4296ef2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=30feb19d1967aad35b3a1eeb7234e995c4296ef2

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 17 16:08:06 2010 +0200

shell32: Flesh out the stub DDE query for Progman groups a little.

---

 dlls/shell32/dde.c |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c
index 129f753..817fd33 100644
--- a/dlls/shell32/dde.c
+++ b/dlls/shell32/dde.c
@@ -22,6 +22,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "ddeml.h"
 #include "shellapi.h"
 
@@ -36,9 +37,17 @@ static HSZ hszAsterisk;
 static HSZ hszShell;
 static HSZ hszAppProperties;
 static HSZ hszFolders;
+static HSZ hszGroups;
 /* DDE Instance ID */
 static DWORD dwDDEInst;
 
+static const char *debugstr_hsz( HSZ hsz )
+{
+    WCHAR buffer[256];
+    if (!DdeQueryStringW( dwDDEInst, hsz, buffer, sizeof(buffer)/sizeof(WCHAR), CP_WINUNICODE ))
+        return "<unknown>";
+    return debugstr_w( buffer );
+}
 
 static inline BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService)
 {
@@ -55,7 +64,7 @@ static inline BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService)
 
 static inline void Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService)
 {
-    FIXME("stub\n");
+    TRACE( "%p %s %s\n", hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszService) );
 }
 
 static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService)
@@ -67,7 +76,13 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService)
 static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic,
                                      HSZ hszItem)
 {
-    FIXME("stub\n");
+    if (hszTopic == hszProgmanTopic && hszItem == hszGroups && uFmt == CF_TEXT)
+    {
+        static BYTE groups_data[] = "Accessories\r\nStartup\r\n";
+        FIXME( "returning fake program groups list\n" );
+        return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszGroups, uFmt, 0 );
+    }
+    FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) );
     return NULL;
 }
 
@@ -79,7 +94,7 @@ static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
     if (!pszCommand)
         return DDE_FNOTPROCESSED;
 
-    FIXME("stub: %s\n", pszCommand);
+    FIXME("stub: %s %s\n", debugstr_hsz(hszTopic), pszCommand);
 
     DdeUnaccessData(hdata);
 
@@ -88,7 +103,7 @@ static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
 
 static inline void Dde_OnDisconnect(HCONV hconv)
 {
-    FIXME("stub\n");
+    TRACE( "%p\n", hconv );
 }
 
 static HDDEDATA CALLBACK DdeCallback(      
@@ -146,6 +161,7 @@ void WINAPI ShellDDEInit(BOOL bInit)
         static const WCHAR wszAppProperties[] =
             {'A','p','p','P','r','o','p','e','r','t','i','e','s',0};
         static const WCHAR wszFolders[] = {'F','o','l','d','e','r','s',0};
+        static const WCHAR wszGroups[] = {'G','r','o','u','p','s',0};
 
         DdeInitializeW(&dwDDEInst, DdeCallback, CBF_FAIL_ADVISES | CBF_FAIL_POKES, 0);
 
@@ -155,6 +171,7 @@ void WINAPI ShellDDEInit(BOOL bInit)
         hszShell = DdeCreateStringHandleW(dwDDEInst, wszShell, CP_WINUNICODE);
         hszAppProperties = DdeCreateStringHandleW(dwDDEInst, wszAppProperties, CP_WINUNICODE);
         hszFolders = DdeCreateStringHandleW(dwDDEInst, wszFolders, CP_WINUNICODE);
+        hszGroups = DdeCreateStringHandleW(dwDDEInst, wszGroups, CP_WINUNICODE);
 
         DdeNameService(dwDDEInst, hszFolders, 0, DNS_REGISTER);
         DdeNameService(dwDDEInst, hszProgmanService, 0, DNS_REGISTER);



From julliard at winehq.org  Thu Jun 17 11:17:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:17 -0500
Subject: Alexandre Julliard : gdi32: Fix the sign of the vertical text
	position in ExtTextOutW.
Message-ID: <E1OPHmH-0001zu-5L@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 69d5a56103bf35f955fc4b76a5a9e0ccd8e07f38
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=69d5a56103bf35f955fc4b76a5a9e0ccd8e07f38

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 17 17:25:04 2010 +0200

gdi32: Fix the sign of the vertical text position in ExtTextOutW.

---

 dlls/gdi32/font.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 637c7d6..2d51445 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -1935,7 +1935,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
         if (align & TA_UPDATECP)
         {
             pt.x = x + width.x;
-            pt.y = y - width.y;
+            pt.y = y + width.y;
             DPtoLP(hdc, &pt, 1);
             MoveToEx(hdc, pt.x, pt.y, NULL);
         }
@@ -1943,12 +1943,12 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
 
     case TA_CENTER:
         x -= width.x / 2;
-        y += width.y / 2;
+        y -= width.y / 2;
         break;
 
     case TA_RIGHT:
         x -= width.x;
-        y += width.y;
+        y -= width.y;
         if (align & TA_UPDATECP)
         {
             pt.x = x;
@@ -2129,7 +2129,7 @@ done:
                 pts[0].x = x - underlinePos * sinEsc;
                 pts[0].y = y - underlinePos * cosEsc;
                 pts[1].x = x + width.x - underlinePos * sinEsc;
-                pts[1].y = y - width.y - underlinePos * cosEsc;
+                pts[1].y = y + width.y - underlinePos * cosEsc;
                 pts[2].x = pts[1].x + underlineWidth * sinEsc;
                 pts[2].y = pts[1].y + underlineWidth * cosEsc;
                 pts[3].x = pts[0].x + underlineWidth * sinEsc;
@@ -2145,7 +2145,7 @@ done:
                 pts[0].x = x - strikeoutPos * sinEsc;
                 pts[0].y = y - strikeoutPos * cosEsc;
                 pts[1].x = x + width.x - strikeoutPos * sinEsc;
-                pts[1].y = y - width.y - strikeoutPos * cosEsc;
+                pts[1].y = y + width.y - strikeoutPos * cosEsc;
                 pts[2].x = pts[1].x + strikeoutWidth * sinEsc;
                 pts[2].y = pts[1].y + strikeoutWidth * cosEsc;
                 pts[3].x = pts[0].x + strikeoutWidth * sinEsc;
@@ -2172,7 +2172,7 @@ done:
                 pts[0].x = x;
                 pts[0].y = y;
                 pts[1].x = x + width.x;
-                pts[1].y = y - width.y;
+                pts[1].y = y + width.y;
                 DPtoLP(hdc, pts, 2);
                 MoveToEx(hdc, pts[0].x - underlinePos * sinEsc, pts[0].y - underlinePos * cosEsc, &oldpt);
                 LineTo(hdc, pts[1].x - underlinePos * sinEsc, pts[1].y - underlinePos * cosEsc);
@@ -2187,7 +2187,7 @@ done:
                 pts[0].x = x;
                 pts[0].y = y;
                 pts[1].x = x + width.x;
-                pts[1].y = y - width.y;
+                pts[1].y = y + width.y;
                 DPtoLP(hdc, pts, 2);
                 MoveToEx(hdc, pts[0].x - strikeoutPos * sinEsc, pts[0].y - strikeoutPos * cosEsc, &oldpt);
                 LineTo(hdc, pts[1].x - strikeoutPos * sinEsc, pts[1].y - strikeoutPos * cosEsc);



From julliard at winehq.org  Thu Jun 17 11:17:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 17 Jun 2010 11:17:17 -0500
Subject: Michael Stefaniuc : notepad: Fix an error in the Bulgarian
	translation.
Message-ID: <E1OPHmH-00020B-9P@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ae942d615a279e25b0ad7670a3ba6cd17ec91de0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ae942d615a279e25b0ad7670a3ba6cd17ec91de0

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jun 17 16:26:24 2010 +0200

notepad: Fix an error in the Bulgarian translation.

---

 programs/notepad/Bg.rc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/programs/notepad/Bg.rc b/programs/notepad/Bg.rc
index 85fb4fc..5898ea3 100644
--- a/programs/notepad/Bg.rc
+++ b/programs/notepad/Bg.rc
@@ -53,6 +53,7 @@ POPUP "&
 POPUP "&???????" {
   MENUITEM "&?????...\tCtrl+F",   CMD_SEARCH
   MENUITEM "?????? &???????\tF3",  CMD_SEARCH_NEXT
+  MENUITEM "&??????...\tCtrl+H", CMD_REPLACE
  }
 POPUP "&?????" {
   MENUITEM "&??????????",         CMD_HELP_CONTENTS



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: Alexandre Julliard : user32: Destroy the unused buttons in a message
	box instead of only hiding them.
Message-ID: <E1OPd1g-0005Gm-3h@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f69d88b503ef818c34108d313006010425a4adbe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f69d88b503ef818c34108d313006010425a4adbe

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 17 20:07:22 2010 +0200

user32: Destroy the unused buttons in a message box instead of only hiding them.

---

 dlls/user32/msgbox.c |   74 +++++++++++++++++++++++++-------------------------
 1 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
index 232e599..32b4252 100644
--- a/dlls/user32/msgbox.c
+++ b/dlls/user32/msgbox.c
@@ -122,55 +122,55 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
     TRACE_(msgbox)("%s\n", debugstr_w(lpszText));
     SetWindowTextW(GetDlgItem(hwnd, MSGBOX_IDTEXT), lpszText);
 
-    /* Hide not selected buttons */
+    /* Remove not selected buttons */
     switch(lpmb->dwStyle & MB_TYPEMASK) {
     case MB_OK:
-	ShowWindow(GetDlgItem(hwnd, IDCANCEL), SW_HIDE);
+	DestroyWindow(GetDlgItem(hwnd, IDCANCEL));
 	/* fall through */
     case MB_OKCANCEL:
-	ShowWindow(GetDlgItem(hwnd, IDABORT), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDRETRY), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDIGNORE), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDYES), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDNO), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDTRYAGAIN), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDCONTINUE), SW_HIDE);
+	DestroyWindow(GetDlgItem(hwnd, IDABORT));
+	DestroyWindow(GetDlgItem(hwnd, IDRETRY));
+	DestroyWindow(GetDlgItem(hwnd, IDIGNORE));
+	DestroyWindow(GetDlgItem(hwnd, IDYES));
+	DestroyWindow(GetDlgItem(hwnd, IDNO));
+	DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
+	DestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
 	break;
     case MB_ABORTRETRYIGNORE:
-	ShowWindow(GetDlgItem(hwnd, IDOK), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDCANCEL), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDYES), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDNO), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDCONTINUE), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDTRYAGAIN), SW_HIDE);
+	DestroyWindow(GetDlgItem(hwnd, IDOK));
+	DestroyWindow(GetDlgItem(hwnd, IDCANCEL));
+	DestroyWindow(GetDlgItem(hwnd, IDYES));
+	DestroyWindow(GetDlgItem(hwnd, IDNO));
+	DestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
+	DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
 	break;
     case MB_YESNO:
-	ShowWindow(GetDlgItem(hwnd, IDCANCEL), SW_HIDE);
+	DestroyWindow(GetDlgItem(hwnd, IDCANCEL));
 	/* fall through */
     case MB_YESNOCANCEL:
-	ShowWindow(GetDlgItem(hwnd, IDOK), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDABORT), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDRETRY), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDIGNORE), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDCONTINUE), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDTRYAGAIN), SW_HIDE);
+	DestroyWindow(GetDlgItem(hwnd, IDOK));
+	DestroyWindow(GetDlgItem(hwnd, IDABORT));
+	DestroyWindow(GetDlgItem(hwnd, IDRETRY));
+	DestroyWindow(GetDlgItem(hwnd, IDIGNORE));
+	DestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
+	DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
 	break;
     case MB_RETRYCANCEL:
-	ShowWindow(GetDlgItem(hwnd, IDOK), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDABORT), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDIGNORE), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDYES), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDNO), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDCONTINUE), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDTRYAGAIN), SW_HIDE);
+	DestroyWindow(GetDlgItem(hwnd, IDOK));
+	DestroyWindow(GetDlgItem(hwnd, IDABORT));
+	DestroyWindow(GetDlgItem(hwnd, IDIGNORE));
+	DestroyWindow(GetDlgItem(hwnd, IDYES));
+	DestroyWindow(GetDlgItem(hwnd, IDNO));
+	DestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
+	DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
 	break;
     case MB_CANCELTRYCONTINUE:
-	ShowWindow(GetDlgItem(hwnd, IDOK), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDABORT), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDIGNORE), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDYES), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDNO), SW_HIDE);
-	ShowWindow(GetDlgItem(hwnd, IDRETRY), SW_HIDE);
+	DestroyWindow(GetDlgItem(hwnd, IDOK));
+	DestroyWindow(GetDlgItem(hwnd, IDABORT));
+	DestroyWindow(GetDlgItem(hwnd, IDIGNORE));
+	DestroyWindow(GetDlgItem(hwnd, IDYES));
+	DestroyWindow(GetDlgItem(hwnd, IDNO));
+	DestroyWindow(GetDlgItem(hwnd, IDRETRY));
     }
     /* Set the icon */
     switch(lpmb->dwStyle & MB_ICONMASK) {
@@ -201,9 +201,9 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
 	break;
     }
 
-    /* Hide Help button unless MB_HELP supplied */
+    /* Remove Help button unless MB_HELP supplied */
     if (!(lpmb->dwStyle & MB_HELP)) {
-        ShowWindow(GetDlgItem(hwnd, IDHELP), SW_HIDE);
+        DestroyWindow(GetDlgItem(hwnd, IDHELP));
     }
 
     /* Position everything */



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: Roderick Colenbrander : wined3d: Add NPOT quirk for GeforceFX 5200.
Message-ID: <E1OPd1g-0005H2-6P@wine.codeweavers.com>

Module: wine
Branch: master
Commit: eb0a032a8c78b996798dd075f18bc35fcee32dc4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eb0a032a8c78b996798dd075f18bc35fcee32dc4

Author: Roderick Colenbrander <thunderbird2k at gmail.com>
Date:   Mon Jun 14 23:22:52 2010 +0200

wined3d: Add NPOT quirk for GeforceFX 5200.

---

 dlls/wined3d/directx.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 424271b..268fee1 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -452,7 +452,9 @@ static BOOL match_geforce5(const struct wined3d_gl_info *gl_info, const char *gl
 {
     if (card_vendor == HW_VENDOR_NVIDIA)
     {
-        if (device == CARD_NVIDIA_GEFORCEFX_5800 || device == CARD_NVIDIA_GEFORCEFX_5600)
+        if (device == CARD_NVIDIA_GEFORCEFX_5200 ||
+            device == CARD_NVIDIA_GEFORCEFX_5600 ||
+            device == CARD_NVIDIA_GEFORCEFX_5800)
         {
             return TRUE;
         }



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winemaker: Avoid setting
	variable to an uninitialized value.
Message-ID: <E1OPd1g-0005HI-97@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1d33f8db9be0b71680161644d7d47b85178ff2c8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1d33f8db9be0b71680161644d7d47b85178ff2c8

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Thu Jun 17 21:10:01 2010 +0200

winemaker: Avoid setting variable to an uninitialized value.

---

 tools/winemaker |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 48e7bde..23f800f 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -2251,9 +2251,13 @@ sub generate_list($$$;$)
     foreach my $item (@$list) {
       my $value;
       if (defined $data) {
-	$value=&$data($item);
+        $value=&$data($item);
       } else {
-	$value=$item;
+        if (defined $item) {
+          $value=$item;
+        } else {
+          $value="";
+        }
       }
       if ($value ne "") {
 	if ($first) {



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: Michael Stefaniuc : jscript: Add the Romanian translation.
Message-ID: <E1OPd1g-0005HY-Bw@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 97a6523bdcd58c60018585ad9555ba1132deabc9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=97a6523bdcd58c60018585ad9555ba1132deabc9

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Fri Jun 18 11:14:15 2010 +0200

jscript: Add the Romanian translation.

Translation by Claudia Cotun?.

---

 dlls/jscript/Makefile.in   |    1 +
 dlls/jscript/jscript_Ro.rc |   51 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index 647412c..b22e15d 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -17,6 +17,7 @@ RC_SRCS = \
 	jscript_Nl.rc \
 	jscript_Pl.rc \
 	jscript_Pt.rc \
+	jscript_Ro.rc \
 	jscript_Ru.rc \
 	jscript_Si.rc \
 	rsrc.rc
diff --git a/dlls/jscript/jscript_Ro.rc b/dlls/jscript/jscript_Ro.rc
new file mode 100644
index 0000000..066e200
--- /dev/null
+++ b/dlls/jscript/jscript_Ro.rc
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009 Piotr Caban
+ * Copyright 2010 Claudia Cotun?
+ *                Michael Stefaniuc
+ *
+ * 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 "resource.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TO_PRIMITIVE        "Eroare la convertirea obiectului la un tip primitiv"
+    IDS_INVALID_CALL_ARG    "Apel de procedur? sau argument nevalid"
+    IDS_CREATE_OBJ_ERROR    "Serverul de automatizare nu poate crea obiectul"
+    IDS_NO_PROPERTY         "Obiectul nu suport? aceast? proprietate sau metod?"
+    IDS_ARG_NOT_OPT         "Argumentul nu este op?ional"
+    IDS_SYNTAX_ERROR        "Eroare de sintax?"
+    IDS_SEMICOLON           "?;? presupus"
+    IDS_LBRACKET            "?(? presupus"
+    IDS_RBRACKET            "?)? presupus"
+    IDS_UNTERMINATED_STR    "Constant? de ?ir nedeterminat?"
+    IDS_NOT_FUNC            "Func?ie presupus?"
+    IDS_NOT_DATE            "?[obiect]? nu este un obiect de tip dat?"
+    IDS_NOT_NUM             "Num?r presupus"
+    IDS_OBJECT_EXPECTED     "Obiect presupus"
+    IDS_ILLEGAL_ASSIGN      "Atribuire ilegal?"
+    IDS_UNDEFINED           "?|? nu este definit"
+    IDS_NOT_BOOL            "Obiect boolean presupus"
+    IDS_JSCRIPT_EXPECTED    "Obiect JScript presupus"
+    IDS_REGEXP_SYNTAX_ERROR "Eroare de sintax? ?n expresie ra?ional?"
+    IDS_URI_INVALID_CHAR    "URI care trebuie codificat con?ine caractere nevalide"
+    IDS_INVALID_LENGTH      "Lungimea unei matrice trebuie s? fie un num?r ?ntreg pozitiv"
+    IDS_ARRAY_EXPECTED      "Obiect matrice presupus"
+}



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: Paul Vriens : user32: Add another flag to the TRACE().
Message-ID: <E1OPd1g-0005Ho-Db@wine.codeweavers.com>

Module: wine
Branch: master
Commit: aef01a24d42ab9da3eda2f4f30ba6879a9ae5ef6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aef01a24d42ab9da3eda2f4f30ba6879a9ae5ef6

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Jun 18 10:19:25 2010 +0200

user32: Add another flag to the TRACE().

---

 dlls/user32/win.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 6800abd..4dd8962 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -1038,6 +1038,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle )
     if(exstyle & WS_EX_STATICEDGE) TRACE(" WS_EX_STATICEDGE");
     if(exstyle & WS_EX_APPWINDOW) TRACE(" WS_EX_APPWINDOW");
     if(exstyle & WS_EX_LAYERED) TRACE(" WS_EX_LAYERED");
+    if(exstyle & WS_EX_LAYOUTRTL) TRACE(" WS_EX_LAYOUTRTL");
 
 #define DUMPED_EX_STYLES \
     (WS_EX_DLGMODALFRAME | \
@@ -1057,7 +1058,8 @@ static void dump_window_styles( DWORD style, DWORD exstyle )
      WS_EX_CONTROLPARENT | \
      WS_EX_STATICEDGE | \
      WS_EX_APPWINDOW | \
-     WS_EX_LAYERED)
+     WS_EX_LAYERED | \
+     WS_EX_LAYOUTRTL)
 
     if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08lx", exstyle & ~DUMPED_EX_STYLES);
     TRACE("\n");



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: Huw Davies : wineps.drv: Don't return an error for empty glyphs.
Message-ID: <E1OPd1g-0005I4-FI@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 25629eff96b62f7f38033cab1100fb8d1ed2f7e6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=25629eff96b62f7f38033cab1100fb8d1ed2f7e6

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Jun 18 11:50:52 2010 +0100

wineps.drv: Don't return an error for empty glyphs.

---

 dlls/wineps.drv/type1.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c
index bc33ef6..dbd2336 100644
--- a/dlls/wineps.drv/type1.c
+++ b/dlls/wineps.drv/type1.c
@@ -494,7 +494,7 @@ static BOOL append_glyph_outline(HDC hdc, DWORD index, glyph_outline *outline)
     SHORT num_conts;
 
     glyph_data = get_glyph_data(hdc, index);
-    if(!glyph_data) return FALSE;
+    if(!glyph_data) return TRUE;
 
     num_conts = get_be_word(glyph_data);
 



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: Henri Verbeet : ddraw: Register / unregister the ddraw window class
	from DllMain().
Message-ID: <E1OPd1g-0005IL-Gz@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e4a4065bbd7ea0ea4e06c26df5ac07974ee34bc2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e4a4065bbd7ea0ea4e06c26df5ac07974ee34bc2

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jun 18 13:09:50 2010 +0200

ddraw: Register / unregister the ddraw window class from DllMain().

This avoids failing in DDRAW_Create() if a previous IDirectDrawImpl object
with the same pointer value was imporperly cleaned up. The improper cleanup is
of course the larger problem, but I don't believe that can be fixed without
making more invasive changes to ddraw.

---

 dlls/ddraw/ddraw.c         |   30 +++++++++++++----------
 dlls/ddraw/ddraw_private.h |    7 +----
 dlls/ddraw/main.c          |   54 ++++++++++++++++++-------------------------
 3 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index a8dbafa..7d6558d 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -275,9 +275,6 @@ IDirectDrawImpl_Destroy(IDirectDrawImpl *This)
         This->devicewindow = 0;
     }
 
-    /* Unregister the window class */
-    UnregisterClassA(This->classname, 0);
-
     EnterCriticalSection(&ddraw_cs);
     list_remove(&This->ddraw_list_entry);
     LeaveCriticalSection(&ddraw_cs);
@@ -504,11 +501,15 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface,
         /* Don't create a device window if a focus window is set */
         if( !(This->focuswindow) )
         {
-            HWND devicewindow = CreateWindowExA(0, This->classname, "DDraw device window",
-                                                WS_POPUP, 0, 0,
-                                                GetSystemMetrics(SM_CXSCREEN),
-                                                GetSystemMetrics(SM_CYSCREEN),
-                                                NULL, NULL, GetModuleHandleA(0), NULL);
+            HWND devicewindow = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DDraw device window",
+                    WS_POPUP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+                    NULL, NULL, NULL, NULL);
+            if (!devicewindow)
+            {
+                ERR("Failed to create window, last error %#x.\n", GetLastError());
+                LeaveCriticalSection(&ddraw_cs);
+                return E_FAIL;
+            }
 
             ShowWindow(devicewindow, SW_SHOW);   /* Just to be sure */
             TRACE("(%p) Created a DDraw device window. HWND=%p\n", This, devicewindow);
@@ -2875,11 +2876,14 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This,
     /* If there's no window, create a hidden window. WineD3D needs it */
     if(window == 0 || window == GetDesktopWindow())
     {
-        window = CreateWindowExA(0, This->classname, "Hidden D3D Window",
-                                 WS_DISABLED, 0, 0,
-                                 GetSystemMetrics(SM_CXSCREEN),
-                                 GetSystemMetrics(SM_CYSCREEN),
-                                 NULL, NULL, GetModuleHandleA(0), NULL);
+        window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "Hidden D3D Window",
+                WS_DISABLED, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+                NULL, NULL, NULL, NULL);
+        if (!window)
+        {
+            ERR("Failed to create window, last error %#x.\n", GetLastError());
+            return E_FAIL;
+        }
 
         ShowWindow(window, SW_HIDE);   /* Just to be sure */
         WARN("(%p) No window for the Direct3DDevice, created a hidden window. HWND=%p\n", This, window);
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index d6f4a57..1cb3070 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -143,11 +143,6 @@ struct IDirectDrawImpl
     /* The surface type to request */
     WINED3DSURFTYPE         ImplType;
 
-
-    /* Our private window class */
-    char classname[32];
-    WNDCLASSA wnd_class;
-
     /* Helpers for surface creation */
     IDirectDrawSurfaceImpl *tex_root;
     BOOL                    depthstencil;
@@ -165,6 +160,8 @@ struct IDirectDrawImpl
     UINT                    numConvertedDecls, declArraySize;
 };
 
+#define DDRAW_WINDOW_CLASS_NAME "ddraw_wc"
+
 /* Declare the VTables. They can be found ddraw.c */
 extern const IDirectDraw7Vtbl IDirectDraw7_Vtbl DECLSPEC_HIDDEN;
 extern const IDirectDraw4Vtbl IDirectDraw4_Vtbl DECLSPEC_HIDDEN;
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 591f46c..45a156f 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -242,37 +242,6 @@ DDRAW_Create(const GUID *guid,
     This->wineD3DDevice = wineD3DDevice;
     TRACE("wineD3DDevice created at %p\n", This->wineD3DDevice);
 
-    /* Register the window class
-     *
-     * It is used to create a hidden window for D3D
-     * rendering, if the application didn't pass one.
-     * It can also be used for Creating a device window
-     * from SetCooperativeLevel
-     *
-     * The name: DDRAW_<address>. The classname is
-     * 32 bit long, so a 64 bit address will fit nicely
-     * (Will this be compiled for 64 bit anyway?)
-     *
-     */
-    sprintf(This->classname, "DDRAW_%p", This);
-
-    memset(&This->wnd_class, 0, sizeof(This->wnd_class));
-    This->wnd_class.style = CS_HREDRAW | CS_VREDRAW;
-    This->wnd_class.lpfnWndProc = DefWindowProcA;
-    This->wnd_class.cbClsExtra = 0;
-    This->wnd_class.cbWndExtra = 0;
-    This->wnd_class.hInstance = GetModuleHandleA(0);
-    This->wnd_class.hIcon = 0;
-    This->wnd_class.hCursor = 0;
-    This->wnd_class.hbrBackground = GetStockObject(BLACK_BRUSH);
-    This->wnd_class.lpszMenuName = NULL;
-    This->wnd_class.lpszClassName = This->classname;
-    if(!RegisterClassA(&This->wnd_class))
-    {
-        ERR("RegisterClassA failed!\n");
-        goto err_out;
-    }
-
     /* Get the amount of video memory */
     This->total_vidmem = IWineD3DDevice_GetAvailableTextureMem(This->wineD3DDevice);
 
@@ -817,8 +786,28 @@ DllMain(HINSTANCE hInstDLL,
         DWORD size = sizeof(buffer);
         HKEY hkey = 0;
         HKEY appkey = 0;
+        WNDCLASSA wc;
         DWORD len;
 
+        /* Register the window class. This is used to create a hidden window
+         * for D3D rendering, if the application didn't pass one. It can also
+         * be used for creating a device window from SetCooperativeLevel(). */
+        wc.style = CS_HREDRAW | CS_VREDRAW;
+        wc.lpfnWndProc = DefWindowProcA;
+        wc.cbClsExtra = 0;
+        wc.cbWndExtra = 0;
+        wc.hInstance = hInstDLL;
+        wc.hIcon = 0;
+        wc.hCursor = 0;
+        wc.hbrBackground = GetStockObject(BLACK_BRUSH);
+        wc.lpszMenuName = NULL;
+        wc.lpszClassName = DDRAW_WINDOW_CLASS_NAME;
+        if (!RegisterClassA(&wc))
+        {
+            ERR("Failed to register ddraw window class, last error %#x.\n", GetLastError());
+            return FALSE;
+        }
+
        /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */
        if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0;
 
@@ -955,6 +944,9 @@ DllMain(HINSTANCE hInstDLL,
                 while(IDirectDraw7_Release((IDirectDraw7 *)ddraw));
             }
         }
+
+        /* Unregister the window class. */
+        UnregisterClassA(DDRAW_WINDOW_CLASS_NAME, hInstDLL);
     }
 
     return TRUE;



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: Paul Chitescu : user32: Use a safer method of freeing user handles to
	prevent zeroing out a newly allocated handle .
Message-ID: <E1OPd1g-0005Ic-JL@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bb6769f4754d5bc8961b62219e20674058546fb3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bb6769f4754d5bc8961b62219e20674058546fb3

Author: Paul Chitescu <paulc at voip.null.ro>
Date:   Fri Jun 18 14:09:38 2010 +0300

user32: Use a safer method of freeing user handles to prevent zeroing out a newly allocated handle.

---

 dlls/user32/win.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 4dd8962..cbc949c 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -107,7 +107,7 @@ HANDLE alloc_user_handle( struct user_object *ptr, enum user_obj_type type )
         assert( index < NB_USER_HANDLES );
         ptr->handle = handle;
         ptr->type = type;
-        user_handles[index] = ptr;
+        InterlockedExchangePointer( &user_handles[index], ptr );
     }
     return handle;
 }
@@ -161,8 +161,8 @@ void *free_user_handle( HANDLE handle, enum user_obj_type type )
         SERVER_START_REQ( free_user_handle )
         {
             req->handle = wine_server_user_handle( handle );
-            if (!wine_server_call( req )) user_handles[index] = NULL;
-            else ptr = NULL;
+            if (wine_server_call( req )) ptr = NULL;
+            else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr );
         }
         SERVER_END_REQ;
         release_user_handle_ptr( ptr );
@@ -243,7 +243,6 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name,
 
     index = USER_HANDLE_TO_INDEX(handle);
     assert( index < NB_USER_HANDLES );
-    user_handles[index] = win;
     win->obj.handle = handle;
     win->obj.type   = USER_WINDOW;
     win->parent     = full_parent;
@@ -251,6 +250,7 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name,
     win->class      = class;
     win->winproc    = get_class_winproc( class );
     win->cbWndExtra = extra_bytes;
+    InterlockedExchangePointer( &user_handles[index], win );
     if (WINPROC_IsUnicode( win->winproc, unicode )) win->flags |= WIN_ISUNICODE;
     return win;
 }
@@ -271,8 +271,8 @@ static void free_window_handle( HWND hwnd )
         SERVER_START_REQ( destroy_window )
         {
             req->handle = wine_server_user_handle( hwnd );
-            if (!wine_server_call_err( req )) user_handles[index] = NULL;
-            else ptr = NULL;
+            if (wine_server_call_err( req )) ptr = NULL;
+            else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr );
         }
         SERVER_END_REQ;
         release_user_handle_ptr( ptr );
@@ -815,7 +815,7 @@ static void destroy_thread_window( HWND hwnd )
         if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = (HMENU)wndPtr->wIDmenu;
         sys_menu = wndPtr->hSysMenu;
         free_dce( wndPtr->dce, hwnd );
-        user_handles[index] = NULL;
+        InterlockedCompareExchangePointer( &user_handles[index], NULL, wndPtr );
     }
     USER_Unlock();
 



From julliard at winehq.org  Fri Jun 18 09:58:36 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 09:58:36 -0500
Subject: Vitaly Lipatov : Update Russian translations.
Message-ID: <E1OPd1g-0005It-Lt@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b974852ce154bd0dfd6de6fe67c7ad653b22e545
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b974852ce154bd0dfd6de6fe67c7ad653b22e545

Author: Vitaly Lipatov <lav at etersoft.ru>
Date:   Thu Jun 17 19:18:08 2010 +0400

Update Russian translations.

---

 dlls/avifil32/avifile_Ru.rc        |    2 +-
 dlls/comdlg32/cdlg_Ru.rc           |   10 +++++-----
 dlls/localui/ui_Ru.rc              |    2 +-
 dlls/mshtml/Ru.rc                  |    2 +-
 dlls/oledlg/oledlg_Ru.rc           |    2 +-
 dlls/sane.ds/sane_Ru.rc            |    2 +-
 dlls/setupapi/Ru.rc                |    2 +-
 dlls/user32/resources/user32_Ru.rc |    2 +-
 dlls/wineps.drv/wps_Ru.rc          |    2 +-
 dlls/winmm/winmm_Ru.rc             |    4 ++--
 dlls/wldap32/wldap32_Ru.rc         |    4 ++--
 programs/cmd/Ru.rc                 |    4 ++--
 programs/cmdlgtst/Ru.rc            |    4 ++--
 programs/notepad/Ru.rc             |    4 ++--
 programs/oleview/Ru.rc             |   36 ++++++++++++++++++------------------
 programs/progman/Ru.rc             |    2 +-
 programs/regedit/Ru.rc             |    2 +-
 programs/start/Ru.rc               |   18 +++++++++---------
 programs/taskmgr/Ru.rc             |   14 +++++++-------
 programs/view/Ru.rc                |    2 +-
 programs/wineboot/wineboot_Ru.rc   |    2 +-
 programs/winecfg/Ru.rc             |   10 +++++-----
 programs/winedbg/rsrc_Ru.rc        |    2 +-
 programs/winefile/Ru.rc            |    6 +++---
 programs/winhlp32/Ru.rc            |    2 +-
 programs/wordpad/Ru.rc             |   30 +++++++++++++++---------------
 programs/xcopy/Ru.rc               |    2 +-
 27 files changed, 87 insertions(+), 87 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=b974852ce154bd0dfd6de6fe67c7ad653b22e545


From julliard at winehq.org  Fri Jun 18 12:45:40 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 12:45:40 -0500
Subject: Alexandre Julliard : Release 1.2-rc4.
Message-ID: <E1OPfdM-0005he-6d@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ffdbc65a1c0c7f38b1613255c0a38bd11d8f4711
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ffdbc65a1c0c7f38b1613255c0a38bd11d8f4711

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 18 19:36:58 2010 +0200

Release 1.2-rc4.

---

 ANNOUNCE  |  769 ++++++++++++++++++++-----------------------------------------
 VERSION   |    2 +-
 configure |   18 +-
 3 files changed, 261 insertions(+), 528 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffdbc65a1c0c7f38b1613255c0a38bd11d8f4711


From julliard at winehq.org  Fri Jun 18 12:45:40 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 12:45:40 -0500
Subject: Tag wine-1.2-rc4 : Alexandre Julliard : Release 1.2-rc4
Message-ID: <E1OPfdM-0005hs-8h@wine.codeweavers.com>

Module: wine
Branch: refs/tags/wine-1.2-rc4
Tag:    6ecd9fc5c7c884e6f0e0cac39d4d82cfb83441c4
URL:    http://source.winehq.org/git/wine.git/?a=tag;h=6ecd9fc5c7c884e6f0e0cac39d4d82cfb83441c4

Tagger: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 18 19:36:58 2010 +0200

Release 1.2-rc4


From julliard at winehq.org  Fri Jun 18 12:46:10 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 18 Jun 2010 12:46:10 -0500
Subject: Alexandre Julliard : Wine release 1.2-rc4
Message-ID: <E1OPfdq-0005s2-7p@wine.codeweavers.com>

Module: website
Branch: master
Commit: 18931d2a917b2c9e2805ea77aabc6061296c035b
URL:    http://source.winehq.org/git/website.git/?a=commit;h=18931d2a917b2c9e2805ea77aabc6061296c035b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 18 19:46:05 2010 +0200

Wine release 1.2-rc4

---

 news/en/2010061801.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/news/en/2010061801.xml b/news/en/2010061801.xml
new file mode 100644
index 0000000..b628402
--- /dev/null
+++ b/news/en/2010061801.xml
@@ -0,0 +1,13 @@
+<news>
+<date>June 18, 2010</date>
+<title>Wine 1.2-rc4 Released</title>
+<body>
+<p> The Wine development release 1.2-rc4 is now available.</p>
+<p> <a href="{$root}/announce/1.2-rc4">What's new</a> in this release:
+<ul>
+  <li>Many translation updates.</li>
+  <li>A lot of bug fixes.</li>
+</ul></p>
+<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc4.tar.bz2">available now</a>.
+Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>.
+</p></body></news>



From jnewman at winehq.org  Mon Jun 21 09:36:50 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 09:36:50 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: German translation of release
	news 1 .2-rc2
Message-ID: <E1OQi7G-0001XK-Gr@wine.codeweavers.com>

Module: website
Branch: master
Commit: f9a2c84f533376da69308d714a35af74989dbc71
URL:    http://source.winehq.org/git/website.git/?a=commit;h=f9a2c84f533376da69308d714a35af74989dbc71

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Fri Jun 11 20:12:32 2010 +0200

German translation of release news 1.2-rc2

---

 news/de/2010052801.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/news/de/2010052801.xml b/news/de/2010052801.xml
new file mode 100644
index 0000000..a19b0c3
--- /dev/null
+++ b/news/de/2010052801.xml
@@ -0,0 +1,9 @@
+<news>
+<date>28. Mai 2010</date>
+<title>Wine 1.2-rc2 Freigegeben</title>
+<body>
+<p> Die Entwicklungsversion 1.2-rc2 von Wine ist jetzt verf&uuml;gbar.</p>
+<p> Es gibt keine neuen Features in dieser Version, nur Fehlerbehebungen da wir uns im Code-Freeze befinden. Solltest du ein neues Feature finden ist es ein Fehler.</p>
+<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc2.tar.bz2">verf&uuml;gbar</a>.
+Bin&auml;r-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verf&uuml;gung.
+</p></body></news>



From jnewman at winehq.org  Mon Jun 21 09:36:50 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 09:36:50 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: German translation of release
	news 1 .2-rc3
Message-ID: <E1OQi7G-0001Xa-Jv@wine.codeweavers.com>

Module: website
Branch: master
Commit: 647b700a0678397c60daeb069ac6c8e3e6f8f442
URL:    http://source.winehq.org/git/website.git/?a=commit;h=647b700a0678397c60daeb069ac6c8e3e6f8f442

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Fri Jun 11 20:13:17 2010 +0200

German translation of release news 1.2-rc3

---

 news/de/2010061101.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/news/de/2010061101.xml b/news/de/2010061101.xml
new file mode 100644
index 0000000..6f42098
--- /dev/null
+++ b/news/de/2010061101.xml
@@ -0,0 +1,13 @@
+<news>
+<date>11. Juni 2010</date>
+<title>Wine 1.2-rc3 Freigegeben</title>
+<body>
+<p> Die Entwicklungsversion 1.2-rc3 von Wine ist jetzt verf&uuml;gbar.</p>
+<p> <a href="{$root}/announce/1.2-rc3">Neuerungen (en)</a> in dieser Version:
+<ul>
+  <li>Viele &Uuml;bersetzungen.</li>
+  <li>Ein Haufen Fehlerbehebungen.</li>
+</ul></p>
+<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc3.tar.bz2">verf&uuml;gbar</a>.
+Bin&auml;r-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verf&uuml;gung.
+</p></body></news>



From jnewman at winehq.org  Mon Jun 21 09:36:50 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 09:36:50 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: Polish translation for
	release 1.2-rc2 and 1.2-rc3
Message-ID: <E1OQi7G-0001Xq-LT@wine.codeweavers.com>

Module: website
Branch: master
Commit: cfbaa660de7121b98b8abf095b5c484dbc27d21a
URL:    http://source.winehq.org/git/website.git/?a=commit;h=cfbaa660de7121b98b8abf095b5c484dbc27d21a

Author: ?ukasz Wojni?owicz <lukasz.wojnilowicz at gmail.com>
Date:   Fri Jun 11 20:18:36 2010 +0200

Polish translation for release 1.2-rc2 and 1.2-rc3

---

 news/pl/2010052801.xml |    9 +++++++++
 news/pl/2010061101.xml |   13 +++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/news/pl/2010052801.xml b/news/pl/2010052801.xml
new file mode 100644
index 0000000..7dd15b2
--- /dev/null
+++ b/news/pl/2010052801.xml
@@ -0,0 +1,9 @@
+<news>
+<date>Maj 28, 2010</date>
+<title>Wydano 1.2-rc2</title>
+<body>
+<p> Wydanie rozwojowe Wine 1.2-rc2 jest ju? dost?pne.</p>
+<p> Nie ma nowych funkcjonalno?ci w tym wydaniu, wyst?puj? jedynie poprawki b??d?w, bo jeste?my w momencie zamro?enia kodu. Je?eli znajdziesz now? funkcjonalno?? to jest to b??d.</p>
+<p><p>?r?d?o jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc2.tar.bz2">ju? dost?pne</a>.
+Paczki binarne s? w trakcie budowy i uka?? si? wkr?tce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>.
+</p></body></news>
diff --git a/news/pl/2010061101.xml b/news/pl/2010061101.xml
new file mode 100644
index 0000000..b75b2c3
--- /dev/null
+++ b/news/pl/2010061101.xml
@@ -0,0 +1,13 @@
+<news>
+<date>Czerwiec 11, 2010</date>
+<title>Wydano Wine 1.2-rc3</title>
+<body>
+<p> Wydanie rozwojowe Wine 1.2-rc3 jest ju? dost?pne.</p>
+<p> <a href="{$root}/announce/1.2-rc3">Co nowego</a> w tym wydaniu:
+<ul>
+  <li>Wiele aktualizacji t?umacze?.</li>
+  <li>Wiele poprawek b??d?w.</li>
+</ul></p>
+<p><p>?r?d?o jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc3.tar.bz2">ju? dost?pne</a>.
+Paczki binarne s? w trakcie budowy i uka?? si? wkr?tce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>.
+</p></body></news>



From jnewman at winehq.org  Mon Jun 21 09:41:20 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 09:41:20 -0500
Subject: =?UTF-8?Q?Alexandru=20B=C4=83lu=C8=9B=20?=: Changed the main page to
	use a single image instead of 10 images for the rounded icons (try 2)
Message-ID: <E1OQiBc-00034X-1X@wine.codeweavers.com>

Module: website
Branch: master
Commit: 6a73a1c06a46231b151b654f41c94c0ec18b183d
URL:    http://source.winehq.org/git/website.git/?a=commit;h=6a73a1c06a46231b151b654f41c94c0ec18b183d

Author: Alexandru B?lu? <alexandru.balut at gmail.com>
Date:   Sat Jun 12 01:40:45 2010 +0200

Changed the main page to use a single image instead of 10 images for the rounded icons (try 2)

--0016367d6d4e2cc6fe0488c9ac0f
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

The previous patch is incomplete. I attached the patch with the
home.template file for de, es, fr, and pl changed accordingly. Please have =
a
look.

Thanks,
Alex

On Fri, Jun 11, 2010 at 17:51, Alexandru B=C4=83lu=C8=9B <alexandru.balut at g=
mail.com>wrote:

> On Firefox it can be noticed very easily, when you load the winehq.orgpag=
e, and move the mouse over the icons, it takes a while until the hover
> images are loaded. You can clearly see the icon flickering. This patch fi=
xes
> this problem by using a single image instead of 10 images.
>
> I had to change a bit the structure of the main page menu, to be able to
> preserve the current layout.
>
> Notice when you go to winehq.org and you hover the About link, it does no=
t
> change its icon. To make ":hover" work in IE8, I had to change
> content_nobox.template and set the doctype to HTML 4.01 strict. As far as=
 I
> checked, this only changes a tiny bit how the pages look. For example, th=
e
> search box is 2px wider.
>
> I tested that:
> - the icons are changing when hovering them or the associated text;
> - the page looks the same (or better, see IE8);
> - when resizing the window very small, it looks reasonably ok (looks bett=
er
> in the current format, but this is a corner case);
> - when resizing the window very large, it looks ok.
>
> I tested on:
> - Linux: Chrome, Epiphany, Firefox, Opera
> - Windows: Chrome, IE8, Firefox
>
> Thanks,
> Alex
>

The previous patch is incomplete. I attached the patch with the home.template file for de, es, fr, and pl changed accordingly. Please have a look.<div><br></div><div>Thanks,</div><div>Alex<br><br><div class="gmail_quote">On Fri, Jun 11, 2010 at 17:51, Alexandru B?lu? <span dir="ltr">&lt;<a href="mailto:alexandru.balut at gmail.com" target="_blank">alexandru.balut at gmail.com</a>&gt;</span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Firefox it can be noticed very easily, when you load the <a href="http://winehq.org" target="_blank">winehq.org</a> page, and move the mouse over the icons, it takes a while until the hover images are loaded. You can clearly see the icon flickering. This patch fixes this problem by using a single image instead of 10 images.<div>

<br></div><div>I had to change?a bit?the structure of the main page menu, to be able to preserve the current layout.</div><div><br></div><div>Notice when you go to <a href="http://winehq.org" target="_blank">winehq.org</a> and you hover the About link, it does not change its icon.?To make &quot;:hover&quot; work in IE8,?I had to change content_nobox.template and set the doctype to HTML 4.01 strict. As far as I checked, this only changes a tiny bit how the pages look. For example, the search box is 2px wider.</div>

<div><div><br></div><div>I tested that:</div><div>- the icons are changing when hovering them or the associated text;</div>
<div>- the page looks the same (or better, see IE8);</div><div>- when resizing the window very small, it looks reasonably ok (looks better in the current format, but this is a corner case);</div><div>- when resizing the window very large, it looks ok.</div>

<div><br></div><div>I tested on:</div></div><div>- Linux: Chrome,?Epiphany,?Firefox, Opera</div><div>- Windows:?Chrome,?IE8, Firefox</div><div><br></div><div>
Thanks,</div><div>Alex</div>
</blockquote></div><br></div>

---

 images/home_icons.png                        |  Bin 0 -> 21418 bytes
 images/main_devel.png                        |  Bin 4385 -> 0 bytes
 images/main_devel_s.png                      |  Bin 4572 -> 0 bytes
 images/main_dl.png                           |  Bin 4439 -> 0 bytes
 images/main_dl_s.png                         |  Bin 4633 -> 0 bytes
 images/main_donate.png                       |  Bin 4235 -> 0 bytes
 images/main_donate_s.png                     |  Bin 4455 -> 0 bytes
 images/main_help.png                         |  Bin 4148 -> 0 bytes
 images/main_help_s.png                       |  Bin 4384 -> 0 bytes
 images/main_info.png                         |  Bin 3891 -> 0 bytes
 images/main_info_s.png                       |  Bin 4199 -> 0 bytes
 include/themes/winehq/content_nobox.template |    2 +-
 styles.css                                   |   39 ++++++++--------
 templates/de/home.template                   |   61 +++++++++++++++---------
 templates/en/home.template                   |   63 +++++++++++++++---------
 templates/es/home.template                   |   65 ++++++++++++++++----------
 templates/fr/home.template                   |   61 +++++++++++++++---------
 templates/pl/home.template                   |   61 +++++++++++++++---------
 18 files changed, 213 insertions(+), 139 deletions(-)

Diff:   http://source.winehq.org/git/website.git/?a=commitdiff;h=6a73a1c06a46231b151b654f41c94c0ec18b183d


From jnewman at winehq.org  Mon Jun 21 09:41:20 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 09:41:20 -0500
Subject: =?UTF-8?Q?Alexandru=20B=C4=83lu=C8=9B=20?=: Corrected the title of
	the pl links in lang.template for en and de
Message-ID: <E1OQiBc-00034n-3u@wine.codeweavers.com>

Module: website
Branch: master
Commit: 10ccdc3eb270ed3e922ada099f200cd1652fd3c7
URL:    http://source.winehq.org/git/website.git/?a=commit;h=10ccdc3eb270ed3e922ada099f200cd1652fd3c7

Author: Alexandru B?lu? <alexandru.balut at gmail.com>
Date:   Sat Jun 12 10:00:06 2010 +0200

Corrected the title of the pl links in lang.template for en and de

--0016e6d77e6fff9bee0488d0a537
Content-Type: text/plain; charset=UTF-8

<br>

---

 templates/de/lang.template |    2 +-
 templates/en/lang.template |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/de/lang.template b/templates/de/lang.template
index 4bc47ac..08dff17 100644
--- a/templates/de/lang.template
+++ b/templates/de/lang.template
@@ -26,7 +26,7 @@
     </li>
 
     <li style="background-image: url('{$root}/images/lang/pl.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;">
-        <a href="{$root}/lang/pl" title="Portugu?s">Polski</a> <small>(Polnisch)</small>
+        <a href="{$root}/lang/pl" title="Polski">Polski</a> <small>(Polnisch)</small>
     </li>
 
     <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;">
diff --git a/templates/en/lang.template b/templates/en/lang.template
index 086a020..267df33 100644
--- a/templates/en/lang.template
+++ b/templates/en/lang.template
@@ -26,7 +26,7 @@
     </li>
 
     <li style="background-image: url('{$root}/images/lang/pl.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;">
-        <a href="{$root}/lang/pl" title="Portugu?s">Polski</a> <small>(Polish)</small>
+        <a href="{$root}/lang/pl" title="Polski">Polski</a> <small>(Polish)</small>
     </li>
 
     <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;">



From jnewman at winehq.org  Mon Jun 21 09:41:20 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 09:41:20 -0500
Subject: =?UTF-8?Q?Alexandru=20B=C4=83lu=C8=9B=20?=: Updated
	winehq.conf.sample: lang has all the available languages;
	documented debug, debug_log,   and base_patch
Message-ID: <E1OQiBc-000353-6O@wine.codeweavers.com>

Module: website
Branch: master
Commit: 68ba8dbac9d3409cf4d81ccd4a9d2634152ceb2f
URL:    http://source.winehq.org/git/website.git/?a=commit;h=68ba8dbac9d3409cf4d81ccd4a9d2634152ceb2f

Author: Alexandru B?lu? <alexandru.balut at gmail.com>
Date:   Sat Jun 12 10:44:38 2010 +0200

Updated winehq.conf.sample: lang has all the available languages; documented debug, debug_log, and base_patch

--0016e6d9677e3fe8d50488d1450e
Content-Type: text/plain; charset=UTF-8

<br>

---

 include/winehq.conf.sample |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample
index b5d5025..e46fc4d 100644
--- a/include/winehq.conf.sample
+++ b/include/winehq.conf.sample
@@ -6,6 +6,12 @@ web_debug:          0
 # list of debug channels to output (channels are: none,all,template,plugin)
 @debug_chan:        none
 
+# Whether to append the debug messages to the debug_log file 
+debug:              0
+
+# Path to debug log file
+debug_log:          /path/to/error.log
+
 # title of this site
 site_name:          WineHQ
 
@@ -16,7 +22,7 @@ theme:              winehq
 lang:               en
 
 # available languages
- at languages:         en, de, es, fr, pt
+ at languages:         en, de, es, fr, pl, pt
 
 # default base URLS (if you run the site, in a subdir, set base_root)
 base_root:          
@@ -33,3 +39,6 @@ bug_system:         http://bugs.winehq.org/show_bug.cgi?id=
 
 # URL for git tree
 git_tree:           http://source.winehq.org/git
+
+# Path to the root directory of the site
+base_path:          /path/to/root/directory/of/website/



From jnewman at winehq.org  Mon Jun 21 09:41:20 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 09:41:20 -0500
Subject: =?UTF-8?Q?Alexandru=20B=C4=83lu=C8=9B=20?=: Updated instructions for
	setting up to mention globals.conf
Message-ID: <E1OQiBc-00035q-8J@wine.codeweavers.com>

Module: website
Branch: master
Commit: 7534f41e16db0f60c474c88c925b95d579b9c0a0
URL:    http://source.winehq.org/git/website.git/?a=commit;h=7534f41e16db0f60c474c88c925b95d579b9c0a0

Author: Alexandru B?lu? <alexandru.balut at gmail.com>
Date:   Sat Jun 12 10:53:53 2010 +0200

Updated instructions for setting up to mention globals.conf

--0016e6d9677e54e64f0488d1662e
Content-Type: text/plain; charset=UTF-8

<br>

---

 README |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/README b/README
index 70707bc..6419b54 100644
--- a/README
+++ b/README
@@ -18,6 +18,8 @@ Setting Up.
     otherwise if this site is the root, leave Rewritebase /
 3. cp include/winehq.conf.sample include/winehq.conf
 4. edit include/winehq.conf
+5. cp include/globals.conf.sample include/globals.conf
+6. edit include/globals.conf
 
 Templates.
 --------------



From jnewman at winehq.org  Mon Jun 21 09:41:20 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 09:41:20 -0500
Subject: Ing. Simone. Giustetti : Slackware release download description line
	updated to 13.1
Message-ID: <E1OQiBc-000366-Br@wine.codeweavers.com>

Module: website
Branch: master
Commit: cfcdf67341f6d0e0830a9975520439bd707e67a2
URL:    http://source.winehq.org/git/website.git/?a=commit;h=cfcdf67341f6d0e0830a9975520439bd707e67a2

Author: Ing. Simone. Giustetti <studiosg at giustetti.net>
Date:   Wed Jun 16 23:13:36 2010 +0200

Slackware release download description line updated to 13.1

Hi all,

The download page description for Slackware was updated because packages are now
built for latest stable release 13.1 instead of the old 13.0.

Bye
Simone

--
Ing. Simone Giustetti
Tel: 340-3425647
e-mail: studiosg at giustetti.net

-------------------------------------------------
This mail sent through IMP: http://horde.org/imp/


From studiosg at giustetti.net  Wed Jun 16 15:53:42 2010
From: studiosg at giustetti.net (twinstar)
Date: Wed, 16 Jun 2010 22:53:42 +0200
Subject: The Slackware release was changed from the old 13.0 to 13.1 the
 most recent one.
Message-ID: <mailman.614.1277131283.27605.wine-cvs@winehq.org>

---

 templates/de/download.template |    2 +-
 templates/en/download.template |    2 +-
 templates/pl/download.template |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/de/download.template b/templates/de/download.template
index 4d8be29..3816dd6 100644
--- a/templates/de/download.template
+++ b/templates/de/download.template
@@ -127,7 +127,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p>
       <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a>
     </td>
     <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&amp;package_id=6301">Slackware</a></b>
-         bin&auml;r txz (Slackware 13.0), und tgz (f&uuml;r &auml;ltere Versionen)</td>
+         bin&auml;r txz (Slackware 13.1), und tgz (f&uuml;r &auml;ltere Versionen)</td>
     <td><a href="mailto:studiosg at giustetti.net">Simone Giustetti</a></td>
   </tr>
 
diff --git a/templates/en/download.template b/templates/en/download.template
index cdabcff..ff7e500 100644
--- a/templates/en/download.template
+++ b/templates/en/download.template
@@ -114,7 +114,7 @@ requested in exchange for hosting the Wine web site.</p>
       <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a>
     </td>
     <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&amp;package_id=6301">Download Slackware packages</a></b>
-         - binary txz (Slackware 13.0), and tgz (for older versions)</td>
+         - binary txz (Slackware 13.1), and tgz (for older versions)</td>
     <td><a href="mailto:studiosg at giustetti.net">Simone Giustetti</a></td>
   </tr>
 
diff --git a/templates/pl/download.template b/templates/pl/download.template
index b53ae15..e8d0902 100644
--- a/templates/pl/download.template
+++ b/templates/pl/download.template
@@ -111,7 +111,7 @@
       <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a>
     </td>
     <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&amp;package_id=6301">Slackware</a></b>
-         binarne: txz (dla Slackware 13.0), i tgz (dla starszych wersji)</td>
+         binarne: txz (dla Slackware 13.1), i tgz (dla starszych wersji)</td>
     <td><a href="mailto:studiosg at giustetti.net">Simone Giustetti</a></td>
   </tr>
 



From julliard at winehq.org  Mon Jun 21 11:06:59 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:06:59 -0500
Subject: Akihiro Sagawa : hhctrl.ocx: Add Japanese translation.
Message-ID: <E1OQjWV-0000rY-45@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ef137aab626615e24906b90bb49bfc14c556b6f6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ef137aab626615e24906b90bb49bfc14c556b6f6

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun 19 00:03:41 2010 +0900

hhctrl.ocx: Add Japanese translation.

---

 dlls/hhctrl.ocx/Ja.rc       |   64 +++++++++++++++++++++++++++++++++++++++++++
 dlls/hhctrl.ocx/Makefile.in |    1 +
 2 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/dlls/hhctrl.ocx/Ja.rc b/dlls/hhctrl.ocx/Ja.rc
new file mode 100644
index 0000000..f16beab
--- /dev/null
+++ b/dlls/hhctrl.ocx/Ja.rc
@@ -0,0 +1,64 @@
+/*
+ * HTML Help resources
+ * Japanese Language Support
+ *
+ * Copyright 2005 James Hawkins
+ * Copyright 2010 Akihiro Sagawa
+ *
+ * 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 "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_CONTENTS     "??(&C)"
+    IDS_INDEX        "??(&N)"
+    IDS_SEARCH       "??(&S)"
+    IDS_FAVORITES    "?????(&I)"
+END
+
+STRINGTABLE
+BEGIN
+    IDTB_EXPAND      "??"
+    IDTB_CONTRACT    "???"
+    IDTB_STOP        "??"
+    IDTB_REFRESH     "??"
+    IDTB_BACK        "??"
+    IDTB_HOME        "???"
+    IDTB_SYNC        "??"
+    IDTB_PRINT       "??"
+    IDTB_OPTIONS     "?????"
+    IDTB_FORWARD     "??"
+    IDTB_NOTES       "IDTB_NOTES"
+    IDTB_BROWSE_FWD  "IDTB_BROWSE_FWD"
+    IDTB_BROWSE_BACK "IDT_BROWSE_BACK"
+    IDTB_CONTENTS    "IDTB_CONTENTS"
+    IDTB_INDEX       "IDTB_INDEX"
+    IDTB_SEARCH      "IDTB_SEARCH"
+    IDTB_HISTORY     "IDTB_HISTORY"
+    IDTB_FAVORITES   "IDTB_FAVORITES"
+    IDTB_JUMP1       "????1"
+    IDTB_JUMP2       "????2"
+    IDTB_CUSTOMIZE   "??????"
+    IDTB_ZOOM        "????"
+    IDTB_TOC_NEXT    "IDTB_TOC_NEXT"
+    IDTB_TOC_PREV    "IDTB_TOC_PREV"
+END
diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in
index 569c8e0..5561f42 100644
--- a/dlls/hhctrl.ocx/Makefile.in
+++ b/dlls/hhctrl.ocx/Makefile.in
@@ -27,6 +27,7 @@ RC_SRCS = \
 	Fr.rc \
 	Hu.rc \
 	It.rc \
+	Ja.rc \
 	Ko.rc \
 	Lt.rc \
 	Nl.rc \



From julliard at winehq.org  Mon Jun 21 11:06:59 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:06:59 -0500
Subject: Akihiro Sagawa : comdlg32: Update Japanese translation.
Message-ID: <E1OQjWV-0000rp-Aj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 47e7703079f49ff1742ec15dca9d229f9158e365
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=47e7703079f49ff1742ec15dca9d229f9158e365

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun 19 00:03:52 2010 +0900

comdlg32: Update Japanese translation.

---

 dlls/comdlg32/cdlg_Ja.rc |  119 +++++++++++++++++++++++-----------------------
 1 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/dlls/comdlg32/cdlg_Ja.rc b/dlls/comdlg32/cdlg_Ja.rc
index 0e0358f..6e16877 100644
--- a/dlls/comdlg32/cdlg_Ja.rc
+++ b/dlls/comdlg32/cdlg_Ja.rc
@@ -375,78 +375,77 @@ STRINGTABLE DISCARDABLE
     IDS_VERIFYFILE          "???????????????"
     IDS_CREATEFILE          "??????????????\n???????"
     IDS_OVERWRITEFILE       "?????????????\n????????"
-    IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
+    IDS_INVALID_FILENAME_TITLE "????????????"
     IDS_INVALID_FILENAME    "??????????????????:\n                          / : < > |"
-    IDS_PATHNOTEXISTING     "Path does not exist"
-    IDS_FILENOTEXISTING     "File does not exist"
+    IDS_PATHNOTEXISTING     "??????????"
+    IDS_FILENOTEXISTING     "????????????"
 }
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_UPFOLDER         "Up One Level"
-    IDS_NEWFOLDER        "Create New Folder"
-    IDS_LISTVIEW         "List"
-    IDS_REPORTVIEW       "Details"
-    IDS_TODESKTOP        "Browse to Desktop"
+    IDS_UPFOLDER         "?????????"
+    IDS_NEWFOLDER        "??????????"
+    IDS_LISTVIEW         "??"
+    IDS_REPORTVIEW       "??"
+    IDS_TODESKTOP        "?????????"
 }
 
 STRINGTABLE DISCARDABLE
 {
-    PD32_PRINT_TITLE       "Print"
+    PD32_PRINT_TITLE       "??"
 
     PD32_VALUE_UREADABLE                  "Unreadable Entry"
-    PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\
-Please enter a value between %d and %d."
-    PD32_FROM_NOT_ABOVE_TO                "The 'from' entry cannot exceed the \
-'to' entry."
-    PD32_MARGINS_OVERLAP                  "Margins overlap or fall outside \
-Paper boundaries.\nPlease reenter margins."
-    PD32_NR_OF_COPIES_EMPTY               "The number of 'Number of copies' \
-value cannot be empty."
-    PD32_TOO_LARGE_COPIES                 "This large number of copies is not \
-supported by your printer.\nPlease enter a value between 1 and %d."
-    PD32_PRINT_ERROR                      "A printer error occurred."
-    PD32_NO_DEFAULT_PRINTER               "No default printer defined."
-    PD32_CANT_FIND_PRINTER                "Cannot find the printer."
-    PD32_OUT_OF_MEMORY                    "Out of memory."
-    PD32_GENERIC_ERROR                    "An error occurred."
-    PD32_DRIVER_UNKNOWN                   "Unknown printer driver."
-    PD32_NO_DEVICES                       "Before you can perform printer-related tasks \
-such as page setup or printing a document, you need to install a printer. \
-Please install one and retry."
-
-    PD32_DEFAULT_PRINTER                  "Default Printer; "
-    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "There are %d documents in the queue"
-    PD32_MARGINS_IN_INCHES                "Margins [inches]"
-    PD32_MARGINS_IN_MILLIMETERS           "Margins [mm]"
+    PD32_INVALID_PAGE_RANGE "??????????????????\n\
+%d ?? %d ??????????????"
+    PD32_FROM_NOT_ABOVE_TO                "?????????????????\
+?????????????"
+    PD32_MARGINS_OVERLAP                  "?????????????????\
+???????\n?????????????"
+    PD32_NR_OF_COPIES_EMPTY               "????????????"
+    PD32_TOO_LARGE_COPIES                 "????????????????\
+????????\n1 ?? %d ??????????????"
+    PD32_PRINT_ERROR                      "???? ???????????"
+    PD32_NO_DEFAULT_PRINTER               "??????????????????"
+    PD32_CANT_FIND_PRINTER                "?????????????"
+    PD32_OUT_OF_MEMORY                    "????????"
+    PD32_GENERIC_ERROR                    "???????????"
+    PD32_DRIVER_UNKNOWN                   "???? ??????????"
+    PD32_NO_DEVICES                       "???????????????????????\
+???????????????????????????????? \
+??????????????????????????"
+
+    PD32_DEFAULT_PRINTER                  "??????? "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "???? %d ????"
+    PD32_MARGINS_IN_INCHES                "?? [???]"
+    PD32_MARGINS_IN_MILLIMETERS           "?? [mm]"
     PD32_MILLIMETERS                      "mm"
 
-    PD32_PRINTER_STATUS_READY             "Ready"
-    PD32_PRINTER_STATUS_PAUSED            "Paused; "
-    PD32_PRINTER_STATUS_ERROR             "Error; "
-    PD32_PRINTER_STATUS_PENDING_DELETION  "Pending deletion; "
-    PD32_PRINTER_STATUS_PAPER_JAM         "Paper jam; "
-    PD32_PRINTER_STATUS_PAPER_OUT         "Out of paper; "
-    PD32_PRINTER_STATUS_MANUAL_FEED       "Feed paper manual; "
-    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Paper problem; "
-    PD32_PRINTER_STATUS_OFFLINE           "Printer offline; "
-    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Active; "
-    PD32_PRINTER_STATUS_BUSY              "Busy; "
-    PD32_PRINTER_STATUS_PRINTING          "Printing; "
-    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Output tray is full; "
-    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Not available; "
-    PD32_PRINTER_STATUS_WAITING           "Waiting; "
-    PD32_PRINTER_STATUS_PROCESSING        "Processing; "
-    PD32_PRINTER_STATUS_INITIALIZING      "Initialising; "
-    PD32_PRINTER_STATUS_WARMING_UP        "Warming up; "
-    PD32_PRINTER_STATUS_TONER_LOW         "Toner low; "
-    PD32_PRINTER_STATUS_NO_TONER          "No toner; "
-    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
-    PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; "
-    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Out of memory; "
-    PD32_PRINTER_STATUS_DOOR_OPEN         "The printer door is open; "
-    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server unknown; "
-    PD32_PRINTER_STATUS_POWER_SAVE        "Power save mode; "
+    PD32_PRINTER_STATUS_READY             "????"
+    PD32_PRINTER_STATUS_PAUSED            "???? -"
+    PD32_PRINTER_STATUS_ERROR             "??? -"
+    PD32_PRINTER_STATUS_PENDING_DELETION  "???? -"
+    PD32_PRINTER_STATUS_PAPER_JAM         "???? -"
+    PD32_PRINTER_STATUS_PAPER_OUT         "???? -"
+    PD32_PRINTER_STATUS_MANUAL_FEED       "??? -"
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "????? -"
+    PD32_PRINTER_STATUS_OFFLINE           "????? -"
+    PD32_PRINTER_STATUS_IO_ACTIVE         "???? -"
+    PD32_PRINTER_STATUS_BUSY              "??? -"
+    PD32_PRINTER_STATUS_PRINTING          "??? -"
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "???????? -"
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "???? -"
+    PD32_PRINTER_STATUS_WAITING           "??? -"
+    PD32_PRINTER_STATUS_PROCESSING        "??? -"
+    PD32_PRINTER_STATUS_INITIALIZING      "???? -"
+    PD32_PRINTER_STATUS_WARMING_UP        "?????? ??? -"
+    PD32_PRINTER_STATUS_TONER_LOW         "????? -"
+    PD32_PRINTER_STATUS_NO_TONER          "????? -"
+    PD32_PRINTER_STATUS_PAGE_PUNT         "???? -"
+    PD32_PRINTER_STATUS_USER_INTERVENTION "????????? -"
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "????? -"
+    PD32_PRINTER_STATUS_DOOR_OPEN         "???? ????? -"
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "???? ????? -"
+    PD32_PRINTER_STATUS_POWER_SAVE        "?????? -"
 }
 
 STRINGTABLE DISCARDABLE /* Font styles */
@@ -479,7 +478,7 @@ STRINGTABLE DISCARDABLE /* Color names */
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_FONT_SIZE   "Select a font size between %d and %d points."
+    IDS_FONT_SIZE   "???????? %d ?????? %d ????????????????"
     IDS_SAVE_BUTTON "??(&S)"
     IDS_SAVE_IN     "??????(&I):"
     IDS_SAVE        "??"



From julliard at winehq.org  Mon Jun 21 11:06:59 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:06:59 -0500
Subject: Akihiro Sagawa : gphoto2.ds: Add Japanese translation.
Message-ID: <E1OQjWV-0000sQ-Ha@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 441e02d7c33116735e74e688735cc34967a7c744
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=441e02d7c33116735e74e688735cc34967a7c744

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun 19 00:03:45 2010 +0900

gphoto2.ds: Add Japanese translation.

---

 dlls/gphoto2.ds/Makefile.in   |    1 +
 dlls/gphoto2.ds/gphoto2_Ja.rc |   60 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index 691b6ec..63d1b68 100644
--- a/dlls/gphoto2.ds/Makefile.in
+++ b/dlls/gphoto2.ds/Makefile.in
@@ -20,6 +20,7 @@ RC_SRCS = \
 	gphoto2_Es.rc \
 	gphoto2_Fr.rc \
 	gphoto2_It.rc \
+	gphoto2_Ja.rc \
 	gphoto2_Ko.rc \
 	gphoto2_Lt.rc \
 	gphoto2_Nl.rc \
diff --git a/dlls/gphoto2.ds/gphoto2_Ja.rc b/dlls/gphoto2.ds/gphoto2_Ja.rc
new file mode 100644
index 0000000..d3f8611
--- /dev/null
+++ b/dlls/gphoto2.ds/gphoto2_Ja.rc
@@ -0,0 +1,60 @@
+/*
+ * Japanese resources for Twain
+ *
+ * Copyright 2006 CodeWeavers, Aric Stewart
+ * Copyright 2010 Akihiro Sagawa
+ *
+ * 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 "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
+    WS_CAPTION | WS_SYSMENU
+CAPTION "??????????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	CONTROL         "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER |
+WS_TABSTOP,7,7,358,229
+    DEFPUSHBUTTON   "?????",IDC_IMPORT,152,252,72,14
+    PUSHBUTTON      "?????",IDC_FETCH,7,252,64,14
+    PUSHBUTTON      "????????",IDC_IMPORTALL,80,252,64,14
+    CONTROL         "????????????",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14
+    PUSHBUTTON      "??",IDC_EXIT,315,252,50,14
+END
+
+IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
+CAPTION "???"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT   "?????... ???????",IDC_STATIC,5,19,176,8, SS_CENTER
+END
+
+IDD_CONNECTING DIALOG DISCARDABLE  0, 0, 280, 116
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER
+CAPTION "???????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110
+    LTEXT           "???????????... ???????",IDC_STATIC,128,58,
+                    116,8
+END



From julliard at winehq.org  Mon Jun 21 11:06:59 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:06:59 -0500
Subject: Akihiro Sagawa : mapi32: Add Japanese translation.
Message-ID: <E1OQjWV-0000sg-Jn@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 87b15dfc9050154d4a9a7a09a8769fb53fb18f4b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=87b15dfc9050154d4a9a7a09a8769fb53fb18f4b

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun 19 00:03:47 2010 +0900

mapi32: Add Japanese translation.

---

 dlls/mapi32/Ja.rc       |   34 ++++++++++++++++++++++++++++++++++
 dlls/mapi32/Makefile.in |    1 +
 2 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/dlls/mapi32/Ja.rc b/dlls/mapi32/Ja.rc
new file mode 100644
index 0000000..96dbdb0
--- /dev/null
+++ b/dlls/mapi32/Ja.rc
@@ -0,0 +1,34 @@
+/*
+* MAPI32 Japanese resources
+*
+* Copyright 2009 Owen Rudge for CodeWeavers
+* Copyright 2010 Akihiro Sagawa
+*
+* 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_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+   IDS_NO_MAPI_CLIENT, "MAPI ??? ???????????????????????????????????"
+   IDS_SEND_MAIL, "?????"
+}
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index e8d0a71..e81a99a 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -20,6 +20,7 @@ RC_SRCS = \
 	Es.rc \
 	Fr.rc \
 	It.rc \
+	Ja.rc \
 	Lt.rc \
 	Nl.rc \
 	Pl.rc \



From julliard at winehq.org  Mon Jun 21 11:06:59 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:06:59 -0500
Subject: Akihiro Sagawa : localspl: Update Japanese translation.
Message-ID: <E1OQjWV-0000t8-Nw@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0b5b33883e8f09e0c2706ac56c37556299c9eb9a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0b5b33883e8f09e0c2706ac56c37556299c9eb9a

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun 19 00:03:44 2010 +0900

localspl: Update Japanese translation.

---

 dlls/localspl/Makefile.in |    1 +
 dlls/localspl/spl_Ja.rc   |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in
index 42991a8..99e4c03 100644
--- a/dlls/localspl/Makefile.in
+++ b/dlls/localspl/Makefile.in
@@ -18,6 +18,7 @@ RC_SRCS = \
 	spl_Es.rc \
 	spl_Fr.rc \
 	spl_It.rc \
+	spl_Ja.rc \
 	spl_Ko.rc \
 	spl_Lt.rc \
 	spl_Nl.rc \
diff --git a/dlls/localspl/spl_Ja.rc b/dlls/localspl/spl_Ja.rc
new file mode 100644
index 0000000..d7fa86b
--- /dev/null
+++ b/dlls/localspl/spl_Ja.rc
@@ -0,0 +1,33 @@
+/*
+ * Japanese resources for localspl
+ *
+ * Copyright 2005 Huw Davies
+ * Copyright 2006 Detlef Riekenberg
+ *
+ * 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 "localspl_private.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_LOCALPORT "???? ???"
+    IDS_LOCALMONITOR "???? ???"
+}



From julliard at winehq.org  Mon Jun 21 11:06:59 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:06:59 -0500
Subject: Akihiro Sagawa : shdoclc: Add Japanese translation.
Message-ID: <E1OQjWV-0000tQ-SR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8c6e0553c51094e33a4915b4c9fde59359924e8c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8c6e0553c51094e33a4915b4c9fde59359924e8c

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun 19 00:03:50 2010 +0900

shdoclc: Add Japanese translation.

---

 dlls/shdoclc/Ja.rc       |  252 ++++++++++++++++++++++++++++++++++++++++++++++
 dlls/shdoclc/Makefile.in |    1 +
 2 files changed, 253 insertions(+), 0 deletions(-)

diff --git a/dlls/shdoclc/Ja.rc b/dlls/shdoclc/Ja.rc
new file mode 100644
index 0000000..92410d9
--- /dev/null
+++ b/dlls/shdoclc/Ja.rc
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2005-2006 Jacek Caban
+ * Copyright 2010 Akihiro Sagawa
+ *
+ * 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 "shdoclc.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_MESSAGE_BOX_TITLE, "Wine ??????? ???????"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_PRINT_HEADER_TEMPLATE "&w&b&p???" /* FIXME: should be "&w&bPage &p of &P" */
+    IDS_PRINT_FOOTER_TEMPLATE "&u&b&d"
+}
+
+IDR_BROWSE_CONTEXT_MENU MENU
+{
+    POPUP "Default"
+    {
+        MENUITEM "??(&B)",               IDM_GOBACKWARD
+        MENUITEM "??(&O)",               IDM_GOFORWARD
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&S)...",      IDM_SAVEBACKGROUND
+        MENUITEM "?????(&G)",         IDM_SETWALLPAPER
+        MENUITEM "??????(&C)",       IDM_COPYBACKGROUND
+        MENUITEM "?????????????(&D)", IDM_SETDESKTOPITEM
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&A)",         IDM_SELECTALL
+        MENUITEM "????(&P)",           IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "??????????(&T)", IDM_CREATESHORTCUT
+        MENUITEM "????????(&F)",   IDM_ADDFAVORITES
+        MENUITEM "??????(&V)",       IDM_VIEWSOURCE
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&E)",         IDM_LANGUAGE
+        MENUITEM SEPARATOR
+        MENUITEM "??(&I)",               IDM_PRINT
+        MENUITEM "??(&R)",               _IDM_REFRESH
+        MENUITEM SEPARATOR
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&P)",         IDM_PROPERTIES
+    }
+
+    POPUP "Image"
+    {
+        MENUITEM "??????(&O)",         IDM_FOLLOWLINKC
+        MENUITEM "???????????????(&N)", IDM_FOLLOWLINKN
+        MENUITEM "???????(&A)...",    IDM_SAVETARGET
+        MENUITEM "???????(&P)",       IDM_PRINTTARGET
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&H)",           IDM_SHOWPICTURE
+        MENUITEM "?????(&S)...",        IDM_SAVEPICTURE
+        MENUITEM "??????(&E)...",      IDM_MP_EMAILPICTURE
+        MENUITEM "?????(&I)...",        IDM_MP_PRINTPICTURE
+        MENUITEM "?? ???????(&G)",  IDM_MP_MYPICS
+        MENUITEM "?????(&G)",           IDM_SETWALLPAPER
+        MENUITEM "?????????????(&D)...",  IDM_SETDESKTOPITEM
+        MENUITEM SEPARATOR
+        MENUITEM "????(&T)",             IDM_CUT
+        MENUITEM "???(&C)",               IDM_COPY
+        MENUITEM "???????????(&T)", IDM_COPYSHORTCUT
+        MENUITEM "????(&P)",             IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "????????(&F)...",  IDM_ADDFAVORITES
+        MENUITEM SEPARATOR
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&R)",           IDM_PROPERTIES
+    }
+
+    POPUP "Control"
+    {
+        MENUITEM "????(&U)", IDM_UNDO
+        MENUITEM SEPARATOR
+        MENUITEM "????(&T)", IDM_CUT
+        MENUITEM "???(&C)",   IDM_COPY
+        MENUITEM "????(&P)", IDM_PASTE
+        MENUITEM "??(&D)",     IDM_DELETE
+        MENUITEM SEPARATOR
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&A)", IDM_SELECTALL
+    }
+
+    POPUP "Table"
+    {
+        POPUP "??(&S)"
+        {
+            MENUITEM "??(&C)",      IDM_CELLSELECT
+            MENUITEM "?(&R)",        IDM_ROWSELECT
+            MENUITEM "?(&C)",        IDM_COLUMNSELECT
+            MENUITEM "?(&T)",        IDM_TABLESELECT
+        }
+        MENUITEM SEPARATOR
+        MENUITEM SEPARATOR
+        MENUITEM "????????(&C)",  IDM_CELLPROPERTIES
+        MENUITEM "???????(&T)", IDM_TABLEPROPERTIES
+    }
+
+    POPUP "1DSite Select"
+    {
+        MENUITEM "????(&T)", IDM_CUT
+        MENUITEM "???(&C)",  IDM_COPY
+        MENUITEM "????",    IDM_PASTE
+        MENUITEM "?????(&A)", IDM_SELECTALL
+        MENUITEM "??(&P)",    IDM_PRINT
+        MENUITEM SEPARATOR
+    }
+
+    POPUP "Anchor"
+    {
+        MENUITEM "??(&O)",              IDM_FOLLOWLINKC
+        MENUITEM "???????????(&N)", IDM_FOLLOWLINKN
+        MENUITEM "???????(&A)...", IDM_SAVETARGET
+        MENUITEM "???????(&P)",    IDM_PRINTTARGET
+        MENUITEM SEPARATOR
+        MENUITEM "????",              IDM_CUT
+        MENUITEM "???(&C)",            IDM_COPY
+        MENUITEM "???????????(&T)", IDM_COPYSHORTCUT
+        MENUITEM "????(&P)",          IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "????????(&F)...", IDM_ADDFAVORITES
+        MENUITEM SEPARATOR
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&R)",        IDM_PROPERTIES
+    }
+
+    POPUP "Context Unknown"
+    {
+        MENUITEM SEPARATOR
+    }
+
+    POPUP "DYNSRC Image"
+    {
+        MENUITEM "??????(&O)",         IDM_FOLLOWLINKC
+        MENUITEM "???????????????(&N)", IDM_FOLLOWLINKN
+        MENUITEM "???????(&A)...",    IDM_SAVETARGET
+        MENUITEM "???????(&P)",       IDM_PRINTTARGET
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&H)",           IDM_SHOWPICTURE
+        MENUITEM "??????(&S)...",      IDM_SAVEPICTURE
+        MENUITEM "?????(&G)",           IDM_SETWALLPAPER
+        MENUITEM "???????????(&D)...",  IDM_SETDESKTOPITEM
+        MENUITEM SEPARATOR
+        MENUITEM "???(&T)",               IDM_CUT
+        MENUITEM "???(&C)",               IDM_COPY
+        MENUITEM "???????????(&T)", IDM_COPYSHORTCUT
+        MENUITEM "????(&P)",             IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "????????(&F)...",  IDM_ADDFAVORITES
+        MENUITEM SEPARATOR
+        MENUITEM SEPARATOR
+        MENUITEM "??",                     IDM_DYNSRCPLAY
+        MENUITEM "??",                     IDM_DYNSRCSTOP
+        MENUITEM "?????(&R)",           IDM_PROPERTIES
+    }
+
+    POPUP "ART Image"
+    {
+        MENUITEM "??????(&O)",         IDM_FOLLOWLINKC
+        MENUITEM "???????????????(&N)", IDM_FOLLOWLINKN
+        MENUITEM "???????(&A)...",    IDM_SAVETARGET
+        MENUITEM "???????(&P)",       IDM_PRINTTARGET
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&H)",           IDM_SHOWPICTURE
+        MENUITEM "?????(&S)...",        IDM_SAVEPICTURE
+        MENUITEM "?????(&G)",           IDM_SETWALLPAPER
+        MENUITEM "?????????????(&D)...",  IDM_SETDESKTOPITEM
+        MENUITEM SEPARATOR
+        MENUITEM "????(&T)",             IDM_CUT
+        MENUITEM "???(&C)",               IDM_COPY
+        MENUITEM "???????????(&T)", IDM_COPYSHORTCUT
+        MENUITEM "????(&P)",             IDM_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "????????(&F)...",  IDM_ADDFAVORITES
+        MENUITEM SEPARATOR
+        MENUITEM "??",                     IDM_DYNSRCPLAY
+        MENUITEM "??",                     IDM_DYNSRCSTOP
+        MENUITEM "????",                 IDM_IMGARTREWIND
+        MENUITEM SEPARATOR
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&R)",           IDM_PROPERTIES
+    }
+
+    POPUP "Debug"
+    {
+        MENUITEM "???????",     IDM_TRACETAGS
+        MENUITEM "???????",     IDM_RESOURCEFAILURES
+        MENUITEM "????????",   IDM_DUMPTRACKINGINFO
+        MENUITEM "???? ????",  IDM_DEBUGBREAK
+        MENUITEM "???? ???",    IDM_DEBUGVIEW
+        MENUITEM "???????",     IDM_DUMPTREE
+        MENUITEM "?????",         IDM_DUMPLINES
+        MENUITEM "?????????", IDM_DUMPDISPLAYTREE
+        MENUITEM "?????? ?????????", IDM_DUMPFORMATCACHES
+        MENUITEM "????????",   IDM_DUMPLAYOUTRECTS
+        MENUITEM "??? ???",     IDM_MEMORYMONITOR
+        MENUITEM "??????? ???", IDM_PERFORMANCEMETERS
+        MENUITEM "HTML???",         IDM_SAVEHTML
+        MENUITEM SEPARATOR
+        MENUITEM "?????(&B)",     IDM_BROWSEMODE
+        MENUITEM "?????(&E)",     IDM_EDITMODE
+    }
+
+    POPUP "Vertical Scrollbar"
+    {
+        MENUITEM "????????",  IDM_SCROLL_HERE
+        MENUITEM SEPARATOR
+        MENUITEM "??",           IDM_SCROLL_TOP
+        MENUITEM "??",           IDM_SCROLL_BOTTOM
+        MENUITEM SEPARATOR
+        MENUITEM "1?????",    IDM_SCROLL_PAGEUP
+        MENUITEM "1?????",    IDM_SCROLL_PAGEDOWN
+        MENUITEM SEPARATOR
+        MENUITEM "???????", IDM_SCROLL_UP
+        MENUITEM "???????", IDM_SCROLL_DOWN
+    }
+
+    POPUP "Horizontal Scrollbar"
+    {
+        MENUITEM "????????", IDM_SCROLL_HERE
+        MENUITEM SEPARATOR
+        MENUITEM "??",           IDM_SCROLL_LEFTEDGE
+        MENUITEM "??",           IDM_SCROLL_RIGHTEDGE
+        MENUITEM SEPARATOR
+        MENUITEM "1?????",    IDM_SCROLL_PAGELEFT
+        MENUITEM "1?????",    IDM_SCROLL_PAGERIGHT
+        MENUITEM SEPARATOR
+        MENUITEM "???????", IDM_SCROLL_LEFT
+        MENUITEM "???????", IDM_SCROLL_RIGHT
+    }
+}
diff --git a/dlls/shdoclc/Makefile.in b/dlls/shdoclc/Makefile.in
index cdc7ca6..b6d2867 100644
--- a/dlls/shdoclc/Makefile.in
+++ b/dlls/shdoclc/Makefile.in
@@ -15,6 +15,7 @@ RC_SRCS = \
 	Fr.rc \
 	Hu.rc \
 	It.rc \
+	Ja.rc \
 	Ko.rc \
 	Lt.rc \
 	Nl.rc \



From julliard at winehq.org  Mon Jun 21 11:06:59 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:06:59 -0500
Subject: Akihiro Sagawa : winspool.drv: Add Japanese translation.
Message-ID: <E1OQjWV-0000th-Tx@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 58277cb0e9f71a23cae5810bd3d1cac47c2997ba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=58277cb0e9f71a23cae5810bd3d1cac47c2997ba

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Sat Jun 19 00:03:49 2010 +0900

winspool.drv: Add Japanese translation.

---

 dlls/winspool.drv/Ja.rc       |   45 +++++++++++++++++++++++++++++++++++++++++
 dlls/winspool.drv/Makefile.in |    1 +
 2 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/dlls/winspool.drv/Ja.rc b/dlls/winspool.drv/Ja.rc
new file mode 100644
index 0000000..dc32afa
--- /dev/null
+++ b/dlls/winspool.drv/Ja.rc
@@ -0,0 +1,45 @@
+/*
+ * Japanese resources for winspool
+ *
+ * Copyright 2005  Huw Davies
+ * Copyright 2010  Akihiro Sagawa
+ *
+ * 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 "wspool.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "???????"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "???????(&O):", -1, 7, 13, 194, 13, WS_VISIBLE
+    EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE
+    PUSHBUTTON "?????", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE
+END
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CAPTION "???? ???"
+    IDS_FILE_EXISTS "??????????????????????? OK ????????????"
+    IDS_CANNOT_OPEN "??????????????????"
+}
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index 0cb9468..721798b 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -22,6 +22,7 @@ RC_SRCS = \
 	Fi.rc \
 	Fr.rc \
 	It.rc \
+	Ja.rc \
 	Ko.rc \
 	Lt.rc \
 	Nl.rc \



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Juan Lang : wincrypt.h: Remove duplicate definitions.
Message-ID: <E1OQjWW-0000ty-0j@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3d73c466ca5a3a799f003387f889507b8d1afa76
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3d73c466ca5a3a799f003387f889507b8d1afa76

Author: Juan Lang <juan.lang at gmail.com>
Date:   Fri Jun 18 12:20:01 2010 -0700

wincrypt.h: Remove duplicate definitions.

---

 include/wincrypt.h |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/include/wincrypt.h b/include/wincrypt.h
index d3f56b9..39c098a 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -3007,7 +3007,12 @@ typedef struct _CTL_FIND_SUBJECT_PARA
 #define szOID_AUTO_ENROLL_CTL_USAGE          "1.3.6.1.4.1.311.20.1"
 #define szOID_ENROLL_CERTTYPE_EXTENSION      "1.3.6.1.4.1.311.20.2"
 #define szOID_ENROLLMENT_AGENT               "1.3.6.1.4.1.311.20.2.1"
+#ifndef szOID_KP_SMARTCARD_LOGON
 #define szOID_KP_SMARTCARD_LOGON             "1.3.6.1.4.1.311.20.2.2"
+#endif
+#ifndef szOID_NT_PRINCIPAL_NAME
+#define szOID_NT_PRINCIPAL_NAME              "1.3.6.1.4.1.311.20.2.3"
+#endif
 #define szOID_CERT_MANIFOLD                  "1.3.6.1.4.1.311.20.3"
 #ifndef szOID_CERTSRV_CA_VERSION
 #define szOID_CERTSRV_CA_VERSION             "1.3.6.1.4.1.311.21.1"
@@ -3079,21 +3084,6 @@ typedef struct _CTL_FIND_SUBJECT_PARA
 #define szOID_SERIALIZED                     "1.3.6.1.4.1.311.10.3.3.1"
 #endif
 
-#define szOID_AUTO_ENROLL_CTL_USAGE          "1.3.6.1.4.1.311.20.1"
-#define szOID_ENROLL_CERTTYPE_EXTENSION      "1.3.6.1.4.1.311.20.2"
-#define szOID_ENROLLMENT_AGENT               "1.3.6.1.4.1.311.20.2.1"
-#ifndef szOID_KP_SMARTCARD_LOGON
-#define szOID_KP_SMARTCARD_LOGON             "1.3.6.1.4.1.311.20.2.2"
-#endif
-#ifndef szOID_NT_PRINCIPAL_NAME
-#define szOID_NT_PRINCIPAL_NAME              "1.3.6.1.4.1.311.20.2.3"
-#endif
-#define szOID_CERT_MANIFOLD                  "1.3.6.1.4.1.311.20.3"
-
-#ifndef szOID_CERTSRV_CA_VERSION
-#define szOID_CERTSRV_CA_VERSION             "1.3.6.1.4.1.311.21.1"
-#endif
-
 #ifndef szOID_PRODUCT_UPDATE
 #define szOID_PRODUCT_UPDATE                 "1.3.6.1.4.1.311.31.1"
 #endif



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Dylan Smith : winemine: Native RegisterClassEx requires cbSize to be
	set.
Message-ID: <E1OQjWW-0000uF-3U@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8a2cb8fe218d2292790413333456432b98bb2556
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8a2cb8fe218d2292790413333456432b98bb2556

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Fri Jun 18 17:42:23 2010 -0400

winemine: Native RegisterClassEx requires cbSize to be set.

---

 programs/winemine/main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/programs/winemine/main.c b/programs/winemine/main.c
index 582f2cb..e9e89ec 100644
--- a/programs/winemine/main.c
+++ b/programs/winemine/main.c
@@ -1015,6 +1015,7 @@ int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmd
 
     LoadString( hInst, IDS_APPNAME, appname, sizeof(appname));
 
+    wc.cbSize = sizeof(wc);
     wc.style = 0;
     wc.lpfnWndProc = MainProc;
     wc.cbClsExtra = 0;



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Dylan Smith : shell32: Native RegisterClassEx requires cbSize to be
	set.
Message-ID: <E1OQjWW-0000uV-5J@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fcbc48183f8d8ef8690a7e26c02b12d676cfebc6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fcbc48183f8d8ef8690a7e26c02b12d676cfebc6

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Fri Jun 18 17:42:44 2010 -0400

shell32: Native RegisterClassEx requires cbSize to be set.

---

 dlls/shell32/control.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index aabe89e..3346ddc 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -622,6 +622,7 @@ static void    Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst)
 
     LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0]));
 
+    wc.cbSize = sizeof(wc);
     wc.style = CS_HREDRAW|CS_VREDRAW;
     wc.lpfnWndProc = Control_WndProc;
     wc.cbClsExtra = 0;



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Dylan Smith : shdocvw: Native RegisterClassEx requires cbSize to be
	set.
Message-ID: <E1OQjWW-0000ul-7G@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ec99c8553155afe29ef2c5dcf37160f85bbb5822
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ec99c8553155afe29ef2c5dcf37160f85bbb5822

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Fri Jun 18 17:42:55 2010 -0400

shdocvw: Native RegisterClassEx requires cbSize to be set.

---

 dlls/shdocvw/iexplore.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c
index 5ef0b36..e4e7618 100644
--- a/dlls/shdocvw/iexplore.c
+++ b/dlls/shdocvw/iexplore.c
@@ -90,6 +90,7 @@ void register_iewindow_class(void)
     WNDCLASSEXW wc;
 
     memset(&wc, 0, sizeof wc);
+    wc.cbSize = sizeof(wc);
     wc.style = 0;
     wc.lpfnWndProc = ie_window_proc;
     wc.cbClsExtra = 0;



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Michael Stefaniuc : wordpad: "Fix" an error in the Norvegian
	translation.
Message-ID: <E1OQjWW-0000v3-93@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fdf38b72d586cc9d9c51d2abcc9f0dc1795151b4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fdf38b72d586cc9d9c51d2abcc9f0dc1795151b4

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Sat Jun 19 00:10:45 2010 +0200

wordpad: "Fix" an error in the Norvegian translation.

---

 programs/wordpad/No.rc |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc
index fbca2a0..7fa0c84 100644
--- a/programs/wordpad/No.rc
+++ b/programs/wordpad/No.rc
@@ -247,13 +247,6 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Lukk"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Michael Stefaniuc : wordpad: Remove untranslated resources from the
	Turkish translation.
Message-ID: <E1OQjWW-0000vK-Am@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8b0f3e1cf60cd4ed63ce8b3e721992d27891cdd9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8b0f3e1cf60cd4ed63ce8b3e721992d27891cdd9

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Sat Jun 19 00:10:56 2010 +0200

wordpad: Remove untranslated resources from the Turkish translation.

---

 programs/wordpad/Tr.rc |  124 ------------------------------------------------
 1 files changed, 0 insertions(+), 124 deletions(-)

diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc
index ef66aa4..2273175 100644
--- a/programs/wordpad/Tr.rc
+++ b/programs/wordpad/Tr.rc
@@ -131,127 +131,3 @@ BEGIN
         MENUITEM "Automatic"    ID_COLOR_AUTOMATIC
     END
 END
-
-IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Date and time"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "Available formats",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
-    PUSHBUTTON   "&OK",IDOK,87,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,87,26,40,12
-END
-
-IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "New"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "New document type",-1,3,2,100,15
-    LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
-    PUSHBUTTON   "&OK",IDOK,97,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,97,26,40,12
-END
-
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Paragraph format"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Indentation", -1, 10, 10, 120, 68
-    LTEXT "Left", -1, 15, 22, 40, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Right", -1, 15, 40, 40, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "First line", -1, 15, 58, 40, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alignment", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-END
-
-IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Tabs"
-FONT 8, "MS SHell DLg"
-BEGIN
-    GROUPBOX "Tab stops", -1, 10, 10, 120, 90
-    COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15
-END
-
-IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
-STYLE DS_SYSMODAL
-Caption ""
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Line wrapping", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15
-    GROUPBOX "Toolbars", -1, 150, 10, 120, 85
-    CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
-    LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
-    STRING_TEXT_FILES_TXT,         "Text documents (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
-    STRING_ALL_FILES,              "All documents (*.*)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Left"
-    STRING_ALIGN_RIGHT,           "Right"
-    STRING_ALIGN_CENTER,          "Center"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Text document"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicode text document"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Printer files (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_VIEWPROPS_TITLE,          "Options"
-    STRING_VIEWPROPS_TEXT,           "Text"
-    STRING_VIEWPROPS_RICHTEXT,       "Rich text"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PREVIEW_PRINT,            "Print"
-    STRING_PREVIEW_NEXTPAGE,         "Next page"
-    STRING_PREVIEW_PREVPAGE,         "Previous page"
-    STRING_PREVIEW_TWOPAGES,         "Two pages"
-    STRING_PREVIEW_ONEPAGE,          "One page"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
-    STRING_PREVIEW_CLOSE,            "Close"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Michael Stefaniuc : winecfg: Fix an error in the Chinese
	(Traditional) translation.
Message-ID: <E1OQjWW-0000vd-EB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bf19ba29297bfcf810fdd377c463d25852b5f14d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bf19ba29297bfcf810fdd377c463d25852b5f14d

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Sat Jun 19 00:11:06 2010 +0200

winecfg: Fix an error in the Chinese (Traditional) translation.

---

 programs/winecfg/Zh.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index 51b9d94..93f6416 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -348,8 +348,8 @@ BEGIN
                     IDC_ABT_LICENSE_TEXT,105,64,145,60
     GROUPBOX        " Windows ???? ", IDC_STATIC, 15, 155, 230, 55
     LTEXT           "??:", IDC_STATIC, 22, 171, 40, 20
-    LTEXT           "??:", IDC_STATIC, 22, 185, 50, 20
     EDITTEXT        IDC_ABT_OWNER, 75, 171, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP
+    LTEXT           "??:", IDC_STATIC, 22, 185, 50, 20
     EDITTEXT        IDC_ABT_ORG, 75, 185, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP
 END
 



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Luca Bennati : kernel32: Update Italian translation.
Message-ID: <E1OQjWW-0000vw-I7@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8e55a610b6199cb5af0652e5f133444b95faabe3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8e55a610b6199cb5af0652e5f133444b95faabe3

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Sat Jun 19 12:28:15 2010 +0200

kernel32: Update Italian translation.

---

 .gitignore                      |    1 +
 dlls/kernel32/Makefile.in       |    1 +
 dlls/kernel32/nls/ita.nls       |   32 +-
 dlls/kernel32/nls/winerr_ita.mc | 3737 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 3755 insertions(+), 16 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e55a610b6199cb5af0652e5f133444b95faabe3


From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: cmd: Initial PATH value
	taken from registry, not wine.conf.
Message-ID: <E1OQjWW-0000wE-MT@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a758a67a8cb5c6d07899fa73d880383590ac04e2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a758a67a8cb5c6d07899fa73d880383590ac04e2

Author: Fr?d?ric Delanoy <frederic.delanoy at gmail.com>
Date:   Sun Jun 20 01:22:26 2010 +0200

cmd: Initial PATH value taken from registry, not wine.conf.

---

 programs/cmd/En.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc
index 97f4640..dfc807e 100644
--- a/programs/cmd/En.rc
+++ b/programs/cmd/En.rc
@@ -112,8 +112,8 @@ MOVE fails if the old and new locations are on different DOS drive letters.\n"
   WCMD_PATH,
 "PATH displays or changes the cmd search path.\n\
 \n\
-Entering PATH will display the current PATH setting (initially this is\n\
-the value given in your wine.conf file). To change the setting follow the\n\
+Entering PATH will display the current PATH setting (initially taken\n\
+from the registry). To change the setting follow the\n\
 PATH command with the new value.\n\
 \n\
 It is also possible to modify the PATH by using the PATH environment\n\



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: Nikolay Sivov : msxml3: Don't force parser encoding when loading from
	file.
Message-ID: <E1OQjWW-0000wV-Qm@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c4852be28e6fefd7df9b3166ec13564e3695b478
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c4852be28e6fefd7df9b3166ec13564e3695b478

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sun Jun 20 13:47:39 2010 +0400

msxml3: Don't force parser encoding when loading from file.

---

 dlls/msxml3/domdoc.c |   10 +++++-----
 dlls/msxml3/node.c   |    1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 34be70c..4808e4e 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -141,14 +141,14 @@ static xmldoc_priv * create_priv(void)
     return priv;
 }
 
-static xmlDocPtr doparse( char *ptr, int len )
+static xmlDocPtr doparse( char *ptr, int len, const char *encoding )
 {
 #ifdef HAVE_XMLREADMEMORY
     /*
      * use xmlReadMemory if possible so we can suppress
      * writing errors to stderr
      */
-    return xmlReadMemory( ptr, len, NULL, "UTF-8",
+    return xmlReadMemory( ptr, len, NULL, encoding,
                           XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS );
 #else
     return xmlParseMemory( ptr, len );
@@ -1447,7 +1447,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len)
     domdoc *This = obj;
     xmlDocPtr xmldoc;
 
-    xmldoc = doparse( ptr, len );
+    xmldoc = doparse( ptr, len, NULL );
     if(xmldoc) {
         xmldoc->_private = create_priv();
         return attach_xmldoc(&This->node, xmldoc);
@@ -1683,9 +1683,9 @@ static HRESULT WINAPI domdoc_loadXML(
     {
         *isSuccessful = VARIANT_FALSE;
 
-        if ( bstrXML  && bstr_to_utf8( bstrXML, &str, &len ) )
+        if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) )
         {
-            xmldoc = doparse( str, len );
+            xmldoc = doparse( str, len, "UTF-8" );
             heap_free( str );
             if ( !xmldoc )
                 This->error = E_FAIL;
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index e263a2a..31c6e46 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -437,6 +437,7 @@ static HRESULT WINAPI xmlnode_get_firstChild(
     IXMLDOMNode** firstChild)
 {
     xmlnode *This = impl_from_IXMLDOMNode( iface );
+    TRACE("(%p)->(%p)\n", This, firstChild);
     return get_node( This, "firstChild", This->node->children, firstChild );
 }
 



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winedump: Update README.
Message-ID: <E1OQjWW-0000wl-TB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cccad9d97b9615224a0cd30336b76d7df71633f5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cccad9d97b9615224a0cd30336b76d7df71633f5

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Sun Jun 20 16:04:58 2010 +0200

winedump: Update README.

---

 tools/winedump/README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/winedump/README b/tools/winedump/README
index b1ef087..a6bb59b 100644
--- a/tools/winedump/README
+++ b/tools/winedump/README
@@ -450,5 +450,5 @@ Please send questions and bug reports to jon_p_griffiths at yahoo.com.
 References
 ----------
 
-[1] See the wine and wine.conf man pages for details on how to tell Wine
+[1] See the wine man page for details on how to tell Wine
     whether to use native (Win32) or internal DLL's.



From julliard at winehq.org  Mon Jun 21 11:07:00 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:00 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: cmd: Update German translation.
Message-ID: <E1OQjWW-0000x3-W8@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ab87f82f468f44566d28fc551f9abb1d4fa8f9e2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ab87f82f468f44566d28fc551f9abb1d4fa8f9e2

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Sun Jun 20 16:05:17 2010 +0200

cmd: Update German translation.

---

 programs/cmd/De.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc
index 2e83338..b6ca7bc 100644
--- a/programs/cmd/De.rc
+++ b/programs/cmd/De.rc
@@ -121,7 +121,7 @@ Laufwerken sind.\n"
 "PATH ?ndert oder zeigt den CMD Suchpfad an.\n\
 \n\
 Nach der Eingabe von PATH, wird die aktuelle PATH Einstellung angezeigt\n\
-(nach dem Start wird der Wert aus der wine.conf Datei genommen). Um die\n\
+(nach dem Start wird der Wert aus der Registry genommen). Um die\n\
 Einstellungen zu ?ndern, muss nach dem PATH Befehl der neue Wert angegeben\n\
 werden\n\
 \n\



From julliard at winehq.org  Mon Jun 21 11:07:01 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:01 -0500
Subject: Peter Davies : winegcc: Enable the use of gcov and PGO.
Message-ID: <E1OQjWX-0000xN-64@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1b23130d746f86173a95d0882b5728e664ea5986
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1b23130d746f86173a95d0882b5728e664ea5986

Author: Peter Davies <ultratwo at gmail.com>
Date:   Sun Jun 20 12:28:34 2010 +0100

winegcc: Enable the use of gcov and PGO.

---

 tools/winegcc/winegcc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 40f44c3..5fed4a3 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1003,7 +1003,7 @@ static int is_linker_arg(const char* arg)
     {
 	"-nostartfiles", "-nodefaultlibs", "-nostdlib", "-s", 
 	"-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic",
-	"-framework"
+	"-framework", "--coverage", "-fprofile-generate", "-fprofile-use"
     };
     unsigned int j;
 



From julliard at winehq.org  Mon Jun 21 11:07:01 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:01 -0500
Subject: Hwang YunSong : comctl32: Update Korean resource.
Message-ID: <E1OQjWX-0000xe-An@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 40200a404d3b7ffcd1a37eb50e268d7da260ee54
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=40200a404d3b7ffcd1a37eb50e268d7da260ee54

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 21 10:29:46 2010 +0900

comctl32: Update Korean resource.

---

 dlls/comctl32/comctl_Ko.rc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/comctl_Ko.rc b/dlls/comctl32/comctl_Ko.rc
index daf9917..4f9ec0a 100644
--- a/dlls/comctl32/comctl_Ko.rc
+++ b/dlls/comctl32/comctl_Ko.rc
@@ -1,6 +1,6 @@
 /*
  * Copyright 2002 Won-kyu Park <wkpark at kldp.org>
- * Copyright 2005,2007 YunSong Hwang
+ * Copyright 2005,2007,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
@@ -56,10 +56,10 @@ CAPTION "
 FONT 9, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "????(&C)",     IDCANCEL,308,6,44,14
-  PUSHBUTTON    "????(&E)",     IDC_RESET_BTN,308,23,44,14
+  PUSHBUTTON    "??????(&E)",     IDC_RESET_BTN,308,23,44,14
   PUSHBUTTON    "??????(&H)",      IDC_HELP_BTN,308,40,44,14
   PUSHBUTTON    "???? ????(&U)",   IDC_MOVEUP_BTN,308,74,44,14
-  PUSHBUTTON    "??????????(&D)", IDC_MOVEDN_BTN,308,91,49,14
+  PUSHBUTTON    "?????? ????(&D)", IDC_MOVEDN_BTN,308,91,49,14
   LTEXT         "?????? ????(&V)", -1,4,5,84,10
   LISTBOX       IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
   PUSHBUTTON    "??????(&A) ->",    IDOK, 131, 42, 44, 14



From julliard at winehq.org  Mon Jun 21 11:07:01 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:01 -0500
Subject: Hwang YunSong : gphoto2.ds: Update Korean resource.
Message-ID: <E1OQjWX-0000xx-EI@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d81fbcd67103d38c33042964dd683fd20c91fc2c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d81fbcd67103d38c33042964dd683fd20c91fc2c

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 21 10:30:16 2010 +0900

gphoto2.ds: Update Korean resource.

---

 dlls/gphoto2.ds/gphoto2_Ko.rc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/gphoto2.ds/gphoto2_Ko.rc b/dlls/gphoto2.ds/gphoto2_Ko.rc
index 7f83d25..922d821 100644
--- a/dlls/gphoto2.ds/gphoto2_Ko.rc
+++ b/dlls/gphoto2.ds/gphoto2_Ko.rc
@@ -2,7 +2,7 @@
  * Korean resources for Twain
  *
  * Copyright 2006 CodeWeavers, Aric Stewart
- * Copyright 2006,2007 YunSong Hwang
+ * Copyright 2006,2007,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
@@ -26,7 +26,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | 
     WS_CAPTION | WS_SYSMENU
-CAPTION "???????? ????"
+CAPTION "???????? ???? ??"
 FONT 9, "MS Shell Dlg"
 BEGIN
 	CONTROL         "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER |
@@ -43,7 +43,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTE
 CAPTION "?????? ??"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT   "?????? ??...?????? ????????????",IDC_STATIC,5,19,176,8, SS_CENTER
+    LTEXT   "?????? ??... ?????? ????????????",IDC_STATIC,5,19,176,8, SS_CENTER
 END
 
 IDD_CONNECTING DIALOG DISCARDABLE  0, 0, 280, 116
@@ -52,6 +52,6 @@ CAPTION "??
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110
-    LTEXT           "?????????? ??????... ?????? ????????????",IDC_STATIC,128,58,
-                    116,8
+    LTEXT           "?????????? ??????...  ?????? ????????????",IDC_STATIC,128,58,
+                    134,8
 END



From julliard at winehq.org  Mon Jun 21 11:07:01 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:01 -0500
Subject: Hwang YunSong : oledlg: Update Korean resource.
Message-ID: <E1OQjWX-0000yE-H8@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5f23e98aa0b0ea398a2ae63afc54c81c08fe1a3b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5f23e98aa0b0ea398a2ae63afc54c81c08fe1a3b

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 21 10:30:52 2010 +0900

oledlg: Update Korean resource.

---

 dlls/oledlg/oledlg_Ko.rc |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dlls/oledlg/oledlg_Ko.rc b/dlls/oledlg/oledlg_Ko.rc
index 7e0ae7e..a1474c9 100644
--- a/dlls/oledlg/oledlg_Ko.rc
+++ b/dlls/oledlg/oledlg_Ko.rc
@@ -1,5 +1,6 @@
 /*
- * Copyright 2005,2007 YunSong Hwang
+ * Copyright 2003 Ulrich Czekalla for CodeWeavers
+ * Copyright 2005,2007,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
@@ -56,7 +57,7 @@ STRINGTABLE DISCARDABLE
   IDS_NOTOLEMODCAPTION  "?????? ??????"
 }
 
-IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140
+IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 299, 140
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "????????  ????????"
 FONT 9, "MS Shell Dlg"
@@ -66,14 +67,14 @@ BEGIN
                   1, 44, 55, 10
     CONTROL       "?????? ????????(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
                   1, 61, 69, 10
-    LTEXT         "???? ????????(&A):", -1, 67, 25, 53, 8, WS_VISIBLE | WS_GROUP
-    LISTBOX       IDC_PS_PASTELIST,     66, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
-    LISTBOX       IDC_PS_PASTELINKLIST, 66, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
-    LISTBOX       IDC_PS_DISPLAYLIST,   66, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE
-    CONTROL       "????", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
-    CONTROL       "????", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
-    CONTROL       "??????(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
-    CONTROL       "?????????? ????(&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    LTEXT         "???? ????????(&A):", -1, 73, 25, 59, 8, WS_VISIBLE | WS_GROUP
+    LISTBOX       IDC_PS_PASTELIST,     73, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_PASTELINKLIST, 73, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_DISPLAYLIST,   73, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE
+    CONTROL       "????", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 226, 6, 66, 14
+    CONTROL       "????", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 226, 23, 66, 14
+    CONTROL       "??????(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 226, 42, 66, 14
+    CONTROL       "?????????? ????(&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 226, 59, 70, 14
     CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
     CONTROL       "?????? ??????(&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
     CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
@@ -93,5 +94,5 @@ STRINGTABLE DISCARDABLE
     IDS_PS_NON_OLE                        "?????? ?????? ?????????? ???? ????????."
     IDS_PS_UNKNOWN_TYPE                   "???? ???? ????"
     IDS_PS_UNKNOWN_SRC                    "???? ???? ????"
-    IDS_PS_UNKNOWN_APP                    "?? ?????????? ?? ?? ???? ???????????? ??????????????"
+    IDS_PS_UNKNOWN_APP                    "???? ???? ????????"
 }



From julliard at winehq.org  Mon Jun 21 11:07:01 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:01 -0500
Subject: Hwang YunSong : setupapi: Update Korean resource.
Message-ID: <E1OQjWX-000101-Qh@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d7124ae9eeb8f905f84ce0420f24ac6c3c2e2ba2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d7124ae9eeb8f905f84ce0420f24ac6c3c2e2ba2

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 21 10:31:23 2010 +0900

setupapi: Update Korean resource.

---

 dlls/setupapi/Ko.rc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/Ko.rc b/dlls/setupapi/Ko.rc
index 6def9c2..d263b5e 100644
--- a/dlls/setupapi/Ko.rc
+++ b/dlls/setupapi/Ko.rc
@@ -1,7 +1,9 @@
 /*
  * Korean resources for SETUPAPI
  *
- * Copyright 2005 YunSong Hwang
+ * Copyright 2001 Andreas Mohr
+ * Copyright 2009 Ricardo Filipe
+ * Copyright 2005,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
@@ -50,7 +52,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "???????? ???? ???????? ????????, \ ?????? ?????? ?????????? ???????? ?????????? ", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
 	LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
-	LTEXT "???????? ?????? ?????? ??:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "???????? ?????? ?????? ??:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
 	CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14
 	PUSHBUTTON "????", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	PUSHBUTTON "????", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP



From julliard at winehq.org  Mon Jun 21 11:07:01 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:01 -0500
Subject: Hwang YunSong : shdoclc: Update Korean resource.
Message-ID: <E1OQjWX-00010V-U7@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ea56c5fbcbccfe8ae6065d033a076ee2a1c2086a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ea56c5fbcbccfe8ae6065d033a076ee2a1c2086a

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 21 10:32:00 2010 +0900

shdoclc: Update Korean resource.

---

 dlls/shdoclc/Ko.rc |  279 ++++++++++++++++++++++++++--------------------------
 1 files changed, 141 insertions(+), 138 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea56c5fbcbccfe8ae6065d033a076ee2a1c2086a


From julliard at winehq.org  Mon Jun 21 11:07:02 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:02 -0500
Subject: Hwang YunSong : winecfg: Update Korean resource.
Message-ID: <E1OQjWY-00010w-6H@wine.codeweavers.com>

Module: wine
Branch: master
Commit: af08cc50b4905a4f634a42edeb7f666711f036f3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=af08cc50b4905a4f634a42edeb7f666711f036f3

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 21 10:32:27 2010 +0900

winecfg: Update Korean resource.

---

 programs/winecfg/Ko.rc |  371 ++++++++++++++++++++++++------------------------
 1 files changed, 186 insertions(+), 185 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=af08cc50b4905a4f634a42edeb7f666711f036f3


From julliard at winehq.org  Mon Jun 21 11:07:02 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:02 -0500
Subject: Hwang YunSong : wininet: Update Korean resource.
Message-ID: <E1OQjWY-00011N-C9@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 784716946ec1b76d87dbf8c469d10b38633385c1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=784716946ec1b76d87dbf8c469d10b38633385c1

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 21 10:32:57 2010 +0900

wininet: Update Korean resource.

---

 dlls/wininet/wininet_Ko.rc |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/dlls/wininet/wininet_Ko.rc b/dlls/wininet/wininet_Ko.rc
index 5c2595a..ff98f09 100644
--- a/dlls/wininet/wininet_Ko.rc
+++ b/dlls/wininet/wininet_Ko.rc
@@ -1,6 +1,7 @@
 /*
- * Copyright 2005,2007 YunSong Hwang
- *
+ * Copyright 2003 Mike McCormack for CodeWeavers
+ * Copyright 2005,2007,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
@@ -25,16 +26,36 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "???????? ???? ????"
 FONT 9, "MS Shell Dlg"
 {
- LTEXT "?????? ?????? ?????? ?????? ??????????:", -1, 40, 6, 150, 15
+ LTEXT "?????? ?????? ?????? ?????? ????????????:", -1, 40, 6, 150, 15
  LTEXT "??????", -1, 40, 26, 50, 10
- LTEXT "Realm", -1, 40, 46, 50, 10
+ LTEXT "????", -1, 40, 46, 50, 10
  LTEXT "??????", -1, 40, 66, 50, 10
  LTEXT "????", -1, 40, 86, 50, 10
  LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
  LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "???? ????(&S)(??????????)", IDC_SAVEPASSWORD,
+ CHECKBOX "???? ????(&S)(????????  ????)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "????", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "????", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "???? ????"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "?????? ?????? ?????? ?????? ????????????:", -1, 40, 6, 150, 15
+ LTEXT "????", -1, 40, 26, 50, 10
+ LTEXT "????", -1, 40, 46, 50, 10
+ LTEXT "??????", -1, 40, 66, 50, 10
+ LTEXT "????", -1, 40, 86, 50, 10
+ LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "???? ????(&S)  (???????? ????)", IDC_SAVEPASSWORD,
            80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "????", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  PUSHBUTTON "????", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP



From julliard at winehq.org  Mon Jun 21 11:07:02 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:02 -0500
Subject: Hwang YunSong : avifil32: Update Korean resource.
Message-ID: <E1OQjWY-00012x-Mj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 503c5b88300005b732a4e13ca3f9e23687697afc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=503c5b88300005b732a4e13ca3f9e23687697afc

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 21 10:35:01 2010 +0900

avifil32: Update Korean resource.

---

 dlls/avifil32/avifile_Ko.rc |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/dlls/avifil32/avifile_Ko.rc b/dlls/avifil32/avifile_Ko.rc
index 622880c..285a9a2 100644
--- a/dlls/avifil32/avifile_Ko.rc
+++ b/dlls/avifil32/avifile_Ko.rc
@@ -1,6 +1,6 @@
 /*
- * Copyright 2002 Michael G?nnewig
- * Copyright 2005 YunSong Hwang
+ * Copyright 2002 Michael G??nnewig
+ * Copyright 2005,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
@@ -19,35 +19,37 @@
 
 #include "avifile_private.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "???? ????"
+CAPTION "?????? ??????"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT           "?????? ????(&C):",-1,2,5,154,10
+    LTEXT           "????????? ??????(&C):",-1,2,5,154,10
     COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "????(&O)...",IDC_OPTIONS,170,17,50,14
-    AUTOCHECKBOX    "???? ????????(&I)",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    PUSHBUTTON      "??????(&O)...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "?????? ???????????? ??????(&I)",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
     EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "??????",-1,129,43,36,9
-    LTEXT           "???? ????:",-1,3,56,73,9
-    LTEXT           "?????? ????",IDC_FORMATTEXT,75,56,90,26
-    DEFPUSHBUTTON   "????",IDOK,170,42,50,14
-    PUSHBUTTON      "????",IDCANCEL,170,61,50,14
+    LTEXT           "?????????",-1,129,43,36,9
+    LTEXT           "?????? ??????:",-1,3,56,73,9
+    LTEXT           "????????? ??????",IDC_FORMATTEXT,75,56,90,26
+    DEFPUSHBUTTON   "??????",IDOK,170,42,50,14
+    PUSHBUTTON      "??????",IDCANCEL,170,61,50,14
 END
 
 STRINGTABLE DISCARDABLE
 {
-  IDS_WAVESTREAMFORMAT	"????????: %s"
-  IDS_WAVEFILETYPE	"????????"
-  IDS_ALLMULTIMEDIA	"???? ?????????? ????"
-  IDS_ALLFILES		"???? ???? (*.*)@*.*"
-  IDS_VIDEO		"??????"
-  IDS_AUDIO		"??????"
+  IDS_WAVESTREAMFORMAT	"??????: %s"
+  IDS_WAVEFILETYPE	"??????"
+  IDS_ALLMULTIMEDIA	"?????? ??????????????? ??????"
+  IDS_ALLFILES		"?????? ?????? (*.*)@*.*"
+  IDS_VIDEO		"?????????"
+  IDS_AUDIO		"?????????"
   IDS_AVISTREAMFORMAT	"%s %s #%d"
-  IDS_AVIFILETYPE	"Wine AVI-????-??????????"
-  IDS_UNCOMPRESSED      "??????"
+  IDS_AVIFILETYPE	"Wine AVI-??????-???????????????????"
+  IDS_UNCOMPRESSED      "????????????"
 }



From julliard at winehq.org  Mon Jun 21 11:07:03 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:03 -0500
Subject: Hwang YunSong : mapi32: New Korean resource.
Message-ID: <E1OQjWZ-00017V-Bs@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ed264c4bb7fe5624163f84555a3cf638c1b1e7b7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ed264c4bb7fe5624163f84555a3cf638c1b1e7b7

Author: Hwang YunSong <hys545 at 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 \



From julliard at winehq.org  Mon Jun 21 11:07:03 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:03 -0500
Subject: Alexandre Julliard : hlink/tests: Comment out a test for an
	uninitialized return value.
Message-ID: <E1OQjWZ-00019A-Ew@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2a26e954ec13bc2fc47b6464ee063b102b6b4e7e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a26e954ec13bc2fc47b6464ee063b102b6b4e7e

Author: Alexandre Julliard <julliard at 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);
 }



From julliard at winehq.org  Mon Jun 21 11:07:03 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:03 -0500
Subject: Alexandre Julliard : ntdll: Fix the initial FPU control word on
	64-bit.
Message-ID: <E1OQjWZ-0001B2-PT@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8b5439068659cfd0c3f9711bdf5fd06b0507b989
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8b5439068659cfd0c3f9711bdf5fd06b0507b989

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 21 11:49:25 2010 +0200

ntdll: Fix the initial FPU control word on 64-bit.

---

 dlls/kernel32/tests/thread.c |    5 +++--
 dlls/ntdll/signal_x86_64.c   |    9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index df87ae0..1d3931f 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -1387,10 +1387,11 @@ static WORD get_thread_fpu_cw(void)
 
 static void test_thread_fpu_cw(void)
 {
-    WORD initial_cw, cw;
+    WORD initial_cw, cw, expect;
 
     initial_cw = get_fpu_cw();
-    ok(initial_cw == 0x37f, "Expected FPU control word 0x37f, got %#x.\n", initial_cw);
+    expect = sizeof(void *) > sizeof(int) ? 0x27f : 0x37f;
+    ok(initial_cw == expect, "Expected FPU control word expect, got %#x.\n", initial_cw);
 
     cw = get_thread_fpu_cw();
     ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw);
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 188224d..48f8b6d 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2330,6 +2330,7 @@ void signal_free_thread( TEB *teb )
  */
 void signal_init_thread( TEB *teb )
 {
+    const WORD fpu_cw = 0x27f;
     stack_t ss;
 
 #if defined __linux__
@@ -2345,15 +2346,11 @@ void signal_init_thread( TEB *teb )
     ss.ss_flags = 0;
     if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" );
 
-    if (teb->Peb->ProcessHeap) /* Not for the inital thread. */
-    {
-        const WORD fpu_cw = 0x27f;
 #ifdef __GNUC__
-        __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw));
+    __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw));
 #else
-        FIXME("FPU setup not implemented for this platform.\n");
+    FIXME("FPU setup not implemented for this platform.\n");
 #endif
-    }
 }
 
 /**********************************************************************



From julliard at winehq.org  Mon Jun 21 11:07:03 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:03 -0500
Subject: Alexandre Julliard : shell32/tests: Use the windows directory for the
	SHParseDisplayName test to avoid ambiguous namings .
Message-ID: <E1OQjWZ-0001BW-Se@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fa2444caf1d1540d9fb4be7220d51349d104d0e1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fa2444caf1d1540d9fb4be7220d51349d104d0e1

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 21 11:50:15 2010 +0200

shell32/tests: Use the windows directory for the SHParseDisplayName test to avoid ambiguous namings.

---

 dlls/shell32/tests/shlfolder.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index d0055d4..085c91e 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -2024,7 +2024,6 @@ static void test_SHCreateShellItem(void)
 
 static void test_SHParseDisplayName(void)
 {
-    static const WCHAR prefixW[] = {'w','t',0};
     LPITEMIDLIST pidl1, pidl2;
     IShellFolder *desktop;
     WCHAR dirW[MAX_PATH];
@@ -2066,9 +2065,7 @@ if (0)
     pILFree(pidl2);
 
     /* with path */
-    GetTempPathW(sizeof(dirW)/sizeof(WCHAR), dirW);
-    GetTempFileNameW(dirW, prefixW, 0, dirW);
-    CreateFileW(dirW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
+    GetWindowsDirectoryW( dirW, MAX_PATH );
 
     hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL);
     ok(hr == S_OK, "failed %08x\n", hr);
@@ -2080,8 +2077,6 @@ if (0)
     pILFree(pidl1);
     pILFree(pidl2);
 
-    DeleteFileW(dirW);
-
     IShellFolder_Release(desktop);
 }
 



From julliard at winehq.org  Mon Jun 21 11:07:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:04 -0500
Subject: Alexandre Julliard : user32: Fallback to English in
	MessageBoxIndirect if the specified language is not supported .
Message-ID: <E1OQjWa-0001EE-4n@wine.codeweavers.com>

Module: wine
Branch: master
Commit: db1c43c399fe9559abe43a08064255c1e50acf6d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=db1c43c399fe9559abe43a08064255c1e50acf6d

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 21 11:50:44 2010 +0200

user32: Fallback to English in MessageBoxIndirect if the specified language is not supported.

---

 dlls/user32/msgbox.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
index 32b4252..effe09b 100644
--- a/dlls/user32/msgbox.c
+++ b/dlls/user32/msgbox.c
@@ -512,7 +512,11 @@ INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox )
 
     if (!(hRes = FindResourceExW(user32_module, (LPWSTR)RT_DIALOG,
                                  msg_box_res_nameW, msgbox->dwLanguageId)))
-        return 0;
+    {
+        if (!msgbox->dwLanguageId ||
+            !(hRes = FindResourceExW(user32_module, (LPWSTR)RT_DIALOG, msg_box_res_nameW, LANG_NEUTRAL)))
+            return 0;
+    }
     if (!(tmplate = LoadResource(user32_module, hRes)))
         return 0;
 



From julliard at winehq.org  Mon Jun 21 11:07:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:04 -0500
Subject: Jacek Caban : mshtml: Fixed event tests.
Message-ID: <E1OQjWa-0001H0-DZ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c00121a6030124553a542f7ba93b799c05144e2c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c00121a6030124553a542f7ba93b799c05144e2c

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Sat Jun 19 22:25:12 2010 +0200

mshtml: Fixed event tests.

---

 dlls/mshtml/tests/events.c |   48 +++++++------------------------------------
 1 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c
index d62df7a..c9523de 100644
--- a/dlls/mshtml/tests/events.c
+++ b/dlls/mshtml/tests/events.c
@@ -483,9 +483,7 @@ static void _test_event_x(unsigned line, IHTMLEventObj *event, LONG exl)
 
     hres = IHTMLEventObj_get_x(event, &l);
     ok_(__FILE__,line)(hres == S_OK, "get_x failed: %08x\n", hres);
-    if(exl == -10) /* don't test the exact value */
-        todo_wine ok_(__FILE__,line)(l > 0, "x = %d\n", l);
-    else
+    if(exl != -10) /* don't test the exact value */
         ok_(__FILE__,line)(l == exl, "x = %d, expected %d\n", l, exl);
 }
 
@@ -496,9 +494,7 @@ static void _test_event_y(unsigned line, IHTMLEventObj *event, LONG exl)
 
     hres = IHTMLEventObj_get_y(event, &l);
     ok_(__FILE__,line)(hres == S_OK, "get_y failed: %08x\n", hres);
-    if(exl == -10) /* don't test the exact value */
-        todo_wine ok_(__FILE__,line)(l > 0, "y = %d\n", l);
-    else
+    if(exl != -10) /* don't test the exact value */
         ok_(__FILE__,line)(l == exl, "y = %d, expected %d\n", l, exl);
 }
 
@@ -509,14 +505,8 @@ static void _test_event_clientx(unsigned line, IHTMLEventObj *event, LONG exl)
 
     hres = IHTMLEventObj_get_clientX(event, &l);
     ok_(__FILE__,line)(hres == S_OK, "get_clientX failed: %08x\n", hres);
-    if(exl == -10)  {/* don't test the exact value */
-        if(xy_todo)
-            todo_wine ok_(__FILE__,line)(l > 0, "clientX = %d\n", l);
-        else
-            ok_(__FILE__,line)(l > 0, "clientX = %d\n", l);
-    }else {
+    if(exl != -10) /* don't test the exact value */
         ok_(__FILE__,line)(l == exl, "clientX = %d, expected %d\n", l, exl);
-    }
 }
 
 static void _test_event_clienty(unsigned line, IHTMLEventObj *event, LONG exl)
@@ -526,14 +516,8 @@ static void _test_event_clienty(unsigned line, IHTMLEventObj *event, LONG exl)
 
     hres = IHTMLEventObj_get_clientY(event, &l);
     ok_(__FILE__,line)(hres == S_OK, "get_clientY failed: %08x\n", hres);
-    if(exl == -10)  {/* don't test the exact value */
-        if(xy_todo)
-            todo_wine ok_(__FILE__,line)(l > 0, "clientY = %d\n", l);
-        else
-            ok_(__FILE__,line)(l > 0, "clientY = %d\n", l);
-    }else {
+    if(exl != -10) /* don't test the exact value */
         ok_(__FILE__,line)(l == exl, "clientY = %d, expected %d\n", l, exl);
-    }
 }
 
 static void _test_event_offsetx(unsigned line, IHTMLEventObj *event, LONG exl)
@@ -543,9 +527,7 @@ static void _test_event_offsetx(unsigned line, IHTMLEventObj *event, LONG exl)
 
     hres = IHTMLEventObj_get_offsetX(event, &l);
     ok_(__FILE__,line)(hres == S_OK, "get_offsetX failed: %08x\n", hres);
-    if(exl == -10) /* don't test the exact value */
-        todo_wine ok_(__FILE__,line)(l > 0, "offsetX = %d\n", l);
-    else
+    if(exl != -10) /* don't test the exact value */
         ok_(__FILE__,line)(l == exl, "offsetX = %d, expected %d\n", l, exl);
 }
 
@@ -556,9 +538,7 @@ static void _test_event_offsety(unsigned line, IHTMLEventObj *event, LONG exl)
 
     hres = IHTMLEventObj_get_offsetY(event, &l);
     ok_(__FILE__,line)(hres == S_OK, "get_offsetY failed: %08x\n", hres);
-    if(exl == -10) /* don't test the exact value */
-        todo_wine ok_(__FILE__,line)(l > 0, "offsetY = %d\n", l);
-    else
+    if(exl != -10) /* don't test the exact value */
         ok_(__FILE__,line)(l == exl, "offsetY = %d, expected %d\n", l, exl);
 }
 
@@ -569,14 +549,8 @@ static void _test_event_screenx(unsigned line, IHTMLEventObj *event, LONG exl)
 
     hres = IHTMLEventObj_get_screenX(event, &l);
     ok_(__FILE__,line)(hres == S_OK, "get_screenX failed: %08x\n", hres);
-    if(exl == -10) { /* don't test the exact value */
-        if(xy_todo)
-            todo_wine ok_(__FILE__,line)(l > 0, "screenX = %d\n", l);
-        else
-            ok_(__FILE__,line)(l > 0, "screenX = %d\n", l);
-    }else {
+    if(exl != -10) /* don't test the exact value */
         ok_(__FILE__,line)(l == exl, "screenX = %d, expected %d\n", l, exl);
-    }
 }
 
 static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl)
@@ -586,14 +560,8 @@ static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl)
 
     hres = IHTMLEventObj_get_screenY(event, &l);
     ok_(__FILE__,line)(hres == S_OK, "get_screenY failed: %08x\n", hres);
-    if(exl == -10) { /* don't test the exact value */
-        if(xy_todo)
-            todo_wine ok_(__FILE__,line)(l > 0, "screenY = %d\n", l);
-        else
-            ok_(__FILE__,line)(l > 0, "screenY = %d\n", l);
-    }else {
+    if(exl != -10) /* don't test the exact value for -10 */
         ok_(__FILE__,line)(l == exl, "screenY = %d, expected %d\n", l, exl);
-    }
 }
 
 static void _test_event_type(unsigned line, IHTMLEventObj *event, const char *exstr)



From julliard at winehq.org  Mon Jun 21 11:07:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:04 -0500
Subject: Jacek Caban : mshtml: Check if event_table entry is allocated before
	using it in remove_event_handler .
Message-ID: <E1OQjWa-0001KN-Pz@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1eced6053d7d277029128b9e127edf2317e9ccbd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1eced6053d7d277029128b9e127edf2317e9ccbd

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Sat Jun 19 22:25:32 2010 +0200

mshtml: Check if event_table entry is allocated before using it in remove_event_handler.

---

 dlls/mshtml/htmlevent.c    |    2 +-
 dlls/mshtml/tests/events.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 6925a0c..7cc2f39 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1077,7 +1077,7 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve
 
 static HRESULT remove_event_handler(event_target_t **event_target, eventid_t eid)
 {
-    if(*event_target && (*event_target)->event_table[eid]->handler_prop) {
+    if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) {
         IDispatch_Release((*event_target)->event_table[eid]->handler_prop);
         (*event_target)->event_table[eid]->handler_prop = NULL;
     }
diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c
index c9523de..deafd54 100644
--- a/dlls/mshtml/tests/events.c
+++ b/dlls/mshtml/tests/events.c
@@ -1172,6 +1172,10 @@ static void test_onclick(IHTMLDocument2 *doc)
     hres = IHTMLElement_put_onclick(div, v);
     ok(hres == S_OK, "put_onclick failed: %08x\n", hres);
 
+    V_VT(&v) = VT_NULL;
+    hres = IHTMLElement_put_ondblclick(div, v);
+    ok(hres == S_OK, "put_ondblclick failed: %08x\n", hres);
+
     V_VT(&v) = VT_EMPTY;
     hres = IHTMLElement_get_onclick(div, &v);
     ok(hres == S_OK, "get_onclick failed: %08x\n", hres);



From julliard at winehq.org  Mon Jun 21 11:07:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:04 -0500
Subject: Jacek Caban : shdocvw: Return IHTMLDocument2's IDispatch in
	get_Document.
Message-ID: <E1OQjWa-0001Lb-Ub@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2c354b8bbbd4f59962673894caa8f188cc682eca
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2c354b8bbbd4f59962673894caa8f188cc682eca

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Sun Jun 20 14:40:09 2010 +0200

shdocvw: Return IHTMLDocument2's IDispatch in get_Document.

---

 dlls/mshtml/tests/htmldoc.c     |    5 +++++
 dlls/shdocvw/tests/webbrowser.c |    6 ++++++
 dlls/shdocvw/webbrowser.c       |   22 +++++++++++++++++++---
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 319e5fd..2d51262 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -4515,6 +4515,11 @@ static void test_QueryInterface(IHTMLDocument2 *doc)
     hres = IUnknown_QueryInterface(doc, &IID_IStdMarshalInfo, (void**)&qi);
     ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
     ok(qi == NULL, "qi=%p, expected NULL\n", qi);
+
+    hres = IUnknown_QueryInterface(doc, &IID_IDispatch, (void**)&qi);
+    ok(hres == S_OK, "Could not get IDispatch interface: %08x\n", hres);
+    ok(qi != (IUnknown*)doc, "disp == doc\n");
+    IUnknown_Release(qi);
 }
 
 static void init_test(enum load_state_t ls) {
diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c
index 17189fc..15fc1ec 100644
--- a/dlls/shdocvw/tests/webbrowser.c
+++ b/dlls/shdocvw/tests/webbrowser.c
@@ -2369,6 +2369,7 @@ static void test_IServiceProvider(IUnknown *unk)
 #define get_document(u) _get_document(__LINE__,u)
 static IDispatch *_get_document(unsigned line, IUnknown *unk)
 {
+    IHTMLDocument2 *html_doc;
     IWebBrowser2 *wb;
     IDispatch *disp;
     HRESULT hres;
@@ -2382,6 +2383,11 @@ static IDispatch *_get_document(unsigned line, IUnknown *unk)
     ok_(__FILE__,line)(hres == S_OK, "get_Document failed: %08x\n", hres);
     ok_(__FILE__,line)(disp != NULL, "doc_disp == NULL\n");
 
+    hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&html_doc);
+    ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument iface: %08x\n", hres);
+    ok(disp == (IDispatch*)html_doc, "disp != html_doc\n");
+    IHTMLDocument_Release(html_doc);
+
     return disp;
 }
 
diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index 0c26a83..20d39bb 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -22,6 +22,7 @@
 #include "wine/debug.h"
 #include "shdocvw.h"
 #include "exdispid.h"
+#include "mshtml.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
@@ -334,13 +335,28 @@ static HRESULT WINAPI WebBrowser_get_Container(IWebBrowser2 *iface, IDispatch **
 static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **ppDisp)
 {
     WebBrowser *This = WEBBROWSER_THIS(iface);
+    IDispatch *disp = NULL;
 
     TRACE("(%p)->(%p)\n", This, ppDisp);
 
-    *ppDisp = NULL;
-    if(This->doc_host.document)
-        IUnknown_QueryInterface(This->doc_host.document, &IID_IDispatch, (void**)ppDisp);
+    if(This->doc_host.document) {
+        HRESULT hres;
+
+        hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IDispatch, (void**)&disp);
+        if(SUCCEEDED(hres)) {
+            IDispatch *html_doc;
+
+            /* Some broken apps cast returned IDispatch to IHTMLDocument2
+             * without QueryInterface call */
+            hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&html_doc);
+            if(SUCCEEDED(hres)) {
+                IDispatch_Release(disp);
+                disp = html_doc;
+            }
+        }
+    }
 
+    *ppDisp = disp;
     return S_OK;
 }
 



From julliard at winehq.org  Mon Jun 21 11:07:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:05 -0500
Subject: =?UTF-8?Q?Florian=20K=C3=B6berle=20?=: comctl32/tests: Test
	calculating the rect of a child item while handling TVN_ITEMEXPANDED.
Message-ID: <E1OQjWb-0001Oj-8j@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2f77e2b93d6a70975d3416a03cadf5ff224e8adc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2f77e2b93d6a70975d3416a03cadf5ff224e8adc

Author: Florian K?berle <florian at fkoeberle.de>
Date:   Sun Jun 20 14:50:00 2010 +0200

comctl32/tests: Test calculating the rect of a child item while handling TVN_ITEMEXPANDED.

---

 dlls/comctl32/tests/treeview.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index a0d8e77..320deba 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -819,12 +819,15 @@ static void test_get_set_unicodeformat(void)
 
 static TVITEMA g_item_expanding, g_item_expanded;
 static BOOL g_get_from_expand;
+static BOOL g_get_rect_in_expand;
 
 static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     static LONG defwndproc_counter = 0;
     struct message msg;
     LRESULT ret;
+    RECT rect;
+    HTREEITEM visibleItem;
 
     msg.message = message;
     msg.flags = sent|wparam|lparam;
@@ -907,6 +910,17 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam,
                   ret = SendMessageA(pHdr->hwndFrom, TVM_GETITEMA, 0, (LPARAM)&g_item_expanded);
                   ok(ret == TRUE, "got %lu\n", ret);
                 }
+                if (g_get_rect_in_expand) {
+                  visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, NULL, TVGN_FIRSTVISIBLE);
+                  ok(pTreeView->itemNew.hItem == visibleItem, "expanded item == first visible item\n");
+                  *(HTREEITEM*)&rect = visibleItem;
+                  ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for first visible item.\n");
+                  visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, visibleItem, TVGN_NEXTVISIBLE);
+                  *(HTREEITEM*)&rect = visibleItem;
+                  ok(visibleItem != NULL, "There must be a visible item after the first visisble item.\n");
+                  todo_wine
+                  ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for second visible item.\n");
+                }
                 break;
             }
         }
@@ -1167,6 +1181,17 @@ static void test_expandnotify(void)
     DestroyWindow(hTree);
 }
 
+static void test_rect_retrieval_after_expand_with_select(void) {
+  BOOL ret;
+  HWND hTree;
+  hTree = create_treeview_control();
+  fill_tree(hTree);
+  g_get_rect_in_expand = TRUE;
+  ret = TreeView_Select(hTree, hChild, TVGN_CARET);
+  g_get_rect_in_expand = FALSE;
+  ok(ret,"TreeView_Select should return true\n");
+}
+
 START_TEST(treeview)
 {
     HMODULE hComctl32;
@@ -1227,6 +1252,7 @@ START_TEST(treeview)
     test_itemedit();
     test_treeview_classinfo();
     test_expandnotify();
+    test_rect_retrieval_after_expand_with_select();
 
     PostMessageA(hMainWnd, WM_CLOSE, 0, 0);
     while(GetMessageA(&msg,0,0,0)) {



From julliard at winehq.org  Mon Jun 21 11:07:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:05 -0500
Subject: Paul Chitescu : gdi32: If driver is missing claim vectorial fonts are
	supported so GDI fonts ( freetype) are used.
Message-ID: <E1OQjWb-0001P8-CA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f479aa5ce5f0b1995913dbee7483d63949b6ea24
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f479aa5ce5f0b1995913dbee7483d63949b6ea24

Author: Paul Chitescu <paulc at voip.null.ro>
Date:   Fri Jun 18 18:37:50 2010 +0300

gdi32: If driver is missing claim vectorial fonts are supported so GDI fonts (freetype) are used.

---

 dlls/gdi32/dc.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index f3a62bd..c55442f 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -912,6 +912,11 @@ INT WINAPI GetDeviceCaps( HDC hdc, INT cap )
         case LOGPIXELSX:  ret = 72; break;
         case LOGPIXELSY:  ret = 72; break;
         case SIZEPALETTE: ret = 2; break;
+        case TEXTCAPS:
+            ret = (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE |
+                   TC_CR_ANY | TC_SF_X_YINDEP | TC_SA_DOUBLE | TC_SA_INTEGER |
+                   TC_SA_CONTIN | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE | TC_VA_ABLE);
+            break;
         }
         release_dc_ptr( dc );
     }



From julliard at winehq.org  Mon Jun 21 11:07:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:05 -0500
Subject: Maarten Lankhorst : winecfg: Only initialise the audio drivers once.
Message-ID: <E1OQjWb-0001Ps-Es@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0dc5bab1c9ccb27473d9bc2ec96e58b0e23662e4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0dc5bab1c9ccb27473d9bc2ec96e58b0e23662e4

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Fri Jun 18 21:18:06 2010 +0200

winecfg: Only initialise the audio drivers once.

---

 programs/winecfg/audio.c |   47 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index c5cebcd..134296d 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -86,9 +86,10 @@ typedef struct
 {
   UINT nameID;
   const char *szDriver;
+  HDRVR hDriver;
 } AUDIO_DRIVER;
 
-static const AUDIO_DRIVER sAudioDrivers[] = {
+static AUDIO_DRIVER sAudioDrivers[] = {
   {IDS_DRIVER_ALSA,      "alsa"},
   {IDS_DRIVER_OSS,       "oss"},
   {IDS_DRIVER_COREAUDIO, "coreaudio"},
@@ -118,7 +119,7 @@ static void configureAudioDriver(HWND hDlg)
         HDRVR hdrvr;
         char wine_driver[MAX_NAME_LENGTH + 9];
         sprintf(wine_driver, "wine%s.drv", pAudioDrv->szDriver);
-        hdrvr = OpenDriverA(wine_driver, 0, 0);
+        hdrvr = pAudioDrv->hDriver;
         if (hdrvr != 0)
         {
             if (SendDriverMessage(hdrvr, DRV_QUERYCONFIGURE, 0, 0) != 0)
@@ -129,7 +130,6 @@ static void configureAudioDriver(HWND hDlg)
                 dci.lpszDCIAliasName = NULL;
                 SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG_PTR)&dci);
             }
-            CloseDriver(hdrvr, 0, 0);
         }
         else
         {
@@ -197,7 +197,7 @@ static void removeDriver(const char * driver)
 
 static void initAudioDeviceTree(HWND hDlg)
 {
-    const AUDIO_DRIVER *pAudioDrv = NULL;
+    AUDIO_DRIVER *pAudioDrv = NULL;
     int i, j;
     TVINSERTSTRUCTW insert;
     HTREEITEM root, driver[10];
@@ -247,7 +247,7 @@ static void initAudioDeviceTree(HWND hDlg)
         LoadStringW (GetModuleHandle (NULL), pAudioDrv->nameID, text,
             sizeof(text)/sizeof(text[0]));
 
-        if ((hdrv = OpenDriverA(name, 0, 0)))
+        if ((hdrv = pAudioDrv->hDriver))
         {
             HMODULE lib;
             if ((lib = GetDriverModuleHandle(hdrv)))
@@ -473,7 +473,6 @@ static void initAudioDeviceTree(HWND hDlg)
                     }
                 }
             }
-            CloseDriver(hdrv, 0, 0);
         }
     }
 
@@ -490,7 +489,7 @@ static void initAudioDeviceTree(HWND hDlg)
 static void findAudioDrivers(void)
 {
     int numFound = 0;
-    const AUDIO_DRIVER *pAudioDrv = NULL;
+    AUDIO_DRIVER *pAudioDrv = NULL;
     HCURSOR old_cursor;
 
     /* delete an existing list */
@@ -511,10 +510,38 @@ static void findAudioDrivers(void)
 
             sprintf(driver, "wine%s.drv", pAudioDrv->szDriver);
 
-            if ((hdrv = OpenDriverA(driver, 0, 0)))
-            {
-                CloseDriver(hdrv, 0, 0);
+            hdrv = pAudioDrv->hDriver;
+            if (!pAudioDrv->hDriver && (hdrv = OpenDriverA(driver, 0, 0))) {
+                HMODULE lib = GetDriverModuleHandle(hdrv);
+                MessagePtr wodMessagePtr = (MessagePtr)GetProcAddress(lib, "wodMessage");
+                MessagePtr widMessagePtr = (MessagePtr)GetProcAddress(lib, "widMessage");
+                MessagePtr modMessagePtr = (MessagePtr)GetProcAddress(lib, "modMessage");
+                MessagePtr midMessagePtr = (MessagePtr)GetProcAddress(lib, "midMessage");
+                MessagePtr auxMessagePtr = (MessagePtr)GetProcAddress(lib, "auxMessage");
+                MessagePtr mxdMessagePtr = (MessagePtr)GetProcAddress(lib, "mxdMessage");
+
+                pAudioDrv->hDriver = hdrv;
 
+                if (wodMessagePtr)
+                    wodMessagePtr(0, DRVM_INIT, 0, 0, 0);
+
+                if (widMessagePtr)
+                    widMessagePtr(0, DRVM_INIT, 0, 0, 0);
+
+                if (modMessagePtr)
+                    modMessagePtr(0, DRVM_INIT, 0, 0, 0);
+
+                if (midMessagePtr)
+                    midMessagePtr(0, DRVM_INIT, 0, 0, 0);
+
+                if (auxMessagePtr)
+                    auxMessagePtr(0, DRVM_INIT, 0, 0, 0);
+
+                if (mxdMessagePtr)
+                    mxdMessagePtr(0, DRVM_INIT, 0, 0, 0);
+            }
+            if (hdrv)
+            {
                 if (loadedAudioDrv)
                     loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER));
                 else



From julliard at winehq.org  Mon Jun 21 11:07:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:05 -0500
Subject: Marko Nikolic : advapi32/tests: Fixed -Wsign-compare warnings in
	security tests.
Message-ID: <E1OQjWb-0001QI-Hs@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3675a3844786496098675a9fa0855357c2fe1e9e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3675a3844786496098675a9fa0855357c2fe1e9e

Author: Marko Nikolic <grkoma at gmail.com>
Date:   Fri Jun 18 22:01:57 2010 +0200

advapi32/tests: Fixed -Wsign-compare warnings in security tests.

---

 dlls/advapi32/tests/security.c |   62 ++++++++++++++++++++--------------------
 1 files changed, 31 insertions(+), 31 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=3675a3844786496098675a9fa0855357c2fe1e9e


From julliard at winehq.org  Mon Jun 21 11:07:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:05 -0500
Subject: Marko Nikolic : advapi32/ tests Fixed test macro in
	ConvertSecurityDescriptorToString.
Message-ID: <E1OQjWb-0001V0-Ss@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b8978553ad83a069e7a033a995048b3a335b6ad4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b8978553ad83a069e7a033a995048b3a335b6ad4

Author: Marko Nikolic <grkoma at gmail.com>
Date:   Fri Jun 18 22:44:45 2010 +0200

advapi32/tests Fixed test macro in ConvertSecurityDescriptorToString.

---

 dlls/advapi32/tests/security.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index ba139ce..2b14ae5 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2812,7 +2812,7 @@ static void test_ConvertSecurityDescriptorToString(void)
 
 #define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \
     ok(strcmp(string, (exp_str1)) == 0 || strcmp(string, (exp_str2)) == 0, "String mismatch (expected\n\"%s\" or\n\"%s\", got\n\"%s\")\n", (exp_str1), (exp_str2), string); \
-    ok(len >= (strlen(string) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(string) + 1, len); \
+    ok(len >= (strlen(exp_str1) + 1) || len >= (strlen(exp_str2) + 1), "Length mismatch (expected %d or %d, got %d)\n", lstrlen(exp_str1) + 1, lstrlen(exp_str2) + 1, len); \
     LocalFree(string);
 
     InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION);



From julliard at winehq.org  Mon Jun 21 11:07:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:06 -0500
Subject: Eric Pouech : mmsystem.drv: Always map parameters for all callback
	kinds.
Message-ID: <E1OQjWc-0001WW-0X@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6f778a79f4f0e0c229d7dc7917a5fb5195dabd35
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6f778a79f4f0e0c229d7dc7917a5fb5195dabd35

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sun Jun 20 08:08:04 2010 +0200

mmsystem.drv: Always map parameters for all callback kinds.

---

 dlls/mmsystem.dll16/message16.c |   70 +++++++++++++++++++++++++++------------
 dlls/mmsystem.dll16/mmsystem.c  |   61 +++++++++++++--------------------
 dlls/mmsystem.dll16/winemm16.h  |    2 +-
 3 files changed, 74 insertions(+), 59 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f778a79f4f0e0c229d7dc7917a5fb5195dabd35


From julliard at winehq.org  Mon Jun 21 11:07:08 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:08 -0500
Subject: Nikolay Sivov : msxml3: Support xml:lang attribute in IXMLElement::
	getAttribute().
Message-ID: <E1OQjWe-0001uR-GO@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b00046ccc44ad3ed3368f1b62d8d1ad2bd7eeade
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b00046ccc44ad3ed3368f1b62d8d1ad2bd7eeade

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun 21 01:51:20 2010 +0400

msxml3: Support xml:lang attribute in IXMLElement::getAttribute().

---

 dlls/msxml3/xmlelem.c |   60 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index 3ff307b..7a4faa3 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -238,46 +238,66 @@ static HRESULT WINAPI xmlelem_setAttribute(IXMLElement *iface, BSTR strPropertyN
     return (attr) ? S_OK : S_FALSE;
 }
 
-static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR strPropertyName,
-                                           VARIANT *PropertyValue)
+static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR name,
+    VARIANT *value)
 {
+    static const WCHAR xmllangW[] = { 'x','m','l',':','l','a','n','g',0 };
     xmlelem *This = impl_from_IXMLElement(iface);
-    xmlChar *val = NULL, *name;
-    xmlAttrPtr ptr;
+    xmlChar *val = NULL;
 
-    TRACE("(%p, %s, %p)\n", iface, debugstr_w(strPropertyName), PropertyValue);
+    TRACE("(%p, %s, %p)\n", iface, debugstr_w(name), value);
 
-    if (!PropertyValue)
+    if (!value)
         return E_INVALIDARG;
 
-    VariantInit(PropertyValue);
-    V_BSTR(PropertyValue) = NULL;
+    VariantInit(value);
+    V_BSTR(value) = NULL;
 
-    if (!strPropertyName)
+    if (!name)
         return E_INVALIDARG;
 
-    name = xmlChar_from_wchar(strPropertyName);
-    ptr = This->node->properties;
-    while (ptr)
+    /* case for xml:lang attribute */
+    if (!lstrcmpiW(name, xmllangW))
+    {
+        xmlNsPtr ns;
+        ns = xmlSearchNs(This->node->doc, This->node, (xmlChar*)"xml");
+        val = xmlGetNsProp(This->node, (xmlChar*)"lang", ns->href);
+        xmlFree(ns);
+    }
+    else
     {
-        if (!lstrcmpiA((LPSTR)name, (LPCSTR)ptr->name))
+        xmlAttrPtr attr;
+        xmlChar *xml_name;
+
+        xml_name = xmlChar_from_wchar(name);
+        attr = This->node->properties;
+        while (attr)
         {
-            val = xmlNodeListGetString(ptr->doc, ptr->children, 1);
-            break;
+            BSTR attr_name;
+
+            attr_name = bstr_from_xmlChar(attr->name);
+            if (!lstrcmpiW(name, attr_name))
+            {
+                val = xmlNodeListGetString(attr->doc, attr->children, 1);
+                SysFreeString(attr_name);
+                break;
+            }
+
+            attr = attr->next;
+            SysFreeString(attr_name);
         }
 
-        ptr = ptr->next;
+        heap_free(xml_name);
     }
 
     if (val)
     {
-        V_VT(PropertyValue) = VT_BSTR;
-        V_BSTR(PropertyValue) = bstr_from_xmlChar(val);
+        V_VT(value) = VT_BSTR;
+        V_BSTR(value) = bstr_from_xmlChar(val);
     }
 
-    heap_free(name);
     xmlFree(val);
-    TRACE("returning %s\n", debugstr_w(V_BSTR(PropertyValue)));
+    TRACE("returning %s\n", debugstr_w(V_BSTR(value)));
     return (val) ? S_OK : S_FALSE;
 }
 



From julliard at winehq.org  Mon Jun 21 11:07:10 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:10 -0500
Subject: Nikolay Sivov : msxml3: Don't crash on null pointer when doing
	::Next() on a last child.
Message-ID: <E1OQjWg-0002Gs-IC@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 473c5c4cc02b376ae561368cd5623372fe4223b5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=473c5c4cc02b376ae561368cd5623372fe4223b5

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun 21 02:46:23 2010 +0400

msxml3: Don't crash on null pointer when doing ::Next() on a last child.

---

 dlls/msxml3/tests/xmlelem.c |   10 ++++++++++
 dlls/msxml3/xmlelem.c       |   17 ++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c
index 3304d5a..f38d515 100644
--- a/dlls/msxml3/tests/xmlelem.c
+++ b/dlls/msxml3/tests/xmlelem.c
@@ -357,6 +357,16 @@ static void test_xmlelem_collection(void)
     ok(V_VT(&var) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var));
     ok(num_vars == 1, "Expected 1, got %d\n", num_vars);
 
+    /* try advance further, no children left */
+    hr = IEnumVARIANT_Next(enumVar, 1, &var, &num_vars);
+    ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr);
+    ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var));
+    ok(num_vars == 0, "Expected 0, got %d\n", num_vars);
+
+    hr = IEnumVARIANT_Next(enumVar, 1, &var, NULL);
+    ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr);
+    ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var));
+
     hr = IUnknown_QueryInterface(V_DISPATCH(&var), &IID_IXMLElement, (LPVOID *)&child);
     ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
     ok(child != NULL, "Expected non-NULL child\n");
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index 7a4faa3..c067179 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -723,21 +723,28 @@ static ULONG WINAPI xmlelem_collection_IEnumVARIANT_Release(
 }
 
 static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
-    IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched)
+    IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *fetched)
 {
     xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
     xmlNodePtr ptr = This->current;
 
-    TRACE("(%p, %d, %p, %p)\n", iface, celt, rgVar, pCeltFetched);
+    TRACE("(%p, %d, %p, %p)\n", iface, celt, rgVar, fetched);
 
     if (!rgVar)
         return E_INVALIDARG;
 
     /* FIXME: handle celt */
-    if (pCeltFetched)
-        *pCeltFetched = 1;
+    if (fetched)
+        *fetched = 1;
 
-    This->current = This->current->next;
+    if (This->current)
+        This->current = This->current->next;
+    else
+    {
+        V_VT(rgVar) = VT_EMPTY;
+        if (fetched) *fetched = 0;
+        return S_FALSE;
+    }
 
     V_VT(rgVar) = VT_DISPATCH;
     return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)&V_DISPATCH(rgVar), FALSE);



From julliard at winehq.org  Mon Jun 21 11:07:10 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:10 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: user32: Update comment.
Message-ID: <E1OQjWg-0002IL-Mp@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 858ae060fd5403c101ef582cf007ec261b5f836a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=858ae060fd5403c101ef582cf007ec261b5f836a

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Sun Jun 20 16:08:33 2010 +0200

user32: Update comment.

---

 dlls/user32/sysparams.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 7155dba..e6d2386 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -1085,7 +1085,7 @@ static void load_nonclient_metrics(void)
     if (!reg_get_logfont(METRICS_REGKEY, METRICS_SMCAPTIONLOGFONT_VALNAME, &ncm.lfSmCaptionFont))
         SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &ncm.lfSmCaptionFont, 0 );
 
-    /* menus, FIXME: names of wine.conf entries are bogus */
+    /* menus, FIXME: names of registry entries are bogus */
 
     /* size of the menu (MDI) buttons */
     ncm.iMenuHeight = get_reg_metric(hkey, METRICS_MENUHEIGHT_VALNAME, 18);



From julliard at winehq.org  Mon Jun 21 11:07:10 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:10 -0500
Subject: Nikolay Sivov : msxml3: Extend traces for inc/dec refs on libxml2
	documents .
Message-ID: <E1OQjWg-0002Jq-SQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 94e88e6712aa40cb30a6be920e9d20885aa7e7c7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=94e88e6712aa40cb30a6be920e9d20885aa7e7c7

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun 21 13:36:13 2010 +0400

msxml3: Extend traces for inc/dec refs on libxml2 documents.

---

 dlls/msxml3/domdoc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 4808e4e..688ce99 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -158,7 +158,7 @@ static xmlDocPtr doparse( char *ptr, int len, const char *encoding )
 LONG xmldoc_add_ref(xmlDocPtr doc)
 {
     LONG ref = InterlockedIncrement(&priv_from_xmlDocPtr(doc)->refs);
-    TRACE("%d\n", ref);
+    TRACE("(%p)->(%d)\n", doc, ref);
     return ref;
 }
 
@@ -166,7 +166,7 @@ LONG xmldoc_release(xmlDocPtr doc)
 {
     xmldoc_priv *priv = priv_from_xmlDocPtr(doc);
     LONG ref = InterlockedDecrement(&priv->refs);
-    TRACE("%d\n", ref);
+    TRACE("(%p)->(%d)\n", doc, ref);
     if(ref == 0)
     {
         orphan_entry *orphan, *orphan2;



From julliard at winehq.org  Mon Jun 21 11:07:11 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:11 -0500
Subject: Andrey Turkin : ntdll: Fix race in NtRead/WriteFile.
Message-ID: <E1OQjWh-0002KQ-09@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5b3750e2a4496c6088af82518721ec470cd68d19
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5b3750e2a4496c6088af82518721ec470cd68d19

Author: Andrey Turkin <andrey.turkin at gmail.com>
Date:   Mon Jun 21 18:16:04 2010 +0400

ntdll: Fix race in NtRead/WriteFile.

---

 dlls/ntdll/file.c |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 30b93aa..0a6ee55 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -582,6 +582,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent,
     ULONG total = 0;
     enum server_fd_type type;
     ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user;
+    BOOL send_completion = FALSE;
 
     TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n",
           hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key);
@@ -730,7 +731,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent,
     }
 
 done:
-    if (cvalue) NTDLL_AddCompletion( hFile, cvalue, status, total );
+    send_completion = cvalue != 0;
 
 err:
     if (needs_close) close( unix_handle );
@@ -748,6 +749,9 @@ err:
         TRACE("= 0x%08x\n", status);
         if (status != STATUS_PENDING && hEvent) NtResetEvent( hEvent, NULL );
     }
+
+    if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total );
+
     return status;
 }
 
@@ -767,6 +771,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap
     ULONG pos = 0, total = 0;
     enum server_fd_type type;
     ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user;
+    BOOL send_completion = FALSE;
 
     TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n",
            file, event, apc, apc_user, io_status, segments, length, offset, key);
@@ -814,7 +819,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap
         }
     }
 
-    if (cvalue) NTDLL_AddCompletion( file, cvalue, status, total );
+    send_completion = cvalue != 0;
 
  error:
     if (needs_close) close( unix_handle );
@@ -832,6 +837,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap
         TRACE("= 0x%08x\n", status);
         if (status != STATUS_PENDING && event) NtResetEvent( event, NULL );
     }
+
+    if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total );
+
     return status;
 }
 
@@ -921,6 +929,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent,
     ULONG total = 0;
     enum server_fd_type type;
     ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user;
+    BOOL send_completion = FALSE;
 
     TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n",
           hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key);
@@ -1054,7 +1063,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent,
     }
 
 done:
-    if (cvalue) NTDLL_AddCompletion( hFile, cvalue, status, total );
+    send_completion = cvalue != 0;
 
 err:
     if (needs_close) close( unix_handle );
@@ -1072,6 +1081,9 @@ err:
         TRACE("= 0x%08x\n", status);
         if (status != STATUS_PENDING && hEvent) NtResetEvent( hEvent, NULL );
     }
+
+    if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total );
+
     return status;
 }
 
@@ -1091,6 +1103,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap
     ULONG pos = 0, total = 0;
     enum server_fd_type type;
     ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user;
+    BOOL send_completion = FALSE;
 
     TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n",
            file, event, apc, apc_user, io_status, segments, length, offset, key);
@@ -1143,7 +1156,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap
         }
     }
 
-    if (cvalue) NTDLL_AddCompletion( file, cvalue, status, total );
+    send_completion = cvalue != 0;
 
  error:
     if (needs_close) close( unix_handle );
@@ -1161,6 +1174,9 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap
         TRACE("= 0x%08x\n", status);
         if (status != STATUS_PENDING && event) NtResetEvent( event, NULL );
     }
+
+    if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total );
+
     return status;
 }
 



From julliard at winehq.org  Mon Jun 21 11:07:11 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 21 Jun 2010 11:07:11 -0500
Subject: Alexandre Julliard : advapi32: Make rpcrt4 a delayed import to work
	around circular dependencies with native .
Message-ID: <E1OQjWh-0002Lh-2j@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 58a698882d7f048e642bfccba65edcac98bd3a40
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=58a698882d7f048e642bfccba65edcac98bd3a40

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 21 16:56:12 2010 +0200

advapi32: Make rpcrt4 a delayed import to work around circular dependencies with native.

---

 dlls/advapi32/Makefile.in |    3 +-
 dlls/advapi32/crypt.c     |   56 ++++++++++++++++++--------------------------
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index a3d0efc..d880360 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -5,7 +5,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advapi32.dll
 IMPORTLIB = advapi32
-IMPORTS   = rpcrt4 kernel32 ntdll
+IMPORTS   = kernel32 ntdll
+DELAYIMPORTS = rpcrt4
 EXTRALIBS = @SECURITYLIB@
 
 C_SRCS = \
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index bb019d0..4235e83 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -284,40 +284,30 @@ static void CRYPT_CreateMachineGuid(void)
 		r = RegQueryValueExW(key, machineGuidW, NULL, NULL, NULL, &size);
 		if (r == ERROR_FILE_NOT_FOUND)
 		{
-			static const WCHAR rpcrt4[] = {
-				'r','p','c','r','t','4',0 };
-			HMODULE lib = LoadLibraryW(rpcrt4);
-
-			if (lib)
-			{
-				RPC_STATUS (RPC_ENTRY *pUuidCreate)(UUID *);
-				UUID uuid;
-                                WCHAR buf[37];
-                                RPC_STATUS rs;
-                                static const WCHAR uuidFmt[] = {
-                                    '%','0','8','x','-','%','0','4','x','-',
-                                    '%','0','4','x','-','%','0','2','x',
-                                    '%','0','2','x','-','%','0','2','x',
-                                    '%','0','2','x','%','0','2','x',
-                                    '%','0','2','x','%','0','2','x',
-                                    '%','0','2','x',0 };
-
-                                pUuidCreate = (void *)GetProcAddress(lib, "UuidCreate");
-                                rs = pUuidCreate(&uuid);
-                                if (rs == S_OK)
-                                {
-                                    sprintfW(buf, uuidFmt,
-                                             uuid.Data1, uuid.Data2, uuid.Data3,
-                                             uuid.Data4[0], uuid.Data4[1],
-                                             uuid.Data4[2], uuid.Data4[3],
-                                             uuid.Data4[4], uuid.Data4[5],
-                                             uuid.Data4[6], uuid.Data4[7] );
-                                    RegSetValueExW(key, machineGuidW, 0, REG_SZ,
-                                                   (const BYTE *)buf,
-                                                   (lstrlenW(buf)+1)*sizeof(WCHAR));
-                                }
-				FreeLibrary(lib);
-			}
+                    UUID uuid;
+                    WCHAR buf[37];
+                    RPC_STATUS rs;
+                    static const WCHAR uuidFmt[] = {
+                        '%','0','8','x','-','%','0','4','x','-',
+                        '%','0','4','x','-','%','0','2','x',
+                        '%','0','2','x','-','%','0','2','x',
+                        '%','0','2','x','%','0','2','x',
+                        '%','0','2','x','%','0','2','x',
+                        '%','0','2','x',0 };
+
+                    rs = UuidCreate(&uuid);
+                    if (rs == S_OK)
+                    {
+                        sprintfW(buf, uuidFmt,
+                                 uuid.Data1, uuid.Data2, uuid.Data3,
+                                 uuid.Data4[0], uuid.Data4[1],
+                                 uuid.Data4[2], uuid.Data4[3],
+                                 uuid.Data4[4], uuid.Data4[5],
+                                 uuid.Data4[6], uuid.Data4[7] );
+                        RegSetValueExW(key, machineGuidW, 0, REG_SZ,
+                                       (const BYTE *)buf,
+                                       (lstrlenW(buf)+1)*sizeof(WCHAR));
+                    }
 		}
 		RegCloseKey(key);
 	}



From jnewman at winehq.org  Mon Jun 21 11:08:14 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 21 Jun 2010 11:08:14 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: German translation of release
	news 1 .2-rc4
Message-ID: <E1OQjXi-0003wa-37@wine.codeweavers.com>

Module: website
Branch: master
Commit: d4767c2fcd40ed075f665da32bfbe7856dfe0a72
URL:    http://source.winehq.org/git/website.git/?a=commit;h=d4767c2fcd40ed075f665da32bfbe7856dfe0a72

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon Jun 21 17:56:13 2010 +0200

German translation of release news 1.2-rc4

---

 news/de/2010061801.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/news/de/2010061801.xml b/news/de/2010061801.xml
new file mode 100644
index 0000000..d3a2b34
--- /dev/null
+++ b/news/de/2010061801.xml
@@ -0,0 +1,13 @@
+<news>
+<date>18. Juni 2010</date>
+<title>Wine 1.2-rc4 Freigegeben</title>
+<body>
+<p> Die Entwicklungsversion 1.2-rc4 von Wine ist jetzt verf&uuml;gbar.</p>
+<p> <a href="{$root}/announce/1.2-rc4">Neuerungen (en)</a> in dieser Version:
+<ul>
+  <li>Viele &Uuml;bersetzungen.</li>
+  <li>Ein Haufen Fehlerbehebungen.</li>
+</ul></p>
+<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc4.tar.bz2">verf&uuml;gbar</a>.
+Bin&auml;r-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verf&uuml;gung.
+</p></body></news>



From asornes at winehq.org  Mon Jun 21 17:02:38 2010
From: asornes at winehq.org (=?UTF-8?Q?Alexander_Nicolaysen_S=C3=B8rnes?=)
Date: Mon, 21 Jun 2010 17:02:38 -0500
Subject: =?UTF-8?Q?Alex=20B=C4=83lu=C8=9B=20?=: maintainer: Fix
	getMaintainerCountForUser()
Message-ID: <E1OQp4g-0000uj-Jt@wine.codeweavers.com>

Module: appdb
Branch: master
Commit: 4fce59fde74eb10090d7b97619c3d7b9ce54429a
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=4fce59fde74eb10090d7b97619c3d7b9ce54429a

Author: Alex B?lu? <alexandru.balut at gmail.com>
Date:   Mon Jun 21 22:59:01 2010 +0200

maintainer: Fix getMaintainerCountForUser()

---

 include/maintainer.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/maintainer.php b/include/maintainer.php
index 34cef97..00ff90d 100644
--- a/include/maintainer.php
+++ b/include/maintainer.php
@@ -543,7 +543,7 @@ class maintainer
     // returns the number of applications/versions a particular user maintains
     function getMaintainerCountForUser($oUser, $bSuperMaintainer)
     {
-        return getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer);
+        return self::getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer);
     }
 
     /**



From asornes at winehq.org  Mon Jun 21 17:02:38 2010
From: asornes at winehq.org (=?UTF-8?Q?Alexander_Nicolaysen_S=C3=B8rnes?=)
Date: Mon, 21 Jun 2010 17:02:38 -0500
Subject: =?UTF-8?Q?Alex=20B=C4=83lu=C8=9B=20?=: Fixed a bug in Url.create():
	after creating a table row, the object is not updated properly
Message-ID: <E1OQp4g-0000v0-MV@wine.codeweavers.com>

Module: appdb
Branch: master
Commit: 55a4b0c38df3d708db1f1ba9b8bf72b1b7ca4b14
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=55a4b0c38df3d708db1f1ba9b8bf72b1b7ca4b14

Author: Alex B?lu? <alexandru.balut at gmail.com>
Date:   Mon Jun 21 22:59:01 2010 +0200

Fixed a bug in Url.create(): after creating a table row, the object is not updated properly

---

 include/url.php |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/include/url.php b/include/url.php
index 0419168..15d33ef 100644
--- a/include/url.php
+++ b/include/url.php
@@ -5,7 +5,10 @@
 require_once(BASE."include/util.php");
 
 /**
- * Url class for handling urls
+ * Class for handling URLs (aka Links) of applications and
+ * of application versions.
+ * 
+ * Uses the appData table to store the URLs in rows with type='url'.
  */
 class Url {
     var $iUrlId;
@@ -33,6 +36,8 @@ class Url {
                        WHERE type = 'url'
                        AND id = '?'";
             $hResult = query_parameters($sQuery, $iUrlId);
+            if(!$hResult)
+                return;
             $oRow = query_fetch_object($hResult);
         }
 
@@ -53,12 +58,14 @@ class Url {
 
     /**
      * Creates a new url.
+     * Writes the url into the appData table, then updates the object.
+     * 
+     * @param bSilent Whether to send a notification email.
+     * @return true if everything went fine.
      */
     function create($sDescription = null, $sUrl = null, $iVersionId = null,
                     $iAppId = null, $bSilent = false)
     {
-        global $aClean;
-
         // Security, if we are not an administrator or a maintainer, the url must be queued.
         if(($iAppId && !url::canEdit(NULL, $iAppId)) ||
         ($iVersionId && !url::canEdit($iVersionId)))
@@ -78,7 +85,7 @@ class Url {
         }
 
         $this->iUrlId = query_appdb_insert_id();
-        $this->url($this->iUrlId,$this->bQueued);
+        $this->Url($this->iUrlId);
 
         if(!$bSilent)
             $this->SendNotificationMail();



From asornes at winehq.org  Mon Jun 21 17:02:38 2010
From: asornes at winehq.org (=?UTF-8?Q?Alexander_Nicolaysen_S=C3=B8rnes?=)
Date: Mon, 21 Jun 2010 17:02:38 -0500
Subject: =?UTF-8?Q?Alex=20B=C4=83lu=C8=9B=20?=: Updated test_appData,
	because using downloadurl objects does not work anymore,
	because appData.  listSubmittedBy() ignores queued downloadurls
Message-ID: <E1OQp4g-0000vG-OB@wine.codeweavers.com>

Module: appdb
Branch: master
Commit: dcc72bf43f35d6a575ec2c884392dd5ac00fe86e
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=dcc72bf43f35d6a575ec2c884392dd5ac00fe86e

Author: Alex B?lu? <alexandru.balut at gmail.com>
Date:   Mon Jun 21 23:12:27 2010 +0200

Updated test_appData, because using downloadurl objects does not work anymore, because appData.listSubmittedBy() ignores queued downloadurls

---

 unit_test/test_appData.php |   65 ++++++++++++++++++++++++-------------------
 1 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/unit_test/test_appData.php b/unit_test/test_appData.php
index 335a642..ba62234 100644
--- a/unit_test/test_appData.php
+++ b/unit_test/test_appData.php
@@ -3,7 +3,7 @@
 require_once("path.php");
 require_once("test_common.php");
 require_once(BASE."include/appData.php");
-require_once(BASE."include/downloadurl.php");
+require_once(BASE."include/url.php");
 
 function test_appData_listSubmittedBy()
 {
@@ -19,38 +19,45 @@ function test_appData_listSubmittedBy()
         return FALSE;
     }
 
-    /* Create a queued appData entry */
-    $oDownloadUrl = new downloadurl;
-
-    $oDownloadUrl->sUrl = "http://www.microsoft.com/windowsmedia";
-    $oDownloadUrl->sDescription = "Download Meida Player";
-    $oDownloadUrl->iVersionId = 1;
-
-    $oDownloadUrl->create();
-
-    $shReturn = appData::listSubmittedBy($oUser->iUserId, true);
-
-    /* This is needed for deleting the entry */
-    $oUser->addPriv("admin");
-
-    /* There should be two lines; one header and one for the downloadurl */
-    $iExpected = 2;
-    $iReceived = substr_count($shReturn, "</tr>");
-    if($iExpected != $iReceived)
+    /* Create a queued Url, which will be stored in the appData table */
+    $oUrl = new Url;
+    $bResult = $oUrl->create("test description", "http://testurl", 1, null, true);
+    if(!$bResult)
     {
-        error("Got $iReceived rows instead of $iExpected.");
         $bSuccess = false;
-    }
-
-    /* Clean up */
-    if(!$oDownloadUrl->purge())
+        error("Failed to create Url");
+    } else
     {
-        $bSuccess = false;
-        error("Failed to delete oDownloadUrl!");
+        $shReturn = appData::listSubmittedBy($oUser->iUserId, true);
+        if(!$shReturn)
+        {
+            $bSuccess = false;
+            error("Got empty list.");
+        } else
+        {
+            /* There should be two lines; one header and one for the linked data */
+            $iExpected = 2;
+            $iReceived = substr_count($shReturn, "</tr>");
+            if($iExpected != $iReceived)
+            {
+                error("Got $iReceived rows instead of $iExpected.");
+                $bSuccess = false;
+            }
+        }
+    
+        /* Clean up */
+        /* This is needed for deleting the entry */
+        $oUser->addPriv("admin");
+    
+        if(!$oUrl->purge())
+        {
+            $bSuccess = false;
+            error("Failed to delete oUrl!");
+        }
+    
+        $oUser->delete();
     }
-
-    $oUser->delete();
-
+    
     return $bSuccess;
 }
 



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Alexandre Julliard : ntdll: Fix the initial FPU control word on
	32-bit too.
Message-ID: <E1OR5jA-0007gm-48@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0db65fd36ee8399e08635eec8a038919e3b029bc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0db65fd36ee8399e08635eec8a038919e3b029bc

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 22 11:19:02 2010 +0200

ntdll: Fix the initial FPU control word on 32-bit too.

---

 dlls/kernel32/tests/thread.c |    7 ++++---
 dlls/ntdll/signal_i386.c     |    9 +++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index 1d3931f..3da29a2 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -1329,6 +1329,8 @@ static void test_ThreadErrorMode(void)
     pSetThreadErrorMode(oldmode, NULL);
 }
 
+void _fpreset(void) {} /* override the mingw fpu init code */
+
 static inline void set_fpu_cw(WORD cw)
 {
 #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
@@ -1387,11 +1389,10 @@ static WORD get_thread_fpu_cw(void)
 
 static void test_thread_fpu_cw(void)
 {
-    WORD initial_cw, cw, expect;
+    WORD initial_cw, cw;
 
     initial_cw = get_fpu_cw();
-    expect = sizeof(void *) > sizeof(int) ? 0x27f : 0x37f;
-    ok(initial_cw == expect, "Expected FPU control word expect, got %#x.\n", initial_cw);
+    ok(initial_cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", initial_cw);
 
     cw = get_thread_fpu_cw();
     ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw);
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index b003436..c08693e 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2155,6 +2155,7 @@ void signal_free_thread( TEB *teb )
  */
 void signal_init_thread( TEB *teb )
 {
+    const WORD fpu_cw = 0x27f;
     struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1;
     LDT_ENTRY fs_entry;
     stack_t ss;
@@ -2178,15 +2179,11 @@ void signal_init_thread( TEB *teb )
     wine_ldt_init_fs( thread_data->fs, &fs_entry );
     thread_data->gs = wine_get_gs();
 
-    if (teb->Peb->ProcessHeap) /* Not for the inital thread. */
-    {
-        const WORD fpu_cw = 0x27f;
 #ifdef __GNUC__
-        __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw));
+    __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw));
 #else
-        FIXME("FPU setup not implemented for this platform.\n");
+    FIXME("FPU setup not implemented for this platform.\n");
 #endif
-    }
 }
 
 /**********************************************************************



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: =?UTF-8?Q?Aurimas=20Fi=C5=A1eras=20?=: cmd: Update Lithuanian
	translation.
Message-ID: <E1OR5jA-0007h2-6v@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e554c4575f4858b4f6f06a5e52aaa22ff987704a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e554c4575f4858b4f6f06a5e52aaa22ff987704a

Author: Aurimas Fi?eras <aurimas at gmail.com>
Date:   Mon Jun 21 19:23:46 2010 +0300

cmd: Update Lithuanian translation.

---

 programs/cmd/Lt.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/Lt.rc b/programs/cmd/Lt.rc
index d3eccb9..9f5ca81 100644
--- a/programs/cmd/Lt.rc
+++ b/programs/cmd/Lt.rc
@@ -113,8 +113,8 @@ MOVE nepavyksta jei sena ir nauja vietos yra su skirtingomis DOS raid?mis.\n"
   WCMD_PATH,
 "PATH parodo ar pakei?ia paie?kos keli?.\n\
 \n\
-?vedus PATH bus parodyta dabartin? PATH reik?m? (i? prad?i? tai reik?m?\n\
-nurodyta j?s? wine.conf faile). Nor?dami pakeisti nuostat? nurodykite PATH\n\
+?vedus PATH bus parodyta dabartin? PATH reik?m? (i? prad?i? reik?m?\n\
+paimama i? registro). Nor?dami pakeisti nuostat? nurodykite PATH\n\
 komandai nauj? reik?m? kaip parametr?.\n\
 \n\
 PATH modifikuoti taip pat galima naudojant PATH aplinkos kintam?j?,\n\



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: cmd: Update French
	translation .
Message-ID: <E1OR5jA-0007hH-8T@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2030b8c0c84bb66a3eebe8504c0d0f17823cafc1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2030b8c0c84bb66a3eebe8504c0d0f17823cafc1

Author: Fr?d?ric Delanoy <frederic.delanoy at gmail.com>
Date:   Mon Jun 21 19:23:56 2010 +0200

cmd: Update French translation.

---

 programs/cmd/Fr.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc
index 6ee1e1d..ba86eed 100644
--- a/programs/cmd/Fr.rc
+++ b/programs/cmd/Fr.rc
@@ -114,8 +114,8 @@ MOVE ?choue si l'ancien et le nouvel emplacement sont sur des lecteurs DOS diff
   WCMD_PATH,
 "PATH affiche ou change le chemin de recherche de cmd.\n\
 \n\
-Entrer PATH seul affiche le r?glage courant de PATH (initialement\n\
-c'est la valeur donn?e dans le fichier wine.conf). Pour changer\n\
+Entrer PATH seul affiche le r?glage courant de PATH (dont la valeur\n\
+initiale provient de la base de registre). Pour changer\n\
 le r?glage, faites suivre la commande PATH par la nouvelle valeur.\n\
 Il est aussi possible de modifier le PATH en utilisant la variable\n\
 d'environnement PATH, par exemple :\n\



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Sven Baars : cmd: Update Dutch translation.
Message-ID: <E1OR5jA-0007hY-AB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1f8225c99d7ea66ffddea0a6aa1b21b5da438041
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f8225c99d7ea66ffddea0a6aa1b21b5da438041

Author: Sven Baars <sven.wine at gmail.com>
Date:   Mon Jun 21 21:50:10 2010 +0200

cmd: Update Dutch translation.

---

 programs/cmd/Nl.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc
index 79a14e4..ab6c10d 100644
--- a/programs/cmd/Nl.rc
+++ b/programs/cmd/Nl.rc
@@ -120,8 +120,8 @@ DOS-schijven bevinden.\n"
   WCMD_PATH,
 "PATH toon of wijzigt het zoekpad van cmd.\n\
 \n\
-De opdracht PATH toont het huidige zoekpad (de beginwaarde wordt in\n\
-het bestand genaamd wine.conf toegekend). Om het zoekpad te wijzigen laat\n\
+De opdracht PATH toont het huidige zoekpad (de beginwaarde wordt uit\n\
+het register gehaald). Om het zoekpad te wijzigen laat\n\
 u de PATH opdracht volgen door de nieuwe waarde.\n\
 \n\
 Het is ook mogelijk om het zoekpad te wijzigen met behulp van de PATH\n\



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Nikolay Sivov : msxml3: Properly free namespace structure pointer.
Message-ID: <E1OR5jA-0007hn-Bg@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ea9a6a4b4e33cc8f56bc7835f7f05146487fb5d2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ea9a6a4b4e33cc8f56bc7835f7f05146487fb5d2

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun 21 22:06:29 2010 +0400

msxml3: Properly free namespace structure pointer.

---

 dlls/msxml3/xmlelem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index c067179..0327604 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -262,7 +262,7 @@ static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR name,
         xmlNsPtr ns;
         ns = xmlSearchNs(This->node->doc, This->node, (xmlChar*)"xml");
         val = xmlGetNsProp(This->node, (xmlChar*)"lang", ns->href);
-        xmlFree(ns);
+        xmlFreeNs(ns);
     }
     else
     {



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Matteo Bruni : wined3d: Check for error conditions in GL call.
Message-ID: <E1OR5jA-0007i4-Dz@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6585bec5ac0a2793badcac8a4fc9fb267341ed2e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6585bec5ac0a2793badcac8a4fc9fb267341ed2e

Author: Matteo Bruni <matteo.mystral at gmail.com>
Date:   Mon Jun 21 22:14:58 2010 +0200

wined3d: Check for error conditions in GL call.

---

 dlls/wined3d/surface.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index d363feb..73c5aff 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -848,6 +848,7 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct win
     {
         GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level,
                 internal, width, height, 0, This->resource.size, mem));
+        checkGLcall("glCompressedTexImage2DARB");
     }
     else
     {



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Michael Stefaniuc : xcopy: Add the Romanian translation.
Message-ID: <E1OR5jA-0007iK-GY@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a2b2d6adeb71bc7c9caf0f2cf68ef0b585e2804a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a2b2d6adeb71bc7c9caf0f2cf68ef0b585e2804a

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Tue Jun 22 00:43:57 2010 +0200

xcopy: Add the Romanian translation.

Translation by Claudia Cotun?.

---

 programs/xcopy/Makefile.in |    1 +
 programs/xcopy/Ro.rc       |   80 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 0 deletions(-)

diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in
index ea98eba..8d8e9e7 100644
--- a/programs/xcopy/Makefile.in
+++ b/programs/xcopy/Makefile.in
@@ -25,6 +25,7 @@ RC_SRCS = \
 	No.rc \
 	Pl.rc \
 	Pt.rc \
+	Ro.rc \
 	Ru.rc \
 	Si.rc \
 	Uk.rc
diff --git a/programs/xcopy/Ro.rc b/programs/xcopy/Ro.rc
new file mode 100644
index 0000000..3e8a655
--- /dev/null
+++ b/programs/xcopy/Ro.rc
@@ -0,0 +1,80 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ *
+ * Copyright (C) 2007 J. Edmeades
+ * Copyright (C) 2010 Claudia Cotun?
+ *                    Michael Stefaniuc
+ *
+ * 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 "xcopy.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "Num?r de parametri nevalid - Utiliza?i xcopy /? pentru ajutor\n"
+    STRING_INVPARM,  "Parametru nevalid ?%s? -  Utiliza?i xcopy /? pentru ajutor\n"
+    STRING_PAUSE,    "Ap?sa?i pe <enter> pentru a ?ncepe copierea\n"
+    STRING_SIMCOPY,  "%d fi?ier(e) ar fi copiat(e)\n"
+    STRING_COPY,     "%d fi?ier(e) copiat(e)\n"
+    STRING_QISDIR,   "?%s? este un nume de fi?ier sau un director\ndin destina?ie?\n(F - Fi?ier, D - Director)\n"
+    STRING_SRCPROMPT,"%s? (Da|Nu)\n"
+    STRING_OVERWRITE,"Se suprascrie %s? (Da|Nu|Toate)\n"
+    STRING_COPYFAIL, "Copierea ?%s? ?n ?%s? a e?uat cu cod de retur %d\n"
+    STRING_OPENFAIL, "Deschiderea ?%s? a e?uat\n"
+    STRING_READFAIL, "Citirea ?%s? a e?uat\n"
+    STRING_YES_CHAR, "D"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "T"
+    STRING_FILE_CHAR,"F"
+    STRING_DIR_CHAR, "D"
+
+    STRING_HELP,
+"XCOPY - Copiaz? fi?iere sau arbori de directoare surs? ?ntr-o destina?ie\n\
+\n\
+Sintax?:\n\
+XCOPY surs? [destina?ie] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\            [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\nCu:\n\
+\n\
+[/I]  Creeaz? director dac? destina?ia nu exist? ?i se copiaz? dou? sau\n\
+\      mai multe fi?iere\n\
+[/S]  Copiaz? directoarele ?i subdirectoarele\n\
+[/E]  Copiaz? directoarele ?i subdirectoarele, inclusiv pe cele goale\n\
+[/Q]  Nu afi?a numele ?n timpul copierii.\n\
+[/F]  Arat? numele ?ntreg pentru surs? ?i destina?ie ?n timpul copierii\n\
+[/L]  Simuleaz? opera?iunea, afi??nd numele care ar fi copiate\n\
+[/W]  Solicit? confirmarea ?nainte de a ?ncepe copierea\n\
+[/T]  Creeaz? o structur? de directoare goale, dar nu copiaz? fi?iere\n\
+[/Y]  Nu solicita confirmarea la suprascrierea fi?ierelor\n\
+[/-Y] Solicit? confirmarea la suprascrierea fi?ierelor\n\
+[/P]  Solicit? confirmarea ?nainte de copierea fiec?rui fi?ier surs? \n\
+[/N]  Copiaz? utiliz?nd prescurt?ri de nume\n\
+[/U]  Copiaz? numai fi?ierele care exist? deja ?n destina?ie\n\
+[/R]  Suprascrie orice fi?iere cu protec?ie la modific?ri\n\
+[/H]  Include ?n copie fi?ierele ascunse ?i de sistem\n\
+[/C]  Continu? chiar dac? apare o eroare ?n timpul copierii\n\
+[/A]  Copiaz? numai fi?ierele cu atributul de arhiv? activat\n\
+[/M]  Copiaz? numai fi?ierele cu atributul de arhiv? activat, dezactiveaz?\n\
+\      apoi atributul\n\
+[/D | /D:m-d-y] Copiaz? fi?ierele noi sau pe cele modificate dup? data\n\
+\t\tspecificat?. Dac? nu este specificat? nici o dat?, copiaz?\n\
+\t\tnumai dac? fi?ierul destina?ie este mai vechi dec?t fi?ierul\n\
+\t\tsurs?\n\n"
+}



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Michael Stefaniuc : xcopy: Update the English resource.
Message-ID: <E1OR5jA-0007ia-I1@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1d7f820f17d76e71f5b8b945a07eb1ef5dd9f19f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1d7f820f17d76e71f5b8b945a07eb1ef5dd9f19f

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Jun 22 00:44:05 2010 +0200

xcopy: Update the English resource.

---

 programs/xcopy/En.rc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/xcopy/En.rc b/programs/xcopy/En.rc
index 83ef291..6fb299c 100644
--- a/programs/xcopy/En.rc
+++ b/programs/xcopy/En.rc
@@ -53,8 +53,8 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or\n\
-\tmore files\n\
+[/I]  Assume directory if destination does not exist and copying two or\n\
+\      more files\n\
 [/S]  Copy directories and subdirectories\n\
 [/E]  Copy directories and subdirectories, including any empty ones\n\
 [/Q]  Do not list names during copy, ie quiet.\n\
@@ -72,7 +72,7 @@ Where:\n\
 [/C]  Continue even if an error occurs during the copy\n\
 [/A]  Only copy files with archive attribute set\n\
 [/M]  Only copy files with archive attribute set, removes\n\
-\tarchive attribute\n\
+\      archive attribute\n\
 [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
 \t\tIf no date is supplied, only copy if destination is older\n\
 \t\tthan source\n\n"



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Michael Stefaniuc : cmd: Don't treat all command lines with '/?' as
	builtin commands.
Message-ID: <E1OR5jA-0007ir-Ky@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 71e647fe5188c8ab7f5e4df6cbb0f04f23ff46c0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=71e647fe5188c8ab7f5e4df6cbb0f04f23ff46c0

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Jun 22 00:44:15 2010 +0200

cmd: Don't treat all command lines with '/?' as builtin commands.

---

 programs/cmd/wcmdmain.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index b86801c..b50512e 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1405,15 +1405,14 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects,
     }
     for (i=0; i<=WCMD_EXIT; i++) {
       if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT,
-        whichcmd, count, inbuilt[i], -1) == 2) break;
+        whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) break;
     }
     p = WCMD_strtrim_leading_spaces (&whichcmd[count]);
     WCMD_parse (p, quals, param1, param2);
     WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2));
 
-    if((p[0] == '/') && (p[1] == '?')) {
-
-      /*this is a help request for a program*/
+    if (i <= WCMD_EXIT && (p[0] == '/') && (p[1] == '?')) {
+      /* this is a help request for a builtin program */
       i = WCMD_HELP;
       memcpy(p, whichcmd, count * sizeof(WCHAR));
       p[count] = '\0';



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: winecfg:
	Update Portuguese translation.
Message-ID: <E1OR5jA-0007j7-Ml@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cdad4e4af2fbcaad6b082abefbd98be47af6ac4c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cdad4e4af2fbcaad6b082abefbd98be47af6ac4c

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Mon Jun 21 21:07:29 2010 -0300

winecfg: Update Portuguese translation.

---

 programs/winecfg/Pt.rc |  320 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 248 insertions(+), 72 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdad4e4af2fbcaad6b082abefbd98be47af6ac4c


From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Andrew Nguyen : ddraw: Validate structure pointers and sizes in
	IDirect3D3: :FindDevice.
Message-ID: <E1OR5jA-0007je-Q3@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 10a076ad8d653db5d626310464033c9c1a6929e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=10a076ad8d653db5d626310464033c9c1a6929e8

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Mon Jun 21 10:14:51 2010 -0500

ddraw: Validate structure pointers and sizes in IDirect3D3::FindDevice.

---

 dlls/ddraw/direct3d.c  |    7 +++++++
 dlls/ddraw/tests/d3d.c |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c
index 3f2410f..f919860 100644
--- a/dlls/ddraw/direct3d.c
+++ b/dlls/ddraw/direct3d.c
@@ -666,6 +666,13 @@ IDirect3DImpl_3_FindDevice(IDirect3D3 *iface,
 
     TRACE("(%p)->(%p,%p)\n", This, D3DDFS, D3DFDR);
 
+    if (!D3DDFS || !D3DFDR)
+        return DDERR_INVALIDPARAMS;
+
+    if (D3DDFS->dwSize != sizeof(D3DFINDDEVICESEARCH) ||
+        D3DFDR->dwSize != sizeof(D3DFINDDEVICERESULT))
+        return DDERR_INVALIDPARAMS;
+
     if ((D3DDFS->dwFlags & D3DFDS_COLORMODEL) &&
         (D3DDFS->dcmColorModel != D3DCOLOR_RGB))
     {
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index 26dc1cf..e74fb79 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -3391,6 +3391,40 @@ static void VertexBufferLockRest(void)
     IDirect3DVertexBuffer7_Release(buffer);
 }
 
+static void FindDevice(void)
+{
+    D3DFINDDEVICESEARCH search = {0};
+    D3DFINDDEVICERESULT result = {0};
+    HRESULT hr;
+
+    /* Test invalid parameters. */
+    hr = IDirect3D_FindDevice(Direct3D1, NULL, NULL);
+    ok(hr == DDERR_INVALIDPARAMS,
+       "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr);
+
+    hr = IDirect3D_FindDevice(Direct3D1, NULL, &result);
+    ok(hr == DDERR_INVALIDPARAMS,
+       "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr);
+
+    hr = IDirect3D_FindDevice(Direct3D1, &search, NULL);
+    ok(hr == DDERR_INVALIDPARAMS,
+       "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr);
+
+    search.dwSize = 0;
+    result.dwSize = 0;
+
+    hr = IDirect3D_FindDevice(Direct3D1, &search, &result);
+    ok(hr == DDERR_INVALIDPARAMS,
+       "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr);
+
+    search.dwSize = sizeof(search) + 1;
+    result.dwSize = sizeof(result) + 1;
+
+    hr = IDirect3D_FindDevice(Direct3D1, &search, &result);
+    ok(hr == DDERR_INVALIDPARAMS,
+       "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr);
+}
+
 START_TEST(d3d)
 {
     init_function_pointers();
@@ -3425,6 +3459,7 @@ START_TEST(d3d)
         Direct3D1Test();
         TextureLoadTest();
         ViewportTest();
+        FindDevice();
         D3D1_releaseObjects();
     }
 



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Andrew Nguyen : ddraw: Allow the ddraw RGB device to be enumerated in
	IDirect3D3::FindDevice.
Message-ID: <E1OR5jA-0007jv-Rv@wine.codeweavers.com>

Module: wine
Branch: master
Commit: eb9227015ad639a1fbdb15eeb212d25c0bdc083c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eb9227015ad639a1fbdb15eeb212d25c0bdc083c

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Mon Jun 21 10:15:05 2010 -0500

ddraw: Allow the ddraw RGB device to be enumerated in IDirect3D3::FindDevice.

Partially based on a patch by David Adam.

---

 dlls/ddraw/direct3d.c  |    5 ++-
 dlls/ddraw/tests/d3d.c |   64 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c
index f919860..edbcc28 100644
--- a/dlls/ddraw/direct3d.c
+++ b/dlls/ddraw/direct3d.c
@@ -684,10 +684,11 @@ IDirect3DImpl_3_FindDevice(IDirect3D3 *iface,
         TRACE(" trying to match guid %s.\n", debugstr_guid(&(D3DDFS->guid)));
         if ((IsEqualGUID(&IID_D3DDEVICE_WineD3D, &(D3DDFS->guid)) == 0) &&
             (IsEqualGUID(&IID_IDirect3DHALDevice, &(D3DDFS->guid)) == 0) &&
-            (IsEqualGUID(&IID_IDirect3DRefDevice, &(D3DDFS->guid)) == 0))
+            (IsEqualGUID(&IID_IDirect3DRefDevice, &(D3DDFS->guid)) == 0) &&
+            (IsEqualGUID(&IID_IDirect3DRGBDevice, &(D3DDFS->guid)) == 0))
         {
             TRACE(" no match for this GUID.\n");
-            return DDERR_INVALIDPARAMS;
+            return DDERR_NOTFOUND;
         }
     }
 
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index e74fb79..7f47d20 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -3393,9 +3393,20 @@ static void VertexBufferLockRest(void)
 
 static void FindDevice(void)
 {
+    static const struct
+    {
+        const GUID *guid;
+        int todo;
+    } deviceGUIDs[] =
+    {
+        {&IID_IDirect3DRampDevice, 1},
+        {&IID_IDirect3DRGBDevice},
+    };
+
     D3DFINDDEVICESEARCH search = {0};
     D3DFINDDEVICERESULT result = {0};
     HRESULT hr;
+    int i;
 
     /* Test invalid parameters. */
     hr = IDirect3D_FindDevice(Direct3D1, NULL, NULL);
@@ -3423,6 +3434,59 @@ static void FindDevice(void)
     hr = IDirect3D_FindDevice(Direct3D1, &search, &result);
     ok(hr == DDERR_INVALIDPARAMS,
        "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr);
+
+    /* Specifying no flags is permitted. */
+    search.dwSize = sizeof(search);
+    search.dwFlags = 0;
+    result.dwSize = sizeof(result);
+
+    hr = IDirect3D_FindDevice(Direct3D1, &search, &result);
+    ok(hr == D3D_OK,
+       "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr);
+
+    /* Try an arbitrary non-device GUID. */
+    search.dwSize = sizeof(search);
+    search.dwFlags = D3DFDS_GUID;
+    search.guid = IID_IDirect3D;
+    result.dwSize = sizeof(result);
+
+    hr = IDirect3D_FindDevice(Direct3D1, &search, &result);
+    ok(hr == DDERR_NOTFOUND,
+       "Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", hr);
+
+    /* The reference device GUID can't be enumerated. */
+    search.dwSize = sizeof(search);
+    search.dwFlags = D3DFDS_GUID;
+    search.guid = IID_IDirect3DRefDevice;
+    result.dwSize = sizeof(result);
+
+    hr = IDirect3D_FindDevice(Direct3D1, &search, &result);
+    todo_wine
+    ok(hr == DDERR_NOTFOUND,
+       "Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", hr);
+
+    /* These GUIDs appear to be always present. */
+    for (i = 0; i < sizeof(deviceGUIDs)/sizeof(deviceGUIDs[0]); i++)
+    {
+        search.dwSize = sizeof(search);
+        search.dwFlags = D3DFDS_GUID;
+        search.guid = *deviceGUIDs[i].guid;
+        result.dwSize = sizeof(result);
+
+        hr = IDirect3D_FindDevice(Direct3D1, &search, &result);
+
+        if (deviceGUIDs[i].todo)
+        {
+            todo_wine
+            ok(hr == D3D_OK,
+               "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr);
+        }
+        else
+        {
+            ok(hr == D3D_OK,
+               "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr);
+        }
+    }
 }
 
 START_TEST(d3d)



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: Andrew Nguyen : ddraw/tests: Add an observation regarding device
	color model criteria for IDirect3D3:: FindDevice.
Message-ID: <E1OR5jA-0007kC-Tv@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bdc29f83bc6fcd3c550fdb710d634e48c9b1739b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bdc29f83bc6fcd3c550fdb710d634e48c9b1739b

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Mon Jun 21 10:15:18 2010 -0500

ddraw/tests: Add an observation regarding device color model criteria for IDirect3D3::FindDevice.

---

 dlls/ddraw/tests/d3d.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index 7f47d20..069bc96 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -3487,6 +3487,17 @@ static void FindDevice(void)
                "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr);
         }
     }
+
+    /* Curiously the color model criteria seem to be ignored. */
+    search.dwSize = sizeof(search);
+    search.dwFlags = D3DFDS_COLORMODEL;
+    search.dcmColorModel = 0xdeadbeef;
+    result.dwSize = sizeof(result);
+
+    hr = IDirect3D_FindDevice(Direct3D1, &search, &result);
+    todo_wine
+    ok(hr == D3D_OK,
+       "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr);
 }
 
 START_TEST(d3d)



From julliard at winehq.org  Tue Jun 22 10:49:32 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:32 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: krnl386.exe16: Update a
	comment.
Message-ID: <E1OR5jA-0007kS-VW@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8f0a0c23fa07f8360547db275146778ab45b4900
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8f0a0c23fa07f8360547db275146778ab45b4900

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon Jun 21 17:46:57 2010 +0200

krnl386.exe16: Update a comment.

---

 dlls/krnl386.exe16/ioports.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c
index 9ceb3ae..d802ab9 100644
--- a/dlls/krnl386.exe16/ioports.c
+++ b/dlls/krnl386.exe16/ioports.c
@@ -463,7 +463,7 @@ static int IO_pp_sort(const void *p1,const  void *p2)
 
 /* IO_pp_init
  *
- * Read the ppdev entries from wine.conf, open the device and check
+ * Read the ppdev entries from registry, open the device and check
  * for necessary IOCTRL
  * Report verbose about possible errors
  */



From julliard at winehq.org  Tue Jun 22 10:49:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:33 -0500
Subject: Alexandre Julliard : jscript/tests: Fix a test that fails because of
	the reduced FPU precision.
Message-ID: <E1OR5jB-0007kk-1t@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b4d21efd127aa6164e25613118117be72f5d7592
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b4d21efd127aa6164e25613118117be72f5d7592

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 22 12:52:03 2010 +0200

jscript/tests: Fix a test that fails because of the reduced FPU precision.

---

 dlls/jscript/tests/lang.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 495762e..36a75f5 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -263,7 +263,9 @@ ok(tmp === 7, "2*3.5 !== 7");
 ok(getVT(tmp) === "VT_I4", "getVT(2*3.5) !== VT_I4");
 
 tmp = 2.5*3.5;
-ok(tmp === 8.75, "2.5*3.5 !== 8.75");
+/* FIXME: the parser loses precision */
+/* ok(tmp === 8.75, "2.5*3.5 !== 8.75"); */
+ok(tmp > 8.749999 && tmp < 8.750001, "2.5*3.5 !== 8.75");
 ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8");
 
 tmp = 4/2;



From julliard at winehq.org  Tue Jun 22 10:49:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:33 -0500
Subject: Alexandre Julliard : psapi/tests: Fix the working set tests for Wow64.
Message-ID: <E1OR5jB-0007l0-3m@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6cf16d723af29e37819e1f6c4b4a646ff404447b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6cf16d723af29e37819e1f6c4b4a646ff404447b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 22 12:55:23 2010 +0200

psapi/tests: Fix the working set tests for Wow64.

---

 dlls/psapi/tests/psapi_main.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index 21a3d1a..55eb937 100644
--- a/dlls/psapi/tests/psapi_main.c
+++ b/dlls/psapi/tests/psapi_main.c
@@ -275,23 +275,36 @@ static void test_ws_functions(void)
     ULONG_PTR pages[4096];
     char *addr;
     unsigned int i;
-    
+    BOOL ret;
+
     todo_wine w32_err(pEmptyWorkingSet(NULL), ERROR_INVALID_HANDLE);
     todo_wine w32_err(pEmptyWorkingSet(hpSR), ERROR_ACCESS_DENIED);
     w32_suc(pEmptyWorkingSet(hpAA));
-    
-    todo_wine w32_err(pInitializeProcessForWsWatch(NULL), ERROR_INVALID_HANDLE);
+
+    SetLastError( 0xdeadbeef );
+    ret = pInitializeProcessForWsWatch( NULL );
+    todo_wine ok( !ret, "InitializeProcessForWsWatch succeeded\n" );
+    if (!ret)
+    {
+        if (GetLastError() == ERROR_INVALID_FUNCTION)  /* not supported on xp in wow64 mode */
+        {
+            trace( "InitializeProcessForWsWatch not supported\n" );
+            return;
+        }
+        ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() );
+    }
     w32_suc(pInitializeProcessForWsWatch(hpAA));
     
     if(!w32_suc(addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE)))
         return;
 
+    *addr = 0; /* make sure it's paged in (needed on wow64) */
     if(!VirtualLock(addr, 1))
     {
         trace("locking failed (error=%d) - skipping test\n", GetLastError());
         goto free_page;
     }
-	
+
     todo_wine if(w32_suc(pQueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR))))
     {
        for(i = 0; i < pages[0]; i++)



From julliard at winehq.org  Tue Jun 22 10:49:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:33 -0500
Subject: Alexandre Julliard : ntdll/tests: Fix some exception tests for Wow64.
Message-ID: <E1OR5jB-0007lK-7F@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0fdcab06ac5872637e57f2c5b6e1bf61ddf573c2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0fdcab06ac5872637e57f2c5b6e1bf61ddf573c2

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 22 13:51:18 2010 +0200

ntdll/tests: Fix some exception tests for Wow64.

---

 dlls/ntdll/tests/exception.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 154a7c7..598544e 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -143,9 +143,9 @@ static const struct exception
 /* 20 */
     /* test overlong instruction (limit is 15 bytes, 5 on Win7) */
     { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 },
-      0, 16, FALSE, STATUS_ILLEGAL_INSTRUCTION, 0 },
+      0, 16, TRUE, STATUS_ILLEGAL_INSTRUCTION, 0 },
     { { 0x64,0x64,0x64,0x64,0xfa,0xc3 },
-      0, 5, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 },
+      0, 5, TRUE, STATUS_PRIVILEGED_INSTRUCTION, 0 },
 
     /* test invalid interrupt */
     { { 0xcd, 0xff, 0xc3 },   /* 21: int $0xff; ret */
@@ -246,7 +246,9 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce
        rec->ExceptionAddress, (char *)code_mem + 0xb);
 
     if (pNtCurrentTeb()->Peb->BeingDebugged)
-        ok((void *)context->Eax == pRtlRaiseException, "debugger managed to modify Eax to %x should be %p\n",
+        ok((void *)context->Eax == pRtlRaiseException ||
+           broken( is_wow64 && context->Eax == 0xf00f00f1 ), /* broken on vista */
+           "debugger managed to modify Eax to %x should be %p\n",
            context->Eax, pRtlRaiseException);
 
     /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT
@@ -773,7 +775,9 @@ static void test_debugger(void)
                         /* ctx.Eip is the same value the exception handler got */
                         if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT)
                         {
-                            ok((char *)ctx.Eip == (char *)code_mem_address + 0xa, "Eip at 0x%x instead of %p\n",
+                            ok((char *)ctx.Eip == (char *)code_mem_address + 0xa ||
+                               broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb),
+                               "Eip at 0x%x instead of %p\n",
                                 ctx.Eip, (char *)code_mem_address + 0xa);
                             /* need to fixup Eip for debuggee */
                             if ((char *)ctx.Eip == (char *)code_mem_address + 0xa)
@@ -824,7 +828,8 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R
         ok( rec->ExceptionCode ==  STATUS_FLOAT_MULTIPLE_TRAPS,
             "exception code: %#x, should be %#x\n",
             rec->ExceptionCode,  STATUS_FLOAT_MULTIPLE_TRAPS);
-        ok( rec->NumberParameters == 1, "# of params: %i, should be 1\n",
+        ok( rec->NumberParameters == 1 || broken(is_wow64 && rec->NumberParameters == 2),
+            "# of params: %i, should be 1\n",
             rec->NumberParameters);
         if( rec->NumberParameters == 1 )
             ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]);



From julliard at winehq.org  Tue Jun 22 10:49:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:33 -0500
Subject: Piotr Caban : msvcrt: Added __crtLCMapStringW partial implementation.
Message-ID: <E1OR5jB-0007lc-DR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c0637edda20fe5206db534fd50e783996a4ad463
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c0637edda20fe5206db534fd50e783996a4ad463

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Tue Jun 22 12:26:23 2010 +0200

msvcrt: Added __crtLCMapStringW partial implementation.

---

 dlls/msvcr100/msvcr100.spec |    2 +-
 dlls/msvcr70/msvcr70.spec   |    2 +-
 dlls/msvcr71/msvcr71.spec   |    2 +-
 dlls/msvcr80/msvcr80.spec   |    2 +-
 dlls/msvcr90/msvcr90.spec   |    2 +-
 dlls/msvcrt/locale.c        |   12 ++++++++++++
 dlls/msvcrt/msvcrt.spec     |    2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 0d05c28..99730e5 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -344,7 +344,7 @@
 @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA
 @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW
 @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA
-@ stub __crtLCMapStringW
+@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW
 @ stub __daylight
 @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit
 @ cdecl __doserrno() msvcrt.__doserrno
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index 7c84705..97783fb 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -110,7 +110,7 @@
 @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW
 @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW
 @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA
-@ stub __crtLCMapStringW
+@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW
 @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit
 @ cdecl __doserrno() msvcrt.__doserrno
 @ cdecl __fpecode() msvcrt.__fpecode
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 8599efa..dfa04f8 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -105,7 +105,7 @@
 @ cdecl __crtGetLocaleInfoW(long long ptr long)
 @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW
 @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA
-@ stub __crtLCMapStringW
+@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW
 @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit
 @ cdecl __doserrno() msvcrt.__doserrno
 @ cdecl __fpecode() msvcrt.__fpecode
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index b4c168a..8f3769e 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -150,7 +150,7 @@
 @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW
 @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW
 @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA
-@ stub __crtLCMapStringW
+@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW
 @ stub __daylight
 @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit
 @ cdecl __doserrno() msvcrt.__doserrno
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index a2bed36..e00a331 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -147,7 +147,7 @@
 @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW
 @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW
 @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA
-@ stub __crtLCMapStringW
+@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW
 @ stub __daylight
 @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit
 @ cdecl __doserrno() msvcrt.__doserrno
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index 5a27de0..393a23d 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -466,6 +466,18 @@ int CDECL __crtLCMapStringA(
 }
 
 /*********************************************************************
+ *              __crtLCMapStringW (MSVCRT.@)
+ */
+int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const MSVCRT_wchar_t *src,
+        int srclen, MSVCRT_wchar_t *dst, int dstlen, unsigned int codepage, int xflag)
+{
+    FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n",
+            lcid, mapflags, debugstr_w(src), srclen, dst, dstlen, codepage, xflag);
+
+    return LCMapStringW(lcid, mapflags, src, srclen, dst, dstlen);
+}
+
+/*********************************************************************
  *		__crtCompareStringA (MSVCRT.@)
  */
 int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len1,
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index bba06d6..e39253e 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -140,7 +140,7 @@
 @ cdecl __crtGetLocaleInfoW(long long ptr long)
 @ cdecl __crtGetStringTypeW(long long wstr long ptr)
 @ cdecl __crtLCMapStringA(long long str long ptr long long long)
-# stub __crtLCMapStringW
+@ cdecl __crtLCMapStringW(long long wstr long ptr long long long)
 # stub __daylight
 @ cdecl __dllonexit(ptr ptr ptr)
 @ cdecl __doserrno() MSVCRT___doserrno



From julliard at winehq.org  Tue Jun 22 10:49:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:33 -0500
Subject: Henri Verbeet : wined3d: read_from_framebuffer_texture() isn' t
	suitable for readback of onscreen surfaces.
Message-ID: <E1OR5jB-0007lv-Hz@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b769c912cc457cc4de2bfbb739c3284de1668320
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b769c912cc457cc4de2bfbb739c3284de1668320

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Jun 22 12:49:07 2010 +0200

wined3d: read_from_framebuffer_texture() isn't suitable for readback of onscreen surfaces.

---

 dlls/wined3d/surface.c |   58 +++++++++++++++---------------------------------
 1 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 73c5aff..08835a8 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1495,6 +1495,15 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb)
     struct wined3d_context *context;
     GLint prevRead;
 
+    if (!surface_is_offscreen(This))
+    {
+        /* We would need to flip onscreen surfaces, but there's no efficient
+         * way to do that here. It makes more sense for the caller to
+         * explicitly go through sysmem. */
+        ERR("Not supported for onscreen targets.\n");
+        return;
+    }
+
     /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer
      * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any
      * states in the stateblock, and no driver was found yet that had bugs in that regard.
@@ -1505,42 +1514,13 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb)
     surface_prepare_texture(This, gl_info, srgb);
     surface_bind_and_dirtify(This, srgb);
 
-    ENTER_GL();
-    glGetIntegerv(GL_READ_BUFFER, &prevRead);
-    LEAVE_GL();
-
-    /* Select the correct read buffer, and give some debug output.
-     * There is no need to keep track of the current read buffer or reset it, every part of the code
-     * that reads sets the read buffer as desired.
-     */
-    if (!surface_is_offscreen(This))
-    {
-        GLenum buffer = surface_get_gl_buffer(This);
-        TRACE("Locking %#x buffer\n", buffer);
-
-        ENTER_GL();
-        glReadBuffer(buffer);
-        checkGLcall("glReadBuffer");
-        LEAVE_GL();
-    }
-    else
-    {
-        /* Locking the primary render target which is not on a swapchain(=offscreen render target).
-         * Read from the back buffer
-         */
-        TRACE("Locking offscreen render target\n");
-        ENTER_GL();
-        glReadBuffer(device->offscreenBuffer);
-        checkGLcall("glReadBuffer");
-        LEAVE_GL();
-    }
+    TRACE("Reading back offscreen render target %p.\n", This);
 
     ENTER_GL();
-    /* If !SrcIsUpsideDown we should flip the surface.
-     * This can be done using glCopyTexSubImage2D but this
-     * is VERY slow, so don't do that. We should prevent
-     * this code from getting called in such cases or perhaps
-     * we can use FBOs */
+
+    glGetIntegerv(GL_READ_BUFFER, &prevRead);
+    glReadBuffer(device->offscreenBuffer);
+    checkGLcall("glReadBuffer");
 
     glCopyTexSubImage2D(This->texture_target, This->texture_level,
             0, 0, 0, 0, This->currentDesc.Width, This->currentDesc.Height);
@@ -1552,8 +1532,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb)
     LEAVE_GL();
 
     context_release(context);
-
-    TRACE("Updated target %d\n", This->texture_target);
 }
 
 /* Context activation is done by the caller. */
@@ -4239,11 +4217,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
     IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
     IWineD3DDeviceImpl *device = This->resource.device;
     const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
+    BOOL drawable_read_ok = surface_is_offscreen(This);
     struct wined3d_format_desc desc;
     CONVERT_TYPES convert;
     int width, pitch, outpitch;
     BYTE *mem;
-    BOOL drawable_read_ok = TRUE;
     BOOL in_fbo = FALSE;
 
     if (This->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)
@@ -4402,9 +4380,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
                     IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect);
                 }
             }
-            if(!(This->Flags & SFLAG_INSYSMEM)) {
-                /* Should not happen */
-                ERR("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set\n");
+            if (!(This->Flags & SFLAG_INSYSMEM))
+            {
+                WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n");
                 /* Lets hope we get it from somewhere... */
                 IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect);
             }



From julliard at winehq.org  Tue Jun 22 10:49:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:33 -0500
Subject: Alexandre Julliard : kernel32: Add the TlsAlloc/FreeInternal entry
	points.
Message-ID: <E1OR5jB-0007mB-Kj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 79b6351c9c886e563a0ac6c6575bb0203f4c24c5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79b6351c9c886e563a0ac6c6575bb0203f4c24c5

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 22 16:58:02 2010 +0200

kernel32: Add the TlsAlloc/FreeInternal entry points.

---

 dlls/kernel32/kernel32.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index f08e752..dbcb179 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1095,9 +1095,9 @@
 @ stdcall Thread32Next(long ptr)
 @ stdcall -i386 -private ThunkConnect32(ptr str str str ptr ptr) krnl386.exe16.ThunkConnect32
 @ stdcall TlsAlloc()
-@ stub TlsAllocInternal
+@ stdcall TlsAllocInternal() TlsAlloc
 @ stdcall TlsFree(long)
-@ stub TlsFreeInternal
+@ stdcall TlsFreeInternal(long) TlsFree
 @ stdcall TlsGetValue(long)
 @ stdcall TlsSetValue(long ptr)
 @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr)



From julliard at winehq.org  Tue Jun 22 10:49:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:33 -0500
Subject: Nikolay Sivov : msxml3: Use vtable macros consistently,
	depending on pointer type.
Message-ID: <E1OR5jB-0007mS-OB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 302fb5f15a7079860d3f2386b4239ae6a25c896c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=302fb5f15a7079860d3f2386b4239ae6a25c896c

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jun 22 16:14:51 2010 +0400

msxml3: Use vtable macros consistently, depending on pointer type.

---

 dlls/msxml3/domdoc.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 688ce99..54e4728 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -1060,7 +1060,7 @@ static HRESULT WINAPI domdoc_createElement(
     V_VT(&type) = VT_I1;
     V_I1(&type) = NODE_ELEMENT;
 
-    hr = IXMLDOMDocument_createNode(iface, type, tagname, NULL, &node);
+    hr = IXMLDOMDocument2_createNode(iface, type, tagname, NULL, &node);
     if (hr == S_OK)
     {
         IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)element);
@@ -1089,7 +1089,7 @@ static HRESULT WINAPI domdoc_createDocumentFragment(
     V_VT(&type) = VT_I1;
     V_I1(&type) = NODE_DOCUMENT_FRAGMENT;
 
-    hr = IXMLDOMDocument_createNode(iface, type, NULL, NULL, &node);
+    hr = IXMLDOMDocument2_createNode(iface, type, NULL, NULL, &node);
     if (hr == S_OK)
     {
         IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocumentFragment, (void**)frag);
@@ -1249,7 +1249,7 @@ static HRESULT WINAPI domdoc_createAttribute(
     V_VT(&type) = VT_I1;
     V_I1(&type) = NODE_ATTRIBUTE;
 
-    hr = IXMLDOMDocument_createNode(iface, type, name, NULL, &node);
+    hr = IXMLDOMDocument2_createNode(iface, type, name, NULL, &node);
     if (hr == S_OK)
     {
         IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMAttribute, (void**)attribute);
@@ -1747,23 +1747,23 @@ static HRESULT WINAPI domdoc_save(
     if(V_VT(&destination) == VT_UNKNOWN)
     {
         IUnknown *pUnk = V_UNKNOWN(&destination);
-        IXMLDOMDocument *pDocument;
+        IXMLDOMDocument2 *pDocument;
 
-        ret = IXMLDOMDocument_QueryInterface(pUnk, &IID_IXMLDOMDocument2, (void**)&pDocument);
+        ret = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMDocument2, (void**)&pDocument);
         if(ret == S_OK)
         {
             BSTR bXML;
             VARIANT_BOOL bSuccessful;
 
-            ret = IXMLDOMDocument_get_xml(iface, &bXML);
+            ret = IXMLDOMDocument2_get_xml(iface, &bXML);
             if(ret == S_OK)
             {
-                ret = IXMLDOMDocument_loadXML(pDocument, bXML, &bSuccessful);
+                ret = IXMLDOMDocument2_loadXML(pDocument, bXML, &bSuccessful);
 
                 SysFreeString(bXML);
             }
 
-            IXMLDOMDocument_Release(pDocument);
+            IXMLDOMDocument2_Release(pDocument);
         }
 
         TRACE("ret %d\n", ret);



From julliard at winehq.org  Tue Jun 22 10:49:33 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 22 Jun 2010 10:49:33 -0500
Subject: Aric Stewart : winex11.drv: Make UploadGlyph fallback to notdef and
	space so as to not fail.
Message-ID: <E1OR5jB-0007mj-Qg@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 802c4dee5793d8ee13f9ae6fbb9eab4190c45f53
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=802c4dee5793d8ee13f9ae6fbb9eab4190c45f53

Author: Aric Stewart <aric at codeweavers.com>
Date:   Tue Jun 22 21:50:21 2010 +0900

winex11.drv: Make UploadGlyph fallback to notdef and space so as to not fail.

---

 dlls/winex11.drv/xrender.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 810b163..2fc804a 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -1205,7 +1205,7 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev)
  *
  * Helper to ExtTextOut.  Must be called inside xrender_cs
  */
-static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
+static void UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
 {
     unsigned int buflen;
     char *buf;
@@ -1252,8 +1252,16 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
             buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, &identity);
         }
         if(buflen == GDI_ERROR) {
-            WARN("GetGlyphOutlineW failed\n");
-            return FALSE;
+            WARN("GetGlyphOutlineW failed using default glyph\n");
+            buflen = GetGlyphOutlineW(physDev->hdc, 0, ggo_format, &gm, 0, NULL, &identity);
+            if(buflen == GDI_ERROR) {
+                WARN("GetGlyphOutlineW failed for default glyph trying for space\n");
+                buflen = GetGlyphOutlineW(physDev->hdc, 0x20, ggo_format, &gm, 0, NULL, &identity);
+                if(buflen == GDI_ERROR) {
+                    ERR("GetGlyphOutlineW for all attempts unable to upload a glyph\n");
+                    return;
+                }
+            }
         }
         TRACE("Turning off antialiasing for this monochrome font\n");
     }
@@ -1423,8 +1431,6 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
     }
 
     formatEntry->gis[glyph] = gi;
-
-    return TRUE;
 }
 
 static void SharpGlyphMono(X11DRV_PDEVICE *physDev, INT x, INT y,



From julliard at winehq.org  Wed Jun 23 10:47:02 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:47:02 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winedev: Update installing
	sources of mingw32 for deb and rpm systems.
Message-ID: <E1ORSAI-0002xG-LO@wine.codeweavers.com>

Module: docs
Branch: master
Commit: 85929c15831cfa63989e397295da69bb991aac8a
URL:    http://source.winehq.org/git/docs.git/?a=commit;h=85929c15831cfa63989e397295da69bb991aac8a

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 22 21:54:04 2010 +0200

winedev: Update installing sources of mingw32 for deb and rpm systems.

---

 en/winedev-testing.sgml |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml
index 31f15f4..ccd1020 100644
--- a/en/winedev-testing.sgml
+++ b/en/winedev-testing.sgml
@@ -188,32 +188,24 @@ thread.c: 86 tests executed, 5 marked as todo, 0 failures.
           distributions and *BSD.
         </para>
         <sect3>
-          <title>Debian GNU/Linux</title>
+          <title>Debian GNU/Linux like deb systems</title>
           <para>
-            On Debian do <command>apt-get install mingw32</>.
+            This includes Debian GNU/Linux, Ubuntu, etc.
+            The following step should probably work on any deb based system.
           </para>
           <para>
-            The standard MinGW libraries will probably be incomplete, causing
-            'undefined symbol' errors. So get the latest
-            <ulink url="http://mirzam.it.vu.nl/mingw/">mingw-w32api RPM</>
-            and use <command>alien</> to either convert it to a .tar.gz file
-            from which to extract just the relevant files, or to convert it
-            to a Debian package that you will install.
+            Run <command>apt-get install mingw32</>.
           </para>
         </sect3>
         <sect3>
           <title>Red Hat Linux like rpm systems</title>
           <para>
-            This includes Fedora Core, Red Hat Enterprise Linux, Mandrake,
+            This includes Fedora, Red Hat Enterprise Linux, Mandrake,
             most probably SuSE Linux too, etc. But this list isn't exhaustive;
-            the following steps should probably work on any rpm based system.
+            The following step should probably work on any rpm based system.
           </para>
           <para>
-            Download and install the latest rpm's from 
-            <ulink url="http://mirzam.it.vu.nl/mingw/">MinGW RPM packages</>.
-            Alternatively you can follow the instructions on that page and
-            build your own packages from the source rpm's listed there as well.
-          </para>
+            Run <command>yum install mingw32-gcc</>.
         </sect3>
         <sect3>
           <title>*BSD</title>



From julliard at winehq.org  Wed Jun 23 10:57:03 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:03 -0500
Subject: Francois Gouget : crypt32/tests: Add a trailing '\n' to ok() calls.
Message-ID: <E1ORSJz-00057i-UQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fea384cea4be337d9c86a3f5f57114d28c583c40
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fea384cea4be337d9c86a3f5f57114d28c583c40

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:48:34 2010 +0200

crypt32/tests: Add a trailing '\n' to ok() calls.

---

 dlls/crypt32/tests/encode.c |    4 ++--
 dlls/crypt32/tests/store.c  |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index d60843a..cc59a59 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -7962,7 +7962,7 @@ static void testPortPublicKeyInfo(void)
      CRYPT_DELETEKEYSET);
     ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL,
      CRYPT_NEWKEYSET);
-    ok(ret,"CryptAcquireContextA failed");
+    ok(ret,"CryptAcquireContextA failed\n");
 
     testExportPublicKey(csp, &info);
     testImportPublicKey(csp, info);
@@ -7971,7 +7971,7 @@ static void testPortPublicKeyInfo(void)
     CryptReleaseContext(csp, 0);
     ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL,
      CRYPT_DELETEKEYSET);
-    ok(ret,"CryptAcquireContextA failed");
+    ok(ret,"CryptAcquireContextA failed\n");
 }
 
 START_TEST(encode)
diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index 3d55935..10a85a3 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -2228,7 +2228,7 @@ static void testAddCertificateLink(void)
     ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError());
     if (ret)
     {
-        ok(linked->hCertStore == store1, "unexpected store");
+        ok(linked->hCertStore == store1, "unexpected store\n");
         ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size);
         ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n",
          GetLastError());
@@ -2300,7 +2300,7 @@ static void testAddCertificateLink(void)
     ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError());
     if (ret)
     {
-        ok(linked->hCertStore == store2, "unexpected store");
+        ok(linked->hCertStore == store2, "unexpected store\n");
         ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size);
         ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n",
          GetLastError());
@@ -2360,7 +2360,7 @@ static void testAddCertificateLink(void)
     ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError());
     if (ret)
     {
-        ok(linked->hCertStore == store2, "unexpected store");
+        ok(linked->hCertStore == store2, "unexpected store\n");
         ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size);
         ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n",
          GetLastError());
@@ -2429,7 +2429,7 @@ static void testAddCertificateLink(void)
     ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError());
     if (ret)
     {
-        ok(linked->hCertStore == store2, "unexpected store");
+        ok(linked->hCertStore == store2, "unexpected store\n");
         ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL);
         ok(ret, "CertControlStore failed: %d\n", ret);
         compareStore(store2, "file store -> system store",
@@ -2452,7 +2452,7 @@ static void testAddCertificateLink(void)
     ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError());
     if (ret)
     {
-        ok(linked->hCertStore == store2, "unexpected store");
+        ok(linked->hCertStore == store2, "unexpected store\n");
         CertDeleteCertificateFromStore(linked);
     }
     CertCloseStore(store2, 0);



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : d3d10/tests: Add a trailing '\n' to ok() calls.
Message-ID: <E1ORSK0-000588-4C@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7d66375fba780ae43c03720363f95bf6f0ff82ab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7d66375fba780ae43c03720363f95bf6f0ff82ab

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:49:15 2010 +0200

d3d10/tests: Add a trailing '\n' to ok() calls.

---

 dlls/d3d10/tests/effect.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c
index a8c5886..eab6d6d 100644
--- a/dlls/d3d10/tests/effect.c
+++ b/dlls/d3d10/tests/effect.c
@@ -3536,7 +3536,7 @@ static void test_effect_get_variable_by(ID3D10Device *device)
 
     /* variable f1 */
     variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 0);
-    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index);
+    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index);
 
     variable = effect->lpVtbl->GetVariableByName(effect, "f1");
     ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index);
@@ -3546,7 +3546,7 @@ static void test_effect_get_variable_by(ID3D10Device *device)
 
     /* variable f2 */
     variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 1);
-    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index);
+    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index);
 
     variable = effect->lpVtbl->GetVariableByName(effect, "f2");
     ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index);
@@ -3556,18 +3556,18 @@ static void test_effect_get_variable_by(ID3D10Device *device)
 
     /* variable f3 */
     variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 2);
-    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index);
+    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index);
 
     variable = effect->lpVtbl->GetVariableByName(effect, "f3");
     ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index);
 
     variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION");
-    ok(variable != null_variable, "GetVariableBySemantic failed %p", variable);
-    ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable);
+    ok(variable != null_variable, "GetVariableBySemantic failed %p\n", variable);
+    ok(variable != variable_by_index, "GetVariableBySemantic failed %p\n", variable);
 
     /* variable f4 */
     variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 3);
-    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index);
+    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index);
 
     variable = effect->lpVtbl->GetVariableByName(effect, "f4");
     ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index);
@@ -3577,7 +3577,7 @@ static void test_effect_get_variable_by(ID3D10Device *device)
 
     /* variable tex1 */
     variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 4);
-    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index);
+    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index);
 
     variable = effect->lpVtbl->GetVariableByName(effect, "tex1");
     ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index);
@@ -3587,14 +3587,14 @@ static void test_effect_get_variable_by(ID3D10Device *device)
 
     /* variable tex2 */
     variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 5);
-    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index);
+    ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index);
 
     variable = effect->lpVtbl->GetVariableByName(effect, "tex2");
     ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index);
 
     variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1");
-    ok(variable != null_variable, "GetVariableBySemantic failed %p", variable);
-    ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable);
+    ok(variable != null_variable, "GetVariableBySemantic failed %p\n", variable);
+    ok(variable != variable_by_index, "GetVariableBySemantic failed %p\n", variable);
 
     effect->lpVtbl->Release(effect);
 }



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
Message-ID: <E1ORSK0-00058P-75@wine.codeweavers.com>

Module: wine
Branch: master
Commit: eb8ce091cb7b1e94726f47f30c31723cbb5471ae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eb8ce091cb7b1e94726f47f30c31723cbb5471ae

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:49:41 2010 +0200

msvcrt/tests: Add a trailing '\n' to an ok() call.

---

 dlls/msvcrt/tests/string.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 1a362a1..b70d777 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -975,7 +975,7 @@ static void test__strtoi64(void)
     ok(res == 123, "res != 123\n");
     ok(endpos == oct+strlen(oct), "Incorrect endpos (%p-%p)\n", oct, endpos);
     res = p_strtoi64(blanks, &endpos, 10);
-    ok(res == 12, "res != 12");
+    ok(res == 12, "res != 12\n");
     ok(endpos == blanks+10, "Incorrect endpos (%p-%p)\n", blanks, endpos);
     ok(errno == 0xdeadbeef, "errno = %x\n", errno);
 



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : opengl32/tests: Add a trailing '\n' to a skip()
	call.
Message-ID: <E1ORSK0-00058e-8r@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8e7ad1906450ccf0cbd1680c94441589752bb560
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8e7ad1906450ccf0cbd1680c94441589752bb560

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:50:05 2010 +0200

opengl32/tests: Add a trailing '\n' to a skip() call.

---

 dlls/opengl32/tests/opengl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c
index 7568f47..2b81dda 100644
--- a/dlls/opengl32/tests/opengl.c
+++ b/dlls/opengl32/tests/opengl.c
@@ -553,7 +553,7 @@ static void test_bitmap_rendering(void)
 
     if(!iPixelFormat)
     {
-        skip("Unable to find a suitable pixel format");
+        skip("Unable to find a suitable pixel format\n");
     }
     else
     {



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : usp10/tests: Add a trailing '\n' to an ok() call.
Message-ID: <E1ORSK0-00058w-AY@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e39b983f495eb49bdea9bcc33399e803fc4a385d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e39b983f495eb49bdea9bcc33399e803fc4a385d

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:50:48 2010 +0200

usp10/tests: Add a trailing '\n' to an ok() call.

---

 dlls/usp10/tests/usp10.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index 522e035..efc0569 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -148,7 +148,7 @@ static void test_ScriptItemize( void )
     ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if pItems is NULL\n");
 
     hr = ScriptItemize(test1, 4, 1, &Control, &State, items, NULL);
-    ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cMaxItems < 2.");
+    ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cMaxItems < 2.\n");
 
     hr = ScriptItemize(test1, 0, 10, NULL, NULL, items, &nItems);
     ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cInChars is 0\n");



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : msvcrt/tests: Make test_dup2() static.
Message-ID: <E1ORSK0-00059D-DA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1f07f583cf677cf666e2999c08cc269053444f65
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f07f583cf677cf666e2999c08cc269053444f65

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:51:13 2010 +0200

msvcrt/tests: Make test_dup2() static.

---

 dlls/msvcrt/tests/file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c
index 3afc149..ef7b28d 100644
--- a/dlls/msvcrt/tests/file.c
+++ b/dlls/msvcrt/tests/file.c
@@ -1414,7 +1414,7 @@ static void test_unlink(void)
     rmdir("test_unlink");
 }
 
-void test_dup2(void)
+static void test_dup2(void)
 {
     ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" );
 }



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : shlwapi/tests: Make the XXX_Construct() functions
	static.
Message-ID: <E1ORSK0-00059V-GI@wine.codeweavers.com>

Module: wine
Branch: master
Commit: aebbbcb06b3882fbd4f382951b7b2df7839564c7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aebbbcb06b3882fbd4f382951b7b2df7839564c7

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:51:28 2010 +0200

shlwapi/tests: Make the XXX_Construct() functions static.

---

 dlls/shlwapi/tests/ordinal.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index cfc25e1..bf61418 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -1960,7 +1960,7 @@ typedef struct {
 
 static const IOleCommandTargetVtbl IOleCommandTargetImpl_Vtbl;
 
-IOleCommandTarget* IOleCommandTargetImpl_Construct(void)
+static IOleCommandTarget* IOleCommandTargetImpl_Construct(void)
 {
     IOleCommandTargetImpl *obj;
 
@@ -2050,7 +2050,7 @@ typedef struct {
 static const IServiceProviderVtbl IServiceProviderImpl_Vtbl;
 static const IProfferServiceVtbl IProfferServiceImpl_Vtbl;
 
-IServiceProvider* IServiceProviderImpl_Construct(void)
+static IServiceProvider* IServiceProviderImpl_Construct(void)
 {
     IServiceProviderImpl *obj;
 
@@ -2061,7 +2061,7 @@ IServiceProvider* IServiceProviderImpl_Construct(void)
     return (IServiceProvider*)obj;
 }
 
-IProfferService* IProfferServiceImpl_Construct(void)
+static IProfferService* IProfferServiceImpl_Construct(void)
 {
     IProfferServiceImpl *obj;
 



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : ntdll: Fix a typo in a parameter name.
Message-ID: <E1ORSK0-00059n-J0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4c8b3b0f3db867957df46371796c58752297778c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3b0f3db867957df46371796c58752297778c

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:51:43 2010 +0200

ntdll: Fix a typo in a parameter name.

---

 dlls/ntdll/error.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c
index 5537c87..80bf787 100644
--- a/dlls/ntdll/error.c
+++ b/dlls/ntdll/error.c
@@ -132,7 +132,7 @@ DWORD WINAPI RtlGetLastWin32Error(void)
  *      NtRaiseHardError (NTDLL.@)
  */
 NTSTATUS WINAPI NtRaiseHardError( NTSTATUS ErrorStatus, ULONG NumberOfParameters,
-                                  PUNICODE_STRING UnicodeStringParameterMask, PVOID *Paramaters,
+                                  PUNICODE_STRING UnicodeStringParameterMask, PVOID *Parameters,
                                   HARDERROR_RESPONSE_OPTION ResponseOption, PHARDERROR_RESPONSE Response )
 {
     FIXME(": stub. Errorstatus was %08x\n", ErrorStatus);



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : ws2_32/tests: Fix a typo in a variable name.
Message-ID: <E1ORSK0-0005A4-Kj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1a1f1aa58865c19882b308083292f93c7c907523
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1a1f1aa58865c19882b308083292f93c7c907523

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:52:12 2010 +0200

ws2_32/tests: Fix a typo in a variable name.

---

 dlls/ws2_32/tests/sock.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index c405053..9217913 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -2564,7 +2564,7 @@ typedef struct async_message
     struct async_message *next;
 } async_message;
 
-static struct async_message *messages_recieved;
+static struct async_message *messages_received;
 
 #define WM_SOCKET (WM_USER+100)
 static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -2579,14 +2579,14 @@ static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPA
         message->lparam = lparam;
         message->next = NULL;
 
-        if (messages_recieved)
+        if (messages_received)
         {
-            struct async_message *last = messages_recieved;
+            struct async_message *last = messages_received;
             while (last->next) last = last->next;
             last->next = message;
         }
         else
-            messages_recieved = message;
+            messages_received = message;
         return 0;
     }
 
@@ -2650,7 +2650,7 @@ static char *dbgstr_event_seq(const LPARAM *seq)
 static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents)
 {
     static char message[1024];
-    struct async_message *curr = messages_recieved;
+    struct async_message *curr = messages_received;
     int index, error, bit = 0;
     char name[10];
 
@@ -2693,7 +2693,7 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents)
 static void flush_events(SOCKET s, HANDLE hEvent)
 {
     WSANETWORKEVENTS netEvents;
-    struct async_message *prev = NULL, *curr = messages_recieved;
+    struct async_message *prev = NULL, *curr = messages_received;
     int ret;
     DWORD dwRet;
 
@@ -2714,12 +2714,12 @@ static void flush_events(SOCKET s, HANDLE hEvent)
             if (curr->socket == s)
             {
                 if (prev) prev->next = curr->next;
-                else messages_recieved = curr->next;
+                else messages_received = curr->next;
 
                 HeapFree(GetProcessHeap(), 0, curr);
 
                 if (prev) curr = prev->next;
-                else curr = messages_recieved;
+                else curr = messages_received;
             }
             else
             {
@@ -2759,7 +2759,7 @@ static int match_event_sequence(SOCKET s, WSANETWORKEVENTS *netEvents, const LPA
     }
     else
     {
-        curr = messages_recieved;
+        curr = messages_received;
         while (curr)
         {
             if (curr->socket == s)



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : msvcr90/tests: Make
	test_invalid_parameter_handler() static.
Message-ID: <E1ORSK0-0005AL-Mc@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 31f7eb790fc2f10888bbffa482051367d2ab3d33
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=31f7eb790fc2f10888bbffa482051367d2ab3d33

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:52:23 2010 +0200

msvcr90/tests: Make test_invalid_parameter_handler() static.

---

 dlls/msvcr90/tests/msvcr90.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c
index 2b4fae4..9f6e47b 100644
--- a/dlls/msvcr90/tests/msvcr90.c
+++ b/dlls/msvcr90/tests/msvcr90.c
@@ -44,7 +44,7 @@ int cb_called[4];
 
 /* ########## */
 
-void __cdecl test_invalid_parameter_handler(const wchar_t *expression,
+static void __cdecl test_invalid_parameter_handler(const wchar_t *expression,
         const wchar_t *function, const wchar_t *file,
         unsigned line, uintptr_t arg)
 {



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : winemenubuilder: Add a trailing '\n' to a FIXME()
	call.
Message-ID: <E1ORSK0-0005Ac-On@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4a9b52549e3d7dcb1de8ea7b97a30cf8b04d979f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4a9b52549e3d7dcb1de8ea7b97a30cf8b04d979f

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:54:28 2010 +0200

winemenubuilder: Add a trailing '\n' to a FIXME() call.

---

 programs/winemenubuilder/winemenubuilder.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 3abfc39..c027dad 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -514,7 +514,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename,
     case 32:
         return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW);
     default:
-        WINE_FIXME("unsupported bpp %d, please report", pIcon->bmiHeader.biBitCount);
+        WINE_FIXME("unsupported bpp %d, please report\n", pIcon->bmiHeader.biBitCount);
         return FALSE;
     }
 }



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: Francois Gouget : msvcr100: The msvcr100 debug channel is unused so
	remove it.
Message-ID: <E1ORSK0-0005Au-Rq@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7735f024eabd6fa0f32df8fce2a0efdc4451cdcd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7735f024eabd6fa0f32df8fce2a0efdc4451cdcd

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jun 22 17:54:19 2010 +0200

msvcr100: The msvcr100 debug channel is unused so remove it.

---

 dlls/msvcr100/msvcr100.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c
index 735092e..274d4c7 100644
--- a/dlls/msvcr100/msvcr100.c
+++ b/dlls/msvcr100/msvcr100.c
@@ -23,9 +23,7 @@
 #include "stdlib.h"
 #include "windef.h"
 #include "winbase.h"
-#include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msvcr100);
 
 /*********************************************************************
  *  DllMain (MSVCR100.@)



From julliard at winehq.org  Wed Jun 23 10:57:04 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:04 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winemaker: Ignore the Global
	section .
Message-ID: <E1ORSK0-0005BC-UN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 61622fe8d1804e2fba8a7a57fda1650195411bd5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=61622fe8d1804e2fba8a7a57fda1650195411bd5

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 22 18:01:03 2010 +0200

winemaker: Ignore the Global section.

---

 tools/winemaker |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 23f800f..bed499d 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -1163,6 +1163,8 @@ sub source_scan_workspace_file($)
                 next;
             } elsif (/^#/) {
                 # ignore Comments
+            } elsif (/^Global:/) {
+                # ignore the Global section
             } elsif (/\w:/) {
                 print STDERR "unknown section $_\n";
             } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) {



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winemaker: Ignore files not
	found by the search function.
Message-ID: <E1ORSK1-0005C0-2x@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f4679761b7a6385452bba6a12db9b1e3eae5ed06
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f4679761b7a6385452bba6a12db9b1e3eae5ed06

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 22 18:01:07 2010 +0200

winemaker: Ignore files not found by the search function.

---

 tools/winemaker |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index bed499d..78034fa 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -782,6 +782,7 @@ sub source_scan_project_file($$$)
             } elsif (/^SOURCE=(.*)$/) {
                 my @components=split /[\/\\]+/, $1;
                 $sfilet=search_from($path, \@components);
+                if (!defined $sfilet) { next; }
                 if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) {
                     push @sources_c,$sfilet;
                 } elsif ($sfilet =~ /\.(cpp|cxx)$/i) {



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winemaker: Warn on include
	path starting with drive letter.
Message-ID: <E1ORSK1-0005CH-6I@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 02efd5a7c0092fa48c0ce49c0e7352ec33fc1c7f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=02efd5a7c0092fa48c0ce49c0e7352ec33fc1c7f

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 22 18:01:13 2010 +0200

winemaker: Warn on include path starting with drive letter.

---

 tools/winemaker |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 78034fa..0e34245 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -670,7 +670,11 @@ sub source_scan_project_file($$$)
                         # Additional Include Directories
                         $sfilet=$1;
                         $sfilet=~s/\\/\//g;
-                        push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." ";
+                        if ($sfilet=~/^\w:/) {
+                            print STDERR "warning: Can't fix path $sfilet\n"
+                        } else {
+                            push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." ";
+                        }
                     } elsif (/^U\s*\"(.*)\"/) {
                         # Undefines a previously defined symbol
                         $prj_target_cflags.="-U".$1." ";



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winemaker: Don' t use
	deprecated -mcpu option.
Message-ID: <E1ORSK1-0005CZ-A2@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f10513b2f822291d03cdcb2ebe43cdf316ed76a0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f10513b2f822291d03cdcb2ebe43cdf316ed76a0

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 22 18:01:20 2010 +0200

winemaker: Don't use deprecated -mcpu option.

---

 tools/winemaker |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 0e34245..64cf54b 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -691,19 +691,19 @@ sub source_scan_project_file($$$)
                         # this option is always present and is already specified in the suffix rules
                     } elsif (/^GB$/) {
                         # Blend Optimization
-                        $prj_target_cflags.="-mcpu=pentiumpro -D_M_IX86=500 ";
+                        $prj_target_cflags.="-march=pentiumpro -D_M_IX86=500 ";
                     } elsif (/^G6$/) {
                         # Pentium Pro Optimization
                         $prj_target_cflags.="-march=pentiumpro -D_M_IX86=600 ";
                     } elsif (/^G5$/) {
                         # Pentium Optimization
-                        $prj_target_cflags.="-mcpu=pentium -D_M_IX86=500 ";
+                        $prj_target_cflags.="-march=pentium -D_M_IX86=500 ";
                     } elsif (/^G3$/) {
                         # 80386 Optimization
-                        $prj_target_cflags.="-mcpu=i386 -D_M_IX86=300 ";
+                        $prj_target_cflags.="-march=i386 -D_M_IX86=300 ";
                     } elsif (/^G4$/) {
                         # 80486 Optimization
-                        $prj_target_cflags.="-mcpu=i486 -D_M_IX86=400 ";
+                        $prj_target_cflags.="-march=i486 -D_M_IX86=400 ";
                     } elsif (/^Yc/) {
                         # Create Precompiled Header
                     } elsif (/^Yu/) {



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: Sven Baars : oledlg: Fix Dutch translation.
Message-ID: <E1ORSK1-0005D0-Gb@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9aa71a1fc664763076aadab3ace4ef39395bc558
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9aa71a1fc664763076aadab3ace4ef39395bc558

Author: Sven Baars <sven.wine at gmail.com>
Date:   Tue Jun 22 21:19:43 2010 +0200

oledlg: Fix Dutch translation.

---

 dlls/oledlg/oledlg_Nl.rc |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/dlls/oledlg/oledlg_Nl.rc b/dlls/oledlg/oledlg_Nl.rc
index 58a63da..e81b010 100644
--- a/dlls/oledlg/oledlg_Nl.rc
+++ b/dlls/oledlg/oledlg_Nl.rc
@@ -22,6 +22,8 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
+#pragma code_page(65001)
+
 UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Object invoegen"
@@ -36,12 +38,12 @@ BEGIN
     GROUPBOX        "Resultaat",IDC_RESULT,7,103,208,41
     CONTROL         "Nieuw",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | 
                     WS_GROUP,7,20,62,10
-    CONTROL         "Cre?ren",IDC_CREATECONTROL,"Button",
+    CONTROL         "Cre??ren",IDC_CREATECONTROL,"Button",
                     BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
     CONTROL         "Bestand gebruiken",IDC_CREATEFROMFILE,"Button",
                     BS_AUTORADIOBUTTON,7,37,67,10
     LTEXT           "",IDC_RESULTDESC,49,112,159,23
-    PUSHBUTTON      "Toevoegen...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
+    PUSHBUTTON      "&Toevoegen...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
     CONTROL         "Als pictogram weergeven",IDC_ASICON,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
     PUSHBUTTON      "Bladeren...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
@@ -51,10 +53,10 @@ END
 
 STRINGTABLE DISCARDABLE
 {
-  IDS_RESULTOBJDESC	"Voeg een nieuw %s object in uw document"
-  IDS_RESULTFILEOBJDESC	"Voeg de inhoud van het bestand als object in uw document zodat u het later kunt bewerken met het programma waarmee u het heeft gemaakt."
+  IDS_RESULTOBJDESC	"Voeg een nieuw %s object in uw document in"
+  IDS_RESULTFILEOBJDESC	"Voeg de inhoud van het bestand als object in uw document in, zodat u het later kunt bewerken met het programma waarmee u het heeft gemaakt."
   IDS_BROWSE            "Bladeren"
-  IDS_NOTOLEMOD         "Het bestand is geen geldig OLE bestand. Registratie is mislukt."
+  IDS_NOTOLEMOD         "Het bestand is geen geldig OLE bestand. De registratie is mislukt."
   IDS_NOTOLEMODCAPTION  "Toevoegen"
 }
 
@@ -66,7 +68,7 @@ BEGIN
     LTEXT         "Bron:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
     CONTROL       "&Plakken", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
                   6, 38, 55, 10
-    CONTROL       "Plakken &Verwijzing", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
+    CONTROL       "Plak &verwijzing", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
                   6, 63, 55, 10
     LTEXT         "&Als:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP
     LISTBOX       IDC_PS_PASTELIST,     65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
@@ -75,25 +77,25 @@ BEGIN
     CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
     CONTROL       "Annuleren", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
     CONTROL       "&Help", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
-    CONTROL       "&Toon Als Icoon", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    CONTROL       "Als pictogram &weergeven", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
     CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
-    CONTROL       "Verander &Icoon...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
+    CONTROL       "Wijzig p&ictogram...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
     CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
-    CONTROL       "<< resultaat tekst komt hier >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
+    CONTROL       "<< resultaattekst komt hier >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
     CONTROL       "Resultaat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48
     CONTROL       "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
 END
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_PS_PASTE_DATA                     "Voegt de inhoud van het clipbord in uw document als %s."
-    IDS_PS_PASTE_OBJECT                   "Voegt de inhoud van het clipbord in uw document zodat u het kan activeren met %s."
-    IDS_PS_PASTE_OBJECT_AS_ICON           "Voegt de inhoud van het clipbord in uw document zodat u het kan activeren met %s. Het zal getoond worden als een icoon."
-    IDS_PS_PASTE_LINK_DATA                "Voegt de inhoud van het clipbord in uw document als %s. De data is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document."
-    IDS_PS_PASTE_LINK_OBJECT              "Voegt een afbeelding vanuit het clipbord in uw document. De afbeelding is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document."
-    IDS_PS_PASTE_LINK_OBJECT_AS_ICON      "Voegt een verwijzing in die wijst naar de locatie van de inhoud van het clipbord. De verwijzing is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document."
-    IDS_PS_NON_OLE                        "Voegt de inhoud van het clipbord in uw document."
-    IDS_PS_UNKNOWN_TYPE                   "Onbekend Type"
-    IDS_PS_UNKNOWN_SRC                    "Onbekende Bron"
-    IDS_PS_UNKNOWN_APP                    "het programma die het gecre?erd heeft"
+    IDS_PS_PASTE_DATA                     "Voegt de inhoud van het klembord in uw document in als %s."
+    IDS_PS_PASTE_OBJECT                   "Voegt de inhoud van het klembord in uw document in zodat u het kan activeren met %s."
+    IDS_PS_PASTE_OBJECT_AS_ICON           "Voegt de inhoud van het klembord in uw document in zodat u het kan activeren met %s. Het zal getoond worden als een icoon."
+    IDS_PS_PASTE_LINK_DATA                "Voegt de inhoud van het klembord in uw document in als %s. De data is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document."
+    IDS_PS_PASTE_LINK_OBJECT              "Voegt een afbeelding vanuit het klembord in uw document in. De afbeelding is verbonden met het bronbestand, zodat wijzigingen in dat bestand worden getoond in uw document."
+    IDS_PS_PASTE_LINK_OBJECT_AS_ICON      "Voegt een verwijzing in die wijst naar de locatie van de inhoud van het klembord. De verwijzing is verbonden met het bronbestand, zodat wijzigingen in dat bestand worden getoond in uw document."
+    IDS_PS_NON_OLE                        "Voegt de inhoud van het klembord in uw document."
+    IDS_PS_UNKNOWN_TYPE                   "Onbekend type"
+    IDS_PS_UNKNOWN_SRC                    "Onbekende bron"
+    IDS_PS_UNKNOWN_APP                    "het programma die het gecre??erd heeft"
 }



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: uxtheme: Quiet a noisy fixme.
Message-ID: <E1ORSK1-0005DH-LA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e17be10d44faa32a18dd88d06e8cfddbf3972e3d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e17be10d44faa32a18dd88d06e8cfddbf3972e3d

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 22 21:41:23 2010 +0200

uxtheme: Quiet a noisy fixme.

---

 dlls/uxtheme/buffer.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c
index af004d0..f4d8229 100644
--- a/dlls/uxtheme/buffer.c
+++ b/dlls/uxtheme/buffer.c
@@ -61,8 +61,14 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC hdcTarget,
                                        BP_PAINTPARAMS *pPaintParams,
                                        HDC *phdc)
 {
-    FIXME("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat,
+    static int i;
+
+    TRACE("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat,
           pPaintParams, phdc);
+
+    if (!i++)
+        FIXME("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat,
+              pPaintParams, phdc);
     return NULL;
 }
 



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: Nikolay Sivov : msxml3: Silence a warning in ::get_baseName() for
	document nodes.
Message-ID: <E1ORSK1-0005DY-OG@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d24d007fa5ef35abb5a83d9b399645243b242356
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d24d007fa5ef35abb5a83d9b399645243b242356

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jun 22 22:47:36 2010 +0400

msxml3: Silence a warning in ::get_baseName() for document nodes.

---

 dlls/msxml3/node.c         |    1 +
 dlls/msxml3/tests/domdoc.c |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 31c6e46..135844f 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -1632,6 +1632,7 @@ static HRESULT WINAPI xmlnode_get_baseName(
         break;
     case XML_TEXT_NODE:
     case XML_COMMENT_NODE:
+    case XML_DOCUMENT_NODE:
         break;
     default:
         ERR("Unhandled type %d\n", This->node->type );
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 605628f..d85e9fb 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -656,6 +656,11 @@ if (0)
     r = IXMLDOMDocument_get_nodeName( doc, NULL );
     ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n");
 
+    str = (BSTR)0xdeadbeef;
+    r = IXMLDOMDocument_get_baseName( doc, &str );
+    ok ( r == S_FALSE, "got 0x%08x\n", r);
+    ok (str == NULL, "got %p\n", str);
+
     /* content doesn't matter here */
     str = NULL;
     r = IXMLDOMDocument_get_nodeName( doc, &str );



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: Nikolay Sivov : msxml3: Accept CLSID_FreeThreadedDOMDocument30 in
	class factory.
Message-ID: <E1ORSK1-0005Do-QB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 15720f8141231459138f1a0df7cafdc5b308cec9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=15720f8141231459138f1a0df7cafdc5b308cec9

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Jun 23 00:47:04 2010 +0400

msxml3: Accept CLSID_FreeThreadedDOMDocument30 in class factory.

---

 dlls/msxml3/factory.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index af94d5c..3fd229c 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -162,7 +162,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
         cf = (IClassFactory*) &xmldoccf.lpVtbl;
     }
     else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) ||   /* Version indep. v 2.x */
-             IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) )
+             IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) ||
+             IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument30 ))
     {
         cf = (IClassFactory*) &domdoccf.lpVtbl;
     }



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: Nikolay Sivov : msxml3: Don't free namespace data tracked in a tree.
Message-ID: <E1ORSK1-0005E5-SP@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 16e465c7ae1710a51b0fa156304e277d158dbab6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=16e465c7ae1710a51b0fa156304e277d158dbab6

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Jun 23 02:33:02 2010 +0400

msxml3: Don't free namespace data tracked in a tree.

Fixes regression from ea9a6a4b4e33cc8f56bc7835f7f05146487fb5d2.

---

 dlls/msxml3/xmlelem.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index 0327604..a71b18b 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -262,7 +262,6 @@ static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR name,
         xmlNsPtr ns;
         ns = xmlSearchNs(This->node->doc, This->node, (xmlChar*)"xml");
         val = xmlGetNsProp(This->node, (xmlChar*)"lang", ns->href);
-        xmlFreeNs(ns);
     }
     else
     {



From julliard at winehq.org  Wed Jun 23 10:57:05 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:05 -0500
Subject: Michael Stefaniuc : serialui: Add the Romanian translation.
Message-ID: <E1ORSK1-0005EM-U8@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ea8313b1c1e9bb44253e0889893f2e6b89bf4385
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ea8313b1c1e9bb44253e0889893f2e6b89bf4385

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Wed Jun 23 01:14:16 2010 +0200

serialui: Add the Romanian translation.

Translations by Claudia Cotun? and Paul Chitescu.

---

 dlls/serialui/Makefile.in |    1 +
 dlls/serialui/Ro.rc       |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 95a04f3..b293921 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -28,6 +28,7 @@ RC_SRCS = \
 	No.rc \
 	Pl.rc \
 	Pt.rc \
+	Ro.rc \
 	Ru.rc \
 	Si.rc \
 	Sv.rc \
diff --git a/dlls/serialui/Ro.rc b/dlls/serialui/Ro.rc
new file mode 100644
index 0000000..1fe3981
--- /dev/null
+++ b/dlls/serialui/Ro.rc
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2000 Mike McCormack
+ * Copyright 2010 Claudia Cotun?
+ *                Paul Chitescu
+ *                Michael Stefaniuc
+ *
+ * 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 "serialui.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Propriet??i pentru "
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Rata de transfer", -1,5,20,55,10
+  COMBOBOX      IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Paritate", -1,5,40,55,10
+  COMBOBOX      IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Controlul fluxului", -1,5,60,55,10
+  COMBOBOX      IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Bi?i de date", -1,5,80,55,10
+  COMBOBOX      IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Bi?i de stop", -1,5,100,55,10
+  COMBOBOX      IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
+  DEFPUSHBUTTON "OK",     IDOK,30,138,50,14
+  PUSHBUTTON    "Renun??", IDCANCEL,85,138,50,14
+END



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Michael Stefaniuc : hhctrl.ocx: Add the Romanian translation.
Message-ID: <E1ORSK2-0005Ee-2l@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fb5ef1c6c648ad443b3fdc4015f7cd5bd0cff548
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb5ef1c6c648ad443b3fdc4015f7cd5bd0cff548

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Wed Jun 23 01:14:28 2010 +0200

hhctrl.ocx: Add the Romanian translation.

Translation by Claudia Cotun?.

---

 dlls/hhctrl.ocx/Makefile.in |    1 +
 dlls/hhctrl.ocx/Ro.rc       |   63 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in
index 5561f42..1dd511b 100644
--- a/dlls/hhctrl.ocx/Makefile.in
+++ b/dlls/hhctrl.ocx/Makefile.in
@@ -34,6 +34,7 @@ RC_SRCS = \
 	No.rc \
 	Pl.rc \
 	Pt.rc \
+	Ro.rc \
 	Ru.rc \
 	Si.rc \
 	Sv.rc \
diff --git a/dlls/hhctrl.ocx/Ro.rc b/dlls/hhctrl.ocx/Ro.rc
new file mode 100644
index 0000000..28f7569
--- /dev/null
+++ b/dlls/hhctrl.ocx/Ro.rc
@@ -0,0 +1,63 @@
+/*
+ * HTML Help resources
+ *
+ * Copyright 2005 James Hawkins
+ * Copyright 2010 Claudia Cotun?
+ *                Michael Stefaniuc
+ *
+ * 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 "resource.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+BEGIN
+    IDS_CONTENTS     "&Cuprins"
+    IDS_INDEX        "I&ndex"
+    IDS_SEARCH       "C&aut?"
+    IDS_FAVORITES    "Favor&ite"
+END
+
+STRINGTABLE
+BEGIN
+    IDTB_EXPAND      "Afi?eaz?"
+    IDTB_CONTRACT    "Ascunde"
+    IDTB_STOP        "Opre?te"
+    IDTB_REFRESH     "Actualizeaz?"
+    IDTB_BACK        "?napoi"
+    IDTB_HOME        "Acas?"
+    IDTB_SYNC        "Sincronizeaz?"
+    IDTB_PRINT       "Imprim?"
+    IDTB_OPTIONS     "Op?iuni"
+    IDTB_FORWARD     "?nainte"
+    IDTB_NOTES       "IDTB_NOTES"
+    IDTB_BROWSE_FWD  "IDTB_BROWSE_FWD"
+    IDTB_BROWSE_BACK "IDT_BROWSE_BACK"
+    IDTB_CONTENTS    "IDTB_CONTENTS"
+    IDTB_INDEX       "IDTB_INDEX"
+    IDTB_SEARCH      "IDTB_SEARCH"
+    IDTB_HISTORY     "IDTB_HISTORY"
+    IDTB_FAVORITES   "IDTB_FAVORITES"
+    IDTB_JUMP1       "Salt1"
+    IDTB_JUMP2       "Salt2"
+    IDTB_CUSTOMIZE   "Personalizare"
+    IDTB_ZOOM        "Zoom"
+    IDTB_TOC_NEXT    "IDTB_TOC_NEXT"
+    IDTB_TOC_PREV    "IDTB_TOC_PREV"
+END



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Michael Stefaniuc : gphoto.ds: Add the Romanian translation.
Message-ID: <E1ORSK2-0005Eu-4y@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 65cebf3ae23b89b67d3861231d317f2017fef068
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=65cebf3ae23b89b67d3861231d317f2017fef068

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Wed Jun 23 01:14:48 2010 +0200

gphoto.ds: Add the Romanian translation.

Translation by Claudia Cotun?.

---

 dlls/gphoto2.ds/Makefile.in   |    1 +
 dlls/gphoto2.ds/gphoto2_Ro.rc |   57 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index 63d1b68..5cbde22 100644
--- a/dlls/gphoto2.ds/Makefile.in
+++ b/dlls/gphoto2.ds/Makefile.in
@@ -27,6 +27,7 @@ RC_SRCS = \
 	gphoto2_No.rc \
 	gphoto2_Pl.rc \
 	gphoto2_Pt.rc \
+	gphoto2_Ro.rc \
 	gphoto2_Ru.rc \
 	gphoto2_Si.rc \
 	gphoto2_Sv.rc \
diff --git a/dlls/gphoto2.ds/gphoto2_Ro.rc b/dlls/gphoto2.ds/gphoto2_Ro.rc
new file mode 100644
index 0000000..9cfe1b2
--- /dev/null
+++ b/dlls/gphoto2.ds/gphoto2_Ro.rc
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2006 CodeWeavers, Aric Stewart
+ * Copyright 2010 Claudia Cotun?
+ *                Michael Stefaniuc
+ *
+ * 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 "resource.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
+    WS_CAPTION | WS_SYSMENU
+CAPTION "Fi?iere ?n aparatul foto"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL       "Lista1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER |
+WS_TABSTOP,7,7,358,229
+    DEFPUSHBUTTON "Import? selec?ia",IDC_IMPORT,152,252,72,14
+    PUSHBUTTON    "Previzualizare",IDC_FETCH,7,252,64,14
+    PUSHBUTTON    "Import? tot",IDC_IMPORTALL,80,252,64,14
+    CONTROL       "Omite acest dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14
+    PUSHBUTTON    "Ie?ire",IDC_EXIT,315,252,50,14
+END
+
+IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
+CAPTION "Transferare"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT "Se transfer?... A?tepta?i",IDC_STATIC,5,19,176,8, SS_CENTER
+END
+
+IDD_CONNECTING DIALOG DISCARDABLE  0, 0, 280, 116
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER
+CAPTION "Conectare la camer?"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110
+    LTEXT   "Se conecteaz? la camer?... A?tepta?i",IDC_STATIC,128,58,116,8
+END



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Luca Bennati : cmd: Update Italian translation.
Message-ID: <E1ORSK2-0005FB-71@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0e63d955d6fe7f4cf61cd1d0dd4865a25f14ddd0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0e63d955d6fe7f4cf61cd1d0dd4865a25f14ddd0

Author: Luca Bennati <lucak3 at gmail.com>
Date:   Tue Jun 22 23:38:53 2010 +0200

cmd: Update Italian translation.

---

 programs/cmd/It.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc
index ecccebe..c503cd1 100644
--- a/programs/cmd/It.rc
+++ b/programs/cmd/It.rc
@@ -113,8 +113,8 @@ MOVE fallisce se la nuova e la vecchia locazione sono su lettere di unit? DOS d
   WCMD_PATH,
 "PATH mostra o cambia il percorso di ricerca di cmd.\n\
 \n\
-Usando PATH, verr? mostrato la configurazione corrente di PATH (inizialmente questa ?\n\
-il valore nel tuo file wine.conf). Per cambiarla, fai seguire al\n\
+Usando PATH, verr? mostrato l'impostazione corrente di PATH (il cui valore ? preso\n\
+inizialmente dal registro). Per cambiarla, fai seguire al\n\
 comando PATH il nuovo valore.\n\
 \n\
 ? anche possibile modificare il PATH usando la variabile d'ambiente\n\



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Aric Stewart : shlwapi: URL_FILE_USE_PATHURL flag only unescapes file
	urls in UrlCanonicalize.
Message-ID: <E1ORSK2-0005FR-8u@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ea029bd2fb3754ea1c30e41e1a4c6cb770f4c9e1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ea029bd2fb3754ea1c30e41e1a4c6cb770f4c9e1

Author: Aric Stewart <aric at codeweavers.com>
Date:   Wed Jun 23 15:47:35 2010 +0900

shlwapi: URL_FILE_USE_PATHURL flag only unescapes file urls in UrlCanonicalize.

---

 dlls/shlwapi/tests/url.c |    4 +++-
 dlls/shlwapi/url.c       |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index c828ea9..8a8f68a 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -160,7 +160,9 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = {
     {"A", 0, S_OK, "A", FALSE},
     {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", FALSE} /*LimeWire online installer calls this*/,
     {"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"},
-    {"http://localhost/test.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/test.html"}
+    {"http://localhost/test.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/test.html"},
+    {"http://localhost/te%20st.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/te%20st.html"},
+    {"http://www.winehq.org/%E6%A1%9C.html", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/%E6%A1%9C.html"}
 };
 
 /* ################ */
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index ad7d989..d7a36db 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -486,7 +486,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized,
     while ((nLen > 0) && ((lpszUrlCpy[nLen-1] <= ' ')))
         lpszUrlCpy[--nLen]=0;
 
-    if(dwFlags & (URL_UNESCAPE | URL_FILE_USE_PATHURL))
+    if((dwFlags & URL_UNESCAPE) ||
+       ((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile)
+                && !memcmp(wszFile, pszUrl, sizeof(wszFile))))
         UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE);
 
     if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Alexandre Julliard : user32/tests: Add more systematic tests to
	validate the DDE client-side A<-> W conversions.
Message-ID: <E1ORSK2-0005Fl-Bs@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f5f93d459e5b56539bf545a6a368fd96f14b0e3a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f5f93d459e5b56539bf545a6a368fd96f14b0e3a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 23 14:19:51 2010 +0200

user32/tests: Add more systematic tests to validate the DDE client-side A<->W conversions.

---

 dlls/user32/tests/dde.c |  439 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 363 insertions(+), 76 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5f93d459e5b56539bf545a6a368fd96f14b0e3a


From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Alexandre Julliard : user32/tests: Fix some DDE test failures on
	Win9x.
Message-ID: <E1ORSK2-0005G1-Dj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fe161ec2f906c62c4e718770cc479b4af1744887
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fe161ec2f906c62c4e718770cc479b4af1744887

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 23 15:22:29 2010 +0200

user32/tests: Fix some DDE test failures on Win9x.

---

 dlls/user32/tests/dde.c |   60 ++++++++++++++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index 040c11a..8ead6d2 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -162,7 +162,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA
         lstrcpyA((LPSTR)data->Value, str);
         GlobalUnlock(hglobal);
 
-        lparam = PackDDElParam(WM_DDE_ACK, (UINT_PTR)hglobal, HIWORD(lparam));
+        lparam = PackDDElParam(WM_DDE_DATA, (UINT_PTR)hglobal, HIWORD(lparam));
         PostMessageA(client, WM_DDE_DATA, (WPARAM)hwnd, lparam);
 
         break;
@@ -188,7 +188,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA
         if (msg_index == 5)
         {
             size = GlobalSize((HGLOBAL)lo);
-            ok(size == 4, "got %d\n", size);
+            ok(size == 4 || broken(size == 32), /* sizes are rounded up on win9x */ "got %d\n", size);
         }
         else
             ok(!lstrcmpA((LPSTR)poke->Value, "poke data\r\n"),
@@ -230,6 +230,11 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA
         break;
     }
 
+    case WM_DDE_ACK:  /* happens on win9x when fAckReq is TRUE, ignore it */
+        ok(msg_index == 4, "Expected 4, got %d\n", msg_index);
+        msg_index--;
+        break;
+
     default:
         ok(FALSE, "Unhandled msg: %08x\n", msg);
     }
@@ -300,14 +305,15 @@ static void test_ddeml_client(void)
     hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
     ret = DdeGetLastError(client_pid);
     ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
-    ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %08x\n", res);
-    if (hdata == NULL)
-        ok(FALSE, "hdata is NULL\n");
-    else
+    ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */
+       "Expected DDE_FNOTPROCESSED, got %08x\n", res);
+    ok( hdata != NULL, "hdata is NULL\n" );
+    if (hdata)
     {
         str = (LPSTR)DdeAccessData(hdata, &size);
         ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str);
-        ok(size == 19, "Expected 19, got %d\n", size);
+        ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */
+           "Expected 19, got %d\n", size);
 
         ret = DdeUnaccessData(hdata);
         ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
@@ -318,16 +324,18 @@ static void test_ddeml_client(void)
     DdeGetLastError(client_pid);
     hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
     ret = DdeGetLastError(client_pid);
-    ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res);
+    ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */
+       "Expected DDE_FNOTPROCESSED, got %x\n", res);
 todo_wine
-    ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret);
-    if (hdata == NULL)
-        ok(FALSE, "hdata is NULL\n");
-    else
+    ok(ret == DMLERR_MEMORY_ERROR || broken(ret == 0), /* win9x */
+       "Expected DMLERR_MEMORY_ERROR, got %d\n", ret);
+    ok( hdata != NULL, "hdata is NULL\n" );
+    if (hdata)
     {
         str = (LPSTR)DdeAccessData(hdata, &size);
         ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str);
-        ok(size == 19, "Expected 19, got %d\n", size);
+        ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */
+           "Expected 19, got %d\n", size);
 
         ret = DdeUnaccessData(hdata);
         ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
@@ -339,14 +347,16 @@ todo_wine
     hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
     ret = DdeGetLastError(client_pid);
     ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
-    ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res);
+    ok(res == DDE_FNOTPROCESSED || broken(res == 0xdeadbeef), /* win9x */
+       "Expected DDE_FNOTPROCESSED, got %x\n", res);
     if (hdata == NULL)
         ok(FALSE, "hdata is NULL\n");
     else
     {
         str = (LPSTR)DdeAccessData(hdata, &size);
         ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str);
-        ok(size == 19, "Expected 19, got %d\n", size);
+        ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */
+           "Expected 19, got %d\n", size);
 
         ret = DdeUnaccessData(hdata);
         ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
@@ -394,7 +404,7 @@ todo_wine
     op = DdeClientTransaction((LPBYTE)hdata, 0, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res);
     ret = DdeGetLastError(client_pid);
     ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op);
-    ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res);
+    ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res);
     ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
 
     /* XTYP_POKE, correct params */
@@ -403,7 +413,8 @@ todo_wine
     op = DdeClientTransaction((LPBYTE)hdata, -1, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res);
     ret = DdeGetLastError(client_pid);
     ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op);
-    ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res);
+    ok(res == DDE_FACK || broken(res == (0xdead0000 | DDE_FACK)), /* win9x */
+       "Expected DDE_FACK, got %x\n", res);
     ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
 
     DdeFreeDataHandle(hdata);
@@ -420,7 +431,7 @@ todo_wine
     ret = DdeGetLastError(client_pid);
     ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
     ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op);
-    ok(res == DDE_FACK, "Expected DDE_FACK, got %d\n", res);
+    ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res);
 
     /* XTYP_EXECUTE, no data */
     res = 0xdeadbeef;
@@ -585,9 +596,16 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon
         ok(size == 13, "Expected 13, got %d\n", size);
 
         size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI);
-        ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str);
-        ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]);
-        ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str);
+        if (!strncmp( str, "TestDDEServer:(", 15 ))  /* win9x style */
+        {
+            ok(size == 16 + 2*sizeof(WORD), "Got size %d for %s\n", size, str);
+        }
+        else
+        {
+            ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str);
+            ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str);
+        }
+            ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]);
 
         return (HDDEDATA)TRUE;
     }



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Michael Stefaniuc : net: Add the Romanian translation.
Message-ID: <E1ORSK2-0005GI-Fg@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dbf5ec01aea564bf230da144fc4b714962a12915
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dbf5ec01aea564bf230da144fc4b714962a12915

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Wed Jun 23 10:34:21 2010 +0200

net: Add the Romanian translation.

Translation by Claudia Cotun?.

---

 programs/net/Makefile.in |    1 +
 programs/net/Ro.rc       |   48 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in
index 5c06bb8..5efbef0 100644
--- a/programs/net/Makefile.in
+++ b/programs/net/Makefile.in
@@ -21,6 +21,7 @@ RC_SRCS = \
 	No.rc \
 	Pl.rc \
 	Pt.rc \
+	Ro.rc \
 	Ru.rc \
 	Si.rc
 
diff --git a/programs/net/Ro.rc b/programs/net/Ro.rc
new file mode 100644
index 0000000..9dc52f7
--- /dev/null
+++ b/programs/net/Ro.rc
@@ -0,0 +1,48 @@
+/*
+ * NET.EXE - Wine-compatible net program
+ *
+ * Copyright (C) 2007 Tim Schwartz
+ * Copyright (C) 2010 Claudia Cotun?
+ *                    Michael Stefaniuc
+ *
+ * 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 "resources.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    STRING_USAGE, "Sintaxa acestei comenzi este:\n\nNET [ HELP | START | STOP | USE ]\n"
+    STRING_START_USAGE, "Specifica?i numele serviciului de pornit.\n"
+    STRING_STOP_USAGE, "Specifica?i numele serviciului de oprit.\n"
+    STRING_STOP_DEP, "Se opre?te serviciul dependent: %s\n"
+    STRING_CANT_STOP, "Serviciul %s nu a putut fi oprit\n"
+    STRING_NO_SCM, "Nu a putut fi accesat managerul de control al serviciului.\n"
+    STRING_NO_SVCHANDLE, "Serviciul nu a putut fi accesat.\n"
+    STRING_START_SVC, "Serviciul %s porne?te.\n"
+    STRING_START_SVC_SUCCESS, "Serviciul %s a fost pornit cu succes.\n"
+    STRING_START_SVC_FAIL, "Pornirea serviciului %s a e?uat.\n"
+    STRING_STOP_SVC, "Serviciul %s se opre?te.\n"
+    STRING_STOP_SVC_SUCCESS, "Serviciul %s a fost oprit cu succes.\n"
+    STRING_STOP_SVC_FAIL, "Oprirea serviciului %s a e?uat.\n"
+    STRING_HELP_USAGE, "Sintaxa acestei comenzi este:\n\ncomand? NET HELP\n    -sau-\ncomand? NET /HELP\n\n   Comenzile disponibile sunt:\n   NET HELP    NET START    NET STOP    NET USE\n"
+    STRING_NO_ENTRIES, "Nu exist? nici un element ?n list?.\n"
+    STRING_USE_HEADER, "\nStare  Local   Distant\n---------------------------------------------------------------\n"
+    STRING_USE_ENTRY,  "%s      %S      %S      Resurse deschise: %lu\n"
+}



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Michael Stefaniuc : notepad: Fix an error in the Wallon resource.
Message-ID: <E1ORSK2-0005GY-HG@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bd007372d26c0aa43b9241029e845de7fec7b2e4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bd007372d26c0aa43b9241029e845de7fec7b2e4

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Wed Jun 23 11:13:01 2010 +0200

notepad: Fix an error in the Wallon resource.

Translation by David Estebanez.

---

 programs/notepad/Wa.rc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc
index 1856490..85c49c5 100644
--- a/programs/notepad/Wa.rc
+++ b/programs/notepad/Wa.rc
@@ -57,6 +57,7 @@ POPUP "&Candj
 POPUP "C&wer?" {
   MENUITEM "Cwer?...",          CMD_SEARCH
   MENUITEM "&Sh?vant\tF3",      CMD_SEARCH_NEXT
+  MENUITEM "&Replaec?...\tCtrl+H", CMD_REPLACE
  }
 POPUP "&Aide" {
   MENUITEM "?&dvins",           CMD_HELP_CONTENTS



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Michael Stefaniuc : notepad: Fix an error in the Chinese (Simplified)
	resource.
Message-ID: <E1ORSK2-0005Gq-JH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 98c2a1ee816f5e2b0263e6fb3a828e256f164e26
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=98c2a1ee816f5e2b0263e6fb3a828e256f164e26

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Wed Jun 23 11:13:16 2010 +0200

notepad: Fix an error in the Chinese (Simplified) resource.

Translation by Donald Park.

---

 programs/notepad/Zh.rc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc
index 005c67d..242eb65 100644
--- a/programs/notepad/Zh.rc
+++ b/programs/notepad/Zh.rc
@@ -55,6 +55,7 @@ POPUP "??(&E)" {
 POPUP "??(&S)" {
   MENUITEM "??(&S)...",           CMD_SEARCH
   MENUITEM "?????(&S)\tF3", CMD_SEARCH_NEXT
+  MENUITEM "??...\tCtrl+H", CMD_REPLACE
  }
 POPUP "??(&H)" {
   MENUITEM "??(&C)",             CMD_HELP_CONTENTS



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Michael Stefaniuc : msvfw32: Add the Romanian translation.
Message-ID: <E1ORSK2-0005H7-LN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d22e3e4324af139c5da9c082a16223c0a444ef58
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d22e3e4324af139c5da9c082a16223c0a444ef58

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Wed Jun 23 13:09:54 2010 +0200

msvfw32: Add the Romanian translation.

Translation by Claudia Cotun?.

---

 dlls/msvfw32/Makefile.in   |    1 +
 dlls/msvfw32/msvfw32_Ro.rc |   57 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in
index 292e345..e431ce5 100644
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@@ -25,6 +25,7 @@ RC_SRCS = \
 	msvfw32_No.rc \
 	msvfw32_Pl.rc \
 	msvfw32_Pt.rc \
+	msvfw32_Ro.rc \
 	msvfw32_Ru.rc \
 	msvfw32_Si.rc \
 	msvfw32_Sv.rc \
diff --git a/dlls/msvfw32/msvfw32_Ro.rc b/dlls/msvfw32/msvfw32_Ro.rc
new file mode 100644
index 0000000..69527b0
--- /dev/null
+++ b/dlls/msvfw32/msvfw32_Ro.rc
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2005 Dmitry Timoshkov
+ * Copyright 2010 Claudia Cotun?
+ *                Michael Stefaniuc
+ *
+ * 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 "msvideo_private.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 200, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Compresie video"
+FONT 8, "MS Shell Dlg"
+{
+    DEFPUSHBUTTON "OK",IDOK,140,2,51,14
+    PUSHBUTTON "Renun??",IDCANCEL,140,18,51,14
+
+    LTEXT "&Compresor:",-1,9,6,105,8
+    COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
+
+    PUSHBUTTON "Con&figurare...",882,140,36,51,14
+    PUSHBUTTON "&Despre...",883,140,52,51,14
+
+    SCROLLBAR 884,9,44,111,9,WS_TABSTOP
+
+    LTEXT "Ca&litatea compresiei:",886,9,34,80,8
+
+    CONTROL "Cadru c&heie la fiecare",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,82,12
+    EDITTEXT 888,93,60,22,12
+    LTEXT "cadre",889,118,62,22,10
+
+    CONTROL "Rata de &date",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,70,12
+    EDITTEXT 895,93,76,22,12
+    LTEXT "KO/sec",896,118,78,22,10
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_FULLFRAMES "Cadre ?ntregi (necomprimate)"
+}



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Hans Leidekker : msi: Avoid a crash when the cabinet file must be
	downloaded.
Message-ID: <E1ORSK2-0005HQ-P0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2c20c35d3ca35e0c516658f22415b83c9c67ece7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2c20c35d3ca35e0c516658f22415b83c9c67ece7

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Jun 23 10:44:26 2010 +0200

msi: Avoid a crash when the cabinet file must be downloaded.

Fixes a regression caused by e5869d5d5c8f01b140ac5fba1044f3c10975612c.

---

 dlls/msi/media.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/media.c b/dlls/msi/media.c
index b455775..6dc262c 100644
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -785,13 +785,17 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi)
     {
         WCHAR temppath[MAX_PATH], *p;
 
-        msi_download_file(cabinet_file, temppath);
+        rc = msi_download_file(cabinet_file, temppath);
+        if (rc != ERROR_SUCCESS)
+        {
+            ERR("Failed to download %s (%u)\n", debugstr_w(cabinet_file), rc);
+            msi_free(cabinet_file);
+            return rc;
+        }
         if ((p = strrchrW(temppath, '\\'))) *p = 0;
-
-        msi_free(mi->sourcedir);
         strcpyW(mi->sourcedir, temppath);
         msi_free(mi->cabinet);
-        strcpyW(mi->cabinet, p + 1);
+        mi->cabinet = strdupW(p + 1);
 
         msi_free(cabinet_file);
         return ERROR_SUCCESS;



From julliard at winehq.org  Wed Jun 23 10:57:06 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:06 -0500
Subject: Dmitry Timoshkov : comctl32: Add a bunch of imagelist storage tests,
	make them pass under Wine.
Message-ID: <E1ORSK2-0005Hi-VE@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1066194f94b59ba4df249e0dcfa9e0da6e4c6f5e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1066194f94b59ba4df249e0dcfa9e0da6e4c6f5e

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Wed Jun 23 17:57:39 2010 +0900

comctl32: Add a bunch of imagelist storage tests, make them pass under Wine.

---

 dlls/comctl32/imagelist.c       |    8 +-
 dlls/comctl32/tests/imagelist.c |  187 +++++++++++++++++++++++++++++++-------
 2 files changed, 156 insertions(+), 39 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=1066194f94b59ba4df249e0dcfa9e0da6e4c6f5e


From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: Jose Rostagno : wineconsole: Fix Spanish translation.
Message-ID: <E1ORSK3-0005Hz-3l@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 05472a934453fa42dbb6c364b430ab67db460769
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=05472a934453fa42dbb6c364b430ab67db460769

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun 22 22:04:46 2010 -0300

wineconsole: Fix Spanish translation.

---

 programs/wineconsole/wineconsole_Es.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/wineconsole/wineconsole_Es.rc b/programs/wineconsole/wineconsole_Es.rc
index da6e1fb..7fd8162 100644
--- a/programs/wineconsole/wineconsole_Es.rc
+++ b/programs/wineconsole/wineconsole_Es.rc
@@ -32,7 +32,7 @@ IDS_MARK,		"&Marcar"
 IDS_COPY,		"&Copiar"
 IDS_PASTE,		"&Pegar"
 IDS_SELECTALL,		"&Seleccionar todo"
-IDS_SCROLL,		"Sc&roll"
+IDS_SCROLL,		"Desplaza&r"
 IDS_SEARCH,		"&Buscar"
 IDS_FNT_DISPLAY,	"Cada caracter tiene %ld p?xeles de ancho por %ld p?xeles de alto"
 IDS_FNT_PREVIEW,	"Esto es una prueba"



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: Jose Rostagno : winecfg: Fix Spanish translation.
Message-ID: <E1ORSK3-0005IG-7j@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2fffa25290f9f67e42cd7c54ea7c9a324eec3a68
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2fffa25290f9f67e42cd7c54ea7c9a324eec3a68

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun 22 22:10:32 2010 -0300

winecfg: Fix Spanish translation.

---

 programs/winecfg/Es.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 0b9a8fa..dcf8e37 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -155,7 +155,7 @@ BEGIN
     COMBOBOX        IDC_COMBO_TYPE,45,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     PUSHBUTTON      "&Mostrar avanzado",IDC_BUTTON_SHOW_HIDE_ADVANCED,166,135,80,13
-    LTEXT           "De&vice:",IDC_STATIC_DEVICE,15,153,26,9
+    LTEXT           "Dispositi&vo:",IDC_STATIC_DEVICE,15,153,26,9
     EDITTEXT        IDC_EDIT_DEVICE,45,150,150,13,ES_AUTOHSCROLL | WS_TABSTOP
     PUSHBUTTON      "E&xaminar...",IDC_BUTTON_BROWSE_DEVICE,200,150,46,13
 



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: Jose Rostagno : start: Fix Spanish translation.
Message-ID: <E1ORSK3-0005IV-9z@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c5af0b87df460ec562bbd1925c2f318e9bc91f8d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c5af0b87df460ec562bbd1925c2f318e9bc91f8d

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun 22 22:16:54 2010 -0300

start: Fix Spanish translation.

---

 programs/start/Es.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/start/Es.rc b/programs/start/Es.rc
index 83881c6..d2f878e 100644
--- a/programs/start/Es.rc
+++ b/programs/start/Es.rc
@@ -65,5 +65,5 @@ Mire el archivo COPYING.LIB para informaci
 
 STRING_EXECFAIL "La aplicaci?n no se pudo ejecutar, o no hay ninguna aplicaci?n asociada con el archivo especificado.\nShellExecuteEx fallido"
 
-STRING_UNIXFAIL "Could not translate the specified Unix filename to a DOS filename."
+STRING_UNIXFAIL "No se pudo traducir el nombre de archivo UNIX especificado a un nombre de archivo de DOS."
 }



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: Jose Rostagno : regedit: Fix Spanish translation.
Message-ID: <E1ORSK3-0005In-Bx@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f3a1e2cf00b4a8544a196525607eec458a3793bc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f3a1e2cf00b4a8544a196525607eec458a3793bc

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Tue Jun 22 22:21:10 2010 -0300

regedit: Fix Spanish translation.

---

 programs/regedit/Es.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/regedit/Es.rc b/programs/regedit/Es.rc
index c6d3f95..3799d37 100644
--- a/programs/regedit/Es.rc
+++ b/programs/regedit/Es.rc
@@ -298,7 +298,7 @@ BEGIN
     IDS_TOO_BIG_VALUE       "El valor es demasiado grande (%u)"
     IDS_DELETE_BOX_TITLE    "Confirmar eliminaci?n de valor"
     IDS_DELETE_BOX_TEXT     "?Seguro que desea eliminar el valor '%s'?"
-    IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?"
+    IDS_DELETE_BOX_TEXT_MULTIPLE "?Est? seguro que desea eliminar estos valores?"
     IDS_NEWKEY              "Nueva clave #%d"
     IDS_NEWVALUE            "Nuevo valor #%d"
     IDS_NOTFOUND            "Cadena de b?squeda '%s' no encontrada"
@@ -307,7 +307,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_FILEDIALOG_IMPORT_TITLE   "Importar archivo de registro"
-    IDS_FILEDIALOG_EXPORT_TITLE   "Exportar arvhivo de registro"
+    IDS_FILEDIALOG_EXPORT_TITLE   "Exportar archivo de registro"
     IDS_FILEDIALOG_FILTER         "Archivos de registro\0*.reg\0Archivos de registro de Win9x/NT4 (REGEDIT4)\0*.reg\0Todos los archivos (*.*)\0*.*\0\0"
 END
 



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: Alessandro Pignotti : winedevice: Use 64-bit wide delta when
	relocating.
Message-ID: <E1ORSK3-0005J4-Dz@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 58f36e863e9d4efe08b620557d2ea93109380cf4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=58f36e863e9d4efe08b620557d2ea93109380cf4

Author: Alessandro Pignotti <a.pignotti at sssup.it>
Date:   Wed Jun 23 13:51:46 2010 +0200

winedevice: Use 64-bit wide delta when relocating.

---

 programs/winedevice/device.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index e0cd07b..2ce8c15 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -67,7 +67,8 @@ static HMODULE load_driver_module( const WCHAR *name )
     IMAGE_NT_HEADERS *nt;
     const IMAGE_IMPORT_DESCRIPTOR *imports;
     size_t page_size = getpagesize();
-    int i, delta;
+    int i;
+    INT_PTR delta;
     ULONG size;
     HMODULE module = LoadLibraryW( name );
 



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: wordpad:
	Update Portuguese translation.
Message-ID: <E1ORSK3-0005JL-GC@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3fbe5d1e044e95c4fa6b793170c430f0b02e47f2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3fbe5d1e044e95c4fa6b793170c430f0b02e47f2

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Wed Jun 23 10:08:27 2010 -0300

wordpad: Update Portuguese translation.

---

 programs/wordpad/Pt.rc |  164 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 149 insertions(+), 15 deletions(-)

diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc
index 3f14049..b7f9c52 100644
--- a/programs/wordpad/Pt.rc
+++ b/programs/wordpad/Pt.rc
@@ -2,6 +2,7 @@
  * Portuguese Language File
  *
  * Copyright 2008 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,81 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDM_MAINMENU MENU DISCARDABLE
+BEGIN
+    POPUP "&Arquivo"
+    BEGIN
+        MENUITEM "&Novo...\tCtrl+N",       ID_FILE_NEW
+        MENUITEM "&Abrir...\tCtrl+O",      ID_FILE_OPEN
+        MENUITEM "&Salvar\tCtrl+S",        ID_FILE_SAVE
+        MENUITEM "Salvar &como...",        ID_FILE_SAVEAS
+        MENUITEM SEPARATOR
+        MENUITEM "&Imprimir...\tCtrl+P",   ID_PRINT
+        MENUITEM "&Pr? visualizar...",     ID_PREVIEW
+        MENUITEM "C&onfigurar p?gina...",  ID_PRINTSETUP
+        MENUITEM SEPARATOR
+        MENUITEM "&Sair",                  ID_FILE_EXIT
+    END
+    POPUP "&Editar"
+    BEGIN
+        MENUITEM "&Desfazer\tCtrl+Z",           ID_EDIT_UNDO
+        MENUITEM "&Refazer\tCtrl+Y",            ID_EDIT_REDO
+        MENUITEM SEPARATOR
+        MENUITEM "Cor&tar\tCtrl+X",             ID_EDIT_CUT
+        MENUITEM "C&opiar\tCtrl+C",             ID_EDIT_COPY
+        MENUITEM "&Colar\tCtrl+V",              ID_EDIT_PASTE
+        MENUITEM "&Limpar\tDEL",                ID_EDIT_CLEAR
+        MENUITEM "&Selecionar tudo\tCtrl+A",    ID_EDIT_SELECTALL
+        MENUITEM SEPARATOR
+        MENUITEM "Locali&zar...\tCtrl+F",       ID_FIND
+        MENUITEM "&Localizar pr?xima\tF3",      ID_FIND_NEXT
+        MENUITEM "Substitui&r...\tCtrl+H",      ID_REPLACE
+        MENUITEM SEPARATOR
+        MENUITEM "Some&nte leitura",            ID_EDIT_READONLY
+        MENUITEM "&Modificado",                 ID_EDIT_MODIFIED
+        MENUITEM SEPARATOR
+        POPUP "E&xtras"
+        BEGIN
+            MENUITEM "&Informa??o da selec??o",           ID_EDIT_SELECTIONINFO
+            MENUITEM "&Formato dos caracteres",           ID_EDIT_CHARFORMAT
+            MENUITEM "&Definir formato dos caracteres",   ID_EDIT_DEFCHARFORMAT
+            MENUITEM "F&ormato dos par?grafos",           ID_EDIT_PARAFORMAT
+            MENUITEM "&Buscar texto",                     ID_EDIT_GETTEXT
+        END
+    END
+    POPUP "E&xibir"
+    BEGIN
+        MENUITEM "&Barra de Ferramentas",    ID_TOGGLE_TOOLBAR
+        MENUITEM "Barra de &Formata??o",     ID_TOGGLE_FORMATBAR
+        MENUITEM "&R?gua",                   ID_TOGGLE_RULER
+        MENUITEM "Barra de &Estado",         ID_TOGGLE_STATUSBAR
+        MENUITEM SEPARATOR
+        MENUITEM "&Op??es...",               ID_VIEWPROPERTIES
+    END
+    POPUP "&Inserir"
+    BEGIN
+        MENUITEM "&Data e hora...",  ID_DATETIME
+    END
+    POPUP "F&ormatar"
+    BEGIN
+        MENUITEM "&Fonte...",       ID_FONTSETTINGS
+        MENUITEM "&Marcadores"      ID_BULLET
+        MENUITEM "&Par?grafo..."    ID_PARAFORMAT
+        MENUITEM "T&abula??o..."    ID_TABSTOPS
+        POPUP "&Fundo"
+        BEGIN
+            MENUITEM "&Sistema\tCtrl+1",            ID_BACK_1
+            MENUITEM "&PostThat amarelo\tCtrl+2",   ID_BACK_2
+        END
+    END
+    POPUP "&Ajuda"
+    BEGIN
+        MENUITEM "&Sobre Wine Wordpad"       ID_ABOUT
+    END
+END
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 IDM_MAINMENU MENU DISCARDABLE
@@ -97,6 +173,24 @@ BEGIN
     END
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDM_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Cortar",         ID_EDIT_CUT
+        MENUITEM "C&opiar",         ID_EDIT_COPY
+        MENUITEM "Co&lar",          ID_EDIT_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "&Marcadores"      ID_BULLET
+        MENUITEM "&Par?grafo..."    ID_PARAFORMAT
+    END
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDM_POPUP MENU DISCARDABLE
 BEGIN
     POPUP ""
@@ -110,6 +204,9 @@ BEGIN
     END
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
 IDM_COLOR_POPUP MENU DISCARDABLE
 BEGIN
     POPUP ""
@@ -130,7 +227,7 @@ BEGIN
         MENUITEM "F?csia"        ID_COLOR_FUCHSIA
         MENUITEM "Azul-piscina"  ID_COLOR_AQUA
         MENUITEM "Branco"        ID_COLOR_WHITE
-        MENUITEM "Automatic"     ID_COLOR_AUTOMATIC
+        MENUITEM "Autom?tico"    ID_COLOR_AUTOMATIC
     END
 END
 
@@ -156,22 +253,22 @@ BEGIN
     PUSHBUTTON   "&Cancelar",IDCANCEL,97,26,40,12
 END
 
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
+IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 220, 110
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 Caption "Par?grafo"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Identa??o", -1, 10, 10, 120, 68
-    LTEXT "Esquerda", -1, 15, 22, 40, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Direita", -1, 15, 40, 40, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "Primeira Linha", -1, 15, 58, 40, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alinhamento", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancelar", IDCANCEL, 137, 33, 50, 15
+    GROUPBOX "Identa??o", -1, 10, 10, 140, 68
+    LTEXT "Esquerda", -1, 15, 22, 60, 13
+    EDITTEXT IDC_PARA_LEFT, 75, 20, 60, 13
+    LTEXT "Direita", -1, 15, 40, 60, 13
+    EDITTEXT IDC_PARA_RIGHT, 75, 38, 60, 13
+    LTEXT "Primeira Linha", -1, 15, 58, 60, 13
+    EDITTEXT IDC_PARA_FIRST, 75, 56, 60, 13
+    LTEXT "Alinhamento", -1, 15, 87, 50, 13
+    COMBOBOX IDC_PARA_ALIGN, 65, 85, 70, 60, CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 157, 15, 50, 15
+    PUSHBUTTON "&Cancelar", IDCANCEL, 157, 33, 50, 15
 END
 
 IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
@@ -207,7 +304,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
     STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
     STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
     STRING_ALL_FILES,              "Todos os documentos (*.*)"
@@ -222,16 +319,29 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
+    STRING_NEWFILE_RICHTEXT,     "Documento rich text"
     STRING_NEWFILE_TXT,          "Documento de texto"
     STRING_NEWFILE_TXT_UNICODE,  "Documento de texto Unicode"
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_PRINTER_FILES_PRN,        "Arquivos de impressora (*.PRN)"
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_PRINTER_FILES_PRN,        "Ficheiros de impressora (*.PRN)"
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_VIEWPROPS_TITLE,          "Op??es"
@@ -257,6 +367,30 @@ BEGIN
     STRING_UNITS_PT,                 "pt"
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_DEFAULT_FILENAME,     "Documento"
+    STRING_PROMPT_SAVE_CHANGES,  "Salvar as altera??es de '%s'?"
+    STRING_SEARCH_FINISHED,      "Acabou a pesquisa do documento."
+    STRING_LOAD_RICHED_FAILED,   "Falha ao carregar a biblioteca RichEdit."
+    STRING_SAVE_LOSEFORMATTING,  "Foi escolhido salvar em formato de texto simples, " \
+                                 "o que vai anular todas as formata??es. " \
+                                 "Tem a certeza que deseja fazer isto?"
+    STRING_INVALID_NUMBER,       "Formato de n?mero inv?lido"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE n?o s?o suportados"
+    STRING_WRITE_FAILED,              "N?o foi poss?vel salvar o arquivo."
+    STRING_WRITE_ACCESS_DENIED,       "N?o tem permiss?es para salvar o arquivo."
+    STRING_OPEN_FAILED,               "N?o foi poss?vel abrir o arquivo."
+    STRING_OPEN_ACCESS_DENIED,        "N?o tem permiss?es para abrir o arquivo."
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Impress?o n?o implementada"
+    STRING_MAX_TAB_STOPS,             "N?o ? poss?vel adicionar mais de 32 tabula??es."
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_DEFAULT_FILENAME,     "Documento"



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: browseui:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1ORSK3-0005Jc-Hs@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a7297802b830ebad34339d690d052e143a6e4f8c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a7297802b830ebad34339d690d052e143a6e4f8c

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Wed Jun 23 10:18:10 2010 -0300

browseui: Update Portuguese (Brazilian) translation.

---

 dlls/browseui/rsrc_Pt.rc |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/dlls/browseui/rsrc_Pt.rc b/dlls/browseui/rsrc_Pt.rc
index fe07405..5320424 100644
--- a/dlls/browseui/rsrc_Pt.rc
+++ b/dlls/browseui/rsrc_Pt.rc
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,13 +19,23 @@
 
 #include "resids.h"
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE
+{
+    IDS_CANCELLING    "Cancelando..."
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE
 {
     IDS_CANCELLING    "A cancelar..."
 }
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
 IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
 CAPTION ""



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: Misha Koshelev : include: Include d3dx9shape.h in d3dx9.h.
Message-ID: <E1ORSK3-0005Jt-Jz@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6882287b97cf9401e5a5eee032bb4bf26e904ba7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6882287b97cf9401e5a5eee032bb4bf26e904ba7

Author: Misha Koshelev <misha680 at gmail.com>
Date:   Tue Jun 22 22:56:23 2010 -0500

include: Include d3dx9shape.h in d3dx9.h.

---

 include/d3dx9.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/d3dx9.h b/include/d3dx9.h
index ccf731e..09ae553 100644
--- a/include/d3dx9.h
+++ b/include/d3dx9.h
@@ -33,6 +33,7 @@
 #include "d3dx9mesh.h"
 #include "d3dx9shader.h"
 #include "d3dx9effect.h"
+#include "d3dx9shape.h"
 #include "d3dx9tex.h"
 
 #define _FACDD 0x876



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winetest: Implement aborting.
Message-ID: <E1ORSK3-0005KA-Ma@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bee78503449c4175e4e2731dc70cecbfd3d6ea15
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bee78503449c4175e4e2731dc70cecbfd3d6ea15

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 22 19:36:08 2010 +0200

winetest: Implement aborting.

---

 programs/winetest/gui.c      |    3 ++-
 programs/winetest/main.c     |   11 +++++++++++
 programs/winetest/winetest.h |    1 +
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c
index 45b3232..a9f3465 100644
--- a/programs/winetest/gui.c
+++ b/programs/winetest/gui.c
@@ -456,7 +456,8 @@ DlgProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                        MAKEINTRESOURCE (IDD_ABOUT), hwnd, AboutProc);
             return TRUE;
         case IDABORT:
-            report (R_WARNING, "Not implemented");
+            report (R_STATUS, "Aborting, please wait...");
+            aborting = TRUE;
             return TRUE;
         }
     }
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 01217d2..f5bf8d4 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -49,6 +49,7 @@ struct wine_test
 
 char *tag = NULL;
 char *email = NULL;
+BOOL aborting = FALSE;
 static struct wine_test *wine_tests;
 static int nr_of_files, nr_of_tests;
 static int nr_native_dlls;
@@ -677,6 +678,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType,
     HMODULE dll;
     DWORD err;
 
+    if (aborting) return TRUE;
     if (test_filtered_out( lpszName, NULL )) return TRUE;
 
     /* Check if the main dll is present on this system */
@@ -840,6 +842,8 @@ run_tests (char *logname, char *outdir)
 
     FreeLibrary(hmscoree);
 
+    if (aborting) return logname;
+
     xprintf ("Test output:\n" );
 
     report (R_DELTA, 0, "Extracting: Done");
@@ -853,12 +857,15 @@ run_tests (char *logname, char *outdir)
         struct wine_test *test = wine_tests + i;
         int j;
 
+        if (aborting) break;
+
         if (test->maindllpath) {
             /* We need to add the path (to the main dll) to PATH */
             append_path(test->maindllpath);
         }
 
 	for (j = 0; j < test->subtest_count; j++) {
+            if (aborting) break;
             report (R_STEP, "Running: %s:%s", test->name,
                     test->subtests[j]);
 	    run_test (test, test->subtests[j], logfile, tempdir);
@@ -1105,6 +1112,10 @@ int main( int argc, char *argv[] )
 
         if (!logname) {
             logname = run_tests (NULL, outdir);
+            if (aborting) {
+                DeleteFileA(logname);
+                exit (0);
+            }
             if (build_id[0] && !nb_filters && !nr_native_dlls &&
                 report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES)
                 if (!send_file (logname) && !DeleteFileA(logname))
diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h
index a0d2fbd..2b9046c 100644
--- a/programs/winetest/winetest.h
+++ b/programs/winetest/winetest.h
@@ -69,6 +69,7 @@ enum report_type {
 #define MAXTAGLEN 20
 extern char *tag;
 extern char *email;
+extern BOOL aborting;
 int guiAskTag (void);
 int guiAskEmail (void);
 int report (enum report_type t, ...);



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: =?UTF-8?Q?J=C3=B6rg=20H=C3=B6hle=20?=: winealsa: Only linear PCM is
	supported.
Message-ID: <E1ORSK3-0005KT-P4@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3d94ea821500da21c711446ddc906dd8a284edc1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3d94ea821500da21c711446ddc906dd8a284edc1

Author: J?rg H?hle <hoehle at users.sourceforge.net>
Date:   Tue Jun 22 06:51:18 2010 +0200

winealsa: Only linear PCM is supported.

---

 dlls/winealsa.drv/alsa.c    |   15 ---------------
 dlls/winealsa.drv/waveout.c |   12 ------------
 2 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 5ebb8b7..b242cfa 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -358,10 +358,6 @@ void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2)
         iLength = sizeof(WAVEFORMATPCMEX);
     else
         iLength = sizeof(WAVEFORMATEX) + wf1->cbSize;
-    if (iLength > sizeof(WAVEFORMATPCMEX)) {
-        ERR("calculated %u bytes, capping\n", iLength);
-        iLength = sizeof(WAVEFORMATPCMEX);
-    }
     memcpy(wf2, wf1, iLength);
 }
 
@@ -395,17 +391,6 @@ BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf)
         } else
             WARN("only KSDATAFORMAT_SUBTYPE_PCM and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT "
                  "supported\n");
-    } else if (wf->wFormatTag == WAVE_FORMAT_MULAW || wf->wFormatTag == WAVE_FORMAT_ALAW) {
-        if (wf->wBitsPerSample==8)
-            return TRUE;
-        else
-            ERR("WAVE_FORMAT_MULAW and WAVE_FORMAT_ALAW wBitsPerSample must = 8\n");
-
-    } else if (wf->wFormatTag == WAVE_FORMAT_ADPCM) {
-        if (wf->wBitsPerSample==4)
-            return TRUE;
-        else
-            ERR("WAVE_FORMAT_ADPCM wBitsPerSample must = 4\n");
     } else
         WARN("only WAVE_FORMAT_PCM and WAVE_FORMAT_EXTENSIBLE supported\n");
 
diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index 18693c1..6ab1515 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -716,18 +716,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
     } else if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) &&
         IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){
         format = (wwo->format.Format.wBitsPerSample == 32) ? SND_PCM_FORMAT_FLOAT_LE : -1;
-    } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_MULAW) {
-        FIXME("unimplemented format: WAVE_FORMAT_MULAW\n");
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
-    } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_ALAW) {
-        FIXME("unimplemented format: WAVE_FORMAT_ALAW\n");
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
-    } else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_ADPCM) {
-        FIXME("unimplemented format: WAVE_FORMAT_ADPCM\n");
-        retcode = WAVERR_BADFORMAT;
-        goto errexit;
     } else {
         ERR("invalid format: %0x04x\n", wwo->format.Format.wFormatTag);
         retcode = WAVERR_BADFORMAT;



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: =?UTF-8?Q?J=C3=B6rg=20H=C3=B6hle=20?=: mmsystem: Handle
	WAVE_FORMAT_QUERY case.
Message-ID: <E1ORSK3-0005Kk-Rr@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 64742c99fc7b2e250f6c97106ed23344ca308508
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=64742c99fc7b2e250f6c97106ed23344ca308508

Author: J?rg H?hle <hoehle at users.sourceforge.net>
Date:   Wed Jun 23 06:57:57 2010 +0200

mmsystem: Handle WAVE_FORMAT_QUERY case.

---

 dlls/mmsystem.dll16/mmsystem.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c
index e9f2b3a..1109ef4 100644
--- a/dlls/mmsystem.dll16/mmsystem.c
+++ b/dlls/mmsystem.dll16/mmsystem.c
@@ -1257,11 +1257,10 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID,
     ret = waveOutOpen(&hWaveOut, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID,
                       lpFormat, (DWORD)thunk, dwInstance, dwFlags);
 
-    if (ret == MMSYSERR_NOERROR)
-    {
-        if (lphWaveOut != NULL) *lphWaveOut = HWAVEOUT_16(hWaveOut);
-        MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut);
-    }
+    if (lphWaveOut != NULL && ret == MMSYSERR_NOERROR)
+       *lphWaveOut = HWAVEOUT_16(hWaveOut);
+    if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY))
+         MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut);
     else MMSYSTDRV_DeleteThunk(thunk);
     return ret;
 }
@@ -1550,11 +1549,10 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID,
     ret = waveInOpen(&hWaveIn, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID,
                      lpFormat, (DWORD)thunk, dwInstance, dwFlags);
 
-    if (ret == MMSYSERR_NOERROR)
-    {
-        if (lphWaveIn != NULL) *lphWaveIn = HWAVEIN_16(hWaveIn);
-        MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn);
-    }
+    if (lphWaveIn != NULL && ret == MMSYSERR_NOERROR)
+       *lphWaveIn = HWAVEIN_16(hWaveIn);
+    if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY))
+         MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn);
     else MMSYSTDRV_DeleteThunk(thunk);
     return ret;
 }



From julliard at winehq.org  Wed Jun 23 10:57:07 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:07 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: appwiz.cpl:
	Update Portuguese translation.
Message-ID: <E1ORSK3-0005L1-Td@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7b7672056f28a3eb25f5a941d6f173f06282b19c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7b7672056f28a3eb25f5a941d6f173f06282b19c

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Wed Jun 23 10:43:15 2010 -0300

appwiz.cpl: Update Portuguese translation.

---

 dlls/appwiz.cpl/Pt.rc |   75 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 1 deletions(-)

diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc
index cf013cf..87d50a4 100644
--- a/dlls/appwiz.cpl/Pt.rc
+++ b/dlls/appwiz.cpl/Pt.rc
@@ -2,6 +2,7 @@
 * Add/Remove Programs Portuguese resources
 *
 * Copyright 2001-2002, 2008 Ricardo Filipe
+* Copyright 2010 Gustavo Henrique Milar?
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -23,6 +24,26 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE
+{
+   IDS_CPL_TITLE, "Adicionar/Remover Programas"
+   IDS_CPL_DESC, "Permite a instala??o de novo software, ou a remo??o de software existente no seu computador."
+   IDS_TAB1_TITLE, "Aplicativos"
+
+   IDS_UNINSTALL_FAILED, "N?o foi poss?vel executar o desinstalador, '%s'. Deseja remover do registo a entrada de desinstala??o para este programa?"
+   IDS_NOT_SPECIFIED, "N?o especificado"
+
+   IDS_COLUMN_NAME, "Nome"
+   IDS_COLUMN_PUBLISHER, "Editor"
+   IDS_COLUMN_VERSION, "Vers?o"
+   IDS_INSTALL_FILTER, "Programas de Instala??o\0*instal*.exe;*setup*.exe;*.msi\0Programas (*.exe)\0*.exe\0Todos os arquivos (*.*)\0*.*\0\0"
+
+   IDS_REMOVE, "&Remover..."
+   IDS_MODIFY_REMOVE, "&Modificar/Remover..."
+}
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE
@@ -43,6 +64,28 @@ STRINGTABLE
    IDS_MODIFY_REMOVE, "&Modificar/Remover..."
 }
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_MAIN DIALOG 0, 0, 320, 220
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalar/Desinstalar"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "Para instalar um programa novo a partir de uma disquete, CD-ROM ou do seu disco r?gido, clique em Instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20
+ CONTROL "&Instalar...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14
+ CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1
+ CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20
+ CONTROL "O software seguinte pode ser automaticamente removido. Para remover um programa ou modificar os seus componentes instalados selecione-o na lista e clique em Adicionar/Remover.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30
+ CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100
+ CONTROL "&Informa??o de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 198, 94, 14
+ CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14
+ CONTROL "&Remover...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14
+ CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDD_MAIN DIALOG 0, 0, 320, 220
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalar/Desinstalar"
@@ -54,12 +97,42 @@ FONT 8, "MS Shell Dlg"
  CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20
  CONTROL "O software seguinte pode ser automaticamente removido. Para remover um programa ou modificar os seus componentes instalados seleccione-o da lista e clique em Adicionar/Remover.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30
  CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100
- CONTROL "&Informa??o de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14
+ CONTROL "&Informa??o de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 198, 94, 14
  CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14
  CONTROL "&Remover...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14
  CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20
 }
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_INFO DIALOG 0, 0, 256, 138
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Informa??o de Suporte"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14
+ CONTROL "A informa??o seguinte pode ser usada para obter suporte t?cnico para %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19
+ CONTROL "Editor:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8
+ CONTROL "Vers?o:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8
+ CONTROL "Contato:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8
+ CONTROL "Informa??o de Suporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8
+ CONTROL "Telefone de Suporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8
+ CONTROL "Leia-me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8
+ CONTROL "Atualiza??es de Produto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8
+ CONTROL "Coment?rios:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8
+ CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8
+ CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8
+ CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8
+ CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8
+ CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8
+ CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8
+ CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8
+ CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDD_INFO DIALOG 0, 0, 256, 138
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Informa??o de Suporte"



From julliard at winehq.org  Wed Jun 23 10:57:08 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:08 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: notepad:
	Fix Portuguese translation.
Message-ID: <E1ORSK4-0005LK-0n@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7fe7bd550873a712985487cac2c22d7044d792ab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7fe7bd550873a712985487cac2c22d7044d792ab

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Wed Jun 23 11:23:32 2010 -0300

notepad: Fix Portuguese translation.

---

 programs/notepad/Pt.rc |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc
index a9f244a..959ff51 100644
--- a/programs/notepad/Pt.rc
+++ b/programs/notepad/Pt.rc
@@ -6,6 +6,7 @@
  * Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
  * Copyright 2003 Marcelo Duarte
  * Copyright 2004 Am?rico Jos? Melo
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -124,16 +125,16 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Configurar p?gina"
 {
-LTEXT    "&Cabe?alho (mm):",  0x140,  10, 07, 40, 15
+LTEXT    "&Cabe?alho:",  0x140,  10, 07, 40, 15
 EDITTEXT IDC_PAGESETUP_HEADERVALUE,   60, 05,110, 12, WS_BORDER | WS_TABSTOP
 LTEXT    "&Rodap?:",  0x142,   10, 24, 40, 15
 EDITTEXT IDC_PAGESETUP_FOOTERVALUE,   60, 22,110, 12, WS_BORDER | WS_TABSTOP
 
-GROUPBOX "&Margens:",      0x144,     10, 43,160, 45
-LTEXT    "&Esquerda:",        0x145,   20, 55, 30, 10, WS_CHILD
-EDITTEXT IDC_PAGESETUP_LEFTVALUE,     50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-LTEXT    "&Superior:",         0x148,    20, 73, 30, 10, WS_CHILD
-EDITTEXT IDC_PAGESETUP_TOPVALUE,      50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
+GROUPBOX "&Margens (mil?metros):",      0x144,     10, 43,160, 45
+LTEXT    "&Esquerda:",        0x145,   20, 55, 35, 10, WS_CHILD
+EDITTEXT IDC_PAGESETUP_LEFTVALUE,     55, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
+LTEXT    "&Superior:",         0x148,    20, 73, 35, 10, WS_CHILD
+EDITTEXT IDC_PAGESETUP_TOPVALUE,      55, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 LTEXT    "&Direita:",       0x14B, 100, 55, 30, 10, WS_CHILD
 EDITTEXT IDC_PAGESETUP_RIGHTVALUE,   130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 LTEXT    "&Inferior:",      0x14E,100, 73, 30, 10, WS_CHILD
@@ -176,10 +177,10 @@ STRING_NOTEXT,					"Voc? n?o digitou nenhum texto. \
 STRING_DOESNOTEXIST,				"Arquivo '%s'\nn?o existe\n\n \
 Voc? deseja criar um novo arquivo?"
 STRING_NOTSAVED,				"Arquivo '%s'\nfoi modificado\n\n \
-Gostaria de salvar as altera??es?"
+Gostaria de salvar as altera??es?"
 STRING_NOTFOUND,					"'%s' n?o pode ser encontrado."
 STRING_OUT_OF_MEMORY,			"N?o h? mem?ria suficiente para completar essa \
-tarefa.\nFeche uma ou mais aplica??es para aumentar a quantidade de mem?ria livre."
+tarefa.\nFeche um ou mais aplicativos para aumentar a quantidade de mem?ria livre."
 }
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
@@ -206,7 +207,7 @@ STRINGTABLE DISCARDABLE
  STRING_DOESNOTEXIST,		"Ficheiro '%s'\nn?o existe\n\n \
 Deseja criar um novo ficheiro?"
  STRING_NOTSAVED,		"Ficheiro '%s'\nfoi modificado\n\n \
-Gostaria de gravar as altera??es?"
+Gostaria de gravar as altera??es?"
  STRING_NOTFOUND,		"'%s' n?o pode ser encontrado."
  STRING_OUT_OF_MEMORY,		"N?o h? mem?ria suficiente para completar esta \
 tarefa.\nFeche uma ou mais aplica??es para aumentar a quantidade de mem?ria livre."



From julliard at winehq.org  Wed Jun 23 10:57:08 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:08 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: credui:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1ORSK4-0005La-3N@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b5e8c5a6e1f9049c620a3f650df99c2e7f8d7719
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b5e8c5a6e1f9049c620a3f650df99c2e7f8d7719

Author: Gustavo Henrique Milar?? <gugamilare at gmail.com>
Date:   Wed Jun 23 11:58:42 2010 -0300

credui: Update Portuguese (Brazilian) translation.

---

 dlls/credui/credui_Pt.rc |   43 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/dlls/credui/credui_Pt.rc b/dlls/credui/credui_Pt.rc
index 2283e43..b4f4797 100644
--- a/dlls/credui/credui_Pt.rc
+++ b/dlls/credui/credui_Pt.rc
@@ -2,6 +2,7 @@
  * Portuguese language resource file for Credentials UI
  *
  * Copyright 2008 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar??
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +21,30 @@
 
 #include "credui_resources.h"
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_CREDDIALOG DIALOG DISCARDABLE  0, 0, 213, 149
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "IDS_TITLEFORMAT"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0,
+                    0,213,37
+    LTEXT           "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP
+    LTEXT           "Nome de &usu??rio:",-1,8,62,72,12,SS_CENTERIMAGE
+    CONTROL         "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN |
+                    CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87
+    LTEXT           "&Senha:",-1,8,80,72,12,SS_CENTERIMAGE
+    EDITTEXT        IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "&Lembrar a senha",IDC_SAVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12
+    DEFPUSHBUTTON   "OK",IDOK,97,128,50,14
+    PUSHBUTTON      "Cancelar",IDCANCEL,156,128,50,14
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 IDD_CREDDIALOG DIALOG DISCARDABLE  0, 0, 213, 149
 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -41,12 +65,27 @@ BEGIN
     PUSHBUTTON      "Cancelar",IDCANCEL,156,128,50,14
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TITLEFORMAT     "Conectar a %s"
+    IDS_MESSAGEFORMAT   "Conectando a %s"
+    IDS_INCORRECTPASSWORDTITLE  "Logon mal sucedido"
+    IDS_INCORRECTPASSWORD       "Certifique-se de que nome de usu??rio\ne senha est??o corretos."
+    IDS_CAPSLOCKONTITLE "Caps Lock ligado"
+    IDS_CAPSLOCKON      "Ter o Caps Lock ligado pode provocar a introdu????o incorreta da sua senha.\n\nPressione a tecla Caps Lock no seu teclado para desligar o Caps Lock antes\nde introduzir a senha."
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 STRINGTABLE DISCARDABLE
 {
     IDS_TITLEFORMAT     "Ligar a %s"
     IDS_MESSAGEFORMAT   "A ligar a %s"
     IDS_INCORRECTPASSWORDTITLE  "Logon mal sucedido"
-    IDS_INCORRECTPASSWORD       "Verifique que o seu nome de utilizador\ne password est?o correctos."
+    IDS_INCORRECTPASSWORD       "Verifique que o seu nome de utilizador\ne password est??o correctos."
     IDS_CAPSLOCKONTITLE "Caps Lock ligado"
     IDS_CAPSLOCKON      "Tendo o Caps Lock ligado pode provocar que introduza a sua password incorrectamente.\n\nPressione a tecla Caps Lock no seu teclado para desligar o Caps Lock antes\nde introduzir a password."
 }



From julliard at winehq.org  Wed Jun 23 10:57:08 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 23 Jun 2010 10:57:08 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: avifil32:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1ORSK4-0005Lt-9r@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 410f8e9128763b36e40a08a7379f1b70c5a8d7dd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=410f8e9128763b36e40a08a7379f1b70c5a8d7dd

Author: Gustavo Henrique Milar?? <gugamilare at gmail.com>
Date:   Wed Jun 23 11:57:25 2010 -0300

avifil32: Update Portuguese (Brazilian) translation.

---

 dlls/avifil32/avifile_Pt.rc |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/dlls/avifil32/avifile_Pt.rc b/dlls/avifil32/avifile_Pt.rc
index ce3d032..9ef3abf 100644
--- a/dlls/avifil32/avifile_Pt.rc
+++ b/dlls/avifil32/avifile_Pt.rc
@@ -1,6 +1,7 @@
 /*
  * Copyright 2003 Marcelo Duarte
- * Copyright 2006 Am?rico Jos? Melo
+ * Copyright 2006 Am??rico Jos?? Melo
+ * Copyright 2010 Gustavo Henrique Milar??
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,20 +20,22 @@
 
 #include "avifile_private.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Op??es de compress?o"
+CAPTION "Op????es de compress??o"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Escolha a stream:",-1,2,5,154,10
     COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Op??es...",IDC_OPTIONS,170,17,50,14
-    AUTOCHECKBOX    "&Interleave every",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    PUSHBUTTON      "&Op????es...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Entrela??ar todos",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
     EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
-    LTEXT           "frames",-1,129,43,36,9
+    LTEXT           "quadros",-1,129,43,36,9
     LTEXT           "Formato atual:",-1,3,56,73,9
     LTEXT           "This space for rent",IDC_FORMATTEXT,75,56,90,26
     DEFPUSHBUTTON   "OK",IDOK,170,42,50,14
@@ -43,14 +46,14 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 IDD_SAVEOPTIONS DIALOG FIXED IMPURE  43, 37, 226, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Op??es de compress?o"
+CAPTION "Op????es de compress??o"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Escolha a stream:",-1,2,5,154,10
     COMBOBOX        IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
-    PUSHBUTTON      "&Op??es...",IDC_OPTIONS,170,17,50,14
-    AUTOCHECKBOX    "&Interla?ar a todos os",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
+    PUSHBUTTON      "&Op????es...",IDC_OPTIONS,170,17,50,14
+    AUTOCHECKBOX    "&Interla??ar a todos os",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP
     EDITTEXT        IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL
     LTEXT           "molduras",-1,129,43,36,9
     LTEXT           "Formato actual:",-1,3,56,73,9
@@ -66,13 +69,13 @@ STRINGTABLE DISCARDABLE
 {
   IDS_WAVESTREAMFORMAT	"Formato wave: %s"
   IDS_WAVEFILETYPE	"Formato wave"
-  IDS_ALLMULTIMEDIA	"Todos arquivos multim?dia"
+  IDS_ALLMULTIMEDIA	"Todos arquivos multim??dia"
   IDS_ALLFILES		"Todos os arquivos (*.*)@*.*"
-  IDS_VIDEO		"v?deo"
-  IDS_AUDIO		"?udio"
+  IDS_VIDEO		"v??deo"
+  IDS_AUDIO		"??udio"
   IDS_AVISTREAMFORMAT	"%s %s #%d"
-  IDS_AVIFILETYPE	"Wine AVI-manipulador padr?o de arquivo"
-  IDS_UNCOMPRESSED      "sem compress?o"
+  IDS_AVIFILETYPE	"Manipulador de AVI padr??o do Wine"
+  IDS_UNCOMPRESSED      "sem compress??o"
 }
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
@@ -81,11 +84,11 @@ STRINGTABLE DISCARDABLE
 {
   IDS_WAVESTREAMFORMAT	"Formato wave: %s"
   IDS_WAVEFILETYPE	"Formato wave"
-  IDS_ALLMULTIMEDIA	"Todos os ficheiros multim?dia"
+  IDS_ALLMULTIMEDIA	"Todos os ficheiros multim??dia"
   IDS_ALLFILES		"Todos os ficheiros (*.*)@*.*"
-  IDS_VIDEO		"v?deo"
-  IDS_AUDIO		"?udio"
+  IDS_VIDEO		"v??deo"
+  IDS_AUDIO		"??udio"
   IDS_AVISTREAMFORMAT	"%s %s #%d"
   IDS_AVIFILETYPE	"Manipulador AVI Wine predefinido"
-  IDS_UNCOMPRESSED      "sem compress?o"
+  IDS_UNCOMPRESSED      "sem compress??o"
 }



From julliard at winehq.org  Thu Jun 24 11:15:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:20 -0500
Subject: Eric Pouech : mmsystem.drv: Always create a thunk for MMIO objects.
Message-ID: <E1ORp5E-00074c-ST@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dfcaf61de87007eeaa9eba8476f26642824df8fe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dfcaf61de87007eeaa9eba8476f26642824df8fe

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Wed Jun 23 22:11:51 2010 +0200

mmsystem.drv: Always create a thunk for MMIO objects.

---

 dlls/mmsystem.dll16/mmio16.c |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c
index cc13583..ff55ce9 100644
--- a/dlls/mmsystem.dll16/mmio16.c
+++ b/dlls/mmsystem.dll16/mmio16.c
@@ -248,7 +248,7 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16* lpmmioinfo16,
 	memset(&mmioinfo, 0, sizeof(mmioinfo));
 
         EnterCriticalSection(&mmio_cs);
-        if (lpmmioinfo16->pIOProc && !(thunk = MMIO_AddThunk(lpmmioinfo16->pIOProc, lpmmioinfo16->pchBuffer)))
+        if (!(thunk = MMIO_AddThunk(lpmmioinfo16->pIOProc, lpmmioinfo16->pchBuffer)))
         {
             LeaveCriticalSection(&mmio_cs);
             return 0;
@@ -256,7 +256,7 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16* lpmmioinfo16,
 
 	mmioinfo.dwFlags     = lpmmioinfo16->dwFlags;
 	mmioinfo.fccIOProc   = lpmmioinfo16->fccIOProc;
-	mmioinfo.pIOProc     = (LPMMIOPROC)thunk;
+	mmioinfo.pIOProc     = lpmmioinfo16->pIOProc ? (LPMMIOPROC)thunk : 0;
 	mmioinfo.cchBuffer   = lpmmioinfo16->cchBuffer;
 	mmioinfo.pchBuffer   = MapSL((DWORD)lpmmioinfo16->pchBuffer);
         mmioinfo.adwInfo[0]  = lpmmioinfo16->adwInfo[0];
@@ -267,14 +267,19 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16* lpmmioinfo16,
 	mmioinfo.adwInfo[2]  = lpmmioinfo16->adwInfo[2];
 
 	ret = mmioOpenA(szFileName, &mmioinfo, dwOpenFlags);
-        if (thunk)
+        if (!ret || (dwOpenFlags & (MMIO_PARSE|MMIO_EXIST)))
         {
-            if (!ret || (dwOpenFlags & (MMIO_PARSE|MMIO_EXIST)))
-            {
-                thunk->pfn16 = NULL;
-                thunk->hMmio = NULL;
-            }
-            else thunk->hMmio = ret;
+            thunk->pfn16 = NULL;
+            thunk->hMmio = NULL;
+        }
+        else thunk->hMmio = ret;
+        if (ret && (dwOpenFlags & MMIO_ALLOCBUF))
+        {
+            MMIOINFO    m;
+            if (lpmmioinfo16->pchBuffer) FIXME("ooch\n");
+            /* FIXME: check whether mmioOpen should set pchBuffer */
+            mmioGetInfo(ret, &m, 0);
+            thunk->segbuffer = MapLS(m.pchBuffer);
         }
         LeaveCriticalSection(&mmio_cs);
 



From julliard at winehq.org  Thu Jun 24 11:15:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:20 -0500
Subject: Nikolay Sivov : msxml3/tests: A test to show difference in XPath and
	XSLPattern for node position.
Message-ID: <E1ORp5E-00074s-Uy@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 89a00ec3ac6e78bb2a5d55a421c71745741eddd4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=89a00ec3ac6e78bb2a5d55a421c71745741eddd4

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Jun 24 00:33:37 2010 +0400

msxml3/tests: A test to show difference in XPath and XSLPattern for node position.

---

 dlls/msxml3/tests/domdoc.c |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index d85e9fb..9c1440c 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -2969,6 +2969,8 @@ static void test_XPath(void)
     expect_list_and_release(list, "");
     ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("//elem[4]"), &list));
     expect_list_and_release(list, "");
+    ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//elem[0]"), &list));
+    expect_list_and_release(list, "");
 
     /* foo undeclared in document node */
     ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL);
@@ -5524,6 +5526,38 @@ static void test_document_IObjectSafety(void)
     IXMLDOMDocument_Release(doc);
 }
 
+static void test_XSLPattern(void)
+{
+    IXMLDOMDocument2 *doc;
+    IXMLDOMNodeList *list;
+    VARIANT_BOOL b;
+    HRESULT r;
+    LONG len;
+
+    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
+        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void**)&doc );
+    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
+    if( r != S_OK )
+        return;
+
+    ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b));
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    /* switch to XPath */
+    ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern")));
+
+    /* for XSLPattern start index is 0, for XPath it's 1 */
+    ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//elem[0]"), &list));
+    len = 0;
+    ole_check(IXMLDOMNodeList_get_length(list, &len));
+    todo_wine ok(len != 0, "expected filled list\n");
+    if (len)
+        todo_wine expect_list_and_release(list, "E1.E2.D1");
+
+    IXMLDOMDocument2_Release(doc);
+    free_bstrs();
+}
+
 START_TEST(domdoc)
 {
     IXMLDOMDocument *doc;
@@ -5552,6 +5586,7 @@ START_TEST(domdoc)
         test_removeNamedItem();
         test_IXMLDOMDocument2();
         test_XPath();
+        test_XSLPattern();
         test_cloneNode();
         test_xmlTypes();
         test_nodeTypeTests();



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: wordpad:
	Fix Portuguese translation.
Message-ID: <E1ORp5F-000759-1f@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 49c685e43afb0535923dfcf415d661e2c49adfa7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=49c685e43afb0535923dfcf415d661e2c49adfa7

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Wed Jun 23 16:16:56 2010 -0300

wordpad: Fix Portuguese translation.

---

 programs/wordpad/Pt.rc |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc
index b7f9c52..2bc44fe 100644
--- a/programs/wordpad/Pt.rc
+++ b/programs/wordpad/Pt.rc
@@ -310,33 +310,33 @@ BEGIN
     STRING_ALL_FILES,              "Todos os documentos (*.*)"
 END
 
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Esquerda"
-    STRING_ALIGN_RIGHT,           "Direita"
-    STRING_ALIGN_CENTER,          "Centro"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Documento rich text"
-    STRING_NEWFILE_TXT,          "Documento de texto"
-    STRING_NEWFILE_TXT_UNICODE,  "Documento de texto Unicode"
-END
-
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_PRINTER_FILES_PRN,        "Arquivos de impressora (*.PRN)"
+    STRING_ALL_FILES,              "Todos os documentos (*.*)"
+    STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "Documento rich text"
+    STRING_NEWFILE_TXT,            "Documento de texto"
+    STRING_NEWFILE_TXT_UNICODE,    "Documento de texto Unicode"
+    STRING_PRINTER_FILES_PRN,      "Arquivos de impressora (*.PRN)"
 END
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_PRINTER_FILES_PRN,        "Ficheiros de impressora (*.PRN)"
+    STRING_ALL_FILES,              "Todos os documentos (*.*)"
+    STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "Documento rich text"
+    STRING_NEWFILE_TXT,            "Documento de texto"
+    STRING_NEWFILE_TXT_UNICODE,    "Documento de texto Unicode"
+    STRING_PRINTER_FILES_PRN,      "Ficheiros de impressora (*.PRN)"
 END
 
 
@@ -344,6 +344,13 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    STRING_ALIGN_LEFT,            "Esquerda"
+    STRING_ALIGN_RIGHT,           "Direita"
+    STRING_ALIGN_CENTER,          "Centro"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
     STRING_VIEWPROPS_TITLE,          "Op??es"
     STRING_VIEWPROPS_TEXT,           "Texto"
     STRING_VIEWPROPS_RICHTEXT,       "Rich text"



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: Michael Stefaniuc : oledlg: Add the Romanian translation.
Message-ID: <E1ORp5F-00075P-47@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 756df72a04e45d392adb75ae157727e4cf645844
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=756df72a04e45d392adb75ae157727e4cf645844

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Thu Jun 24 00:01:00 2010 +0200

oledlg: Add the Romanian translation.

Translation by Claudia Cotun?, reviewed by Alexandru B?lu?.

---

 dlls/oledlg/Makefile.in  |    1 +
 dlls/oledlg/oledlg_Ro.rc |  101 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 0 deletions(-)

diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 6f9a3bf..70648f3 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -27,6 +27,7 @@ RC_SRCS = \
 	oledlg_No.rc \
 	oledlg_Pl.rc \
 	oledlg_Pt.rc \
+	oledlg_Ro.rc \
 	oledlg_Ru.rc \
 	oledlg_Si.rc \
 	oledlg_Sv.rc \
diff --git a/dlls/oledlg/oledlg_Ro.rc b/dlls/oledlg/oledlg_Ro.rc
new file mode 100644
index 0000000..8ffa714
--- /dev/null
+++ b/dlls/oledlg/oledlg_Ro.rc
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2003 Ulrich Czekalla for CodeWeavers
+ * Copyright 2010 Claudia Cotun?
+ *                Michael Stefaniuc
+ *
+ * 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 "resource.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 314, 151
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Inserare obiect"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
+                    LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
+                    WS_TABSTOP
+    LTEXT           "Tipul obiectului:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
+    DEFPUSHBUTTON   "OK",IDOK,221,7,66,14
+    PUSHBUTTON      "Renun??",IDCANCEL,221,24,66,14
+    GROUPBOX        "Rezultat",IDC_RESULT,7,103,208,41
+    CONTROL         "Creeaz? nou",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON |
+                    WS_GROUP,7,20,67,10
+    CONTROL         "Creeaz? un control",IDC_CREATECONTROL,"Button",
+                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,74,10
+    CONTROL         "Creeaz? din fi?ier",IDC_CREATEFROMFILE,"Button",
+                    BS_AUTORADIOBUTTON,7,37,67,10
+    LTEXT           "",IDC_RESULTDESC,49,112,159,23
+    PUSHBUTTON      "&Ad?ug? un control...",IDC_ADDCONTROL,82,88,72,14,NOT WS_VISIBLE
+    CONTROL         "Afi?eaz? ca pictogram?",IDC_ASICON,"Button",BS_AUTOCHECKBOX |
+                    WS_TABSTOP | NOT WS_VISIBLE,223,58,86,10
+    PUSHBUTTON      "Navigare...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
+    LTEXT           "Fi?ier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE
+    EDITTEXT        IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE
+END
+
+STRINGTABLE DISCARDABLE
+{
+  IDS_RESULTOBJDESC     "Insera?i un nou obiect %s ?n document"
+  IDS_RESULTFILEOBJDESC "Insera?i con?inutul fi?ierului ca pe un obiect ?n document, astfel ?nc?t s? ?l pute?i activa utiliz?nd programul care l-a creat."
+  IDS_BROWSE            "Navigare"
+  IDS_NOTOLEMOD         "Fi?ierul nu pare a fi un modul OLE valid. Nu se poate ?nregistra controlul OLE."
+  IDS_NOTOLEMODCAPTION  "Adaug? un control"
+}
+
+IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 324, 140
+STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Inserare special?"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT         "Surs?:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
+    CONTROL       "I&nsereaz?", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
+                  6, 38, 55, 10
+    CONTROL       "Insereaz? &leg?tura", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
+                  6, 63, 74, 10
+    LTEXT         "C&a:", -1, 81, 25, 16, 8, WS_VISIBLE | WS_GROUP
+    LISTBOX       IDC_PS_PASTELIST,     81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_PASTELINKLIST, 81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_DISPLAYLIST,   81, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE
+    CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 235, 6, 86, 14
+    CONTROL       "Renun??", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 23, 86, 14
+    CONTROL       "A&jutor", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 42, 86, 14
+    CONTROL       "A&fi?eaz? ca pictogram?", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 235, 59, 86, 14
+    CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 235, 75, 66, 44
+    CONTROL       "Schimbare p&ictogram?...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 235, 123, 82, 14
+    CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
+    CONTROL       "<< textul rezultat apare aici >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 65, 100, 159, 35
+    CONTROL       "Rezultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 223, 48
+    CONTROL       "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
+END
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_PS_PASTE_DATA                   "Insereaz? con?inutul din clipboard ?n document ca %s."
+    IDS_PS_PASTE_OBJECT                 "Insereaz? con?inutul din clipboard ?n document astfel ?nc?t s? ?l pute?i activa utiliz?nd %s."
+    IDS_PS_PASTE_OBJECT_AS_ICON         "Insereaz? con?inutul din clipboard ?n document astfel ?nc?t s? ?l pute?i activa utiliz?nd %s.  Va fi afi?at ca o pictogram?."
+    IDS_PS_PASTE_LINK_DATA              "Insereaz? con?inutul din clipboard ?n document ca %s.  Datele sunt legate de fi?ierul surs?, astfel ?nc?t modific?rile aduse fi?ierului vor fi reflectate ?n document."
+    IDS_PS_PASTE_LINK_OBJECT            "Insereaz? o imagine a con?inutului din clipboard ?n document.  Imaginea este legat? de fi?ierul surs?, astfel ?nc?t modific?rile aduse fi?ierului vor fi reflectate ?n document."
+    IDS_PS_PASTE_LINK_OBJECT_AS_ICON    "Insereaz? o scurt?tur? care conduce la loca?ia con?inutului din clipboard.  Scurt?tura este legat? de fi?ierul surs?, astfel ?nc?t modific?rile aduse fi?ierului vor fi reflectate ?n document."
+    IDS_PS_NON_OLE                      "Insereaz? con?inutul din clipboard ?n document."
+    IDS_PS_UNKNOWN_TYPE                 "Tip necunoscut"
+    IDS_PS_UNKNOWN_SRC                  "Surs? necunoscut?"
+    IDS_PS_UNKNOWN_APP                  "programul care l-a creat"
+}



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: Dylan Smith : wordpad: Remove untranslated resources from the Chinese
	translation.
Message-ID: <E1ORp5F-00075i-D2@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 63b04e4abfcc441edd7dc31e01f6b10c5621f049
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=63b04e4abfcc441edd7dc31e01f6b10c5621f049

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Wed Jun 23 19:19:50 2010 -0400

wordpad: Remove untranslated resources from the Chinese translation.

---

 programs/wordpad/Zh.rc |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc
index 135f00c..bae40a7 100644
--- a/programs/wordpad/Zh.rc
+++ b/programs/wordpad/Zh.rc
@@ -111,30 +111,6 @@ BEGIN
     END
 END
 
-IDM_COLOR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Black",      ID_COLOR_BLACK
-        MENUITEM "Maroon",     ID_COLOR_MAROON
-        MENUITEM "Green",      ID_COLOR_GREEN
-        MENUITEM "Olive"       ID_COLOR_OLIVE
-        MENUITEM "Navy"        ID_COLOR_NAVY
-        MENUITEM "Purple"      ID_COLOR_PURPLE
-        MENUITEM "Teal"        ID_COLOR_TEAL
-        MENUITEM "Gray"        ID_COLOR_GRAY
-        MENUITEM "Silver"      ID_COLOR_SILVER
-        MENUITEM "Red"         ID_COLOR_RED
-        MENUITEM "Lime"        ID_COLOR_LIME
-        MENUITEM "Yellow"      ID_COLOR_YELLOW
-        MENUITEM "Blue"        ID_COLOR_BLUE
-        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
-        MENUITEM "Aqua"        ID_COLOR_AQUA
-        MENUITEM "White"       ID_COLOR_WHITE
-        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
-    END
-END
-
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "?????"



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: Akihiro Sagawa : jscript: Add Japanese translation.
Message-ID: <E1ORp5F-00075z-Fl@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 496a7895d5b9a31e73667f0ad132565c5bc68b96
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=496a7895d5b9a31e73667f0ad132565c5bc68b96

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Wed Jun 23 23:19:53 2010 +0900

jscript: Add Japanese translation.

---

 dlls/jscript/Makefile.in   |    1 +
 dlls/jscript/jscript_Ja.rc |   51 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index b22e15d..56cf824 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -12,6 +12,7 @@ RC_SRCS = \
 	jscript_Es.rc \
 	jscript_Fr.rc \
 	jscript_It.rc \
+	jscript_Ja.rc \
 	jscript_Ko.rc \
 	jscript_Lt.rc \
 	jscript_Nl.rc \
diff --git a/dlls/jscript/jscript_Ja.rc b/dlls/jscript/jscript_Ja.rc
new file mode 100644
index 0000000..9751751
--- /dev/null
+++ b/dlls/jscript/jscript_Ja.rc
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009 Piotr Caban
+ * Copyright 2010 Akihiro Sagawa
+ *
+ * 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 "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TO_PRIMITIVE        "??????????????????"
+    IDS_INVALID_CALL_ARG    "?????????????????"
+    IDS_CREATE_OBJ_ERROR    "???????? ??????????????????"
+    IDS_NO_PROPERTY         "????????????????????????????????"
+    IDS_ARG_NOT_OPT         "??????????"
+    IDS_SYNTAX_ERROR        "?????"
+    IDS_SEMICOLON           "';'?????????"
+    IDS_LBRACKET            "'('?????????"
+    IDS_RBRACKET            "')'?????????"
+    IDS_UNTERMINATED_STR    "??????????????"
+    IDS_NOT_FUNC            "???????????"
+    IDS_NOT_DATE            "'[object]' ????????????????"
+    IDS_NOT_NUM             "???????????"
+    IDS_OBJECT_EXPECTED     "???????????????"
+    IDS_ILLEGAL_ASSIGN      "???????"
+    IDS_UNDEFINED           "'|'??????????"
+    IDS_NOT_BOOL            "?????????????????"
+    IDS_JSCRIPT_EXPECTED    "JScript???????????????"
+    IDS_REGEXP_SYNTAX_ERROR "??????????????"
+    IDS_URI_INVALID_CHAR    "????????URI??????????????"
+    IDS_INVALID_LENGTH      "??????????????????????"
+    IDS_ARRAY_EXPECTED      "?????????????????"
+}



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: Akihiro Sagawa : shdoclc: Fix Japanese translation.
Message-ID: <E1ORp5F-00076E-Hi@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 13f82064807670219f245ca516e61ea21af0ad0f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=13f82064807670219f245ca516e61ea21af0ad0f

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Wed Jun 23 23:19:55 2010 +0900

shdoclc: Fix Japanese translation.

---

 dlls/shdoclc/Ja.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shdoclc/Ja.rc b/dlls/shdoclc/Ja.rc
index 92410d9..f423977 100644
--- a/dlls/shdoclc/Ja.rc
+++ b/dlls/shdoclc/Ja.rc
@@ -194,8 +194,8 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM SEPARATOR
         MENUITEM "????????(&F)...",  IDM_ADDFAVORITES
         MENUITEM SEPARATOR
-        MENUITEM "??",                     IDM_DYNSRCPLAY
-        MENUITEM "??",                     IDM_DYNSRCSTOP
+        MENUITEM "??",                     IDM_IMGARTPLAY
+        MENUITEM "??",                     IDM_IMGARTSTOP
         MENUITEM "????",                 IDM_IMGARTREWIND
         MENUITEM SEPARATOR
         MENUITEM SEPARATOR



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: Francois Gouget : mmdevapi/tests: Add a trailing '\n' to an ok() call.
Message-ID: <E1ORp5F-00076X-JU@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5fe33dcb530c7c411fbfe018929d6add08544076
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5fe33dcb530c7c411fbfe018929d6add08544076

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 09:56:16 2010 +0200

mmdevapi/tests: Add a trailing '\n' to an ok() call.

---

 dlls/mmdevapi/tests/dependency.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c
index 23c3614..62bc4e6 100644
--- a/dlls/mmdevapi/tests/dependency.c
+++ b/dlls/mmdevapi/tests/dependency.c
@@ -94,7 +94,7 @@ START_TEST(dependency)
             hr = IBaseFilter_GetClassID(bf, &clsid);
             ok(hr == S_OK, "GetClassId failed with 0x%08x\n", hr);
             if (hr == S_OK)
-                ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s", dump_guid(&clsid));
+                ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", dump_guid(&clsid));
         }
     }
 



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: Jose Rostagno : winhlp32: Fix Spanish translation.
Message-ID: <E1ORp5F-00076o-Le@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d36ef881c13b462ea9b9e54ab39fe12065540c38
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d36ef881c13b462ea9b9e54ab39fe12065540c38

Author: Jose Rostagno <joserostagno at hotmail.com>
Date:   Wed Jun 23 23:14:32 2010 -0300

winhlp32: Fix Spanish translation.

---

 programs/winhlp32/Es.rc |   42 +++++++++++++++++++++++++++++-------------
 1 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/programs/winhlp32/Es.rc b/programs/winhlp32/Es.rc
index e752950..745cac6 100644
--- a/programs/winhlp32/Es.rc
+++ b/programs/winhlp32/Es.rc
@@ -42,21 +42,21 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
  POPUP "&Marcador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
- POPUP "&Options" {
-   POPUP	"Help always visible"
+ POPUP "&Opciones" {
+   POPUP	"Ayuda siempre visible"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Por defecto",	MNID_OPTS_HELP_DEFAULT
      MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "No visible",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  MENUITEM "Historial",		MNID_OPTS_HISTORY
+  POPUP    "Fuentes"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Peque?a",		MNID_OPTS_FONTS_SMALL
     MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Grande",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "Usar colores del sistema",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "A&yuda" {
    MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
@@ -69,6 +69,22 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
  }
 }
 
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "?ndice"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+}
+
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Buscar"
+{
+    LTEXT  "A?n no implementado", -1, 10, 10, 180, 150
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 {
@@ -79,11 +95,11 @@ STID_INFO,  		"Informaci
 STID_NOT_IMPLEMENTED, 	"A?n no implementado"
 STID_HLPFILE_ERROR_s, 	"Error al leer el archivo de ayuda `%s'"
 STID_INDEX, 		"&?ndice"
-STID_CONTENTS,		"Summary"
+STID_CONTENTS,		"Resumen"
 STID_BACK, 		"&Anterior"
 STID_ALL_FILES, 	"Todos los archivos (*.*)"
 STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
-STID_PSH_INDEX,		"Help topics: "
+STID_FILE_NOT_FOUND_s	"No se pudo encontrar '%s'. ?Desea buscar este archivo usted mismo?"
+STID_NO_RICHEDIT	"No se pudo encontrar una implementaci?n de richedit... Abortando"
+STID_PSH_INDEX,		"Temas de ayuda: "
 }



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: Francois Gouget : wined3d: Remove spaces after '\n's.
Message-ID: <E1ORp5F-000775-Ns@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 620087c545c9f8e62abffe3b8ae38c7591d3c6b6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=620087c545c9f8e62abffe3b8ae38c7591d3c6b6

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:03:13 2010 +0200

wined3d: Remove spaces after '\n's.

---

 dlls/wined3d/glsl_shader.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 9781a4b..89bc6ac 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1832,7 +1832,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context
         case WINED3DSTT_CUBE:
             if (shadow)
             {
-                FIXME("Unsupported Cube shadow function.\n ");
+                FIXME("Unsupported Cube shadow function.\n");
                 sample_function->name = "unsupportedCubeShadow";
                 sample_function->coord_mask = 0;
             }
@@ -1865,7 +1865,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context
         case WINED3DSTT_VOLUME:
             if (shadow)
             {
-                FIXME("Unsupported 3D shadow function.\n ");
+                FIXME("Unsupported 3D shadow function.\n");
                 sample_function->name = "unsupported3DShadow";
                 sample_function->coord_mask = 0;
             }



From julliard at winehq.org  Thu Jun 24 11:15:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:21 -0500
Subject: Francois Gouget : shell32/tests: Make I{DataObject,
	ShellBrowser}Impl_Construct() static.
Message-ID: <E1ORp5F-00077P-Sa@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4898f6cb36c025c5296b0a78ccc846edf8938768
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4898f6cb36c025c5296b0a78ccc846edf8938768

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:10:24 2010 +0200

shell32/tests: Make I{DataObject,ShellBrowser}Impl_Construct() static.

---

 dlls/shell32/tests/shlview.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c
index dc60a49..e3e0ef2 100644
--- a/dlls/shell32/tests/shlview.c
+++ b/dlls/shell32/tests/shlview.c
@@ -94,7 +94,7 @@ typedef struct {
 
 static const IDataObjectVtbl IDataObjectImpl_Vtbl;
 
-IDataObject* IDataObjectImpl_Construct(void)
+static IDataObject* IDataObjectImpl_Construct(void)
 {
     IDataObjectImpl *obj;
 
@@ -216,7 +216,7 @@ typedef struct {
 
 static const IShellBrowserVtbl IShellBrowserImpl_Vtbl;
 
-IShellBrowser* IShellBrowserImpl_Construct(void)
+static IShellBrowser* IShellBrowserImpl_Construct(void)
 {
     IShellBrowserImpl *browser;
 



From julliard at winehq.org  Thu Jun 24 11:15:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:22 -0500
Subject: Francois Gouget : d3dxof: Make fdi_{alloc,free}() static.
Message-ID: <E1ORp5G-00077g-0w@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e6b907b7b388e5468b093868d5e2796dd9554161
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e6b907b7b388e5468b093868d5e2796dd9554161

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:12:31 2010 +0200

d3dxof: Make fdi_{alloc,free}() static.

---

 dlls/d3dxof/mszip.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dxof/mszip.c b/dlls/d3dxof/mszip.c
index 73fa848..1796616 100644
--- a/dlls/d3dxof/mszip.c
+++ b/dlls/d3dxof/mszip.c
@@ -607,12 +607,12 @@ static int ZIPfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state)
   return DECR_OK;
 }
 
-void * __cdecl fdi_alloc(ULONG cb)
+static void * __cdecl fdi_alloc(ULONG cb)
 {
   return HeapAlloc(GetProcessHeap(), 0, cb);
 }
 
-void __cdecl fdi_free(void *pv)
+static void __cdecl fdi_free(void *pv)
 {
   HeapFree(GetProcessHeap(), 0, pv);
 }



From julliard at winehq.org  Thu Jun 24 11:15:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:22 -0500
Subject: Francois Gouget : gdiplus: Make measure_ranges_callback() static.
Message-ID: <E1ORp5G-00078H-6j@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a56375fcb56d9bef8d510d43e03a581683c2488f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a56375fcb56d9bef8d510d43e03a581683c2488f

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:12:48 2010 +0200

gdiplus: Make measure_ranges_callback() static.

---

 dlls/gdiplus/graphics.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 68e422e..da3c15f 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -3653,7 +3653,7 @@ struct measure_ranges_args {
     GpRegion **regions;
 };
 
-GpStatus measure_ranges_callback(GpGraphics *graphics,
+static GpStatus measure_ranges_callback(GpGraphics *graphics,
     GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font,
     GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format,
     INT lineno, const RectF *bounds, void *user_data)



From julliard at winehq.org  Thu Jun 24 11:15:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:22 -0500
Subject: Francois Gouget : d3dx9_36: Make assemble_shader() static.
Message-ID: <E1ORp5G-000781-4y@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3133b71e9257f505f3658a7d0d93aed36d66be84
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3133b71e9257f505f3658a7d0d93aed36d66be84

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:12:41 2010 +0200

d3dx9_36: Make assemble_shader() static.

---

 dlls/d3dx9_36/shader.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 3a7824a..9677e0b 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -382,7 +382,7 @@ static int wpp_close_output(void)
     return 1;
 }
 
-HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages,
+static HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages,
                         LPD3DXBUFFER* ppShader, LPD3DXBUFFER* ppErrorMsgs)
 {
     struct bwriter_shader *shader;



From julliard at winehq.org  Thu Jun 24 11:15:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:22 -0500
Subject: Francois Gouget : wordpad: Make print_preview() and
	preview_page_hittest() static.
Message-ID: <E1ORp5G-00078Y-97@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a413afa3e5ce02eca0f32574e82a6b23ce1c2e91
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a413afa3e5ce02eca0f32574e82a6b23ce1c2e91

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:13:11 2010 +0200

wordpad: Make print_preview() and preview_page_hittest() static.

---

 programs/wordpad/print.c   |    4 ++--
 programs/wordpad/wordpad.h |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c
index 1d4e6e3..231c90e 100644
--- a/programs/wordpad/print.c
+++ b/programs/wordpad/print.c
@@ -891,7 +891,7 @@ static void update_preview_buttons(HWND hMainWnd)
     EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0);
 }
 
-LRESULT print_preview(HWND hwndPreview)
+static LRESULT print_preview(HWND hwndPreview)
 {
     HDC hdc;
     RECT window, background;
@@ -1039,7 +1039,7 @@ static void toggle_num_pages(HWND hMainWnd)
 
 /* Returns the page shown that the point is in (1 or 2) or 0 if the point
  * isn't inside either page */
-int preview_page_hittest(POINT pt)
+static int preview_page_hittest(POINT pt)
 {
     RECT rc;
     rc.left = preview.spacing.cx;
diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h
index c250cc1..c3c5bc0 100644
--- a/programs/wordpad/wordpad.h
+++ b/programs/wordpad/wordpad.h
@@ -247,7 +247,6 @@ LRESULT preview_command(HWND, WPARAM);
 void init_preview(HWND, LPWSTR);
 void close_preview(HWND);
 BOOL preview_isactive(void);
-LRESULT print_preview(HWND);
 void get_default_printer_opts(void);
 void registry_set_pagemargins(HKEY);
 void registry_read_pagemargins(HKEY);



From julliard at winehq.org  Thu Jun 24 11:15:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:22 -0500
Subject: Francois Gouget : kernel32: GetProcessDword() is unused so remove it.
Message-ID: <E1ORp5G-00078q-Cs@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7bf45b4c358e6dbc2e9ee9798daae7e196873038
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7bf45b4c358e6dbc2e9ee9798daae7e196873038

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:13:52 2010 +0200

kernel32: GetProcessDword() is unused so remove it.

We use krnl386.exe16's implementation instead.

---

 dlls/kernel32/process.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index cc2a6ba..1e4a6e1 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -2637,16 +2637,6 @@ DWORD WINAPI GetProcessFlags( DWORD processid )
 }
 
 
-/***********************************************************************
- *           GetProcessDword    (KERNEL32.18)
- */
-DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset )
-{
-    FIXME( "(%d, %d): not supported\n", dwProcessID, offset );
-    return 0;
-}
-
-
 /*********************************************************************
  *           OpenProcess   (KERNEL32.@)
  *



From julliard at winehq.org  Thu Jun 24 11:15:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:22 -0500
Subject: Francois Gouget : usbd.sys: Fix the test for type control endpoints.
Message-ID: <E1ORp5G-000798-Nd@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3c58b1a6f699f308780900223a841df84da5dcad
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3c58b1a6f699f308780900223a841df84da5dcad

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:17:22 2010 +0200

usbd.sys: Fix the test for type control endpoints.

The value of USB_ENDPOINT_TYPE_CONTROL is 0 so and-ing with it makes no sense.

---

 dlls/usbd.sys/usbd.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c
index 4727512..80fd02e 100644
--- a/dlls/usbd.sys/usbd.c
+++ b/dlls/usbd.sys/usbd.c
@@ -125,14 +125,21 @@ PURB WINAPI USBD_CreateConfigurationRequestEx(
                 interfaceInfo->Pipes[i].MaximumPacketSize = endpointDescriptor->wMaxPacketSize;
                 interfaceInfo->Pipes[i].EndpointAddress = endpointDescriptor->bEndpointAddress;
                 interfaceInfo->Pipes[i].Interval = endpointDescriptor->bInterval;
-                if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_CONTROL)
+                switch (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK)
+                {
+                case USB_ENDPOINT_TYPE_CONTROL:
                     interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeControl;
-                else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_BULK)
+                    break;
+                case USB_ENDPOINT_TYPE_BULK:
                     interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeBulk;
-                else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_INTERRUPT)
+                    break;
+                case USB_ENDPOINT_TYPE_INTERRUPT:
                     interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeInterrupt;
-                else if (endpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_ISOCHRONOUS)
+                    break;
+                case USB_ENDPOINT_TYPE_ISOCHRONOUS:
                     interfaceInfo->Pipes[i].PipeType = UsbdPipeTypeIsochronous;
+                    break;
+                }
                 endpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) USBD_ParseDescriptors(
                     ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength,
                     endpointDescriptor + 1, USB_ENDPOINT_DESCRIPTOR_TYPE );



From julliard at winehq.org  Thu Jun 24 11:15:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:22 -0500
Subject: Francois Gouget : winecfg: The winecfg debug channel is unused so
	remove it .
Message-ID: <E1ORp5G-00079O-PK@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c5bd7e4eb62db23ba2834540727348722ec59b89
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c5bd7e4eb62db23ba2834540727348722ec59b89

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:18:26 2010 +0200

winecfg: The winecfg debug channel is unused so remove it.

---

 programs/winecfg/about.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c
index b8a6964..d6b2a7d 100644
--- a/programs/winecfg/about.c
+++ b/programs/winecfg/about.c
@@ -29,12 +29,10 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
-#include <wine/debug.h>
 
 #include "resource.h"
 #include "winecfg.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
 
 static HICON logo = NULL;
 static HFONT titleFont = NULL;



From julliard at winehq.org  Thu Jun 24 11:15:22 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:22 -0500
Subject: Francois Gouget : programs: Remove spaces before '\n's in the
	resources.
Message-ID: <E1ORp5G-00079g-W1@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c59b791b855e3632eec7056073dec7cc0b7a8ed6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c59b791b855e3632eec7056073dec7cc0b7a8ed6

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jun 24 10:22:43 2010 +0200

programs: Remove spaces before '\n's in the resources.

---

 programs/notepad/Si.rc |    2 +-
 programs/taskmgr/Si.rc |    4 ++--
 programs/xcopy/Ro.rc   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc
index 531e9fa..1947286 100644
--- a/programs/notepad/Si.rc
+++ b/programs/notepad/Si.rc
@@ -133,7 +133,7 @@ STRING_UNICODE_BE,     "Unicode (UTF-16 big-endian)"
 
 STRING_LOSS_OF_UNICODE_CHARACTERS,         "%s\n\
 Ta datoteka vsebuje Unicode znake, ki bodo izgubljeni,\n\
-?e datoteko shranite v %s kodiranju. \n\
+?e datoteko shranite v %s kodiranju.\n\
 Da bi te znake obdr?ali, kliknite Prekli?i in izberite\n\
 eno izmed Unicode mo?nosti v seznamu kodiranj.\n\
 Nadaljujem?"
diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc
index 858e9d2..496c94a 100644
--- a/programs/taskmgr/Si.rc
+++ b/programs/taskmgr/Si.rc
@@ -547,9 +547,9 @@ BEGIN
                                      neza?eljene posledice, vklju?no z nesabilnostjo sistema. Ali ste\n\
                                      prepri?ani, da ?elite spremeniti prioriteto?"
     IDS_PRIORITY_UNABLE2CHANGE      "Ne morem spremeniti prioritete"
-    IDS_TERMINATE_MESSAGE           "OPOZORILO: Prekinjanje procesa lahko povzro?i neza?eljene \n\
+    IDS_TERMINATE_MESSAGE           "OPOZORILO: Prekinjanje procesa lahko povzro?i neza?eljene\n\
                                      posledice, vklju?no z izgubo podatkov in nestabilnostjo sistema.\n\
-                                     Pred prekinitvijo proces ne bo imel mo?nosti shraniti svojega \n\
+                                     Pred prekinitvijo proces ne bo imel mo?nosti shraniti svojega\n\
                                      stanja ali podatkov. Ali ste prepri?ani, da ?elite\n\
                                      prekiniti proces?"
     IDS_TERMINATE_UNABLE2TERMINATE  "Ne morem prekiniti procesa"
diff --git a/programs/xcopy/Ro.rc b/programs/xcopy/Ro.rc
index 3e8a655..bf4f5eb 100644
--- a/programs/xcopy/Ro.rc
+++ b/programs/xcopy/Ro.rc
@@ -64,7 +64,7 @@ XCOPY surs? [destina?ie] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 [/T]  Creeaz? o structur? de directoare goale, dar nu copiaz? fi?iere\n\
 [/Y]  Nu solicita confirmarea la suprascrierea fi?ierelor\n\
 [/-Y] Solicit? confirmarea la suprascrierea fi?ierelor\n\
-[/P]  Solicit? confirmarea ?nainte de copierea fiec?rui fi?ier surs? \n\
+[/P]  Solicit? confirmarea ?nainte de copierea fiec?rui fi?ier surs?\n\
 [/N]  Copiaz? utiliz?nd prescurt?ri de nume\n\
 [/U]  Copiaz? numai fi?ierele care exist? deja ?n destina?ie\n\
 [/R]  Suprascrie orice fi?iere cu protec?ie la modific?ri\n\



From julliard at winehq.org  Thu Jun 24 11:15:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:23 -0500
Subject: Francois Gouget : winhlp32: Remove a space before an ellipsis in the
	Dutch translation.
Message-ID: <E1ORp5H-0007A1-2g@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6724fc2604effd59dcc23cf8ee070e30c7c009d4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6724fc2604effd59dcc23cf8ee070e30c7c009d4

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jun 24 10:24:06 2010 +0200

winhlp32: Remove a space before an ellipsis in the Dutch translation.

---

 programs/winhlp32/Nl.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc
index 0a4594a..9294856 100644
--- a/programs/winhlp32/Nl.rc
+++ b/programs/winhlp32/Nl.rc
@@ -113,7 +113,7 @@ BEGIN
 	BEGIN
 		MENUITEM "Annotering...",       MNID_CTXT_ANNOTATE
 		MENUITEM "Kopi?ren",            MNID_CTXT_COPY
-		MENUITEM "Afdrukken ...",       MNID_CTXT_PRINT
+		MENUITEM "Afdrukken...",        MNID_CTXT_PRINT
 		POPUP    "Lettertype"
 		BEGIN
 			MENUITEM "Klein",       MNID_CTXT_FONTS_SMALL



From julliard at winehq.org  Thu Jun 24 11:15:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:23 -0500
Subject: Francois Gouget : wineboot: Remove a space before an ellipsis in the
	Norwegian (Bokmal) translation.
Message-ID: <E1ORp5H-0007AH-5b@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 78dca6d6164b5902d101216b6bc5f46b61fc54ec
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=78dca6d6164b5902d101216b6bc5f46b61fc54ec

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jun 24 10:25:22 2010 +0200

wineboot: Remove a space before an ellipsis in the Norwegian (Bokmal) translation.

---

 programs/wineboot/wineboot_No.rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/wineboot/wineboot_No.rc b/programs/wineboot/wineboot_No.rc
index 1e7b90a..ce7a3bf 100644
--- a/programs/wineboot/wineboot_No.rc
+++ b/programs/wineboot/wineboot_No.rc
@@ -44,6 +44,6 @@ CAPTION "Wine"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_WAITICON, 3, 3, 10, 10
-    LTEXT "Vent mes Wine-oppsettet i ?%s? blir oppdatert ...",
+    LTEXT "Vent mes Wine-oppsettet i ?%s? blir oppdatert...",
           IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX
 END



From julliard at winehq.org  Thu Jun 24 11:15:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:23 -0500
Subject: Francois Gouget : programs: Add a space before ellipses in the
	Slovenian translation.
Message-ID: <E1ORp5H-0007Ad-HV@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e5a19a51631d6e3d02374152392cd758ad31dcc4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e5a19a51631d6e3d02374152392cd758ad31dcc4

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jun 24 10:26:30 2010 +0200

programs: Add a space before ellipses in the Slovenian translation.

---

 programs/taskmgr/Si.rc           |    2 +-
 programs/wineboot/wineboot_Si.rc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc
index 496c94a..c6cc43d 100644
--- a/programs/taskmgr/Si.rc
+++ b/programs/taskmgr/Si.rc
@@ -497,7 +497,7 @@ BEGIN
     IDS_VIEW_SMALL                     "M&ale ikone"
     IDS_VIEW_DETAILS                   "Po&drobnosti"
     IDS_WINDOWS                        "&Okna"
-    IDS_VIEW_SELECTCOLUMNS             "&Izbiranje stolcev..."
+    IDS_VIEW_SELECTCOLUMNS             "&Izbiranje stolcev ..."
     IDS_OPTIONS_SHOW16BITTASKS         "&Prikaz 16-bitnih opravil"
     IDS_VIEW_CPUHISTORY                "&Zgodovina procesorja"
     IDS_VIEW_CPUHISTORY_ONEGRAPHALL    "&En grafikon za vse procesorje"
diff --git a/programs/wineboot/wineboot_Si.rc b/programs/wineboot/wineboot_Si.rc
index bb210f9..82e061b 100644
--- a/programs/wineboot/wineboot_Si.rc
+++ b/programs/wineboot/wineboot_Si.rc
@@ -44,6 +44,6 @@ CAPTION "Wine"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_WAITICON, 3, 3, 10, 10
-    LTEXT "Konfiguracija programa Wine v %s se posodablja, prosimo po?kajte...",
+    LTEXT "Konfiguracija programa Wine v %s se posodablja, prosimo po?kajte ...",
           IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX
 END



From julliard at winehq.org  Thu Jun 24 11:15:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:23 -0500
Subject: Francois Gouget : Assorted typo and spelling fixes.
Message-ID: <E1ORp5H-0007Aw-K5@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7649c75b40506221179296388c5d38891cda03e0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7649c75b40506221179296388c5d38891cda03e0

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 24 10:18:34 2010 +0200

Assorted typo and spelling fixes.

---

 dlls/d3dx9_36/tests/asm.c        |    6 +++---
 dlls/dbghelp/cpu_x86_64.c        |    2 +-
 dlls/ddraw/ddraw.c               |    2 +-
 dlls/mmdevapi/audio.c            |    2 +-
 dlls/mmdevapi/audiovolume.c      |    2 +-
 dlls/mmdevapi/tests/capture.c    |    4 ++--
 dlls/msvcrt/tests/misc.c         |    2 +-
 dlls/oleaut32/tests/olepicture.c |    4 ++--
 dlls/setupx.dll16/setupx_main.c  |    2 +-
 dlls/shell32/tests/shellpath.c   |    2 +-
 dlls/urlmon/tests/uri.c          |    2 +-
 dlls/usp10/bidi.c                |    2 +-
 dlls/wined3d/surface.c           |    2 +-
 dlls/winejoystick.drv/joystick.c |    4 ++--
 dlls/winex11.drv/xim.c           |    2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c
index 276a6e2..23ec484 100644
--- a/dlls/d3dx9_36/tests/asm.c
+++ b/dlls/d3dx9_36/tests/asm.c
@@ -1362,13 +1362,13 @@ static void failure_test(void) {
         /* shader 42: no modifiers with vs dcl sampler instruction */
         "vs_3_0\n"
         "dcl_2d_pp s0\n",
-        /* shader 43: can't explicitely declare input registers in ps_2_0 */
+        /* shader 43: can't explicitly declare input registers in ps_2_0 */
         "ps_2_0\n"
         "dcl_texcoord0 t0\n",
-        /* shader 44: can't implicitely declare registers in vs */
+        /* shader 44: can't implicitly declare registers in vs */
         "vs_2_0\n"
         "dcl o0\n",
-        /* shader 45: can't implicitely declare samplers in vs */
+        /* shader 45: can't implicitly declare samplers in vs */
         "vs_3_0\n"
         "dcl s2\n",
         /* shader 46: no tx registers in ps_3_0 */
diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c
index f07d8e4..7b719ce 100644
--- a/dlls/dbghelp/cpu_x86_64.c
+++ b/dlls/dbghelp/cpu_x86_64.c
@@ -238,7 +238,7 @@ static void dump_unwind_info(HANDLE hProcess, ULONG64 base, RUNTIME_FUNCTION *fu
     }
 }
 
-/* highly derivated from dlls/ntdlls/signal_x86_64.c */
+/* highly derived from dlls/ntdll/signal_x86_64.c */
 static ULONG64 get_int_reg(CONTEXT *context, int reg)
 {
     return *(&context->Rax + reg);
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 7d6558d..d5511ad 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -345,7 +345,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface)
  *  DDSCL_SETDEVICEWINDOW: Sets a window specially used for rendering (I don't
  *  expect any difference to a normal window for wine)
  *  DDSCL_CREATEDEVICEWINDOW: Tells ddraw to create its own window for
- *  rendering (Possible test case: Half-life)
+ *  rendering (Possible test case: Half-Life)
  *
  * Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE
  *
diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c
index e0a7ac5..ddd97e8 100644
--- a/dlls/mmdevapi/audio.c
+++ b/dlls/mmdevapi/audio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Maarten Lankhorst for Codeweavers
+ * Copyright 2010 Maarten Lankhorst for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c
index 61cbed4..5e8994a 100644
--- a/dlls/mmdevapi/audiovolume.c
+++ b/dlls/mmdevapi/audiovolume.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Maarten Lankhorst for Codeweavers
+ * Copyright 2010 Maarten Lankhorst for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c
index b5c4883..1bedfc6 100644
--- a/dlls/mmdevapi/tests/capture.c
+++ b/dlls/mmdevapi/tests/capture.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Maarten Lankhorst for Codeweavers
+ * Copyright 2010 Maarten Lankhorst for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -244,7 +244,7 @@ static void test_audioclient(IAudioClient *ac)
     ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr);
 
     /* It seems that if length > 2s or periodicity != 0 the length is ignored and call succeeds
-     * Since we can only initialize succesfully once skip those tests
+     * Since we can only initialize successfully once skip those tests
      */
     hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL);
     ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr);
diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c
index 82dda5d..0e45eba 100644
--- a/dlls/msvcrt/tests/misc.c
+++ b/dlls/msvcrt/tests/misc.c
@@ -96,7 +96,7 @@ static void test_memcpy_s(void)
     ret = pmemcpy_s(data, 10, data, 10);
     ok(ret == 0, "ret = %x\n", ret);
     ok(errno == 0xdeadbeef, "errno = %x\n", errno);
-    ok(!memcmp(dest, data, 5), "data was destroyed during overwritting\n");
+    ok(!memcmp(dest, data, 5), "data was destroyed during overwriting\n");
 
     errno = 0xdeadbeef;
     dest[0] = 'x';
diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c
index 3208368..ab4fb48 100644
--- a/dlls/oleaut32/tests/olepicture.c
+++ b/dlls/oleaut32/tests/olepicture.c
@@ -829,7 +829,7 @@ static void test_OleLoadPicturePath(void)
 
     DeleteFileA(temp_file);
 
-    /* Try with a non-existent file. */
+    /* Try with a nonexistent file. */
     hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic);
     ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */
        hres == E_UNEXPECTED || /* NT4/Win95 */
@@ -865,7 +865,7 @@ static void test_OleLoadPicturePath(void)
 
     DeleteFileA(temp_file);
 
-    /* Try with a non-existent file. */
+    /* Try with a nonexistent file. */
     hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic);
     ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */
        hres == E_UNEXPECTED || /* NT4/Win95 */
diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c
index 3c37e1e..adc5900 100644
--- a/dlls/setupx.dll16/setupx_main.c
+++ b/dlls/setupx.dll16/setupx_main.c
@@ -29,7 +29,7 @@
  * Stuff tested with:
  * - rs405deu.exe (German Acroread 4.05 setup)
  * - ie5setup.exe
- * - Netmeeting
+ * - NetMeeting
  *
  * FIXME:
  * - string handling is... weird ;) (buflen etc.)
diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index 33e0789..b874b5a 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -727,7 +727,7 @@ static void doChild(const char *arg)
 
             trace("CSIDL_FAVORITES was changed to %s\n", path);
             ret = CreateDirectoryA(path, NULL);
-            ok(!ret, "expected failure with with ERROR_ALREADY_EXISTS\n");
+            ok(!ret, "expected failure with ERROR_ALREADY_EXISTS\n");
             if (!ret)
                 ok(GetLastError() == ERROR_ALREADY_EXISTS,
                   "got %d, expected ERROR_ALREADY_EXISTS\n", GetLastError());
diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index 6a3f306..31f22a5 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -1254,7 +1254,7 @@ static void test_IUri_GetPropertyLength(void) {
 
                 expectedLen = lstrlen(prop.value);
 
-                /* This won't be neccessary once GetPropertyLength is implemented. */
+                /* This won't be necessary once GetPropertyLength is implemented. */
                 receivedLen = -1;
 
                 hr = IUri_GetPropertyLength(uri, j, &receivedLen, 0);
diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c
index 8af28e7..0538fa5 100644
--- a/dlls/usp10/bidi.c
+++ b/dlls/usp10/bidi.c
@@ -851,7 +851,7 @@ int BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B
     return ich;
 }
 
-/* Applies the reorder in reverse. Taking an already reordered string and returing the original */
+/* Applies the reorder in reverse. Taking an already reordered string and returning the original */
 int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse)
 {
     int ich = 0;
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 08835a8..e21086f 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3276,7 +3276,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface,
             && dst_surface == dstSwapchain->front_buffer
             && src_surface == dstSwapchain->back_buffers[0])
     {
-        /* Half-life does a Blt from the back buffer to the front buffer,
+        /* Half-Life does a Blt from the back buffer to the front buffer,
          * Full surface size, no flags... Use present instead
          *
          * This path will only be entered for d3d7 and ddraw apps, because d3d8/9 offer no way to blit TO the front buffer
diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c
index 9a6902e..95d9c32 100644
--- a/dlls/winejoystick.drv/joystick.c
+++ b/dlls/winejoystick.drv/joystick.c
@@ -230,10 +230,10 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k',
     lpCaps->wZmin = 0;
     lpCaps->wZmax = (nrOfAxes >= 3) ? 0xFFFF : 0;
 #ifdef BODGE_THE_HAT
-    /* HalfLife won't allow you to map an axis event to things like
+    /* Half-Life won't allow you to map an axis event to things like
        "next weapon" and "use". Linux reports the hat on my stick as
        axis U and V. So, IFF BODGE_THE_HAT is defined, lie through our
-       teeth and say we have 32 buttons, and we will map the axises to
+       teeth and say we have 32 buttons, and we will map the axes to
        the high buttons. Really, perhaps this should be a registry entry,
        or even a parameter to the Linux joystick driver (which would completely
        remove the need for this.)
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 6daa075..791139e 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -51,7 +51,7 @@ static DWORD dwCompStringSize = 0;
 #define STYLE_ROOT (XIMPreeditNothing | XIMStatusNothing)
 /* this uses all the callbacks to utilize full IME support */
 #define STYLE_CALLBACK (XIMPreeditCallbacks | XIMStatusNothing)
-/* inorder to enable deadkey support */
+/* in order to enable deadkey support */
 #define STYLE_NONE (XIMPreeditNothing | XIMStatusNothing)
 
 static XIMStyle ximStyle = 0;



From julliard at winehq.org  Thu Jun 24 11:15:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:23 -0500
Subject: Alexandre Julliard : kernel32: Avoid returning the same name when
	GetTempFileName is called twice in a short interval .
Message-ID: <E1ORp5H-0007BN-NX@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9f7bc109d20a07367875fcd6044dbaad41d9eb7e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9f7bc109d20a07367875fcd6044dbaad41d9eb7e

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 24 11:01:56 2010 +0200

kernel32: Avoid returning the same name when GetTempFileName is called twice in a short interval.

---

 dlls/kernel32/path.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index f0da96c..0e69f91 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -684,7 +684,10 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR
         /* get a "random" unique number and try to create the file */
         HANDLE handle;
         UINT num = GetTickCount() & 0xffff;
+        static UINT last;
 
+        /* avoid using the same name twice in a short interval */
+        if (last - num < 10) num = last + 1;
         if (!num) num = 1;
         unique = num;
         do
@@ -696,6 +699,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR
             {  /* We created it */
                 TRACE("created %s\n", debugstr_w(buffer) );
                 CloseHandle( handle );
+                last = unique;
                 break;
             }
             if (GetLastError() != ERROR_FILE_EXISTS &&



From julliard at winehq.org  Thu Jun 24 11:15:23 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:23 -0500
Subject: Alexandre Julliard : ntdll: Add a WINEARCH environment variable that
	allows forcing a specific 32- or 64-bit architecture .
Message-ID: <E1ORp5H-0007Bf-Pu@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a49891f1e2e9852a113fcb8cbd365f477b686f03
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a49891f1e2e9852a113fcb8cbd365f477b686f03

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 24 15:10:58 2010 +0200

ntdll: Add a WINEARCH environment variable that allows forcing a specific 32- or 64-bit architecture.

---

 dlls/ntdll/server.c |   22 ++++++++++++++++++++++
 loader/wine.man.in  |   18 ++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 08ee784..8564c0a 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -752,6 +752,18 @@ static void setup_config_dir(void)
 
         mkdir( config_dir, 0777 );
         if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir );
+
+        if ((p = getenv( "WINEARCH" )) && !strcmp( p, "win32" ))
+        {
+            /* force creation of a 32-bit prefix */
+            int fd = open( "system.reg", O_WRONLY | O_CREAT | O_EXCL, 0666 );
+            if (fd != -1)
+            {
+                static const char regfile[] = "WINE REGISTRY Version 2\n\n#arch=win32\n";
+                write( fd, regfile, sizeof(regfile) - 1 );
+                close( fd );
+            }
+        }
         MESSAGE( "wine: created the configuration directory '%s'\n", config_dir );
     }
 
@@ -1040,6 +1052,7 @@ NTSTATUS server_init_process_done(void)
 size_t server_init_thread( void *entry_point )
 {
     static const int is_win64 = (sizeof(void *) > sizeof(int));
+    const char *arch = getenv( "WINEARCH" );
     int ret;
     int reply_pipe[2];
     struct sigaction sig_act;
@@ -1090,6 +1103,15 @@ size_t server_init_thread( void *entry_point )
     switch (ret)
     {
     case STATUS_SUCCESS:
+        if (arch)
+        {
+            if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64))
+                fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n",
+                             wine_get_config_dir() );
+            if (!strcmp( arch, "win64" ) && !is_wow64)
+                fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n",
+                             wine_get_config_dir() );
+        }
         return info_size;
     case STATUS_NOT_REGISTRY_FILE:
         fatal_error( "'%s' is a 32-bit installation, it cannot support 64-bit applications.\n",
diff --git a/loader/wine.man.in b/loader/wine.man.in
index 7d6953c..6779b44 100644
--- a/loader/wine.man.in
+++ b/loader/wine.man.in
@@ -142,8 +142,9 @@ on all relay messages (API calls).
 .TP
 WINEDEBUG=relay
 will turn on all relay messages. For more control on including or excluding
-functions and dlls from the relay trace look into the [Debug] section
-of the wine configuration file.
+functions and dlls from the relay trace, look into the
+.B HKEY_CURRENT_USER\\\\Software\\\\Wine\\\\Debug
+registry key.
 .PP
 For more information on debugging messages, see the
 .I Running Wine
@@ -204,6 +205,19 @@ the builtin load fails; load shell32 always as builtin and comctl32
 always as native. Oleaut32 will be disabled.
 .RE
 .TP
+.I WINEARCH
+Specifies the Windows architecture to support. It can be set either to
+.B win32
+(support only 32-bit applications), or to
+.B win64
+(support both 64-bit applications and 32-bit ones in WoW64 mode).
+.br
+The architecture supported by a given Wine prefix is set at prefix
+creation time and cannot be changed afterwards. When running with an
+existing prefix, Wine will refuse to start if
+.I WINEARCH
+doesn't match the prefix architecture.
+.TP
 .I DISPLAY
 Specifies the X11 display to use.
 .TP



From julliard at winehq.org  Thu Jun 24 11:15:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:24 -0500
Subject: Michael Stefaniuc : jscript: Update the Romanian translation.
Message-ID: <E1ORp5I-0007Bx-0r@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8aa9185a52b39eafa8a2980dec27b02c54489074
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8aa9185a52b39eafa8a2980dec27b02c54489074

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Thu Jun 24 10:38:13 2010 +0200

jscript: Update the Romanian translation.

Based on comments from Octavian Voicu.

---

 dlls/jscript/jscript_Ro.rc |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/jscript/jscript_Ro.rc b/dlls/jscript/jscript_Ro.rc
index 066e200..481e629 100644
--- a/dlls/jscript/jscript_Ro.rc
+++ b/dlls/jscript/jscript_Ro.rc
@@ -32,20 +32,20 @@ STRINGTABLE DISCARDABLE
     IDS_NO_PROPERTY         "Obiectul nu suport? aceast? proprietate sau metod?"
     IDS_ARG_NOT_OPT         "Argumentul nu este op?ional"
     IDS_SYNTAX_ERROR        "Eroare de sintax?"
-    IDS_SEMICOLON           "?;? presupus"
-    IDS_LBRACKET            "?(? presupus"
-    IDS_RBRACKET            "?)? presupus"
-    IDS_UNTERMINATED_STR    "Constant? de ?ir nedeterminat?"
-    IDS_NOT_FUNC            "Func?ie presupus?"
+    IDS_SEMICOLON           "Se a?teapt? ?;?"
+    IDS_LBRACKET            "Se a?teapt? ?(?"
+    IDS_RBRACKET            "Se a?teapt? ?)?"
+    IDS_UNTERMINATED_STR    "?ir constant neterminat"
+    IDS_NOT_FUNC            "Se a?teapt? o func?ie"
     IDS_NOT_DATE            "?[obiect]? nu este un obiect de tip dat?"
-    IDS_NOT_NUM             "Num?r presupus"
-    IDS_OBJECT_EXPECTED     "Obiect presupus"
+    IDS_NOT_NUM             "Se a?teapt? un num?r"
+    IDS_OBJECT_EXPECTED     "Se a?teapt? un obiect"
     IDS_ILLEGAL_ASSIGN      "Atribuire ilegal?"
     IDS_UNDEFINED           "?|? nu este definit"
-    IDS_NOT_BOOL            "Obiect boolean presupus"
-    IDS_JSCRIPT_EXPECTED    "Obiect JScript presupus"
-    IDS_REGEXP_SYNTAX_ERROR "Eroare de sintax? ?n expresie ra?ional?"
+    IDS_NOT_BOOL            "Se a?teapt? un obiect boolean"
+    IDS_JSCRIPT_EXPECTED    "Se a?teapt? un obiect JScript"
+    IDS_REGEXP_SYNTAX_ERROR "Eroare de sintax? ?n expresia regulat?"
     IDS_URI_INVALID_CHAR    "URI care trebuie codificat con?ine caractere nevalide"
     IDS_INVALID_LENGTH      "Lungimea unei matrice trebuie s? fie un num?r ?ntreg pozitiv"
-    IDS_ARRAY_EXPECTED      "Obiect matrice presupus"
+    IDS_ARRAY_EXPECTED      "Se a?teapt? un obiect matrice"
 }



From julliard at winehq.org  Thu Jun 24 11:15:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:24 -0500
Subject: Henri Verbeet : ddraw: Avoid an integer overflow in
	IDirectDrawSurfaceImpl_BltFast().
Message-ID: <E1ORp5I-0007CL-3f@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cf39adbaa2ad80980f8d8f03a9d8802ef7cbd4fd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cf39adbaa2ad80980f8d8f03a9d8802ef7cbd4fd

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Jun 24 12:10:03 2010 +0200

ddraw: Avoid an integer overflow in IDirectDrawSurfaceImpl_BltFast().

Bug spotted by Iain Arnell, test by Iain Arnell.

---

 dlls/ddraw/surface.c        |   28 ++++++++++++++++------------
 dlls/ddraw/tests/dsurface.c |    8 ++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index bfe83a4..ef7b381 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -2077,9 +2077,13 @@ IDirectDrawSurfaceImpl_BltFast(IDirectDrawSurface7 *iface,
 {
     IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
     IDirectDrawSurfaceImpl *src = (IDirectDrawSurfaceImpl *)Source;
+    DWORD src_w, src_h, dst_w, dst_h;
     HRESULT hr;
     TRACE("(%p)->(%d,%d,%p,%p,%d): Relay\n", This, dstx, dsty, Source, rsrc, trans);
 
+    dst_w = This->surface_desc.dwWidth;
+    dst_h = This->surface_desc.dwHeight;
+
     /* Source must be != NULL, This is not checked by windows. Windows happily throws a 0xc0000005
      * in that case
      */
@@ -2092,21 +2096,21 @@ IDirectDrawSurfaceImpl_BltFast(IDirectDrawSurface7 *iface,
             WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n");
             return DDERR_INVALIDRECT;
         }
-        if(dstx + rsrc->right - rsrc->left > This->surface_desc.dwWidth ||
-           dsty + rsrc->bottom - rsrc->top > This->surface_desc.dwHeight)
-        {
-            WARN("Destination area out of bounds, returning DDERR_INVALIDRECT\n");
-            return DDERR_INVALIDRECT;
-        }
+
+        src_w = rsrc->right - rsrc->left;
+        src_h = rsrc->bottom - rsrc->top;
     }
     else
     {
-        if(dstx + src->surface_desc.dwWidth > This->surface_desc.dwWidth ||
-           dsty + src->surface_desc.dwHeight > This->surface_desc.dwHeight)
-        {
-            WARN("Destination area out of bounds, returning DDERR_INVALIDRECT\n");
-            return DDERR_INVALIDRECT;
-        }
+        src_w = src->surface_desc.dwWidth;
+        src_h = src->surface_desc.dwHeight;
+    }
+
+    if (src_w > dst_w || dstx > dst_w - src_w
+            || src_h > dst_h || dsty > dst_h - src_h)
+    {
+        WARN("Destination area out of bounds, returning DDERR_INVALIDRECT.\n");
+        return DDERR_INVALIDRECT;
     }
 
     EnterCriticalSection(&ddraw_cs);
diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c
index bfd5eae..20e8634 100644
--- a/dlls/ddraw/tests/dsurface.c
+++ b/dlls/ddraw/tests/dsurface.c
@@ -2537,6 +2537,14 @@ static void BltParamTest(void)
     ok(hr == DDERR_INVALIDRECT, "BltFast with a rectangle resulting in an off-surface write returned %08x\n", hr);
     hr = IDirectDrawSurface_BltFast(surface1, 90, 90, surface2, NULL, 0);
     ok(hr == DDERR_INVALIDRECT, "BltFast with a rectangle resulting in an off-surface write returned %08x\n", hr);
+
+    hr = IDirectDrawSurface_BltFast(surface1, -10, 0, surface2, NULL, 0);
+    ok(hr == DDERR_INVALIDRECT, "BltFast with an offset resulting in an off-surface write returned %08x\n", hr);
+    hr = IDirectDrawSurface_BltFast(surface1, 0, -10, surface2, NULL, 0);
+    ok(hr == DDERR_INVALIDRECT, "BltFast with an offset resulting in an off-surface write returned %08x\n", hr);
+    hr = IDirectDrawSurface_BltFast(surface2, 20, 20, surface1, &valid, 0);
+    ok(hr == DD_OK, "BltFast from bigger to smaller surface using a valid rectangle and offset returned %08x\n", hr);
+
     hr = IDirectDrawSurface_BltFast(surface2, 0, 0, surface1, &invalid1, 0);
     ok(hr == DDERR_INVALIDRECT, "BltFast with invalid rectangle 1 returned %08x\n", hr);
     hr = IDirectDrawSurface_BltFast(surface2, 0, 0, surface1, &invalid2, 0);



From julliard at winehq.org  Thu Jun 24 11:15:24 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Thu, 24 Jun 2010 11:15:24 -0500
Subject: Jacek Caban : mshtml: Use correct iexplore.exe path in mshtml.inf.
Message-ID: <E1ORp5I-0007Cb-5P@wine.codeweavers.com>

Module: wine
Branch: master
Commit: eaa227c12d8bb7bd56177c2f2124b046795b0498
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eaa227c12d8bb7bd56177c2f2124b046795b0498

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jun 24 16:17:54 2010 +0200

mshtml: Use correct iexplore.exe path in mshtml.inf.

---

 dlls/mshtml/mshtml.inf |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf
index 7789334..d7d2428 100644
--- a/dlls/mshtml/mshtml.inf
+++ b/dlls/mshtml/mshtml.inf
@@ -91,7 +91,7 @@ HKCR,"CLSID\%CLSID_CRecalcEngine%\InProcServer32","ThreadingModel",,"Apartment"
 ;; CrSource
 HKCR,"CLSID\%CLSID_CrSource%",,,"Microsoft CrSource 4.0"
 HKCR,"CLSID\%CLSID_CrSource%\BrowseInPlace",,16
-HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
+HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1"
 HKCR,"CLSID\%CLSID_CrSource%\EnablePlugin\.css",,,"PointPlus plugin"
 HKCR,"CLSID\%CLSID_CrSource%\InProcServer32",,,"mshtml.dll"
 HKCR,"CLSID\%CLSID_CrSource%\InProcServer32","ThreadingModel",,"Apartment"
@@ -122,7 +122,7 @@ HKCR,"CLSID\%CLSID_HTADocument%\Version",,,"6.0"
 ;; HTMLDocument
 HKCR,"CLSID\%CLSID_HTMLDocument%",,,"HTML Document"
 HKCR,"CLSID\%CLSID_HTMLDocument%\BrowseInPlace",,16
-HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
+HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1"
 HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32",,,"mshtml.dll"
 HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32","ThreadingModel",,"Apartment"
 HKCR,"CLSID\%CLSID_HTMLDocument%\MiscStatus",,,"2228625"
@@ -215,7 +215,7 @@ HKCR,"CLSID\%CLSID_MailtoProtocol%\InProcServer32","ThreadingModel",,"Apartment"
 ;; MHTMLDocument
 HKCR,"CLSID\%CLSID_MHTMLDocument%",,,"MHTML Document"
 HKCR,"CLSID\%CLSID_MHTMLDocument%\BrowseInPlace",,16
-HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
+HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1"
 HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32",,,"mshtml.dll"
 HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32","ThreadingModel",,"Apartment"
 HKCR,"CLSID\%CLSID_MHTMLDocument%\MiscStatus",,,"2228625"
@@ -236,7 +236,7 @@ HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus",,,"0"
 HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus\1",,,"131473"
 HKCR,"CLSID\%CLSID_Scriptlet%\ProgID",,,"ScriptBridge.ScriptBridge.1"
 HKCR,"CLSID\%CLSID_Scriptlet%\Programmable",,16
-HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%IEXPLORE%,1"
+HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%16422%\Internet Explorer\iexplore.exe,1"
 HKCR,"CLSID\%CLSID_Scriptlet%\TypeLib",,,"%LIBID_MSHTML%"
 HKCR,"CLSID\%CLSID_Scriptlet%\Version",,,"4.0"
 HKCR,"CLSID\%CLSID_Scriptlet%\VersionIndependentProgID",,,"ScriptBridge.ScriptBridge"
@@ -312,11 +312,11 @@ HKCR,".gif",,2,"giffile"
 HKCR,".gif","Content Type",,"image/gif"
 HKCR,"giffile",,,"GIF Image"
 HKCR,"giffile\CLSID",,,"%CLSID_HTMLDocument%"
-HKCR,"giffile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"giffile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome"
 HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
 HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
-;; HKCR,"giffile\DefaultIcon",,,"%IEXPLORE%,9"
+;; HKCR,"giffile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9"
 
 ;; GZIP
 HKCR,"MIME\Database\Content Type\application/x-gzip","Extension",,".gz"
@@ -339,7 +339,7 @@ HKCR,"htmlfile\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%%1
 HKCR,"htmlfile",,,"HTML Document"
 HKCR,"htmlfile\BrowseInPlace",,16
 HKCR,"htmlfile\CLSID",,,"%CLSID_HTMLDocument%"
-HKCR,"htmlfile\DefaultIcon",,0x00020000,"%IEXPLORE%,1"
+HKCR,"htmlfile\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1"
 HKCR,"htmlfile_FullWindowEmbed",,,"HTML Plugin Document"
 HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,16
 HKCR,"htmlfile_FullWindowEmbed\CLSID",,,"%CLSID_HTMLPluginDocument%"
@@ -359,11 +359,11 @@ HKCR,".jpe",,2,"jpegfile"
 HKCR,".jpe","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
-HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome"
 HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
 HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
-;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8"
+;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8"
 
 ;; JPEG
 HKCR,"MIME\Database\Content Type\image/jpeg","CLSID",,"%CLSID_HTMLDocument%"
@@ -374,22 +374,22 @@ HKCR,".jpeg",,2,"jpegfile"
 HKCR,".jpeg","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
-HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome"
 HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
 HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
-;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8"
+;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8"
 
 ;; JPG
 HKCR,".jpg",,2,"jpegfile"
 HKCR,".jpg","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
-HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome"
 HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
 HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
-;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8"
+;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8"
 
 ;; MHTML
 HKCR,"MIME\Database\Content Type\message/rfc822","CLSID",,"%CLSID_MHTMLDocument%"
@@ -422,11 +422,11 @@ HKCR,".jfif",,2,"pjpegfile"
 HKCR,".jfif","Content Type",,"image/jpeg"
 HKCR,"pjpegfile",,,"JPEG Image"
 HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%"
-HKCR,"pjpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"pjpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome"
 HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
 HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
-;; HKCR,"pjpegfile\DefaultIcon",,,"%IEXPLORE%,8"
+;; HKCR,"pjpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8"
 
 ;; PNG
 HKCR,"MIME\Database\Content Type\image/png","Extension",,".png"
@@ -435,11 +435,11 @@ HKCR,".png",,2,"pngfile"
 HKCR,".png","Content Type",,"image/png"
 HKCR,"pngfile",,,"PNG Image"
 HKCR,"pngfile\CLSID",,,"%CLSID_HTMLDocument%"
-HKCR,"pngfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"pngfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe""" -nohome"
 HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
 HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
-;; HKCR,"pngfile\DefaultIcon",,,"%IEXPLORE%,9"
+;; HKCR,"pngfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9"
 
 ;; PS
 HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps"
@@ -478,11 +478,11 @@ HKCR,"MIME\Database\Content Type\image/x-xbitmap","CLSID",,"%CLSID_HTMLDocument%
 HKCR,".xbm","Content Type",,"image/x-xbitmap"
 HKCR,"xbmfile",,,"XBM Image"
 HKCR,"xbmfile\CLSID",,,"%CLSID_HTMLDocument%"
-HKCR,"xbmfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"
+HKCR,"xbmfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome"
 HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
 HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore"
 HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
-;; HKCR,"xbmfile\DefaultIcon",,,"%IEXPLORE%,9"
+;; HKCR,"xbmfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9"
 
 ;; XML
 HKCR,"MIME\Database\Content Type\application/xml","CLSID",,"{48123BC4-99D9-11D1-A6B3-00C04FD91555}"



From julliard at winehq.org  Fri Jun 25 09:40:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:50 -0500
Subject: Alexandre Julliard : user32/tests: Restructure the DDE end-to-end
	tests to make it easier to add new cases.
Message-ID: <E1OSA5K-0006ov-Ml@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c58fe1f414cf4bbcb15d40695d41e74575b2c34f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c58fe1f414cf4bbcb15d40695d41e74575b2c34f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 24 19:56:49 2010 +0200

user32/tests: Restructure the DDE end-to-end tests to make it easier to add new cases.

---

 dlls/user32/tests/dde.c |  169 ++++++++++++++++++++++++-----------------------
 1 files changed, 86 insertions(+), 83 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=c58fe1f414cf4bbcb15d40695d41e74575b2c34f


From julliard at winehq.org  Fri Jun 25 09:40:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:50 -0500
Subject: Alexandre Julliard : user32/tests: Add some Unicode test cases for A/
	W mappings.
Message-ID: <E1OSA5K-0006pB-PG@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 83adf08bb7915ab9f1e32fec0ec214babb270ace
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=83adf08bb7915ab9f1e32fec0ec214babb270ace

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 24 21:27:45 2010 +0200

user32/tests: Add some Unicode test cases for A/W mappings.

---

 dlls/user32/tests/dde.c |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index eb30c15..5ee5b47 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -2373,6 +2373,9 @@ static void test_UnpackDDElParam(void)
 static char test_cmd_a_to_a[] = "Test dde command";
 static WCHAR test_cmd_w_to_w[][32] = {
     {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0},
+    { 0x2018, 0x2019, 0x0161, 0x0041, 0x02dc, 0 },  /* some chars that should map properly to CP1252 */
+    { 0x2026, 0x2020, 0x2021, 0x0d0a, 0 },  /* false negative for IsTextUnicode */
+    { 0x4efa, 0x4efc, 0x0061, 0x4efe, 0 },  /* some Chinese chars */
 };
 static const int nb_callbacks = 5 + sizeof(test_cmd_w_to_w)/sizeof(test_cmd_w_to_w[0]);
 
@@ -2509,6 +2512,35 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV
             }
             break;
 
+        case 2:  /* normal Unicode string */
+        case 3:  /* IsTextUnicode false negative */
+        case 4:  /* Chinese chars */
+            if (unicode_server) todo_wine
+            {
+                /* double A->W mapping */
+                /* NT uses the full size, XP+ only until the first null */
+                DWORD nt_size = MultiByteToWideChar( CP_ACP, 0, (char *)cmd_w, size_w, test_cmd_a_to_w,
+                                                     sizeof(test_cmd_a_to_w)/sizeof(WCHAR) ) * sizeof(WCHAR);
+                DWORD xp_size = MultiByteToWideChar( CP_ACP, 0, (char *)cmd_w, -1, NULL, 0 ) * sizeof(WCHAR);
+                ok(size == xp_size || broken(size == nt_size),
+                   "Wrong size %d/%d, msg_index=%d\n", size, size_a_to_w, msg_index);
+                ok(!lstrcmpW((WCHAR*)buffer, test_cmd_a_to_w),
+                   "Expected %s, msg_index=%d\n", wine_dbgstr_w(test_cmd_a_to_w), msg_index);
+            }
+            else if (unicode_client)
+            {
+                ok(size == size_w_to_a, "Wrong size %d/%d, msg_index=%d\n", size, size_w_to_a, msg_index);
+                ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n",
+                   test_cmd_w_to_a, buffer, msg_index);
+            }
+            else
+            {
+                ok(size == size_w, "Wrong size %d/%d, msg_index=%d\n", size, size_w, msg_index);
+                ok(!lstrcmpW((WCHAR*)buffer, cmd_w),
+                   "Expected %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), msg_index);
+            }
+            break;
+
         default:
             ok( 0, "Invalid message %u\n", msg_index );
             break;



From julliard at winehq.org  Fri Jun 25 09:40:50 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:50 -0500
Subject: Alexandre Julliard : user32/tests: Fix more DDE test failures on
	Win9x.
Message-ID: <E1OSA5K-0006pR-S7@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f83bc2e50aee53dd04cfb72e0c384dd560e26f54
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f83bc2e50aee53dd04cfb72e0c384dd560e26f54

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 24 23:36:24 2010 +0200

user32/tests: Fix more DDE test failures on Win9x.

---

 dlls/user32/tests/dde.c |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index 5ee5b47..ce6d964 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -405,7 +405,8 @@ todo_wine
     op = DdeClientTransaction((LPBYTE)hdata, 0, conversation, item, CF_TEXT, XTYP_POKE, default_timeout, &res);
     ret = DdeGetLastError(client_pid);
     ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op);
-    ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res);
+    ok(res == DDE_FACK || broken(res == (0xdead0000 | DDE_FACK)), /* win9x */
+       "Expected DDE_FACK, got %x\n", res);
     ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
 
     /* XTYP_POKE, correct params */
@@ -432,16 +433,25 @@ todo_wine
     ret = DdeGetLastError(client_pid);
     ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
     ok(op == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", op);
-    ok(res == DDE_FACK || broken(res == 0xdeadbeef), /* win9x */ "Expected DDE_FACK, got %x\n", res);
+    ok(res == DDE_FACK || broken(res == (0xdead0000 | DDE_FACK)), /* win9x */
+       "Expected DDE_FACK, got %x\n", res);
 
     /* XTYP_EXECUTE, no data */
     res = 0xdeadbeef;
     DdeGetLastError(client_pid);
     op = DdeClientTransaction(NULL, 0, conversation, NULL, 0, XTYP_EXECUTE, default_timeout, &res);
     ret = DdeGetLastError(client_pid);
-    ok(op == NULL, "Expected NULL, got %p\n", op);
-    ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res);
-    ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret);
+    ok(op == NULL || broken(op == (HDDEDATA)TRUE), /* win9x */ "Expected NULL, got %p\n", op);
+    if (!op)
+    {
+        ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res);
+        ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret);
+    }
+    else  /* win9x */
+    {
+        ok(res == (0xdead0000 | DDE_FACK), "Expected DDE_FACK, got %x\n", res);
+        ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
+    }
 
     /* XTYP_EXECUTE, no data, -1 size */
     res = 0xdeadbeef;
@@ -450,7 +460,8 @@ todo_wine
     ret = DdeGetLastError(client_pid);
     ok(op == NULL, "Expected NULL, got %p\n", op);
     ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res);
-    ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret);
+    ok(ret == DMLERR_INVALIDPARAMETER || broken(ret == DMLERR_NO_ERROR), /* win9x */
+       "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret);
 
     DdeFreeStringHandle(client_pid, topic);
     DdeFreeDataHandle(hdata);
@@ -463,14 +474,16 @@ todo_wine
     hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
     ret = DdeGetLastError(client_pid);
     ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
-    ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res);
+    ok(res == DDE_FNOTPROCESSED || broken(res == (0xdead0000 | DDE_FNOTPROCESSED)), /* win9x */
+       "Expected DDE_FNOTPROCESSED, got %d\n", res);
     if (hdata == NULL)
         ok(FALSE, "hdata is NULL\n");
     else
     {
         str = (LPSTR)DdeAccessData(hdata, &size);
         ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str);
-        ok(size == 21, "Expected 21, got %d\n", size);
+        ok(size == 21 || broken(size == 28), /* sizes are rounded up on win9x */
+           "Expected 21, got %d\n", size);
 
         ret = DdeUnaccessData(hdata);
         ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
@@ -710,7 +723,8 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon
 
         ptr = (LPSTR)DdeAccessData(hdata, &size);
         ok(!lstrcmpA(ptr, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", ptr);
-        ok(size == 12, "Expected 12, got %d\n", size);
+        ok(size == 12 || broken(size == 28), /* sizes are rounded up on win9x */
+           "Expected 12, got %d\n", size);
         DdeUnaccessData(hdata);
 
         size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI);
@@ -904,7 +918,7 @@ static LRESULT WINAPI dde_msg_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam,
             ok(ack->reserved == 0, "Expected 0, got %d\n", ack->reserved);
             ok(ack->fBusy == FALSE, "Expected FALSE, got %d\n", ack->fBusy);
 
-            ok(hi == (UINT_PTR)execute_hglobal, "Execpted execute hglobal, got %08lx\n", hi);
+            ok(hi == (UINT_PTR)execute_hglobal, "Expected execute hglobal, got %08lx\n", hi);
             ptr = GlobalLock((HGLOBAL)hi);
 
             if (msg_index == 9)
@@ -1596,7 +1610,8 @@ todo_wine {
     ret = 0xdeadbeef;
     hdata = DdeClientTransaction((LPBYTE)test_cmd, strlen(test_cmd) + 1, hconv, (HSZ)0xdead, 0xbeef, XTYP_EXECUTE, 1000, &ret);
     ok(!hdata, "DdeClientTransaction succeeded\n");
-    ok(ret == DDE_FNOTPROCESSED, "wrong status code %04x\n", ret);
+    ok(ret == DDE_FNOTPROCESSED || broken(ret == (0xdead0000 | DDE_FNOTPROCESSED)), /* win9x */
+       "wrong status code %04x\n", ret);
     err = DdeGetLastError(dde_inst);
     ok(err == DMLERR_NOTPROCESSED, "wrong dde error %x\n", err);
 
@@ -1643,7 +1658,8 @@ todo_wine {
     else  /* no mapping */
     {
         ok(!hdata, "DdeClientTransaction returned %p, error %x\n", hdata, err);
-        ok(ret == DDE_FNOTPROCESSED, "wrong status code %04x\n", ret);
+        ok(ret == DDE_FNOTPROCESSED || broken(ret == (0xdead0000 | DDE_FNOTPROCESSED)), /* win9x */
+           "wrong status code %04x\n", ret);
         ok(err == DMLERR_NOTPROCESSED, "DdeClientTransaction returned error %x\n", err);
     }
 



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: Alexandre Julliard : user32: Add a heuristic for Unicode mappings of
	DDE data on the server side.
Message-ID: <E1OSA5L-0006pi-0q@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b2de316fc59875a810cbe60e94e05e6c96836e95
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b2de316fc59875a810cbe60e94e05e6c96836e95

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 24 23:43:08 2010 +0200

user32: Add a heuristic for Unicode mappings of DDE data on the server side.

---

 dlls/user32/dde_server.c |   59 ++++++++++++++++++++++++++++++++++++++++++++-
 dlls/user32/tests/dde.c  |    6 +---
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c
index 2dc8ae8..0d62c49 100644
--- a/dlls/user32/dde_server.c
+++ b/dlls/user32/dde_server.c
@@ -29,9 +29,11 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winnls.h"
 #include "dde.h"
 #include "ddeml.h"
 #include "win.h"
+#include "wine/unicode.h"
 #include "wine/debug.h"
 #include "dde_private.h"
 
@@ -756,6 +758,54 @@ static	WDML_XACT* WDML_ServerQueueExecute(WDML_CONV* pConv, LPARAM lParam)
     return pXAct;
 }
 
+static BOOL data_looks_unicode( const WCHAR *data, DWORD size )
+{
+    DWORD i;
+
+    if (size % sizeof(WCHAR)) return FALSE;
+    for (i = 0; i < size / sizeof(WCHAR); i++) if (data[i] > 255) return FALSE;
+    return TRUE;
+}
+
+/* convert data to Unicode, unless it looks like it's already Unicode */
+static HDDEDATA map_A_to_W( DWORD instance, void *ptr, DWORD size )
+{
+    HDDEDATA ret;
+    DWORD len;
+    const char *end;
+
+    if (!data_looks_unicode( ptr, size ))
+    {
+        if ((end = memchr( ptr, 0, size ))) size = end + 1 - (const char *)ptr;
+        len = MultiByteToWideChar( CP_ACP, 0, ptr, size, NULL, 0 );
+        ret = DdeCreateDataHandle( instance, NULL, len * sizeof(WCHAR), 0, 0, CF_TEXT, 0);
+        MultiByteToWideChar( CP_ACP, 0, ptr, size, (WCHAR *)DdeAccessData(ret, NULL), len );
+    }
+    else ret = DdeCreateDataHandle( instance, ptr, size, 0, 0, CF_TEXT, 0 );
+
+    return ret;
+}
+
+/* convert data to ASCII, unless it looks like it's not in Unicode format */
+static HDDEDATA map_W_to_A( DWORD instance, void *ptr, DWORD size )
+{
+    HDDEDATA ret;
+    DWORD len;
+    const WCHAR *end;
+
+    if (data_looks_unicode( ptr, size ))
+    {
+        size /= sizeof(WCHAR);
+        if ((end = memchrW( ptr, 0, size ))) size = end + 1 - (const WCHAR *)ptr;
+        len = WideCharToMultiByte( CP_ACP, 0, ptr, size, NULL, 0, NULL, NULL );
+        ret = DdeCreateDataHandle( instance, NULL, len, 0, 0, CF_TEXT, 0);
+        WideCharToMultiByte( CP_ACP, 0, ptr, size, (char *)DdeAccessData(ret, NULL), len, NULL, NULL );
+    }
+    else ret = DdeCreateDataHandle( instance, ptr, size, 0, 0, CF_TEXT, 0 );
+
+    return ret;
+}
+
  /******************************************************************
  *		WDML_ServerHandleExecute
  *
@@ -769,11 +819,16 @@ static	WDML_QUEUE_STATE WDML_ServerHandleExecute(WDML_CONV* pConv, WDML_XACT* pX
     if (!(pConv->instance->CBFflags & CBF_FAIL_EXECUTES))
     {
 	LPVOID	ptr = GlobalLock(pXAct->hMem);
+        DWORD size = GlobalSize(pXAct->hMem);
 
 	if (ptr)
 	{
-	    hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, ptr, GlobalSize(pXAct->hMem),
-					   0, 0, CF_TEXT, 0);
+            if (pConv->instance->unicode)  /* Unicode server, try to map A->W */
+                hDdeData = map_A_to_W( pConv->instance->instanceID, ptr, size );
+            else if (!IsWindowUnicode( pConv->hwndClient )) /* ASCII server and client, try to map W->A */
+                hDdeData = map_W_to_A( pConv->instance->instanceID, ptr, size );
+            else
+                hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, ptr, size, 0, 0, CF_TEXT, 0);
 	    GlobalUnlock(pXAct->hMem);
 	}
 	hDdeData = WDML_InvokeCallback(pConv->instance, XTYP_EXECUTE, 0, (HCONV)pConv,
diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index ce6d964..529c527 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -2486,11 +2486,9 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV
         case 0:  /* ASCII string */
             if (unicode_server)
             {
-                todo_wine {
                 ok(size == size_a_to_w, "Wrong size %d/%d, msg_index=%d\n", size, size_a_to_w, msg_index);
                 ok(!lstrcmpW((WCHAR*)buffer, test_cmd_a_to_w),
                    "Expected %s, msg_index=%d\n", wine_dbgstr_w(test_cmd_a_to_w), msg_index);
-                }
             }
             else if (unicode_client)
             {
@@ -2519,7 +2517,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV
                 ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n",
                    test_cmd_w_to_a, buffer, msg_index);
             }
-            else todo_wine
+            else
             {
                 ok(size == size_w_to_a, "Wrong size %d/%d, msg_index=%d\n",
                    size, size_w_to_a, msg_index);
@@ -2531,7 +2529,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV
         case 2:  /* normal Unicode string */
         case 3:  /* IsTextUnicode false negative */
         case 4:  /* Chinese chars */
-            if (unicode_server) todo_wine
+            if (unicode_server)
             {
                 /* double A->W mapping */
                 /* NT uses the full size, XP+ only until the first null */



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: Alexandre Julliard : Revert "winebrowser: Convert URL obtained
	through DdeGetData to Unicode."
Message-ID: <E1OSA5L-0006q0-4I@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6f2aa56ce640a3d9256f076271fbedbfddb972fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6f2aa56ce640a3d9256f076271fbedbfddb972fc

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 24 23:42:41 2010 +0200

Revert "winebrowser: Convert URL obtained through DdeGetData to Unicode."

This reverts commit 3dcf22e03fb4473db112bcd47671b37a037cbfc6. The
conversion is now properly handled in DDEML.

---

 programs/winebrowser/main.c |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c
index b959d38..f5ffe05 100644
--- a/programs/winebrowser/main.c
+++ b/programs/winebrowser/main.c
@@ -199,27 +199,15 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv,
             return (HDDEDATA)FALSE;
 
         case XTYP_EXECUTE:
-        {
-            char *buffer = NULL;
-
             if (!(size = DdeGetData(hData, NULL, 0, 0)))
                 WINE_ERR("DdeGetData returned zero size of execute string\n");
-            else if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size)))
+            else if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, size)))
                 WINE_ERR("Out of memory\n");
-            else if (DdeGetData(hData, (LPBYTE)buffer, size, 0) != size)
+            else if (DdeGetData(hData, (LPBYTE)ddeString, size, 0) != size)
                 WINE_WARN("DdeGetData did not return %d bytes\n", size);
-            else
-            {
-                int len = MultiByteToWideChar(CP_ACP, 0, buffer, -1, NULL, 0);
-                if (!(ddeString = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
-                    WINE_ERR("Out of memory\n");
-                else
-                    MultiByteToWideChar(CP_ACP, 0, buffer, -1, ddeString, len);
-            }
-            HeapFree(GetProcessHeap(), 0, buffer);
             DdeFreeDataHandle(hData);
             return (HDDEDATA)DDE_FACK;
-        }
+
         case XTYP_REQUEST:
             ret = -3; /* error */
             if (!(size = DdeQueryStringW(ddeInst, hsz2, NULL, 0, CP_WINUNICODE)))



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: Alexandre Julliard : shell32: Fix DDE command tracing now that we are
	receiving Unicode.
Message-ID: <E1OSA5L-0006qH-7Y@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cedeccce76a6e94c171c99215e507e6ce0228b0c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cedeccce76a6e94c171c99215e507e6ce0228b0c

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 25 00:00:35 2010 +0200

shell32: Fix DDE command tracing now that we are receiving Unicode.

---

 dlls/shell32/dde.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c
index 817fd33..2cbcb0d 100644
--- a/dlls/shell32/dde.c
+++ b/dlls/shell32/dde.c
@@ -88,13 +88,13 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic,
 
 static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
 {
-    BYTE * pszCommand;
+    WCHAR * pszCommand;
 
-    pszCommand = DdeAccessData(hdata, NULL);
+    pszCommand = (WCHAR *)DdeAccessData(hdata, NULL);
     if (!pszCommand)
         return DDE_FNOTPROCESSED;
 
-    FIXME("stub: %s %s\n", debugstr_hsz(hszTopic), pszCommand);
+    FIXME("stub: %s %s\n", debugstr_hsz(hszTopic), debugstr_w(pszCommand));
 
     DdeUnaccessData(hdata);
 



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: kernel32: Update a warning.
Message-ID: <E1OSA5L-0006qY-Am@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c85357a230cf80c4af651c4539086f3901c8a53f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c85357a230cf80c4af651c4539086f3901c8a53f

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Thu Jun 24 20:15:06 2010 +0200

kernel32: Update a warning.

---

 dlls/kernel32/computername.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c
index 258f297..f710d7c 100644
--- a/dlls/kernel32/computername.c
+++ b/dlls/kernel32/computername.c
@@ -551,7 +551,7 @@ BOOL WINAPI SetComputerNameW( LPCWSTR lpComputerName )
     {
         /* This check isn't necessary, but may help debugging problems. */
         WARN( "Disabled by Wine Configuration.\n" );
-        WARN( "Set \"UseDnsComputerName\" = \"N\" in category [Network] to enable.\n" );
+        WARN( "Set \"UseDnsComputerName\" = \"N\" in HKCU\\Software\\Wine\\Network to enable.\n" );
         SetLastError ( ERROR_ACCESS_DENIED );
         return FALSE;
     }



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: wineps.drv: Update comments.
Message-ID: <E1OSA5L-0006qp-Cr@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5038c2c286e365723d2067b8866831217777576c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5038c2c286e365723d2067b8866831217777576c

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Thu Jun 24 20:15:09 2010 +0200

wineps.drv: Update comments.

---

 dlls/wineps.drv/afm.c      |    7 ++++---
 dlls/wineps.drv/truetype.c |    2 +-
 dlls/wineps.drv/type1afm.c |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/wineps.drv/afm.c b/dlls/wineps.drv/afm.c
index 5c9278a..6f7d8f8 100644
--- a/dlls/wineps.drv/afm.c
+++ b/dlls/wineps.drv/afm.c
@@ -273,9 +273,10 @@ static BOOL AddBuiltinAFMs(void)
  *
  *	PSDRV_GetFontMetrics
  *
- * Parses all afm files listed in [afmdirs] and [TrueType Font Directories]
- * sections of Wine configuration file.  Adds built-in data last, so it can
- * be overridden by user-supplied AFM or TTF files.
+ * Parses all afm files listed in the
+ * HKEY_CURRENT_USER\\Software\\Wine\\Fonts registry key.
+ * Adds built-in data last, so it can be overridden by
+ * user-supplied AFM or TTF files.
  *
  * If this function fails, PSDRV_Init will destroy PSDRV_Heap, so don't worry
  * about freeing all the memory that's been allocated.
diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c
index 36ee404..e53b4ad 100644
--- a/dlls/wineps.drv/truetype.c
+++ b/dlls/wineps.drv/truetype.c
@@ -570,7 +570,7 @@ static BOOL ReadTrueTypeDir(FT_Library library, LPCSTR dirname)
  *  PSDRV_GetTrueTypeMetrics
  *
  *  Reads font metrics from TrueType font files in directories listed in the
- *  [TrueType Font Directories] section of the Wine configuration file.
+ *  HKEY_CURRENT_USER\\Software\\Wine\\Fonts\\Path registry string.
  *
  *  If this function fails (returns FALSE), the driver will fail to initialize
  *  and the driver heap will be destroyed, so it's not necessary to HeapFree
diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c
index e7248c4..f9a8bcb 100644
--- a/dlls/wineps.drv/type1afm.c
+++ b/dlls/wineps.drv/type1afm.c
@@ -1167,7 +1167,7 @@ static BOOL ReadAFMDir(LPCSTR dirname)
  *  PSDRV_GetType1Metrics
  *
  *  Reads font metrics from Type 1 AFM font files in directories listed in the
- *  [afmdirs] section of the Wine configuration file.
+ *  HKEY_CURRENT_USER\\Software\\Wine\\Fonts\\AFMPath registry string.
  *
  *  If this function fails (returns FALSE), the driver will fail to initialize
  *  and the driver heap will be destroyed, so it's not necessary to HeapFree



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winetest: Also abort while
	sending.
Message-ID: <E1OSA5L-0006r5-Es@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 8ee71cc5728060d9325221458252ac822ae341d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8ee71cc5728060d9325221458252ac822ae341d6

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Thu Jun 24 21:11:43 2010 +0200

winetest: Also abort while sending.

---

 programs/winetest/send.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/programs/winetest/send.c b/programs/winetest/send.c
index c250424..11c9f33 100644
--- a/programs/winetest/send.c
+++ b/programs/winetest/send.c
@@ -177,6 +177,7 @@ send_file_direct (const char *name)
     report (R_PROGRESS, 2, filesize);
     total = 0;
     while (total < filesize && ReadFile( file, buffer, BUFLEN/2, &bytes_read, NULL )) {
+        if (aborting) goto abort2;
         if (!bytes_read) break;
         total += bytes_read;
         if (total > filesize) bytes_read -= total - filesize;
@@ -344,6 +345,7 @@ send_file_wininet (const char *name)
     report (R_PROGRESS, 2, filesize);
     total = 0;
     while (total < filesize && ReadFile( file, buffer, BUFLEN/2, &bytes_read, NULL )) {
+        if (aborting) goto done;
         if (!bytes_read) break;
         total += bytes_read;
         if (total > filesize) bytes_read -= total - filesize;



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: notepad:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5L-0006rV-Io@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6f163d0c2bb88ad421372ff383ff6686f1322f77
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6f163d0c2bb88ad421372ff383ff6686f1322f77

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Wed Jun 23 20:57:14 2010 -0300

notepad: Update Portuguese (Brazilian) translation.

---

 programs/notepad/Pt.rc |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc
index 959ff51..7569627 100644
--- a/programs/notepad/Pt.rc
+++ b/programs/notepad/Pt.rc
@@ -181,6 +181,16 @@ Gostaria de salvar as altera??es?"
 STRING_NOTFOUND,					"'%s' n?o pode ser encontrado."
 STRING_OUT_OF_MEMORY,			"N?o h? mem?ria suficiente para completar essa \
 tarefa.\nFeche um ou mais aplicativos para aumentar a quantidade de mem?ria livre."
+
+STRING_UNICODE_LE,     "Unicode (UTF-16)"
+STRING_UNICODE_BE,     "Unicode (UTF-16 big-endian)"
+
+STRING_LOSS_OF_UNICODE_CHARACTERS,         "%s\n\
+Este arquivo cont?m caracteres Unicode que ser?o perdidos se\n\
+for salvo na codifica??o %s.\n\
+Para manter estes caracteres, clique em Cancelar e depois selecione\n\
+uma das op??es Unicode na lista de Codifica??es.\n\
+Continuar?"
 }
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: winefile:
	Update Portuguese translation.
Message-ID: <E1OSA5L-0006rn-Mg@wine.codeweavers.com>

Module: wine
Branch: master
Commit: aebcb448faff36972fcac59bd23853aa3ace0c0f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aebcb448faff36972fcac59bd23853aa3ace0c0f

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Thu Jun 24 16:34:56 2010 -0300

winefile: Update Portuguese translation.

---

 programs/winefile/Pt.rc |  204 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 149 insertions(+), 55 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=aebcb448faff36972fcac59bd23853aa3ace0c0f


From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: progman:
	Update Portuguese translation.
Message-ID: <E1OSA5L-0006s6-Qw@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6caca9628a57225d6e91d8236eeb42be0bfda14e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6caca9628a57225d6e91d8236eeb42be0bfda14e

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Thu Jun 24 18:25:34 2010 -0300

progman: Update Portuguese translation.

---

 programs/progman/Pt.rc |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/programs/progman/Pt.rc b/programs/progman/Pt.rc
index 2b07522..fd07068 100644
--- a/programs/progman/Pt.rc
+++ b/programs/progman/Pt.rc
@@ -35,8 +35,8 @@ MAIN_MENU MENU
    MENUITEM "A&brir\tEnter",             PM_OPEN
    MENUITEM "&Mover...\tF7",             PM_MOVE,      GRAYED
    MENUITEM "&Copiar...\tF8",             PM_COPY,      GRAYED
-   MENUITEM "&Excluir\tEntf",           PM_DELETE
-   MENUITEM "&Atributos...\tAlt+Enter",       PM_ATTRIBUTES
+   MENUITEM "E&xcluir\tEntf",           PM_DELETE
+   MENUITEM "A&tributos...\tAlt+Enter",       PM_ATTRIBUTES
    MENUITEM SEPARATOR
    MENUITEM "&Executar...",          PM_EXECUTE
    MENUITEM SEPARATOR
@@ -74,7 +74,7 @@ MAIN_MENU MENU
    MENUITEM "A&brir\tEnter",             PM_OPEN
    MENUITEM "&Mover...\tF7",             PM_MOVE,      GRAYED
    MENUITEM "&Copiar...\tF8",             PM_COPY,      GRAYED
-   MENUITEM "&Excluir\tEntf",           PM_DELETE
+   MENUITEM "E&xcluir\tEntf",           PM_DELETE
    MENUITEM "&Atributos...\tAlt+Enter",       PM_ATTRIBUTES
    MENUITEM SEPARATOR
    MENUITEM "&Executar...",          PM_EXECUTE
@@ -99,7 +99,7 @@ POPUP "Aj&uda" {
    MENUITEM "&Ajuda da ajuda",     PM_HELPONHELP
    MENUITEM "&Tutorial",         PM_TUTORIAL
    MENUITEM SEPARATOR
-   MENUITEM "&Acerca do Wine",     PM_ABOUT_WINE
+   MENUITEM "Acerca do &Wine",     PM_ABOUT_WINE
  }
 }
 
@@ -170,13 +170,13 @@ DIALOG_GROUP DIALOG 0, 0, 230, 65
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Atributos do grupo de programas"
 {
-LTEXT     "&Descri??o:", PM_DESCRIPTION_TXT,   05, 18,  50, 10
-EDITTEXT                            PM_DESCRIPTION,       60, 18,  90, 15, WS_TABSTOP
+LTEXT     "&Descri??o:", PM_DESCRIPTION_TXT,   05, 18,  60, 10
+EDITTEXT                            PM_DESCRIPTION,       70, 18,  90, 15, WS_TABSTOP
 LTEXT     "&Grupo de arquivo:",        PM_FILE_TXT,          05, 38,  50, 10
-EDITTEXT                            PM_FILE,              60, 38,  90, 15, WS_TABSTOP
-DEFPUSHBUTTON "OK",            IDOK,                155,  5,  60, 15, WS_TABSTOP
-PUSHBUTTON    "Cancelar",        IDCANCEL,            155, 25,  60, 15, WS_TABSTOP
-PUSHBUTTON    "Aj&uda",          PM_HELP,             155, 45,  60, 15, WS_TABSTOP
+EDITTEXT                            PM_FILE,              70, 38,  90, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",            IDOK,                165,  5,  60, 15, WS_TABSTOP
+PUSHBUTTON    "Cancelar",        IDCANCEL,            165, 25,  60, 15, WS_TABSTOP
+PUSHBUTTON    "Aj&uda",          PM_HELP,             165, 45,  60, 15, WS_TABSTOP
 }
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
@@ -185,13 +185,13 @@ DIALOG_GROUP DIALOG 0, 0, 230, 65
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Atributos do grupo de programas"
 {
-LTEXT     "&Descri??o:", PM_DESCRIPTION_TXT,   05, 18,  50, 10
-EDITTEXT                            PM_DESCRIPTION,       60, 18,  90, 15, WS_TABSTOP
+LTEXT     "&Descri??o:", PM_DESCRIPTION_TXT,   05, 18,  60, 10
+EDITTEXT                            PM_DESCRIPTION,       70, 18,  90, 15, WS_TABSTOP
 LTEXT     "&Grupo de ficheiro:",        PM_FILE_TXT,          05, 38,  50, 10
-EDITTEXT                            PM_FILE,              60, 38,  90, 15, WS_TABSTOP
-DEFPUSHBUTTON "OK",            IDOK,                155,  5,  60, 15, WS_TABSTOP
-PUSHBUTTON    "Cancelar",        IDCANCEL,            155, 25,  60, 15, WS_TABSTOP
-PUSHBUTTON    "Aj&uda",          PM_HELP,             155, 45,  60, 15, WS_TABSTOP
+EDITTEXT                            PM_FILE,              70, 38,  90, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",            IDOK,                165,  5,  60, 15, WS_TABSTOP
+PUSHBUTTON    "Cancelar",        IDCANCEL,            165, 25,  60, 15, WS_TABSTOP
+PUSHBUTTON    "Aj&uda",          PM_HELP,             165, 45,  60, 15, WS_TABSTOP
 }
 
 
@@ -294,12 +294,12 @@ IDS_DELETE_PROGRAM_s,		"Excluir programa '%s' ?"
 IDS_NOT_IMPLEMENTED,		"N?o implementado"
 IDS_FILE_READ_ERROR_s,		"Erro lendo '%s'."
 IDS_FILE_WRITE_ERROR_s,		"Erro escrevendo '%s'."
-IDS_GRPFILE_READ_ERROR_s,	"O arquivo de grupo '%s' n?o pode ser aberto.\nDever? ser tentado outras vezes?"
+IDS_GRPFILE_READ_ERROR_s,	"O arquivo de grupo '%s' n?o pode ser aberto.\nTentar novamente?"
 IDS_OUT_OF_MEMORY,		"Sem mem?ria."
 IDS_WINHELP_ERROR,		"Ajuda n?o dispon?vel."
 IDS_UNKNOWN_FEATURE_s,		"Recurso desconhecido em %s"
-IDS_FILE_NOT_OVERWRITTEN_s,	"Arquivo '%s' existe. N?o sobreescrevendo."
-IDS_SAVE_GROUP_AS_s,		"Salvar grupo como '%s' para prevenir a sobreescrita dos arquivos originais."
+IDS_FILE_NOT_OVERWRITTEN_s,	"Arquivo '%s' existe. N?o foi sobrescrito."
+IDS_SAVE_GROUP_AS_s,		"Salvar grupo como '%s' para prevenir a sobrescrita dos arquivos originais."
 IDS_NO_HOT_KEY,			"Nenhuma"
 IDS_ALL_FILES,			"Todos os arquivos (*.*)"
 IDS_PROGRAMS,			"Programas"



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: gphoto2.gs:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5L-0006sN-TJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ef21a144e7bcf97aece457510584394a6dc5b751
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ef21a144e7bcf97aece457510584394a6dc5b751

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Thu Jun 24 18:18:24 2010 -0300

gphoto2.gs: Update Portuguese (Brazilian) translation.

---

 dlls/gphoto2.ds/gphoto2_Pt.rc |   46 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/dlls/gphoto2.ds/gphoto2_Pt.rc b/dlls/gphoto2.ds/gphoto2_Pt.rc
index 284f557..fef94e0 100644
--- a/dlls/gphoto2.ds/gphoto2_Pt.rc
+++ b/dlls/gphoto2.ds/gphoto2_Pt.rc
@@ -2,6 +2,7 @@
  * Portuguese resources for Twain
  *
  * Copyright 2008 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,23 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
+    WS_CAPTION | WS_SYSMENU
+CAPTION "Arquivos na C?mera"
+FONT 8, "MS Sans Serif"
+BEGIN
+	CONTROL         "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER |
+WS_TABSTOP,7,7,358,229
+    DEFPUSHBUTTON   "Importar Selecionado",IDC_IMPORT,152,252,72,14
+    PUSHBUTTON      "Pr?-visualizar",IDC_FETCH,7,252,64,14
+    PUSHBUTTON      "Importar tudo",IDC_IMPORTALL,80,252,64,14
+    CONTROL         "Passar ? frente",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14
+    PUSHBUTTON      "Sair",IDC_EXIT,315,252,50,14
+END
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273
@@ -39,6 +57,19 @@ WS_TABSTOP,7,7,358,229
     PUSHBUTTON      "Sair",IDC_EXIT,315,252,50,14
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
+CAPTION "Transferindo"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT   "Transferindo... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
 CAPTION "A transferir"
@@ -47,6 +78,21 @@ BEGIN
     LTEXT   "A transferir... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_CONNECTING DIALOG DISCARDABLE  0, 0, 280, 116
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER
+CAPTION "Contectando ? c?mera"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110
+    LTEXT           "Contectando ? c?mera... Por favor espere",IDC_STATIC,128,58,
+                    116,8
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDD_CONNECTING DIALOG DISCARDABLE  0, 0, 280, 116
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER
 CAPTION "A ligar ? c?mara"



From julliard at winehq.org  Fri Jun 25 09:40:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:51 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: jscript:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5L-0006se-V1@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ca94a9cb0563a6ec0db43c39e15ec8e73474dfc2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ca94a9cb0563a6ec0db43c39e15ec8e73474dfc2

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Thu Jun 24 17:21:54 2010 -0300

jscript: Update Portuguese (Brazilian) translation.

---

 dlls/jscript/jscript_Pt.rc |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/jscript_Pt.rc b/dlls/jscript/jscript_Pt.rc
index 0ac712b..a907b10 100644
--- a/dlls/jscript/jscript_Pt.rc
+++ b/dlls/jscript/jscript_Pt.rc
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +21,34 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TO_PRIMITIVE        "Erro ao converter objeto em tipo primitivo"
+    IDS_INVALID_CALL_ARG    "Argumento ou chamada de procedimento inv?lida"
+    IDS_CREATE_OBJ_ERROR    "O servidor de automa??o n?o conseguiu criar o objeto"
+    IDS_NO_PROPERTY         "O objeto n?o suporta esta propriedade ou m?todo"
+    IDS_ARG_NOT_OPT         "Argumento n?o opcional"
+    IDS_SYNTAX_ERROR        "Erro de sintaxe"
+    IDS_SEMICOLON           "';' esperado"
+    IDS_LBRACKET            "'(' esperado"
+    IDS_RBRACKET            "')' esperado"
+    IDS_UNTERMINATED_STR    "Constante de string n?o terminada"
+    IDS_NOT_FUNC            "Fun??o esperada"
+    IDS_NOT_DATE            "'[object]' n?o ? um objeto de data"
+    IDS_NOT_NUM             "N?mero esperado"
+    IDS_OBJECT_EXPECTED     "Objeto esperado"
+    IDS_ILLEGAL_ASSIGN      "Atribui??o ilegal"
+    IDS_UNDEFINED           "'|' ? indefinido"
+    IDS_NOT_BOOL            "Objeto boleano esperado"
+    IDS_JSCRIPT_EXPECTED    "Objeto JScript esperado"
+    IDS_REGEXP_SYNTAX_ERROR "Erro de sintaxe na express?o regular"
+    IDS_URI_INVALID_CHAR    "URI a ser codificado cont?m caracteres inv?lidos"
+    IDS_INVALID_LENGTH      "Tamanho do vetor tem que ser um inteiro finito positivo"
+    IDS_ARRAY_EXPECTED      "Objeto Array esperado"
+}
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Fri Jun 25 09:40:52 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:52 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: mapi32:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5M-0006su-0f@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 007dc192957f928b38f2785073e76482e6a94344
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=007dc192957f928b38f2785073e76482e6a94344

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Thu Jun 24 17:29:51 2010 -0300

mapi32: Update Portuguese (Brazilian) translation.

---

 dlls/mapi32/Pt.rc |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/mapi32/Pt.rc b/dlls/mapi32/Pt.rc
index ab8a8d1..b12e6c5 100644
--- a/dlls/mapi32/Pt.rc
+++ b/dlls/mapi32/Pt.rc
@@ -2,6 +2,7 @@
 * MAPI32 Portuguese resources
 *
 * Copyright 2010 Ricardo Filipe
+* Copyright 2010 Gustavo Henrique Milar?
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -21,10 +22,18 @@
 
 #include "res.h"
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE
+{
+   IDS_NO_MAPI_CLIENT, "O envio do e-mail falhou porque n?o existe um cliente de e-mail MAPI instalado."
+   IDS_SEND_MAIL, "Enviar E-mail"
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 STRINGTABLE
 {
    IDS_NO_MAPI_CLIENT, "O envio de correio falhou porque n?o existe um cliente de correio MAPI instalado."



From julliard at winehq.org  Fri Jun 25 09:40:52 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:52 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: msacm32:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5M-0006tG-5a@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 16752ff94c7b512b7115f77e05f89651f0a9453a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=16752ff94c7b512b7115f77e05f89651f0a9453a

Author: Gustavo Henrique Milar?? <gugamilare at gmail.com>
Date:   Thu Jun 24 17:33:12 2010 -0300

msacm32: Update Portuguese (Brazilian) translation.

---

 dlls/msacm32/msacm_Pt.rc |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/msacm32/msacm_Pt.rc b/dlls/msacm32/msacm_Pt.rc
index 9309b4c..440dc3e 100644
--- a/dlls/msacm32/msacm_Pt.rc
+++ b/dlls/msacm32/msacm_Pt.rc
@@ -2,7 +2,8 @@
  * Portuguese resource file for MS ACM
  *
  * Copyright 2003 Marcelo Duarte
- * Copyright 2006 Am?rico Jos? Melo
+ * Copyright 2006 Am??rico Jos?? Melo
+ * Copyright 2010 Gustavo Henrique Milar??
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,11 +22,13 @@
 
 #include "wineacm.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE  10, 20, 225, 100
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Selec??o de som"
+CAPTION "Sele????o de som"
 FONT 8, "MS Shell Dlg"
 BEGIN
 
@@ -34,7 +37,7 @@ BEGIN
     COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60,
                     CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
-    PUSHBUTTON      "&Gravar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
+    PUSHBUTTON      "&Salvar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
     PUSHBUTTON      "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
 
     LTEXT           "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP
@@ -57,7 +60,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE  10, 20, 225, 100
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Selec??o de som"
+CAPTION "Selec????o de som"
 FONT 8, "MS Shell Dlg"
 BEGIN
 



From julliard at winehq.org  Fri Jun 25 09:40:52 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:52 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: mshtml:
	Updated Portuguese (Brazilian) translation.
Message-ID: <E1OSA5M-0006tW-81@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 06175d046fcd396d6e5122beb6212e8a39b48625
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=06175d046fcd396d6e5122beb6212e8a39b48625

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Thu Jun 24 17:52:32 2010 -0300

mshtml: Updated Portuguese (Brazilian) translation.

---

 dlls/mshtml/Pt.rc |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc
index 0620702..689f930 100644
--- a/dlls/mshtml/Pt.rc
+++ b/dlls/mshtml/Pt.rc
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +21,16 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_HTMLDISABLED    "A interpreta??o de HTML est? desativada."
+    IDS_HTMLDOCUMENT    "Documento HTML"
+    IDS_DOWNLOADING     "Fazendo o download..."
+    IDS_INSTALLING      "Instalando..."
+}
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE DISCARDABLE
@@ -30,6 +41,26 @@ STRINGTABLE DISCARDABLE
     IDS_INSTALLING      "A instalar..."
 }
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 260, 95
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalador Wine Gecko"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT "O Wine n?o p?de encontrar o pacote Gecko que ? necess?rio para aplica??es com HTML embutido" \
+          "funcionarem corretamente. O Wine pode automaticamente efetuar o download instal?-lo para voc?.\n\n" \
+          "Nota: ? recomend?vel usar os pacotes da sua distribui??o ao inv?s disso. \n\
+Veja http://wiki.winehq.org/Gecko para mais detalhes.",
+          ID_DWL_STATUS, 10, 10, 240, 60, SS_LEFT
+    CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12
+    DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 260, 95
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalador Wine Gecko"
@@ -44,6 +75,25 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP
 }
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65
+STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Hiperlink"
+FONT 8, "MS Shell Dlg"
+{
+    GROUPBOX "Informa??o do Hiperlink", -1, 5, 5, 190, 55
+    LTEXT "&Tipo:", -1, 10, 22, 20, 10
+    COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
+    LTEXT "&URL:", -1, 10, 42, 20, 10
+    EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hiperliga??o"
@@ -58,6 +108,9 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON "Cancelar", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP
 }
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
 ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION ""



From julliard at winehq.org  Fri Jun 25 09:40:52 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:52 -0500
Subject: Dylan Smith : wordpad: Use correct resource ID for tab stops dialog.
Message-ID: <E1OSA5M-0006tw-MV@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0c50285e3e49151bb13422e6c80574c53dfaaa69
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0c50285e3e49151bb13422e6c80574c53dfaaa69

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Thu Jun 24 18:36:04 2010 -0400

wordpad: Use correct resource ID for tab stops dialog.

Fixes regression from commit 55f024afe195659e257e4806e4737a7a0fa63c22.

---

 programs/wordpad/wordpad.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index d73a79b..0e6566d 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -2435,7 +2435,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
         break;
 
     case ID_TABSTOPS:
-        DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, tabstops_proc);
+        DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_TABSTOPS), hWnd, tabstops_proc);
         break;
 
     case ID_ABOUT:



From julliard at winehq.org  Fri Jun 25 09:40:53 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:53 -0500
Subject: Ken Thomases : winex11: Allow setting focus on active window,
	if no focus window.
Message-ID: <E1OSA5N-0006uE-2Q@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4bcf7cbbf010809cbdc7508e8e3d019588dfc0dc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4bcf7cbbf010809cbdc7508e8e3d019588dfc0dc

Author: Ken Thomases <ken at codeweavers.com>
Date:   Thu Jun 24 15:06:29 2010 -0500

winex11: Allow setting focus on active window, if no focus window.

---

 dlls/winex11.drv/event.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 64d1992..0e8d60c 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -483,6 +483,7 @@ static void set_focus( Display *display, HWND hwnd, Time time )
 
     GetGUIThreadInfo(0, &threadinfo);
     focus = threadinfo.hwndFocus;
+    if (!focus) focus = threadinfo.hwndActive;
     if (focus) focus = GetAncestor( focus, GA_ROOT );
     win = X11DRV_get_whole_window(focus);
 



From julliard at winehq.org  Fri Jun 25 09:40:53 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:53 -0500
Subject: Vincent Povirk : gdiplus: Stub GdipGetRenderingOrigin.
Message-ID: <E1OSA5N-0006ud-CH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 85c0e83dc513464dba48a4ab4ff66e4855b34abc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=85c0e83dc513464dba48a4ab4ff66e4855b34abc

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Thu Jun 24 12:09:26 2010 -0500

gdiplus: Stub GdipGetRenderingOrigin.

---

 dlls/gdiplus/gdiplus.spec |    2 +-
 dlls/gdiplus/graphics.c   |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 14e7fbf..a8f5b5f 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -383,7 +383,7 @@
 @ stub GdipGetRegionScans
 @ stdcall GdipGetRegionScansCount(ptr ptr ptr)
 @ stub GdipGetRegionScansI
-@ stub GdipGetRenderingOrigin
+@ stdcall GdipGetRenderingOrigin(ptr ptr ptr)
 @ stdcall GdipGetSmoothingMode(ptr ptr)
 @ stdcall GdipGetSolidFillColor(ptr ptr)
 @ stdcall GdipGetStringFormatAlign(ptr ptr)
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index da3c15f..5fed017 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -4216,6 +4216,20 @@ GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics *graphics, INT x, INT y)
     return NotImplemented;
 }
 
+GpStatus WINGDIPAPI GdipGetRenderingOrigin(GpGraphics *graphics, INT *x, INT *y)
+{
+    static int calls;
+
+    TRACE("(%p,%p,%p)\n", graphics, x, y);
+
+    if (!(calls++))
+        FIXME("not implemented\n");
+
+    *x = *y = 0;
+
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode)
 {
     TRACE("(%p, %d)\n", graphics, mode);



From julliard at winehq.org  Fri Jun 25 09:40:53 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:53 -0500
Subject: Vincent Povirk : gdiplus: Stub GdipGetLineTransform.
Message-ID: <E1OSA5N-0006uz-IA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2e4eb7144c39ac7e55f3ddad3d0364d31af418df
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2e4eb7144c39ac7e55f3ddad3d0364d31af418df

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Sat Jun 19 16:09:00 2010 -0500

gdiplus: Stub GdipGetLineTransform.

---

 dlls/gdiplus/brush.c      |   12 ++++++++++++
 dlls/gdiplus/gdiplus.spec |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index 57db380..1d05f3e 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -1784,6 +1784,18 @@ GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush,
     return NotImplemented;
 }
 
+GpStatus WINGDIPAPI GdipGetLineTransform(GpLineGradient *brush, GpMatrix *matrix)
+{
+    static int calls;
+
+    TRACE("(%p,%p)\n", brush, matrix);
+
+    if(!(calls++))
+        FIXME("not implemented\n");
+
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient *brush, REAL sx, REAL sy,
     GpMatrixOrder order)
 {
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index a8f5b5f..23c3ddd 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -309,7 +309,7 @@
 @ stdcall GdipGetLineRect(ptr ptr)
 @ stdcall GdipGetLineRectI(ptr ptr)
 @ stdcall GdipGetLineSpacing(ptr long ptr)
-@ stub GdipGetLineTransform
+@ stdcall GdipGetLineTransform(ptr ptr)
 @ stdcall GdipGetLineWrapMode(ptr ptr)
 @ stdcall GdipGetLogFontA(ptr ptr ptr)
 @ stdcall GdipGetLogFontW(ptr ptr ptr)



From julliard at winehq.org  Fri Jun 25 09:40:53 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:53 -0500
Subject: Vincent Povirk : gdiplus: Stub GdipMultiplyLineTransform.
Message-ID: <E1OSA5N-0006vL-KX@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 86f4e00fbac8cfd983ae1d45c85b4689942db103
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=86f4e00fbac8cfd983ae1d45c85b4689942db103

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Sat Jun 19 16:11:33 2010 -0500

gdiplus: Stub GdipMultiplyLineTransform.

---

 dlls/gdiplus/brush.c      |   13 +++++++++++++
 dlls/gdiplus/gdiplus.spec |    2 +-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index 1d05f3e..a6da058 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -1809,6 +1809,19 @@ GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient *brush, REAL sx, REAL
     return NotImplemented;
 }
 
+GpStatus WINGDIPAPI GdipMultiplyLineTransform(GpLineGradient *brush,
+    GDIPCONST GpMatrix *matrix, GpMatrixOrder order)
+{
+    static int calls;
+
+    TRACE("(%p,%p,%u)\n", brush, matrix, order);
+
+    if(!(calls++))
+        FIXME("not implemented\n");
+
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient* brush,
         REAL dx, REAL dy, GpMatrixOrder order)
 {
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 23c3ddd..68b8884 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -442,7 +442,7 @@
 @ stdcall GdipMeasureCharacterRanges(ptr wstr long ptr ptr ptr long ptr)
 @ stdcall GdipMeasureDriverString(ptr ptr long ptr ptr long ptr ptr)
 @ stdcall GdipMeasureString(ptr wstr long ptr ptr ptr ptr ptr ptr)
-@ stub GdipMultiplyLineTransform
+@ stdcall GdipMultiplyLineTransform(ptr ptr long)
 @ stdcall GdipMultiplyMatrix(ptr ptr long)
 @ stub GdipMultiplyPathGradientTransform
 @ stub GdipMultiplyPenTransform



From julliard at winehq.org  Fri Jun 25 09:40:53 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:53 -0500
Subject: Vincent Povirk : gdiplus: Stub GdipGetPathGradientCenterColor.
Message-ID: <E1OSA5N-0006vl-Oq@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0178093576da0763cf4b5956d8045a4ed552137e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0178093576da0763cf4b5956d8045a4ed552137e

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Sat Jun 19 16:15:00 2010 -0500

gdiplus: Stub GdipGetPathGradientCenterColor.

---

 dlls/gdiplus/brush.c      |   13 +++++++++++++
 dlls/gdiplus/gdiplus.spec |    2 +-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index a6da058..421d053 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -1064,6 +1064,19 @@ GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient *grad,
     return ret;
 }
 
+GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient *grad,
+    ARGB *colors)
+{
+    static int calls;
+
+    TRACE("(%p,%p)\n", grad, colors);
+
+    if(!(calls++))
+        FIXME("not implemented\n");
+
+    return NotImplemented;
+}
+
 GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient *grad,
     REAL *x, REAL *y)
 {
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 68b8884..e48a70a 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -327,7 +327,7 @@
 @ stdcall GdipGetPathFillMode(ptr ptr)
 @ stdcall GdipGetPathGradientBlend(ptr ptr ptr long)
 @ stdcall GdipGetPathGradientBlendCount(ptr ptr)
-@ stub GdipGetPathGradientCenterColor
+@ stdcall GdipGetPathGradientCenterColor(ptr ptr)
 @ stdcall GdipGetPathGradientCenterPoint(ptr ptr)
 @ stdcall GdipGetPathGradientCenterPointI(ptr ptr)
 @ stdcall GdipGetPathGradientFocusScales(ptr ptr ptr)



From julliard at winehq.org  Fri Jun 25 09:40:53 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:53 -0500
Subject: Vincent Povirk : gdiplus: Always create path gradient brushes with
	blend positions.
Message-ID: <E1OSA5N-0006w8-Ty@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4c93f9f8805251c88cb8536ed371f57cc35ecbbe
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c93f9f8805251c88cb8536ed371f57cc35ecbbe

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Sat Jun 19 16:31:14 2010 -0500

gdiplus: Always create path gradient brushes with blend positions.

---

 dlls/gdiplus/brush.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index 421d053..b399fce 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -574,12 +574,15 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points,
     if (!*grad) return OutOfMemory;
 
     (*grad)->blendfac = GdipAlloc(sizeof(REAL));
-    if(!(*grad)->blendfac){
+    (*grad)->blendpos = GdipAlloc(sizeof(REAL));
+    if(!(*grad)->blendfac || !(*grad)->blendpos){
+        GdipFree((*grad)->blendfac);
+        GdipFree((*grad)->blendpos);
         GdipFree(*grad);
         return OutOfMemory;
     }
     (*grad)->blendfac[0] = 1.0;
-    (*grad)->blendpos    = NULL;
+    (*grad)->blendpos[0] = 1.0;
     (*grad)->blendcount  = 1;
 
     (*grad)->pathdata.Count = count;
@@ -664,12 +667,15 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path,
     if (!*grad) return OutOfMemory;
 
     (*grad)->blendfac = GdipAlloc(sizeof(REAL));
-    if(!(*grad)->blendfac){
+    (*grad)->blendpos = GdipAlloc(sizeof(REAL));
+    if(!(*grad)->blendfac || !(*grad)->blendpos){
+        GdipFree((*grad)->blendfac);
+        GdipFree((*grad)->blendpos);
         GdipFree(*grad);
         return OutOfMemory;
     }
     (*grad)->blendfac[0] = 1.0;
-    (*grad)->blendpos    = NULL;
+    (*grad)->blendpos[0] = 1.0;
     (*grad)->blendcount  = 1;
 
     (*grad)->pathdata.Count = path->pathdata.Count;



From julliard at winehq.org  Fri Jun 25 09:40:54 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:54 -0500
Subject: Vincent Povirk : gdiplus: Stub GdipGetEncoderParameterListSize.
Message-ID: <E1OSA5O-0006wR-2s@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 63fa6915ec1c47ebdab655045bfbdcc6a2dbcc39
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=63fa6915ec1c47ebdab655045bfbdcc6a2dbcc39

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Sat Jun 19 16:40:11 2010 -0500

gdiplus: Stub GdipGetEncoderParameterListSize.

---

 dlls/gdiplus/gdiplus.spec |    2 +-
 dlls/gdiplus/image.c      |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index e48a70a..bf0de64 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -262,7 +262,7 @@
 @ stub GdipGetEffectParameters
 @ stdcall GdipGetEmHeight(ptr long ptr)
 @ stub GdipGetEncoderParameterList
-@ stub GdipGetEncoderParameterListSize
+@ stdcall GdipGetEncoderParameterListSize(ptr ptr ptr)
 @ stdcall GdipGetFamily(ptr ptr)
 @ stdcall GdipGetFamilyName(ptr ptr long)
 @ stdcall GdipGetFontCollectionFamilyCount(ptr ptr)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 8b55115..46f6056 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -3297,6 +3297,21 @@ GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodec
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipGetEncoderParameterListSize(GpImage *image,
+    GDIPCONST CLSID* clsidEncoder, UINT *size)
+{
+    static int calls;
+
+    TRACE("(%p,%s,%p)\n", image, debugstr_guid(clsidEncoder), size);
+
+    if(!(calls++))
+        FIXME("not implemented\n");
+
+    *size = 0;
+
+    return NotImplemented;
+}
+
 /*****************************************************************************
  * GdipCreateBitmapFromHBITMAP [GDIPLUS.@]
  */



From julliard at winehq.org  Fri Jun 25 09:40:54 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:54 -0500
Subject: Sven Baars : shell32: Fix Dutch translation.
Message-ID: <E1OSA5O-0006wm-5u@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5a348f61298174de631ade0d3d2b00fbc3f03fff
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5a348f61298174de631ade0d3d2b00fbc3f03fff

Author: Sven Baars <sven.wine at gmail.com>
Date:   Fri Jun 25 11:13:39 2010 +0200

shell32: Fix Dutch translation.

---

 dlls/shell32/shell32_Nl.rc |   50 ++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc
index 4dd6632..6030433 100644
--- a/dlls/shell32/shell32_Nl.rc
+++ b/dlls/shell32/shell32_Nl.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 MENU_001 MENU DISCARDABLE
 BEGIN
-	MENUITEM "&Grote Pictogrammen",	FCIDM_SHVIEW_BIGICON
-	MENUITEM "&Kleine Pictogrammen",	FCIDM_SHVIEW_SMALLICON
+	MENUITEM "&Grote pictogrammen",	FCIDM_SHVIEW_BIGICON
+	MENUITEM "&Kleine pictogrammen",	FCIDM_SHVIEW_SMALLICON
 	MENUITEM "&Lijst",			FCIDM_SHVIEW_LISTVIEW
 	MENUITEM "&Details",		FCIDM_SHVIEW_REPORTVIEW
 END
@@ -40,32 +40,32 @@ BEGIN
 	BEGIN
 	  POPUP "&Bekijken"
 	  BEGIN
-	    MENUITEM "&Grote Pictogrammen",	FCIDM_SHVIEW_BIGICON
-	    MENUITEM "&Kleine Pictogrammen",	FCIDM_SHVIEW_SMALLICON
+	    MENUITEM "&Grote pictogrammen",	FCIDM_SHVIEW_BIGICON
+	    MENUITEM "&Kleine pictogrammen",	FCIDM_SHVIEW_SMALLICON
 	    MENUITEM "&Lijst",		FCIDM_SHVIEW_LISTVIEW
 	    MENUITEM "&Details",	FCIDM_SHVIEW_REPORTVIEW
 	  END
 	  MENUITEM SEPARATOR
-	  POPUP "P&ictogrammen Sorteren"
+	  POPUP "P&ictogrammen sorteren"
 	  BEGIN
-	    MENUITEM "Op &Naam",	0x30	/* column 0 */
-	    MENUITEM "Op &Type",	0x32	/* column 2 */
-	    MENUITEM "Op &Grootte",	0x31	/* ... */
-	    MENUITEM "Op &Datum",	0x33
+	    MENUITEM "Op &naam",	0x30	/* column 0 */
+	    MENUITEM "Op &type",	0x32	/* column 2 */
+	    MENUITEM "Op &grootte",	0x31	/* ... */
+	    MENUITEM "Op &datum",	0x33
 	    MENUITEM SEPARATOR
 	    MENUITEM "&Automatisch",	FCIDM_SHVIEW_AUTOARRANGE
 	  END
-	  MENUITEM "Pictogrammen Uitlijnen",	FCIDM_SHVIEW_SNAPTOGRID
+	  MENUITEM "Pictogrammen uitlijnen",	FCIDM_SHVIEW_SNAPTOGRID
 	  MENUITEM SEPARATOR
 	  MENUITEM "Vernieuwen",		FCIDM_SHVIEW_REFRESH
 	  MENUITEM SEPARATOR
 	  MENUITEM "Plakken",		FCIDM_SHVIEW_INSERT
-	  MENUITEM "Plakken als Snelkoppeling",	FCIDM_SHVIEW_INSERTLINK
+	  MENUITEM "Plakken als snelkoppeling",	FCIDM_SHVIEW_INSERTLINK
 	  MENUITEM SEPARATOR
 	  POPUP "Nieuw"
 	  BEGIN
-	    MENUITEM "Nieuwe &Map",	FCIDM_SHVIEW_NEWFOLDER
-	    MENUITEM "Nieuwe Sne&lkoppeling",	FCIDM_SHVIEW_NEWLINK
+	    MENUITEM "Nieuwe &map",	FCIDM_SHVIEW_NEWFOLDER
+	    MENUITEM "Nieuwe sne&lkoppeling",	FCIDM_SHVIEW_NEWLINK
 	    MENUITEM SEPARATOR
 	  END
 	  MENUITEM SEPARATOR
@@ -88,7 +88,7 @@ BEGIN
 	  MENUITEM "K&nippen",		FCIDM_SHVIEW_CUT
 	  MENUITEM "&Kopi?ren",		FCIDM_SHVIEW_COPY
 	  MENUITEM SEPARATOR
-	  MENUITEM "Maak Sne&lkoppeling",	FCIDM_SHVIEW_CREATELINK
+	  MENUITEM "Maak sne&lkoppeling",	FCIDM_SHVIEW_CREATELINK
 	  MENUITEM "Ver&wijderen",		FCIDM_SHVIEW_DELETE
 	  MENUITEM "&Hernoemen",		FCIDM_SHVIEW_RENAME
 	  MENUITEM SEPARATOR
@@ -106,8 +106,8 @@ BEGIN
 
     POPUP "B&eeld"
     BEGIN
-        MENUITEM "&Grote Pictogrammen", FCIDM_SHVIEW_BIGICON
-        MENUITEM "&Kleine Pictogrammen", FCIDM_SHVIEW_SMALLICON
+        MENUITEM "&Grote pictogrammen", FCIDM_SHVIEW_BIGICON
+        MENUITEM "&Kleine pictogrammen", FCIDM_SHVIEW_SMALLICON
         MENUITEM "&Lijst", FCIDM_SHVIEW_LISTVIEW
         MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW
     END
@@ -120,7 +120,7 @@ END
 
 SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
-CAPTION "Bladeren naar Map"
+CAPTION "Bladeren naar map"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
@@ -135,7 +135,7 @@ FONT 8, "MS Shell Dlg"
 
 SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
-CAPTION "Bladeren naar Map"
+CAPTION "Bladeren naar map"
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "", IDD_TITLE, 10, 8, 198, 24
@@ -217,26 +217,26 @@ STRINGTABLE
         /* special folders */
 	IDS_DESKTOP		"Bureaublad"
 	IDS_MYCOMPUTER		"Mijn Computer"
-	IDS_RECYCLEBIN_FOLDER_NAME      "Vuilnisbak"
+	IDS_RECYCLEBIN_FOLDER_NAME      "Prullenbak"
 	IDS_CONTROLPANEL	"Configuratiescherm"
 
         /* context menus */
-	IDS_VIEW_LARGE		"Grote Pictogrammen"
-	IDS_VIEW_SMALL		"&Kleine Pictogrammen"
+	IDS_VIEW_LARGE		"Grote pictogrammen"
+	IDS_VIEW_SMALL		"&Kleine pictogrammen"
 	IDS_VIEW_LIST		"&Lijst"
 	IDS_VIEW_DETAILS	"&Details"
 	IDS_SELECT		"Selecteren"
 	IDS_OPEN		"Openen"
 
-	IDS_CREATEFOLDER_DENIED "Niet mogelijk om nieuwe map te maken: Geen permissies."
+	IDS_CREATEFOLDER_DENIED "Niet mogelijk om nieuwe map te maken: geen permissies."
 	IDS_CREATEFOLDER_CAPTION "Fout tijdens het maken van een nieuwe map"
 	IDS_DELETEITEM_CAPTION "Bevestig bestandsverwijdering"
 	IDS_DELETEFOLDER_CAPTION "Bevestig mapverwijdering"
 	IDS_DELETEITEM_TEXT "Weet u zeker dat u '%1' wilt verwijderen?"
 	IDS_DELETEMULTIPLE_TEXT "Weet u zeker dat u deze %1 bestanden wilt verwijderen?"
 	IDS_DELETESELECTED_TEXT "Weet u zeker dat u de geselecteerde bestand(en) wilt verwijderen?"
-	IDS_TRASHITEM_TEXT "Weet u zeker dat u '%1' naar de Vuilnisbak wilt verplaatsen?"
-	IDS_TRASHFOLDER_TEXT "Weet u zeker dat u '%1' en zijn gehele inhoud naar de Vuilnisbak wilt verplaatsen?"
+	IDS_TRASHITEM_TEXT "Weet u zeker dat u '%1' naar de Prullenbak wilt verplaatsen?"
+	IDS_TRASHFOLDER_TEXT "Weet u zeker dat u '%1' en zijn gehele inhoud naar de Prullenbak wilt verplaatsen?"
 	IDS_TRASHMULTIPLE_TEXT "Weet u zeker dat u deze %1 bestanden naar de Vuilnisbak wilt verplaatsen?"
 	IDS_CANTTRASH_TEXT "Bestand '%1' kan niet naar de Vuilnisbak worden verplaatst. Wilt u het bestand permanent verwijderen?"
 	IDS_OVERWRITEFILE_TEXT "Deze map bevat reeds een bestand genaamd '%1'.\n\nWilt u het vervangen?"
@@ -281,7 +281,7 @@ STRINGTABLE
 	IDS_MYPICTURES              "Mijn Afbeeldingen"
 	IDS_PROGRAM_FILES_COMMON    "Program Files\\Common Files"
 	IDS_COMMON_DOCUMENTS        "Documenten"
-	IDS_ADMINTOOLS              "Start Menu\\Programmas\\Administratieve Tools"
+	IDS_ADMINTOOLS              "Start Menu\\Programma's\\Administratieve Tools"
 	IDS_COMMON_MUSIC            "Documenten\\Mijn Muziek"
 	IDS_COMMON_PICTURES         "Documenten\\Mijn Afbeeldingen"
 	IDS_COMMON_VIDEO            "Documenten\\Mijn Videos"



From julliard at winehq.org  Fri Jun 25 09:40:54 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:54 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: kernel32: Update the
	Polish translation.
Message-ID: <E1OSA5O-0006x6-7x@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9edc384263bc1e6561b6f7f2b124235f33183dec
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9edc384263bc1e6561b6f7f2b124235f33183dec

Author: ??ukasz Wojni??owicz <lukasz.wojnilowicz at gmail.com>
Date:   Fri Jun 25 08:34:10 2010 +0200

kernel32: Update the Polish translation.

---

 dlls/kernel32/nls/winerr_plk.mc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/nls/winerr_plk.mc b/dlls/kernel32/nls/winerr_plk.mc
index cb1517b..6fd397c 100644
--- a/dlls/kernel32/nls/winerr_plk.mc
+++ b/dlls/kernel32/nls/winerr_plk.mc
@@ -3729,3 +3729,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED
 Language=PLK
 RPC_S_GRP_ELT_NOT_REMOVED
 .
+MessageId=2221
+SymbolicName=NERR_UserNotFound
+Language=PLK
+Nie znaleziono nazwy u?ytkownika
+.



From julliard at winehq.org  Fri Jun 25 09:40:54 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:54 -0500
Subject: Andrew Nguyen : msvcrt: Implement _makepath_s.
Message-ID: <E1OSA5O-0006xV-BJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9628a0d3e43c6fa0984aaa1ef60bd8a4cbdfbc64
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9628a0d3e43c6fa0984aaa1ef60bd8a4cbdfbc64

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Fri Jun 25 03:53:41 2010 -0500

msvcrt: Implement _makepath_s.

---

 dlls/msvcr100/msvcr100.spec |    2 +-
 dlls/msvcr80/msvcr80.spec   |    2 +-
 dlls/msvcr90/msvcr90.spec   |    2 +-
 dlls/msvcrt/dir.c           |  104 ++++++++++++++++++++++++++++++++++++
 dlls/msvcrt/msvcrt.spec     |    2 +-
 dlls/msvcrt/tests/dir.c     |  123 +++++++++++++++++++++++++++++++++++++++++++
 include/msvcrt/stdlib.h     |    1 +
 7 files changed, 232 insertions(+), 4 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=9628a0d3e43c6fa0984aaa1ef60bd8a4cbdfbc64


From julliard at winehq.org  Fri Jun 25 09:40:54 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:54 -0500
Subject: Andrew Nguyen : msvcrt: Implement _wmakepath_s.
Message-ID: <E1OSA5O-0006xn-FQ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 58dd97efcf5c9e9b204b9b520d4b017175cce37b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=58dd97efcf5c9e9b204b9b520d4b017175cce37b

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Fri Jun 25 03:53:54 2010 -0500

msvcrt: Implement _wmakepath_s.

---

 dlls/msvcr100/msvcr100.spec |    4 +-
 dlls/msvcr80/msvcr80.spec   |    4 +-
 dlls/msvcr90/msvcr90.spec   |    4 +-
 dlls/msvcrt/dir.c           |  104 +++++++++++++++++++++++++++++
 dlls/msvcrt/msvcrt.spec     |    4 +-
 dlls/msvcrt/tests/dir.c     |  152 ++++++++++++++++++++++++++++++++++---------
 include/msvcrt/stdlib.h     |    1 +
 7 files changed, 235 insertions(+), 38 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=58dd97efcf5c9e9b204b9b520d4b017175cce37b


From julliard at winehq.org  Fri Jun 25 09:40:54 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:54 -0500
Subject: Andrew Nguyen : gdiplus: Add a few additional traces to gdiplus image
	functions.
Message-ID: <E1OSA5O-0006yE-Jt@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6ea90c3c2edd37ddd37a3402ff23b97486c4aec3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6ea90c3c2edd37ddd37a3402ff23b97486c4aec3

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Fri Jun 25 04:26:53 2010 -0500

gdiplus: Add a few additional traces to gdiplus image functions.

---

 dlls/gdiplus/image.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 46f6056..252e19a 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -1391,6 +1391,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height,
     static int calls;
     GpStatus ret;
 
+    TRACE("(%d, %d, %p, %p)\n", width, height, target, bitmap);
+
     if(!target || !bitmap)
         return InvalidParameter;
 
@@ -2133,6 +2135,8 @@ GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage *image, PixelFormat *format)
 
 GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format)
 {
+    TRACE("(%p, %p)\n", image, format);
+
     if(!image || !format)
         return InvalidParameter;
 
@@ -2195,6 +2199,8 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile,
 {
     static int calls;
 
+    TRACE("(%p, %p)\n", metafile, header);
+
     if(!metafile || !header)
         return InvalidParameter;
 
@@ -2211,6 +2217,8 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size,
 {
     static int calls;
 
+    TRACE("(%p, %u, %u, %p)\n", image, size, num, items);
+
     if(!(calls++))
         FIXME("not implemented\n");
 
@@ -2221,6 +2229,8 @@ GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage *image, UINT* num)
 {
     static int calls;
 
+    TRACE("(%p, %p)\n", image, num);
+
     if(!(calls++))
         FIXME("not implemented\n");
 
@@ -2231,6 +2241,8 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID* list
 {
     static int calls;
 
+    TRACE("(%p, %u, %p)\n", image, num, list);
+
     if(!(calls++))
         FIXME("not implemented\n");
 
@@ -2242,6 +2254,8 @@ GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID id, UINT size,
 {
     static int calls;
 
+    TRACE("(%p, %u, %u, %p)\n", image, id, size, buffer);
+
     if(!(calls++))
         FIXME("not implemented\n");
 
@@ -2311,6 +2325,8 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image,
 GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image,
     UINT* count)
 {
+    TRACE("(%p, %p)\n", image, count);
+
     /* Native gdiplus 1.1 does not yet support multiple frame dimensions. */
 
     if(!image || !count)
@@ -2354,6 +2370,8 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image,
 {
     static int calls;
 
+    TRACE("(%p, %s, %u)\n", image, debugstr_guid(dimensionID), frameidx);
+
     if(!image || !dimensionID)
         return InvalidParameter;
 



From julliard at winehq.org  Fri Jun 25 09:40:54 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:54 -0500
Subject: Michael Stefaniuc : reg: Add the Romanian translation.
Message-ID: <E1OSA5O-0006yY-N0@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c3e602c6b5fc77fb22b0ad2de33a521616e30357
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c3e602c6b5fc77fb22b0ad2de33a521616e30357

Author: Michael Stefaniuc <mstefani at redhat.com>
Date:   Fri Jun 25 12:37:07 2010 +0200

reg: Add the Romanian translation.

Translation by Claudia Cotun?, reviewed by Alexandru B?lu?.

---

 programs/reg/Makefile.in |    1 +
 programs/reg/Ro.rc       |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in
index 90ae143..08d96e7 100644
--- a/programs/reg/Makefile.in
+++ b/programs/reg/Makefile.in
@@ -24,6 +24,7 @@ RC_SRCS = \
 	No.rc \
 	Pl.rc \
 	Pt.rc \
+	Ro.rc \
 	Ru.rc \
 	Si.rc \
 	Uk.rc
diff --git a/programs/reg/Ro.rc b/programs/reg/Ro.rc
new file mode 100644
index 0000000..9405c9c
--- /dev/null
+++ b/programs/reg/Ro.rc
@@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ *
+ * Copyright 2008 Andrew Riedi
+ * Copyright 2010 Claudia Cotun?
+ *                Michael Stefaniuc
+ *
+ * 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 "reg.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    STRING_USAGE, "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY ]\nREG comand? /?\n"
+    STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s separator] [/d date] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n"
+    STRING_SUCCESS, "Opera?iunea a fost finalizat? cu succes\n"
+    STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n"
+    STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comand?\n"
+    STRING_NO_REMOTE, "Eroare: Nu se pot ad?uga chei pe calculatorul de la distan??\n"
+    STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut g?si cheia sau valoarea de registru specificat?\n"
+}



From julliard at winehq.org  Fri Jun 25 09:40:54 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:54 -0500
Subject: Michael Stefaniuc : winedbg: Add the Romanian translation.
Message-ID: <E1OSA5O-0006yq-RG@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 911278b87494dd109e66575214abf595d753f8c3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=911278b87494dd109e66575214abf595d753f8c3

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Fri Jun 25 12:48:02 2010 +0200

winedbg: Add the Romanian translation.

Translation by Claudia Cotun?, reviewed by Alexandru B?lu?.

---

 programs/winedbg/Makefile.in |    1 +
 programs/winedbg/rsrc_Ro.rc  |   58 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 0 deletions(-)

diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index 2989457..6656db0 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -45,6 +45,7 @@ RC_SRCS = \
 	rsrc_No.rc \
 	rsrc_Pl.rc \
 	rsrc_Pt.rc \
+	rsrc_Ro.rc \
 	rsrc_Ru.rc \
 	rsrc_Si.rc \
 	rsrc_Sv.rc
diff --git a/programs/winedbg/rsrc_Ro.rc b/programs/winedbg/rsrc_Ro.rc
new file mode 100644
index 0000000..0f0ece3
--- /dev/null
+++ b/programs/winedbg/rsrc_Ro.rc
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 Mikolaj Zalewski
+ * Copyright 2010 Claudia Cotun?
+ *                Michael Stefaniuc
+ *
+ * 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 "resource.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+IDM_DEBUG_POPUP MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Depaneaz?", ID_DEBUG
+    END
+END
+
+IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Eroare de program"
+FONT 8, "Tahoma"
+BEGIN
+    LTEXT           "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0
+    LTEXT           "Programul %s a ?nt?mpinat o problem? grav? ?i trebuie s? \
+                     se ?nchid?. Ne cerem scuze pentru nepl?cerile create.",
+                    IDC_STATIC_TXT1,27,10,224,30
+    LTEXT           "Cauza poate fi o problem? ?n program sau o deficien?? ?n \
+                     Wine. Pute?i consulta http://appdb.winehq.org pentru \
+                     sugestii privind executarea acestei aplica?ii.\n\n\
+                     Dac? aceast? problem? nu este prezent? ?n Windows ?i nu a \
+                     fost raportat? ?nc?, o pute?i raporta la \
+                     http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100
+    DEFPUSHBUTTON   "?nchide", IDOK, 205, 151, 60, 16, WS_TABSTOP
+END
+
+STRINGTABLE
+BEGIN
+    IDS_AUTO_CAPTION     "Avarie program Wine"
+    IDS_INVALID_PARAMS   "Erori interne - s-au recep?ionat parametri nevalizi"
+    IDS_UNIDENTIFIED     "(neidentificat)"
+END



From julliard at winehq.org  Fri Jun 25 09:40:55 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:55 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: oledlg:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5P-0006zG-1P@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 44cc08ca794a8000c44d4f4abe86a2a6d5b892f4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=44cc08ca794a8000c44d4f4abe86a2a6d5b892f4

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Fri Jun 25 00:39:53 2010 -0300

oledlg: Update Portuguese (Brazilian) translation.

---

 dlls/oledlg/oledlg_Pt.rc |   55 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/dlls/oledlg/oledlg_Pt.rc b/dlls/oledlg/oledlg_Pt.rc
index 9ef209e..f37719f 100644
--- a/dlls/oledlg/oledlg_Pt.rc
+++ b/dlls/oledlg/oledlg_Pt.rc
@@ -2,6 +2,7 @@
  * Copyright 2004 Marcelo Duarte
  * Copyright 2006 Am?rico Jos? Melo
  * Copyright 2009 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -103,6 +104,37 @@ STRINGTABLE DISCARDABLE
   IDS_NOTOLEMODCAPTION  "Adicionar Controlo"
 }
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140
+STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Colar Especial"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT         "Origem:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
+    CONTROL       "&Colar", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
+                  6, 38, 55, 10
+    CONTROL       "Colar &Link", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
+                  6, 63, 55, 10
+    LTEXT         "&Como:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP
+    LISTBOX       IDC_PS_PASTELIST,     65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_DISPLAYLIST,   65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE
+    CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
+    CONTROL       "Cancelar", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
+    CONTROL       "&Ajuda", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
+    CONTROL       "&Mostrar como ?cone", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
+    CONTROL       "Mudar &?cone...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
+    CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
+    CONTROL       "<< texto resultante fica aqui >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
+    CONTROL       "Resultado", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48
+    CONTROL       "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Colar Especial"
@@ -120,15 +152,34 @@ BEGIN
     CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
     CONTROL       "Cancelar", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
     CONTROL       "&Ajuda", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
-    CONTROL       "&Mostrar como Icone", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    CONTROL       "&Mostrar como ?cone", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
     CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
-    CONTROL       "Mudar &Icone...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
+    CONTROL       "Mudar &?cone...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
     CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
     CONTROL       "<< texto resultante fica aqui >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
     CONTROL       "Resultado", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48
     CONTROL       "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_PS_PASTE_DATA                     "Insere o conte?do da ?rea de transfer?ncia no seu documento como %s."
+    IDS_PS_PASTE_OBJECT                   "Insere o conte?do da ?rea de transfer?ncia no seu documento para que seja poss?vel ativ?-lo usando %s."
+    IDS_PS_PASTE_OBJECT_AS_ICON           "Insere o conte?do da ?rea de transfer?ncia no seu documento para que seja poss?vel ativ?-lo usando %s.  Ser? mostrado como um ?cone."
+    IDS_PS_PASTE_LINK_DATA                "Insere o conte?do da ?rea de transfer?ncia no seu documento como %s.  Os dados est?o ligados ao arquivo de origem para que altera??es ao arquivo se reflitam no seu documento."
+    IDS_PS_PASTE_LINK_OBJECT              "Insere uma imagem da ?rea de transfer?ncia no seu documento.  A imagem fica ligada ao arquivo de origem para que altera??es ao arquivo se reflitam no seu documento."
+    IDS_PS_PASTE_LINK_OBJECT_AS_ICON      "Insere um atalho que aponta para a localiza??o do conte?do na ?rea de transfer?ncia.  O atalho fica ligado ao arquivo de origem para que altera??es ao arquivo se reflitam no seu documento."
+    IDS_PS_NON_OLE                        "Insere o conte?do da ?rea de transfer?ncia no seu documento."
+    IDS_PS_UNKNOWN_TYPE                   "Tipo Desconhecido"
+    IDS_PS_UNKNOWN_SRC                    "Origem Desconhecida"
+    IDS_PS_UNKNOWN_APP                    "o programa que o criou"
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 STRINGTABLE DISCARDABLE
 {
     IDS_PS_PASTE_DATA                     "Insere o conte?do da ?rea de transfer?ncia no seu documento como %s."



From julliard at winehq.org  Fri Jun 25 09:40:55 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:55 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: msi:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5P-0006ze-9G@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e45330968a03e23e1688712fc2b4c1cd8c92e9d4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e45330968a03e23e1688712fc2b4c1cd8c92e9d4

Author: Gustavo Henrique Milar?? <gugamilare at gmail.com>
Date:   Fri Jun 25 00:18:49 2010 -0300

msi: Update Portuguese (Brazilian) translation.

---

 dlls/msi/msi_Pt.rc |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/dlls/msi/msi_Pt.rc b/dlls/msi/msi_Pt.rc
index 94cc633..4a1045c 100644
--- a/dlls/msi/msi_Pt.rc
+++ b/dlls/msi/msi_Pt.rc
@@ -2,7 +2,8 @@
  * Portuguese resources for MSI
  *
  * Copyright 2005 Marcelo Duarte
- * Copyright 2006 Am?rico Jos? Melo
+ * Copyright 2006 Am??rico Jos?? Melo
+ * Copyright 2010 Gustavo Henrique Milar??
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,45 +22,47 @@
 
 #include "windef.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 STRINGTABLE DISCARDABLE
 {
-	4 "The specified installation package could not be opened.  Please check the file path and try again."
-	5 "caminho %s n?o encontrado"
+	4 "O pacote de instala????o especificado n??o p??de ser aberto. Por favor, verifique o arquivo e tente novamente."
+	5 "caminho %s n??o encontrado"
 	9 "insira disco %s"
 	10 "Windows Installer %s\n\n" \
-	"Usage:\n" \
+	"Modo de usar:\n" \
 	"msiexec command {required parameter} [optional parammeter]\n\n" \
-	"Install a product:\n" \
+	"Instalar um produto:\n" \
 	"\t/i {package|productcode} [property]\n" \
 	"\t/package {package|productcode} [property]\n" \
 	"\t/a package [property]\n" \
-	"Repair an installation:\n" \
+	"Reparar uma instala????o:\n" \
 	"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \
-	"Uninstall a product:\n" \
+	"Desinstalar um produto:\n" \
 	"\t/uninstall {package|productcode} [property]\n" \
 	"\t/x {package|productcode} [property]\n" \
-	"Advertise a product:\n" \
+	"Anunciar um produto:\n" \
 	"\t/j[u|m] package [/t transform] [/g languageid]\n" \
-	"Apply a patch:\n" \
+	"Aplicar um patch:\n" \
 	"\t/p patchpackage [property]\n" \
 	"\t/p patchpackage /a package [property]\n" \
-	"Log and UI Modifiers for above commands:\n" \
+	"Modificadores Log e UI para os comandos acima:\n" \
 	"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \
 	"\t/q{|n|b|r|f|n+|b+|b-}\n" \
-	"Register MSI Service:\n" \
+	"Registrar Servi??o MSI:\n" \
 	"\t/y\n" \
-	"Unregister MSI Service:\n" \
+	"Desregistrar Servi??o MSI:\n" \
 	"\t/z\n" \
-	"Display this help:\n" \
+	"Mostrar esta ajuda:\n" \
 	"\t/help\n" \
 	"\t/?\n"
-	11 "entre qual pasta cont?m %s"
-	12 "instalar fonte para caracter?stica faltando"
-	13 "drive de rede para  caracter?stica faltando"
-	14 "caracter?stica de:"
-	15 "escolha qual pasta cont?m %s"
+	11 "entre a pasta que cont??m %s"
+	12 "faltando fonte de instala????o para caracter??stica"
+	13 "faltando drive de rede para caracter??stica"
+	14 "origem da caracter??stica:"
+	15 "escolha a pasta que cont??m %s"
 }
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
@@ -67,7 +70,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 STRINGTABLE DISCARDABLE
 {
 	4 "The specified installation package could not be opened.  Please check the file path and try again."
-	5 "localiza??o %s n?o encontrada"
+	5 "localiza????o %s n??o encontrada"
 	9 "insira o disco %s"
 	10 "Windows Installer %s\n\n" \
 	"Usage:\n" \
@@ -96,9 +99,9 @@ STRINGTABLE DISCARDABLE
 	"Display this help:\n" \
 	"\t/help\n" \
 	"\t/?\n"
-	11 "indique que pasta cont?m %s"
-	12 "instalar fonte para a op??o em falta"
-	13 "controlador de rede para a op??o em falta"
-	14 "op??o de:"
-	15 "indique que pasta cont?m %s"
+	11 "indique que pasta cont??m %s"
+	12 "instalar fonte para a op????o em falta"
+	13 "controlador de rede para a op????o em falta"
+	14 "op????o de:"
+	15 "indique que pasta cont??m %s"
 }



From julliard at winehq.org  Fri Jun 25 09:40:55 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:55 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: oleacc:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5P-000707-Gj@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f977762f6b0d24443d917d716d25875380174573
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f977762f6b0d24443d917d716d25875380174573

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Fri Jun 25 00:32:03 2010 -0300

oleacc: Update Portuguese (Brazilian) translation.

---

 dlls/oleacc/oleacc_Pt.rc |   72 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 72 insertions(+), 0 deletions(-)

diff --git a/dlls/oleacc/oleacc_Pt.rc b/dlls/oleacc/oleacc_Pt.rc
index 395324a..9620840 100644
--- a/dlls/oleacc/oleacc_Pt.rc
+++ b/dlls/oleacc/oleacc_Pt.rc
@@ -2,6 +2,7 @@
  * Portuguese resources for oleacc
  *
  * Copyright 2009 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,77 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+{
+    0 "objecto desconhecido" /* undocumented */
+    ROLE_SYSTEM_TITLEBAR    "barra de t?tulo"
+    ROLE_SYSTEM_MENUBAR     "barra de menu"
+    ROLE_SYSTEM_SCROLLBAR   "barra de rolagem"
+    ROLE_SYSTEM_GRIP        "grip"
+    ROLE_SYSTEM_SOUND       "som"
+    ROLE_SYSTEM_CURSOR      "cursor"
+    ROLE_SYSTEM_CARET       "caret"
+    ROLE_SYSTEM_ALERT       "alerta"
+    ROLE_SYSTEM_WINDOW      "janela"
+    ROLE_SYSTEM_CLIENT      "cliente"
+    ROLE_SYSTEM_MENUPOPUP   "menu popup"
+    ROLE_SYSTEM_MENUITEM    "item do menu"
+    ROLE_SYSTEM_TOOLTIP     "dica"
+    ROLE_SYSTEM_APPLICATION "aplicativo"
+    ROLE_SYSTEM_DOCUMENT    "documento"
+    ROLE_SYSTEM_PANE        "painel"
+    ROLE_SYSTEM_CHART       "gr?fico"
+    ROLE_SYSTEM_DIALOG      "di?logo"
+    ROLE_SYSTEM_BORDER      "margem"
+    ROLE_SYSTEM_GROUPING    "agrupamento"
+    ROLE_SYSTEM_SEPARATOR   "separador"
+    ROLE_SYSTEM_TOOLBAR     "barra de ferramentas"
+    ROLE_SYSTEM_STATUSBAR   "barra de estado"
+    ROLE_SYSTEM_TABLE        "tabela"
+    ROLE_SYSTEM_COLUMNHEADER "cabe?alho da coluna"
+    ROLE_SYSTEM_ROWHEADER    "cabe?alho da linha"
+    ROLE_SYSTEM_COLUMN       "coluna"
+    ROLE_SYSTEM_ROW          "linha"
+    ROLE_SYSTEM_CELL         "c?lula"
+    ROLE_SYSTEM_LINK         "link"
+    ROLE_SYSTEM_HELPBALLOON  "bal?o de ajuda"
+    ROLE_SYSTEM_CHARACTER    "caractere"
+    ROLE_SYSTEM_LIST         "lista"
+    ROLE_SYSTEM_LISTITEM     "item da lista"
+    ROLE_SYSTEM_OUTLINE      "contorno"
+    ROLE_SYSTEM_OUTLINEITEM  "item de contorno"
+    ROLE_SYSTEM_PAGETAB      "tab de p?gina"
+    ROLE_SYSTEM_PROPERTYPAGE "p?gina de propriedades"
+    ROLE_SYSTEM_INDICATOR    "indicador"
+    ROLE_SYSTEM_GRAPHIC      "gr?fico"
+    ROLE_SYSTEM_STATICTEXT   "texto est?tico"
+    ROLE_SYSTEM_TEXT         "texto"
+    ROLE_SYSTEM_PUSHBUTTON   "push button"
+    ROLE_SYSTEM_CHECKBUTTON  "check button"
+    ROLE_SYSTEM_RADIOBUTTON  "radio button"
+    ROLE_SYSTEM_COMBOBOX     "combo box"
+    ROLE_SYSTEM_DROPLIST     "drop down"
+    ROLE_SYSTEM_PROGRESSBAR  "barra de progresso"
+    ROLE_SYSTEM_DIAL         "dial"
+    ROLE_SYSTEM_HOTKEYFIELD  "hot key field"
+    ROLE_SYSTEM_SLIDER       "slider"
+    ROLE_SYSTEM_SPINBUTTON   "spin box"
+    ROLE_SYSTEM_DIAGRAM      "diagrama"
+    ROLE_SYSTEM_ANIMATION    "anima??o"
+    ROLE_SYSTEM_EQUATION     "equa??o"
+    ROLE_SYSTEM_BUTTONDROPDOWN "drop down button"
+    ROLE_SYSTEM_BUTTONMENU   "menu button"
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid drop down button"
+    ROLE_SYSTEM_WHITESPACE   "espa?o em branco"
+    ROLE_SYSTEM_PAGETABLIST  "page tab list"
+    ROLE_SYSTEM_CLOCK        "rel?gio"
+    ROLE_SYSTEM_SPLITBUTTON  "split button"
+    ROLE_SYSTEM_IPADDRESS    "endere?o IP"
+    ROLE_SYSTEM_OUTLINEBUTTON "outline button"
+}
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Fri Jun 25 09:40:55 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:55 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: sane.ds:
	Update Portuguese (Brazilian) translation.
Message-ID: <E1OSA5P-00070b-LV@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 820358853dc8161979554c8ef40404f3b608162d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=820358853dc8161979554c8ef40404f3b608162d

Author: Gustavo Henrique Milar? <gugamilare at gmail.com>
Date:   Fri Jun 25 00:45:14 2010 -0300

sane.ds: Update Portuguese (Brazilian) translation.

---

 dlls/sane.ds/sane_Pt.rc |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/dlls/sane.ds/sane_Pt.rc b/dlls/sane.ds/sane_Pt.rc
index 9b0ff41..a0b0b3d 100644
--- a/dlls/sane.ds/sane_Pt.rc
+++ b/dlls/sane.ds/sane_Pt.rc
@@ -2,6 +2,7 @@
  * Portuguese resources for Twain
  *
  * Copyright 2008 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milar?
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +21,17 @@
 
 #include "resource.h"
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
+CAPTION "Escaneando"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT   "ESCANEANDO... Por Favor Espere",IDC_STATIC,5,19,176,8, SS_CENTER
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
@@ -30,6 +41,9 @@ BEGIN
     LTEXT   "A PESQUISAR... Por Favor Espere",IDC_STATIC,5,19,176,8, SS_CENTER
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
 STRINGTABLE DISCARDABLE
 {
  0 ""



From julliard at winehq.org  Fri Jun 25 09:40:55 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:55 -0500
Subject: =?UTF-8?Q?Gustavo=20Henrique=20Mila?==?UTF-8?Q?r=C3=A9=20?=: serialui:
	Fix Portuguese (Brazilian) translation.
Message-ID: <E1OSA5P-00070z-Tk@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a254524a029c7b58f4d69e852cc388d99ac67894
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a254524a029c7b58f4d69e852cc388d99ac67894

Author: Gustavo Henrique Milar?? <gugamilare at gmail.com>
Date:   Fri Jun 25 00:47:45 2010 -0300

serialui: Fix Portuguese (Brazilian) translation.

---

 dlls/serialui/Pt.rc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/serialui/Pt.rc b/dlls/serialui/Pt.rc
index 6d42420..9b949f3 100644
--- a/dlls/serialui/Pt.rc
+++ b/dlls/serialui/Pt.rc
@@ -1,6 +1,7 @@
 /*
  * Copyright 2003 Marcelo Duarte
- * Copyright 2004 Am?rico Jos? Melo
+ * Copyright 2004 Am??rico Jos?? Melo
+ * Copyright 2010 Gustavo Henrique Milar??
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,18 +20,20 @@
 
 #include "serialui.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propriedades para "
+CAPTION "Propriedades de "
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT         "Bits por segundo", -1,5,20,55,10
   COMBOBOX      IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
   LTEXT         "Paridade", -1,5,40,55,10
   COMBOBOX      IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
-  LTEXT         "Control de fluxo", -1,5,60,55,10
+  LTEXT         "Controle de fluxo", -1,5,60,55,10
   COMBOBOX      IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP
   LTEXT         "Bits de dados", -1,5,80,55,10
   COMBOBOX      IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP



From julliard at winehq.org  Fri Jun 25 09:40:56 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 09:40:56 -0500
Subject: Ilya Basin : shell32/tests: SHELL_ArgifyW(%2|%*|%~3, ...) tests.
Message-ID: <E1OSA5Q-00071K-1V@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9c23b5debcd4a55492c1e8c4f2e117b43c37db37
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9c23b5debcd4a55492c1e8c4f2e117b43c37db37

Author: Ilya Basin <basinilya at gmail.com>
Date:   Tue Jun 22 23:15:04 2010 +0400

shell32/tests: SHELL_ArgifyW(%2|%*|%~3, ...) tests.

---

 dlls/shell32/tests/shlexec.c |  137 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 137 insertions(+), 0 deletions(-)

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 8455776..b883d0b 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -960,6 +960,133 @@ static void test_lpFile_parsed(void)
         "expected success (33), got %s (%d), lpFile: %s\n",
         rc > 32 ? "success" : "failure", rc, fileA
         );
+
+}
+
+static void test_argify(void)
+{
+    char fileA[MAX_PATH];
+
+    int rc;
+
+    sprintf(fileA, "%s\\test file.shlexec", tmpdir);
+
+    /* %2 */
+    rc=shell_execute("NoQuotesParam2", fileA, "a b", NULL);
+    ok(rc>32,
+        "expected success (33), got %s (%d), lpFile: %s\n",
+        rc > 32 ? "success" : "failure", rc, fileA
+        );
+    if (rc>32)
+    {
+        okChildInt("argcA", 5);
+        okChildString("argvA4", "a");
+    }
+
+    /* %2 */
+    /* '"a"""'   -> 'a"' */
+    rc=shell_execute("NoQuotesParam2", fileA, "\"a:\"\"some string\"\"\"", NULL);
+    ok(rc>32,
+        "expected success (33), got %s (%d), lpFile: %s\n",
+        rc > 32 ? "success" : "failure", rc, fileA
+        );
+    if (rc>32)
+    {
+        okChildInt("argcA", 5);
+        todo_wine {
+            okChildString("argvA4", "a:some string");
+        }
+    }
+
+    /* %2 */
+    /* backslash isn't escape char
+     * '"a\""'   -> '"a\""' */
+    rc=shell_execute("NoQuotesParam2", fileA, "\"a:\\\"some string\\\"\"", NULL);
+    ok(rc>32,
+        "expected success (33), got %s (%d), lpFile: %s\n",
+        rc > 32 ? "success" : "failure", rc, fileA
+        );
+    if (rc>32)
+    {
+        okChildInt("argcA", 5);
+        todo_wine {
+            okChildString("argvA4", "a:\\");
+        }
+    }
+
+    /* "%2" */
+    /* \t isn't whitespace */
+    rc=shell_execute("QuotedParam2", fileA, "a\tb c", NULL);
+    ok(rc>32,
+        "expected success (33), got %s (%d), lpFile: %s\n",
+        rc > 32 ? "success" : "failure", rc, fileA
+        );
+    if (rc>32)
+    {
+        okChildInt("argcA", 5);
+        todo_wine {
+            okChildString("argvA4", "a\tb");
+        }
+    }
+
+    /* %* */
+    rc=shell_execute("NoQuotesAllParams", fileA, "a b c d e f g h", NULL);
+    ok(rc>32,
+        "expected success (33), got %s (%d), lpFile: %s\n",
+        rc > 32 ? "success" : "failure", rc, fileA
+        );
+    if (rc>32)
+    {
+        todo_wine {
+            okChildInt("argcA", 12);
+            okChildString("argvA4", "a");
+            okChildString("argvA11", "h");
+        }
+    }
+
+    /* %* can sometimes contain only whitespaces and no args */
+    rc=shell_execute("QuotedAllParams", fileA, "   ", NULL);
+    ok(rc>32,
+        "expected success (33), got %s (%d), lpFile: %s\n",
+        rc > 32 ? "success" : "failure", rc, fileA
+        );
+    if (rc>32)
+    {
+        todo_wine {
+            okChildInt("argcA", 5);
+            okChildString("argvA4", "   ");
+        }
+    }
+
+    /* %~3 */
+    rc=shell_execute("NoQuotesParams345etc", fileA, "a b c d e f g h", NULL);
+    ok(rc>32,
+        "expected success (33), got %s (%d), lpFile: %s\n",
+        rc > 32 ? "success" : "failure", rc, fileA
+        );
+    if (rc>32)
+    {
+        todo_wine {
+            okChildInt("argcA", 11);
+            okChildString("argvA4", "b");
+            okChildString("argvA10", "h");
+        }
+    }
+
+    /* %~3 is rest of command line starting with whitespaces after 2nd arg */
+    rc=shell_execute("QuotedParams345etc", fileA, "a    ", NULL);
+    ok(rc>32,
+        "expected success (33), got %s (%d), lpFile: %s\n",
+        rc > 32 ? "success" : "failure", rc, fileA
+        );
+    if (rc>32)
+    {
+        okChildInt("argcA", 5);
+        todo_wine {
+            okChildString("argvA4", "    ");
+        }
+    }
+
 }
 
 static void test_filename(void)
@@ -1935,6 +2062,15 @@ static void init_test(void)
     create_test_verb(".shlexec", "QuotedLowerL", 0, "QuotedLowerL \"%l\"");
     create_test_verb(".shlexec", "UpperL", 0, "UpperL %L");
     create_test_verb(".shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\"");
+
+    create_test_verb(".shlexec", "NoQuotesParam2", 0, "NoQuotesParam2 %2");
+    create_test_verb(".shlexec", "QuotedParam2", 0, "QuotedParam2 \"%2\"");
+
+    create_test_verb(".shlexec", "NoQuotesAllParams", 0, "NoQuotesAllParams %*");
+    create_test_verb(".shlexec", "QuotedAllParams", 0, "QuotedAllParams \"%*\"");
+
+    create_test_verb(".shlexec", "NoQuotesParams345etc", 0, "NoQuotesParams345etc %~3");
+    create_test_verb(".shlexec", "QuotedParams345etc", 0, "QuotedParams345etc \"%~3\"");
 }
 
 static void cleanup_test(void)
@@ -2048,6 +2184,7 @@ START_TEST(shlexec)
 
     init_test();
 
+    test_argify();
     test_lpFile_parsed();
     test_filename();
     test_find_executable();



From julliard at winehq.org  Fri Jun 25 12:39:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 12:39:43 -0500
Subject: Alexandre Julliard : Release 1.2-rc5.
Message-ID: <E1OSCsR-0008KD-JF@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d474d3f142b6e5f50ca3253cd170695ac3cc8930
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d474d3f142b6e5f50ca3253cd170695ac3cc8930

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 25 19:30:52 2010 +0200

Release 1.2-rc5.

---

 ANNOUNCE  |  557 ++++++++++++++++++++++++++++++++++---------------------------
 VERSION   |    2 +-
 configure |   18 +-
 3 files changed, 319 insertions(+), 258 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=d474d3f142b6e5f50ca3253cd170695ac3cc8930


From julliard at winehq.org  Fri Jun 25 12:39:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 12:39:43 -0500
Subject: Tag wine-1.2-rc5 : Alexandre Julliard : Release 1.2-rc5
Message-ID: <E1OSCsR-0008KS-LI@wine.codeweavers.com>

Module: wine
Branch: refs/tags/wine-1.2-rc5
Tag:    26839599d89a130d7172108ab98c3305f0406a84
URL:    http://source.winehq.org/git/wine.git/?a=tag;h=26839599d89a130d7172108ab98c3305f0406a84

Tagger: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 25 19:30:54 2010 +0200

Release 1.2-rc5


From julliard at winehq.org  Fri Jun 25 12:40:08 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Fri, 25 Jun 2010 12:40:08 -0500
Subject: Alexandre Julliard : Wine release 1.2-rc5
Message-ID: <E1OSCsq-000074-Nd@wine.codeweavers.com>

Module: website
Branch: master
Commit: 0fa2e8226eebc57a257a6ef32f3f45ef69874952
URL:    http://source.winehq.org/git/website.git/?a=commit;h=0fa2e8226eebc57a257a6ef32f3f45ef69874952

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 25 19:40:05 2010 +0200

Wine release 1.2-rc5

---

 news/en/2010062501.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/news/en/2010062501.xml b/news/en/2010062501.xml
new file mode 100644
index 0000000..42f93e7
--- /dev/null
+++ b/news/en/2010062501.xml
@@ -0,0 +1,13 @@
+<news>
+<date>June 25, 2010</date>
+<title>Wine 1.2-rc5 Released</title>
+<body>
+<p> The Wine development release 1.2-rc5 is now available.</p>
+<p> <a href="{$root}/announce/1.2-rc5">What's new</a> in this release:
+<ul>
+  <li>Many translation updates.</li>
+  <li>A lot of bug fixes.</li>
+</ul></p>
+<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc5.tar.bz2">available now</a>.
+Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>.
+</p></body></news>



From jnewman at winehq.org  Mon Jun 28 09:17:27 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 28 Jun 2010 09:17:27 -0500
Subject: =?UTF-8?Q?=C5=81ukasz=20Wojni=C5=82owicz=20?=: Polish translation for
	release 1.2-rc4 and 1.2-rc5
Message-ID: <E1OTF9L-0004LP-W8@wine.codeweavers.com>

Module: website
Branch: master
Commit: 9982555bc415918e90013d29c64829367fd806cb
URL:    http://source.winehq.org/git/website.git/?a=commit;h=9982555bc415918e90013d29c64829367fd806cb

Author: ?ukasz Wojni?owicz <lukasz.wojnilowicz at gmail.com>
Date:   Fri Jun 25 20:09:25 2010 +0200

Polish translation for release 1.2-rc4 and 1.2-rc5

---

 news/pl/2010061801.xml |   13 +++++++++++++
 news/pl/2010062501.xml |   13 +++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/news/pl/2010061801.xml b/news/pl/2010061801.xml
new file mode 100644
index 0000000..4388167
--- /dev/null
+++ b/news/pl/2010061801.xml
@@ -0,0 +1,13 @@
+<news>
+<date>Czerwiec 18, 2010</date>
+<title>Wydano Wine 1.2-rc4</title>
+<body>
+<p> Wydanie rozwojowe Wine 1.2-rc4 jest ju? dost?pne.</p>
+<p> <a href="{$root}/announce/1.2-rc4">Co nowego</a> w tym wydaniu:
+<ul>
+  <li>Wiele aktualizacji t?umacze?.</li>
+  <li>Wiele poprawek b??d?w.</li>
+</ul></p>
+<p><p>?r?d?o jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc4.tar.bz2">ju? dost?pne</a>.
+Paczki binarne s? w trakcie budowy i uka?? si? wkr?tce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>.
+</p></body></news>
diff --git a/news/pl/2010062501.xml b/news/pl/2010062501.xml
new file mode 100644
index 0000000..300c976
--- /dev/null
+++ b/news/pl/2010062501.xml
@@ -0,0 +1,13 @@
+<news>
+<date>Czerwiec 25, 2010</date>
+<title>Wydano Wine 1.2-rc5</title>
+<body>
+<p> Wydanie rozwojowe Wine 1.2-rc5 jest ju? dost?pne.</p>
+<p> <a href="{$root}/announce/1.2-rc5">Co nowego</a> w tym wydaniu:
+<ul>
+  <li>Wiele aktualizacji t?umacze?.</li>
+  <li>Wiele poprawek b??d?w.</li>
+</ul></p>
+<p><p>?r?d?o jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc5.tar.bz2">ju? dost?pne</a>.
+Paczki binarne s? w trakcie budowy i uka?? si? wkr?tce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>.
+</p></body></news>



From jnewman at winehq.org  Mon Jun 28 09:17:28 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 28 Jun 2010 09:17:28 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: German translation of release
	news 1 .2-rc5
Message-ID: <E1OTF9M-0004Lf-25@wine.codeweavers.com>

Module: website
Branch: master
Commit: a02283908b52a3bc4b60a283f2124880b1e35289
URL:    http://source.winehq.org/git/website.git/?a=commit;h=a02283908b52a3bc4b60a283f2124880b1e35289

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Fri Jun 25 21:11:52 2010 +0200

German translation of release news 1.2-rc5

---

 news/de/2010062501.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/news/de/2010062501.xml b/news/de/2010062501.xml
new file mode 100644
index 0000000..abc6aec
--- /dev/null
+++ b/news/de/2010062501.xml
@@ -0,0 +1,13 @@
+<news>
+<date>25. Juni 2010</date>
+<title>Wine 1.2-rc4 Freigegeben</title>
+<body>
+<p> Die Entwicklungsversion 1.2-rc5 von Wine ist jetzt verf&uuml;gbar.</p>
+<p> <a href="{$root}/announce/1.2-rc5">Neuerungen (en)</a> in dieser Version:
+<ul>
+  <li>Viele &Uuml;bersetzungen.</li>
+  <li>Ein Haufen Fehlerbehebungen.</li>
+</ul></p>
+<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc5.tar.bz2">verf&uuml;gbar</a>.
+Bin&auml;r-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verf&uuml;gung.
+</p></body></news>



From julliard at winehq.org  Mon Jun 28 11:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:16 -0500
Subject: Paul Chitescu : dbghelp: Provide a non-NULL number of bytes read to
	ReadProcessMemoryProc64 callback .
Message-ID: <E1OTGlo-0007Wy-Q5@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 61a9eef9a1c0a72e6571742dbb830f7b22c05230
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=61a9eef9a1c0a72e6571742dbb830f7b22c05230

Author: Paul Chitescu <paulc at voip.null.ro>
Date:   Sat Jun 26 13:24:38 2010 +0300

dbghelp: Provide a non-NULL number of bytes read to ReadProcessMemoryProc64 callback.

---

 dlls/dbghelp/stack.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c
index e0180ba..3e1ff72 100644
--- a/dlls/dbghelp/stack.c
+++ b/dlls/dbghelp/stack.c
@@ -95,10 +95,11 @@ static inline void addr_64to32(const ADDRESS64* addr64, ADDRESS* addr32)
 
 BOOL sw_read_mem(struct cpu_stack_walk* csw, DWORD64 addr, void* ptr, DWORD sz)
 {
+    DWORD bytes_read = 0;
     if (csw->is32)
-        return csw->u.s32.f_read_mem(csw->hProcess, addr, ptr, sz, NULL);
+        return csw->u.s32.f_read_mem(csw->hProcess, addr, ptr, sz, &bytes_read);
     else
-        return csw->u.s64.f_read_mem(csw->hProcess, addr, ptr, sz, NULL);
+        return csw->u.s64.f_read_mem(csw->hProcess, addr, ptr, sz, &bytes_read);
 }
 
 DWORD64 sw_xlat_addr(struct cpu_stack_walk* csw, ADDRESS64* addr)



From julliard at winehq.org  Mon Jun 28 11:01:16 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:16 -0500
Subject: Ilya Basin : include: Fix packing bug in shlobj.h. pragma pack 8 for
	ITEMSPACING, CSFV, SFV_CREATE.
Message-ID: <E1OTGlo-0007XE-WD@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fcba27239169267febb3b76de5de40b7f8109d2b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fcba27239169267febb3b76de5de40b7f8109d2b

Author: Ilya Basin <basinilya at gmail.com>
Date:   Sat Jun 26 17:37:48 2010 +0400

include: Fix packing bug in shlobj.h. pragma pack 8 for ITEMSPACING, CSFV, SFV_CREATE.

---

 dlls/shell32/tests/generated.c |  116 +++++++++++++++++++++++++++++++++-------
 include/shlobj.h               |   12 ++++
 tools/winapi/tests.dat         |    2 +
 3 files changed, 111 insertions(+), 19 deletions(-)

diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c
index e3f0633..ace877e 100644
--- a/dlls/shell32/tests/generated.c
+++ b/dlls/shell32/tests/generated.c
@@ -1386,25 +1386,25 @@ static void test_pack_CIDA(void)
 
 static void test_pack_CSFV(void)
 {
-    /* CSFV (pack 1) */
+    /* CSFV (pack 8) */
     TEST_FIELD_SIZE  (CSFV, cbSize, 4)
-    TEST_FIELD_ALIGN (CSFV, cbSize, 1)
+    TEST_FIELD_ALIGN (CSFV, cbSize, 4)
     TEST_FIELD_OFFSET(CSFV, cbSize, 0)
     TEST_FIELD_SIZE  (CSFV, pshf, 8)
-    TEST_FIELD_ALIGN (CSFV, pshf, 1)
-    TEST_FIELD_OFFSET(CSFV, pshf, 4)
+    TEST_FIELD_ALIGN (CSFV, pshf, 8)
+    TEST_FIELD_OFFSET(CSFV, pshf, 8)
     TEST_FIELD_SIZE  (CSFV, psvOuter, 8)
-    TEST_FIELD_ALIGN (CSFV, psvOuter, 1)
-    TEST_FIELD_OFFSET(CSFV, psvOuter, 12)
+    TEST_FIELD_ALIGN (CSFV, psvOuter, 8)
+    TEST_FIELD_OFFSET(CSFV, psvOuter, 16)
     TEST_FIELD_SIZE  (CSFV, pidl, 8)
-    TEST_FIELD_ALIGN (CSFV, pidl, 1)
-    TEST_FIELD_OFFSET(CSFV, pidl, 20)
+    TEST_FIELD_ALIGN (CSFV, pidl, 8)
+    TEST_FIELD_OFFSET(CSFV, pidl, 24)
     TEST_FIELD_SIZE  (CSFV, lEvents, 4)
-    TEST_FIELD_ALIGN (CSFV, lEvents, 1)
-    TEST_FIELD_OFFSET(CSFV, lEvents, 28)
+    TEST_FIELD_ALIGN (CSFV, lEvents, 4)
+    TEST_FIELD_OFFSET(CSFV, lEvents, 32)
     TEST_FIELD_SIZE  (CSFV, pfnCallback, 8)
-    TEST_FIELD_ALIGN (CSFV, pfnCallback, 1)
-    TEST_FIELD_OFFSET(CSFV, pfnCallback, 32)
+    TEST_FIELD_ALIGN (CSFV, pfnCallback, 8)
+    TEST_FIELD_OFFSET(CSFV, pfnCallback, 40)
 }
 
 static void test_pack_DROPFILES(void)
@@ -1532,6 +1532,25 @@ static void test_pack_FILEGROUPDESCRIPTORW(void)
     TEST_FIELD_OFFSET(FILEGROUPDESCRIPTORW, fgd, 4)
 }
 
+static void test_pack_ITEMSPACING(void)
+{
+    /* ITEMSPACING (pack 8) */
+    TEST_TYPE_SIZE   (ITEMSPACING, 16)
+    TEST_TYPE_ALIGN  (ITEMSPACING, 4)
+    TEST_FIELD_SIZE  (ITEMSPACING, cxSmall, 4)
+    TEST_FIELD_ALIGN (ITEMSPACING, cxSmall, 4)
+    TEST_FIELD_OFFSET(ITEMSPACING, cxSmall, 0)
+    TEST_FIELD_SIZE  (ITEMSPACING, cySmall, 4)
+    TEST_FIELD_ALIGN (ITEMSPACING, cySmall, 4)
+    TEST_FIELD_OFFSET(ITEMSPACING, cySmall, 4)
+    TEST_FIELD_SIZE  (ITEMSPACING, cxLarge, 4)
+    TEST_FIELD_ALIGN (ITEMSPACING, cxLarge, 4)
+    TEST_FIELD_OFFSET(ITEMSPACING, cxLarge, 8)
+    TEST_FIELD_SIZE  (ITEMSPACING, cyLarge, 4)
+    TEST_FIELD_ALIGN (ITEMSPACING, cyLarge, 4)
+    TEST_FIELD_OFFSET(ITEMSPACING, cyLarge, 12)
+}
+
 static void test_pack_LPBROWSEINFOA(void)
 {
     /* LPBROWSEINFOA */
@@ -1756,6 +1775,25 @@ static void test_pack_QCMINFO_IDMAP_PLACEMENT(void)
     TEST_FIELD_OFFSET(QCMINFO_IDMAP_PLACEMENT, fFlags, 4)
 }
 
+static void test_pack_SFV_CREATE(void)
+{
+    /* SFV_CREATE (pack 8) */
+    TEST_TYPE_SIZE   (SFV_CREATE, 32)
+    TEST_TYPE_ALIGN  (SFV_CREATE, 8)
+    TEST_FIELD_SIZE  (SFV_CREATE, cbSize, 4)
+    TEST_FIELD_ALIGN (SFV_CREATE, cbSize, 4)
+    TEST_FIELD_OFFSET(SFV_CREATE, cbSize, 0)
+    TEST_FIELD_SIZE  (SFV_CREATE, pshf, 8)
+    TEST_FIELD_ALIGN (SFV_CREATE, pshf, 8)
+    TEST_FIELD_OFFSET(SFV_CREATE, pshf, 8)
+    TEST_FIELD_SIZE  (SFV_CREATE, psvOuter, 8)
+    TEST_FIELD_ALIGN (SFV_CREATE, psvOuter, 8)
+    TEST_FIELD_OFFSET(SFV_CREATE, psvOuter, 16)
+    TEST_FIELD_SIZE  (SFV_CREATE, psfvcb, 8)
+    TEST_FIELD_ALIGN (SFV_CREATE, psfvcb, 8)
+    TEST_FIELD_OFFSET(SFV_CREATE, psfvcb, 24)
+}
+
 static void test_pack_SHChangeDWORDAsIDList(void)
 {
     /* SHChangeDWORDAsIDList (pack 1) */
@@ -3166,24 +3204,24 @@ static void test_pack_CIDA(void)
 
 static void test_pack_CSFV(void)
 {
-    /* CSFV (pack 1) */
+    /* CSFV (pack 8) */
     TEST_FIELD_SIZE  (CSFV, cbSize, 4)
-    TEST_FIELD_ALIGN (CSFV, cbSize, 1)
+    TEST_FIELD_ALIGN (CSFV, cbSize, 4)
     TEST_FIELD_OFFSET(CSFV, cbSize, 0)
     TEST_FIELD_SIZE  (CSFV, pshf, 4)
-    TEST_FIELD_ALIGN (CSFV, pshf, 1)
+    TEST_FIELD_ALIGN (CSFV, pshf, 4)
     TEST_FIELD_OFFSET(CSFV, pshf, 4)
     TEST_FIELD_SIZE  (CSFV, psvOuter, 4)
-    TEST_FIELD_ALIGN (CSFV, psvOuter, 1)
+    TEST_FIELD_ALIGN (CSFV, psvOuter, 4)
     TEST_FIELD_OFFSET(CSFV, psvOuter, 8)
     TEST_FIELD_SIZE  (CSFV, pidl, 4)
-    TEST_FIELD_ALIGN (CSFV, pidl, 1)
+    TEST_FIELD_ALIGN (CSFV, pidl, 4)
     TEST_FIELD_OFFSET(CSFV, pidl, 12)
     TEST_FIELD_SIZE  (CSFV, lEvents, 4)
-    TEST_FIELD_ALIGN (CSFV, lEvents, 1)
+    TEST_FIELD_ALIGN (CSFV, lEvents, 4)
     TEST_FIELD_OFFSET(CSFV, lEvents, 16)
     TEST_FIELD_SIZE  (CSFV, pfnCallback, 4)
-    TEST_FIELD_ALIGN (CSFV, pfnCallback, 1)
+    TEST_FIELD_ALIGN (CSFV, pfnCallback, 4)
     TEST_FIELD_OFFSET(CSFV, pfnCallback, 20)
 }
 
@@ -3312,6 +3350,25 @@ static void test_pack_FILEGROUPDESCRIPTORW(void)
     TEST_FIELD_OFFSET(FILEGROUPDESCRIPTORW, fgd, 4)
 }
 
+static void test_pack_ITEMSPACING(void)
+{
+    /* ITEMSPACING (pack 8) */
+    TEST_TYPE_SIZE   (ITEMSPACING, 16)
+    TEST_TYPE_ALIGN  (ITEMSPACING, 4)
+    TEST_FIELD_SIZE  (ITEMSPACING, cxSmall, 4)
+    TEST_FIELD_ALIGN (ITEMSPACING, cxSmall, 4)
+    TEST_FIELD_OFFSET(ITEMSPACING, cxSmall, 0)
+    TEST_FIELD_SIZE  (ITEMSPACING, cySmall, 4)
+    TEST_FIELD_ALIGN (ITEMSPACING, cySmall, 4)
+    TEST_FIELD_OFFSET(ITEMSPACING, cySmall, 4)
+    TEST_FIELD_SIZE  (ITEMSPACING, cxLarge, 4)
+    TEST_FIELD_ALIGN (ITEMSPACING, cxLarge, 4)
+    TEST_FIELD_OFFSET(ITEMSPACING, cxLarge, 8)
+    TEST_FIELD_SIZE  (ITEMSPACING, cyLarge, 4)
+    TEST_FIELD_ALIGN (ITEMSPACING, cyLarge, 4)
+    TEST_FIELD_OFFSET(ITEMSPACING, cyLarge, 12)
+}
+
 static void test_pack_LPBROWSEINFOA(void)
 {
     /* LPBROWSEINFOA */
@@ -3536,6 +3593,25 @@ static void test_pack_QCMINFO_IDMAP_PLACEMENT(void)
     TEST_FIELD_OFFSET(QCMINFO_IDMAP_PLACEMENT, fFlags, 4)
 }
 
+static void test_pack_SFV_CREATE(void)
+{
+    /* SFV_CREATE (pack 8) */
+    TEST_TYPE_SIZE   (SFV_CREATE, 16)
+    TEST_TYPE_ALIGN  (SFV_CREATE, 4)
+    TEST_FIELD_SIZE  (SFV_CREATE, cbSize, 4)
+    TEST_FIELD_ALIGN (SFV_CREATE, cbSize, 4)
+    TEST_FIELD_OFFSET(SFV_CREATE, cbSize, 0)
+    TEST_FIELD_SIZE  (SFV_CREATE, pshf, 4)
+    TEST_FIELD_ALIGN (SFV_CREATE, pshf, 4)
+    TEST_FIELD_OFFSET(SFV_CREATE, pshf, 4)
+    TEST_FIELD_SIZE  (SFV_CREATE, psvOuter, 4)
+    TEST_FIELD_ALIGN (SFV_CREATE, psvOuter, 4)
+    TEST_FIELD_OFFSET(SFV_CREATE, psvOuter, 8)
+    TEST_FIELD_SIZE  (SFV_CREATE, psfvcb, 4)
+    TEST_FIELD_ALIGN (SFV_CREATE, psfvcb, 4)
+    TEST_FIELD_OFFSET(SFV_CREATE, psfvcb, 12)
+}
+
 static void test_pack_SHChangeDWORDAsIDList(void)
 {
     /* SHChangeDWORDAsIDList (pack 1) */
@@ -3682,6 +3758,7 @@ static void test_pack(void)
     test_pack_HYPER_SIZEDARR();
     test_pack_IID();
     test_pack_ITEMIDLIST();
+    test_pack_ITEMSPACING();
     test_pack_LPBLOB();
     test_pack_LPBROWSEINFOA();
     test_pack_LPBROWSEINFOW();
@@ -3740,6 +3817,7 @@ static void test_pack(void)
     test_pack_RemHMETAFILEPICT();
     test_pack_RemHPALETTE();
     test_pack_SCODE();
+    test_pack_SFV_CREATE();
     test_pack_SHChangeDWORDAsIDList();
     test_pack_SHChangeNotifyEntry();
     test_pack_SHChangeProductKeyAsIDList();
diff --git a/include/shlobj.h b/include/shlobj.h
index df1fc93..dbf8518 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -542,6 +542,8 @@ DECLARE_INTERFACE_(IShellFolderViewCB,IUnknown)
  * IShellFolderView interface
  */
 
+#include <pshpack8.h>
+
 typedef struct _ITEMSPACING
 {
     int cxSmall;
@@ -550,6 +552,8 @@ typedef struct _ITEMSPACING
     int cyLarge;
 } ITEMSPACING;
 
+#include <poppack.h>
+
 #define INTERFACE IShellFolderView
 DEFINE_GUID(IID_IShellFolderView,0x37a378c0,0xf82d,0x11ce,0xae,0x65,0x08,0x00,0x2b,0x2e,0x12,0x62);
 DECLARE_INTERFACE_(IShellFolderView, IUnknown)
@@ -779,6 +783,8 @@ typedef HRESULT (CALLBACK *LPFNVIEWCALLBACK)(
 	WPARAM wParam,
 	LPARAM lParam);
 
+#include <pshpack8.h>
+
 typedef struct _CSFV
 {
   UINT             cbSize;
@@ -790,6 +796,8 @@ typedef struct _CSFV
   FOLDERVIEWMODE   fvm;
 } CSFV, *LPCSFV;
 
+#include <poppack.h>
+
 HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv);
 
 /* SHCreateShellFolderViewEx callback messages */
@@ -850,6 +858,8 @@ HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv);
 #define SFVM_GET_WEBVIEW_THEME        86 /* undocumented */
 #define SFVM_GETDEFERREDVIEWSETTINGS  92 /* undocumented */
 
+#include <pshpack8.h>
+
 typedef struct _SFV_CREATE
 {
     UINT cbSize;
@@ -858,6 +868,8 @@ typedef struct _SFV_CREATE
     IShellFolderViewCB *psfvcb;
 } SFV_CREATE;
 
+#include <poppack.h>
+
 HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pscfv, IShellView **ppsv);
 
 /* Types and definitions for the SFM_* parameters */
diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat
index 90b490a..ec5e702 100644
--- a/tools/winapi/tests.dat
+++ b/tools/winapi/tests.dat
@@ -1108,6 +1108,7 @@ IID
 IShellChangeNotify
 IShellIcon
 ITEMIDLIST
+ITEMSPACING
 LPBLOB
 LPBROWSEINFOA
 LPBROWSEINFOW
@@ -1167,6 +1168,7 @@ RemHGLOBAL
 RemHMETAFILEPICT
 RemHPALETTE
 SCODE
+SFV_CREATE
 SHChangeDWORDAsIDList
 SHChangeNotifyEntry
 SHChangeProductKeyAsIDList



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Eric Pouech : dbghelp: Fix the localization of section table while
	loading COFF information.
Message-ID: <E1OTGlp-0007XU-2h@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1f5ff75107e73e6432cddf83215dae79660b23d4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f5ff75107e73e6432cddf83215dae79660b23d4

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sat Jun 26 22:53:55 2010 +0200

dbghelp: Fix the localization of section table while loading COFF information.

---

 dlls/dbghelp/pe_module.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
index cd2f248..7f20ea8 100644
--- a/dlls/dbghelp/pe_module.c
+++ b/dlls/dbghelp/pe_module.c
@@ -409,7 +409,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module)
     isym = (const IMAGE_SYMBOL*)((const char*)mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable);
     /* FIXME: no way to get strtable size */
     strtable = (const char*)&isym[numsym];
-    sect = IMAGE_FIRST_SECTION(&fmap->u.pe.ntheader);
+    sect = IMAGE_FIRST_SECTION(RtlImageNtHeader((HMODULE)mapping));
 
     for (i = 0; i < numsym; i+= naux, isym += naux)
     {



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Eric Pouech : dbghelp: Test validity of COFF symbol table against
	file size (and not image size).
Message-ID: <E1OTGlp-0007Xk-4P@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d97e6a47e59feae67f1e54654e24546d3f01fcc2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d97e6a47e59feae67f1e54654e24546d3f01fcc2

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sat Jun 26 22:54:01 2010 +0200

dbghelp: Test validity of COFF symbol table against file size (and not image size).

---

 dlls/dbghelp/pe_module.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
index 7f20ea8..a46193c 100644
--- a/dlls/dbghelp/pe_module.c
+++ b/dlls/dbghelp/pe_module.c
@@ -177,17 +177,17 @@ unsigned pe_get_map_size(const struct image_section_map* ism)
  * Checks whether the PointerToSymbolTable and NumberOfSymbols in file_header contain
  * valid information.
  */
-static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping)
+static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping, DWORD64 sz)
 {
     DWORD64     offset;
 
-    /* is the iSym table inside file image ? */
+    /* is the iSym table inside file size ? (including first DWORD of string table, which is its size) */
     offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable;
-    offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL);
-    if (offset > (DWORD64)nthdr->OptionalHeader.SizeOfImage) return FALSE;
-    /* is string table (following iSym table) inside file image ? */
+    offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL) + sizeof(DWORD);
+    if (offset > sz) return FALSE;
+    /* is string table (following iSym table) inside file size ? */
     offset += *(DWORD*)((const char*)mapping + offset);
-    return offset <= (DWORD64)nthdr->OptionalHeader.SizeOfImage;
+    return offset <= sz;
 }
 
 /******************************************************************
@@ -228,7 +228,9 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty
             }
             if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols)
             {
-                if (pe_is_valid_pointer_table(nthdr, mapping))
+                LARGE_INTEGER li;
+
+                if (GetFileSizeEx(file, &li) && pe_is_valid_pointer_table(nthdr, mapping, li.QuadPart))
                 {
                     /* FIXME ugly: should rather map the relevant content instead of copying it */
                     const char* src = (const char*)mapping +
@@ -243,6 +245,7 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty
                 }
                 else
                 {
+                    WARN("Bad coff table... wipping out\n");
                     /* we have bad information here, wipe it out */
                     fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable = 0;
                     fmap->u.pe.ntheader.FileHeader.NumberOfSymbols = 0;



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Eric Pouech : dbghelp: Ensure we can try to load COFF symbols if none
	is found in other debug formats .
Message-ID: <E1OTGlp-0007Y2-72@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3ced7b8f40a767ebd4df3b2fce6bfe08b170004d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3ced7b8f40a767ebd4df3b2fce6bfe08b170004d

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sat Jun 26 22:54:07 2010 +0200

dbghelp: Ensure we can try to load COFF symbols if none is found in other debug formats.

---

 dlls/dbghelp/dwarf.c     |    7 +++----
 dlls/dbghelp/pe_module.c |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 6daf7d7..4d7ec0d 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -3077,10 +3077,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset,
     struct module_format* dwarf2_modfmt;
 
     if (!dwarf2_init_section(&section[section_debug],  fmap, ".debug_info", &debug_sect))
-    {
-        /* no Dwarf debug info here, so there's no error */
-        return TRUE;
-    }
+        /* no Dwarf debug info here */
+        return FALSE;
+
     dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect);
     dwarf2_init_section(&section[section_string], fmap, ".debug_str",    &debug_str_sect);
     dwarf2_init_section(&section[section_line],   fmap, ".debug_line",   &debug_line_sect);
diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
index a46193c..18cec9a 100644
--- a/dlls/dbghelp/pe_module.c
+++ b/dlls/dbghelp/pe_module.c
@@ -183,8 +183,8 @@ static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void*
 
     /* is the iSym table inside file size ? (including first DWORD of string table, which is its size) */
     offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable;
-    offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL) + sizeof(DWORD);
-    if (offset > sz) return FALSE;
+    offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL);
+    if (offset + sizeof(DWORD) > sz) return FALSE;
     /* is string table (following iSym table) inside file size ? */
     offset += *(DWORD*)((const char*)mapping + offset);
     return offset <= sz;



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: =?UTF-8?Q?Jaroslav=20=C5=A0m=C3=ADd=20?=: hhctrl.ocx: Make sure
	pszCaption and pszFile are never 0.
Message-ID: <E1OTGlp-0007YK-9b@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5b7bd76086e94ca3fb9cfb7c308d334ae35ee9e3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5b7bd76086e94ca3fb9cfb7c308d334ae35ee9e3

Author: Jaroslav ?m?d <jardasmid at gmail.com>
Date:   Sat Jun 26 22:24:04 2010 +0200

hhctrl.ocx: Make sure pszCaption and pszFile are never 0.

---

 dlls/hhctrl.ocx/chm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c
index 4c85bd9..f0452fa 100644
--- a/dlls/hhctrl.ocx/chm.c
+++ b/dlls/hhctrl.ocx/chm.c
@@ -238,11 +238,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
         info->WinType.pszIndex = strdupW(null);
         info->WinType.fsValidMembers=0;
         info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE;
-        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle);
+        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null);
         info->WinType.dwStyles=WS_POPUP;
         info->WinType.dwExStyles=0;
         info->WinType.nShowState=SW_SHOW;
-        info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic);
+        info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null);
         info->WinType.curNavType=HHWIN_NAVTYPE_TOC;
         return TRUE;
     }



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Austin English : setupapi: Add stubs for SetupDiBuildDriverInfoList
	and SetupDiDeleteDeviceInfo:.
Message-ID: <E1OTGlp-0007Ya-Bq@wine.codeweavers.com>

Module: wine
Branch: master
Commit: dab1bbef29c84d11d07b80f5262d70689c216366
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dab1bbef29c84d11d07b80f5262d70689c216366

Author: Austin English <austinenglish at gmail.com>
Date:   Sun Jun 27 03:44:44 2010 -0500

setupapi: Add stubs for SetupDiBuildDriverInfoList and SetupDiDeleteDeviceInfo:.

---

 dlls/setupapi/setupapi.spec |    4 ++--
 dlls/setupapi/stubs.c       |   24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 7695c89..6de75b1 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -273,7 +273,7 @@
 @ stdcall SetupDiBuildClassInfoList(long ptr long ptr)
 @ stdcall SetupDiBuildClassInfoListExA(long ptr long ptr str ptr)
 @ stdcall SetupDiBuildClassInfoListExW(long ptr long ptr wstr ptr)
-@ stub SetupDiBuildDriverInfoList
+@ stdcall SetupDiBuildDriverInfoList(ptr ptr long)
 @ stdcall SetupDiCallClassInstaller(long ptr ptr)
 @ stub SetupDiCancelDriverInfoSearch
 @ stub SetupDiChangeState
@@ -297,7 +297,7 @@
 @ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr ptr)
 @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr ptr)
 @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long)
-@ stub SetupDiDeleteDeviceInfo
+@ stdcall SetupDiDeleteDeviceInfo(ptr ptr)
 @ stub SetupDiDeleteDeviceInterfaceData
 @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long)
 @ stub SetupDiDeleteDeviceRegKey
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index f8e99e0..264a890 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -393,3 +393,27 @@ BOOL WINAPI SetupLogFileA(
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
+
+/***********************************************************************
+ *              SetupDiBuildDriverInfoList  (SETUPAPI.@)
+ */
+
+BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType)
+ {
+    FIXME(": stub %p, %p, %d\n", DeviceInfoSet, DeviceInfoData, DriverType);
+
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+ }
+
+/***********************************************************************
+ *              SetupDiDeleteDeviceInfo  (SETUPAPI.@)
+ */
+
+BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData)
+ {
+    FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData);
+
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+ }



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Austin English : ntoskrnl.exe: Add stub for
	MmAllocateContiguousMemorySpecifyCache:.
Message-ID: <E1OTGlp-0007Yt-FG@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 77f4c853f90e79935a5cf1e2b8b177ad70fafc6f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=77f4c853f90e79935a5cf1e2b8b177ad70fafc6f

Author: Austin English <austinenglish at gmail.com>
Date:   Sun Jun 27 03:45:48 2010 -0500

ntoskrnl.exe: Add stub for MmAllocateContiguousMemorySpecifyCache:.

---

 dlls/ntoskrnl.exe/ntoskrnl.c        |   13 +++++++++++++
 dlls/ntoskrnl.exe/ntoskrnl.exe.spec |    2 +-
 include/ddk/wdm.h                   |   10 ++++++++++
 3 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index c22b81a..7823f73 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -1275,6 +1275,19 @@ PVOID WINAPI MmAllocateContiguousMemory( SIZE_T size, PHYSICAL_ADDRESS highest_v
 }
 
 /***********************************************************************
+ *           MmAllocateContiguousMemorySpecifyCache   (NTOSKRNL.EXE.@)
+ */
+PVOID WINAPI MmAllocateContiguousMemorySpecifyCache( SIZE_T size,
+                                                     PHYSICAL_ADDRESS lowest_valid_address,
+                                                     PHYSICAL_ADDRESS highest_valid_address,
+                                                     PHYSICAL_ADDRESS BoundaryAddressMultiple,
+                                                     MEMORY_CACHING_TYPE CacheType )
+{
+    FIXME(": stub\n");
+    return NULL;
+}
+
+/***********************************************************************
  *           MmAllocatePagesForMdl   (NTOSKRNL.EXE.@)
  */
 PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS highaddress,
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index e6db4f7..0a816ab 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -656,7 +656,7 @@
 @ stub MmAdjustWorkingSetSize
 @ stub MmAdvanceMdl
 @ stdcall MmAllocateContiguousMemory(long double)
-@ stub MmAllocateContiguousMemorySpecifyCache
+@ stdcall MmAllocateContiguousMemorySpecifyCache(long double double double long)
 @ stub MmAllocateMappingAddress
 @ stdcall MmAllocateNonCachedMemory(long)
 @ stdcall MmAllocatePagesForMdl(double double double long)
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index baede35..3fa355f 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -1035,6 +1035,16 @@ typedef struct _KUSER_SHARED_DATA {
     } DUMMYUNIONNAME;
 } KSHARED_USER_DATA, *PKSHARED_USER_DATA;
 
+typedef enum _MEMORY_CACHING_TYPE {
+  MmNonCached = 0,
+  MmCached = 1,
+  MmWriteCombined = 2,
+  MmHardwareCoherentCached = 3,
+  MmNonCachedUnordered = 4,
+  MmUSWCCached = 5,
+  MmMaximumCacheType = 6
+} MEMORY_CACHING_TYPE;
+
 typedef enum _MM_SYSTEM_SIZE
 {
     MmSmallSystem,



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Piotr Caban : msxml3: Fix illegal memory access.
Message-ID: <E1OTGlp-0007Z8-Gw@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a42a0917cd47113b810165a7f1a4551211a56025
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a42a0917cd47113b810165a7f1a4551211a56025

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Sun Jun 27 15:21:28 2010 +0200

msxml3: Fix illegal memory access.

---

 dlls/msxml3/saxreader.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index a3de757..eca9f1d 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -1111,7 +1111,8 @@ static void libxmlEndElementNS(
 
     end = (xmlChar*)This->pParserCtxt->input->cur;
     if(*(end-1) != '>' || *(end-2) != '/')
-        while(*(end-2)!='<' && *(end-1)!='/') end--;
+        while(end-2>=This->pParserCtxt->input->base
+                && *(end-2)!='<' && *(end-1)!='/') end--;
 
     update_position(This, end);
 
@@ -1268,7 +1269,8 @@ static void libxmlComment(void *ctx, const xmlChar *value)
     HRESULT hr;
     xmlChar *beg = (xmlChar*)This->pParserCtxt->input->cur;
 
-    while(memcmp(beg-4, "<!--", sizeof(char[4]))) beg--;
+    while(beg-4>=This->pParserCtxt->input->base
+            && memcmp(beg-4, "<!--", sizeof(char[4]))) beg--;
     update_position(This, beg);
 
     if(!This->vbInterface && !This->saxreader->lexicalHandler) return;
@@ -1345,7 +1347,8 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len)
     BSTR Chars;
     BOOL lastEvent = FALSE, change;
 
-    while(memcmp(beg-9, "<![CDATA[", sizeof(char[9]))) beg--;
+    while(beg-9>=This->pParserCtxt->input->base
+            && memcmp(beg-9, "<![CDATA[", sizeof(char[9]))) beg--;
     update_position(This, beg);
 
     if(This->vbInterface && This->saxreader->vblexicalHandler)



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Igor Paliychuk : wordpad: Ukrainian translation update.
Message-ID: <E1OTGlp-0007ZS-Is@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 40c30b3452dd5545154fcb1002175826222d9a8e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=40c30b3452dd5545154fcb1002175826222d9a8e

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Sun Jun 27 13:19:18 2010 +0300

wordpad: Ukrainian translation update.

---

 programs/wordpad/Uk.rc |  145 ++++++++++++++++++++++++-----------------------
 1 files changed, 74 insertions(+), 71 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=40c30b3452dd5545154fcb1002175826222d9a8e


From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Igor Paliychuk : cryptdlg: Ukrainian translation update.
Message-ID: <E1OTGlp-0007Zi-Kp@wine.codeweavers.com>

Module: wine
Branch: master
Commit: bbfbea77c717c4f21994c5df5f9e05d09365d60f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bbfbea77c717c4f21994c5df5f9e05d09365d60f

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Sun Jun 27 14:51:50 2010 +0300

cryptdlg: Ukrainian translation update.

---

 dlls/cryptdlg/cryptdlg_Uk.rc |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/cryptdlg/cryptdlg_Uk.rc b/dlls/cryptdlg/cryptdlg_Uk.rc
index d90226f..dc14749 100644
--- a/dlls/cryptdlg/cryptdlg_Uk.rc
+++ b/dlls/cryptdlg/cryptdlg_Uk.rc
@@ -28,15 +28,15 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_CERT_POLICY "Certificate Policy"
-    IDS_POLICY_ID "Policy Identifier: "
-    IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info"
-    IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id="
+    IDS_CERT_POLICY "???????? ???????????"
+    IDS_POLICY_ID "????????????? ????????: "
+    IDS_POLICY_QUALIFIER_INFO "?????????? ??? ????????? ????????"
+    IDS_POLICY_QUALIFIER_ID "Id ?????????? ????????="
     IDS_CPS "CPS" /* Certification Practice Statement */
-    IDS_USER_NOTICE "User Notice"
-    IDS_QUALIFIER "Qualifier"
-    IDS_NOTICE_REF "Notice Reference"
+    IDS_USER_NOTICE "???????????? ???????????"
+    IDS_QUALIFIER "?????????"
+    IDS_NOTICE_REF "????????? ????????????"
     IDS_ORGANIZATION "???????????="
-    IDS_NOTICE_NUM "Notice Number="
-    IDS_NOTICE_TEXT "Notice Text="
+    IDS_NOTICE_NUM "????? ????????????="
+    IDS_NOTICE_TEXT "????? ????????????="
 }



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Igor Paliychuk : wldap32: Ukrainian translation update.
Message-ID: <E1OTGlp-0007a2-Ph@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 74f88f2933805ac748f1b33a3e1a6edae01791c9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=74f88f2933805ac748f1b33a3e1a6edae01791c9

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Sun Jun 27 15:48:57 2010 +0300

wldap32: Ukrainian translation update.

---

 dlls/wldap32/wldap32_Uk.rc |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/wldap32/wldap32_Uk.rc b/dlls/wldap32/wldap32_Uk.rc
index 54fe943..56c54c6 100644
--- a/dlls/wldap32/wldap32_Uk.rc
+++ b/dlls/wldap32/wldap32_Uk.rc
@@ -38,18 +38,18 @@ STRINGTABLE DISCARDABLE
     6 "?????????? ?????"
     7 "????? ??????????? ?? ?????????????"
     8 "???????? ?????? ???????????"
-    9 "Referral (v2)"
-    10 "Referral"
+    9 "????????? (v2)"
+    10 "?????????"
     11 "?????????? ????????? ???????????????"
-    12 "Unavailable Critical Extension"
+    12 "???????? ?????????? ??????????"
     13 "???????? ????????????????"
     14 ""
     15 ""
     16 "????? ????? ???????????"
     17 "???????????? ???"
-    18 "Inappropriate Matching"
-    19 "Constraint Violation"
-    20 "??????????? ??? ???????? ?????"
+    18 "????????? ?????????????"
+    19 "????????? ?????????"
+    20 "??????????? ??? ???????? ?????"
     21 "???????????? ???????"
     22 ""
     23 ""
@@ -77,12 +77,12 @@ STRINGTABLE DISCARDABLE
     45 ""
     46 ""
     47 ""
-    48 "Inappropriate Authentication"
+    48 "???????????? ?????????????"
     49 "??????? ???????? ????"
     50 "??????????? ????"
     51 "???????"
     52 "??????????"
-    53 "Unwilling To Perform"
+    53 "?? ????? ??????????"
     54 "???????? ????????????"
     55 ""
     56 ""
@@ -95,7 +95,7 @@ STRINGTABLE DISCARDABLE
     63 ""
     64 "????????? ???? ????????????"
     65 "????????? ????? ??'????"
-    66 "?? ????????? ?? ??????? ??????"
+    66 "?? ????????? ?? ?? ????? ??????"
     67 "?? ????????? ?? RDN"
     68 "??? ?????"
     69 "????? ??????? ????? ??'????"
@@ -114,8 +114,8 @@ STRINGTABLE DISCARDABLE
     82 "???????? ???????"
     83 "??????? ?????????"
     84 "??????? ???????????"
-    85 "Timeout"
-    86 "Auth Unknown"
+    85 "????-???"
+    86 "???????? ???????????"
     87 "??????? ???????"
     88 "????????? ????????????"
     89 "??????? ?????????"
@@ -124,7 +124,7 @@ STRINGTABLE DISCARDABLE
     92 "???????? ?? ????????????? ???? ??????? ????????? LDAP"
     93 "???????? ??????? ????????? ?? ???????? ? ????????????"
     94 "? ???????????? ????? ??????????"
-    95 "More results returned"
-    96 "Loop while handling referrals"
-    97 "Referral hop limit exceeded"
+    95 "??????? ?? ??????????"
+    96 "???????????? ??? ??????? ????????"
+    97 "?????????? ???????? ????????? ??????????? ????????"
 }



From julliard at winehq.org  Mon Jun 28 11:01:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:17 -0500
Subject: Igor Paliychuk : winefile: Ukrainian translation update.
Message-ID: <E1OTGlp-0007aK-TR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9fa578041cb0a8eb51f86f4827ce8c48cd77c806
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9fa578041cb0a8eb51f86f4827ce8c48cd77c806

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Sun Jun 27 17:32:48 2010 +0300

winefile: Ukrainian translation update.

---

 programs/winefile/Uk.rc |  118 +++++++++++++++++++++++-----------------------
 1 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/programs/winefile/Uk.rc b/programs/winefile/Uk.rc
index 168894a..74a03de 100644
--- a/programs/winefile/Uk.rc
+++ b/programs/winefile/Uk.rc
@@ -34,24 +34,24 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 IDM_WINEFILE MENU FIXED IMPURE
 {
     POPUP "&????"  {
-        MENUITEM "&????????\tEnter",                ID_ACTIVATE
-        MENUITEM "&???????????...\tF7",                ID_FILE_MOVE
-        MENUITEM "&?????????...\tF8",                ID_FILE_COPY
-        MENUITEM "? &????? ??????...\tF9",        118
-        MENUITEM "????&????\tDel",                ID_FILE_DELETE
-        MENUITEM "????&?????????...",                  109
+        MENUITEM "&????????\tEnter",             ID_ACTIVATE
+        MENUITEM "&???????????...\tF7",          ID_FILE_MOVE
+        MENUITEM "&?????????...\tF8",            ID_FILE_COPY
+        MENUITEM "? &????? ??????...\tF9",       118
+        MENUITEM "????&????\tDel",               ID_FILE_DELETE
+        MENUITEM "????&?????????...",            109
         MENUITEM "?????????&??...\tAlt+Enter",   ID_EDIT_PROPERTIES
         MENUITEM SEPARATOR
-        MENUITEM "?????&?????...",                119
+        MENUITEM "?????&?????...",               119
         MENUITEM "?&??????????...",              120
         MENUITEM SEPARATOR
-        MENUITEM "&?????????...",                     ID_RUN
-        MENUITEM "&????...",                   102
+        MENUITEM "&?????????...",                ID_RUN
+        MENUITEM "&????...",                     102
         MENUITEM "??????????...",                103
         MENUITEM SEPARATOR
-        MENUITEM "???????? ?????????&?...",        111
-        MENUITEM "??&???...",                  104
-        MENUITEM "???????? &?????...",            116
+        MENUITEM "???????? ?????????&?...",      111
+        MENUITEM "??&???...",                    104
+        MENUITEM "???????? &?????...",           116
         MENUITEM SEPARATOR
 #ifndef _NO_EXTENSIONS
         MENUITEM "??&???\tAlt+X",                ID_FILE_EXIT
@@ -61,92 +61,92 @@ IDM_WINEFILE MENU FIXED IMPURE
     }
 
     POPUP "&????"  {
-        MENUITEM "&????????? ????...",               201
-        MENUITEM "&????? ????...",              202
+        MENUITEM "&????????? ????...",           201
+        MENUITEM "&????? ????...",               202
         MENUITEM SEPARATOR
-        MENUITEM "&??????????? ????...",             ID_FORMAT_DISK
+        MENUITEM "&??????????? ????...",         ID_FORMAT_DISK
 #ifdef _WIN95
         MENUITEM "&???????? ????????? ????...", -1 /*TODO*/
 #endif
         MENUITEM SEPARATOR
-        MENUITEM "?????????? &???????? ????",      ID_CONNECT_NETWORK_DRIVE
-        MENUITEM "&?????????? ???????? ????",   ID_DISCONNECT_NETWORK_DRIVE
+        MENUITEM "&?????????? ???????? ????",    ID_CONNECT_NETWORK_DRIVE
+        MENUITEM "&?????????? ???????? ????",    ID_DISCONNECT_NETWORK_DRIVE
         MENUITEM SEPARATOR
-        MENUITEM "??????? ???????? ??...",                 254
-        MENUITEM "&??????? ???????? ??????...",            255
+        MENUITEM "??????? ???????? ??...",       254
+        MENUITEM "&??????? ???????? ??????...",  255
         MENUITEM SEPARATOR
-        MENUITEM "??&????? ????...",            251
+        MENUITEM "??&????? ????...",             251
     }
 
     POPUP "??&????????"  {
-        MENUITEM "&????????? ??????\t+",              301
-        MENUITEM "?????????? &??????\t*",             302
-        MENUITEM "?????????? &???\tStrg+*",         303
-        MENUITEM "???????? ?&?????\t-",           304
+        MENUITEM "&????????? ??????\t+",         301
+        MENUITEM "?????????? &??????\t*",        302
+        MENUITEM "?????????? &???\tStrg+*",      303
+        MENUITEM "???????? ?&?????\t-",          304
         MENUITEM SEPARATOR
-        MENUITEM "&Mark Children",              505
+        MENUITEM "????????? &?????",             505
     }
 
     POPUP "&??????"  {
-        MENUITEM "????&?? ? ??????????",         413
-        MENUITEM "???? ?&?????",                  411
+        MENUITEM "&?????? ? ??????????",         413
+        MENUITEM "???? ?&?????",                 411
         MENUITEM "???? ?&?????????",             412
         MENUITEM SEPARATOR
-        MENUITEM "???&????",                      ID_VIEW_SPLIT
+        MENUITEM "???&????",                     ID_VIEW_SPLIT
         MENUITEM SEPARATOR
-        MENUITEM "&??'?",                       ID_VIEW_NAME
+        MENUITEM "&??'?",                        ID_VIEW_NAME
         MENUITEM "??? ???? ??? ???&?",           ID_VIEW_ALL_ATTRIBUTES, CHECKED
-        MENUITEM "&???????? ????...",         ID_VIEW_SELECTED_ATTRIBUTES
+        MENUITEM "&???????? ????...",            ID_VIEW_SELECTED_ATTRIBUTES
         MENUITEM SEPARATOR
-        MENUITEM "&????????? ?? ??'??",               ID_VIEW_SORT_NAME
-        MENUITEM "????????? ?? &?????",               ID_VIEW_SORT_TYPE
-        MENUITEM "????????? ?? ??&??????",               ID_VIEW_SORT_SIZE
-        MENUITEM "????????? ??  &?????",               ID_VIEW_SORT_DATE
+        MENUITEM "&????????? ?? ??'??",          ID_VIEW_SORT_NAME
+        MENUITEM "????????? ?? &?????",          ID_VIEW_SORT_TYPE
+        MENUITEM "????????? ?? ??&??????",       ID_VIEW_SORT_SIZE
+        MENUITEM "????????? ??  ?&????",         ID_VIEW_SORT_DATE
         MENUITEM SEPARATOR
-        MENUITEM "????????? ?? &...",              ID_VIEW_FILTER
+        MENUITEM "????????? ?? &...",            ID_VIEW_FILTER
     }
 
     POPUP "&????????????"  {
-        MENUITEM "&?????????????...",            501
-        MENUITEM "&?????...",                    ID_SELECT_FONT
-        MENUITEM "Customize Tool&bar...",       512
+        MENUITEM "&?????????????...",                       501
+        MENUITEM "&?????...",                               ID_SELECT_FONT
+        MENUITEM "??????????? &?????? ????????????...",     512
         MENUITEM SEPARATOR
-        MENUITEM "&Toolbar",                    ID_VIEW_TOOL_BAR, CHECKED
-        MENUITEM "?????? &??????",                   ID_VIEW_DRIVE_BAR, CHECKED
-        MENUITEM "&????? ?????",                 ID_VIEW_STATUSBAR, CHECKED
+        MENUITEM "?????? &????????????",                    ID_VIEW_TOOL_BAR, CHECKED
+        MENUITEM "?????? &??????",                          ID_VIEW_DRIVE_BAR, CHECKED
+        MENUITEM "&????? ?????",                            ID_VIEW_STATUSBAR, CHECKED
 #ifndef _NO_EXTENSIONS
-        MENUITEM "?&??? ?????\tCtrl+Shift+S",  ID_VIEW_FULLSCREEN
+        MENUITEM "?&??? ?????\tCtrl+Shift+S",               ID_VIEW_FULLSCREEN
 #endif
         MENUITEM SEPARATOR
-        MENUITEM "&Minimize on run",            504
-        MENUITEM "&???????? ???????????? ????? ???????",      ID_VIEW_SAVESETTINGS
+        MENUITEM "&???????????? ??? ???????",               504
+        MENUITEM "&???????? ???????????? ????? ???????",    ID_VIEW_SAVESETTINGS
     }
 
 
     POPUP "&???????"  {
-        MENUITEM "&??????...",                  605
-        MENUITEM "&Logging...",                 606
+        MENUITEM "&??????...",                    605
+        MENUITEM "&?????????...",                 606
         MENUITEM "&???????...",                   607
     }
 
     POPUP "??&???"  {
-        MENUITEM "???? &?????",                 ID_WINDOW_NEW
-        MENUITEM "????? ????????\tCtrl+F5",          ID_WINDOW_CASCADE
-        MENUITEM "Tile &Horizontally",          ID_WINDOW_TILE_HORZ
-        MENUITEM "Tile &Vertically\tCtrl+F4",   ID_WINDOW_TILE_VERT
+        MENUITEM "???? &?????",                     ID_WINDOW_NEW
+        MENUITEM "????? ????????\tCtrl+F5",         ID_WINDOW_CASCADE
+        MENUITEM "????? &?????? ????",              ID_WINDOW_TILE_HORZ
+        MENUITEM "????? ????? &???????\tCtrl+F4",   ID_WINDOW_TILE_VERT
 #ifndef _NO_EXTENSIONS
-        MENUITEM "???????????? ???????????",       ID_WINDOW_AUTOSORT
+        MENUITEM "???????????? ???????????",        ID_WINDOW_AUTOSORT
 #endif
-        MENUITEM "Arrange &Symbols",            ID_WINDOW_ARRANGE
-        MENUITEM "&???????\tF5",                ID_REFRESH
+        MENUITEM "?????????? &???????",             ID_WINDOW_ARRANGE
+        MENUITEM "&???????\tF5",                    ID_REFRESH
     }
 
     POPUP "??????&?"  {
         MENUITEM "&??????? ???????\tF1",            ID_HELP
-        MENUITEM "??&???...\tF1",         ID_HELP
-        MENUITEM "&???????????? ????????\tF1",             ID_HELP_USING
+        MENUITEM "??&???...\tF1",                   ID_HELP
+        MENUITEM "&???????????? ????????\tF1",      ID_HELP_USING
         MENUITEM SEPARATOR
-        MENUITEM "&??? Winefile...",          ID_ABOUT
+        MENUITEM "&??? Winefile...",                ID_ABOUT
     }
 }
 
@@ -239,9 +239,9 @@ STRINGTABLE
 {
     IDS_COL_NAME            "??'?"
     IDS_COL_SIZE            "??????"
-    IDS_COL_CDATE           "CDate"
-    IDS_COL_ADATE           "ADate"
-    IDS_COL_MDATE           "MDate"
+    IDS_COL_CDATE           "???? ?????????"
+    IDS_COL_ADATE           "???? ?????????? ???????"
+    IDS_COL_MDATE           "???? ????????? ?????"
     IDS_COL_IDX             "Index/Inode"
     IDS_COL_LINKS           "?????????"
     IDS_COL_ATTR            "????????"



From julliard at winehq.org  Mon Jun 28 11:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:18 -0500
Subject: Igor Paliychuk : mshtml: Ukrainian translation update.
Message-ID: <E1OTGlq-0007ab-42@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 181d70ed4f927e5cc314b230d8132be4fafea6a3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=181d70ed4f927e5cc314b230d8132be4fafea6a3

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Sun Jun 27 21:21:42 2010 +0300

mshtml: Ukrainian translation update.

---

 dlls/mshtml/Uk.rc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/Uk.rc b/dlls/mshtml/Uk.rc
index 5e11b4d..ef3a8fb 100644
--- a/dlls/mshtml/Uk.rc
+++ b/dlls/mshtml/Uk.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_HTMLDISABLED    "HTML rendering is currently disabled."
+    IDS_HTMLDISABLED    "? ????? ?????? ???????????? HTML ????????."
     IDS_HTMLDOCUMENT    "???????? HTML"
     IDS_DOWNLOADING     "????????????..."
     IDS_INSTALLING      "????????????..."
@@ -34,11 +34,11 @@ STRINGTABLE DISCARDABLE
 
 ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 260, 95
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Wine Gecko Installer"
+CAPTION "???????????? Wine Gecko"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT "Wine ?? ???? ?????? ??????? Gecko, ???? ?????????  ??? ???????? embedding HTML " \
-          "??? ????????? ??????. Wine ???? ??????????? ??????????? ?? ?????????? ???? ??? ???.\n\n" \
+    LTEXT "Wine ?? ???? ?????? ??????? Gecko, ???? ????????? ??? ????????? ?????? ???????? " \
+          "? ?????????? HTML. Wine ???? ??????????? ??????????? ?? ?????????? ???? ??? ???.\n\n" \
           "????????: ?????????????? ??????????? ????? ? ?????? ????????????. ?????????? ??????? http://wiki.winehq.org/Gecko.",
           ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT
     CONTROL "???????", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12



From julliard at winehq.org  Mon Jun 28 11:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:18 -0500
Subject: Igor Paliychuk : crypt32: Ukrainian translation update.
Message-ID: <E1OTGlq-0007b0-8w@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e9c90a6fee097f7d6525c6e69307ecf402af9705
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e9c90a6fee097f7d6525c6e69307ecf402af9705

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Sun Jun 27 21:54:02 2010 +0300

crypt32: Ukrainian translation update.

---

 dlls/crypt32/crypt32_Uk.rc |   80 ++++++++++++++++++++++----------------------
 1 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/dlls/crypt32/crypt32_Uk.rc b/dlls/crypt32/crypt32_Uk.rc
index d26a456..c21d274 100644
--- a/dlls/crypt32/crypt32_Uk.rc
+++ b/dlls/crypt32/crypt32_Uk.rc
@@ -32,7 +32,7 @@ STRINGTABLE DISCARDABLE
 {
     IDS_AUTHORITY_KEY_ID "Authority Key Identifier"
     IDS_KEY_ATTRIBUTES "??????????? ?????"
-    IDS_KEY_USAGE_RESTRICTION "Key Usage Restriction"
+    IDS_KEY_USAGE_RESTRICTION "????????? ???????????? ?????"
     IDS_SUBJECT_ALT_NAME "Subject Alternative Name"
     IDS_ISSUER_ALT_NAME "Issuer Alternative Name"
     IDS_BASIC_CONSTRAINTS "??????? ?????????"
@@ -47,13 +47,13 @@ STRINGTABLE DISCARDABLE
     IDS_NEXT_UPDATE_LOCATION "Next Update Location"
     IDS_YES_OR_NO_TRUST "Yes or No Trust"
     IDS_EMAIL_ADDRESS "?????? ??. ?????"
-    IDS_UNSTRUCTURED_NAME "Unstructured Name"
+    IDS_UNSTRUCTURED_NAME "??????????????? ?????"
     IDS_CONTENT_TYPE "??? ??????"
     IDS_MESSAGE_DIGEST "Message Digest"
     IDS_SIGNING_TIME "??? ?????"
     IDS_COUNTER_SIGN "Counter Sign"
     IDS_CHALLENGE_PASSWORD "Challenge Password"
-    IDS_UNSTRUCTURED_ADDRESS "Unstructured Address"
+    IDS_UNSTRUCTURED_ADDRESS "??????????????? ??????"
     IDS_SMIME_CAPABILITIES "SMIME Capabilities"
     IDS_PREFER_SIGNED_DATA "Prefer Signed Data"
     IDS_CPS "CPS"
@@ -93,9 +93,9 @@ STRINGTABLE DISCARDABLE
     IDS_PRINCIPAL_NAME "Principal Name"
     IDS_WINDOWS_PRODUCT_UPDATE "Windows Product Update"
     IDS_ENROLLMENT_NAME_VALUE_PAIR "Enrollment Name Value Pair"
-    IDS_OS_VERSION "OS Version"
+    IDS_OS_VERSION "?????? OS"
     IDS_ENROLLMENT_CSP "Enrollment CSP"
-    IDS_CRL_NUMBER "CRL Number"
+    IDS_CRL_NUMBER "????? CRL"
     IDS_DELTA_CRL_INDICATOR "Delta CRL Indicator"
     IDS_ISSUING_DIST_POINT "Issuing Distribution Point"
     IDS_FRESHEST_CRL "Freshest CRL"
@@ -106,13 +106,13 @@ STRINGTABLE DISCARDABLE
     IDS_APPLICATION_POLICIES "Application Policies"
     IDS_APPLICATION_POLICY_MAPPINGS "Application Policy Mappings"
     IDS_APPLICATION_POLICY_CONSTRAINTS "Application Policy Constraints"
-    IDS_CMC_DATA "CMC Data"
+    IDS_CMC_DATA "???? CMC"
     IDS_CMC_RESPONSE "CMC Response"
     IDS_UNSIGNED_CMC_REQUEST "Unsigned CMC Request"
     IDS_CMC_STATUS_INFO "CMC Status Info"
-    IDS_CMC_EXTENSIONS "CMC Extensions"
-    IDS_CMC_ATTRIBUTES "CMC Attributes"
-    IDS_PKCS_7_DATA "PKCS 7 Data"
+    IDS_CMC_EXTENSIONS "?????????? CMC"
+    IDS_CMC_ATTRIBUTES "??????????? CMC"
+    IDS_PKCS_7_DATA "PKCS 7 ????"
     IDS_PKCS_7_SIGNED "PKCS 7 Signed"
     IDS_PKCS_7_ENVELOPED "PKCS 7 Enveloped"
     IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signed Enveloped"
@@ -134,7 +134,7 @@ STRINGTABLE DISCARDABLE
     IDS_RECIPIENT_NONCE "Recipient Nonce"
     IDS_REG_INFO "Reg Info"
     IDS_GET_CERTIFICATE "Get Certificate"
-    IDS_GET_CRL "Get CRL"
+    IDS_GET_CRL "???????? CRL"
     IDS_REVOKE_REQUEST "Revoke Request"
     IDS_QUERY_PENDING "Query Pending"
     IDS_SORTED_CTL "Certificate Trust List"
@@ -185,17 +185,17 @@ STRINGTABLE DISCARDABLE
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_KEY_ID "KeyID="
+    IDS_KEY_ID "ID ?????="
     IDS_CERT_ISSUER "Certificate Issuer"
-    IDS_CERT_SERIAL_NUMBER "Certificate Serial Number="
+    IDS_CERT_SERIAL_NUMBER "???????? ????? ???????????="
     IDS_ALT_NAME_OTHER_NAME "???? ??'?="
     IDS_ALT_NAME_RFC822_NAME "?????? ??. ?????="
-    IDS_ALT_NAME_DNS_NAME "DNS Name="
-    IDS_ALT_NAME_DIRECTORY_NAME "Directory Address"
+    IDS_ALT_NAME_DNS_NAME "????? DNS="
+    IDS_ALT_NAME_DIRECTORY_NAME "?????? ????????"
     IDS_ALT_NAME_URL "URL="
     IDS_ALT_NAME_IP_ADDRESS "IP ??????="
     IDS_ALT_NAME_MASK "?????="
-    IDS_ALT_NAME_REGISTERED_ID "Registered ID="
+    IDS_ALT_NAME_REGISTERED_ID "?????????????? ID="
     IDS_USAGE_UNKNOWN "Unknown Key Usage"
     IDS_SUBJECT_TYPE "Subject Type="
     IDS_SUBJECT_TYPE_CA "CA"
@@ -204,44 +204,44 @@ STRINGTABLE DISCARDABLE
     IDS_PATH_LENGTH_NONE "None"
     IDS_INFO_NOT_AVAILABLE "Information Not Available"
     IDS_AIA "Authority Info Access"
-    IDS_ACCESS_METHOD "Access Method="
+    IDS_ACCESS_METHOD "????? ???????="
     IDS_ACCESS_METHOD_OCSP "OCSP"
     IDS_ACCESS_METHOD_CA_ISSUERS "CA Issuers"
-    IDS_ACCESS_METHOD_UNKNOWN "Unknown Access Method"
-    IDS_ACCESS_LOCATION "Alternative Name"
+    IDS_ACCESS_METHOD_UNKNOWN "????????? ????? ???????"
+    IDS_ACCESS_LOCATION "????????????? ?????"
     IDS_CRL_DIST_POINT "CRL Distribution Point"
     IDS_CRL_DIST_POINT_NAME "Distribution Point Name"
-    IDS_CRL_DIST_POINT_FULL_NAME "Full Name"
-    IDS_CRL_DIST_POINT_RDN_NAME "RDN Name"
+    IDS_CRL_DIST_POINT_FULL_NAME "????? ?????"
+    IDS_CRL_DIST_POINT_RDN_NAME "????? RDN"
     IDS_CRL_DIST_POINT_REASON "CRL Reason="
     IDS_CRL_DIST_POINT_ISSUER "CRL Issuer"
     IDS_REASON_KEY_COMPROMISE "Key Compromise"
     IDS_REASON_CA_COMPROMISE "CA Compromise"
     IDS_REASON_AFFILIATION_CHANGED "Affiliation Changed"
-    IDS_REASON_SUPERSEDED "Superseded"
-    IDS_REASON_CESSATION_OF_OPERATION "Operation Ceased"
+    IDS_REASON_SUPERSEDED "????????"
+    IDS_REASON_CESSATION_OF_OPERATION "???????? ????????"
     IDS_REASON_CERTIFICATE_HOLD "Certificate Hold"
     IDS_FINANCIAL_CRITERIA "????????? ????="
-    IDS_FINANCIAL_CRITERIA_AVAILABLE "Available"
-    IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Not Available"
-    IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Meets Criteria="
-    IDS_YES "Yes"
-    IDS_NO "No"
+    IDS_FINANCIAL_CRITERIA_AVAILABLE "????????"
+    IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "??????????"
+    IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "?????????? ?????????="
+    IDS_YES "???"
+    IDS_NO "??"
     IDS_DIGITAL_SIGNATURE "???????? ??????"
-    IDS_NON_REPUDIATION "Non-Repudiation"
-    IDS_KEY_ENCIPHERMENT "Key Encipherment"
-    IDS_DATA_ENCIPHERMENT "Data Encipherment"
-    IDS_KEY_AGREEMENT "Key Agreement"
-    IDS_CERT_SIGN "Certificate Signing"
-    IDS_OFFLINE_CRL_SIGN "Off-line CRL Signing"
-    IDS_CRL_SIGN "CRL Signing"
-    IDS_ENCIPHER_ONLY "Encipher Only"
-    IDS_DECIPHER_ONLY "Decipher Only"
-    IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentication"
-    IDS_NETSCAPE_SSL_SERVER "SSL Server Authentication"
+    IDS_NON_REPUDIATION "??? ???????"
+    IDS_KEY_ENCIPHERMENT "?????????? ?????"
+    IDS_DATA_ENCIPHERMENT "?????????? ?????"
+    IDS_KEY_AGREEMENT "??????? ?????"
+    IDS_CERT_SIGN "?????????? ???????????"
+    IDS_OFFLINE_CRL_SIGN "?????? ?????????? CRL"
+    IDS_CRL_SIGN "?????????? CRL"
+    IDS_ENCIPHER_ONLY "???? ??????."
+    IDS_DECIPHER_ONLY "???? ???????."
+    IDS_NETSCAPE_SSL_CLIENT "????????????? ??????? SSL"
+    IDS_NETSCAPE_SSL_SERVER "????????????? ??????? SSL"
     IDS_NETSCAPE_SMIME "S/MIME"
-    IDS_NETSCAPE_SIGN "Signature"
+    IDS_NETSCAPE_SIGN "??????"
     IDS_NETSCAPE_SSL_CA "SSL CA"
     IDS_NETSCAPE_SMIME_CA "S/MIME CA"
-    IDS_NETSCAPE_SIGN_CA "Signature CA"
+    IDS_NETSCAPE_SIGN_CA "?????? CA"
 }



From julliard at winehq.org  Mon Jun 28 11:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:18 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: kernel32: Add
	NERR_UserNotFound to german winerr.
Message-ID: <E1OTGlq-0007bH-Cn@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 74532c50096d518f1028a569d45d1bd6dcbfda6a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=74532c50096d518f1028a569d45d1bd6dcbfda6a

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Sun Jun 27 20:32:26 2010 +0200

kernel32: Add NERR_UserNotFound to german winerr.

---

 dlls/kernel32/nls/winerr_deu.mc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/nls/winerr_deu.mc b/dlls/kernel32/nls/winerr_deu.mc
index 8b1d75a..478f29b 100644
--- a/dlls/kernel32/nls/winerr_deu.mc
+++ b/dlls/kernel32/nls/winerr_deu.mc
@@ -3729,3 +3729,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED
 Language=DEU
 RPC_S_GRP_ELT_NOT_REMOVED
 .
+MessageId=2221
+SymbolicName=NERR_UserNotFound
+Language=DEU
+Der Benutzername konnte nicht gefunden werden
+.



From julliard at winehq.org  Mon Jun 28 11:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:18 -0500
Subject: Michael Stefaniuc : start: Add the Romanian translation.
Message-ID: <E1OTGlq-0007bc-Jr@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1f244ce0c59ddb0d3018a7cc5d666dca0a20f053
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f244ce0c59ddb0d3018a7cc5d666dca0a20f053

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Sun Jun 27 22:50:47 2010 +0200

start: Add the Romanian translation.

Translation by Claudia Cotun?, reviewed by Alexandru B?lu?.

---

 programs/start/Makefile.in |    1 +
 programs/start/Ro.rc       |   73 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 0 deletions(-)

diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in
index d8848a1..ae92b04 100644
--- a/programs/start/Makefile.in
+++ b/programs/start/Makefile.in
@@ -24,6 +24,7 @@ RC_SRCS = \
 	No.rc \
 	Pl.rc \
 	Pt.rc \
+	Ro.rc \
 	Ru.rc \
 	Si.rc \
 	Tr.rc
diff --git a/programs/start/Ro.rc b/programs/start/Ro.rc
new file mode 100644
index 0000000..6f058fd
--- /dev/null
+++ b/programs/start/Ro.rc
@@ -0,0 +1,73 @@
+/*
+ * Start
+ *
+ * Copyright 2003 Dan Kegel
+ * Copyright 2010 Claudia Cotun?
+ *                Michael Stefaniuc
+ *
+ * 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 "resources.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE DISCARDABLE
+{
+STRING_USAGE, "Lansa?i un program sau deschide?i un document ?n programul utilizat\n\
+de obicei pentru fi?ierele cu acel sufix.\n\
+Utilizare:\n\
+start [op?iuni] cale_program [...]\n\
+start [op?iuni] cale_document\n\
+\n\
+Op?iuni:\n\
+/M[inimizat] Porne?te programul minimizat.\n\
+/MAX[imizat] Porne?te programul maximizat.\n\
+/R[estaurat] Porne?te programul normal (nici minimizat, nici maximizat).\n\
+/W           A?teapt? ca programul pornit s? termine, apoi ie?i din el\n\
+\             cu codul s?u de ie?ire.\n\
+/Unix        Utilizeaz? un nume de fi?ier Unix ?i porne?te fi?ierul ca\n\
+\             windows explorer.\n\
+/ProgIDOpen  Deschide un document utiliz?nd urm?torul progID.\n\
+/L           Afi?eaz? licen?a utilizatorului final.\n\
+\n\
+start.exe versiunea 0.2 Drepturi de autor (C) 2003, Dan Kegel\n\
+Start nu implic? ABSOLUT NICIO GARAN?IE; pentru detalii, alege?i op?iunea /L.\n\
+Acesta este un software liber ?i ?l pute?i redistribui ?n anumite condi?ii;\n\
+executa?i ?start /L? pentru detalii.\n"
+
+STRING_LICENSE, "start.exe versiunea 0.2 Drepturi de autor (C) 2003, Dan Kegel\n\
+Acest program este un software liber; ?l pute?i redistribui ?i/sau\n\
+modifica respect?nd termenii GNU Lesser Public License a?a cum este\n\
+publicat? de c?tre Free Software Foundation; fie versiunea 2.1\n\
+a Licen?ei, fie (la alegere) orice versiune mai recent?.\n\
+\n\
+Acest program este distribuit cu speran?a c? va fi util,\n\
+dar F?R? NICIO GARAN?IE; nici m?car cu garan?ia implicit? de\n\
+VANDABILITATE sau POTRIVIRE PENTRU UN ANUMIT SCOP. Consulta?i\n\
+GNU Lesser Public License pentru mai multe detalii.\n\
+\n\
+Ar fi trebuit s? primi?i o copie a GNU Lesser Public License\n\
+?mpreun? cu acest program; dac? nu, scrie?i la Free Software\n\
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\
+\n\
+Consulta?i fi?ierul COPYING.LIB pentru informa?ii despre licen??.\n"
+
+STRING_EXECFAIL, "Aplica?ia nu a putut fi pornit? sau nu exist? nici o aplica?ie asociat?\ncu fi?ierul specificat. ShellExecuteEx a e?uat"
+
+STRING_UNIXFAIL "Nu a putut fi tradus numele de fi?ier Unix specificat ?ntr-un nume de fi?ier DOS."
+}



From julliard at winehq.org  Mon Jun 28 11:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:18 -0500
Subject: Michael Stefaniuc : start: One language specifier in the English
	resource is enough.
Message-ID: <E1OTGlq-0007bt-Mu@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b8489d5f33c049e6ea9523bbea26695e8a60b456
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b8489d5f33c049e6ea9523bbea26695e8a60b456

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Sun Jun 27 22:51:06 2010 +0200

start: One language specifier in the English resource is enough.

Also fix a strange indentation.

---

 programs/start/En.rc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/start/En.rc b/programs/start/En.rc
index 463b6c2..3b9fa39 100644
--- a/programs/start/En.rc
+++ b/programs/start/En.rc
@@ -23,9 +23,9 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
-STRING_USAGE,                                   "Start a program, or open a document in the program normally used for files with that suffix.\n\
+STRING_USAGE, "Start a program, or open a document in the program normally used for files with that suffix.\n\
 Usage:\n\
 start [options] program_filename [...]\n\
 start [options] document_filename\n\



From julliard at winehq.org  Mon Jun 28 11:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:18 -0500
Subject: Alexandre Julliard : atl: Fix off-by-one buffer allocation.
Message-ID: <E1OTGlq-0007cA-Q7@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f71c4113bc33fd738ce493d021694f166d2ed27c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f71c4113bc33fd738ce493d021694f166d2ed27c

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 28 11:44:40 2010 +0200

atl: Fix off-by-one buffer allocation.

---

 dlls/atl/registrar.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c
index 70c1384..7076e35 100644
--- a/dlls/atl/registrar.c
+++ b/dlls/atl/registrar.c
@@ -549,7 +549,7 @@ static HRESULT WINAPI Registrar_AddReplacement(IRegistrar *iface, LPCOLESTR Key,
     new_rep = HeapAlloc(GetProcessHeap(), 0, sizeof(rep_list));
 
     new_rep->key_len  = lstrlenW(Key);
-    new_rep->key = HeapAlloc(GetProcessHeap(), 0, new_rep->key_len*sizeof(OLECHAR)+1);
+    new_rep->key = HeapAlloc(GetProcessHeap(), 0, (new_rep->key_len + 1) * sizeof(OLECHAR));
     memcpy(new_rep->key, Key, (new_rep->key_len+1)*sizeof(OLECHAR));
 
     len = lstrlenW(item)+1;



From julliard at winehq.org  Mon Jun 28 11:01:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:18 -0500
Subject: Alexandre Julliard : msvcrt: Use the correct strdup function for
	locale data.
Message-ID: <E1OTGlq-0007cQ-SO@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c5e88a3a69adf6b2bcd32b070dbf168bc83707d8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c5e88a3a69adf6b2bcd32b070dbf168bc83707d8

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 28 11:45:01 2010 +0200

msvcrt: Use the correct strdup function for locale data.

---

 dlls/msvcrt/locale.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index 393a23d..06c8da1 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -741,7 +741,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
             return NULL;
         }
     } else
-        loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = strdup("C");
+        loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = _strdup("C");
 
     if(lcid[MSVCRT_LC_CTYPE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) {
         CPINFO cp;
@@ -783,7 +783,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
         loc->locinfo->lc_clike = 1;
         loc->locinfo->mb_cur_max = 1;
         loc->locinfo->pctype = MSVCRT__ctype+1;
-        loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = strdup("C");
+        loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = _strdup("C");
     }
 
     for(i=0; i<256; i++)
@@ -988,7 +988,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
         loc->locinfo->lconv->p_sign_posn = 127;
         loc->locinfo->lconv->n_sign_posn = 127;
 
-        loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = strdup("C");
+        loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = _strdup("C");
     }
 
     if(lcid[MSVCRT_LC_NUMERIC] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_NUMERIC)) {
@@ -1055,7 +1055,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
         loc->locinfo->lconv->thousands_sep[0] = '\0';
         loc->locinfo->lconv->grouping[0] = '\0';
 
-        loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = strdup("C");
+        loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = _strdup("C");
     }
 
     if(lcid[MSVCRT_LC_TIME] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) {
@@ -1064,7 +1064,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
             return NULL;
         }
     } else
-        loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = strdup("C");
+        loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = _strdup("C");
 
     return loc;
 }



From julliard at winehq.org  Mon Jun 28 11:01:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:19 -0500
Subject: Tim Cadogan-Cowper : winmm: Correctly calculate dwFileSize for apps
	installing their own IOproc.
Message-ID: <E1OTGlr-0007ci-4H@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d65031666179bba2f3bcacbd031ab153e4c7e1a2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d65031666179bba2f3bcacbd031ab153e4c7e1a2

Author: Tim Cadogan-Cowper <tccowper at yahoo.com.au>
Date:   Sun Jun 27 04:20:04 2010 -0700

winmm: Correctly calculate dwFileSize for apps installing their own IOproc.

---

 dlls/winmm/mmio.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index f13e090..a6e06b5 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -667,16 +667,11 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags,
                                         (LPARAM)szFileName, 0, FALSE);
 
     /* grab file size, when possible */
-    /* FIXME: the code around dwFileSize is:
-     * - probably broken
-     * - needs to be tested when the app installs its own IOproc
-     * - likely to be removed
-     * So, restrict dwFileSize usage to DOS ioprocs
-     */
-    if (wm->info.fccIOProc == FOURCC_DOS && (pos = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_CUR)) != -1)
-    {
-        wm->dwFileSize = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_END);
-        _llseek((HFILE)wm->info.adwInfo[0], pos, SEEK_SET);
+    if (wm->info.fccIOProc != FOURCC_MEM && (send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)) != -1) {
+       pos = wm->info.lDiskOffset;
+       send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_END, FALSE);
+       wm->dwFileSize = wm->info.lDiskOffset;
+       send_message(wm->ioProc, &wm->info, MMIOM_SEEK, pos, SEEK_SET, FALSE);
     }
     else wm->dwFileSize = 0;
 



From julliard at winehq.org  Mon Jun 28 11:01:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:19 -0500
Subject: Eric Pouech : winmm: Added a couple of tests for structure alignment.
Message-ID: <E1OTGlr-0007cy-5y@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e9e6845d66645daff6ffcfe599e03849e6ba9d32
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e9e6845d66645daff6ffcfe599e03849e6ba9d32

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Fri Jun 25 22:06:07 2010 +0200

winmm: Added a couple of tests for structure alignment.

---

 dlls/winmm/tests/Makefile.in |    1 +
 dlls/winmm/tests/generated.c | 3504 ++++++++++++++++++++++++++++++++++++++++++
 tools/winapi/tests.dat       |  122 ++
 3 files changed, 3627 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e6845d66645daff6ffcfe599e03849e6ba9d32


From julliard at winehq.org  Mon Jun 28 11:01:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:19 -0500
Subject: Eric Pouech : dbghelp: Set the correct word size when unwinding
	stacks with Dwarf debug info.
Message-ID: <E1OTGlr-0007dG-9p@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b38cddf4845da65a0b5567aa9fb3e9ecac964766
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b38cddf4845da65a0b5567aa9fb3e9ecac964766

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sun Jun 27 18:55:09 2010 +0200

dbghelp: Set the correct word size when unwinding stacks with Dwarf debug info.

---

 dlls/dbghelp/dwarf.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 4d7ec0d..274410e 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -2756,7 +2756,8 @@ static void copy_context_reg(CONTEXT *dstcontext, ULONG_PTR dwregdst, CONTEXT* s
     memcpy(ptrdst, ptrsrc, szdst);
 }
 
-static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char* zp, CONTEXT *context)
+static ULONG_PTR eval_expression(struct module* module, struct cpu_stack_walk* csw,
+                                 const unsigned char* zp, CONTEXT *context)
 {
     dwarf2_traverse_context_t    ctx;
     ULONG_PTR reg, sz, tmp, stack[64];
@@ -2767,7 +2768,7 @@ static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char
     ctx.end_data = zp + 4;
     len = dwarf2_leb128_as_unsigned(&ctx);
     ctx.end_data = ctx.data + len;
-    ctx.word_size = 8; /* FIXME: wordsize!! */
+    ctx.word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size;
 
     while (ctx.data < ctx.end_data)
     {
@@ -2866,7 +2867,8 @@ static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char
     return stack[sp];
 }
 
-static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struct frame_info *info, ULONG_PTR* cfa)
+static void apply_frame_info(struct module* module, struct cpu_stack_walk* csw,
+                             CONTEXT *context, struct frame_info *info, ULONG_PTR* cfa)
 {
     unsigned int i;
     ULONG_PTR value;
@@ -2875,10 +2877,10 @@ static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struc
     switch (info->cfa_rule)
     {
     case RULE_EXPRESSION:
-        *cfa = *(ULONG_PTR*)eval_expression(csw, (const unsigned char*)info->cfa_offset, context);
+        *cfa = *(ULONG_PTR*)eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context);
         break;
     case RULE_VAL_EXPRESSION:
-        *cfa = eval_expression(csw, (const unsigned char*)info->cfa_offset, context);
+        *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context);
         break;
     default:
         *cfa = get_context_reg(context, info->cfa_reg) + info->cfa_offset;
@@ -2901,11 +2903,11 @@ static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struc
             copy_context_reg(&new_context, i, context, info->regs[i]);
             break;
         case RULE_EXPRESSION:
-            value = eval_expression(csw, (const unsigned char*)info->regs[i], context);
+            value = eval_expression(module, csw, (const unsigned char*)info->regs[i], context);
             set_context_reg(csw, &new_context, i, value, TRUE);
             break;
         case RULE_VAL_EXPRESSION:
-            value = eval_expression(csw, (const unsigned char*)info->regs[i], context);
+            value = eval_expression(module, csw, (const unsigned char*)info->regs[i], context);
             set_context_reg(csw, &new_context, i, value, FALSE);
             break;
         }
@@ -2973,7 +2975,7 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk* csw, ULONG_PTR ip, CONTEXT* co
     if (end) fde_ctx.data = end;
 
     execute_cfa_instructions(&fde_ctx, ip, &info);
-    apply_frame_info(csw, context, &info, cfa);
+    apply_frame_info(pair.effective, csw, context, &info, cfa);
 
     return TRUE;
 }



From julliard at winehq.org  Mon Jun 28 11:01:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:19 -0500
Subject: Eric Pouech : dbghelp: Correctly handle the RULE_EXPRESSION when
	computing CFA in dwarf debug info .
Message-ID: <E1OTGlr-0007dg-KX@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1c037bf5641d6dab556439882c1dc26d11a96b68
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1c037bf5641d6dab556439882c1dc26d11a96b68

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sun Jun 27 18:55:15 2010 +0200

dbghelp: Correctly handle the RULE_EXPRESSION when computing CFA in dwarf debug info.

---

 dlls/dbghelp/dwarf.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 274410e..413ae44 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -2877,7 +2877,12 @@ static void apply_frame_info(struct module* module, struct cpu_stack_walk* csw,
     switch (info->cfa_rule)
     {
     case RULE_EXPRESSION:
-        *cfa = *(ULONG_PTR*)eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context);
+        *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context);
+        if (!sw_read_mem(csw, *cfa, cfa, sizeof(*cfa)))
+        {
+            WARN("Couldn't read memory at %p\n", (void*)*cfa);
+            return;
+        }
         break;
     case RULE_VAL_EXPRESSION:
         *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context);



From julliard at winehq.org  Mon Jun 28 11:01:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:19 -0500
Subject: Eric Pouech : dbghelp: When unwinding i386 stacks,
	update CONTEXT with sp/  bp/ip.
Message-ID: <E1OTGlr-0007dx-Ph@wine.codeweavers.com>

Module: wine
Branch: master
Commit: b6c8b8959be4d69db5448281cbddd64b43db228b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b6c8b8959be4d69db5448281cbddd64b43db228b

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sun Jun 27 18:55:21 2010 +0200

dbghelp: When unwinding i386 stacks, update CONTEXT with sp/bp/ip.

---

 dlls/dbghelp/cpu_i386.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c
index dc00410..a88b00f 100644
--- a/dlls/dbghelp/cpu_i386.c
+++ b/dlls/dbghelp/cpu_i386.c
@@ -410,8 +410,23 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO
         sw_read_mem(csw, frame->AddrFrame.Offset + 2 * sizeof(DWORD),
                     frame->Params, sizeof(frame->Params));
     }
-    goto done_pep; /* just to ensure done_pep label is referenced */
+#ifdef __i386__
+    if (context)
+    {
+#define SET(field, seg, reg) \
+        switch (frame->field.Mode) \
+        { \
+        case AddrModeFlat: context->reg = frame->field.Offset; break; \
+        case AddrMode1616: context->seg = frame->field.Segment; context->reg = frame->field.Offset; break; \
+        default: assert(0); \
+        }
+        SET(AddrStack,  SegSs, Esp);
+        SET(AddrFrame,  SegSs, Ebp);
+        SET(AddrReturn, SegCs, Eip);
+#undef SET
+    }
 done_pep:
+#endif
 
     frame->Far = TRUE;
     frame->Virtual = TRUE;



From julliard at winehq.org  Mon Jun 28 11:01:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:20 -0500
Subject: Eric Pouech : dbghelp: Parse correctly DW_LNE_set_discriminator.
Message-ID: <E1OTGls-0007eH-5c@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5afe16621b786a11c6d28e54e2fa526240ba100a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5afe16621b786a11c6d28e54e2fa526240ba100a

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sun Jun 27 22:57:33 2010 +0200

dbghelp: Parse correctly DW_LNE_set_discriminator.

---

 dlls/dbghelp/dwarf.c |    4 ++++
 dlls/dbghelp/dwarf.h |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 413ae44..dda1725 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -2075,6 +2075,10 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections,
                         dwarf2_leb128_as_unsigned(&traverse);
                         dwarf2_leb128_as_unsigned(&traverse);
                         break;
+                    case DW_LNE_set_discriminator:
+                        WARN("not handled %s\n", traverse.data);
+                        dwarf2_leb128_as_unsigned(&traverse);
+                        break;
                     default:
                         FIXME("Unsupported extended opcode %x\n", extopcode);
                         break;
diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h
index 4ecb816..9864ecc 100644
--- a/dlls/dbghelp/dwarf.h
+++ b/dlls/dbghelp/dwarf.h
@@ -421,6 +421,8 @@ enum dwarf_calling_convention
 #define DW_LNE_end_sequence             0x01
 #define DW_LNE_set_address              0x02
 #define DW_LNE_define_file              0x03
+/* Dwarf4 new values */
+#define DW_LNE_set_discriminator        0x04
 
 #define DW_CIE_ID                       ~(0x0)
 



From julliard at winehq.org  Mon Jun 28 11:01:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:20 -0500
Subject: Nikolay Sivov : msxml3: Create additional node for xml declaration.
Message-ID: <E1OTGls-0007eY-Aq@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d461d7d2136fcb8fa591784742c31237ad5b10d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d461d7d2136fcb8fa591784742c31237ad5b10d6

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun 28 12:17:56 2010 +0400

msxml3: Create additional node for xml declaration.

---

 dlls/msxml3/domdoc.c        |   71 ++++++++++++++++++++++++++++++++++++++++---
 dlls/msxml3/msxml_private.h |    2 +
 dlls/msxml3/node.c          |    5 +++
 dlls/msxml3/tests/domdoc.c  |   49 ++++++++++++++++++++++--------
 4 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 54e4728..cec59e8 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -141,18 +141,75 @@ static xmldoc_priv * create_priv(void)
     return priv;
 }
 
+/* links a "<?xml" node as a first child */
+void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node)
+{
+    assert(doc != NULL);
+    if (doc->standalone != -1) xmlAddPrevSibling( doc->children, node );
+}
+
+/* unlinks a first "<?xml" child if it was created */
+xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc)
+{
+    xmlNodePtr node;
+
+    assert(doc != NULL);
+
+    if (doc->standalone != -1)
+    {
+        node = doc->children;
+        xmlUnlinkNode( node );
+    }
+    else
+        node = NULL;
+
+    return node;
+}
+
 static xmlDocPtr doparse( char *ptr, int len, const char *encoding )
 {
+    xmlDocPtr doc;
+
 #ifdef HAVE_XMLREADMEMORY
     /*
      * use xmlReadMemory if possible so we can suppress
      * writing errors to stderr
      */
-    return xmlReadMemory( ptr, len, NULL, encoding,
-                          XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS );
+    doc = xmlReadMemory( ptr, len, NULL, encoding,
+                           XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS );
 #else
-    return xmlParseMemory( ptr, len );
+    doc = xmlParseMemory( ptr, len );
 #endif
+
+    /* create first child as a <?xml...?> */
+    if (doc && doc->standalone != -1)
+    {
+        xmlNodePtr node;
+        char buff[30];
+        xmlChar *xmlbuff = (xmlChar*)buff;
+
+        node = xmlNewDocPI( doc, (xmlChar*)"xml", NULL );
+
+        /* version attribute can't be omitted */
+        sprintf(buff, "version=\"%s\"", doc->version ? (char*)doc->version : "1.0");
+        xmlNodeAddContent( node, xmlbuff );
+
+        if (doc->encoding)
+        {
+            sprintf(buff, " encoding=\"%s\"", doc->encoding);
+            xmlNodeAddContent( node, xmlbuff );
+        }
+
+        if (doc->standalone != -2)
+        {
+            sprintf(buff, " standalone=\"%s\"", doc->standalone == 0 ? "no" : "yes");
+            xmlNodeAddContent( node, xmlbuff );
+        }
+
+        xmldoc_link_xmldecl( doc, node );
+    }
+
+    return doc;
 }
 
 LONG xmldoc_add_ref(xmlDocPtr doc)
@@ -345,7 +402,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load(
     len = GlobalSize(hglobal);
     ptr = GlobalLock(hglobal);
     if (len != 0)
-        xmldoc = parse_xml(ptr, len);
+        xmldoc = doparse(ptr, len, NULL);
     GlobalUnlock(hglobal);
 
     if (!xmldoc)
@@ -1524,7 +1581,7 @@ static HRESULT WINAPI domdoc_load(
                 {
                     *isSuccessful = VARIANT_TRUE;
 
-                    TRACE("Using ID_IStream to load Document\n");
+                    TRACE("Using IStream to load Document\n");
                     return S_OK;
                 }
                 else
@@ -1733,6 +1790,7 @@ static HRESULT WINAPI domdoc_save(
     domdoc *This = impl_from_IXMLDOMDocument2( iface );
     HANDLE handle;
     xmlSaveCtxtPtr ctx;
+    xmlNodePtr xmldecl;
     HRESULT ret = S_OK;
 
     TRACE("(%p)->(var(vt %d, %s))\n", This, V_VT(&destination),
@@ -1788,7 +1846,10 @@ static HRESULT WINAPI domdoc_save(
         return S_FALSE;
     }
 
+    xmldecl = xmldoc_unlink_xmldecl(get_doc(This));
     if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE;
+    xmldoc_link_xmldecl(get_doc(This), xmldecl);
+
     /* will close file through close callback */
     xmlSaveClose(ctx);
 
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
index 1df3e8b..e0279f1 100644
--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
@@ -134,6 +134,8 @@ extern LONG xmldoc_add_ref( xmlDocPtr doc );
 extern LONG xmldoc_release( xmlDocPtr doc );
 extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node );
 extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node );
+extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node);
+extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc);
 
 extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own );
 
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 135844f..bbdcb5d 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -1382,6 +1382,7 @@ static HRESULT WINAPI xmlnode_get_xml(
 {
     xmlnode *This = impl_from_IXMLDOMNode( iface );
     xmlBufferPtr pXmlBuf;
+    xmlNodePtr xmldecl;
     int nSize;
 
     TRACE("(%p %d)->(%p)\n", This, This->node->type, xmlString);
@@ -1391,6 +1392,8 @@ static HRESULT WINAPI xmlnode_get_xml(
 
     *xmlString = NULL;
 
+    xmldecl = xmldoc_unlink_xmldecl( This->node->doc );
+
     pXmlBuf = xmlBufferCreate();
     if(pXmlBuf)
     {
@@ -1424,6 +1427,8 @@ static HRESULT WINAPI xmlnode_get_xml(
         xmlBufferFree(pXmlBuf);
     }
 
+    xmldoc_link_xmldecl( This->node->doc, xmldecl );
+
     /* Always returns a string. */
     if(*xmlString == NULL)  *xmlString = SysAllocStringLen( NULL, 0 );
 
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 9c1440c..cde4c81 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -470,20 +470,8 @@ static void node_to_string(IXMLDOMNode *node, char *buf)
         }
         else
         {
-            int pos = get_node_position(node);
-            DOMNodeType parent_type = NODE_INVALID;
             r = IXMLDOMNode_get_parentNode(node, &new_node);
-
-            /* currently wine doesn't create a node for the <?xml ... ?>. To be able to test query
-             * results we "fix" it */
-            if (r == S_OK)
-                ole_check(IXMLDOMNode_get_nodeType(new_node, &parent_type));
-            if ((parent_type == NODE_DOCUMENT) && type != NODE_PROCESSING_INSTRUCTION && pos==1)
-            {
-                todo_wine ok(FALSE, "The first child of the document node in MSXML is the <?xml ... ?> processing instruction\n");
-                pos++;
-            }
-            wsprintf(buf, "%d", pos);
+            wsprintf(buf, "%d", get_node_position(node));
             buf += strlen(buf);
         }
 
@@ -2477,6 +2465,40 @@ static void test_get_childNodes(void)
     IXMLDOMDocument_Release( doc );
 }
 
+static void test_get_firstChild(void)
+{
+    static WCHAR xmlW[] = {'x','m','l',0};
+    IXMLDOMDocument *doc;
+    IXMLDOMNode *node;
+    VARIANT_BOOL b;
+    HRESULT r;
+    BSTR str;
+
+    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
+        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc );
+    ok( r == S_OK, "failed with 0x%08x\n", r );
+    if( r != S_OK )
+        return;
+
+    str = SysAllocString( szComplete4 );
+    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    ok( r == S_OK, "loadXML failed\n");
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    SysFreeString( str );
+
+    r = IXMLDOMDocument_get_firstChild( doc, &node );
+    ok( r == S_OK, "ret %08x\n", r);
+
+    r = IXMLDOMNode_get_nodeName( node, &str );
+    ok( r == S_OK, "ret %08x\n", r);
+
+    ok(memcmp(str, xmlW, sizeof(xmlW)) == 0, "expected \"xml\" node name\n");
+
+    SysFreeString(str);
+    IXMLDOMNode_Release( node );
+    IXMLDOMDocument_Release( doc );
+}
+
 static void test_removeChild(void)
 {
     HRESULT r;
@@ -5581,6 +5603,7 @@ START_TEST(domdoc)
         test_getElementsByTagName();
         test_get_text();
         test_get_childNodes();
+        test_get_firstChild();
         test_removeChild();
         test_replaceChild();
         test_removeNamedItem();



From julliard at winehq.org  Mon Jun 28 11:01:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:20 -0500
Subject: Andrew Eikum : shell32: Fix a comment typo.
Message-ID: <E1OTGls-0007ep-E6@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5c81b5484a36985f8662df80d2256b5beaea97fa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5c81b5484a36985f8662df80d2256b5beaea97fa

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Fri Jun 25 15:20:04 2010 -0500

shell32: Fix a comment typo.

---

 dlls/shell32/shfldr_fs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index 626f17f..305902c 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -1068,7 +1068,7 @@ static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface)
 }
 
 /****************************************************************************
- * ISFHelper_fnAddFolder
+ * ISFHelper_fnGetUniqueName
  *
  * creates a unique folder name
  */



From julliard at winehq.org  Mon Jun 28 11:01:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:20 -0500
Subject: Hwang YunSong : cmd: Update Korean resource.
Message-ID: <E1OTGls-0007fM-JV@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ffc5f0d45ffb9d0cad2f4a3227d27128e114ef38
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ffc5f0d45ffb9d0cad2f4a3227d27128e114ef38

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 28 10:20:06 2010 +0900

cmd: Update Korean resource.

---

 programs/cmd/Ko.rc |  350 +++++++++++++++++++++++++++-------------------------
 1 files changed, 179 insertions(+), 171 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffc5f0d45ffb9d0cad2f4a3227d27128e114ef38


From julliard at winehq.org  Mon Jun 28 11:01:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:20 -0500
Subject: Hwang YunSong : xcopy: Update Korean resource.
Message-ID: <E1OTGls-0007fd-OP@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 098e6e7f8a19e846f93f3f4a14cc66a1db402e3d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=098e6e7f8a19e846f93f3f4a14cc66a1db402e3d

Author: Hwang YunSong <hys545 at dreamwiz.com>
Date:   Mon Jun 28 10:21:37 2010 +0900

xcopy: Update Korean resource.

---

 programs/xcopy/Ko.rc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/programs/xcopy/Ko.rc b/programs/xcopy/Ko.rc
index 6a5071c..2d32095 100644
--- a/programs/xcopy/Ko.rc
+++ b/programs/xcopy/Ko.rc
@@ -3,7 +3,7 @@
  * Korean language support
  *
  * Copyright (C) 2007 J. Edmeades
- * Copyright (C) 2007 YunSong Hwang(hys545 at dreamwiz.com)
+ * Copyright (C) 2007,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
@@ -54,8 +54,8 @@ XCOPY 
 \n\
 Where:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or\n\
-\tmore files\n\
+[/I] ???? ?????? ???????? ???? ???? ?????????? ???????? ?????? ?? ???? ?????? \n\
+\     ????\n\
 [/S]  ???????????? ???? ???????? ????\n\
 [/E]  ?? ?????????? ???????? ?????????? ???? ???????? ????\n\
 [/Q]  ???????? ???????? ???????? ?????????? ???????? ???? ????.\n\
@@ -73,7 +73,7 @@ Where:\n\
 [/C]  ???????? ?????? ?????? ???????? ???? ????\n\
 [/A]  ???? ???? ?????? ???????????? ?????? ????\n\
 [/M]  ???? ???? ?????? ??????????  ???? ?????? ????????????\n\
-\?????? ????\n\
+\ ?????? ????\n\
 [/D | /D:m-d-y] ?????? ???? ???? ?????????? ?????? ???? ????.\n\
 \t\tI???? ?????? ?????? ???????? ??????,???? ????????\n\
 \t\t?????? ?????? ???? ????\n\n"



From julliard at winehq.org  Mon Jun 28 11:01:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:20 -0500
Subject: Jacek Caban : mshtml: Store client site in HTMLDocumentObj as soon as
	possible in SetClientSite.
Message-ID: <E1OTGls-0007fw-U5@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 95a53a9ff61c3aa5f74a3dd4560bba9da804fd8c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95a53a9ff61c3aa5f74a3dd4560bba9da804fd8c

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 28 12:51:11 2010 +0200

mshtml: Store client site in HTMLDocumentObj as soon as possible in SetClientSite.

---

 dlls/mshtml/oleobj.c        |   26 ++++----
 dlls/mshtml/tests/htmldoc.c |  150 +++++++++++++++++++++++-------------------
 2 files changed, 95 insertions(+), 81 deletions(-)

diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
index a33f479..eab76bf 100644
--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -96,8 +96,10 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
     HTMLDocument *This = OLEOBJ_THIS(iface);
     IDocHostUIHandler *pDocHostUIHandler = NULL;
     IOleCommandTarget *cmdtrg = NULL;
+    IOleWindow *ole_window;
     BOOL hostui_setup;
     VARIANT silent;
+    HWND hwnd;
     HRESULT hres;
 
     TRACE("(%p)->(%p)\n", This, pClientSite);
@@ -121,6 +123,9 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
     if(!pClientSite)
         return S_OK;
 
+    IOleClientSite_AddRef(pClientSite);
+    This->doc_obj->client = pClientSite;
+
     hostui_setup = This->doc_obj->hostui_setup;
 
     hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler);
@@ -129,6 +134,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
         LPOLESTR key_path = NULL, override_key_path = NULL;
         IDocHostUIHandler2 *pDocHostUIHandler2;
 
+        This->doc_obj->hostui = pDocHostUIHandler;
+
         memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO));
         hostinfo.cbSize = sizeof(DOCHOSTUIINFO);
         hres = IDocHostUIHandler_GetHostInfo(pDocHostUIHandler, &hostinfo);
@@ -166,19 +173,16 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
 
             This->doc_obj->hostui_setup = TRUE;
         }
+    }else {
+        This->doc_obj->hostui = NULL;
     }
 
     /* Native calls here GetWindow. What is it for?
      * We don't have anything to do with it here (yet). */
-    if(pClientSite) {
-        IOleWindow *pOleWindow = NULL;
-        HWND hwnd;
-
-        hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleWindow, (void**)&pOleWindow);
-        if(SUCCEEDED(hres)) {
-            IOleWindow_GetWindow(pOleWindow, &hwnd);
-            IOleWindow_Release(pOleWindow);
-        }
+    hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleWindow, (void**)&ole_window);
+    if(SUCCEEDED(hres)) {
+        IOleWindow_GetWindow(ole_window, &hwnd);
+        IOleWindow_Release(ole_window);
     }
 
     hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleCommandTarget, (void**)&cmdtrg);
@@ -204,10 +208,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
         IOleCommandTarget_Release(cmdtrg);
     }
 
-    IOleClientSite_AddRef(pClientSite);
-    This->doc_obj->client = pClientSite;
-    This->doc_obj->hostui = pDocHostUIHandler;
-
     if(This->doc_obj->usermode == UNKNOWN_USERMODE)
         IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERMODE);
 
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 2d51262..65451b1 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -1368,6 +1368,74 @@ static const IOleContainerVtbl OleContainerVtbl = {
 
 static IOleContainer OleContainer = { &OleContainerVtbl };
 
+static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv)
+{
+    return QueryInterface(riid, ppv);
+}
+
+static ULONG WINAPI ClientSite_AddRef(IOleClientSite *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI ClientSite_Release(IOleClientSite *iface)
+{
+    return 1;
+}
+
+static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker,
+        IMoniker **ppmon)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer)
+{
+    CHECK_EXPECT(GetContainer);
+    ok(ppContainer != NULL, "ppContainer = NULL\n");
+    *ppContainer = &OleContainer;
+    return S_OK;
+}
+
+static HRESULT WINAPI ClientSite_ShowObject(IOleClientSite *iface)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ClientSite_OnShowWindow(IOleClientSite *iface, BOOL fShow)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ClientSite_RequestNewObjectLayout(IOleClientSite *iface)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static const IOleClientSiteVtbl ClientSiteVtbl = {
+    ClientSite_QueryInterface,
+    ClientSite_AddRef,
+    ClientSite_Release,
+    ClientSite_SaveObject,
+    ClientSite_GetMoniker,
+    ClientSite_GetContainer,
+    ClientSite_ShowObject,
+    ClientSite_OnShowWindow,
+    ClientSite_RequestNewObjectLayout
+};
+
+static IOleClientSite ClientSite = { &ClientSiteVtbl };
+
 static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv)
 {
     static const GUID undocumented_frame_iid = {0xfbece6c9,0x48d7,0x4a37,{0x8f,0xe3,0x6a,0xd4,0x27,0x2f,0xdd,0xac}};
@@ -1558,9 +1626,23 @@ static ULONG WINAPI InPlaceSiteWindowless_Release(IOleInPlaceSiteWindowless *ifa
 static HRESULT WINAPI InPlaceSiteWindowless_GetWindow(
         IOleInPlaceSiteWindowless *iface, HWND *phwnd)
 {
+    IOleClientSite *client_site;
+    IOleObject *ole_obj;
+    HRESULT hres;
+
     CHECK_EXPECT2(GetWindow);
     ok(phwnd != NULL, "phwnd = NULL\n");
     *phwnd = container_hwnd;
+
+    hres = IUnknown_QueryInterface(doc_unk, &IID_IOleObject, (void**)&ole_obj);
+    ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres);
+
+    hres = IOleObject_GetClientSite(ole_obj, &client_site);
+    IOleObject_Release(ole_obj);
+    ok(hres == S_OK, "GetClientSite failed: %08x\n", hres);
+    ok(client_site == &ClientSite, "client_site != ClientSite\n");
+    IOleClientSite_Release(client_site);
+
     return S_OK;
 }
 
@@ -1821,74 +1903,6 @@ static const IOleInPlaceSiteWindowlessVtbl InPlaceSiteWindowlessVtbl = {
 
 static IOleInPlaceSiteWindowless InPlaceSiteWindowless = { &InPlaceSiteWindowlessVtbl };
 
-static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv)
-{
-    return QueryInterface(riid, ppv);
-}
-
-static ULONG WINAPI ClientSite_AddRef(IOleClientSite *iface)
-{
-    return 2;
-}
-
-static ULONG WINAPI ClientSite_Release(IOleClientSite *iface)
-{
-    return 1;
-}
-
-static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface)
-{
-    ok(0, "unexpected call\n");
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker,
-        IMoniker **ppmon)
-{
-    ok(0, "unexpected call\n");
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI ClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer)
-{
-    CHECK_EXPECT(GetContainer);
-    ok(ppContainer != NULL, "ppContainer = NULL\n");
-    *ppContainer = &OleContainer;
-    return S_OK;
-}
-
-static HRESULT WINAPI ClientSite_ShowObject(IOleClientSite *iface)
-{
-    ok(0, "unexpected call\n");
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI ClientSite_OnShowWindow(IOleClientSite *iface, BOOL fShow)
-{
-    ok(0, "unexpected call\n");
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI ClientSite_RequestNewObjectLayout(IOleClientSite *iface)
-{
-    ok(0, "unexpected call\n");
-    return E_NOTIMPL;
-}
-
-static const IOleClientSiteVtbl ClientSiteVtbl = {
-    ClientSite_QueryInterface,
-    ClientSite_AddRef,
-    ClientSite_Release,
-    ClientSite_SaveObject,
-    ClientSite_GetMoniker,
-    ClientSite_GetContainer,
-    ClientSite_ShowObject,
-    ClientSite_OnShowWindow,
-    ClientSite_RequestNewObjectLayout
-};
-
-static IOleClientSite ClientSite = { &ClientSiteVtbl };
-
 static HRESULT WINAPI DocumentSite_QueryInterface(IOleDocumentSite *iface, REFIID riid, void **ppv)
 {
     return QueryInterface(riid, ppv);



From julliard at winehq.org  Mon Jun 28 11:01:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:21 -0500
Subject: Jacek Caban : shdocvw: Try to guess scheme for IHTMLPrivateWindow
	navigation too.
Message-ID: <E1OTGlt-0007gE-6H@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d230fad0a8bd0101452ec8cb56629dfc1f41962c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d230fad0a8bd0101452ec8cb56629dfc1f41962c

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 28 12:52:03 2010 +0200

shdocvw: Try to guess scheme for IHTMLPrivateWindow navigation too.

---

 dlls/shdocvw/navigate.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 99980c7..6d6cbb6 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -760,7 +760,23 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags,
     This->ready_state = READYSTATE_LOADING;
 
     if(This->doc_navigate) {
-        hres = async_doc_navigate(This, url, headers, post_data, post_data_len, TRUE);
+        WCHAR new_url[INTERNET_MAX_URL_LENGTH];
+
+        if(PathIsURLW(url)) {
+            new_url[0] = 0;
+        }else {
+            DWORD size;
+
+            size = sizeof(new_url)/sizeof(WCHAR);
+            hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME);
+            if(FAILED(hres)) {
+                WARN("UrlApplyScheme failed: %08x\n", hres);
+                new_url[0] = 0;
+            }
+        }
+
+        hres = async_doc_navigate(This, *new_url ? new_url : url, headers, post_data,
+                post_data_len, TRUE);
     }else {
         task_navigate_bsc_t *task;
 



From julliard at winehq.org  Mon Jun 28 11:01:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:21 -0500
Subject: Jacek Caban : shdocvw: Pass correct buffer size to UrlApplySchemeW.
Message-ID: <E1OTGlt-0007gU-7d@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4c2bb6ca706f215495d3fe6c1846abc553c85238
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c2bb6ca706f215495d3fe6c1846abc553c85238

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 28 12:52:23 2010 +0200

shdocvw: Pass correct buffer size to UrlApplySchemeW.

---

 dlls/shdocvw/navigate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 6d6cbb6..3310cba 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -486,7 +486,7 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon)
             return hres;
         }
     }else {
-        size = sizeof(new_url);
+        size = sizeof(new_url)/sizeof(WCHAR);
         hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME);
         TRACE("got %s\n", debugstr_w(new_url));
         if(FAILED(hres)) {



From julliard at winehq.org  Mon Jun 28 11:01:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:21 -0500
Subject: Jacek Caban : shdocvw: Return S_OK in IWebBrowser2::Stop.
Message-ID: <E1OTGlt-0007gm-Bq@wine.codeweavers.com>

Module: wine
Branch: master
Commit: cfdaa3cd531d5e2a294a3eb7a5cde0358b7cc4fa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cfdaa3cd531d5e2a294a3eb7a5cde0358b7cc4fa

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jun 28 12:52:43 2010 +0200

shdocvw: Return S_OK in IWebBrowser2::Stop.

---

 dlls/shdocvw/webbrowser.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index 20d39bb..4799686 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -301,7 +301,7 @@ static HRESULT WINAPI WebBrowser_Stop(IWebBrowser2 *iface)
 {
     WebBrowser *This = WEBBROWSER_THIS(iface);
     FIXME("(%p)\n", This);
-    return E_NOTIMPL;
+    return S_OK;
 }
 
 static HRESULT WINAPI WebBrowser_get_Application(IWebBrowser2 *iface, IDispatch **ppDisp)



From julliard at winehq.org  Mon Jun 28 11:01:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:21 -0500
Subject: Igor Paliychuk : oleacc: Added Ukrainian translation.
Message-ID: <E1OTGlt-0007h2-EG@wine.codeweavers.com>

Module: wine
Branch: master
Commit: fd56bf6d0fff3404b8555d3f7d6685407a58a77f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fd56bf6d0fff3404b8555d3f7d6685407a58a77f

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Sun Jun 27 19:52:27 2010 +0300

oleacc: Added Ukrainian translation.

---

 dlls/oleacc/Makefile.in  |    3 +-
 dlls/oleacc/oleacc_Uk.rc |   97 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletions(-)

diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in
index 2f1a67d..bf28dff 100644
--- a/dlls/oleacc/Makefile.in
+++ b/dlls/oleacc/Makefile.in
@@ -21,6 +21,7 @@ RC_SRCS = \
 	oleacc_Pl.rc \
 	oleacc_Pt.rc \
 	oleacc_Ro.rc \
-	oleacc_Si.rc
+	oleacc_Si.rc \
+	oleacc_Uk.rc
 
 @MAKE_DLL_RULES@
diff --git a/dlls/oleacc/oleacc_Uk.rc b/dlls/oleacc/oleacc_Uk.rc
new file mode 100644
index 0000000..5822cf3
--- /dev/null
+++ b/dlls/oleacc/oleacc_Uk.rc
@@ -0,0 +1,97 @@
+/*
+ * Ukrainian resources for oleacc
+ *
+ * Copyright 2008 Nikolay Sivov
+ *
+ * Copyright 2010 Igor Paliychuk
+ *
+ * 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 "oleacc.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    0 "unknown object" /* undocumented */
+    ROLE_SYSTEM_TITLEBAR    "????? ?????"
+    ROLE_SYSTEM_MENUBAR     "????? ????"
+    ROLE_SYSTEM_SCROLLBAR   "????? ?????????????"
+    ROLE_SYSTEM_GRIP        "?????"
+    ROLE_SYSTEM_SOUND       "????"
+    ROLE_SYSTEM_CURSOR      "??????"
+    ROLE_SYSTEM_CARET       "???? ???????"
+    ROLE_SYSTEM_ALERT       "???????"
+    ROLE_SYSTEM_WINDOW      "?????"
+    ROLE_SYSTEM_CLIENT      "??????"
+    ROLE_SYSTEM_MENUPOPUP   "?????????? ????"
+    ROLE_SYSTEM_MENUITEM    "??????? ????"
+    ROLE_SYSTEM_TOOLTIP     "????????"
+    ROLE_SYSTEM_APPLICATION "???????"
+    ROLE_SYSTEM_DOCUMENT    "????????"
+    ROLE_SYSTEM_PANE        "??????"
+    ROLE_SYSTEM_CHART       "??????"
+    ROLE_SYSTEM_DIALOG      "??????"
+    ROLE_SYSTEM_BORDER      "????"
+    ROLE_SYSTEM_GROUPING    "??????????"
+    ROLE_SYSTEM_SEPARATOR   "??????????"
+    ROLE_SYSTEM_TOOLBAR     "?????? ????????????"
+    ROLE_SYSTEM_STATUSBAR   "????? ?????"
+    ROLE_SYSTEM_TABLE        "???????"
+    ROLE_SYSTEM_COLUMNHEADER "????????? ?????????"
+    ROLE_SYSTEM_ROWHEADER    "????????? ?????"
+    ROLE_SYSTEM_COLUMN       "????????"
+    ROLE_SYSTEM_ROW          "?????"
+    ROLE_SYSTEM_CELL         "???????"
+    ROLE_SYSTEM_LINK         "?????????"
+    ROLE_SYSTEM_HELPBALLOON  "??????? ????????? ????"
+    ROLE_SYSTEM_CHARACTER    "????"
+    ROLE_SYSTEM_LIST         "??????"
+    ROLE_SYSTEM_LISTITEM     "??????? ??????"
+    ROLE_SYSTEM_OUTLINE      "????"
+    ROLE_SYSTEM_OUTLINEITEM  "??????? ?????"
+    ROLE_SYSTEM_PAGETAB      "???????? ????????"
+    ROLE_SYSTEM_PROPERTYPAGE "???????? ????????????"
+    ROLE_SYSTEM_INDICATOR    "????????"
+    ROLE_SYSTEM_GRAPHIC      "???????"
+    ROLE_SYSTEM_STATICTEXT   "????????? ?????"
+    ROLE_SYSTEM_TEXT         "?????"
+    ROLE_SYSTEM_PUSHBUTTON   "??????"
+    ROLE_SYSTEM_CHECKBUTTON  "??????-????????"
+    ROLE_SYSTEM_RADIOBUTTON  "?????????"
+    ROLE_SYSTEM_COMBOBOX     "??????????? ????"
+    ROLE_SYSTEM_DROPLIST     "??????????"
+    ROLE_SYSTEM_PROGRESSBAR  "?????? ????????"
+    ROLE_SYSTEM_DIAL         "?????"
+    ROLE_SYSTEM_HOTKEYFIELD  "???? ??????? ??????"
+    ROLE_SYSTEM_SLIDER       "????????"
+    ROLE_SYSTEM_SPINBUTTON   "???? ?????????"
+    ROLE_SYSTEM_DIAGRAM      "????????"
+    ROLE_SYSTEM_ANIMATION    "????????"
+    ROLE_SYSTEM_EQUATION     "????????"
+    ROLE_SYSTEM_BUTTONDROPDOWN "????????? ??????"
+    ROLE_SYSTEM_BUTTONMENU   "?????? ????"
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID "????????? ?????? ?????"
+    ROLE_SYSTEM_WHITESPACE   "????? ???????"
+    ROLE_SYSTEM_PAGETABLIST  "?????? ???????? ????????"
+    ROLE_SYSTEM_CLOCK        "????????"
+    ROLE_SYSTEM_SPLITBUTTON  "?????? ??????"
+    ROLE_SYSTEM_IPADDRESS    "IP ??????"
+    ROLE_SYSTEM_OUTLINEBUTTON "?????? ?????"
+}



From julliard at winehq.org  Mon Jun 28 11:01:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:21 -0500
Subject: Alexandre Julliard : winemenubuilder: Load only low bit count icons
	if we are going to save to XPM format.
Message-ID: <E1OTGlt-0007hr-Od@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 67bdd633b2b85cf24b67d9b2dc2581964a85f7d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=67bdd633b2b85cf24b67d9b2dc2581964a85f7d6

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 28 16:39:12 2010 +0200

winemenubuilder: Load only low bit count icons if we are going to save to XPM format.

---

 programs/winemenubuilder/winemenubuilder.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index c027dad..620d705 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -684,8 +684,13 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName)
         {
             if ((pIconDir = LockResource(hResData)))
             {
+                lpName = MAKEINTRESOURCEW(pIconDir->idEntries[0].nID);  /* default to first entry */
                 for (i = 0; i < pIconDir->idCount; i++)
                 {
+#ifndef SONAME_LIBPNG
+		    if (pIconDir->idEntries[i].wBitCount != 4 && pIconDir->idEntries[i].wBitCount != 8)
+                        continue;
+#endif
 		    if (pIconDir->idEntries[i].wBitCount >= nMaxBits)
 		    {
 			if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) >= nMax)
@@ -694,7 +699,7 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName)
 			    nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth;
 			    nMaxBits = pIconDir->idEntries[i].wBitCount;
 			}
-		    }		    
+		    }
                 }
             }
 



From julliard at winehq.org  Mon Jun 28 11:01:21 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Mon, 28 Jun 2010 11:01:21 -0500
Subject: Alexandre Julliard : winemenubuilder: Use the new wine glass icon
	from user32 as default icon.
Message-ID: <E1OTGlt-0007i8-Si@wine.codeweavers.com>

Module: wine
Branch: master
Commit: db68b1e60228a562f6df723adf682bd216457c0c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=db68b1e60228a562f6df723adf682bd216457c0c

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 28 16:39:39 2010 +0200

winemenubuilder: Use the new wine glass icon from user32 as default icon.

---

 programs/winemenubuilder/wine.xpm          |  210 ----------------------------
 programs/winemenubuilder/winemenubuilder.c |   34 +----
 2 files changed, 5 insertions(+), 239 deletions(-)

diff --git a/programs/winemenubuilder/wine.xpm b/programs/winemenubuilder/wine.xpm
deleted file mode 100644
index 85e34f8..0000000
--- a/programs/winemenubuilder/wine.xpm
+++ /dev/null
@@ -1,210 +0,0 @@
-/* XPM */
-static const char * wine_xpm[] = {
-"48 48 159 2",
-"  	c None",
-". 	c #010101",
-"+ 	c #030303",
-"@ 	c #000000",
-"# 	c #040404",
-"$ 	c #0D0D0D",
-"% 	c #222222",
-"& 	c #090909",
-"* 	c #050505",
-"= 	c #101010",
-"- 	c #0B0B0B",
-"; 	c #131313",
-"> 	c #1C1C1C",
-", 	c #232323",
-"' 	c #161616",
-") 	c #020202",
-"! 	c #2F2F2F",
-"~ 	c #212121",
-"{ 	c #060606",
-"] 	c #292929",
-"^ 	c #0A0A0A",
-"/ 	c #111111",
-"( 	c #252525",
-"_ 	c #0E0E0E",
-": 	c #262626",
-"< 	c #0C0005",
-"[ 	c #100308",
-"} 	c #2D2D2D",
-"| 	c #2A2A2A",
-"1 	c #360013",
-"2 	c #59001C",
-"3 	c #120006",
-"4 	c #080808",
-"5 	c #141414",
-"6 	c #090707",
-"7 	c #0A0003",
-"8 	c #0E0003",
-"9 	c #0B0205",
-"0 	c #191919",
-"a 	c #6A0022",
-"b 	c #AC0033",
-"c 	c #730024",
-"d 	c #4F0019",
-"e 	c #470016",
-"f 	c #4B0019",
-"g 	c #5D001E",
-"h 	c #690022",
-"i 	c #6E0023",
-"j 	c #660021",
-"k 	c #410012",
-"l 	c #1B080D",
-"m 	c #171717",
-"n 	c #160007",
-"o 	c #8E002E",
-"p 	c #B60038",
-"q 	c #AE0038",
-"r 	c #A90035",
-"s 	c #A60033",
-"t 	c #A60035",
-"u 	c #AF0038",
-"v 	c #B10038",
-"w 	c #B00038",
-"x 	c #A10031",
-"y 	c #6D0020",
-"z 	c #1A0007",
-"A 	c #121212",
-"B 	c #3D0014",
-"C 	c #A70033",
-"D 	c #AE0039",
-"E 	c #B30038",
-"F 	c #B20038",
-"G 	c #B70038",
-"H 	c #98002E",
-"I 	c #2E000F",
-"J 	c #52021A",
-"K 	c #7C0026",
-"L 	c #AC0035",
-"M 	c #AD0038",
-"N 	c #B50038",
-"O 	c #830029",
-"P 	c #1A0008",
-"Q 	c #490017",
-"R 	c #A00033",
-"S 	c #B20039",
-"T 	c #53001B",
-"U 	c #3C0014",
-"V 	c #A20032",
-"W 	c #AD0039",
-"X 	c #B40038",
-"Y 	c #8F002D",
-"Z 	c #1E0008",
-"` 	c #171616",
-" .	c #51001A",
-"..	c #A80035",
-"+.	c #B20037",
-"@.	c #700025",
-"#.	c #0A0104",
-"$.	c #090204",
-"%.	c #B00039",
-"&.	c #A40033",
-"*.	c #32000F",
-"=.	c #110005",
-"-.	c #730026",
-";.	c #AF0039",
-">.	c #810029",
-",.	c #0A0002",
-"'.	c #1D0009",
-").	c #820029",
-"!.	c #410014",
-"~.	c #21000A",
-"{.	c #87002A",
-"].	c #88002C",
-"^.	c #8B002A",
-"/.	c #3C0015",
-"(.	c #20000A",
-"_.	c #86002A",
-":.	c #B50037",
-"<.	c #710022",
-"[.	c #080002",
-"}.	c #130006",
-"|.	c #790026",
-"1.	c #7A0128",
-"2.	c #140007",
-"3.	c #0D0608",
-"4.	c #650021",
-"5.	c #90002E",
-"6.	c #290310",
-"7.	c #181818",
-"8.	c #390013",
-"9.	c #9A0032",
-"0.	c #B40039",
-"a.	c #B10037",
-"b.	c #91002D",
-"c.	c #3E0014",
-"d.	c #0C0407",
-"e.	c #0A0004",
-"f.	c #4A001A",
-"g.	c #92002D",
-"h.	c #A50034",
-"i.	c #94002E",
-"j.	c #6C0122",
-"k.	c #2E0210",
-"l.	c #0B0406",
-"m.	c #070707",
-"n.	c #090003",
-"o.	c #26000C",
-"p.	c #370414",
-"q.	c #28000C",
-"r.	c #060303",
-"s.	c #191818",
-"t.	c #1F1F1F",
-"u.	c #0F0F0F",
-"v.	c #1D1D1D",
-"w.	c #3E3E3E",
-"x.	c #2B2B2B",
-"y.	c #1A1A1A",
-"z.	c #323232",
-"A.	c #2E2E2E",
-"B.	c #1E1E1E",
-"                                                  . + @ @ #                                     ",
-"                                                  $       % & . *                               ",
-"                                                & .             = & -                           ",
-"                                                @                   ; - #                       ",
-"                                              > @                       , #                     ",
-"                                              . '                         )                     ",
-"                                            ! #                         ~ *                     ",
-"                                            { @                         # @                     ",
-"                                            . >                         . *                     ",
-"                                          ] ^ /                       ( _ :                     ",
-"                                          $ < [ }                     + +                       ",
-"                                        | ' 1 2 3 4 5 / 6 7 8 9 $     & 0                       ",
-"                                        ^ * a b c d e f g h i j k l m & '                       ",
-"                                        @ n o p q r s t u q v w x y z @                         ",
-"                                        A B C u D E F v q F u u G H I @                         ",
-"                                        J K L E D F M v u M E q N O P                           ",
-"                                        Q R E q S u v M F u E q r T +                           ",
-"                                      { U V v F W w v v w F M X Y Z                             ",
-"                                      `  ...F u D F u w v w M +. at .#.                            ",
-"                                      $.a w w v %.v u u w v w &.*..                             ",
-"                                      =.-.w w v ;.u v u w M G >.,.@                             ",
-"                                      '.).w v u W v q v u v E !.@                               ",
-"                                      ~.{.E u F D F u w v X ].7 #                               ",
-"                                      ~.^.F F q S u v M F X /.@                                 ",
-"                                      (._.X u E W u v v :.<.[.@                                 ",
-"                                      }.|.w F q D F v v 1.2.4                                   ",
-"                                      3.4.w w F %.F X 5.6.. 7.                                  ",
-"                                      ^ 8.9.G v 0.a.b.c.d..                                     ",
-"                                        e.f.g.h.i.j.k.l.m.                                      ",
-"                                        - n.o.p.q.3 4 ^                                         ",
-"                                        r.@ @ . @ @                                             ",
-"                                        s.@ @ @                                                 ",
-"                                        > @ )                                                   ",
-"                                        t.. u.                                                  ",
-"                                        > +                                                     ",
-"                                        > v.                                                    ",
-"                                        5 '                                                     ",
-"                                        #                                                       ",
-"                                        v.                                                      ",
-"                                      @ (                                                       ",
-"                  w.x.]             _ @ (                                                       ",
-"                    @ @ @ @ & / - @ @ @ (                                                       ",
-"                      { & @ @ @ @ @ @ & (                                                       ",
-"                        = / m.@ @ @ @ = 5 )                                                     ",
-"                              y.@ @ @ @ @ @ @ -                                                 ",
-"                                  z.^ @ @ @ @ m.#                                               ",
-"                                        A _ . @ . &                                             ",
-"                                                A.B.;                                           "};
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 620d705..8ee8387 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -95,7 +95,6 @@
 #include "wine/debug.h"
 #include "wine/library.h"
 #include "wine/list.h"
-#include "wine.xpm"
 
 #ifdef HAVE_PNG_H
 #undef FAR
@@ -865,27 +864,11 @@ end:
     return ret;
 }
 
-static BOOL create_default_icon( const char *filename, const char* comment )
+static BOOL create_default_icon( char *filename )
 {
-    FILE *fXPM;
-    unsigned int i;
-
-    if (!(fXPM = fopen(filename, "w"))) return FALSE;
-    if (fprintf(fXPM, "/* XPM */\n/* %s */\nstatic char * icon[] = {", comment) <= 0)
-        goto error;
-    for (i = 0; i < sizeof(wine_xpm)/sizeof(wine_xpm[0]); i++) {
-        if (fprintf( fXPM, "\n\"%s\",", wine_xpm[i]) <= 0)
-            goto error;
-    }
-    if (fprintf( fXPM, "};\n" ) <=0)
-        goto error;
-    fclose( fXPM );
-    return TRUE;
- error:
-    fclose( fXPM );
-    unlink( filename );
-    return FALSE;
+    static const WCHAR user32W[] = {'u','s','e','r','3','2',0};
 
+    return extract_icon32( user32W, -(INT_PTR)IDI_WINLOGO, filename );
 }
 
 static unsigned short crc16(const char* string)
@@ -1084,15 +1067,8 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO
         goto end;
     if (ExtractFromFileType( path, xpm_path ))
         goto end;
-    if (!bWait)
-    {
-        if (destFilename)
-            sprintf(xpm_path,"%s/%s.xpm",iconsdir,destFilename);
-        else
-            sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name);
-        if (create_default_icon( xpm_path, ico_path ))
-            goto end;
-    }
+    if (!bWait && create_default_icon( xpm_path ))
+        goto end;
 
     HeapFree( GetProcessHeap(), 0, xpm_path );
     xpm_path=NULL;



From jnewman at winehq.org  Mon Jun 28 14:03:06 2010
From: jnewman at winehq.org (Jeremy Newman)
Date: Mon, 28 Jun 2010 14:03:06 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: Fix typo in german news
Message-ID: <E1OTJbm-0005lF-R9@wine.codeweavers.com>

Module: website
Branch: master
Commit: ce47a9c895a140508506dfa1891aefe8538606b2
URL:    http://source.winehq.org/git/website.git/?a=commit;h=ce47a9c895a140508506dfa1891aefe8538606b2

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon Jun 28 20:33:41 2010 +0200

Fix typo in german news

spotted by Reboot on IRC

---

 news/de/2010062501.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/news/de/2010062501.xml b/news/de/2010062501.xml
index abc6aec..0625055 100644
--- a/news/de/2010062501.xml
+++ b/news/de/2010062501.xml
@@ -1,6 +1,6 @@
 <news>
 <date>25. Juni 2010</date>
-<title>Wine 1.2-rc4 Freigegeben</title>
+<title>Wine 1.2-rc5 Freigegeben</title>
 <body>
 <p> Die Entwicklungsversion 1.2-rc5 von Wine ist jetzt verf&uuml;gbar.</p>
 <p> <a href="{$root}/announce/1.2-rc5">Neuerungen (en)</a> in dieser Version:



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: Austin English : kernel32: Add NERR_UserNotFound to Norwegian winerr.
Message-ID: <E1OTcgX-0003IT-8G@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 88d1a9bbff028e74265b5b3dc3f3524fd133f414
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=88d1a9bbff028e74265b5b3dc3f3524fd133f414

Author: Austin English <austinenglish at gmail.com>
Date:   Mon Jun 28 13:30:04 2010 -0500

kernel32: Add NERR_UserNotFound to Norwegian winerr.

---

 dlls/kernel32/nls/winerr_nor.mc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/nls/winerr_nor.mc b/dlls/kernel32/nls/winerr_nor.mc
index 0afa520..d8828e1 100644
--- a/dlls/kernel32/nls/winerr_nor.mc
+++ b/dlls/kernel32/nls/winerr_nor.mc
@@ -3730,3 +3730,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED
 Language=NOR
 RPC_S_GRP_ELT_NOT_REMOVED
 .
+MessageId=2221
+SymbolicName=NERR_UserNotFound
+Language=NOR
+Brukernavnet finnes ikke
+.



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: appwiz.cpl: Add Hungarian
	translation.
Message-ID: <E1OTcgX-0003J8-AZ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 16b05d94f2653e66e2b8541ab9d978a3a1b5050c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=16b05d94f2653e66e2b8541ab9d978a3a1b5050c

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 20:44:54 2010 +0200

appwiz.cpl: Add Hungarian translation.

---

 dlls/appwiz.cpl/Hu.rc       |   87 +++++++++++++++++++++++++++++++++++++++++++
 dlls/appwiz.cpl/Makefile.in |    1 +
 2 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/dlls/appwiz.cpl/Hu.rc b/dlls/appwiz.cpl/Hu.rc
new file mode 100644
index 0000000..b8ba26f
--- /dev/null
+++ b/dlls/appwiz.cpl/Hu.rc
@@ -0,0 +1,87 @@
+/*
+* Add/Remove Programs Hungarian resources
+*
+* Copyright 2010 Andras Kovacs
+*
+* 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_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+   IDS_CPL_TITLE, "Programok hozz?ad?sa/elt?vol?t?sa"
+   IDS_CPL_DESC, "Lehet?v? teszi ?j programok telep?t?s?t illetve elt?vol?t?s?t az ?n sz?m?t?g?p?r?l."
+   IDS_TAB1_TITLE, "Alkalmaz?sok"
+
+   IDS_UNINSTALL_FAILED, "Nem tudom elind?tani az elt?vol?t? programot: '%s'. Szeretn? az ehhez a programhoz tartoz? elt?vol?t?si bejegyz?st t?r?lni a regisztr?ci?s adatb?zisb?l?"
+   IDS_NOT_SPECIFIED, "Nincs megadva"
+
+   IDS_COLUMN_NAME, "N?v"
+   IDS_COLUMN_PUBLISHER, "Kiad?"
+   IDS_COLUMN_VERSION, "Verzi?"
+   IDS_INSTALL_FILTER, "Telep?t? programok\0*instal*.exe;*setup*.exe;*.msi\0Programok (*.exe)\0*.exe\0Minden f?jl (*.*)\0*.*\0\0"
+
+   IDS_REMOVE, "&Elt?vol?t?s..."
+   IDS_MODIFY_REMOVE, "&M?dos?t?s/Elt?vol?t?s..."
+}
+
+IDD_MAIN DIALOG 0, 0, 320, 220
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Telep?t?s/Elt?vol?t?s"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "?j program telep?t?s?hez hajl?konylemezr?l, CD-ROM meghajt?r?l vagy merevlemezr?l kattintson a Telep?t?s gombra.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20
+ CONTROL "&Telep?t?s...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14
+ CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1
+ CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20
+ CONTROL "A k?vetkez? programot automatikusan el lehet t?vol?tani. Program elt?vol?t?s?hoz vagy a telep?tett komponenseinek m?dos?t?s?hoz v?lassza ki a szoftvert a list?b?l, majd kattintson M?dos?t?s/Elt?vol?t?s gombra.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30
+ CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100
+ CONTROL "T?m&ogat?si Inform?ci?...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 64, 198, 84, 14
+ CONTROL "&M?dos?t?s...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 198, 68, 14
+ CONTROL "&Elt?vol?t?s...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 224, 198, 88, 14
+ CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20
+}
+
+IDD_INFO DIALOG 0, 0, 256, 138
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "T?mogat?si inform?ci?"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14
+ CONTROL "A k?vetkez? inform?ci?k haszn?lhat?ak a(z) %s technikai t?mogat?s?nak ig?nybev?tel?hez:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19
+ CONTROL "Kiad?:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8
+ CONTROL "Verzi?:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8
+ CONTROL "Kapcsolat:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8
+ CONTROL "T?mogat?si inform?ci?:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8
+ CONTROL "Telefonos t?mogat?s:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8
+ CONTROL "OlvassEl f?jl:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8
+ CONTROL "Term?kfriss?t?sek:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8
+ CONTROL "Megjegyz?sek:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8
+ CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8
+ CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8
+ CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8
+ CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8
+ CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8
+ CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8
+ CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8
+ CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8
+}
diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in
index afa15cc..1bc8808 100644
--- a/dlls/appwiz.cpl/Makefile.in
+++ b/dlls/appwiz.cpl/Makefile.in
@@ -14,6 +14,7 @@ RC_SRCS = \
 	En.rc \
 	Es.rc \
 	Fr.rc \
+	Hu.rc \
 	It.rc \
 	Ja.rc \
 	Ko.rc \



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: browseui: Add Hungarian
	translation.
Message-ID: <E1OTcgX-0003JO-D4@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 68c47bb48f2f21074d85e427439036c4c76f7654
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=68c47bb48f2f21074d85e427439036c4c76f7654

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 20:47:37 2010 +0200

browseui: Add Hungarian translation.

---

 dlls/browseui/Makefile.in |    1 +
 dlls/browseui/rsrc_Hu.rc  |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index f45afe3..67e5dc9 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -20,6 +20,7 @@ RC_SRCS = \
 	rsrc_En.rc \
 	rsrc_Es.rc \
 	rsrc_Fr.rc \
+	rsrc_Hu.rc \
 	rsrc_It.rc \
 	rsrc_Ja.rc \
 	rsrc_Ko.rc \
diff --git a/dlls/browseui/rsrc_Hu.rc b/dlls/browseui/rsrc_Hu.rc
new file mode 100644
index 0000000..dfae776
--- /dev/null
+++ b/dlls/browseui/rsrc_Hu.rc
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "resids.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    IDS_CANCELLING    "Megszak?t?s..."
+}
+
+IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+{
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
+    LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    PUSHBUTTON "&M?gse", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
+    LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
+}



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: credui: Add Hungarian
	translation .
Message-ID: <E1OTcgX-0003Je-F6@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f8f3702f012e7e89cd695287324a4d6561f34eb0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f8f3702f012e7e89cd695287324a4d6561f34eb0

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 20:48:33 2010 +0200

credui: Add Hungarian translation.

---

 dlls/credui/Makefile.in  |    1 +
 dlls/credui/credui_Hu.rc |   55 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in
index e561162..aafe727 100644
--- a/dlls/credui/Makefile.in
+++ b/dlls/credui/Makefile.in
@@ -16,6 +16,7 @@ RC_SRCS = \
 	credui_En.rc \
 	credui_Es.rc \
 	credui_Fr.rc \
+	credui_Hu.rc \
 	credui_It.rc \
 	credui_Ko.rc \
 	credui_Lt.rc \
diff --git a/dlls/credui/credui_Hu.rc b/dlls/credui/credui_Hu.rc
new file mode 100644
index 0000000..f6ada49
--- /dev/null
+++ b/dlls/credui/credui_Hu.rc
@@ -0,0 +1,55 @@
+/*
+ * Hungarian language resource file for Credentials UI
+ *
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "credui_resources.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+IDD_CREDDIALOG DIALOG DISCARDABLE  0, 0, 213, 149
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "IDS_TITLEFORMAT"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0,
+                    0,213,37
+    LTEXT           "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP
+    LTEXT           "&Felhaszn?l?n?v:",-1,8,62,72,12,SS_CENTERIMAGE
+    CONTROL         "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN |
+                    CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87
+    LTEXT           "&Jelsz?:",-1,8,80,72,12,SS_CENTERIMAGE
+    EDITTEXT        IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "Je&lsz? megjegyz?se",IDC_SAVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12
+    DEFPUSHBUTTON   "OK",IDOK,97,128,50,14
+    PUSHBUTTON      "M?gse",IDCANCEL,156,128,50,14
+END
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TITLEFORMAT     "Kapcsol?d?s: %s"
+    IDS_MESSAGEFORMAT   "Kapcsol?d?s: %s"
+    IDS_INCORRECTPASSWORDTITLE  "Bejelentkez?s sikertelen"
+    IDS_INCORRECTPASSWORD       "K?rem ellen?rizze a felhaszn?l?neve\n?s a jelszava helyess?g?t."
+    IDS_CAPSLOCKONTITLE "A Caps Lock be van kapcsolva"
+    IDS_CAPSLOCKON      "Ha Caps Lock be van kapcsolva, elk?pzelhet? hogy hib?san ?rja be a jelszav?t.\n\nNyomja meg a Caps Lock gombot a billenty?zet?n a Caps Lock kikapcsol?s?hoz\nmiel?tt megadja a jelszav?t."
+}



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: comdlg32: Hungarian
	translation update and conversion to UTF-8.
Message-ID: <E1OTcgX-0003Jt-Gm@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2da7f546574a5b0c1afd69986c9e809bc31d4621
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2da7f546574a5b0c1afd69986c9e809bc31d4621

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 20:50:59 2010 +0200

comdlg32: Hungarian translation update and conversion to UTF-8.

---

 dlls/comdlg32/cdlg_Hu.rc |  426 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 345 insertions(+), 81 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=2da7f546574a5b0c1afd69986c9e809bc31d4621


From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: cryptdlg: Add Hungarian
	translation.
Message-ID: <E1OTcgX-0003KA-JB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 28520d778836fcf2c3f38f5887a888d8dae6ba69
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=28520d778836fcf2c3f38f5887a888d8dae6ba69

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 20:52:31 2010 +0200

cryptdlg: Add Hungarian translation.

---

 dlls/cryptdlg/Makefile.in    |    1 +
 dlls/cryptdlg/cryptdlg_Hu.rc |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in
index 11dcc17..4e3a4bc 100644
--- a/dlls/cryptdlg/Makefile.in
+++ b/dlls/cryptdlg/Makefile.in
@@ -13,6 +13,7 @@ RC_SRCS = \
 	cryptdlg_De.rc \
 	cryptdlg_En.rc \
 	cryptdlg_Fr.rc \
+	cryptdlg_Hu.rc \
 	cryptdlg_It.rc \
 	cryptdlg_Ko.rc \
 	cryptdlg_Lt.rc \
diff --git a/dlls/cryptdlg/cryptdlg_Hu.rc b/dlls/cryptdlg/cryptdlg_Hu.rc
new file mode 100644
index 0000000..b603de6
--- /dev/null
+++ b/dlls/cryptdlg/cryptdlg_Hu.rc
@@ -0,0 +1,41 @@
+/*
+ * cryptdlg dll resources
+ *
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "cryptres.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CERT_POLICY "Tanus?tv?ny szab?lyok"
+    IDS_POLICY_ID "Szab?ly azonos?t?: "
+    IDS_POLICY_QUALIFIER_INFO "Szab?ly min?s?t? inform?ci?"
+    IDS_POLICY_QUALIFIER_ID "Szab?ly min?s?t? Id="
+    IDS_CPS "CPS" /* Certification Practice Statement */
+    IDS_USER_NOTICE "Felhaszn?l? figyelmeztet?s"
+    IDS_QUALIFIER "Min?s?t?"
+    IDS_NOTICE_REF "Megjegyz?si referencia"
+    IDS_ORGANIZATION "Szervezet="
+    IDS_NOTICE_NUM "Megjegyz?s sz?ma="
+    IDS_NOTICE_TEXT "Megjegyz?s sz?vege="
+}



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: crypt32: Add Hungarian
	translation.
Message-ID: <E1OTcgX-0003KT-Lc@wine.codeweavers.com>

Module: wine
Branch: master
Commit: da4b0070b802426314cd0d22a77dbaa679926e93
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=da4b0070b802426314cd0d22a77dbaa679926e93

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:26:06 2010 +0200

crypt32: Add Hungarian translation.

---

 dlls/crypt32/Makefile.in   |    1 +
 dlls/crypt32/crypt32_Hu.rc |  244 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 245 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=da4b0070b802426314cd0d22a77dbaa679926e93


From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: gphoto2.ds: Add Hungarian
	translation.
Message-ID: <E1OTcgX-0003Kk-NU@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 908472416a8687c4e127c743cc93c8095c5e0d78
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=908472416a8687c4e127c743cc93c8095c5e0d78

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:27:31 2010 +0200

gphoto2.ds: Add Hungarian translation.

---

 dlls/gphoto2.ds/Makefile.in   |    1 +
 dlls/gphoto2.ds/gphoto2_Hu.rc |   59 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index 5cbde22..b588b61 100644
--- a/dlls/gphoto2.ds/Makefile.in
+++ b/dlls/gphoto2.ds/Makefile.in
@@ -19,6 +19,7 @@ RC_SRCS = \
 	gphoto2_En.rc \
 	gphoto2_Es.rc \
 	gphoto2_Fr.rc \
+	gphoto2_Hu.rc \
 	gphoto2_It.rc \
 	gphoto2_Ja.rc \
 	gphoto2_Ko.rc \
diff --git a/dlls/gphoto2.ds/gphoto2_Hu.rc b/dlls/gphoto2.ds/gphoto2_Hu.rc
new file mode 100644
index 0000000..a1e5b03
--- /dev/null
+++ b/dlls/gphoto2.ds/gphoto2_Hu.rc
@@ -0,0 +1,59 @@
+/*
+ * Hungarian resources for Twain
+ *
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
+    WS_CAPTION | WS_SYSMENU
+CAPTION "F?nyk?pez?g?pen l?v? f?jlok"
+FONT 8, "MS Sans Serif"
+BEGIN
+	CONTROL         "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER |
+WS_TABSTOP,7,7,358,229
+    DEFPUSHBUTTON   "Kiv?lasztottak import?l?sa",IDC_IMPORT,152,252,72,14
+    PUSHBUTTON      "El?n?zet",IDC_FETCH,7,252,64,14
+    PUSHBUTTON      "?sszes import?l?sa",IDC_IMPORTALL,80,252,64,14
+    CONTROL         "Ezen p?rbesz?dablak kihagy?sa",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14
+    PUSHBUTTON      "Kil?p?s",IDC_EXIT,315,252,50,14
+END
+
+IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
+CAPTION "?tvitel"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT   "?tvitel... K?rem v?rjon",IDC_STATIC,5,19,176,8, SS_CENTER
+END
+
+IDD_CONNECTING DIALOG DISCARDABLE  0, 0, 280, 116
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER
+CAPTION "?tvitel a f?nyk?pez?g?pre"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110
+    LTEXT           "Kapcsol?d?s a f?nyk?pez?g?phez... K?rem v?rjon",IDC_STATIC,128,58,
+                    116,8
+END



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: jscript: Add Hungarian
	translation.
Message-ID: <E1OTcgX-0003L2-Pp@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 153a16be727dfc5ae506ace5a9702f017b0e042e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=153a16be727dfc5ae506ace5a9702f017b0e042e

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:28:24 2010 +0200

jscript: Add Hungarian translation.

---

 dlls/jscript/Makefile.in   |    1 +
 dlls/jscript/jscript_Hu.rc |   50 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index 56cf824..332363a 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -11,6 +11,7 @@ RC_SRCS = \
 	jscript_En.rc \
 	jscript_Es.rc \
 	jscript_Fr.rc \
+	jscript_Hu.rc \
 	jscript_It.rc \
 	jscript_Ja.rc \
 	jscript_Ko.rc \
diff --git a/dlls/jscript/jscript_Hu.rc b/dlls/jscript/jscript_Hu.rc
new file mode 100644
index 0000000..133119e
--- /dev/null
+++ b/dlls/jscript/jscript_Hu.rc
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_TO_PRIMITIVE        "Hiba az objektum primit?v t?pusra val? konvert?l?s?n?l"
+    IDS_INVALID_CALL_ARG    "?rv?nytelen elj?r?sh?v?s vagy argmentum"
+    IDS_CREATE_OBJ_ERROR    "Az automatiz?l? (automation) kiszolg?l? nem tud objektumot l?trehozni"
+    IDS_NO_PROPERTY         "Az objektum nem t?mogatja ezt a tulajdons?got vagy met?dust"
+    IDS_ARG_NOT_OPT         "Az argumentum nem opcion?lis"
+    IDS_SYNTAX_ERROR        "Szinttaktikai hiba"
+    IDS_SEMICOLON           "Hi?nyz? ';'"
+    IDS_LBRACKET            "Hi?nyz? '('"
+    IDS_RBRACKET            "Hi?nyz? ')'"
+    IDS_UNTERMINATED_STR    "Lez?ratlan sztring konstans"
+    IDS_NOT_FUNC            "F?ggv?nyt v?rtam"
+    IDS_NOT_DATE            "'Az [object]' nem egy date (d?tum) objektum"
+    IDS_NOT_NUM             "Sz?mot v?rtam"
+    IDS_OBJECT_EXPECTED     "Objektumot v?rtam"
+    IDS_ILLEGAL_ASSIGN      "Nem megengedett ?sszerendel?s"
+    IDS_UNDEFINED           "A '|' nem defini?lt"
+    IDS_NOT_BOOL            "Boolean (igaz-hamis) objektumot v?rtam"
+    IDS_JSCRIPT_EXPECTED    "JScript objektumot v?rtam"
+    IDS_REGEXP_SYNTAX_ERROR "Szinttaktikai hiba a regul?ris kifejez?sben"
+    IDS_URI_INVALID_CHAR    "A k?doland? URI ?rv?nytelen karaktereket tartalmaz"
+    IDS_INVALID_LENGTH      "A t?mb hossz?nak egy v?ges pozit?v eg?sz sz?mnak kell lennie"
+    IDS_ARRAY_EXPECTED      "T?mb objektumot v?rtam"
+}



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: localspl: Add Hungarian
	translation.
Message-ID: <E1OTcgX-0003LH-RS@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ecd981e39a112db2fa5546759cc0aabfd08660da
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ecd981e39a112db2fa5546759cc0aabfd08660da

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:29:05 2010 +0200

localspl: Add Hungarian translation.

---

 dlls/localspl/Makefile.in |    1 +
 dlls/localspl/spl_Hu.rc   |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in
index 99e4c03..2980720 100644
--- a/dlls/localspl/Makefile.in
+++ b/dlls/localspl/Makefile.in
@@ -17,6 +17,7 @@ RC_SRCS = \
 	spl_En.rc \
 	spl_Es.rc \
 	spl_Fr.rc \
+	spl_Hu.rc \
 	spl_It.rc \
 	spl_Ja.rc \
 	spl_Ko.rc \
diff --git a/dlls/localspl/spl_Hu.rc b/dlls/localspl/spl_Hu.rc
new file mode 100644
index 0000000..912b3f6
--- /dev/null
+++ b/dlls/localspl/spl_Hu.rc
@@ -0,0 +1,32 @@
+/*
+ * Hungarian resources for localspl
+ *
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "localspl_private.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_LOCALPORT "Helyi Port"
+    IDS_LOCALMONITOR "Helyi figyel?"
+}



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: localui: Add Hungarian
	translation.
Message-ID: <E1OTcgX-0003LY-TB@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 36d5a469d86feffcc4371c270879626142406454
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=36d5a469d86feffcc4371c270879626142406454

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:29:30 2010 +0200

localui: Add Hungarian translation.

---

 dlls/localui/Makefile.in |    1 +
 dlls/localui/ui_Hu.rc    |   59 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in
index d104f98..52f30c5 100644
--- a/dlls/localui/Makefile.in
+++ b/dlls/localui/Makefile.in
@@ -15,6 +15,7 @@ RC_SRCS = \
 	ui_En.rc \
 	ui_Es.rc \
 	ui_Fr.rc \
+	ui_Hu.rc \
 	ui_It.rc \
 	ui_Ja.rc \
 	ui_Ko.rc \
diff --git a/dlls/localui/ui_Hu.rc b/dlls/localui/ui_Hu.rc
new file mode 100644
index 0000000..f471dfc
--- /dev/null
+++ b/dlls/localui/ui_Hu.rc
@@ -0,0 +1,59 @@
+/*
+ * Hungarian resources for localui
+ *
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "localui.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Helyi port hozz?ad?sa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Adja meg a &hozz?adni k?v?nt port nev?t:", -1, 7, 13, 194, 13, WS_VISIBLE
+    EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE
+    PUSHBUTTON "M?gse", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE
+END
+
+
+LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "LPT port be?ll?t?sa"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Id?t?ll?p?s (m?sodperc)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
+    LTEXT "?&tviteli ?jrapr?b?lkoz?s:", -1, 14, 22, 90, 13, WS_VISIBLE
+    EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
+    DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE
+    PUSHBUTTON "M?gse", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
+END
+
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_LOCALPORT "Helyi port"
+    IDS_INVALIDNAME "A(z) '%s' nem egy ?rv?nyes portn?v"
+    IDS_PORTEXISTS "A port: %s m?r l?tezik"
+    IDS_NOTHINGTOCONFIG "Ennek a portnak nincsenek be?ll?that? tulajdons?gai"
+}



From julliard at winehq.org  Tue Jun 29 10:25:17 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:17 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: mapi32: Add Hungarian
	translation .
Message-ID: <E1OTcgX-0003Lq-VM@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 11b84ce207d7dcc5ef18155498be5248d5d0b4d1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=11b84ce207d7dcc5ef18155498be5248d5d0b4d1

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:30:38 2010 +0200

mapi32: Add Hungarian translation.

---

 dlls/mapi32/Hu.rc       |   33 +++++++++++++++++++++++++++++++++
 dlls/mapi32/Makefile.in |    1 +
 2 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/dlls/mapi32/Hu.rc b/dlls/mapi32/Hu.rc
new file mode 100644
index 0000000..dac2f33
--- /dev/null
+++ b/dlls/mapi32/Hu.rc
@@ -0,0 +1,33 @@
+/*
+* MAPI32 Hungarian resources
+*
+* Copyright 2010 Andras Kovacs
+*
+* 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_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+   IDS_NO_MAPI_CLIENT, "A lev?lk?ld?s sikertelen, mivel ?nnek nincsen telep?tett MAPI levelez?kliense."
+   IDS_SEND_MAIL, "Lev?lk?ld?s"
+}
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index f416d5c..41140e5 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -19,6 +19,7 @@ RC_SRCS = \
 	En.rc \
 	Es.rc \
 	Fr.rc \
+	Hu.rc \
 	It.rc \
 	Ja.rc \
 	Ko.rc \



From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: mshtml: Update Hungarian
	translation.
Message-ID: <E1OTcgY-0003M7-1Z@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 0ed6f081662bd115022714e0b0e53e246476a9f6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0ed6f081662bd115022714e0b0e53e246476a9f6

Author: Kov??cs Andr??s <andras at csevego.net>
Date:   Mon Jun 28 23:31:17 2010 +0200

mshtml: Update Hungarian translation.

---

 dlls/mshtml/Hu.rc |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/Hu.rc b/dlls/mshtml/Hu.rc
index 137a100..c402c20 100644
--- a/dlls/mshtml/Hu.rc
+++ b/dlls/mshtml/Hu.rc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Andras Kovacs
+ * Copyright 2010 Andras Kovacs
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,12 +18,54 @@
 
 #include "resource.h"
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_HTMLDISABLED    "A HTML rajzol?s jelenleg le van tiltva."
-    IDS_HTMLDOCUMENT    "HTML Dokumentum"
-    IDS_DOWNLOADING     "Downloading..."
-    IDS_INSTALLING      "Installing..."
+    IDS_HTMLDISABLED    "A HTML renderel??s jelenleg le van tiltva."
+    IDS_HTMLDOCUMENT    "HTML dokumentum"
+    IDS_DOWNLOADING     "Let??lt??s..."
+    IDS_INSTALLING      "Telep??t??s..."
+}
+
+ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 260, 95
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Wine Gecko Installer"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT "A Wine nem tal??lt Gecko csomagot, ami ahhoz sz??ks??ges hogy a HTML-t be??gyaz?? alkalmaz??sok " \
+          "megfelel??en m??k??djenek. A Wine ezt automatikusan let??ltheti ??s feltelep??theti ??nnek.\n\n" \
+          "Megjegyz??s: Aj??nlott a disztrib??ci?? csomagj??nak haszn??lata ez helyet. L??sd a http://wiki.winehq.org/Gecko c??met a r??szletek??rt.",
+          ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT
+    CONTROL "Folyamat", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12
+    DEFPUSHBUTTON "&Telep??t??s", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "&M??gse", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP
+}
+
+IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65
+STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Hiperhivatkoz??s"
+FONT 8, "MS Shell Dlg"
+{
+    GROUPBOX "Hiperhivatkoz??s inform??ci??", -1, 5, 5, 190, 55
+    LTEXT "&T??pus:", -1, 10, 22, 20, 10
+    COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
+    LTEXT "&URL:", -1, 10, 42, 20, 10
+    EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "M??gse", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP
+}
+
+ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30
+    EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "M??gse", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP
 }



From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: oleacc: Add Hungarian
	translation .
Message-ID: <E1OTcgY-0003MP-4i@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3160d52f90add33b9d19bd9366048c927950673a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3160d52f90add33b9d19bd9366048c927950673a

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:32:00 2010 +0200

oleacc: Add Hungarian translation.

---

 dlls/oleacc/Makefile.in  |    1 +
 dlls/oleacc/oleacc_Hu.rc |   95 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 0 deletions(-)

diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in
index bf28dff..5e2d505 100644
--- a/dlls/oleacc/Makefile.in
+++ b/dlls/oleacc/Makefile.in
@@ -13,6 +13,7 @@ RC_SRCS = \
 	oleacc_De.rc \
 	oleacc_En.rc \
 	oleacc_Fr.rc \
+	oleacc_Hu.rc \
 	oleacc_It.rc \
 	oleacc_Ko.rc \
 	oleacc_Lt.rc \
diff --git a/dlls/oleacc/oleacc_Hu.rc b/dlls/oleacc/oleacc_Hu.rc
new file mode 100644
index 0000000..eb75a9a
--- /dev/null
+++ b/dlls/oleacc/oleacc_Hu.rc
@@ -0,0 +1,95 @@
+/*
+ * Hungarian resources for oleacc
+ *
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "oleacc.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    0 "ismeretlen objektum" /* undocumented */
+    ROLE_SYSTEM_TITLEBAR    "c?msor"
+    ROLE_SYSTEM_MENUBAR     "men?sor"
+    ROLE_SYSTEM_SCROLLBAR   "g?rget?s?v"
+    ROLE_SYSTEM_GRIP        "markolat"
+    ROLE_SYSTEM_SOUND       "hang"
+    ROLE_SYSTEM_CURSOR      "kurzor"
+    ROLE_SYSTEM_CARET       "kurzor (caret)"
+    ROLE_SYSTEM_ALERT       "figyelmeztet?s"
+    ROLE_SYSTEM_WINDOW      "ablak"
+    ROLE_SYSTEM_CLIENT      "kliens"
+    ROLE_SYSTEM_MENUPOPUP   "felugr? men?"
+    ROLE_SYSTEM_MENUITEM    "men?elem"
+    ROLE_SYSTEM_TOOLTIP     "eszk?ztipp"
+    ROLE_SYSTEM_APPLICATION "alkalmaz?s"
+    ROLE_SYSTEM_DOCUMENT    "dokumentum"
+    ROLE_SYSTEM_PANE        "t?bla"
+    ROLE_SYSTEM_CHART       "diagram"
+    ROLE_SYSTEM_DIALOG      "dial?gus"
+    ROLE_SYSTEM_BORDER      "keret"
+    ROLE_SYSTEM_GROUPING    "csoportos?t?"
+    ROLE_SYSTEM_SEPARATOR   "elv?laszt?"
+    ROLE_SYSTEM_TOOLBAR     "eszk?zt?r"
+    ROLE_SYSTEM_STATUSBAR   "?llapotsor"
+    ROLE_SYSTEM_TABLE        "t?bl?zat"
+    ROLE_SYSTEM_COLUMNHEADER "oszlop fejl?c"
+    ROLE_SYSTEM_ROWHEADER    "sor fejl?c"
+    ROLE_SYSTEM_COLUMN       "oszlop"
+    ROLE_SYSTEM_ROW          "sor"
+    ROLE_SYSTEM_CELL         "cella"
+    ROLE_SYSTEM_LINK         "link"
+    ROLE_SYSTEM_HELPBALLOON  "s?g? bubor?k"
+    ROLE_SYSTEM_CHARACTER    "karakter"
+    ROLE_SYSTEM_LIST         "lista"
+    ROLE_SYSTEM_LISTITEM     "listaelem"
+    ROLE_SYSTEM_OUTLINE      "k?rvonal"
+    ROLE_SYSTEM_OUTLINEITEM  "k?rvonalas elem"
+    ROLE_SYSTEM_PAGETAB      "t?blaf?l"
+    ROLE_SYSTEM_PROPERTYPAGE "tulajdons?glap"
+    ROLE_SYSTEM_INDICATOR    "jelz?"
+    ROLE_SYSTEM_GRAPHIC      "grafika"
+    ROLE_SYSTEM_STATICTEXT   "statikus sz?veg"
+    ROLE_SYSTEM_TEXT         "sz?veg"
+    ROLE_SYSTEM_PUSHBUTTON   "nyom?gomb"
+    ROLE_SYSTEM_CHECKBUTTON  "jel?l?n?gyzet"
+    ROLE_SYSTEM_RADIOBUTTON  "r?di?gomb"
+    ROLE_SYSTEM_COMBOBOX     "kombin?lt lista"
+    ROLE_SYSTEM_DROPLIST     "leg?rd?l? lista"
+    ROLE_SYSTEM_PROGRESSBAR  "folyamatjelz?"
+    ROLE_SYSTEM_DIAL         "h?v?s"
+    ROLE_SYSTEM_HOTKEYFIELD  "gyorsbillenty? mez?"
+    ROLE_SYSTEM_SLIDER       "cs?szka"
+    ROLE_SYSTEM_SPINBUTTON   "g?rgethet? mez?"
+    ROLE_SYSTEM_DIAGRAM      "diagramm"
+    ROLE_SYSTEM_ANIMATION    "anim?ci?"
+    ROLE_SYSTEM_EQUATION     "egyenlet"
+    ROLE_SYSTEM_BUTTONDROPDOWN "leg?rd?l? gomb"
+    ROLE_SYSTEM_BUTTONMENU   "men?gomb"
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID "r?csos leg?rd?l? gomb"
+    ROLE_SYSTEM_WHITESPACE   "?res ter?let"
+    ROLE_SYSTEM_PAGETABLIST  "oldal f?l lista"
+    ROLE_SYSTEM_CLOCK        "?ra"
+    ROLE_SYSTEM_SPLITBUTTON  "felosztott gomb"
+    ROLE_SYSTEM_IPADDRESS    "IP c?m"
+    ROLE_SYSTEM_OUTLINEBUTTON "k?rvonalazott gomb"
+}



From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: oledlg: Update Hungarian
	translation.
Message-ID: <E1OTcgY-0003Mi-6W@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6dbec8d01cc059ce5094296a1ba58e0c4858de08
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6dbec8d01cc059ce5094296a1ba58e0c4858de08

Author: Kov??cs Andr??s <andras at csevego.net>
Date:   Mon Jun 28 23:32:44 2010 +0200

oledlg: Update Hungarian translation.

---

 dlls/oledlg/oledlg_Hu.rc |   77 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/dlls/oledlg/oledlg_Hu.rc b/dlls/oledlg/oledlg_Hu.rc
index 30bd8e0..a1d0d35 100644
--- a/dlls/oledlg/oledlg_Hu.rc
+++ b/dlls/oledlg/oledlg_Hu.rc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Andras Kovacs
+ * Copyright 2006-2010 Andras Kovacs
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,40 +18,83 @@
 
 #include "resource.h"
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Objektum besz?r?sa"
+CAPTION "Objektum besz??r??sa"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
                     LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
                     WS_TABSTOP
-    LTEXT           "Obktum t?pus:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
+    LTEXT           "Objektum t??pus:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
     DEFPUSHBUTTON   "OK",IDOK,221,7,66,14
-    PUSHBUTTON      "M?gse",IDCANCEL,221,24,66,14
-    GROUPBOX        "Eredm?ny",IDC_RESULT,7,103,208,41
-    CONTROL         "?j l?trehoz?sa",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | 
+    PUSHBUTTON      "M??gse",IDCANCEL,221,24,66,14
+    GROUPBOX        "Eredm??ny",IDC_RESULT,7,103,208,41
+    CONTROL         "??j l??trehoz??sa",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,7,20,62,10
-    CONTROL         "Vez?rl? l?trehoz?sa",IDC_CREATECONTROL,"Button",
+    CONTROL         "Vez??rl?? l??trehoz??sa",IDC_CREATECONTROL,"Button",
                     BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
-    CONTROL         "L?trehoz?s f?jlb?l",IDC_CREATEFROMFILE,"Button",
+    CONTROL         "L??trehoz??s f??jlb??l",IDC_CREATEFROMFILE,"Button",
                     BS_AUTORADIOBUTTON,7,37,67,10
     LTEXT           "",IDC_RESULTDESC,49,112,159,23
-    PUSHBUTTON      "Vez?rl? hozz?&ad?sa...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
-    CONTROL         "Megjelen?t?s ikonk?nt",IDC_ASICON,"Button",BS_AUTOCHECKBOX | 
+    PUSHBUTTON      "Vez??rl?? hozz??&ad??sa...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
+    CONTROL         "Megjelen??t??s ikonk??nt",IDC_ASICON,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
-    PUSHBUTTON      "Tall?z...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
-    LTEXT           "F?jl:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE
+    PUSHBUTTON      "Tall??z??s...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
+    LTEXT           "F??jl:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE
     EDITTEXT        IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE
 END
 
 STRINGTABLE DISCARDABLE
 {
-  IDS_RESULTOBJDESC	"?j %s objektum behelyez?se az ?n dokumentum?ba"
-  IDS_RESULTFILEOBJDESC	"K?rem illesssze be a f?jl tartalm?t, mint objektumot a dokumentum?ba, azzal a programmal amivel l?trehozta."
-  IDS_BROWSE            "Tall?z?s"
-  IDS_NOTOLEMOD         "A f?jl ?gy t?nik nem egy ?rv?nyes OLE modul. Nem tudom regisztr?lni az OLE vez?rl?t."
-  IDS_NOTOLEMODCAPTION  "Vez?rl? hozz?ad?sa"
+  IDS_RESULTOBJDESC	"??j %s objektum behelyez??se az ??n dokumentum??ba"
+  IDS_RESULTFILEOBJDESC	"K??rem illesssze be a f??jl tartalm??t, mint objektumot a dokumentum??ba, azzal a programmal amivel l??trehozta."
+  IDS_BROWSE            "Tall??z??s"
+  IDS_NOTOLEMOD         "A f??jl ??gy t??nik nem egy ??rv??nyes OLE modul. Nem tudom regisztr??lni az OLE vez??rl??t."
+  IDS_NOTOLEMODCAPTION  "Vez??rl?? hozz??ad??sa"
+}
+
+IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140
+STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Speci??lis beilleszt??s"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT         "Forr??s:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
+    CONTROL       "&Beilleszt??s", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
+                  6, 38, 55, 10
+    CONTROL       "Beilleszt??s &linkk??nt", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
+                  6, 63, 55, 10
+    LTEXT         "&Mint:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP
+    LISTBOX       IDC_PS_PASTELIST,     65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
+    LISTBOX       IDC_PS_DISPLAYLIST,   65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE
+    CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
+    CONTROL       "M??gse", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
+    CONTROL       "&S??g??", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
+    CONTROL       "Megjelen??t??s i&konk??nt", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
+    CONTROL       "&Ikon megv??ltoztat??sa...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
+    CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
+    CONTROL       "<< eredm??ny sz??veg j??n ide >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
+    CONTROL       "Eredm??ny", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48
+    CONTROL       "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
+END
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_PS_PASTE_DATA                     "A v??g??lap tartalm??nak beilleszt??se az ??n dokumentum??ba mint: %s."
+    IDS_PS_PASTE_OBJECT                   "A v??g??lap tartalm??nak beilleszt??se az ??n dokumentum??ba, amit a k??vetkez?? haszn??lat??val aktiv??lhat: %s."
+    IDS_PS_PASTE_OBJECT_AS_ICON           "A v??g??lap tartalm??nak beilleszt??se az ??n dokumentum??ba, amit a k??vetkez?? haszn??lat??val aktiv??lhat: %s. Ikonk??nt fog megjelnni."
+    IDS_PS_PASTE_LINK_DATA                "A v??g??lap tartalm??nak beilleszt??se az ??n dokumentum??ba mint: %s. Az adat ??ssze van kapcsolva a forr??sf??jllal, ??gy a f??jl m??dos??t??sa hat??ssal lesz a dokumentumra."
+    IDS_PS_PASTE_LINK_OBJECT              "A v??g??lap tartalm??nak k??pe beilleszt??se az ??n dokumentum??ba mint: %s. A k??p ??ssze van kapcsolva a forr??sf??jllal, ??gy a f??jl m??dos??t??sa hat??ssal lesz a dokumentumra."
+    IDS_PS_PASTE_LINK_OBJECT_AS_ICON      "A v??g??lapra mutat?? parancsikon beilleszt??se az ??n dokumentum??ba mint: %s. A parancsikon ??ssze van kapcsolva a forr??sf??jllal, ??gy a f??jl m??dos??t??sa hat??ssal lesz a dokumentumra."
+    IDS_PS_NON_OLE                        "A v??g??lap tartalm??nak beilleszt??se az ??n dokumentum??ba."
+    IDS_PS_UNKNOWN_TYPE                   "Ismeretlen t??pus"
+    IDS_PS_UNKNOWN_SRC                    "Ismeretlen forr??s"
+    IDS_PS_UNKNOWN_APP                    "a program ami l??trehozta"
 }



From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: sane.ds: Add Hungarian
	translation.
Message-ID: <E1OTcgY-0003NX-C8@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3d722816f2bd85e5ab02cf7a5662cb0a42b30911
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3d722816f2bd85e5ab02cf7a5662cb0a42b30911

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:33:15 2010 +0200

sane.ds: Add Hungarian translation.

---

 dlls/sane.ds/Makefile.in |    1 +
 dlls/sane.ds/sane_Hu.rc  |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in
index bf2070c..2ed1a59 100644
--- a/dlls/sane.ds/Makefile.in
+++ b/dlls/sane.ds/Makefile.in
@@ -21,6 +21,7 @@ RC_SRCS = \
 	sane_Es.rc \
 	sane_Fi.rc \
 	sane_Fr.rc \
+	sane_Hu.rc \
 	sane_It.rc \
 	sane_Ja.rc \
 	sane_Ko.rc \
diff --git a/dlls/sane.ds/sane_Hu.rc b/dlls/sane.ds/sane_Hu.rc
new file mode 100644
index 0000000..395671c
--- /dev/null
+++ b/dlls/sane.ds/sane_Hu.rc
@@ -0,0 +1,45 @@
+/*
+ * Hungarian resources for Twain
+ *
+ * Copyright 2010 Andras Kov?cs
+ *
+ * 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 "resource.h"
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
+CAPTION "Lapolvas?s"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT   "LAPOLVAS?S... K?rem v?rjon",IDC_STATIC,5,19,176,8, SS_CENTER
+END
+
+STRINGTABLE DISCARDABLE
+{
+ 0 ""
+ 1 "px"
+ 2 "b"
+ 3 "mm"
+ 4 "dpi"
+ 5 "%"
+ 6 "ns"
+}



From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: setupapi: Update Hungarian
	translation.
Message-ID: <E1OTcgY-0003Nv-EM@wine.codeweavers.com>

Module: wine
Branch: master
Commit: d05b265fc302019332197f80cb9b83049b830c5c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d05b265fc302019332197f80cb9b83049b830c5c

Author: Kov??cs Andr??s <andras at csevego.net>
Date:   Mon Jun 28 23:34:06 2010 +0200

setupapi: Update Hungarian translation.

---

 dlls/setupapi/Hu.rc |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/dlls/setupapi/Hu.rc b/dlls/setupapi/Hu.rc
index ae8725d..3c17e4c 100644
--- a/dlls/setupapi/Hu.rc
+++ b/dlls/setupapi/Hu.rc
@@ -1,7 +1,7 @@
 /*
  * Hungarian resources for SETUPAPI
  *
- * Copyright 2006 Andras Kovacs
+ * Copyright 2010 Andras Kovacs
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,17 +20,42 @@
 
 #include "setupapi_private.h"
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
+STRINGTABLE DISCARDABLE
+{
+        IDS_PROMPTDISK   "A(z) '%s' f??jl sz??ks??ges ezen: %s"
+        IDS_UNKNOWN      "Ismeretlen"
+        IDS_COPYFROM     "F??jlok m??sol??sa innen:"
+        IDS_INFO         "??rja be az ??tvonalat ahol a f??jl tal??lhat?? majd nyomja meg az OK gombot."
+}
+
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "F?jlok m?sol?sa..."
+CAPTION "F??jlok m??sol??sa..."
 FONT 8, "MS Shell Dlg"
 BEGIN
-	PUSHBUTTON "M?gse", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	LTEXT "Forr?s:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+	PUSHBUTTON "M??gse", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	LTEXT "Forr??s:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
 	LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
-	LTEXT "C?l:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "C??l:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
 	LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
 	CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
+
+IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Sz??ks??ges f??jlok"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "Helyezze be a gy??rt?? lemez??t ??s ellen??rizze,\nhogy a megfelel?? meghajt?? van al??bb kiv??lasztva", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "Gy??rt?? f??jlainak m??sol??sa innen:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14
+	PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "M??gse", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	PUSHBUTTON "Tall??z??s...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END



From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: shdoclc: Update Hungarian
	translation.
Message-ID: <E1OTcgY-0003OE-JR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5fe502fcd5983321d8b2831b691ba630f42e956d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5fe502fcd5983321d8b2831b691ba630f42e956d

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:34:59 2010 +0200

shdoclc: Update Hungarian translation.

---

 dlls/shdoclc/Hu.rc |  243 +++++++++++++++++++++++++++------------------------
 1 files changed, 129 insertions(+), 114 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fe502fcd5983321d8b2831b691ba630f42e956d


From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: shell32: Update Hungarian
	translation.
Message-ID: <E1OTcgY-0003OU-N1@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 85e90fb38cb1f1fa73ded43295f793e93f68a0e3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=85e90fb38cb1f1fa73ded43295f793e93f68a0e3

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:35:35 2010 +0200

shell32: Update Hungarian translation.

---

 dlls/shell32/shell32_Hu.rc |  282 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 249 insertions(+), 33 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=85e90fb38cb1f1fa73ded43295f793e93f68a0e3


From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: shlwapi: Update Hungarian
	translation.
Message-ID: <E1OTcgY-0003Ol-QP@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5606db7cfebb63fe4de21f5a3c5fc0a6d780c544
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5606db7cfebb63fe4de21f5a3c5fc0a6d780c544

Author: Kov??cs Andr??s <andras at csevego.net>
Date:   Mon Jun 28 23:36:07 2010 +0200

shlwapi: Update Hungarian translation.

---

 dlls/shlwapi/shlwapi_Hu.rc |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/shlwapi/shlwapi_Hu.rc b/dlls/shlwapi/shlwapi_Hu.rc
index 56535e8..22c1460 100644
--- a/dlls/shlwapi/shlwapi_Hu.rc
+++ b/dlls/shlwapi/shlwapi_Hu.rc
@@ -1,7 +1,7 @@
 /*
  * Hungarian resources for shlwapi
  *
- * Copyright 2006 Andras Kovacs
+ * Copyright 2006-2010 Andras Kovacs
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,9 @@
 
 #include "resource.h"
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -29,17 +32,17 @@ FONT 8, "MS Shell Dlg"
 {
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
- CHECKBOX "Ne jelen?&tse meg ezt az ?zenetet ism?t", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ne jelen??&tse meg ezt az ??zenetet m??gegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&M?gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&M??gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_BYTES_FORMAT    "%ld bytes"
-    IDS_TIME_INTERVAL_HOURS    " hr"
-    IDS_TIME_INTERVAL_MINUTES  " min"
-    IDS_TIME_INTERVAL_SECONDS  " sec"
+    IDS_BYTES_FORMAT    "%ld b??jt"
+    IDS_TIME_INTERVAL_HOURS    " ??ra"
+    IDS_TIME_INTERVAL_MINUTES  " perc"
+    IDS_TIME_INTERVAL_SECONDS  " mp"
 }



From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: wininet: Update Hungarian
	translation.
Message-ID: <E1OTcgY-0003P2-Rx@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 1aec8e4f8a3f16cb1745432a1f929e3f475f58d8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1aec8e4f8a3f16cb1745432a1f929e3f475f58d8

Author: Kov??cs Andr??s <andras at csevego.net>
Date:   Mon Jun 28 23:36:58 2010 +0200

wininet: Update Hungarian translation.

---

 dlls/wininet/wininet_Hu.rc |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/dlls/wininet/wininet_Hu.rc b/dlls/wininet/wininet_Hu.rc
index b19e03d..636bd47 100644
--- a/dlls/wininet/wininet_Hu.rc
+++ b/dlls/wininet/wininet_Hu.rc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Andras Kovacs
+ * Copyright 2006-2010 Andras Kovacs
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,24 +20,47 @@
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "H?l?zati jelsz? megad?sa"
+CAPTION "H??l??zati jelsz?? megad??sa"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "K?rem adja meg a felhaszn?l?nevet, ?s jelsz?t:", -1, 40, 6, 150, 15
+ LTEXT "K??rem adja meg a felhaszn??l??nevet ??s jelsz??t:", -1, 40, 6, 150, 15
  LTEXT "Proxy", -1, 40, 26, 50, 10
  LTEXT "Csoport", -1, 40, 46, 50, 10
- LTEXT "Felhaszn?l?", -1, 40, 66, 50, 10
- LTEXT "Jelsz?", -1, 40, 86, 50, 10
+ LTEXT "Felhaszn??l??", -1, 40, 66, 50, 10
+ LTEXT "Jelsz??", -1, 40, 86, 50, 10
  LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
  LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "&Jelsz? ment?se (nem biztons?gos)", IDC_SAVEPASSWORD,
+ CHECKBOX "&Jelsz?? ment??se (nem biztons??gos)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "M??gse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Hiteles??t??s sz??ks??ges"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "K??rem adja meg a felhaszn??l??nevet ??s jelsz??t:", -1, 40, 6, 150, 15
+ LTEXT "Kiszolg??l??", -1, 40, 26, 50, 10
+ LTEXT "Tartom??ny", -1, 40, 46, 50, 10
+ LTEXT "Felhaszn??l??", -1, 40, 66, 50, 10
+ LTEXT "Jelsz??", -1, 40, 86, 50, 10
+ LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "Jel&sz?? elment??se (nem biztons??gos)", IDC_SAVEPASSWORD,
            80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "M?gse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "M??gse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Tue Jun 29 10:25:18 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:18 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: winspool.drv: Add Hungarian
	translation.
Message-ID: <E1OTcgY-0003PM-VZ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 90be2714a7b161ac786b00989717f65fab480cac
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=90be2714a7b161ac786b00989717f65fab480cac

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:37:46 2010 +0200

winspool.drv: Add Hungarian translation.

---

 dlls/winspool.drv/Hu.rc       |   44 +++++++++++++++++++++++++++++++++++++++++
 dlls/winspool.drv/Makefile.in |    1 +
 2 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/dlls/winspool.drv/Hu.rc b/dlls/winspool.drv/Hu.rc
new file mode 100644
index 0000000..a0c0d91
--- /dev/null
+++ b/dlls/winspool.drv/Hu.rc
@@ -0,0 +1,44 @@
+/*
+ * Hungarian resources for winspool
+ *
+ * Copyright 2010  Andras Kovacs
+ *
+ * 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 "wspool.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Nyomtat?s f?jlba"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Kimeneti &f?jln?v:", -1, 7, 13, 194, 13, WS_VISIBLE
+    EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE
+    PUSHBUTTON "M?gse", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE
+END
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CAPTION "Helyi port"
+    IDS_FILE_EXISTS "A kimeneti f?jl m?r l?tezik.  Kattintson az OK gombra a fel?l?r?shoz."
+    IDS_CANNOT_OPEN "Nem tudom l?trehozni a kimeneti f?jlt."
+}
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index 721798b..9f84801 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -21,6 +21,7 @@ RC_SRCS = \
 	Es.rc \
 	Fi.rc \
 	Fr.rc \
+	Hu.rc \
 	It.rc \
 	Ja.rc \
 	Ko.rc \



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: wldap32: Add Hungarian
	translation.
Message-ID: <E1OTcgZ-0003Pe-2K@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 53828fa0e765285eae93429ae410da9f37ca9d71
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=53828fa0e765285eae93429ae410da9f37ca9d71

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:38:33 2010 +0200

wldap32: Add Hungarian translation.

---

 dlls/wldap32/Makefile.in   |    1 +
 dlls/wldap32/wldap32_Hu.rc |  128 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+), 0 deletions(-)

diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in
index 625dd4b..47dee4f 100644
--- a/dlls/wldap32/Makefile.in
+++ b/dlls/wldap32/Makefile.in
@@ -35,6 +35,7 @@ RC_SRCS = \
 	wldap32_En.rc \
 	wldap32_Es.rc \
 	wldap32_Fr.rc \
+	wldap32_Hu.rc \
 	wldap32_It.rc \
 	wldap32_Ko.rc \
 	wldap32_Lt.rc \
diff --git a/dlls/wldap32/wldap32_Hu.rc b/dlls/wldap32/wldap32_Hu.rc
new file mode 100644
index 0000000..9357208
--- /dev/null
+++ b/dlls/wldap32/wldap32_Hu.rc
@@ -0,0 +1,128 @@
+/*
+ * Hungarian resources for WLDAP32
+ *
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "windef.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    0 "Sikeres"
+    1 "M?veleti hiba"
+    2 "Protokoll hiba"
+    3 "Id?korl?t t?ll?p?s"
+    4 "M?retkorl?t t?ll?p?s"
+    5 "Hasonl?t?s hamis"
+    6 "Hasonl?t?s igaz"
+    7 "Hiteles?t?si m?d nem t?mogatott"
+    8 "er?s hiteles?t?s sz?ks?ges"
+    9 "Besz?mol? (v2)"
+    10 "Besz?mol?"
+    11 "Adminisztr?ci?s korl?t t?ll?p?s"
+    12 "Nem el?rhet? kritikus kiterjeszt?s"
+    13 "Bizalmass?g sz?ks?ges"
+    14 ""
+    15 ""
+    16 "Nincs ilyen attrib?tum"
+    17 "Defini?latlan t?pus"
+    18 "Alkalmatlan egyez?s"
+    19 "Megszor?t?s megs?rt?s"
+    20 "Attrib?tum vagy ?rt?k l?tezik"
+    21 "?rv?nytelen szintakszis"
+    22 ""
+    23 ""
+    24 ""
+    25 ""
+    26 ""
+    27 ""
+    28 ""
+    29 ""
+    30 ""
+    31 ""
+    32 "Nincs ilyen objektum"
+    33 "?ln?v probl?ma"
+    34 "?rv?nytelen DN szintakszis"
+    35 "Ez egy lev?l"
+    36 "?ln?v dereferencia probl?ma"
+    37 ""
+    38 ""
+    39 ""
+    40 ""
+    41 ""
+    42 ""
+    43 ""
+    44 ""
+    45 ""
+    46 ""
+    47 ""
+    48 "Nem megfelel? hiteles?t?s"
+    49 "?rv?nytelen azonos?t?k"
+    50 "Nem elegend? jogok"
+    51 "Foglalt"
+    52 "Nem el?rhet?"
+    53 "Nem akarja v?grehajtani"
+    54 "Ciklus tal?lva"
+    55 ""
+    56 ""
+    57 ""
+    58 ""
+    59 ""
+    60 "Rendez?si vez?rl?s hi?nyzik"
+    61 "Index tartom?ny hiba"
+    62 ""
+    63 ""
+    64 "Elnevez?si ?sszef?rhetetlens?g"
+    65 "Objektum oszt?ly ?sszef?rhetetlens?g"
+    66 "Nem neged?lyezett nem lev?len"
+    67 "Nem enged?lyezett RDN-en"
+    68 "M?r l?tezik"
+    69 "Nincsenek objektum oszt?ly modok"
+    70 "Eredm?ny t?l nagy"
+    71 "T?bb DSA-ra van hat?ssal"
+    72 ""
+    73 ""
+    74 ""
+    75 ""
+    76 ""
+    77 ""
+    78 ""
+    79 ""
+    80 "Egy?b"
+    81 "Kiszolg?l? nem el?rhet?"
+    82 "Helyi hiba"
+    83 "K?dol?si hiba"
+    84 "Dek?dol?si hiba"
+    85 "Id?t?ll?p?s"
+    86 "Ismeretlen hiteles?t?s"
+    87 "Sz?r? hiba"
+    88 "Felhaszn?l? megszak?totta"
+    89 "Param?ter hiba"
+    90 "Nincs mem?ria"
+    91 "Nem tudok csatlakozni az LDAP kiszolg?l?hoz"
+    92 "A m?veletet az LDAP protokoll ezen verzi?ja nem t?mogatja"
+    93 "A megadott vez?rl? nem tal?lhat? az ?zenetben"
+    94 "Nincs eredm?ny az ?zenetben"
+    95 "T?bb eredm?ny j?tt vissza"
+    96 "Ciklus a besz?mol?k kezel?se k?zben"
+    97 "Besz?mol?si ugr?s limit t?ll?pve"
+}



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: =?UTF-8?Q?Kov=C3=A1cs=20Andr=C3=A1s=20?=: devenum: Add Hungarian
	translation.
Message-ID: <E1OTcgZ-0003Pv-3t@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e77622a179472d5fd14db7965378805af5712b98
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e77622a179472d5fd14db7965378805af5712b98

Author: Kov?cs Andr?s <andras at csevego.net>
Date:   Mon Jun 28 23:26:53 2010 +0200

devenum: Add Hungarian translation.

---

 dlls/devenum/Hu.rc       |   34 ++++++++++++++++++++++++++++++++++
 dlls/devenum/Makefile.in |    1 +
 2 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/dlls/devenum/Hu.rc b/dlls/devenum/Hu.rc
new file mode 100644
index 0000000..91d4a0b
--- /dev/null
+++ b/dlls/devenum/Hu.rc
@@ -0,0 +1,34 @@
+/*
+ * Resources for Device Enumerator
+ *
+ * Copyright 2010 Andras Kovacs
+ *
+ * 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 "devenum_private.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_DEVENUM_DSDEFAULT  "Alap?rtelmezett DirectSound"
+    IDS_DEVENUM_DS         "DirectSound: %s"
+    IDS_DEVENUM_WODEFAULT  "Alap?rtelmezett WaveOut eszk?z"
+    IDS_DEVENUM_MIDEFAULT  "Alap?rtelmezett MidiOut eszk?z"
+}
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index df3c136..1b174a5 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -19,6 +19,7 @@ RC_SRCS = \
 	En.rc \
 	Es.rc \
 	Fr.rc \
+	Hu.rc \
 	It.rc \
 	Ja.rc \
 	Ko.rc \



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: Igor Paliychuk : reg: Ukrainian translation update.
Message-ID: <E1OTcgZ-0003QC-5n@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 3762d1c9f8edcb7fc0a95f2bcbf18bfc940c9c20
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3762d1c9f8edcb7fc0a95f2bcbf18bfc940c9c20

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Mon Jun 28 21:46:22 2010 +0300

reg: Ukrainian translation update.

---

 programs/reg/Uk.rc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/programs/reg/Uk.rc b/programs/reg/Uk.rc
index 70c86f7..d2c776a 100644
--- a/programs/reg/Uk.rc
+++ b/programs/reg/Uk.rc
@@ -31,10 +31,10 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "????????? ???? ??????? ?????????:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n"
-    STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n"
+    STRING_USAGE, "????????? ???? ??????? ?????????:\n\nREG [ ADD | DELETE | QUERY ]\nREG <???????> /?\n"
+    STRING_ADD_USAGE, "REG ADD <????> [/v <????????> | /ve] [/t <???>] [/s <??????????>] [/d ????] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE <????> [/v <????????> | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY <????> [/v <????????> | /ve] [/s]\n"
     STRING_SUCCESS, "???????? ??????? ?????????\n"
     STRING_INVALID_KEY, "???????: ??????????? ??'? ?????\n"
     STRING_INVALID_CMDLINE, "???????: ??????????? ????????? ?????????? ?????\n"



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: Igor Paliychuk : xcopy: Ukrainian translation update.
Message-ID: <E1OTcgZ-0003QU-AT@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f8a16d3b301088135847ed70b4bf6f4cb5bce2fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f8a16d3b301088135847ed70b4bf6f4cb5bce2fc

Author: Igor Paliychuk <Igor-hkr at mail.ru>
Date:   Mon Jun 28 21:45:49 2010 +0300

xcopy: Ukrainian translation update.

---

 programs/xcopy/Uk.rc |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/programs/xcopy/Uk.rc b/programs/xcopy/Uk.rc
index 6d59e1b..eb0ec1f 100644
--- a/programs/xcopy/Uk.rc
+++ b/programs/xcopy/Uk.rc
@@ -34,8 +34,7 @@ STRINGTABLE
     STRING_PAUSE,    "????????? <enter> ??? ?????? ??????????\n"
     STRING_SIMCOPY,  "%d ????(??) ???? ???????????\n"
     STRING_COPY,     "%d ????(??) ???????????\n"
-    STRING_QISDIR,   "'%s' ? ?????? ?? ???????????\n" \
-                     "on the target?\n" \
+    STRING_QISDIR,   "'%s' ? ?????? ?? ????????????\n" \
                      "(F - ????, D - ??????????)\n"
     STRING_SRCPROMPT,"%s? (Yes|No)\n"
     STRING_OVERWRITE,"?????????? %s? (Yes|No|All)\n"
@@ -51,34 +50,34 @@ STRINGTABLE
     STRING_HELP,
 "XCOPY - ?????? ????? ?? ?????? ?????????? ?? ????????????\n\
 \n\
-Syntax:\n\
+?????????:\n\
 XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
-Where:\n\
+??:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or\n\
-\tmore files\n\
+[/I]  ???? ??????? ????? ???????? ? ?????????? ?i???? ?????? ?????,\n\
+\t?? ?????????????, ?? ?i??? ??????????? ? ??????\n\
 [/S]  ?????? ?????????? ?? ?????????????\n\
 [/E]  ?????? ?????????? ?? ?????????????, ??????? ? ?????????\n\
-[/Q]  Do not list names during copy, ie quiet.\n\
+[/Q]  ?? ?????????? ????? ?????? ??? ??? ??????????.\n\
 [/F]  ??? ??? ?????????? ?????????? ????? ????? ?????????? ? ???????? ??????\n\
-[/L]  Simulate operation, showing names which would be copied\n\
+[/L]  ???????? ?????? ??????, ??? ?????? ???????????\n\
 [/W]  ????? ????????????? ????? ???????? ??????????\n\
 [/T]  ??????? ????????? ????????? ??? ?? ?????? ?????\n\
-[/Y]  Suppress prompting when overwriting files\n\
+[/Y]  ???????? ????? ?? ????????????? ?????????? ??????\n\
 [/-Y] ????? ????????????? ?? ????????? ??????\n\
-[/P]  Prompts on each source file before copying\n\
+[/P]  ????? ????????????? ??? ??????? ???????????? ?????\n\
 [/N]  ??????, ?????????????? ??????? ?????\n\
-[/U]  Copy only files which already exist in destination\n\
+[/U]  ?????? ???? ?? ?????, ?? ??? i?????? ? ???????? ?????\n\
 [/R]  ??????????? ?????, ???????? ???? ??? ???????\n\
-[/H]  Include hidden and system files in the copy\n\
-[/C]  ????????? ??????, ?????? ???? ??? ?????????? ??????? ???????\n\
+[/H]  ?????? ????? ????????? ?? ???????? ?????\n\
+[/C]  ????????? ??????, ?????? ???? ??? ?????????? ??????? ???????\n\
 [/A]  ?????? ???? ????? ? ??????????? ????????\n\
 [/M]  ?????? ???? ????? ? ??????????? ????????, ???????\n\
 \??????????? ????????\n\
-[/D | /D:m-d-y] ?????? ???? ???? ????? ??? ??, ??? ???? ??????? ????? ???????? ????.\n\
-\t\t???? ???? ?? ???????, only copy if destination is older\n\
-\t\tthan source\n\n"
+[/D | /D:m-d-y] ?????? ???? ???? ????? ??? ??, ??? ???? ??????? ????? ????????\n\
+????. ???? ???? ?? ???????, ?????? ???? ?? ?????, ??? ??????\n\
+? ?????????? ?????\n\n"
 
 }



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: David Hedberg : wordpad: Small update to the Swedish translation.
Message-ID: <E1OTcgZ-0003Qk-C5@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ba7b2813cb32c7073e1a5d26a60ffbfba3639380
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ba7b2813cb32c7073e1a5d26a60ffbfba3639380

Author: David Hedberg <david.hedberg at gmail.com>
Date:   Tue Jun 29 05:24:40 2010 +0200

wordpad: Small update to the Swedish translation.

---

 programs/wordpad/Sv.rc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc
index edc35a9..7482de9 100644
--- a/programs/wordpad/Sv.rc
+++ b/programs/wordpad/Sv.rc
@@ -254,6 +254,9 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_UNITS_CM,             "cm"
+    STRING_UNITS_IN,             "in"
+    STRING_UNITS_INCH,           "tum"
+    STRING_UNITS_PT,             "pt"
 END
 
 STRINGTABLE DISCARDABLE



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: David Hedberg : taskmgr: Small update to the Swedish translation.
Message-ID: <E1OTcgZ-0003R0-G4@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 67f17a241649761077874026c0c4a8d665de7e92
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=67f17a241649761077874026c0c4a8d665de7e92

Author: David Hedberg <david.hedberg at gmail.com>
Date:   Tue Jun 29 05:24:41 2010 +0200

taskmgr: Small update to the Swedish translation.

---

 programs/taskmgr/Sv.rc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/programs/taskmgr/Sv.rc b/programs/taskmgr/Sv.rc
index a77eb61..093c0bc 100644
--- a/programs/taskmgr/Sv.rc
+++ b/programs/taskmgr/Sv.rc
@@ -485,4 +485,6 @@ BEGIN
     ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
                             "Ger processen prioritet under normal"
     ID_PROCESS_PAGE_SETPRIORITY_LOW "Ger processen l?g prioritet"
+    ID_PROCESS_PAGE_DEBUGCHANNELS
+                            "St?ller in fels?kningskanaler"
 END



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: Alexandre Julliard : ntdll: Round up the initial commit size to the
	commit granularity.
Message-ID: <E1OTcgZ-0003RI-IA@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6a9f170b1cd439451e42184a955970a3aaaf71d3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6a9f170b1cd439451e42184a955970a3aaaf71d3

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 29 10:55:20 2010 +0200

ntdll: Round up the initial commit size to the commit granularity.

---

 dlls/ntdll/heap.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 15dd85c..df94410 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -862,6 +862,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
         totalSize = min( totalSize, 0xffff0000 );  /* don't allow a heap larger than 4Gb */
         if (totalSize < commitSize) totalSize = commitSize;
         if (flags & HEAP_SHARED) commitSize = totalSize;  /* always commit everything in a shared heap */
+        commitSize = min( totalSize, (commitSize + COMMIT_MASK) & ~COMMIT_MASK );
 
         /* allocate the memory block */
         if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, &totalSize,



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: Austin English : kernel32: Add stub for
	QueryMemoryResourceNotification.
Message-ID: <E1OTcgZ-0003Rb-Ke@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5dca2545f20ca1f1f0487a0f4b861178eaf2cffa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5dca2545f20ca1f1f0487a0f4b861178eaf2cffa

Author: Austin English <austinenglish at gmail.com>
Date:   Mon Jun 28 15:28:59 2010 -0500

kernel32: Add stub for QueryMemoryResourceNotification.

---

 dlls/kernel32/kernel32.spec |    2 +-
 dlls/kernel32/sync.c        |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index dbcb179..843e97c 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -873,7 +873,7 @@
 @ stdcall QueryFullProcessImageNameA(ptr long ptr ptr)
 @ stdcall QueryFullProcessImageNameW(ptr long ptr ptr)
 @ stdcall QueryInformationJobObject(long long ptr long ptr)
-# @ stub QueryMemoryResourceNotification
+@ stdcall QueryMemoryResourceNotification(ptr ptr)
 @ stub QueryNumberOfEventLogRecords
 @ stub QueryOldestEventLogRecord
 @ stdcall QueryPerformanceCounter(ptr)
diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c
index 0ba2ad1..eac08c8 100644
--- a/dlls/kernel32/sync.c
+++ b/dlls/kernel32/sync.c
@@ -2186,6 +2186,15 @@ HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE
     return NULL;
 }
 
+/***********************************************************************
+ *          QueryMemoryResourceNotification   (KERNEL32.@)
+ */
+BOOL WINAPI QueryMemoryResourceNotification(HANDLE rnh, PBOOL rs)
+{
+    FIXME("(%p, %p) stub\n", rnh, rs);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return 0;
+}
 
 #ifdef __i386__
 



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: Austin English : ntdll: Add stub for NtSystemDebugControl.
Message-ID: <E1OTcgZ-0003Rq-Ma@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5bd468179b80a53a777024310d624afab9bcfd34
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5bd468179b80a53a777024310d624afab9bcfd34

Author: Austin English <austinenglish at gmail.com>
Date:   Mon Jun 28 21:27:11 2010 -0500

ntdll: Add stub for NtSystemDebugControl.

---

 dlls/ntdll/nt.c       |   12 ++++++++++++
 dlls/ntdll/ntdll.spec |    4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index e7700a1..a2b1023 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -1945,3 +1945,15 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING SubsystemName, HANDLE
 
     return STATUS_NOT_IMPLEMENTED;
 }
+
+/******************************************************************************
+ *  NtSystemDebugControl   (NTDLL.@)
+ *  ZwSystemDebugControl   (NTDLL.@)
+ */
+NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND command, PVOID inbuffer, ULONG inbuflength, PVOID outbuffer,
+                                     ULONG outbuflength, PULONG retlength)
+{
+    FIXME("(%d, %p, %d, %p, %d, %p), stub\n", command, inbuffer, inbuflength, outbuffer, outbuflength, retlength);
+
+    return STATUS_NOT_IMPLEMENTED;
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 37e0cca..8441b41 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -353,7 +353,7 @@
 @ stub NtStopProfile
 # @ stub NtSuspendProcess
 @ stdcall NtSuspendThread(long ptr)
-@ stub NtSystemDebugControl
+@ stdcall NtSystemDebugControl(long ptr long ptr long ptr)
 @ stdcall NtTerminateJobObject(long long)
 @ stdcall NtTerminateProcess(long long)
 @ stdcall NtTerminateThread(long long)
@@ -1209,7 +1209,7 @@
 @ stub ZwStopProfile
 # @ stub ZwSuspendProcess
 @ stdcall ZwSuspendThread(long ptr) NtSuspendThread
-@ stub ZwSystemDebugControl
+@ stdcall ZwSystemDebugControl(long ptr long ptr long ptr) NtSystemDebugControl
 @ stdcall ZwTerminateJobObject(long long) NtTerminateJobObject
 @ stdcall ZwTerminateProcess(long long) NtTerminateProcess
 @ stdcall ZwTerminateThread(long long) NtTerminateThread



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: Alexandre Julliard : winex11: Set the user time property on top-level
	windows.
Message-ID: <E1OTcgZ-0003S9-PH@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f2f508856ba9f3e5439f7123efd70ccc7599fc3f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f2f508856ba9f3e5439f7123efd70ccc7599fc3f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 29 11:08:51 2010 +0200

winex11: Set the user time property on top-level windows.

Helps convince some broken window managers to put new windows on top
of the z-order.

---

 dlls/winex11.drv/event.c       |    4 +++-
 dlls/winex11.drv/keyboard.c    |    2 ++
 dlls/winex11.drv/mouse.c       |    1 +
 dlls/winex11.drv/window.c      |   32 ++++++++++++++++++++++++++++++++
 dlls/winex11.drv/x11drv.h      |    3 +++
 dlls/winex11.drv/x11drv_main.c |    2 ++
 6 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 0e8d60c..8fc955a 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -503,11 +503,14 @@ static void set_focus( Display *display, HWND hwnd, Time time )
 static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
 {
     Atom protocol = (Atom)event->data.l[0];
+    Time event_time = (Time)event->data.l[1];
 
     if (!protocol) return;
 
     if (protocol == x11drv_atom(WM_DELETE_WINDOW))
     {
+        update_user_time( event_time );
+
         if (hwnd == GetDesktopWindow())
         {
             /* The desktop window does not have a close button that we can
@@ -559,7 +562,6 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
     }
     else if (protocol == x11drv_atom(WM_TAKE_FOCUS))
     {
-        Time event_time = (Time)event->data.l[1];
         HWND last_focus = x11drv_thread_data()->last_focus;
 
         TRACE( "got take focus msg for %p, enabled=%d, visible=%d (style %08x), focus=%p, active=%p, fg=%p, last=%p\n",
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 893796f..d9da4d2 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1376,6 +1376,8 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev )
     TRACE_(key)("type %d, window %lx, state 0x%04x, keycode %u\n",
 		event->type, event->window, event->state, event->keycode);
 
+    if (event->type == KeyPress) update_user_time( event->time );
+
     wine_tsx11_lock();
     /* Clients should pass only KeyPress events to XmbLookupString */
     if (xic && event->type == KeyPress)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index e8c84dc..cf988c9 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -921,6 +921,7 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev )
         break;
     }
 
+    update_user_time( event->time );
     update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
 
     X11DRV_send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE,
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 7bdf4e1..eb6432e 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -74,6 +74,10 @@ XContext winContext = 0;
 /* X context to associate a struct x11drv_win_data to an hwnd */
 static XContext win_data_context;
 
+/* time of last user event and window where it's stored */
+static Time last_user_time;
+static Window user_time_window;
+
 static const char whole_window_prop[] = "__wine_x11_whole_window";
 static const char client_window_prop[]= "__wine_x11_client_window";
 static const char icon_window_prop[]  = "__wine_x11_icon_window";
@@ -104,6 +108,8 @@ static void remove_startup_notification(Display *display, Window window)
         return;
     SetEnvironmentVariableA("DESKTOP_STARTUP_ID", NULL);
 
+    if ((src = strstr( id, "_TIME" ))) update_user_time( atol( src + 5 ));
+
     pos = snprintf(message, sizeof(message), "remove: ID=");
     message[pos++] = '"';
     for (i = 0; id[i] && pos < sizeof(message) - 2; i++)
@@ -1100,6 +1106,11 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data
     XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware),
                      XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 );
 
+    update_user_time( 0 );  /* make sure that the user time window exists */
+    if (user_time_window)
+        XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_USER_TIME_WINDOW),
+                         XA_WINDOW, 32, PropModeReplace, (unsigned char *)&user_time_window, 1 );
+
     data->wm_hints = XAllocWMHints();
     wine_tsx11_unlock();
 
@@ -1219,6 +1230,27 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data )
 
 
 /***********************************************************************
+ *     update_user_time
+ */
+void update_user_time( Time time )
+{
+    wine_tsx11_lock();
+    if (!user_time_window)
+    {
+        user_time_window = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, 0, InputOnly,
+                                          DefaultVisual(gdi_display,DefaultScreen(gdi_display)), 0, NULL );
+        TRACE( "user time window %lx\n", user_time_window );
+    }
+    if (time && (!last_user_time || (long)(time - last_user_time) > 0))
+    {
+        last_user_time = time;
+        XChangeProperty( gdi_display, user_time_window, x11drv_atom(_NET_WM_USER_TIME),
+                         XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&time, 1 );
+    }
+    wine_tsx11_unlock();
+}
+
+/***********************************************************************
  *     update_net_wm_states
  */
 void update_net_wm_states( Display *display, struct x11drv_win_data *data )
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 944669e..1cd610d 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -649,6 +649,8 @@ enum x11drv_atoms
     XATOM__NET_WM_STATE_MAXIMIZED_VERT,
     XATOM__NET_WM_STATE_SKIP_PAGER,
     XATOM__NET_WM_STATE_SKIP_TASKBAR,
+    XATOM__NET_WM_USER_TIME,
+    XATOM__NET_WM_USER_TIME_WINDOW,
     XATOM__NET_WM_WINDOW_OPACITY,
     XATOM__NET_WM_WINDOW_TYPE,
     XATOM__NET_WM_WINDOW_TYPE_DIALOG,
@@ -770,6 +772,7 @@ extern Drawable create_glxpixmap( Display *display, XVisualInfo *vis, Pixmap par
 extern void flush_gl_drawable( X11DRV_PDEVICE *physDev );
 
 extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set );
+extern void update_user_time( Time time );
 extern void update_net_wm_states( Display *display, struct x11drv_win_data *data );
 extern void make_window_embedded( Display *display, struct x11drv_win_data *data );
 
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 3a1fa3f..b07061c 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -150,6 +150,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
     "_NET_WM_STATE_MAXIMIZED_VERT",
     "_NET_WM_STATE_SKIP_PAGER",
     "_NET_WM_STATE_SKIP_TASKBAR",
+    "_NET_WM_USER_TIME",
+    "_NET_WM_USER_TIME_WINDOW",
     "_NET_WM_WINDOW_OPACITY",
     "_NET_WM_WINDOW_TYPE",
     "_NET_WM_WINDOW_TYPE_DIALOG",



From julliard at winehq.org  Tue Jun 29 10:25:19 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:19 -0500
Subject: Nikolay Sivov : msxml3: Add support for IPersistStreamInit for
	IXMLDOMDocument.
Message-ID: <E1OTcgZ-0003SU-Tn@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6a07cfeb525bed26cc92b5530f678b707a5b48e2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6a07cfeb525bed26cc92b5530f678b707a5b48e2

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun 28 21:16:43 2010 +0400

msxml3: Add support for IPersistStreamInit for IXMLDOMDocument.

---

 dlls/msxml3/domdoc.c       |   88 ++++++++++++++++++++++++-------------------
 dlls/msxml3/tests/domdoc.c |   22 +++++++++++
 2 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index cec59e8..eb98c29 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -66,7 +66,7 @@ typedef struct _domdoc
 {
     xmlnode node;
     const struct IXMLDOMDocument2Vtbl *lpVtbl;
-    const struct IPersistStreamVtbl   *lpvtblIPersistStream;
+    const struct IPersistStreamInitVtbl   *lpvtblIPersistStreamInit;
     const struct IObjectWithSiteVtbl  *lpvtblIObjectWithSite;
     const struct IObjectSafetyVtbl    *lpvtblIObjectSafety;
     const struct ISupportErrorInfoVtbl *lpvtblISupportErrorInfo;
@@ -296,9 +296,9 @@ static inline xmlDocPtr get_doc( domdoc *This )
     return (xmlDocPtr)This->node.node;
 }
 
-static inline domdoc *impl_from_IPersistStream(IPersistStream *iface)
+static inline domdoc *impl_from_IPersistStreamInit(IPersistStreamInit *iface)
 {
-    return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIPersistStream));
+    return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIPersistStreamInit));
 }
 
 static inline domdoc *impl_from_IObjectWithSite(IObjectWithSite *iface)
@@ -319,29 +319,29 @@ static inline domdoc *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface)
 /************************************************************************
  * xmldoc implementation of IPersistStream.
  */
-static HRESULT WINAPI xmldoc_IPersistStream_QueryInterface(
-    IPersistStream *iface, REFIID riid, LPVOID *ppvObj)
+static HRESULT WINAPI xmldoc_IPersistStreamInit_QueryInterface(
+    IPersistStreamInit *iface, REFIID riid, LPVOID *ppvObj)
 {
-    domdoc *this = impl_from_IPersistStream(iface);
+    domdoc *this = impl_from_IPersistStreamInit(iface);
     return IXMLDocument_QueryInterface((IXMLDocument *)this, riid, ppvObj);
 }
 
-static ULONG WINAPI xmldoc_IPersistStream_AddRef(
-    IPersistStream *iface)
+static ULONG WINAPI xmldoc_IPersistStreamInit_AddRef(
+    IPersistStreamInit *iface)
 {
-    domdoc *this = impl_from_IPersistStream(iface);
+    domdoc *this = impl_from_IPersistStreamInit(iface);
     return IXMLDocument_AddRef((IXMLDocument *)this);
 }
 
-static ULONG WINAPI xmldoc_IPersistStream_Release(
-    IPersistStream *iface)
+static ULONG WINAPI xmldoc_IPersistStreamInit_Release(
+    IPersistStreamInit *iface)
 {
-    domdoc *this = impl_from_IPersistStream(iface);
+    domdoc *this = impl_from_IPersistStreamInit(iface);
     return IXMLDocument_Release((IXMLDocument *)this);
 }
 
-static HRESULT WINAPI xmldoc_IPersistStream_GetClassID(
-    IPersistStream *iface, CLSID *classid)
+static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID(
+    IPersistStreamInit *iface, CLSID *classid)
 {
     TRACE("(%p,%p): stub!\n", iface, classid);
 
@@ -353,20 +353,20 @@ static HRESULT WINAPI xmldoc_IPersistStream_GetClassID(
     return S_OK;
 }
 
-static HRESULT WINAPI xmldoc_IPersistStream_IsDirty(
-    IPersistStream *iface)
+static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty(
+    IPersistStreamInit *iface)
 {
-    domdoc *This = impl_from_IPersistStream(iface);
+    domdoc *This = impl_from_IPersistStreamInit(iface);
 
     FIXME("(%p): stub!\n", This);
 
     return S_FALSE;
 }
 
-static HRESULT WINAPI xmldoc_IPersistStream_Load(
-    IPersistStream *iface, LPSTREAM pStm)
+static HRESULT WINAPI xmldoc_IPersistStreamInit_Load(
+    IPersistStreamInit *iface, LPSTREAM pStm)
 {
-    domdoc *This = impl_from_IPersistStream(iface);
+    domdoc *This = impl_from_IPersistStreamInit(iface);
     HRESULT hr;
     HGLOBAL hglobal;
     DWORD read, written, len;
@@ -416,10 +416,10 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load(
     return attach_xmldoc( &This->node, xmldoc );
 }
 
-static HRESULT WINAPI xmldoc_IPersistStream_Save(
-    IPersistStream *iface, LPSTREAM pStm, BOOL fClearDirty)
+static HRESULT WINAPI xmldoc_IPersistStreamInit_Save(
+    IPersistStreamInit *iface, LPSTREAM pStm, BOOL fClearDirty)
 {
-    domdoc *This = impl_from_IPersistStream(iface);
+    domdoc *This = impl_from_IPersistStreamInit(iface);
     HRESULT hr;
     BSTR xmlString;
 
@@ -441,24 +441,33 @@ static HRESULT WINAPI xmldoc_IPersistStream_Save(
     return hr;
 }
 
-static HRESULT WINAPI xmldoc_IPersistStream_GetSizeMax(
-    IPersistStream *iface, ULARGE_INTEGER *pcbSize)
+static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax(
+    IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize)
 {
-    domdoc *This = impl_from_IPersistStream(iface);
+    domdoc *This = impl_from_IPersistStreamInit(iface);
     TRACE("(%p)->(%p): stub!\n", This, pcbSize);
     return E_NOTIMPL;
 }
 
-static const IPersistStreamVtbl xmldoc_IPersistStream_VTable =
+static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew(
+    IPersistStreamInit *iface)
 {
-    xmldoc_IPersistStream_QueryInterface,
-    xmldoc_IPersistStream_AddRef,
-    xmldoc_IPersistStream_Release,
-    xmldoc_IPersistStream_GetClassID,
-    xmldoc_IPersistStream_IsDirty,
-    xmldoc_IPersistStream_Load,
-    xmldoc_IPersistStream_Save,
-    xmldoc_IPersistStream_GetSizeMax,
+    domdoc *This = impl_from_IPersistStreamInit(iface);
+    TRACE("(%p)\n", This);
+    return S_OK;
+}
+
+static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable =
+{
+    xmldoc_IPersistStreamInit_QueryInterface,
+    xmldoc_IPersistStreamInit_AddRef,
+    xmldoc_IPersistStreamInit_Release,
+    xmldoc_IPersistStreamInit_GetClassID,
+    xmldoc_IPersistStreamInit_IsDirty,
+    xmldoc_IPersistStreamInit_Load,
+    xmldoc_IPersistStreamInit_Save,
+    xmldoc_IPersistStreamInit_GetSizeMax,
+    xmldoc_IPersistStreamInit_InitNew
 };
 
 /* ISupportErrorInfo interface */
@@ -520,9 +529,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii
     {
         *ppvObject = IXMLDOMNode_from_impl(&This->node);
     }
-    else if (IsEqualGUID(&IID_IPersistStream, riid))
+    else if (IsEqualGUID(&IID_IPersistStream, riid) ||
+             IsEqualGUID(&IID_IPersistStreamInit, riid))
     {
-        *ppvObject = &(This->lpvtblIPersistStream);
+        *ppvObject = &(This->lpvtblIPersistStreamInit);
     }
     else if (IsEqualGUID(&IID_IObjectWithSite, riid))
     {
@@ -1575,7 +1585,7 @@ static HRESULT WINAPI domdoc_load(
             hr = IUnknown_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream);
             if(hr == S_OK)
             {
-                hr = xmldoc_IPersistStream_Load(pDocStream, pStream);
+                hr = IPersistStream_Load(pDocStream, pStream);
                 IStream_Release(pStream);
                 if(hr == S_OK)
                 {
@@ -2337,7 +2347,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **docu
         return E_OUTOFMEMORY;
 
     doc->lpVtbl = &domdoc_vtbl;
-    doc->lpvtblIPersistStream = &xmldoc_IPersistStream_VTable;
+    doc->lpvtblIPersistStreamInit = &xmldoc_IPersistStreamInit_VTable;
     doc->lpvtblIObjectWithSite = &domdocObjectSite;
     doc->lpvtblIObjectSafety = &domdocObjectSafetyVtbl;
     doc->lpvtblISupportErrorInfo = &support_error_vtbl;
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index cde4c81..21e8178 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -1242,6 +1242,27 @@ if (0)
     free_bstrs();
 }
 
+static void test_persiststreaminit(void)
+{
+    IXMLDOMDocument *doc;
+    IPersistStreamInit *streaminit;
+    HRESULT hr;
+
+    hr = CoCreateInstance( &CLSID_DOMDocument, NULL,
+        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc );
+    ok( hr == S_OK, "failed with 0x%08x\n", hr );
+    if( hr != S_OK )
+        return;
+
+    hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&streaminit);
+    ok( hr == S_OK, "failed with 0x%08x\n", hr );
+
+    hr = IPersistStreamInit_InitNew(streaminit);
+    ok( hr == S_OK, "failed with 0x%08x\n", hr );
+
+    IXMLDOMDocument_Release(doc);
+}
+
 static void test_domnode( void )
 {
     HRESULT r;
@@ -5597,6 +5618,7 @@ START_TEST(domdoc)
         IXMLDOMDocument_Release(doc);
 
         test_domdoc();
+        test_persiststreaminit();
         test_domnode();
         test_refs();
         test_create();



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Nikolay Sivov : msxml3: Use proper pointer types for
	IPersistStreamInit methods.
Message-ID: <E1OTcga-0003Sk-1Q@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4edfeefa646fff67588f971d9ee9c6e4b43cd036
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4edfeefa646fff67588f971d9ee9c6e4b43cd036

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jun 28 21:34:00 2010 +0400

msxml3: Use proper pointer types for IPersistStreamInit methods.

---

 dlls/msxml3/domdoc.c |   54 ++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index eb98c29..0007503 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -317,30 +317,30 @@ static inline domdoc *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface)
 }
 
 /************************************************************************
- * xmldoc implementation of IPersistStream.
+ * domdoc implementation of IPersistStream.
  */
-static HRESULT WINAPI xmldoc_IPersistStreamInit_QueryInterface(
-    IPersistStreamInit *iface, REFIID riid, LPVOID *ppvObj)
+static HRESULT WINAPI domdoc_IPersistStreamInit_QueryInterface(
+    IPersistStreamInit *iface, REFIID riid, void **ppvObj)
 {
     domdoc *this = impl_from_IPersistStreamInit(iface);
-    return IXMLDocument_QueryInterface((IXMLDocument *)this, riid, ppvObj);
+    return IXMLDOMDocument2_QueryInterface((IXMLDOMDocument2 *)this, riid, ppvObj);
 }
 
-static ULONG WINAPI xmldoc_IPersistStreamInit_AddRef(
+static ULONG WINAPI domdoc_IPersistStreamInit_AddRef(
     IPersistStreamInit *iface)
 {
     domdoc *this = impl_from_IPersistStreamInit(iface);
-    return IXMLDocument_AddRef((IXMLDocument *)this);
+    return IXMLDOMDocument2_AddRef((IXMLDOMDocument2 *)this);
 }
 
-static ULONG WINAPI xmldoc_IPersistStreamInit_Release(
+static ULONG WINAPI domdoc_IPersistStreamInit_Release(
     IPersistStreamInit *iface)
 {
     domdoc *this = impl_from_IPersistStreamInit(iface);
-    return IXMLDocument_Release((IXMLDocument *)this);
+    return IXMLDOMDocument2_Release((IXMLDOMDocument2 *)this);
 }
 
-static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID(
+static HRESULT WINAPI domdoc_IPersistStreamInit_GetClassID(
     IPersistStreamInit *iface, CLSID *classid)
 {
     TRACE("(%p,%p): stub!\n", iface, classid);
@@ -353,17 +353,15 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID(
     return S_OK;
 }
 
-static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty(
+static HRESULT WINAPI domdoc_IPersistStreamInit_IsDirty(
     IPersistStreamInit *iface)
 {
     domdoc *This = impl_from_IPersistStreamInit(iface);
-
     FIXME("(%p): stub!\n", This);
-
     return S_FALSE;
 }
 
-static HRESULT WINAPI xmldoc_IPersistStreamInit_Load(
+static HRESULT WINAPI domdoc_IPersistStreamInit_Load(
     IPersistStreamInit *iface, LPSTREAM pStm)
 {
     domdoc *This = impl_from_IPersistStreamInit(iface);
@@ -416,7 +414,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load(
     return attach_xmldoc( &This->node, xmldoc );
 }
 
-static HRESULT WINAPI xmldoc_IPersistStreamInit_Save(
+static HRESULT WINAPI domdoc_IPersistStreamInit_Save(
     IPersistStreamInit *iface, LPSTREAM pStm, BOOL fClearDirty)
 {
     domdoc *This = impl_from_IPersistStreamInit(iface);
@@ -441,7 +439,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Save(
     return hr;
 }
 
-static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax(
+static HRESULT WINAPI domdoc_IPersistStreamInit_GetSizeMax(
     IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize)
 {
     domdoc *This = impl_from_IPersistStreamInit(iface);
@@ -449,7 +447,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax(
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew(
+static HRESULT WINAPI domdoc_IPersistStreamInit_InitNew(
     IPersistStreamInit *iface)
 {
     domdoc *This = impl_from_IPersistStreamInit(iface);
@@ -459,15 +457,15 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew(
 
 static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable =
 {
-    xmldoc_IPersistStreamInit_QueryInterface,
-    xmldoc_IPersistStreamInit_AddRef,
-    xmldoc_IPersistStreamInit_Release,
-    xmldoc_IPersistStreamInit_GetClassID,
-    xmldoc_IPersistStreamInit_IsDirty,
-    xmldoc_IPersistStreamInit_Load,
-    xmldoc_IPersistStreamInit_Save,
-    xmldoc_IPersistStreamInit_GetSizeMax,
-    xmldoc_IPersistStreamInit_InitNew
+    domdoc_IPersistStreamInit_QueryInterface,
+    domdoc_IPersistStreamInit_AddRef,
+    domdoc_IPersistStreamInit_Release,
+    domdoc_IPersistStreamInit_GetClassID,
+    domdoc_IPersistStreamInit_IsDirty,
+    domdoc_IPersistStreamInit_Load,
+    domdoc_IPersistStreamInit_Save,
+    domdoc_IPersistStreamInit_GetSizeMax,
+    domdoc_IPersistStreamInit_InitNew
 };
 
 /* ISupportErrorInfo interface */
@@ -476,21 +474,21 @@ static HRESULT WINAPI support_error_QueryInterface(
     REFIID riid, void** ppvObj )
 {
     domdoc *This = impl_from_ISupportErrorInfo(iface);
-    return IXMLDocument_QueryInterface((IXMLDocument *)This, riid, ppvObj);
+    return IXMLDOMDocument2_QueryInterface((IXMLDOMDocument2 *)This, riid, ppvObj);
 }
 
 static ULONG WINAPI support_error_AddRef(
     ISupportErrorInfo *iface )
 {
     domdoc *This = impl_from_ISupportErrorInfo(iface);
-    return IXMLDocument_AddRef((IXMLDocument *)This);
+    return IXMLDOMDocument2_AddRef((IXMLDOMDocument2 *)This);
 }
 
 static ULONG WINAPI support_error_Release(
     ISupportErrorInfo *iface )
 {
     domdoc *This = impl_from_ISupportErrorInfo(iface);
-    return IXMLDocument_Release((IXMLDocument *)This);
+    return IXMLDOMDocument2_Release((IXMLDOMDocument2 *)This);
 }
 
 static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo(



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: urlmon: Partially implement
	HlinkSimpleNavigateToString.
Message-ID: <E1OTcga-0003T3-66@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 855912cda5f62b791a14969a22d4a335d13dbacb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=855912cda5f62b791a14969a22d4a335d13dbacb

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Mon Jun 28 21:16:51 2010 +0200

urlmon: Partially implement HlinkSimpleNavigateToString.

---

 dlls/urlmon/Makefile.in |    2 +-
 dlls/urlmon/umon.c      |   24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index 91277a5..71567ec 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon.dll
 IMPORTLIB = urlmon
-IMPORTS   = uuid ole32 oleaut32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll
+IMPORTS   = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll
 EXTRADEFS = -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL \
 	    -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}"
 
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index 7ce22cc..9a54e11 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -24,6 +24,8 @@
 
 #include "winreg.h"
 #include "shlwapi.h"
+#include "hlink.h"
+#include "shellapi.h"
 
 #include "wine/debug.h"
 
@@ -742,7 +744,27 @@ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget,
     LPCWSTR szLocation, LPCWSTR szTargetFrameName, IUnknown *pUnk,
     IBindCtx *pbc, IBindStatusCallback *pbsc, DWORD grfHLNF, DWORD dwReserved)
 {
-    FIXME("%s\n", debugstr_w( szTarget ) );
+    FIXME("%s %s %s %p %p %p %u %u partial stub\n", debugstr_w( szTarget ), debugstr_w( szLocation ),
+          debugstr_w( szTargetFrameName ), pUnk, pbc, pbsc, grfHLNF, dwReserved);
+
+    /* undocumented: 0 means HLNF_OPENINNEWWINDOW*/
+    if (!grfHLNF) grfHLNF = HLNF_OPENINNEWWINDOW;
+
+    if (grfHLNF == HLNF_OPENINNEWWINDOW)
+    {
+        SHELLEXECUTEINFOW sei;
+        static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 };
+
+        memset(&sei, 0, sizeof(sei));
+        sei.cbSize = sizeof(sei);
+        sei.lpVerb = openW;
+        sei.nShow = SW_SHOWNORMAL;
+        sei.fMask = SEE_MASK_FLAG_NO_UI | SEE_MASK_NO_CONSOLE;
+        sei.lpFile = szTarget;
+
+        if (ShellExecuteExW(&sei)) return S_OK;
+    }
+
     return E_NOTIMPL;
 }
 



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Marko Nikolic : advapi32/tests: Replaced function lstrlen with strlen
	in condition check.
Message-ID: <E1OTcga-0003TM-Ai@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ff08a6866820221ba134239c957465ce458a182c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ff08a6866820221ba134239c957465ce458a182c

Author: Marko Nikolic <grkoma at gmail.com>
Date:   Mon Jun 28 22:36:10 2010 +0200

advapi32/tests: Replaced function lstrlen with strlen in condition check.

---

 dlls/advapi32/tests/security.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 2b14ae5..1f1b697 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2807,7 +2807,7 @@ static void test_ConvertSecurityDescriptorToString(void)
  * don't replicate this feature so we only test len >= strlen+1. */
 #define CHECK_RESULT_AND_FREE(exp_str) \
     ok(strcmp(string, (exp_str)) == 0, "String mismatch (expected \"%s\", got \"%s\")\n", (exp_str), string); \
-    ok(len >= (lstrlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \
+    ok(len >= (strlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \
     LocalFree(string);
 
 #define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Andrew Eikum : shell32: Use ParseURL to detect URLs.
Message-ID: <E1OTcga-0003Td-DO@wine.codeweavers.com>

Module: wine
Branch: master
Commit: da31fc06a44b38d441a8310724989ea35d512e9f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=da31fc06a44b38d441a8310724989ea35d512e9f

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Mon Jun 28 12:06:24 2010 -0500

shell32: Use ParseURL to detect URLs.

---

 dlls/shell32/shfldr_desktop.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index 30aea3b..46a725f 100644
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -152,6 +152,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
     WCHAR szElement[MAX_PATH];
     LPCWSTR szNext = NULL;
     LPITEMIDLIST pidlTemp = NULL;
+    PARSEDURLW urldata;
     HRESULT hr = S_OK;
     CLSID clsid;
 
@@ -167,6 +168,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
     if (pchEaten)
         *pchEaten = 0;        /* strange but like the original */
 
+    urldata.cbSize = sizeof(urldata);
+
     if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':')
     {
         szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH);
@@ -193,13 +196,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
         *ppidl = pidlTemp;
         return S_OK;
     }
-    else if (strchrW(lpszDisplayName,':'))
+    else if (SUCCEEDED(ParseURLW(lpszDisplayName, &urldata)))
     {
-        PARSEDURLW urldata;
-
-        urldata.cbSize = sizeof(urldata);
-        ParseURLW(lpszDisplayName,&urldata);
-
         if (urldata.nScheme == URL_SCHEME_SHELL) /* handle shell: urls */
         {
             TRACE ("-- shell url: %s\n", debugstr_w(urldata.pszSuffix));



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Andrew Eikum : shell32: UNIX paths should be parsed by unixfs.
Message-ID: <E1OTcga-0003Tv-GV@wine.codeweavers.com>

Module: wine
Branch: master
Commit: a77fb7f5508c268fbc82c30da1774d97586ccb67
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a77fb7f5508c268fbc82c30da1774d97586ccb67

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Mon Jun 28 12:06:27 2010 -0500

shell32: UNIX paths should be parsed by unixfs.

Some tests show that trying to create a PIDL from a path starting with
'/' fails in Windows, so this change shouldn't cause a conflict with
the shell namespace.

---

 dlls/shell32/shfldr_desktop.c |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index 46a725f..e3798a6 100644
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -213,21 +213,36 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
 
         if (*lpszDisplayName)
         {
-            WCHAR szPath[MAX_PATH];
-            LPWSTR pathPtr;
-
-            /* build a complete path to create a simple pidl */
-            lstrcpynW(szPath, This->sPathTarget, MAX_PATH);
-            pathPtr = PathAddBackslashW(szPath);
-            if (pathPtr)
+            if (*lpszDisplayName == '/')
             {
-                lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath));
-                hr = _ILCreateFromPathW(szPath, &pidlTemp);
+                /* UNIX paths should be parsed by unixfs */
+                IShellFolder *unixFS;
+                hr = UnixFolder_Constructor(NULL, &IID_IShellFolder, (LPVOID*)&unixFS);
+                if (SUCCEEDED(hr))
+                {
+                    hr = IShellFolder_ParseDisplayName(unixFS, NULL, NULL,
+                            lpszDisplayName, NULL, &pidlTemp, NULL);
+                    IShellFolder_Release(unixFS);
+                }
             }
             else
             {
-                /* should never reach here, but for completeness */
-                hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+                /* build a complete path to create a simple pidl */
+                WCHAR szPath[MAX_PATH];
+                LPWSTR pathPtr;
+
+                lstrcpynW(szPath, This->sPathTarget, MAX_PATH);
+                pathPtr = PathAddBackslashW(szPath);
+                if (pathPtr)
+                {
+                    lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath));
+                    hr = _ILCreateFromPathW(szPath, &pidlTemp);
+                }
+                else
+                {
+                    /* should never reach here, but for completeness */
+                    hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+                }
             }
         }
         else



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Andrew Eikum : include: Add new SHCNRF flags.
Message-ID: <E1OTcga-0003UC-I4@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 5f884d19c69b8a857083c013e5aecf6031d7bf70
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5f884d19c69b8a857083c013e5aecf6031d7bf70

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Mon Jun 28 10:06:51 2010 -0500

include: Add new SHCNRF flags.

---

 include/shlobj.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/include/shlobj.h b/include/shlobj.h
index dbf8518..5f125c1 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1297,11 +1297,17 @@ typedef struct _SHChangeNotifyEntry
 #define SHCNF_PRINTERW		0x0006
 #define SHCNF_TYPE		0x00FF
 #define SHCNF_FLUSH		0x1000
-#define SHCNF_FLUSHNOWAIT	0x2000
+#define SHCNF_FLUSHNOWAIT	0x3000
+#define SHCNF_NOTIFYRECURSIVE	0x10000
 
 #define SHCNF_PATH              WINELIB_NAME_AW(SHCNF_PATH)
 #define SHCNF_PRINTER           WINELIB_NAME_AW(SHCNF_PRINTER)
 
+#define SHCNRF_InterruptLevel 0x0001
+#define SHCNRF_ShellLevel 0x0002
+#define SHCNRF_RecursiveInterrupt 0x1000
+#define SHCNRF_NewDelivery 0x8000
+
 void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2);
 
 typedef enum {



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Alexandre Julliard : winex11: Disable antialiasing if either
	fontconfig or Xft disable it explicitly.
Message-ID: <E1OTcga-0003US-Jk@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4d9a31177113f53407595f055ea3dbdc6df6bcf9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4d9a31177113f53407595f055ea3dbdc6df6bcf9

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 29 14:58:31 2010 +0200

winex11: Disable antialiasing if either fontconfig or Xft disable it explicitly.

---

 dlls/winex11.drv/xrender.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 2fc804a..4f900b2 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -905,6 +905,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz)
                 break;
         }
 
+        font_smoothing = TRUE;  /* default to enabled */
 #ifdef SONAME_LIBFONTCONFIG
         if (fontconfig_installed)
         {
@@ -956,9 +957,10 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz)
                     case FC_RGBA_BGR:  entry->aa_default = AA_BGR; break;
                     case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break;
                     case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break;
-                    case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break;
+                    case FC_RGBA_NONE: entry->aa_default = AA_Grey; break;
                     }
                 }
+                if (!antialias) font_smoothing = FALSE;
                 pFcPatternDestroy( match );
             }
             pFcPatternDestroy( pattern );
@@ -984,11 +986,14 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz)
                 else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR;
                 else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB;
                 else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR;
-                else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None;
+                else if (!strcmp( value, "none" )) entry->aa_default = AA_Grey;
             }
             wine_tsx11_unlock();
+            if (!antialias) font_smoothing = FALSE;
         }
 
+        if (!font_smoothing) entry->aa_default = AA_None;
+
         /* we can't support subpixel without xrender */
         if (!X11DRV_XRender_Installed && entry->aa_default > AA_Grey) entry->aa_default = AA_Grey;
     }



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Andrew Eikum : shell32: Pass the file extension to ParseDisplayName
	in unixfs's SetNameOf.
Message-ID: <E1OTcga-0003Ui-Lk@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 2b3fea0249de423a3056a3ba3215fa86cb057e6e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2b3fea0249de423a3056a3ba3215fa86cb057e6e

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Mon Jun 28 09:35:36 2010 -0500

shell32: Pass the file extension to ParseDisplayName in unixfs's SetNameOf.

---

 dlls/shell32/shfldr_unixfs.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index dfd7255..9c9f94a 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -1183,9 +1183,9 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H
 
     static const WCHAR awcInvalidChars[] = { '\\', '/', ':', '*', '?', '"', '<', '>', '|' };
     char szSrc[FILENAME_MAX], szDest[FILENAME_MAX];
-    WCHAR wszSrcRelative[MAX_PATH];
+    WCHAR wszSrcRelative[MAX_PATH], *pwszExt = NULL;
     unsigned int i;
-    int cBasePathLen = lstrlenA(This->m_pszPath);
+    int cBasePathLen = lstrlenA(This->m_pszPath), cNameLen;
     struct stat statDest;
     LPITEMIDLIST pidlSrc, pidlDest, pidlRelativeDest;
     LPOLESTR lpwszName;
@@ -1221,8 +1221,8 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H
         _ILSimpleGetTextW(pidl, wszSrcRelative, MAX_PATH) && 
         SHELL_FS_HideExtension(wszSrcRelative))
     {
-        WCHAR *pwszExt = PathFindExtensionW(wszSrcRelative);
         int cLenDest = strlen(szDest);
+        pwszExt = PathFindExtensionW(wszSrcRelative);
         WideCharToMultiByte(CP_UNIXCP, 0, pwszExt, -1, szDest + cLenDest, 
             FILENAME_MAX - cLenDest, NULL, NULL);
     }
@@ -1238,8 +1238,14 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H
         return E_FAIL;
     
     /* Build a pidl for the path of the renamed file */
-    lpwszName = SHAlloc((lstrlenW(lpcwszName)+1)*sizeof(WCHAR)); /* due to const correctness. */
+    cNameLen = lstrlenW(lpcwszName) + 1;
+    if(pwszExt)
+        cNameLen += lstrlenW(pwszExt);
+    lpwszName = SHAlloc(cNameLen*sizeof(WCHAR)); /* due to const correctness. */
     lstrcpyW(lpwszName, lpcwszName);
+    if(pwszExt)
+        lstrcatW(lpwszName, pwszExt);
+
     hr = IShellFolder2_ParseDisplayName(iface, NULL, NULL, lpwszName, NULL, &pidlRelativeDest, NULL);
     SHFree(lpwszName);
     if (FAILED(hr)) {



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Ricardo Filipe : mshtml: Fix Portuguese Portugal translation.
Message-ID: <E1OTcga-0003Uy-OJ@wine.codeweavers.com>

Module: wine
Branch: master
Commit: c009107754dbaccb2d449b65b6f4330183a830c0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c009107754dbaccb2d449b65b6f4330183a830c0

Author: Ricardo Filipe <ricardojdfilipe at gmail.com>
Date:   Tue Jun 29 01:52:15 2010 -0700

mshtml: Fix Portuguese Portugal translation.

---

 dlls/mshtml/Pt.rc |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc
index 689f930..be98a59 100644
--- a/dlls/mshtml/Pt.rc
+++ b/dlls/mshtml/Pt.rc
@@ -66,9 +66,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN
 CAPTION "Instalador Wine Gecko"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \
-          "to work correctly. Wine can automatically download and install it for you.\n\n" \
-          "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.",
+    LTEXT "O Wine n?o conseguiu encontrar o pacote Gecko que ? necess?rio para aplica??es com HTML embutido" \
+          "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instal?-lo por si.\n\n" \
+          "Nota: ? recomend?vel usar os pacotes da sua distribui??o em vez disso. \n\
+Veja http://wiki.winehq.org/Gecko para mais detalhes.",
           ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT
     CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12
     DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP



From julliard at winehq.org  Tue Jun 29 10:25:20 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Tue, 29 Jun 2010 10:25:20 -0500
Subject: Piotr Caban : wininet: Reconnect if persistent connection was closed
	by server.
Message-ID: <E1OTcga-0003VE-QN@wine.codeweavers.com>

Module: wine
Branch: master
Commit: ee68473fe5c244cc3ad3ed6ad8751652b9962c65
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ee68473fe5c244cc3ad3ed6ad8751652b9962c65

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Tue Jun 29 12:20:51 2010 +0200

wininet: Reconnect if persistent connection was closed by server.

---

 dlls/wininet/http.c          |   23 ++++++++++++++++++++---
 dlls/wininet/netconnection.c |    6 +++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 200d03f..4b4bc5b 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -3454,6 +3454,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders,
     do
     {
         DWORD len;
+        BOOL reusing_connection;
         char *ascii_req;
 
         loop_next = FALSE;
@@ -3504,6 +3505,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders,
         TRACE("Request header -> %s\n", debugstr_w(requestString) );
 
         /* Send the request and store the results */
+        if(NETCON_connected(&lpwhr->netConnection))
+            reusing_connection = TRUE;
+        else
+            reusing_connection = FALSE;
+
         if ((res = HTTP_OpenConnection(lpwhr)) != ERROR_SUCCESS)
             goto lend;
 
@@ -3545,6 +3551,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders,
                 goto lend;
     
             responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE);
+            /* FIXME: We should know that connection is closed before sending
+             * headers. Otherwise wrong callbacks are executed */
+            if(!responseLen && reusing_connection) {
+                TRACE("Connection closed by server, reconnecting\n");
+                loop_next = TRUE;
+                continue;
+            }
     
             INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                                 INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen,
@@ -4457,9 +4470,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear)
 
     TRACE("-->\n");
 
-    /* clear old response headers (eg. from a redirect response) */
-    if (clear) HTTP_clear_response_headers( lpwhr );
-
     if (!NETCON_connected(&lpwhr->netConnection))
         goto lend;
 
@@ -4471,6 +4481,13 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear)
         buflen = MAX_REPLY_LEN;
         if (!read_line(lpwhr, bufferA, &buflen))
             goto lend;
+
+        /* clear old response headers (eg. from a redirect response) */
+        if (clear) {
+            HTTP_clear_response_headers( lpwhr );
+            clear = FALSE;
+        }
+
         rc += buflen;
         MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN );
         /* check is this a status code line? */
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 5aa647a..abd7415 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -770,6 +770,8 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int
     if (!connection->useSSL)
     {
 	*recvd = recv(connection->socketFD, buf, len, flags);
+        if(!*recvd)
+            NETCON_close(connection);
 	return *recvd == -1 ? sock_get_error(errno) :  ERROR_SUCCESS;
     }
     else
@@ -779,8 +781,10 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int
 
         /* Check if EOF was received */
         if(!*recvd && (pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_ZERO_RETURN
-                    || pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_SYSCALL))
+                    || pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_SYSCALL)) {
+            NETCON_close(connection);
             return ERROR_SUCCESS;
+        }
 
         return *recvd > 0 ? ERROR_SUCCESS : ERROR_INTERNET_CONNECTION_ABORTED;
 #else



From julliard at winehq.org  Wed Jun 30 05:29:51 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 05:29:51 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: wineusr: Add WINEARCH
	description.
Message-ID: <E1OTuYB-0006nb-FF@wine.codeweavers.com>

Module: docs
Branch: master
Commit: 621c6e936c46cd75170c8a51e3576d083715b8fe
URL:    http://source.winehq.org/git/docs.git/?a=commit;h=621c6e936c46cd75170c8a51e3576d083715b8fe

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 29 21:56:35 2010 +0200

wineusr: Add WINEARCH description.

---

 en/wineusr-running.sgml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml
index 9c5ae2f..1ec71e9 100644
--- a/en/wineusr-running.sgml
+++ b/en/wineusr-running.sgml
@@ -279,6 +279,18 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
         </para>
       </sect2>
       <sect2>
+        <title>WINEARCH</title>
+        <para>
+          Specifies the Windows architecture to support. It can be set either to
+          win32 (support only 32-bit applications), or to win64
+          (support both 64-bit applications and 32-bit ones in WoW64 mode).
+          The  architecture  supported by a given Wine prefix is set at prefix
+          creation time and cannot be changed afterwards. When running with an
+          existing prefix, Wine will refuse to start if WINEARCH doesn't match
+          the prefix architecture.
+        </para>
+      </sect2>
+      <sect2>
         <title>OSS Audio Driver Settings</title>
         <para>
           If you are using the OSS audio driver and you have multiple devices,



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Jacek Caban : shdocvw: Store DocHost url on a regular heap.
Message-ID: <E1OTzux-0006C8-2S@wine.codeweavers.com>

Module: wine
Branch: master
Commit: aed47627f6e1db38b52874acb12b76ad701fe0ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aed47627f6e1db38b52874acb12b76ad701fe0ef

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Jun 29 21:03:22 2010 +0200

shdocvw: Store DocHost url on a regular heap.

---

 dlls/shdocvw/dochost.c  |    2 +-
 dlls/shdocvw/navigate.c |   40 +++++++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c
index 2196eb9..b3db012 100644
--- a/dlls/shdocvw/dochost.c
+++ b/dlls/shdocvw/dochost.c
@@ -820,5 +820,5 @@ void DocHost_Release(DocHost *This)
 
     ConnectionPointContainer_Destroy(&This->cps);
 
-    CoTaskMemFree(This->url);
+    heap_free(This->url);
 }
diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 3310cba..5166e97 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -111,6 +111,23 @@ static void set_status_text(BindStatusCallback *This, LPCWSTR str)
         IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str);
 }
 
+static HRESULT set_dochost_url(DocHost *This, const WCHAR *url)
+{
+    WCHAR *new_url;
+
+    if(url) {
+        new_url = heap_strdupW(url);
+        if(!new_url)
+            return E_OUTOFMEMORY;
+    }else {
+        new_url = NULL;
+    }
+
+    heap_free(This->url);
+    This->url = new_url;
+    return S_OK;
+}
+
 #define BINDSC_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface)
 
 static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface,
@@ -502,6 +519,7 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt
                               IBindStatusCallback *callback)
 {
     IUnknown *unk = NULL;
+    WCHAR *display_name;
     HRESULT hres;
 
     if(mon) {
@@ -512,10 +530,16 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt
             return hres;
     }
 
-    CoTaskMemFree(This->url);
-    hres = IMoniker_GetDisplayName(mon, 0, NULL, &This->url);
-    if(FAILED(hres))
+    hres = IMoniker_GetDisplayName(mon, 0, NULL, &display_name);
+    if(FAILED(hres)) {
         FIXME("GetDisplayName failed: %08x\n", hres);
+        return hres;
+    }
+
+    hres = set_dochost_url(This, display_name);
+    CoTaskMemFree(display_name);
+    if(FAILED(hres))
+        return hres;
 
     IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM,
                                  (IUnknown*)CLIENTSITE(This));
@@ -538,18 +562,12 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt
 static void html_window_navigate(DocHost *This, IHTMLPrivateWindow *window, BSTR url, BSTR headers, SAFEARRAY *post_data)
 {
     VARIANT headers_var, post_data_var;
-    WCHAR *new_url;
     BSTR empty_str;
-    DWORD size;
     HRESULT hres;
 
-    size = (strlenW(url)+1)*sizeof(WCHAR);
-    new_url = CoTaskMemAlloc(size);
-    if(!new_url)
+    hres = set_dochost_url(This, url);
+    if(FAILED(hres))
         return;
-    memcpy(new_url, url, size);
-    CoTaskMemFree(This->url);
-    This->url = new_url;
 
     empty_str = SysAllocStringLen(NULL, 0);
 



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Jacek Caban : shdocvw: Added IBindStatusCallback::OnProgress(
	BINDSTATUS_REDIRECTING) implementation.
Message-ID: <E1OTzux-0006CO-5C@wine.codeweavers.com>

Module: wine
Branch: master
Commit: df8f393b59823f646f4e53322ca82009d5146090
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=df8f393b59823f646f4e53322ca82009d5146090

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Jun 29 21:03:47 2010 +0200

shdocvw: Added IBindStatusCallback::OnProgress(BINDSTATUS_REDIRECTING) implementation.

---

 dlls/shdocvw/navigate.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 5166e97..6f05cf2 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -222,6 +222,8 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface,
           debugstr_w(szStatusText));
 
     switch(ulStatusCode) {
+    case BINDSTATUS_REDIRECTING:
+        return set_dochost_url(This->doc_host, szStatusText);
     case BINDSTATUS_BEGINDOWNLOADDATA:
         set_status_text(This, szStatusText); /* FIXME: "Start downloading from site: %s" */
         return S_OK;



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: user32/tests: Use if(0)
	instead of a comment to make sure code still compiles.
Message-ID: <E1OTzux-0006Ce-7L@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 50c94bf054f10ac879934ae1419ae60af9a1799e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=50c94bf054f10ac879934ae1419ae60af9a1799e

Author: Andr? Hentschel <nerv at dawncrow.de>
Date:   Tue Jun 29 21:56:45 2010 +0200

user32/tests: Use if(0) instead of a comment to make sure code still compiles.

---

 dlls/user32/tests/msg.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index eb27800..e0494ef 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -4717,10 +4717,10 @@ static void test_messages(void)
     ok(hwnd != 0, "Failed to create custom dialog window\n");
     ok_sequence(WmCreateCustomDialogSeq, "CreateCustomDialog", TRUE);
 
-    /*
+    if(0) {
     trace("testing scroll APIs on a visible dialog %p\n", hwnd);
     test_scroll_messages(hwnd);
-    */
+    }
 
     flush_sequence();
 



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Marko Nikolic : advapi32/tests: Removed sign comparison warning in
	test_LookupAccountName.
Message-ID: <E1OTzux-0006Cu-9c@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 29dd5235057bde5beba2807bb6876a7aa56d62b0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=29dd5235057bde5beba2807bb6876a7aa56d62b0

Author: Marko Nikolic <grkoma at gmail.com>
Date:   Tue Jun 29 23:23:37 2010 +0200

advapi32/tests: Removed sign comparison warning in test_LookupAccountName.

---

 dlls/advapi32/tests/security.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 1f1b697..cd4624a 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -1931,7 +1931,7 @@ static void test_LookupAccountName(void)
         ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain);
     }
     ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size);
-    ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size);
+    ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size);
     ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use);
     domain_size = domain_save;
     sid_size = sid_save;
@@ -1949,7 +1949,7 @@ static void test_LookupAccountName(void)
         ok(!lstrcmp(account, "Everyone"), "Expected Everyone, got %s\n", account);
         ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain);
         ok(domain_size == 0, "Expected 0, got %d\n", domain_size);
-        ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size);
+        ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size);
         ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeWellKnownGroup (%d), got %d\n", SidTypeWellKnownGroup, sid_use);
         domain_size = domain_save;
     }



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Andrew Nguyen : atl: Accept a NULL output container pointer in
	AtlAxAttachControl.
Message-ID: <E1OTzux-0006DC-Bf@wine.codeweavers.com>

Module: wine
Branch: master
Commit: e01794d4f7b3097b51d558452618f04175f672fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e01794d4f7b3097b51d558452618f04175f672fc

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Jun 29 09:06:35 2010 -0500

atl: Accept a NULL output container pointer in AtlAxAttachControl.

---

 dlls/atl/atl_ax.c          |    5 +-
 dlls/atl/tests/Makefile.in |    3 +-
 dlls/atl/tests/atl_ax.c    |  122 ++++++++++++++++++++++++++++++++++++++++++++
 dlls/atl/tests/module.c    |    1 -
 4 files changed, 127 insertions(+), 4 deletions(-)

diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c
index cf654e1..d9d60a5 100644
--- a/dlls/atl/atl_ax.c
+++ b/dlls/atl/atl_ax.c
@@ -1044,10 +1044,11 @@ HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUn
 
     TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer );
 
-    *ppUnkContainer = NULL;
+    if (!pControl)
+        return E_INVALIDARG;
 
     hr = IOCS_Create( hWnd, pControl, &pUnkContainer );
-    if ( SUCCEEDED( hr ) )
+    if ( SUCCEEDED( hr ) && ppUnkContainer)
     {
         *ppUnkContainer = (IUnknown*) pUnkContainer;
     }
diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in
index b9752d4..98d9b03 100644
--- a/dlls/atl/tests/Makefile.in
+++ b/dlls/atl/tests/Makefile.in
@@ -3,9 +3,10 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = atl.dll
-IMPORTS   = atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
+IMPORTS   = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
+	atl_ax.c \
 	module.c
 
 @MAKE_TEST_RULES@
diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c
new file mode 100644
index 0000000..8b9966c
--- /dev/null
+++ b/dlls/atl/tests/atl_ax.c
@@ -0,0 +1,122 @@
+/*
+ * Unit tests for Active Template Library ActiveX functions
+ *
+ * Copyright 2010 Andrew Nguyen
+ *
+ * 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 <stdarg.h>
+#include <stdio.h>
+
+#define COBJMACROS
+
+#include <wine/test.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wingdi.h>
+#include <winnls.h>
+#include <winerror.h>
+#include <winnt.h>
+#include <wtypes.h>
+#include <olectl.h>
+#include <ocidl.h>
+#include <exdisp.h>
+
+HRESULT WINAPI AtlAxAttachControl(IUnknown *, HWND, IUnknown **);
+
+static ATOM register_class(void)
+{
+    WNDCLASSA wndclassA;
+
+    wndclassA.style = 0;
+    wndclassA.lpfnWndProc = DefWindowProc;
+    wndclassA.cbClsExtra = 0;
+    wndclassA.cbWndExtra = 0;
+    wndclassA.hInstance = GetModuleHandleA(NULL);
+    wndclassA.hIcon = NULL;
+    wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW);
+    wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
+    wndclassA.lpszMenuName = NULL;
+    wndclassA.lpszClassName = "WineAtlTestClass";
+
+    return RegisterClassA(&wndclassA);
+}
+
+static void test_AtlAxAttachControl(void)
+{
+    HWND hwnd = CreateWindowA("WineAtlTestClass", "Wine ATL Test Window", 0,
+                              CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+                              CW_USEDEFAULT, NULL, NULL, NULL, NULL);
+    HRESULT hr;
+    IUnknown *pObj, *pContainer;
+
+    hr = AtlAxAttachControl(NULL, NULL, NULL);
+    ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr);
+
+    pContainer = (IUnknown *)0xdeadbeef;
+    hr = AtlAxAttachControl(NULL, NULL, &pContainer);
+    ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr);
+    ok(pContainer == (IUnknown *)0xdeadbeef,
+       "Expected the output container pointer to be untouched, got %p\n", pContainer);
+
+    hr = AtlAxAttachControl(NULL, hwnd, NULL);
+    ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr);
+
+    hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER,
+                          &IID_IOleObject, (void **)&pObj);
+    ok(hr == S_OK, "Expected CoCreateInstance to return S_OK, got 0x%08x\n", hr);
+
+    if (FAILED(hr))
+    {
+        skip("Couldn't obtain a test IOleObject instance\n");
+        return;
+    }
+
+    hr = AtlAxAttachControl(pObj, NULL, NULL);
+    todo_wine
+    ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr);
+
+    pContainer = (IUnknown *)0xdeadbeef;
+    hr = AtlAxAttachControl(pObj, NULL, &pContainer);
+    todo_wine
+    ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr);
+    ok(pContainer != (IUnknown *)0xdeadbeef &&
+       pContainer != NULL,
+       "Expected the output container pointer to be initialized to non-NULL, got %p\n", pContainer);
+
+    if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL)
+        IUnknown_Release(pContainer);
+
+    hr = AtlAxAttachControl(pObj, hwnd, NULL);
+    ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr);
+
+    IUnknown_Release(pObj);
+
+    DestroyWindow(hwnd);
+}
+
+START_TEST(atl_ax)
+{
+    if (!register_class())
+        return;
+
+    CoInitialize(NULL);
+
+    test_AtlAxAttachControl();
+
+    CoUninitialize();
+}
diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c
index 294d87b..1b21f6e 100644
--- a/dlls/atl/tests/module.c
+++ b/dlls/atl/tests/module.c
@@ -32,7 +32,6 @@
 #include <winnls.h>
 #include <winerror.h>
 #include <winnt.h>
-#include <initguid.h>
 #include <wtypes.h>
 #include <olectl.h>
 #include <ocidl.h>



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Alexandre Julliard : ntdll/tests: Add a test for the exception
	resulting from an icebp instruction.
Message-ID: <E1OTzux-0006DT-DY@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f712af41f5b82315e0966d8a8b1405a649f2c63f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f712af41f5b82315e0966d8a8b1405a649f2c63f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 30 11:55:32 2010 +0200

ntdll/tests: Add a test for the exception resulting from an icebp instruction.

---

 dlls/ntdll/tests/exception.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 598544e..701b6bb 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -203,6 +203,9 @@ static const struct exception
     { { 0x1e, 0x06, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, 0xfa, 0x07, 0x1f, 0xc3 },
           /* push %ds; push %es; xorl %eax,%eax; mov %ax,%ds; mov %ax,%es; cli; pop %es; pop %ds; ret */
       8, 1, TRUE, STATUS_PRIVILEGED_INSTRUCTION, 0 },
+
+    { { 0xf1, 0x90, 0xc3 },  /* icebp; nop; ret */
+      1, 1, FALSE, STATUS_SINGLE_STEP, 0 },
 };
 
 static int got_exception;



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Alexandre Julliard : gdiplus/tests: Comment out a test that corrupts
	the stack on Vista.
Message-ID: <E1OTzux-0006Dj-FR@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4b9258d165d0a7c745814d24bf404b477cee829e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4b9258d165d0a7c745814d24bf404b477cee829e

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 30 14:17:13 2010 +0200

gdiplus/tests: Comment out a test that corrupts the stack on Vista.

---

 dlls/gdiplus/tests/pen.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c
index 0bdf280..b742118 100644
--- a/dlls/gdiplus/tests/pen.c
+++ b/dlls/gdiplus/tests/pen.c
@@ -225,9 +225,15 @@ static void test_dasharray(void)
 
     /* Try to set with count = 0. */
     GdipSetPenDashStyle(pen, DashStyleDot);
+    if (0)  /* corrupts stack on 64-bit Vista */
+    {
     status = GdipSetPenDashArray(pen, dashes, 0);
     ok(status == OutOfMemory || status == InvalidParameter,
        "Expected OutOfMemory or InvalidParameter, got %.8x\n", status);
+    }
+    status = GdipSetPenDashArray(pen, dashes, -1);
+    ok(status == OutOfMemory || status == InvalidParameter,
+       "Expected OutOfMemory or InvalidParameter, got %.8x\n", status);
     GdipGetPenDashStyle(pen, &style);
     expect(DashStyleDot, style);
 



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Alexandre Julliard : server: Return the total length of the target in
	query_symlink.
Message-ID: <E1OTzux-0006E1-Ho@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 4c1f36cb68d744fe5ed3d52a4ea531b72b1dcac3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c1f36cb68d744fe5ed3d52a4ea531b72b1dcac3

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 30 16:11:03 2010 +0200

server: Return the total length of the target in query_symlink.

---

 include/wine/server_protocol.h |    4 +++-
 server/protocol.def            |    1 +
 server/request.h               |    3 ++-
 server/symlink.c               |    1 +
 server/trace.c                 |    4 +++-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 20bb4a2..1a78bc2 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -4395,7 +4395,9 @@ struct query_symlink_request
 struct query_symlink_reply
 {
     struct reply_header __header;
+    data_size_t    total;
     /* VARARG(target_name,unicode_str); */
+    char __pad_12[4];
 };
 
 
@@ -5485,6 +5487,6 @@ union generic_reply
     struct set_cursor_reply set_cursor_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 401
+#define SERVER_PROTOCOL_VERSION 402
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/protocol.def b/server/protocol.def
index e4e8ec3..e41cd18 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3057,6 +3057,7 @@ enum message_type
 @REQ(query_symlink)
     obj_handle_t   handle;        /* handle to the symlink */
 @REPLY
+    data_size_t    total;         /* total needed size for name */
     VARARG(target_name,unicode_str); /* target name */
 @END
 
diff --git a/server/request.h b/server/request.h
index ef6adea..722fc25 100644
--- a/server/request.h
+++ b/server/request.h
@@ -1980,7 +1980,8 @@ C_ASSERT( FIELD_OFFSET(struct open_symlink_reply, handle) == 8 );
 C_ASSERT( sizeof(struct open_symlink_reply) == 16 );
 C_ASSERT( FIELD_OFFSET(struct query_symlink_request, handle) == 12 );
 C_ASSERT( sizeof(struct query_symlink_request) == 16 );
-C_ASSERT( sizeof(struct query_symlink_reply) == 8 );
+C_ASSERT( FIELD_OFFSET(struct query_symlink_reply, total) == 8 );
+C_ASSERT( sizeof(struct query_symlink_reply) == 16 );
 C_ASSERT( FIELD_OFFSET(struct get_object_info_request, handle) == 12 );
 C_ASSERT( sizeof(struct get_object_info_request) == 16 );
 C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, access) == 8 );
diff --git a/server/symlink.c b/server/symlink.c
index 2ec7ed5..2330fde 100644
--- a/server/symlink.c
+++ b/server/symlink.c
@@ -214,6 +214,7 @@ DECL_HANDLER(query_symlink)
                                                 SYMBOLIC_LINK_QUERY, &symlink_ops );
     if (!symlink) return;
 
+    reply->total = symlink->len;
     if (get_reply_max_size() < symlink->len)
         set_error( STATUS_BUFFER_TOO_SMALL );
     else
diff --git a/server/trace.c b/server/trace.c
index ec87dab..fd2318e 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -3594,7 +3594,8 @@ static void dump_query_symlink_request( const struct query_symlink_request *req
 
 static void dump_query_symlink_reply( const struct query_symlink_reply *req )
 {
-    dump_varargs_unicode_str( " target_name=", cur_size );
+    fprintf( stderr, " total=%u", req->total );
+    dump_varargs_unicode_str( ", target_name=", cur_size );
 }
 
 static void dump_get_object_info_request( const struct get_object_info_request *req )
@@ -4607,6 +4608,7 @@ static const struct
     { "GENERIC_NOT_MAPPED",          STATUS_GENERIC_NOT_MAPPED },
     { "HANDLES_CLOSED",              STATUS_HANDLES_CLOSED },
     { "HANDLE_NOT_CLOSABLE",         STATUS_HANDLE_NOT_CLOSABLE },
+    { "HOST_UNREACHABLE",            STATUS_HOST_UNREACHABLE },
     { "ILLEGAL_FUNCTION",            STATUS_ILLEGAL_FUNCTION },
     { "INSTANCE_NOT_AVAILABLE",      STATUS_INSTANCE_NOT_AVAILABLE },
     { "INSUFFICIENT_RESOURCES",      STATUS_INSUFFICIENT_RESOURCES },



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Alexandre Julliard : ntdll: Append a terminating null and return the
	correct length in NtQuerySymbolicLinkObject .
Message-ID: <E1OTzux-0006EI-Kb@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6df7e7b94362f874a5b5a46cda0eead8f517c651
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6df7e7b94362f874a5b5a46cda0eead8f517c651

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 30 16:11:42 2010 +0200

ntdll: Append a terminating null and return the correct length in NtQuerySymbolicLinkObject.

---

 dlls/ntdll/om.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index c5d9b84..0e64ddd 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -634,33 +634,36 @@ NTSTATUS WINAPI NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,IN ACC
  *  ZwQuerySymbolicLinkObject	[NTDLL.@]
  *
  * Query a namespace symbolic link object target name.
- * 
+ *
  * PARAMS
- *  LinkHandle     [I] Handle to a symbolic link object
- *  LinkTarget     [O] Destination for the symbolic link target
- *  ReturnedLength [O] Size of returned data
+ *  handle     [I] Handle to a symbolic link object
+ *  target     [O] Destination for the symbolic link target
+ *  length     [O] Size of returned data
  *
  * RETURNS
  *  Success: ERROR_SUCCESS.
  *  Failure: An NTSTATUS error code.
  */
-NTSTATUS WINAPI NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, IN OUT PUNICODE_STRING LinkTarget,
-                                          OUT PULONG ReturnedLength OPTIONAL)
+NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target, PULONG length )
 {
     NTSTATUS ret;
-    TRACE("(%p,%p,%p)\n", LinkHandle, LinkTarget, ReturnedLength);
 
-    if (!LinkTarget) return STATUS_ACCESS_VIOLATION;
+    TRACE("(%p,%p,%p)\n", handle, target, length );
+
+    if (!target) return STATUS_ACCESS_VIOLATION;
 
     SERVER_START_REQ(query_symlink)
     {
-        req->handle = wine_server_obj_handle( LinkHandle );
-        wine_server_set_reply( req, LinkTarget->Buffer, LinkTarget->MaximumLength );
+        req->handle = wine_server_obj_handle( handle );
+        if (target->MaximumLength >= sizeof(WCHAR))
+            wine_server_set_reply( req, target->Buffer, target->MaximumLength - sizeof(WCHAR) );
         if (!(ret = wine_server_call( req )))
         {
-            LinkTarget->Length = wine_server_reply_size(reply);
-            if (ReturnedLength) *ReturnedLength = LinkTarget->Length;
+            target->Length = wine_server_reply_size(reply);
+            target->Buffer[target->Length / sizeof(WCHAR)] = 0;
+            if (length) *length = reply->total + sizeof(WCHAR);
         }
+        else if (length && ret == STATUS_BUFFER_TOO_SMALL) *length = reply->total + sizeof(WCHAR);
     }
     SERVER_END_REQ;
     return ret;



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Alexandre Julliard : ntdll/tests: Add some tests for
	NtQuerySymbolicLinkObject.
Message-ID: <E1OTzux-0006EZ-MM@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 929ba3f11dc5c37ddbd37ed97119367cb149b0cc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=929ba3f11dc5c37ddbd37ed97119367cb149b0cc

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 30 16:11:55 2010 +0200

ntdll/tests: Add some tests for NtQuerySymbolicLinkObject.

---

 dlls/ntdll/tests/om.c |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index d052c35..24339bb 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -44,6 +44,7 @@ static NTSTATUS (WINAPI *pNtOpenDirectoryObject)(PHANDLE, ACCESS_MASK, POBJECT_A
 static NTSTATUS (WINAPI *pNtCreateDirectoryObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
 static NTSTATUS (WINAPI *pNtOpenSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
 static NTSTATUS (WINAPI *pNtCreateSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PUNICODE_STRING);
+static NTSTATUS (WINAPI *pNtQuerySymbolicLinkObject)(HANDLE,PUNICODE_STRING,PULONG);
 static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG);
 
 
@@ -402,13 +403,44 @@ static void test_directory(void)
     is_nt4 = (status == STATUS_OBJECT_NAME_NOT_FOUND);  /* nt4 doesn't have Local\\ symlink */
     if (!is_nt4)
     {
+        WCHAR buffer[256];
+        ULONG len, full_len;
+
         ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status);
         pRtlFreeUnicodeString(&str);
         InitializeObjectAttributes(&attr, &str, 0, dir, NULL);
         pRtlCreateUnicodeStringFromAsciiz(&str, "one more level");
         DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH)
         pRtlFreeUnicodeString(&str);
-        pNtClose(h);
+
+        str.Buffer = buffer;
+        str.MaximumLength = sizeof(buffer);
+        len = 0xdeadbeef;
+        memset( buffer, 0xaa, sizeof(buffer) );
+        status = pNtQuerySymbolicLinkObject( dir, &str, &len );
+        ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status );
+        full_len = str.Length + sizeof(WCHAR);
+        ok( len == full_len, "bad length %u/%u\n", len, full_len );
+        ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" );
+
+        str.MaximumLength = str.Length;
+        len = 0xdeadbeef;
+        status = pNtQuerySymbolicLinkObject( dir, &str, &len );
+        ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status );
+        ok( len == full_len, "bad length %u/%u\n", len, full_len );
+
+        str.MaximumLength = 0;
+        len = 0xdeadbeef;
+        status = pNtQuerySymbolicLinkObject( dir, &str, &len );
+        ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status );
+        ok( len == full_len, "bad length %u/%u\n", len, full_len );
+
+        str.MaximumLength = str.Length + sizeof(WCHAR);
+        len = 0xdeadbeef;
+        status = pNtQuerySymbolicLinkObject( dir, &str, &len );
+        ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status );
+        ok( len == full_len, "bad length %u/%u\n", len, full_len );
+
         pNtClose(dir);
     }
 
@@ -710,6 +742,7 @@ START_TEST(om)
     pNtCreateDirectoryObject= (void *)GetProcAddress(hntdll, "NtCreateDirectoryObject");
     pNtOpenSymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtOpenSymbolicLinkObject");
     pNtCreateSymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtCreateSymbolicLinkObject");
+    pNtQuerySymbolicLinkObject  = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject");
     pNtCreateSemaphore      =  (void *)GetProcAddress(hntdll, "NtCreateSemaphore");
     pNtCreateTimer          =  (void *)GetProcAddress(hntdll, "NtCreateTimer");
     pNtCreateSection        =  (void *)GetProcAddress(hntdll, "NtCreateSection");



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Mikko Rasa : ddraw: Grow index buffer as needed.
Message-ID: <E1OTzux-0006Ey-Op@wine.codeweavers.com>

Module: wine
Branch: master
Commit: f18cb4c2f45878c40bbc27f826c4d97ddba304a0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f18cb4c2f45878c40bbc27f826c4d97ddba304a0

Author: Mikko Rasa <tdb at tdb.fi>
Date:   Wed Jun 30 11:40:29 2010 +0300

ddraw: Grow index buffer as needed.

---

 dlls/ddraw/device.c |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index aba7bdc..6b00d4f 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -4299,6 +4299,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
     DWORD stride = get_flexible_vertex_size(vb->fvf);
     WORD *LockedIndices;
     HRESULT hr;
+    WINED3DBUFFER_DESC desc;
 
     TRACE("(%p)->(%08x,%p,%d,%d,%p,%d,%08x)\n", This, PrimitiveType, vb, StartVertex, NumVertices, Indices, IndexCount, Flags);
 
@@ -4320,6 +4321,37 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
         return hr;
     }
 
+    /* check that the buffer is large enough to hold the indices,
+     * reallocate if necessary.
+     */
+    hr = IWineD3DBuffer_GetDesc(This->indexbuffer, &desc);
+    if(desc.Size < IndexCount * sizeof(WORD))
+    {
+        UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD));
+        IWineD3DBuffer *buffer;
+        IUnknown *parent;
+
+        TRACE("Growing index buffer to %u bytes\n", size);
+
+        IWineD3DBuffer_GetParent(This->indexbuffer, &parent);
+        hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, size,
+                WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, &buffer, parent,
+                &ddraw_null_wined3d_parent_ops);
+        if(hr != D3D_OK)
+        {
+            ERR("(%p) IWineD3DDevice::CreateIndexBuffer failed with hr = %08x\n", This, hr);
+            IParent_Release(parent);
+            LeaveCriticalSection(&ddraw_cs);
+            return hr;
+        }
+
+        IWineD3DBuffer_Release(This->indexbuffer);
+        This->indexbuffer = buffer;
+
+        ((IParentImpl *)parent)->child = (IUnknown *)buffer;
+        IParent_Release(parent);
+    }
+
     /* copy the index stream into the index buffer.
      * A new IWineD3DDevice method could be created
      * which takes an user pointer containing the indices
@@ -4331,7 +4363,6 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
                             IndexCount * sizeof(WORD),
                             (BYTE **) &LockedIndices,
                             0 /* Flags */);
-    assert(IndexCount < 0x100000);
     if(hr != D3D_OK)
     {
         ERR("(%p) IWineD3DBuffer::Map failed with hr = %08x\n", This, hr);



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: =?UTF-8?Q?Alexander=20Nicolaysen=20?==?UTF-8?Q?S=C3=B8rnes=20?=: wordpad:
	=?UTF-8?Q?=20Update=20Norwegian=20Bok?==?UTF-8?Q?m=C3=A5l=20translation?=.
Message-ID: <E1OTzux-0006FE-Qi@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 6cf3823a8cb6c7fbd119b77642ed9d6c10618427
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6cf3823a8cb6c7fbd119b77642ed9d6c10618427

Author: Alexander Nicolaysen S?rnes <alex at thehandofagony.com>
Date:   Wed Jun 30 16:08:13 2010 +0200

wordpad: Update Norwegian Bokm?l translation.

---

 programs/wordpad/No.rc |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc
index 7fa0c84..592f93b 100644
--- a/programs/wordpad/No.rc
+++ b/programs/wordpad/No.rc
@@ -128,7 +128,7 @@ BEGIN
         MENUITEM "Fuchsia"    ID_COLOR_FUCHSIA
         MENUITEM "Aqua"       ID_COLOR_AQUA
         MENUITEM "Hvit"       ID_COLOR_WHITE
-        MENUITEM "Automatic"  ID_COLOR_AUTOMATIC
+        MENUITEM "Automatisk" ID_COLOR_AUTOMATIC
     END
 END
 
@@ -192,7 +192,7 @@ Caption ""
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Linjebryting", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Ingen linjebryting", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Verkt?ylinjer", -1, 150, 10, 120, 85
@@ -247,6 +247,12 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Lukk"
+    STRING_PREVIEW_PAGE,             "Side"
+    STRING_PREVIEW_PAGES,            "Sider"
+    STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "inch"
+    STRING_UNITS_PT,                 "pt"
 END
 
 STRINGTABLE DISCARDABLE
@@ -259,7 +265,7 @@ BEGIN
                                  "vil f?re til at all formatering g?r tapt. Er du " \
                                  "sikker p? at du vil fortsette?"
     STRING_INVALID_NUMBER,       "Ugyldig tallformat"
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage-dokumenter st?ttes ikke"
     STRING_WRITE_FAILED,              "Klarte ikke lagre filen."
     STRING_WRITE_ACCESS_DENIED,       "Du har ikke tilgang til ? lagre filen."
     STRING_OPEN_FAILED,               "Klarte ikke ?pne filen."



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: =?UTF-8?Q?Alexander=20Nicolaysen=20?==?UTF-8?Q?S=C3=B8rnes=20?=: mapi32:
	=?UTF-8?Q?=20Add=20Norwegian=20Bokm=C3=A5?==?UTF-8?Q?l=20translation?=.
Message-ID: <E1OTzux-0006FV-Sd@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 7f0273a98f1aeb29d621d99df073c242213aff2f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7f0273a98f1aeb29d621d99df073c242213aff2f

Author: Alexander Nicolaysen S?rnes <alex at thehandofagony.com>
Date:   Wed Jun 30 16:11:21 2010 +0200

mapi32: Add Norwegian Bokm?l translation.

---

 dlls/mapi32/Makefile.in |    1 +
 dlls/mapi32/No.rc       |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 41140e5..6197cd5 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -25,6 +25,7 @@ RC_SRCS = \
 	Ko.rc \
 	Lt.rc \
 	Nl.rc \
+	No.rc \
 	Pl.rc \
 	Pt.rc \
 	Ro.rc \
diff --git a/dlls/mapi32/No.rc b/dlls/mapi32/No.rc
new file mode 100644
index 0000000..5e4d8c5
--- /dev/null
+++ b/dlls/mapi32/No.rc
@@ -0,0 +1,32 @@
+/*
+* MAPI32 Norwegian Bokm?l resources
+*
+* Copyright 2010 Alexander N. S?rnes <alex at thehandofagony.com>
+*
+* 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"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+
+STRINGTABLE
+{
+   IDS_NO_MAPI_CLIENT, "Klarte ikke sende e-post fordi en MAPI-klient ikke er installert."
+   IDS_SEND_MAIL, "Send e-post"
+}



From julliard at winehq.org  Wed Jun 30 11:13:43 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:43 -0500
Subject: Vitaly Lipatov : kernel32: Add Russian translation.
Message-ID: <E1OTzux-0006Fo-Vm@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 43ed0c177cc93985f701ec694e789d5343f13c06
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=43ed0c177cc93985f701ec694e789d5343f13c06

Author: Vitaly Lipatov <lav at etersoft.ru>
Date:   Sat Jun 26 18:08:56 2010 +0400

kernel32: Add Russian translation.

---

 .gitignore                      |    1 +
 dlls/kernel32/Makefile.in       |    3 +-
 dlls/kernel32/nls/winerr_rus.mc | 3736 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 3739 insertions(+), 1 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=43ed0c177cc93985f701ec694e789d5343f13c06


From julliard at winehq.org  Wed Jun 30 11:13:44 2010
From: julliard at winehq.org (Alexandre Julliard)
Date: Wed, 30 Jun 2010 11:13:44 -0500
Subject: Alexandre Julliard : configure: Disable clean and depend rules for
	disabled top-level directories.
Message-ID: <E1OTzuy-0006G5-2W@wine.codeweavers.com>

Module: wine
Branch: master
Commit: 9bdd0272ce45b7d720b1b7d0cf90c744a967cc4a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9bdd0272ce45b7d720b1b7d0cf90c744a967cc4a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 30 17:34:20 2010 +0200

configure: Disable clean and depend rules for disabled top-level directories.

---

 aclocal.m4 |    7 ++++---
 configure  |    9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 69d0e1a..a77f15e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -183,9 +183,10 @@ wine_fn_config_makefile ()
 {
     ac_dir=$[1]
     ac_enable=$[2]
-    wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
+    AS_VAR_IF([$ac_enable],[no],[return 0])
 
-    AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+    wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all: $ac_dir
 .PHONY: $ac_dir
 $ac_dir: $ac_dir/Makefile dummy
@@ -197,7 +198,7 @@ install-lib:: $ac_dir
 install-dev:: $ac_dir
 	@cd $ac_dir && \$(MAKE) install-dev
 uninstall:: $ac_dir/Makefile
-	@cd $ac_dir && \$(MAKE) uninstall"])
+	@cd $ac_dir && \$(MAKE) uninstall"
 }
 
 wine_fn_config_lib ()
diff --git a/configure b/configure
index 530c551..4847297 100755
--- a/configure
+++ b/configure
@@ -13989,13 +13989,13 @@ wine_fn_config_makefile ()
 {
     ac_dir=$1
     ac_enable=$2
-    wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
-
     eval as_val=\$$ac_enable
    if test "x$as_val" = x""no; then :
+  return 0
+fi
 
-else
-  wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+    wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all: $ac_dir
 .PHONY: $ac_dir
 $ac_dir: $ac_dir/Makefile dummy
@@ -14008,7 +14008,6 @@ install-dev:: $ac_dir
 	@cd $ac_dir && \$(MAKE) install-dev
 uninstall:: $ac_dir/Makefile
 	@cd $ac_dir && \$(MAKE) uninstall"
-fi
 }
 
 wine_fn_config_lib ()