April 2015 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Initialize a variable (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 55b678e18686862e25d1dc310d27a6f2c751dadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b678e18686862e25d1dc310… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:20:04 2015 +0200 msi: Initialize a variable (valgrind). --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2c476fa..2b531da 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4201,7 +4201,7 @@ UINT WINAPI MsiProvideComponentA( LPCSTR product, LPCSTR feature, LPCSTR compone { WCHAR *productW = NULL, *componentW = NULL, *featureW = NULL, *bufW = NULL; UINT r = ERROR_OUTOFMEMORY; - DWORD lenW; + DWORD lenW = 0; int len; TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_a(product), debugstr_a(component), debugstr_a(feature), mode, buf, buflen);

1 0

Dmitry Timoshkov : server: GetQueueStatus should clear only checked queue changed bits.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: c0e876cb9e0f0d5663eddeda0fdbf7d2b491f9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e876cb9e0f0d5663eddeda0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 16:01:37 2015 +0800 server: GetQueueStatus should clear only checked queue changed bits. --- dlls/user32/input.c | 4 ++-- dlls/user32/tests/msg.c | 1 - include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/queue.c | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 57594a7..4fcc531 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -434,7 +434,7 @@ DWORD WINAPI GetQueueStatus( UINT flags ) SERVER_START_REQ( get_queue_status ) { - req->clear = 1; + req->clear_bits = flags; wine_server_call( req ); ret = MAKELONG( reply->changed_bits & flags, reply->wake_bits & flags ); } @@ -454,7 +454,7 @@ BOOL WINAPI GetInputState(void) SERVER_START_REQ( get_queue_status ) { - req->clear = 0; + req->clear_bits = 0; wine_server_call( req ); ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4794b12..50e1e2b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14699,7 +14699,6 @@ static void test_SendMessage_other_thread(int thread_n) } ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); -todo_wine ok(ret == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call GetMessage\n"); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d27914a..37dad95 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2822,7 +2822,7 @@ struct set_queue_mask_reply struct get_queue_status_request { struct request_header __header; - int clear; + unsigned int clear_bits; }; struct get_queue_status_reply { @@ -5972,6 +5972,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 467 +#define SERVER_PROTOCOL_VERSION 468 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 54501e8..5d57f96 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2059,7 +2059,7 @@ enum char_info_mode /* Get the current message queue status */ @REQ(get_queue_status) - int clear; /* should we clear the change bits? */ + unsigned int clear_bits; /* should we clear the change bits? */ @REPLY unsigned int wake_bits; /* wake bits */ unsigned int changed_bits; /* changed bits since last time */ diff --git a/server/queue.c b/server/queue.c index 3a321cd..912df3a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2198,7 +2198,7 @@ DECL_HANDLER(get_queue_status) { reply->wake_bits = queue->wake_bits; reply->changed_bits = queue->changed_bits; - if (req->clear) queue->changed_bits = 0; + queue->changed_bits &= ~req->clear_bits; } else reply->wake_bits = reply->changed_bits = 0; } diff --git a/server/request.h b/server/request.h index f94235f..daa5301 100644 --- a/server/request.h +++ b/server/request.h @@ -1416,7 +1416,7 @@ C_ASSERT( sizeof(struct set_queue_mask_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_queue_mask_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_queue_mask_reply, changed_bits) == 12 ); C_ASSERT( sizeof(struct set_queue_mask_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear_bits) == 12 ); C_ASSERT( sizeof(struct get_queue_status_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, changed_bits) == 12 ); diff --git a/server/trace.c b/server/trace.c index 20895b1..6ac0549 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2546,7 +2546,7 @@ static void dump_set_queue_mask_reply( const struct set_queue_mask_reply *req ) static void dump_get_queue_status_request( const struct get_queue_status_request *req ) { - fprintf( stderr, " clear=%d", req->clear ); + fprintf( stderr, " clear_bits=%08x", req->clear_bits ); } static void dump_get_queue_status_reply( const struct get_queue_status_reply *req )

1 0

Nikolay Sivov : wshom.ocx: Fix BSTR allocation for string registry values (Valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: a8150b53b67b30cf87c4c401c66aade9af751ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8150b53b67b30cf87c4c401c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 15:53:32 2015 +0300 wshom.ocx: Fix BSTR allocation for string registry values (Valgrind). --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 826e290..f9ec9dc 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1376,7 +1376,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v case REG_SZ: case REG_EXPAND_SZ: V_VT(value) = VT_BSTR; - V_BSTR(value) = SysAllocStringLen((WCHAR*)data, datalen - sizeof(WCHAR)); + V_BSTR(value) = SysAllocString((WCHAR*)data); if (!V_BSTR(value)) hr = E_OUTOFMEMORY; break; diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 9591c5c..46ffc58 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -276,7 +276,7 @@ static void test_registry(void) { static const WCHAR keypathW[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\',0}; - + static const WCHAR regsz2W[] = {'r','e','g','s','z','2',0}; static const WCHAR regszW[] = {'r','e','g','s','z',0}; static const WCHAR regdwordW[] = {'r','e','g','d','w','o','r','d',0}; static const WCHAR regbinaryW[] = {'r','e','g','b','i','n','a','r','y',0}; @@ -332,6 +332,9 @@ static void test_registry(void) ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7); ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regsz2", 0, REG_SZ, (const BYTE*)"foobar\0f", 9); + ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9); ok(ret == 0, "got %d\n", ret); @@ -355,6 +358,18 @@ static void test_registry(void) VariantClear(&value); SysFreeString(name); + /* REG_SZ with embedded NULL */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regsz2W); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + VariantClear(&value); + SysFreeString(name); + /* REG_DWORD */ lstrcpyW(pathW, keypathW); lstrcatW(pathW, regdwordW);

1 0

Henri Verbeet : wined3d: Slightly simplify get_info_log_line().
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 6e4ad78ff4aa501adb38c5e0a880d4842b7d05a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ad78ff4aa501adb38c5e0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:53 2015 +0200 wined3d: Slightly simplify get_info_log_line(). --- dlls/wined3d/glsl_shader.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84fc1a2..655bb33 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -279,11 +279,9 @@ static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, co shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); } -/* Extract a line from the info log. - * Note that this modifies the source string. */ -static char *get_info_log_line(char **ptr) +static const char *get_info_log_line(const char **ptr) { - char *p, *q; + const char *p, *q; p = *ptr; if (!(q = strstr(p, "\n"))) @@ -292,7 +290,6 @@ static char *get_info_log_line(char **ptr) *ptr += strlen(p); return p; } - *q = '\0'; *ptr = q + 1; return p; @@ -316,7 +313,7 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id * that if there are errors. */ if (length > 1) { - char *ptr, *line; + const char *ptr, *line; log = HeapAlloc(GetProcessHeap(), 0, length); /* The info log is supposed to be zero-terminated, but at least some @@ -333,12 +330,12 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id if (gl_info->quirks & WINED3D_QUIRK_INFO_LOG_SPAM) { WARN("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) WARN(" %s\n", line); + while ((line = get_info_log_line(&ptr))) WARN(" %.*s", (int)(ptr - line), line); } else { FIXME("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); } HeapFree(GetProcessHeap(), 0, log); } @@ -373,7 +370,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGetAttachedShaders(program, shader_count, NULL, shaders)); for (i = 0; i < shader_count; ++i) { - char *ptr, *line; + const char *ptr, *line; GLint tmp; GL_EXTCALL(glGetShaderiv(shaders[i], GL_SHADER_SOURCE_LENGTH, &tmp)); @@ -401,7 +398,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf ptr = source; GL_EXTCALL(glGetShaderSource(shaders[i], source_size, NULL, source)); - while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); FIXME("\n"); }

1 0

Hans Leidekker : iexplore: Update version to 9.0.8112.16421.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: ae84730e3429fc156f6729444e4b3fef22cd6a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae84730e3429fc156f6729444… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:19:20 2015 +0200 iexplore: Update version to 9.0.8112.16421. --- programs/iexplore/iexplore.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index a45df9f..41622b1 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -33,9 +33,9 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" -HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"98112" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.0.8112.16421" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.0.8112.16421" [Strings]

1 0

Michael Stefaniuc : rpcrt4: Don't open code CONTAINING_RECORD().
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 0a8427dc156a6e97f83886e108f48993e8df33cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8427dc156a6e97f83886e10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 21 10:22:04 2015 +0200 rpcrt4: Don't open code CONTAINING_RECORD(). --- dlls/rpcrt4/cstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 0ddb1aa..838ed03 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -59,7 +59,7 @@ typedef struct static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) { - return (cstdstubbuffer_delegating_t*)((char *)iface - FIELD_OFFSET(cstdstubbuffer_delegating_t, stub_buffer)); + return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); } HRESULT CStdStubBuffer_Construct(REFIID riid,

1 0

Dmitry Timoshkov : user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: d31e8a311871ba98f22b2a33b2fb7bdbba9cc2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31e8a311871ba98f22b2a33b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 16:01:30 2015 +0800 user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test. --- dlls/user32/tests/msg.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b014dd9..4794b12 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14609,6 +14609,9 @@ static const struct message send_message_2[] = { }; static const struct message send_message_3[] = { { WM_USER+3, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_4[] = { { WM_USER+1, sent|wparam|lparam, 0, 0 }, { 0 } }; @@ -14716,10 +14719,15 @@ todo_wine ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); + ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); + ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + + trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + ok_sequence(send_message_4, "SendMessage from other thread 4", FALSE); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -14733,7 +14741,7 @@ else trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); - ok_sequence(WmEmptySeq, "SendMessage from other thread 4", thread_n == 2); + ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); ok(ret == 0, "wrong status %08x\n", ret);

1 0

Andrey Gusev : Ukrainian translation for release 1.7.41
by Jeremy Newman April 20, 2015

April 20, 2015

Module: website Branch: master Commit: fa15d9870746621e9a3ee3bff46a07f34f39c77e URL: http://source.winehq.org/git/website.git/?a=commit;h=fa15d9870746621e9a3ee3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Apr 17 18:11:21 2015 +0300 Ukrainian translation for release 1.7.41 --- news/uk/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2015041701.xml b/news/uk/2015041701.xml new file mode 100644 index 0000000..924f375 --- /dev/null +++ b/news/uk/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>17 квітня 2015</date> +<title>Випущено Wine 1.7.41</title> +<body> + Розробницький реліз Wine 1.7.41 наразі доступний. + <a href="{$root}/announce/1.7.41">Що нового</a> в цьому релізі: +<ul> + <li>Більша підтримка Known Folders у Shell.</li> + <li>Більша підтримка для Kernel Job Objects.</li> + <li>Більше вдосконалень для підтримки патчів для MSI.</li> + <li>Деякі виправлення оформлення.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Huw Davies : rpcrt4/tests: Avoid a double-free.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: b24ce98af36431d1b7715db4090d903b82d095c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24ce98af36431d1b7715db40… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 20 09:57:29 2015 +0100 rpcrt4/tests: Avoid a double-free. Commit 4cf70b1418260fda95d69bcb50374a64f1ce895b was causing the tests to crash. The reason is due to a Wine bug in NdrPointerUnmarshall(). Windows returns the same pointer (which is later released in a call to NdrPointerFree()), while Wine makes a copy which Valgrind correctly spots is leaked. --- dlls/rpcrt4/tests/ndr_marshall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 917c9e5..411ba8b 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1560,6 +1560,11 @@ todo_wine { ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } + /* Prevent a memory leak when running with Wine. + Remove once the todo_wine block above is fixed. */ + if (mem != mem_orig) + HeapFree(GetProcessHeap(), 0, mem_orig); + my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); @@ -1590,7 +1595,6 @@ todo_wine { "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } - HeapFree(GetProcessHeap(), 0, mem_orig); my_alloc_called = 0; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc));

1 0

Huw Davies : dssenh/tests: Fix some tests on Win 8.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: ad9910bdfbb2294dccf89520647ce1407e698750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9910bdfbb2294dccf895206… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 20 08:56:39 2015 +0100 dssenh/tests: Fix some tests on Win 8. --- dlls/dssenh/tests/dssenh.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 8b83586..feb9a30 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -20,6 +20,8 @@ #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -186,6 +188,7 @@ struct keylength_test { DWORD expectedError; BOOL brokenResult; DWORD brokenError; + DWORD altError; }; static const struct keylength_test baseDSS_keylength[] = { @@ -197,7 +200,7 @@ static const struct keylength_test baseDSS_keylength[] = { /* min 512 max 1024 increment by 64 */ {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, @@ -214,7 +217,7 @@ static const struct keylength_test baseDSS_keylength[] = { /* min 512 max 1024, increment by 64 */ {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -230,7 +233,7 @@ static const struct keylength_test dssDH_keylength[] = { {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, @@ -248,7 +251,7 @@ static const struct keylength_test dssDH_keylength[] = { {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -269,7 +272,7 @@ static const struct keylength_test dssENH_keylength[] = { {AT_KEYEXCHANGE, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1032 << 16, FALSE, NTE_BAD_FLAGS}, @@ -287,7 +290,7 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -307,7 +310,7 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t /* success */ if(tests[i].expectedResult) { - ok(result, "Expected a key, got %08x\n", GetLastError()); + ok(result, "%d: Expected a key, got %08x\n", i, GetLastError()); result = CryptDestroyKey(key); ok(result, "Expected no errors.\n"); } @@ -315,19 +318,21 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t { /* error but success on older system */ if(tests[i].brokenResult) ok((!result && GetLastError() == tests[i].expectedError) || - broken(result), "Expected a key, got %x.\n", GetLastError()); + broken(result), "%d: Didn't really expect a key, got %x, %d\n", + i, GetLastError(), result); else { /* error */ if(!tests[i].brokenError) ok(!result && GetLastError() == tests[i].expectedError, - "Expected a key, got %x.\n", GetLastError()); + "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); /* error but different error on older system */ else ok(!result && (GetLastError() == tests[i].expectedError || - broken(GetLastError() == tests[i].brokenError)), - "Expected a key, got %x.\n", GetLastError()); + GetLastError() == tests[i].altError || + broken(GetLastError() == tests[i].brokenError) ), + "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); } } }

1 0