July 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : maintainers: D3dxof is a D3D helper library too.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 919a338947510aada7069761677cdd63895db099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919a338947510aada70697616… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:27:32 2016 +0200 maintainers: D3dxof is a D3D helper library too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ac3f515..4a7191c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -85,6 +85,7 @@ F: dlls/d3dcompiler*/ F: dlls/d3dx10*/ F: dlls/d3dx11*/ F: dlls/d3dx9*/ +F: dlls/d3dxof/ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com>

1 0

Michael Stefaniuc : mshtml: Use SetRect() instead of open coding it.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 9cec2e5936598aa9b3d9482d7a9a0e5daa5077a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cec2e5936598aa9b3d9482d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:08:52 2016 +0200 mshtml: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/pluginhost.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7b1133d..712f7e0 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -124,10 +124,7 @@ static void update_readystate(PluginHost *host) /* FIXME: We shouldn't need this function and we should embed plugin directly in the main document */ static void get_pos_rect(PluginHost *host, RECT *ret) { - ret->top = 0; - ret->left = 0; - ret->bottom = host->rect.bottom - host->rect.top; - ret->right = host->rect.right - host->rect.left; + SetRect(ret, 0, 0, host->rect.right - host->rect.left, host->rect.bottom - host->rect.top); } static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag)

1 0

