October 2006 - Wine-Commits

Juan Lang : crypt32/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 353cd81c9a04c3f90310adcfdd7723d9e244d5c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=353cd81c9a04c3f90310adc… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Sep 29 14:36:26 2006 -0700 crypt32/tests: Win64 printf format warning fixes. --- dlls/crypt32/tests/Makefile.in | 1 dlls/crypt32/tests/base64.c | 50 +-- dlls/crypt32/tests/cert.c | 400 +++++++++++----------- dlls/crypt32/tests/chain.c | 12 - dlls/crypt32/tests/crl.c | 138 ++++---- dlls/crypt32/tests/encode.c | 696 +++++++++++++++++++------------------- dlls/crypt32/tests/main.c | 60 ++- dlls/crypt32/tests/oid.c | 74 ++-- dlls/crypt32/tests/protectdata.c | 24 + dlls/crypt32/tests/store.c | 302 ++++++++-------- dlls/crypt32/tests/str.c | 58 ++- 11 files changed, 907 insertions(+), 908 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=353cd81c9a04c3f9031…

1 0

Juan Lang : shdocvw: Ignore VT_ERROR arguments to WebBrowser_Navigate2.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: d62c50bc8657b181c5e6735e396aabe9d020a14f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d62c50bc8657b181c5e6735… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Sep 28 18:01:44 2006 -0700 shdocvw: Ignore VT_ERROR arguments to WebBrowser_Navigate2. --- dlls/shdocvw/webbrowser.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 8805122..3740aab 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -675,7 +675,7 @@ static HRESULT WINAPI WebBrowser_Navigat if(V_VT(URL) != VT_BSTR) return E_INVALIDARG; - if(PostData && V_VT(PostData) != VT_EMPTY) { + if(PostData && V_VT(PostData) != VT_EMPTY && V_VT(PostData) != VT_ERROR) { if(V_VT(PostData) != (VT_ARRAY | VT_UI1) || V_ARRAY(PostData)->cDims != 1) { WARN("Invalid PostData\n"); @@ -686,7 +686,7 @@ static HRESULT WINAPI WebBrowser_Navigat post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; } - if(Headers && V_VT(Headers) != VT_EMPTY) { + if(Headers && V_VT(Headers) != VT_EMPTY && V_VT(Headers) != VT_ERROR) { if(V_VT(Headers) != VT_BSTR) return E_INVALIDARG;

1 0

Juan Lang : shdocvw: Return S_OK from WebBrowser_put_RegisterAsDropTarget.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 6c8e5a391b2c2c19bb2392786e49c4d20bc29cec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c8e5a391b2c2c19bb23927… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Sep 28 18:00:09 2006 -0700 shdocvw: Return S_OK from WebBrowser_put_RegisterAsDropTarget. --- 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 9e56733..8805122 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -795,7 +795,7 @@ static HRESULT WINAPI WebBrowser_put_Reg { WebBrowser *This = WEBBROWSER_THIS(iface); FIXME("(%p)->(%x)\n", This, bRegister); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WebBrowser_get_TheaterMode(IWebBrowser2 *iface, VARIANT_BOOL *pbRegister)

1 0

Ivan Gyurdiev : wined3d: Win64 printf fixes.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 3dcd3681f3012d3cd7206afc1172ea04b3bd1b85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dcd3681f3012d3cd7206af… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Sep 30 23:20:10 2006 -0400 wined3d: Win64 printf fixes. --- dlls/wined3d/Makefile.in | 1 dlls/wined3d/arb_program_shader.c | 94 +++++++++---------- dlls/wined3d/baseshader.c | 66 +++++++------ dlls/wined3d/basetexture.c | 18 ++-- dlls/wined3d/cubetexture.c | 8 +- dlls/wined3d/device.c | 186 +++++++++++++++++++------------------ dlls/wined3d/directx.c | 14 +-- dlls/wined3d/drawprim.c | 32 +++--- dlls/wined3d/glsl_shader.c | 136 ++++++++++++++------------- dlls/wined3d/indexbuffer.c | 6 + dlls/wined3d/palette.c | 8 +- dlls/wined3d/pixelshader.c | 6 + dlls/wined3d/query.c | 8 +- dlls/wined3d/resource.c | 6 + dlls/wined3d/stateblock.c | 14 +-- dlls/wined3d/surface.c | 48 +++++----- dlls/wined3d/surface_gdi.c | 30 +++--- dlls/wined3d/swapchain.c | 6 + dlls/wined3d/texture.c | 4 - dlls/wined3d/utils.c | 28 +++--- dlls/wined3d/vertexbuffer.c | 6 + dlls/wined3d/vertexdeclaration.c | 36 ++++--- dlls/wined3d/vertexshader.c | 8 +- dlls/wined3d/volume.c | 4 - dlls/wined3d/volumetexture.c | 8 +- dlls/wined3d/wined3d_main.c | 2 dlls/wined3d/wined3d_private.h | 2 27 files changed, 392 insertions(+), 393 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3dcd3681f3012d3cd72…

1 0

Hans Leidekker : wldap32: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 54d1899210432e7a23d0596e49c3276362642cfc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54d1899210432e7a23d0596… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Sep 30 12:07:23 2006 +0200 wldap32: Win64 printf format warning fixes. --- dlls/wldap32/Makefile.in | 1 - dlls/wldap32/bind.c | 8 ++++---- dlls/wldap32/dn.c | 4 ++-- dlls/wldap32/error.c | 8 ++++---- dlls/wldap32/extended.c | 2 +- dlls/wldap32/init.c | 18 +++++++++--------- dlls/wldap32/main.c | 2 +- dlls/wldap32/misc.c | 8 ++++---- dlls/wldap32/page.c | 12 ++++++------ dlls/wldap32/parse.c | 9 +++++++-- dlls/wldap32/search.c | 20 ++++++++++---------- 11 files changed, 48 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=54d1899210432e7a23d…

1 0

Hans Leidekker : mscms: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 6ea5f656490a8deb7f4909a84a610c5bdf5c1b38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ea5f656490a8deb7f4909a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Sep 30 12:07:13 2006 +0200 mscms: Win64 printf format warning fixes. --- dlls/mscms/Makefile.in | 1 - dlls/mscms/mscms_main.c | 2 +- dlls/mscms/mscms_priv.h | 12 ------------ dlls/mscms/profile.c | 28 ++++++++++++++-------------- dlls/mscms/stub.c | 42 +++++++++++++++++++++--------------------- dlls/mscms/transform.c | 8 ++++---- 6 files changed, 40 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6ea5f656490a8deb7f4…

1 0

Hans Leidekker : dnsapi: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 4e3b3debef9e0a1575e0ca00f3621988df9b511f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e3b3debef9e0a1575e0ca0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Sep 30 12:07:06 2006 +0200 dnsapi: Win64 printf format warning fixes. --- dlls/dnsapi/Makefile.in | 1 - dlls/dnsapi/main.c | 20 ++++++++++---------- dlls/dnsapi/query.c | 10 +++++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index d8d2915..51c254a 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -6,7 +6,6 @@ MODULE = dnsapi.dll IMPORTLIB = libdnsapi.$(IMPLIBEXT) IMPORTS = netapi32 kernel32 EXTRALIBS = @RESOLVLIBS@ -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ main.c \ diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index faa9cc0..778f7a9 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -34,7 +34,7 @@ HINSTANCE hdnsapi; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { - TRACE( "(%p, %ld, %p)\n", hinst, reason, reserved ); + TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); switch (reason) { @@ -57,7 +57,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DW DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, PVOID cred, HANDLE *context ) { - FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context ); + FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context ); *context = (HANDLE)0xdeadbeef; return ERROR_SUCCESS; @@ -70,7 +70,7 @@ DNS_STATUS WINAPI DnsAcquireContextHandl DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, PVOID cred, HANDLE *context ) { - FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context ); + FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context ); *context = (HANDLE)0xdeadbeef; return ERROR_SUCCESS; @@ -83,7 +83,7 @@ DNS_STATUS WINAPI DnsAcquireContextHandl DNS_STATUS WINAPI DnsAcquireContextHandle_W( DWORD flags, PVOID cred, HANDLE *context ) { - FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context ); + FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context ); *context = (HANDLE)0xdeadbeef; return ERROR_SUCCESS; @@ -132,7 +132,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_ DWORD options, HANDLE context, PIP4_ARRAY servers, PVOID reserved ) { - FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options, + FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -145,7 +145,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_ DWORD options, HANDLE context, PIP4_ARRAY servers, PVOID reserved ) { - FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options, + FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -158,7 +158,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_ DWORD options, HANDLE context, PIP4_ARRAY servers, PVOID reserved ) { - FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options, + FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -184,7 +184,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetA( HANDLE context, PIP4_ARRAY servers, PVOID reserved ) { - FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context, + FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -197,7 +197,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetUTF HANDLE context, PIP4_ARRAY servers, PVOID reserved ) { - FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context, + FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, servers, reserved ); return ERROR_SUCCESS; } @@ -210,7 +210,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetW( HANDLE context, PIP4_ARRAY servers, PVOID reserved ) { - FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context, + FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, servers, reserved ); return ERROR_SUCCESS; } diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 836255c..509e281 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -554,7 +554,7 @@ static DNS_STATUS dns_set_serverlist( PI if (addrs->AddrCount > MAXNS) { - WARN( "too many servers: %ld only using the first: %d\n", + WARN( "too many servers: %d only using the first: %d\n", addrs->AddrCount, MAXNS ); _res.nscount = MAXNS; } @@ -656,7 +656,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name DNS_RECORDW *resultW; DNS_STATUS status; - TRACE( "(%s,%s,0x%08lx,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ), options, servers, result, reserved ); if (!name || !result) @@ -690,7 +690,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR n DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; #ifdef HAVE_RESOLV - TRACE( "(%s,%s,0x%08lx,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ), options, servers, result, reserved ); if (!name || !result) @@ -733,7 +733,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR nam DNS_RECORDA *resultA; DNS_STATUS status; - TRACE( "(%s,%s,0x%08lx,%p,%p,%p)\n", debugstr_w(name), dns_type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), dns_type_to_str( type ), options, servers, result, reserved ); if (!name || !result) @@ -804,7 +804,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CO { DNS_STATUS ret = ERROR_INVALID_PARAMETER; - TRACE( "(%d,0x%08lx,%s,%p,%p,%p)\n", config, flag, debugstr_w(adapter), + TRACE( "(%d,0x%08x,%s,%p,%p,%p)\n", config, flag, debugstr_w(adapter), reserved, buffer, len ); if (!len) return ERROR_INVALID_PARAMETER;

1 0

Michael Stefaniuc : user: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

1 0

Benjamin Arai : resutils: Implements stub dll for resutils.dll.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 3ac07aa0164a9e2923998789d77f6e7f20501d35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ac07aa0164a9e292399878… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Fri Sep 29 15:17:22 2006 -0700 resutils: Implements stub dll for resutils.dll. --- Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/.gitignore | 1 + dlls/Makefile.in | 5 +++ dlls/resutils/Makefile.in | 14 ++++++++ dlls/resutils/resutils.c | 48 +++++++++++++++++++++++++++++ dlls/resutils/resutils.spec | 71 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 144 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3ac07aa0164a9e29239…

1 0

Marcus Meissner : ntdll: Added debug registers test case.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 3a6d53e5d09da1d09211985947344b426860cdf3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a6d53e5d09da1d09211985… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 30 15:09:55 2006 +0200 ntdll: Added debug registers test case. --- dlls/ntdll/tests/exception.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 64e683b..1d00816 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -37,6 +37,7 @@ #include "wine/test.h" #ifdef __i386__ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); +static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); /* Test various instruction combinations that cause a protection fault on the i386, * and check what the resulting exception looks like. @@ -227,11 +228,65 @@ static void test_prot_fault(void) pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; } +static DWORD dreg_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + context->Eip += 2; /* Skips the popl (%eax) */ + context->Dr0 = 0; + context->Dr1 = 0; + context->Dr2 = 0; + context->Dr3 = 0; + context->Dr6 = 0; + context->Dr7 = 0x155; + return ExceptionContinueExecution; +} + +static BYTE code[5] = { + 0x31, 0xc0, /* xor %eax,%eax */ + 0x8f, 0x00, /* popl (%eax) - cause exception */ + 0xc3 /* ret */ +}; + +static void test_debug_regs(void) +{ + CONTEXT ctx; + NTSTATUS res; + struct + { + EXCEPTION_REGISTRATION_RECORD frame; + } exc_frame; + void (*func)(void) = (void*)code; + + pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); + if (!pNtCurrentTeb) + { + trace( "NtCurrentTeb not found, skipping tests\n" ); + return; + } + pNtGetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtGetContextThread" ); + if (!pNtGetContextThread) + { + trace( "NtGetContextThread not found, skipping tests\n" ); + return; + } + + exc_frame.frame.Handler = dreg_handler; + exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; + func(); + pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + res = pNtGetContextThread(GetCurrentThread(), &ctx); + ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %lx", res); + ok(ctx.Dr7 == 0x155,"failed to set debugregister 7 to 0x155"); +} + #endif /* __i386__ */ START_TEST(exception) { #ifdef __i386__ test_prot_fault(); + test_debug_regs(); #endif }

1 0