gmane.comp.emulators.wine.patches

[PATCH 2/2] user32: Don't release capture of child window whendisabling parent window.(try 4)

Guo Jian — 2013-05-19T07:07:20

Fixing bug http://bugs.winehq.org/show_bug.cgi?id=33542

---
 dlls/user32/tests/win.c | 4 ++--
 dlls/user32/win.c       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 2836882..fb32054 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
< at >< at > -2987,13 +2987,13 < at >< at > static void test_capture_3(HWND hwnd1, HWND hwnd2)
     ret = ReleaseCapture();
     ok (ret, "releasecapture did not return TRUE after second try.\n");
 
-    child = CreateWindowExA( 0, "button", NULL, WS_CHILD, 0, 0, 0, 0, hwnd1, 0, 0, NULL );
+    child = CreateWindowExA(0, "button", NULL, WS_CHILD, 0, 0, 0, 0, hwnd1, 0, 0, NULL);
     assert(child);
     SetCapture(child);
     check_wnd_state(hwnd1, hwnd1, hwnd1, child);
 
     EnableWindow(hwnd1, FALSE);
-    todo_wine ok(GetCapture() != NULL, "capture in child window should not be released.\n");
+    ok(GetCapture() != NULL, "capture in child window should not be released.\n");
 
     EnableWindow(hwnd

[PATCH 1/2] user32/tests: Added capture test for child window whenparent window is disabled.(try 5)

Guo Jian — 2013-05-19T07:07:19

Hi,
This time the test is simplified and combined to test_capture_3. I found
it no need to test for WM_LBUTTONUP here once ensured it's captured.
Thank you.

---
 dlls/user32/tests/win.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 37d210e..2836882 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
< at >< at > -2965,6 +2965,7 < at >< at > static void test_capture_2(void)
 static void test_capture_3(HWND hwnd1, HWND hwnd2)
 {
     BOOL ret;
+    HWND child;
 
     ShowWindow(hwnd1, SW_HIDE);
     ShowWindow(hwnd2, SW_HIDE);
< at >< at > -2985,6 +2986,17 < at >< at > static void test_capture_3(HWND hwnd1, HWND hwnd2)
     ok (ret, "releasecapture did not return TRUE.\n");
     ret = ReleaseCapture();
     ok (ret, "releasecapture did not return TRUE after second try.\n");
+
+    child = CreateWindowExA( 0, "button", NULL, WS_CHILD, 0, 0, 0, 0, hwnd1, 0, 0, NULL );
+    assert(child);
+    SetCapture(child);
+    check_wnd_state(hwnd1, hwnd1, hwnd1, child);

inetcpl.cpl: Add stub for LaunchConnectionDialog

André Hentschel — 2013-05-18T14:12:05

For Intel Beacon Mountain 0.5
---
 dlls/inetcpl.cpl/inetcpl.c        | 12 +++++++++++-
 dlls/inetcpl.cpl/inetcpl.cpl.spec |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c
index e11bf85..7a5ba07 100644
--- a/dlls/inetcpl.cpl/inetcpl.c
+++ b/dlls/inetcpl.cpl/inetcpl.c
< at >< at > -212,11 +212,21 < at >< at > BOOL WINAPI LaunchInternetControlPanel(HWND parent)
 }
 
 /*********************************************************************
+ * LaunchConnectionDialog (inetcpl.< at >)
+ *
+ */
+BOOL WINAPI LaunchConnectionDialog(HWND hParent)
+{
+    FIXME("(%p): stub\n", hParent);
+    return FALSE;
+}
+
+/*********************************************************************
  * LaunchInternetControlPanel (inetcpl.< at >)
  *
  */
 BOOL WINAPI LaunchPrivacyDialog(HWND hParent)
 {
-    FIXME(": stub\n");
+    FIXME("(%p): stub\n", hParent);
     return FALSE;
 }
diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec
index 2e59562..bd56ae9

[PATCH] ieframe: Add a IServiceProvider stub to IBindStatusCallback

Detlef Riekenberg — 2013-05-18T13:11:38

--
By by ... Detlef

---
 dlls/ieframe/navigate.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index d730b10..65ab16d 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
< at >< at > -40,6 +40,7 < at >< at > typedef struct {
     IBindStatusCallback  IBindStatusCallback_iface;
     IHttpNegotiate       IHttpNegotiate_iface;
     IHttpSecurity        IHttpSecurity_iface;
+    IServiceProvider     IServiceProvider_iface;
 
     LONG ref;
 
< at >< at > -172,6 +173,9 < at >< at > static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa
     }else if(IsEqualGUID(&IID_IHttpSecurity, riid)) {
         TRACE("(%p)->(IID_IHttpSecurity %p)\n", This, ppv);
         *ppv = &This->IHttpSecurity_iface;
+    }else if(IsEqualGUID(&IID_IServiceProvider, riid)) {
+        TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv);
+        *ppv = &This->IServiceProvider_iface;;
     }else {
         *ppv = N

d3drm/tests: Fix compilation on systems that don't support namelessunions.

Francois Gouget — 2013-05-18T08:40:53

---
 dlls/d3drm/tests/d3drm.c |   48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index f82af5f..31ba044 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
< at >< at > -856,41 +856,41 < at >< at > static void test_Face(void)
         ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count);
         ok(U1(v2[0]).x == U1(v1[0]).x, "Wrong component v2[0].x = %f (expected %f)\n",
            U1(v2[0]).x, U1(v1[0]).x);
