August 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Simplify context_apply_fbo_state_blit().
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 98277e1fc6896348d1becded9a809d5b6a3b18b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98277e1fc6896348d1becded9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:55 2011 +0200 wined3d: Simplify context_apply_fbo_state_blit(). --- dlls/wined3d/context.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 797eb73..33b07ce 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -431,17 +431,12 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) { - if (location != SFLAG_INDRAWABLE || surface_is_offscreen(render_target)) - { - UINT clear_size = (context->gl_info->limits.buffers - 1) * sizeof(*context->blit_targets); - context->blit_targets[0] = render_target; - if (clear_size) memset(&context->blit_targets[1], 0, clear_size); - context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location); - } - else - { - context_apply_fbo_state(context, target, NULL, NULL, location); - } + UINT clear_size = (context->gl_info->limits.buffers - 1) * sizeof(*context->blit_targets); + + context->blit_targets[0] = render_target; + if (clear_size) + memset(&context->blit_targets[1], 0, clear_size); + context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location); } /* Context activation is done by the caller. */

1 0

Alexandre Julliard : gdi32/tests: Make sure the bitmap info is initialized in the GetDIBits test.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 82ef9f960d6e02cef3498985995443e3ba2098b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ef9f960d6e02cef34989859… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 11:15:16 2011 +0200 gdi32/tests: Make sure the bitmap info is initialized in the GetDIBits test. --- dlls/gdi32/tests/bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 29f2c8c..7e3ddc9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3256,6 +3256,7 @@ static void test_GetDIBits_top_down(int bpp) int *picture; int statusCode; + memset( &bi, 0, sizeof(bi) ); bi.bmiHeader.biSize=sizeof(bi.bmiHeader); bi.bmiHeader.biWidth=2; bi.bmiHeader.biHeight=2;

1 0

Octavian Voicu : oleaut32: Fix leak in typelib marshaler when invoking IDispatch methods.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 8177b4793a18f90335da3cf56b6fdcf16bb07a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8177b4793a18f90335da3cf56… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Aug 25 18:50:20 2011 +0300 oleaut32: Fix leak in typelib marshaler when invoking IDispatch methods. --- dlls/oleaut32/tests/tmarshal.c | 6 ++++++ dlls/oleaut32/tmarshal.c | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index c2b36a5..c84aa47 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1000,6 +1000,12 @@ static void test_typelibmarshal(void) IKindaEnumWidget_Release(pKEW); + /* call GetTypeInfoCount (direct) */ + hr = IWidget_GetTypeInfoCount(pWidget, &uval); + ok_ole_success(hr, IWidget_GetTypeInfoCount); + hr = IWidget_GetTypeInfoCount(pWidget, &uval); + ok_ole_success(hr, IWidget_GetTypeInfoCount); + hr = IWidget_QueryInterface(pWidget, &IID_IDispatch, (void **)&pDispatch); ok_ole_success(hr, IWidget_QueryInterface); diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 42eaadd..25f0a0a 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2002,16 +2002,19 @@ TMStubImpl_Invoke( if (This->dispatch_derivative && xmsg->iMethod < sizeof(IDispatchVtbl)/sizeof(void *)) { - IPSFactoryBuffer *factory_buffer; - hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer); - if (hres == S_OK) + if (!This->dispatch_stub) { - hres = IPSFactoryBuffer_CreateStub(factory_buffer, &IID_IDispatch, - This->pUnk, &This->dispatch_stub); - IPSFactoryBuffer_Release(factory_buffer); + IPSFactoryBuffer *factory_buffer; + hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer); + if (hres == S_OK) + { + hres = IPSFactoryBuffer_CreateStub(factory_buffer, &IID_IDispatch, + This->pUnk, &This->dispatch_stub); + IPSFactoryBuffer_Release(factory_buffer); + } + if (hres != S_OK) + return hres; } - if (hres != S_OK) - return hres; return IRpcStubBuffer_Invoke(This->dispatch_stub, xmsg, rpcchanbuf); }

1 0

Alexander Morozov : include: Fix CRYPTUI_SELECTCERTIFICATE_STRUCTA declaration.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: ebfcc25da0dfd4384fbb7f49e6a08732d03db736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfcc25da0dfd4384fbb7f49e… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Aug 10 18:46:35 2011 +0400 include: Fix CRYPTUI_SELECTCERTIFICATE_STRUCTA declaration. --- include/cryptuiapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index f151fa4..81c58af 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -359,7 +359,7 @@ typedef struct _CRYPTUI_SELECTCERTIFICATE_STRUCTA DWORD cStores; HCERTSTORE *rghStores; DWORD cPropSheetPages; - LPCPROPSHEETPAGEW rgPropSheetPages; + LPCPROPSHEETPAGEA rgPropSheetPages; HCERTSTORE hSelectedCertStore; } CRYPTUI_SELECTCERTIFICATE_STRUCTA, *PCRYPTUI_SELECTCERTIFICATE_STRUCTA; typedef const CRYPTUI_SELECTCERTIFICATE_STRUCTA *

1 0

