September 2013 - Wine-Commits

Stefan Dösinger : d3d8/tests: Test blocked texture creation restrictions.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 36c15d92e99f27dfd47bf0d4d0321bb476e5e566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c15d92e99f27dfd47bf0d4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:14 2013 +0200 d3d8/tests: Test blocked texture creation restrictions. --- dlls/d3d8/device.c | 8 ++ dlls/d3d8/tests/device.c | 211 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 208 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36c15d92e99f27dfd47bf…

1 0

Francois Gouget : loader: Fix the clean target to delete the generated wine_info.plist file.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 93f77f461a469dea8d6233be5bca2d90b1667629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f77f461a469dea8d6233be5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 6 14:31:52 2013 +0200 loader: Fix the clean target to delete the generated wine_info.plist file. --- loader/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index a7ab893..a7859b2 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -66,3 +66,6 @@ uninstall:: $(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)/wine.$(prog_manext) + +clean:: + $(RM) wine_info.plist

1 0

Jacek Caban : crypt32: Added support for retrieving certs by URL.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: ba4278a73502916f002e2e81100659f8f632dbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4278a73502916f002e2e811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 6 13:09:11 2013 +0200 crypt32: Added support for retrieving certs by URL. --- dlls/crypt32/chain.c | 38 +++++++++++++++++++------------------- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index bbd0aca..1a83dee 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1972,7 +1972,7 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, } static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, const CERT_CONTEXT *cert, - HCERTSTORE store, DWORD type, void *para, PCCERT_CONTEXT prev_issuer) + HCERTSTORE store, DWORD type, void *para, DWORD flags, PCCERT_CONTEXT prev_issuer) { CRYPT_URL_ARRAY *urls; PCCERT_CONTEXT issuer; @@ -2019,7 +2019,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con TRACE("Trying URL %s\n", debugstr_w(urls->rgwszUrl[i])); res = CryptRetrieveObjectByUrlW(urls->rgwszUrl[i], CONTEXT_OID_CERTIFICATE, - CRYPT_CACHE_ONLY_RETRIEVAL /* FIXME */, + (flags & CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL) ? CRYPT_CACHE_ONLY_RETRIEVAL : CRYPT_AIA_RETRIEVAL, 0, (void**)&new_cert, NULL, NULL, NULL, NULL); if(!res) { @@ -2047,7 +2047,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, HCERTSTORE store, PCCERT_CONTEXT subject, PCCERT_CONTEXT prevIssuer, - DWORD *infoStatus) + DWORD flags, DWORD *infoStatus) { PCCERT_CONTEXT issuer = NULL; PCERT_EXTENSION ext; @@ -2076,7 +2076,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->CertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by issuer/serial number\n"); @@ -2088,7 +2088,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2133,7 +2133,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, &info->AuthorityCertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by directory name\n"); @@ -2147,7 +2147,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2160,7 +2160,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, else { issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_SUBJECT_NAME, - &subject->pCertInfo->Issuer, prevIssuer); + &subject->pCertInfo->Issuer, flags, prevIssuer); TRACE_(chain)("issuer found by name\n"); *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } @@ -2171,7 +2171,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, * until reaching a self-signed cert, or until no issuer can be found. */ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, - HCERTSTORE world, PCERT_SIMPLE_CHAIN chain) + HCERTSTORE world, DWORD flags, PCERT_SIMPLE_CHAIN chain) { BOOL ret = TRUE; PCCERT_CONTEXT cert = chain->rgpElement[chain->cElement - 1]->pCertContext; @@ -2179,7 +2179,7 @@ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - PCCERT_CONTEXT issuer = CRYPT_GetIssuer(engine, world, cert, NULL, + PCCERT_CONTEXT issuer = CRYPT_GetIssuer(engine, world, cert, NULL, flags, &chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus); if (issuer) @@ -2210,7 +2210,7 @@ static LPCSTR debugstr_filetime(LPFILETIME pTime) } static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, - HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, + HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, DWORD flags, PCERT_SIMPLE_CHAIN *ppChain) { BOOL ret = FALSE; @@ -2226,7 +2226,7 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, ret = CRYPT_AddCertToSimpleChain(engine, chain, cert, 0); if (ret) { - ret = CRYPT_BuildSimpleChain(engine, world, chain); + ret = CRYPT_BuildSimpleChain(engine, world, flags, chain); if (ret) CRYPT_CheckSimpleChain(engine, chain, pTime); } @@ -2241,7 +2241,7 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, } static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, - PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, DWORD flags, CertificateChain **ppChain) { PCERT_SIMPLE_CHAIN simpleChain = NULL; @@ -2256,7 +2256,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, /* FIXME: only simple chains are supported for now, as CTLs aren't * supported yet. */ - if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, &simpleChain))) + if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, flags, &simpleChain))) { CertificateChain *chain = CryptMemAlloc(sizeof(CertificateChain)); @@ -2430,7 +2430,7 @@ static CertificateChain *CRYPT_CopyChainToElement(CertificateChain *chain, static CertificateChain *CRYPT_BuildAlternateContextFromChain( CertificateChainEngine *engine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, - CertificateChain *chain) + DWORD flags, CertificateChain *chain) { CertificateChain *alternate; @@ -2462,7 +2462,7 @@ static CertificateChain *CRYPT_BuildAlternateContextFromChain( chain->context.rgpChain[i]->rgpElement[j + 1]->pCertContext); alternateIssuer = CRYPT_GetIssuer(engine, prevIssuer->hCertStore, - subject, prevIssuer, &infoStatus); + subject, prevIssuer, flags, &infoStatus); } if (alternateIssuer) { @@ -2481,7 +2481,7 @@ static CertificateChain *CRYPT_BuildAlternateContextFromChain( if (ret) { ret = CRYPT_BuildSimpleChain(engine, alternate->world, - alternate->context.rgpChain[i]); + flags, alternate->context.rgpChain[i]); if (ret) CRYPT_CheckSimpleChain(engine, alternate->context.rgpChain[i], pTime); @@ -2892,7 +2892,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, dump_chain_para(pChainPara); /* FIXME: what about HCCE_LOCAL_MACHINE? */ ret = CRYPT_BuildCandidateChainFromCert(engine, pCertContext, pTime, - hAdditionalStore, &chain); + hAdditionalStore, dwFlags, &chain); if (ret) { CertificateChain *alternate = NULL; @@ -2900,7 +2900,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, do { alternate = CRYPT_BuildAlternateContextFromChain(engine, - pTime, hAdditionalStore, chain); + pTime, hAdditionalStore, dwFlags, chain); /* Alternate contexts are added as "lower quality" contexts of * chain, to avoid loops in alternate chain creation. diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 96eafa2..ec53539 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3998,7 +3998,7 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); if(chain->TrustStatus.dwErrorStatus == CERT_TRUST_IS_PARTIAL_CHAIN) { /* win2k */ - todo_wine win_skip("winehq cert reported as partial chain, skipping its tests\n"); + win_skip("winehq cert reported as partial chain, skipping its tests\n"); pCertFreeCertificateChain(chain); CertCloseStore(store, 0); return;

1 0

Francois Gouget : winegcc: Ignore the test link command stdout and stderr messages.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 7d3f6d4c60a33100c879f68746182334f0f49ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f6d4c60a33100c879f6874… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 6 14:33:24 2013 +0200 winegcc: Ignore the test link command stdout and stderr messages. Otherwise invoking winegcc on any platform where our first guess at the link options fails results in a lot of confusing error messages. --- tools/winegcc/winegcc.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5cac73d..273210a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -334,7 +334,9 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch { const char *in = get_temp_file( "try_link", ".c" ); const char *out = get_temp_file( "try_link", ".out" ); + const char *err = get_temp_file( "try_link", ".err" ); strarray *link = strarray_dup( link_tool ); + int sout = -1, serr = -1; int ret; create_file( in, 0644, "int main(void){return 1;}\n" ); @@ -344,7 +346,21 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch strarray_addall( link, strarray_fromstring( cflags, " " ) ); strarray_add( link, in ); + sout = dup( fileno(stdout) ); + freopen( err, "w", stdout ); + serr = dup( fileno(stderr) ); + freopen( err, "w", stderr ); ret = spawn( prefix, link, 1 ); + if (sout >= 0) + { + dup2( sout, fileno(stdout) ); + close( sout ); + } + if (serr >= 0) + { + dup2( serr, fileno(stderr) ); + close( serr ); + } strarray_free( link ); return ret; }

1 0

Henri Verbeet : d3dcompiler: Avoid LPVOID.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 5daf5e80fbb2ce5043163f46fdaaf831d340850a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5daf5e80fbb2ce5043163f46f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:42 2013 +0200 d3dcompiler: Avoid LPVOID. --- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 2 +- dlls/d3dcompiler_43/reflection.c | 2 +- dlls/d3dcompiler_43/tests/asm.c | 2 +- include/d3d11shader.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 0c66471..929cec0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -28,7 +28,7 @@ #include "d3dcompiler_private.h" -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { switch (reason) { diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 77e7ac3..97d4148 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -72,7 +72,7 @@ struct d3dcompiler_shader_reflection_variable UINT start_offset; UINT size; UINT flags; - LPVOID default_value; + void *default_value; }; struct d3dcompiler_shader_reflection_constant_buffer diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index cb1453f..331b864 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1486,7 +1486,7 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i static HRESULT WINAPI testD3DInclude_close(ID3DInclude *iface, const void *data) { - HeapFree(GetProcessHeap(), 0, (LPVOID)data); + HeapFree(GetProcessHeap(), 0, (void *)data); return S_OK; } diff --git a/include/d3d11shader.h b/include/d3d11shader.h index ea271f6..9ee78a8 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -80,7 +80,7 @@ typedef struct _D3D11_SHADER_VARIABLE_DESC UINT StartOffset; UINT Size; UINT uFlags; - LPVOID DefaultValue; + void *DefaultValue; UINT StartTexture; UINT TextureSize; UINT StartSampler; @@ -180,7 +180,7 @@ DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c, DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D11ShaderReflection methods */

1 0

Henri Verbeet : ddraw: Introduce a helper function for initializing a D3DDEVICEDESC structure from a D3DDEVICEDESC7 structure .
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 4735690dc2482c41dfbb2e1adc1722bea2c92d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4735690dc2482c41dfbb2e1ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:41 2013 +0200 ddraw: Introduce a helper function for initializing a D3DDEVICEDESC structure from a D3DDEVICEDESC7 structure. --- dlls/ddraw/ddraw.c | 571 +++++++++++++++++++++----------------------- dlls/ddraw/ddraw_private.h | 6 +- dlls/ddraw/device.c | 39 +--- 3 files changed, 282 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4735690dc2482c41dfbb2…

1 0

Ken Thomases : winemac: Add support for mouse-move and right- and middle-click events on systray icons in the Mac status bar .
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 7ed00f6d975718ab32cf30a7fe6c6c27c8f69364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed00f6d975718ab32cf30a7f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 5 22:23:52 2013 -0500 winemac: Add support for mouse-move and right- and middle-click events on systray icons in the Mac status bar. --- dlls/winemac.drv/cocoa_status_item.m | 136 +++++++++++++++++++++++++++++---- dlls/winemac.drv/event.c | 13 ++- dlls/winemac.drv/macdrv.h | 3 +- dlls/winemac.drv/macdrv_cocoa.h | 10 ++- dlls/winemac.drv/systray.c | 69 ++++++++++++----- 5 files changed, 186 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ed00f6d975718ab32cf3…

1 0

Marcus Meissner : mciqtz32: Do not print uninitialized variables (Coverity) .
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: c6761b8b9dc13eca8293ffcefb5bd19608fbffc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6761b8b9dc13eca8293ffcef… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 31 13:17:56 2013 +0200 mciqtz32: Do not print uninitialized variables (Coverity). --- dlls/mciqtz32/mciqtz.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 546f3ed..eb77929 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -733,13 +733,13 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc)); + FIXME("MCI_DGV_WHERE_SOURCE_MAX stub\n"); IBasicVideo_GetSourcePosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_DESTINATION) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub %s\n", wine_dbgstr_rect(&rc)); + FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub\n"); IBasicVideo_GetDestinationPosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_DESTINATION %s\n", wine_dbgstr_rect(&rc)); }