Piotr Caban : msi: Don' t validate platform while checking if transform is applicable.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 92defc736e1e538320599655f614a959f71b7ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92defc736e1e538320599655f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 14 13:47:34 2016 +0200 msi: Don't validate platform while checking if transform is applicable. .Net2.0SP2 64-bit installer uses patches with INTEL platform in x64 package to update 32-bit parts of .Net. Native applies patch even if platform is unknown. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/patch.c | 12 +++--------- dlls/msi/tests/patch.c | 43 ++++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index f8f3eaf..eb91e06 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -139,6 +139,9 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform wanted_flags &= 0xffff; /* mask off error condition flags */ TRACE("validation flags 0x%04x\n", wanted_flags); + /* native is not validating platform */ + wanted_flags &= ~MSITRANSFORM_VALIDATE_PLATFORM; + if (wanted_flags & ~supported_flags) { FIXME("unsupported validation flags 0x%04x\n", wanted_flags); @@ -192,15 +195,6 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform } msi_free( product_code_installed ); } - if (wanted_flags & MSITRANSFORM_VALIDATE_PLATFORM) - { - if ((p = strchrW( template, ';' ))) - { - *p = 0; - if (package->platform == parse_platform( template )) - valid_flags |= MSITRANSFORM_VALIDATE_PLATFORM; - } - } msi_free( template ); if (wanted_flags & MSITRANSFORM_VALIDATE_MAJORVERSION) { diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 3c23656..b6e990b 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -471,16 +471,16 @@ static const char t1_data3[] = { /* SummaryInformation */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x85, 0x9f, 0xf2, 0xf9, 0x4f, 0x68, 0x10, 0xab, 0x91, 0x08, 0x00, 0x2b, 0x27, 0xb3, 0xd9, - 0x30, 0x00, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x9f, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0xdc, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x08, - 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x04, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x8c, 0x01, 0x00, - 0x00, 0x10, 0x00, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x00, 0xf7, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x07, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x8f, 0x01, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x97, 0x01, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, @@ -492,23 +492,24 @@ static const char t1_data3[] = { /* SummaryInformation */ 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x3b, 0x31, - 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, - 0x00, 0x00, 0x00, 0x3b, 0x31, 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x7b, 0x39, 0x31, - 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, 0x42, 0x42, 0x36, - 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, 0x33, 0x39, 0x2d, - 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, 0x46, 0x41, 0x37, - 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, 0x7b, 0x39, 0x31, - 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, 0x42, 0x42, 0x36, - 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, 0x33, 0x39, 0x2d, - 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, 0x46, 0x41, 0x37, - 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, 0x7b, 0x41, 0x32, - 0x45, 0x33, 0x44, 0x36, 0x34, 0x33, 0x2d, 0x34, 0x45, 0x32, 0x43, - 0x2d, 0x34, 0x37, 0x37, 0x46, 0x2d, 0x41, 0x33, 0x30, 0x39, 0x2d, - 0x46, 0x37, 0x36, 0x46, 0x35, 0x35, 0x32, 0x44, 0x35, 0x46, 0x34, - 0x33, 0x7d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, - 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x22, 0x09 + 0x00, 0x1e, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x78, 0x38, + 0x36, 0x3b, 0x31, 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x3b, 0x31, 0x30, 0x33, 0x33, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0x7b, 0x39, 0x31, 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, + 0x42, 0x42, 0x36, 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, + 0x33, 0x39, 0x2d, 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, + 0x46, 0x41, 0x37, 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, + 0x7b, 0x39, 0x31, 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, + 0x42, 0x42, 0x36, 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, + 0x33, 0x39, 0x2d, 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, + 0x46, 0x41, 0x37, 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, + 0x7b, 0x41, 0x32, 0x45, 0x33, 0x44, 0x36, 0x34, 0x33, 0x2d, 0x34, + 0x45, 0x32, 0x43, 0x2d, 0x34, 0x37, 0x37, 0x46, 0x2d, 0x41, 0x33, + 0x30, 0x39, 0x2d, 0x46, 0x37, 0x36, 0x46, 0x35, 0x35, 0x32, 0x44, + 0x35, 0x46, 0x34, 0x33, 0x7d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x22, + 0x09 }; static const struct table_data table_transform1_data[] = {

1 0

Nikolay Sivov : msscript: Implement some connection point methods.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 4058b68966e6933b83b6164140a32006a5bd8263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4058b68966e6933b83b616414… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 14:14:28 2016 +0300 msscript: Implement some connection point methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 15 +++++++++++---- dlls/msscript.ocx/tests/msscript.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 5be53da..bc3f5c1 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1282,9 +1282,10 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, iid); + TRACE("(%p)->(%p)\n", This, iid); - return E_NOTIMPL; + *iid = *This->riid; + return S_OK; } static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, @@ -1292,9 +1293,15 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, container); + TRACE("(%p)->(%p)\n", This, container); - return E_NOTIMPL; + if (!container) + return E_POINTER; + + *container = &This->control->IConnectionPointContainer_iface; + IConnectionPointContainer_AddRef(*container); + + return S_OK; } static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *unk_sink, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 714b075..f4e6306 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -782,10 +782,11 @@ if (hr == S_OK) static void test_connectionpoints(void) { - IConnectionPointContainer *container; + IConnectionPointContainer *container, *container2; IConnectionPoint *cp; IScriptControl *sc; HRESULT hr; + IID iid; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); @@ -799,10 +800,42 @@ static void test_connectionpoints(void) hr = IConnectionPointContainer_FindConnectionPoint(container, &IID_IPropertyNotifySink, &cp); ok(hr == S_OK, "got 0x%08x\n", hr); + + if (0) /* crashes on win2k3 */ + { + hr = IConnectionPoint_GetConnectionPointContainer(cp, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + + hr = IConnectionPoint_GetConnectionInterface(cp, &iid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(&iid, &IID_IPropertyNotifySink), "got %s\n", wine_dbgstr_guid(&iid)); + + hr = IConnectionPoint_GetConnectionPointContainer(cp, &container2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container2 == container, "got %p, expected %p\n", container2, container); + IConnectionPointContainer_Release(container2); + IConnectionPoint_Release(cp); hr = IConnectionPointContainer_FindConnectionPoint(container, &DIID_DScriptControlSource, &cp); ok(hr == S_OK, "got 0x%08x\n", hr); + + if (0) /* crashes on win2k3 */ + { + hr = IConnectionPoint_GetConnectionPointContainer(cp, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + + hr = IConnectionPoint_GetConnectionInterface(cp, &iid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(&iid, &DIID_DScriptControlSource), "got %s\n", wine_dbgstr_guid(&iid)); + + hr = IConnectionPoint_GetConnectionPointContainer(cp, &container2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container2 == container, "got %p, expected %p\n", container2, container); + IConnectionPointContainer_Release(container2); + IConnectionPoint_Release(cp); IConnectionPointContainer_Release(container);

1 0

Nikolay Sivov : mshtml: Fix a typo in a trace message.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 3ea8a700f7d06fa55449d1463e01a6849ae6ebcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea8a700f7d06fa55449d1463… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 11 23:25:24 2016 +0300 mshtml: Fix a typo in a trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 255c37f..f6eb7ea 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -140,7 +140,7 @@ static BOOL init_script_engine(ScriptHost *script_host) hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParse, (void**)&script_host->parse); if(FAILED(hres)) { - WARN("Could not get IActiveScriptHost: %08x\n", hres); + WARN("Could not get IActiveScriptParse: %08x\n", hres); return FALSE; }

1 0

Sebastian Lackner : secur32: Define missing gnutls_kx_algorithm_t constants for gnutls versions < 3.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: e6c85e8436ac889c9c0b22ade2a607cdc0e4404d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c85e8436ac889c9c0b22ade… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 14 13:09:39 2016 +0200 secur32: Define missing gnutls_kx_algorithm_t constants for gnutls versions < 3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7f2dbd6..da83482 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -82,6 +82,11 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #define GNUTLS_CIPHER_AES_192_CBC 92 #define GNUTLS_CIPHER_AES_128_GCM 93 #define GNUTLS_CIPHER_AES_256_GCM 94 + +#define GNUTLS_KX_ANON_ECDH 11 +#define GNUTLS_KX_ECDHE_RSA 12 +#define GNUTLS_KX_ECDHE_ECDSA 13 +#define GNUTLS_KX_ECDHE_PSK 14 #endif static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) @@ -327,7 +332,7 @@ static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) } } -static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) +static ALG_ID schannel_get_kx_algid(int kx) { switch (kx) {

1 0

Iván Matellanes : msvcirt: Reset the pointers on file sync in most cases.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 5101a90bca2bd2618b488f37624af43efe17a0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5101a90bca2bd2618b488f376… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 11 11:34:56 2016 +0100 msvcirt: Reset the pointers on file sync in most cases. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 3adaf74..07aea3e 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1126,8 +1126,8 @@ int __thiscall filebuf_sync(filebuf *this) count = this->base.pptr - this->base.pbase; if (count > 0 && _write(this->fd, this->base.pbase, count) != count) return EOF; - this->base.pbase = this->base.pptr = this->base.epptr = NULL; } + this->base.pbase = this->base.pptr = this->base.epptr = NULL; /* flush input buffer */ if (this->base.egptr != NULL) { offset = this->base.egptr - this->base.gptr; @@ -1143,8 +1143,8 @@ int __thiscall filebuf_sync(filebuf *this) if (_lseek(this->fd, -offset, SEEK_CUR) < 0) return EOF; } - this->base.eback = this->base.gptr = this->base.egptr = NULL; } + this->base.eback = this->base.gptr = this->base.egptr = NULL; return 0; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3e8b548..13b8397 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1419,6 +1419,46 @@ static void test_filebuf(void) ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); ok(_tell(fb1.fd) == 0, "_tell failed\n"); + fb1.base.pbase = fb1.base.pptr = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); + fb1.base.pbase = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.pbase = fb1.base.base; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); + fb1.base.eback = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.eback); + fb1.base.eback = fb1.base.gptr = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.gptr); + fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 100; + fb1.base.pbase = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(fb1.base.gptr == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(fb1.base.egptr == fb1.base.base + 100, "wrong get base, expected %p got %p\n", fb1.base.base + 100, fb1.base.egptr); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.egptr = NULL; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.egptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.egptr); ret = (int) call_func1(p_filebuf_sync, &fb2); ok(ret == -1, "wrong return, expected -1 got %d\n", ret); fb3.base.eback = fb3.base.base;