-        ok(U1(v2[0]).y == U1(v1[0]).y, "Wrong component v2[0].y = %f (expected %f)\n",
-           U1(v2[0]).y, U1(v1[0]).y);
-        ok(U1(v2[0]).z == U1(v1[0]).z, "Wrong component v2[0].z = %f (expected %f)\n",
-           U1(v2[0]).z, U1(v1[0]).z);
+        ok(U2(v2[0]).y == U2(v1[0]).y, "Wrong component v2[0].y = %f (expected %f)\n",
+           U2(v2[0]).y, U2(v1[0]).y);
+        ok(U3(v2[0]).z == U3(v1[0]).z, "Wrong component v2[0].z = %f (expected %f)\n",
+

msi: remove trailing spaces from command line property name

Daniel Jeliński — 2013-05-17T21:27:26

From 253bd4bbd0a91d11b632ad5959c455fca0db3be4 Mon Sep 17 00:00:00 2001
From: Daniel Jelinski <djelinski1< at >gmail.com>
Date: Fri, 17 May 2013 23:24:10 +0200
Subject: msi: remove trailing spaces from command line property name

Fixes bug 33115
---
 dlls/msi/action.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index f519f4b..e6422a7 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
< at >< at > -332,6 +332,8 < at >< at > UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine,
         len = ptr2 - ptr;
         if (!len) return ERROR_INVALID_COMMAND_LINE;
 
+        while (ptr[len - 1] == ' ') len--;
+
         prop = msi_alloc( (len + 1) * sizeof(WCHAR) );
         memcpy( prop, ptr, len * sizeof(WCHAR) );
         prop[len] = 0;

[2/2]gdi32: GetGlyphIndices does substitute glyph

Aric Stewart — 2013-05-17T19:32:39

---
 dlls/gdi32/freetype.c   | 2 ++
 dlls/gdi32/tests/font.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

[1/2]gdi32/test: update the vertical font to be a proper windowsvertical font

Aric Stewart — 2013-05-17T19:32:23

---
 dlls/gdi32/tests/font.c       |   16 +-
 dlls/gdi32/tests/vertical.sfd | 1058 ++++++++++++++++++++++++++++++++++++-----
 dlls/gdi32/tests/vertical.ttf |  Bin 2372 -> 3560 bytes
 3 files changed, 958 insertions(+), 116 deletions(-)

po: Improve German translation

André Hentschel — 2013-05-17T15:57:25

---
 po/de.po |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[PATCH 2/2]vbscript: Implemented builtin function CBool

Zhan Jianyu — 2013-05-17T14:53:27

Implement builtin CBool, with a introduction of helper function, return_bool.
And some tests are also added,  it has passed the testbot testing.

---
 dlls/vbscript/global.c      |   36 ++++++++++++++++++++++++++++++++++--
 dlls/vbscript/tests/api.vbs |    8 ++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)


--

Regards,
Zhan Jianyu

[PATCH 1/2]vbscript: Implemented builtin function CInt

Zhan Jianyu — 2013-05-17T14:53:21

This patch is built based on Jaceks's newly-submitted patch:

    commit 48a862306288d69d3623d5ecdc0f5a5a40addafe
    ( vbscript: Round half to even in to_int)

Thanks, Jacek. :-)

With his patch, CInt could be implementd in a clean way, without
any introduced helper function.

This patch also add tests for any corner cases, and it has passed testbot's
testing.

---
 dlls/vbscript/global.c      |   14 ++++++++++++--
 dlls/vbscript/tests/api.vbs |   23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)


--

Regards,
Zhan Jianyu

[PATCH] wined3d: Only display a fixme when software processing isrequested in wined3d_device_set_software_vertex_processing. (try 2)

Christian Costa — 2013-05-17T13:34:37

Also remove fixme in wined3d_device_get_software_
vertex_processing since it does what it is supposed to do.

Try 2:
  - fix typo

[PATCH 5/5] mshtml: Added whitespace parser tests.

Jacek Caban — 2013-05-17T10:35:08

---
 dlls/mshtml/tests/jstest.html | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

[PATCH 4/5] mshtml: Added parsing custom tag name tests.

Jacek Caban — 2013-05-17T10:34:59

---
 dlls/mshtml/tests/jstest.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

[PATCH 3/5] mshtml: Added more parser compatMode tests.

Jacek Caban — 2013-05-17T10:34:45

---
 dlls/mshtml/tests/dom.c | 1 +
 1 file changed, 1 insertion(+)

[PATCH 2/5] mshtml: Wine Gecko 2.21 release.

Jacek Caban — 2013-05-17T10:34:34