1 0

Ralf Habacker : gdi32: Fixed Rectangle() rotation with GM_ADVANCED graphics mode in dib driver.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 39629a3d35f1bf4453733f70685110208c4f778c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39629a3d35f1bf4453733f706… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Fri Aug 30 12:39:12 2013 +0200 gdi32: Fixed Rectangle() rotation with GM_ADVANCED graphics mode in dib driver. --- dlls/gdi32/dibdrv/graphics.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d91ef11..f3aaeb6 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1285,6 +1285,15 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); + if (GetGraphicsMode( dev->hdc ) == GM_ADVANCED) + { + pts[0].x = pts[3].x = left; + pts[0].y = pts[1].y = top; + pts[1].x = pts[2].x = right; + pts[2].y = pts[3].y = bottom; + return dibdrv_Polygon( dev, pts, 4 ); + } + if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE;

1 0

Andrew Cook : kernel32: Fix argument order for NtIsProcessInJob.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: fef18a42670cd97df214512556ffb090d36e3d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef18a42670cd97df21451255… Author: Andrew Cook <ariscop(a)gmail.com> Date: Fri Sep 6 16:13:12 2013 +1000 kernel32: Fix argument order for NtIsProcessInJob. --- dlls/kernel32/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5cb8e3f..a0ccbb6 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1015,7 +1015,7 @@ BOOL WINAPI AssignProcessToJobObject( HANDLE job, HANDLE process ) */ BOOL WINAPI IsProcessInJob( HANDLE process, HANDLE job, PBOOL result ) { - NTSTATUS status = NtIsProcessInJob( job, process ); + NTSTATUS status = NtIsProcessInJob( process, job ); switch(status) { case STATUS_PROCESS_IN_JOB:

1 0