1 0

Michael Stefaniuc : taskmgr: Use SetRect() instead of open coding it.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: b11b448d7209ce8bd1b639c5c1ecefc929759110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11b448d7209ce8bd1b639c5c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 13 09:52:13 2016 +0200 taskmgr: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/graphctl.c | 16 ++++------------ programs/taskmgr/taskmgr.c | 5 +---- programs/taskmgr/trayicon.c | 5 +---- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 70051eb..214cd75 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -117,10 +117,7 @@ static void GraphCtrl_Resize(TGraphCtrl* this) /* the "left" coordinate and "width" will be modified in */ /* InvalidateCtrl to be based on the width of the y axis scaling */ - this->m_rectPlot.left = 0; - this->m_rectPlot.top = -1; - this->m_rectPlot.right = this->m_rectClient.right-0; - this->m_rectPlot.bottom = this->m_rectClient.bottom-0; + SetRect(&this->m_rectPlot, 0, -1, this->m_rectClient.right, this->m_rectClient.bottom); /* set some member variables to avoid multiple function calls */ this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;/* m_rectPlot.Height(); */ @@ -340,19 +337,14 @@ static void GraphCtrl_DrawPoint(TGraphCtrl* this) if ((prevY <= this->m_rectPlot.top) || (currY <= this->m_rectPlot.top)) { RECT rc; - rc.bottom = this->m_rectPlot.top+1; - rc.left = prevX; - rc.right = currX+1; - rc.top = this->m_rectClient.top; + SetRect(&rc, prevX, this->m_rectClient.top, currX + 1, this->m_rectPlot.top + 1); FillRect(this->m_dcPlot, &rc, this->m_brushBack); } if ((prevY >= this->m_rectPlot.bottom) || (currY >= this->m_rectPlot.bottom)) { RECT rc; - rc.bottom = this->m_rectClient.bottom+1; - rc.left = prevX; - rc.right = currX+1; - rc.top = this->m_rectPlot.bottom+1; + SetRect(&rc, prevX, this->m_rectPlot.bottom + 1, currX + 1, + this->m_rectClient.bottom + 1); /* RECT rc(prevX, m_rectPlot.bottom+1, currX+1, m_rectClient.bottom+1); */ FillRect(this->m_dcPlot, &rc, this->m_brushBack); } diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 80dc81c..b280f79 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -65,10 +65,7 @@ static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) RECT rect; SetBkColor(hDC, clr); - rect.left = x; - rect.top = y; - rect.right = x + cx; - rect.bottom = y + cy; + SetRect(&rect, x, y, x + cx, y + cy); ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); } diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index 636d3bd..af98474 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -90,10 +90,7 @@ static HICON TrayIcon_GetProcessorUsageIcon(void) * just having 10. */ nLinesToDraw = (ProcessorUsage + (ProcessorUsage / 10)) / 11; - rc.left = 3; - rc.top = 12 - nLinesToDraw; - rc.right = 13; - rc.bottom = 13; + SetRect(&rc, 3, 12 - nLinesToDraw, 13, 13); /* * Now draw the cpu usage

1 0

Michael Müller : ntdll: Use sysinfo to report correct number of physical pages.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: d0832cdf428696e2c08b1aa27382baad4d1e376f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0832cdf428696e2c08b1aa27… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jul 8 05:40:22 2016 +0200 ntdll: Use sysinfo to report correct number of physical pages. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntdll/virtual.c | 14 ++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 19 insertions(+) diff --git a/configure b/configure index 944ff6b..ce49aed 100755 --- a/configure +++ b/configure @@ -6809,6 +6809,7 @@ for ac_header in \ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ + sys/sysinfo.h \ sys/tihdr.h \ sys/time.h \ sys/timeout.h \ diff --git a/configure.ac b/configure.ac index 6e960a1..019d549 100644 --- a/configure.ac +++ b/configure.ac @@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ + sys/sysinfo.h \ sys/tihdr.h \ sys/time.h \ sys/timeout.h \ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5c43d26..2e63b78 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -38,6 +38,9 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_SYSINFO_H +# include <sys/sysinfo.h> +#endif #ifdef HAVE_VALGRIND_VALGRIND_H # include <valgrind/valgrind.h> #endif @@ -1356,11 +1359,22 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { +#ifdef HAVE_SYS_SYSINFO_H + struct sysinfo sinfo; +#endif + info->unknown = 0; info->KeMaximumIncrement = 0; /* FIXME */ info->PageSize = page_size; info->MmLowestPhysicalPage = 1; info->MmHighestPhysicalPage = 0x7fffffff / page_size; +#ifdef HAVE_SYS_SYSINFO_H + if (!sysinfo(&sinfo)) + { + ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; + info->MmHighestPhysicalPage = max(1, total / page_size); + } +#endif info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage; info->AllocationGranularity = get_mask(0) + 1; info->LowestUserAddress = (void *)0x10000; diff --git a/include/config.h.in b/include/config.h.in index a4a4bb4..64f56fd 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1119,6 +1119,9 @@ /* Define to 1 if you have the <sys/sysctl.h> header file. */ #undef HAVE_SYS_SYSCTL_H +/* Define to 1 if you have the <sys/sysinfo.h> header file. */ +#undef HAVE_SYS_SYSINFO_H + /* Define to 1 if you have the <sys/thr.h> header file. */ #undef HAVE_SYS_THR_H