---
 dlls/appwiz.cpl/addons.c |   6 +-
 dlls/mshtml/htmlelem2.c  |   8 +-
 dlls/mshtml/nsiface.idl  | 217
+++++++++++++++++++++++++++++++----------------
 dlls/mshtml/nsio.c       |  52 ++++++++++--
 dlls/mshtml/propbag.c    |   8 +-
 5 files changed, 204 insertions(+), 87 deletions(-)

[PATCH 1/5] winegecko.php: Added 2.21 release.

Jacek Caban — 2013-05-17T10:34:15

---
 winegecko.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

oledb32: Support VT_NULL when converting to DBTYPE_BSTR

Alistair Leslie-Hughes — 2013-05-17T07:38:16

Hi,


Changelog:
     oledb32:  Support VT_NULL when converting to DBTYPE_BSTR


Best Regards
  Alistair Leslie-Hughes
From: Alistair Leslie-Hughes <leslie_alistair< at >hotmail.com>
Date: Fri, 17 May 2013 12:21:12 +1000
Subject: [PATCH] Support VT_NULL when converting to DBTYPE_BSTR
To: wine-patches <wine-patches< at >winehq.org>

---
 dlls/oledb32/convert.c       | 19 +++++++++++++++----
 dlls/oledb32/tests/convert.c |  8 ++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 19f46f6..0cd9e53 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
< at >< at > -534,10 +534,21 < at >< at > static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
         }
         break;
         case DBTYPE_VARIANT:
-            VariantInit(&tmp);
-            if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK)
-                *d = V_BSTR(&tmp);
-            break;
+        {
+            if(V_VT((VARIANT*)src) == VT_NULL)
+            {
+

dbghelp: Add stub SymGetLineNextW64

Alistair Leslie-Hughes — 2013-05-17T07:37:17

Hi,


Changelog:
     dbghelp: Add stub SymGetLineNextW64


Best Regards
  Alistair Leslie-Hughes
From: Alistair Leslie-Hughes <leslie_alistair< at >hotmail.com>
Date: Fri, 17 May 2013 10:26:32 +1000
Subject: [PATCH] Add stub SymGetLineNextW64
To: wine-patches <wine-patches< at >winehq.org>

---
 dlls/dbghelp/dbghelp.spec |  2 +-
 dlls/dbghelp/symbol.c     | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec
index 4772358..83542c0 100644
--- a/dlls/dbghelp/dbghelp.spec
+++ b/dlls/dbghelp/dbghelp.spec
< at >< at > -91,7 +91,7 < at >< at >
 < at > stdcall SymGetLineFromNameW64(long wstr wstr long ptr ptr)
 < at > stdcall SymGetLineNext(long ptr)
 < at > stdcall SymGetLineNext64(long ptr)
-< at > stub SymGetLineNextW64
+< at > stdcall SymGetLineNextW64(long ptr)
 < at > stdcall SymGetLinePrev(long ptr)
 < at > stdcall SymGetLinePrev64(long ptr)
 < at > stub SymGetLinePrevW64
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index ebc4644..3984972 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dll

oledb32: Correct whitespace

Alistair Leslie-Hughes — 2013-05-17T07:38:51

Hi,


Changelog:
     oledb32: Correct whitespace


Best Regards
  Alistair Leslie-Hughes
From: Alistair Leslie-Hughes <leslie_alistair< at >hotmail.com>
Date: Fri, 17 May 2013 15:51:11 +1000
Subject: [PATCH] Correct whitespace
To: wine-patches <wine-patches< at >winehq.org>

---
 dlls/oledb32/convert.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 0cd9e53..2f4d545 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
< at >< at > -121,7 +121,7 < at >< at > static int get_length(DBTYPE type)
     case DBTYPE_UI2:
         return 2;
     case DBTYPE_BOOL:
-return sizeof(VARIANT_BOOL);
+        return sizeof(VARIANT_BOOL);
     case DBTYPE_I4:
     case DBTYPE_UI4:
     case DBTYPE_R4:
< at >< at > -134,7 +134,7 < at >< at > static int get_length(DBTYPE type)
     case DBTYPE_DBDATE:
         return sizeof(DBDATE);
     case DBTYPE_DBTIMESTAMP:
-return sizeof(DBTIMESTAMP);
+        return sizeof(DBTIMESTAMP);
     case DBTYPE_CY:
         return sizeof(CY);

msvcp90: Prefer native version.

Dmitry Timoshkov — 2013-05-17T06:01:34

Just like msvcp60,msvcp70,msvcp71,msvcp80,msvcp100,msvcp110 do.
---
 dlls/msvcp90/msvcp90_main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c
index 7a7aafe..ce56c14 100644
--- a/dlls/msvcp90/msvcp90_main.c
+++ b/dlls/msvcp90/msvcp90_main.c
< at >< at > -80,10 +80,13 < at >< at > static void init_cxx_funcs(void)
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("(%p,%u,%p)\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason)
     {
+        case DLL_WINE_PREATTACH:
+            return FALSE;  /* prefer native version */
+
         case DLL_PROCESS_ATTACH:
             init_cxx_funcs();
             init_lockit();