Alexander Morozov : cryptui: Add stubs for CryptUIDlgSelectCertificateA/W.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: d15d45e5d1006bfee502ebec3447ed59e1e642cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15d45e5d1006bfee502ebec3… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Jul 20 21:09:42 2011 +0400 cryptui: Add stubs for CryptUIDlgSelectCertificateA/W. --- dlls/cryptui/cryptui.spec | 4 ++-- dlls/cryptui/main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index d243217..bce5de0 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -2,9 +2,9 @@ 2 stdcall CryptUIDlgCertMgr(ptr) 3 stub CryptUIDlgFreeCAContext 4 stub CryptUIDlgSelectCA -5 stub CryptUIDlgSelectCertificateA +5 stdcall CryptUIDlgSelectCertificateA(ptr) 6 stub CryptUIDlgSelectCertificateFromStore -7 stub CryptUIDlgSelectCertificateW +7 stdcall CryptUIDlgSelectCertificateW(ptr) 8 stdcall CryptUIDlgSelectStoreA(ptr) 9 stdcall CryptUIDlgSelectStoreW(ptr) 10 stub CryptUIDlgViewCRLA diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 15e71d5..9df9800 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7043,3 +7043,15 @@ BOOL WINAPI CryptUIDlgViewSignerInfoA(CRYPTUI_VIEWSIGNERINFO_STRUCTA *pcvsi) FIXME("%p: stub\n", pcvsi); return FALSE; } + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateW(PCCRYPTUI_SELECTCERTIFICATE_STRUCTW pcsc) +{ + FIXME("%p: stub\n", pcsc); + return NULL; +} + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_STRUCTA pcsc) +{ + FIXME("%p: stub\n", pcsc); + return NULL; +}

1 0

Frédéric Delanoy : cmd/tests: Add attrib tests.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 3ce59f5dba4bcb26f8408d3bfe69111808d25529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce59f5dba4bcb26f8408d3bf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Aug 24 12:53:21 2011 +0200 cmd/tests: Add attrib tests. --- programs/cmd/tests/test_builtins.cmd | 61 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 20 ++++++++++ 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 668bea4..618a6c7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -786,6 +786,67 @@ if not exist bar\baz (echo bar\baz removed) else echo bar\baz not removed! cd .. rd /s/q foobaz +echo ------------ Testing attrib -------------- +rem FIXME Add tests for archive, hidden and system attributes + mixed attributes modifications +mkdir foobar & cd foobar +echo foo original contents> foo +attrib foo +echo > bar +echo ... read-only attribute +rem Read-only files cannot be altered or deleted, unless forced +attrib +R foo +attrib foo +dir /Ar /B +echo bar>> foo +type foo +del foo > NUL 2>&1 +if exist foo ( + echo Read-only file not deleted +) else ( + echo Should not delete read-only file! +) +del /F foo +if not exist foo ( + echo Read-only file forcibly deleted +) else ( + echo Should delete read-only file with del /F! + attrib -r foo + del foo +) +cd .. +rd /s/q foobar +echo ... recursive behaviour +mkdir foobar\baz & cd foobar +echo > level1 +echo > whatever +echo > baz\level2 +attrib baz\level2 +cd .. +attrib +R l*vel? /S > nul 2>&1 +cd foobar +attrib level1 +attrib baz\level2 +echo > bar +attrib bar +cd .. +rd /s/q foobar +echo ... folders processing +mkdir foobar +attrib foobar +cd foobar +mkdir baz +echo toto> baz\toto +attrib +r baz /s /d > nul 2>&1 +attrib baz +attrib baz\toto +echo lulu>>baz\toto +type baz\toto +echo > baz\lala +rem Oddly windows allows file creation in a read-only directory... +if exist baz\lala (echo file created in read-only dir) else echo file not created +cd .. +rd /s/q foobar + echo ------------ Testing CALL -------------- mkdir foobar & cd foobar rem External script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 08a66eb..ae21f05 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -476,6 +476,26 @@ foo removed bar removed foobar removed bar\baz removed +------------ Testing attrib -------------- +(a)todo_wine@A @pwd@\foobar\foo(a)or_broken@A @pwd@\foobar\foo +... read-only attribute +(a)todo_wine@A R @pwd@\foobar\foo(a)or_broken@A R @pwd@\foobar\foo +foo +foo original contents +Read-only file not deleted +Read-only file forcibly deleted +... recursive behaviour +(a)todo_wine@A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2 +(a)todo_wine@A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1 +(a)todo_wine@A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2 +(a)todo_wine@A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar +... folders processing +(a)todo_wine@ @pwd@\foobar(a)or_broken@ @pwd@\foobar +(a)todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz +(a)todo_wine@A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto +toto +lulu +file created in read-only dir ------------ Testing CALL -------------- foo(a)space@ @todo_wine(a)foo 8

1 0

Francois Gouget : notepad: Mark the page header as not needing translation.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

1 0

Francois Gouget : shdoclc: Mark the page print footer as not needing translation.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

1 0

Francois Gouget : msvidc32: Mark 'MS-CRAM' as not needing translation.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

1 0

Octavian Voicu : ieframe/tests: Skip rest of tests if CoCreateInstance failed.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 3ba185d5ceea0c63dd22960d33d53d80eecfc85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba185d5ceea0c63dd22960d3… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Aug 25 16:06:20 2011 +0300 ieframe/tests: Skip rest of tests if CoCreateInstance failed. --- dlls/ieframe/tests/ie.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 6f62e23..b761c6f 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -60,6 +60,9 @@ static void test_InternetExplorer(void) &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create InternetExplorer instance: %08x\n", hres); + if(hres != S_OK) + return; + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres);

1 0