1 0

Huw Davies : gdi32: Use the get_mono_dc_colors() helper.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: f5bffe0ef7afbeb2528f8025283d0fd887f4271e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5bffe0ef7afbeb2528f80252… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 13 10:02:27 2016 +0100 gdi32: Use the get_mono_dc_colors() helper. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dib.c | 9 +-------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index d2b3de2..ed011fc 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -222,7 +222,7 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits } /* helper to retrieve either both colors or only the background color for monochrome blits */ -static void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) +void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) { RGBQUAD *colors = info->bmiColors; COLORREF color = GetBkColor( hdc ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ad2bf4f..c3009a2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -581,14 +581,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { if (src_info->bmiHeader.biBitCount > 1) - { - COLORREF color = GetBkColor( dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue( color ); - dst_info->bmiColors[0].rgbGreen = GetGValue( color ); - dst_info->bmiColors[0].rgbBlue = GetBValue( color ); - dst_info->bmiColors[0].rgbReserved = 0; - dst_info->bmiHeader.biClrUsed = 1; - } + get_mono_dc_colors( dev->hdc, dst_info, 1 ); else { memcpy( dst_info->bmiColors, src_info->bmiColors, 2 * sizeof(dst_info->bmiColors[0]) ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 79a7a74..8bdf9f1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -205,6 +205,7 @@ extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_c extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, BITMAPINFO *dst_info, struct bitblt_coords *dst, struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; +extern void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN;

1 0