September 2011 - Wine-commits

Łukasz Wojniłowicz : Polish translation for release 1.3.28 (try 2)
by Jeremy Newman 12 Sep '11

12 Sep '11

Module: website Branch: master Commit: 8ff9860772e6248e81ac516ec56012cb54f1003f URL: http://source.winehq.org/git/website.git/?a=commit;h=8ff9860772e6248e81ac51… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 11 16:30:37 2011 +0200 Polish translation for release 1.3.28 (try 2) >From 8002279de7d0ca8f9df4ef0de7b4bcdf2f0b63a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= <lukasz.wojnilowicz(a)gmail.com> Date: Sun, 11 Sep 2011 13:22:22 +0200 Subject: Polish translation for release 1.3.28 --- news/pl/2011090901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/pl/2011090901.xml b/news/pl/2011090901.xml new file mode 100644 index 0000000..06b654c --- /dev/null +++ b/news/pl/2011090901.xml @@ -0,0 +1,19 @@ +<news> +<date>Wrzesień 9, 2011</date> +<title>Wydano Wine 1.3.28</title> +<body> + Wydanie rozwojowe Wine 1.3.28 jest już dostępne. + <a href="{$root}/announce/1.3.28">Co nowego</a> w tym wydaniu: +<ul> + <li>Wstępna wersja programu przetwarzającego VBScript.</li> + <li>Automagiczny wybór sterownika dźwiękowego.</li> + <li>Wsparcie dla informacji o wolumenie na systemach plików UDF.</li> + <li>Program wyświetlający OpenGL jest teraz domyślny dla DirectDraw.</li> + <li>Okno dialogowe konfiguracji urządzenia w DirectInput.</li> + <li>Wsparcie SetDIBitsToDevice w silniku DIB.</li> + <li>Kilka ulepszeń w programie przetwarzającym cmd.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.28.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.28
by Jeremy Newman 09 Sep '11

09 Sep '11

Module: website Branch: master Commit: 5d22b21d06d6898c8353ea84710435e777b8db91 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d22b21d06d6898c8353ea… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 9 20:20:00 2011 +0200 French translation for release 1.3.28 --- news/fr/2011090901.xml | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/news/fr/2011090901.xml b/news/fr/2011090901.xml new file mode 100644 index 0000000..603e9af --- /dev/null +++ b/news/fr/2011090901.xml @@ -0,0 +1,22 @@ +<news> +<date>9 septembre 2011</date> +<title>Sortie de Wine 1.3.28</title> +<body> + La version de développement 1.3.28 de Wine est disponible. + <a href="{$root}/announce/1.3.28">Nouveautés</a> de cette version : +<ul> + <li>Version initiale de l'analyseur syntaxique VBScript.</li> + <li>Sélection de pilote audio automagique.</li> + <li>Prise en charge des informations de volume sur les systèmes de fichiers UDF.</li> + <li>Le moteur de rendu OpenGL est désormais utilisé par défaut dans DirectDraw.</li> + <li>Boîte de dialogue de configuration de périphérique dans DirectInput.</li> + <li>Prise en charge de SetDIBitsToDevice dans le moteur DIB.</li> + <li>Plusieurs améliorations dans l'analyseur syntaxique cmd.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.28.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.28
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: website Branch: master Commit: 17ff1b9c03940b2294bd1ddc0f576d4ccedf82e5 URL: http://source.winehq.org/git/website.git/?a=commit;h=17ff1b9c03940b2294bd1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 19:53:08 2011 +0200 Wine release 1.3.28 --- news/en/2011090901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/en/2011090901.xml b/news/en/2011090901.xml new file mode 100644 index 0000000..aef8b6d --- /dev/null +++ b/news/en/2011090901.xml @@ -0,0 +1,19 @@ +<news> +<date>September 9, 2011</date> +<title>Wine 1.3.28 Released</title> +<body> + The Wine development release 1.3.28 is now available. + <a href="{$root}/announce/1.3.28">What's new</a> in this release: +<ul> + <li>Initial version of the VBScript parser.</li> + <li>Automagic audio driver selection.</li> + <li>Support for volume information on UDF file systems.</li> + <li>The OpenGL renderer is now the default for DirectDraw.</li> + <li>Device configuration dialog in DirectInput.</li> + <li>SetDIBitsToDevice support in the DIB engine.</li> + <li>Several improvements in the cmd parser.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.28.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.28.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 3b40c03a8f0e3dcbb236d59125b115b2501086f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b40c03a8f0e3dcbb236d5912… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 19:43:48 2011 +0200 Release 1.3.28. --- ANNOUNCE | 1142 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 651 insertions(+), 511 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b40c03a8f0e3dcbb236d…

1 0

Tag wine-1.3.28 : Alexandre Julliard : Release 1.3.28
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: refs/tags/wine-1.3.28 Tag: 73c3f3a50ec99f64b71c3b1616a0661bdce5bb9d URL: http://source.winehq.org/git/wine.git/?a=tag;h=73c3f3a50ec99f64b71c3b1616a0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 19:43:49 2011 +0200 Release 1.3.28

1 0

Jacek Caban : vbscript: Added empty literal support.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 6d8f84e5333bbb822127e636e1b4554f88629679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8f84e5333bbb822127e636e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:26 2011 +0200 vbscript: Added empty literal support. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 10 ++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/tests/lang.vbs | 3 +++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e9b651d..aa9881c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -196,6 +196,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) switch(expr->type) { case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + case EXPR_EMPTY: + return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_MEMBER: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index ec56fa9..4e16d74 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -251,6 +251,16 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_empty(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_EMPTY; + return stack_push(ctx, &v); +} + static HRESULT interp_not(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 607bdec..409e737 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_BOOL, + EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7bfdae9..36ebf17 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -35,6 +35,7 @@ static int parser_error(const char*); static void source_add_statement(parser_ctx_t*,statement_t*); +static void *new_expression(parser_ctx_t*,expression_type_t,size_t); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); @@ -145,6 +146,7 @@ LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } + | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } PrimaryExpression : '(' Expression ')' { $$ = $2; } @@ -172,7 +174,7 @@ static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) ctx->option_explicit = option_explicit; } -static void *new_expression(parser_ctx_t *ctx, expression_type_t type, unsigned size) +static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size) { expression_t *expr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1c9512a..3614f96 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -29,10 +29,13 @@ Call ok(true = true, "true = true is false") Call ok(false = false, "false = false is false") Call ok(not (true = false), "true = false is true") Call ok("x" = "x", """x"" = ""x"" is false") +Call ok(empty = empty, "empty = empty is false") +Call ok(empty = "", "empty = """" is false") Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") Call ok(getVT("test") = "VT_BSTR", "getVT(""test"") is not VT_BSTR") +Call ok(getVT(Empty) = "VT_EMPTY", "getVT(Empty) is not VT_EMPTY") reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0219334..aa90f4c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -76,6 +76,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \

1 0

Jacek Caban : vbscript: Added null literal support.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 4520815c0229733eb578bdd048ff698a0e393687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4520815c0229733eb578bdd04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:36 2011 +0200 vbscript: Added null literal support. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 20 ++++++++++++++++++-- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/vbscript.h | 1 + 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index aa9881c..181f6c1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -204,6 +204,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); + case EXPR_NULL: + return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); default: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4e16d74..d02516e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -261,6 +261,16 @@ static HRESULT interp_empty(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_null(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_NULL; + return stack_push(ctx, &v); +} + static HRESULT interp_not(exec_ctx_t *ctx) { variant_val_t val; @@ -291,8 +301,14 @@ static HRESULT cmp_oper(exec_ctx_t *ctx) return hres; hres = stack_pop_val(ctx, &l); - if(SUCCEEDED(hres)) - hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); + if(SUCCEEDED(hres)) { + if(V_VT(l.v) == VT_NULL || V_VT(r.v) == VT_NULL) { + FIXME("comparing nulls is not implemented\n"); + hres = E_NOTIMPL; + }else { + hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); + } + } release_val(&r); release_val(&l); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 409e737..56b3e1b 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -22,6 +22,7 @@ typedef enum { EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, + EXPR_NULL, EXPR_STRING } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 36ebf17..c1c7e61 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -147,6 +147,7 @@ LiteralExpression | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } + | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } PrimaryExpression : '(' Expression ')' { $$ = $2; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3614f96..8a5a9c5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -37,5 +37,6 @@ Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") Call ok(getVT("test") = "VT_BSTR", "getVT(""test"") is not VT_BSTR") Call ok(getVT(Empty) = "VT_EMPTY", "getVT(Empty) is not VT_EMPTY") +Call ok(getVT(null) = "VT_NULL", "getVT(null) is not VT_NULL") reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index aa90f4c..199ca70 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -81,6 +81,7 @@ typedef enum { X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(not, 1, 0, 0) \ + X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(string, 1, ARG_STR, 0)

1 0

Bruno Jesus : winecfg: Write the ProductName registry key based on selected OS.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 9f24f14cc03ee5d7ce65579ce1ab10583d9321ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f24f14cc03ee5d7ce65579ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 8 21:20:52 2011 -0300 winecfg: Write the ProductName registry key based on selected OS. --- programs/winecfg/appdefaults.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f90607e..d2c9e7d 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -424,10 +424,13 @@ static void on_winver_change(HWND dialog) win_versions[selection].dwMinorVersion, win_versions[selection].dwBuildNumber); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", win_versions[selection].szCSDVersion); + snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription); + set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "ProductName", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyWindNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyEnvNT, "OS", NULL); @@ -441,6 +444,8 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", win_versions[selection].szCSDVersion); snprintf(Buffer, sizeof(Buffer), "%d", win_versions[selection].dwBuildNumber); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", Buffer); + snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", win_versions[selection].szProductType); set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyWindNT, "CSDVersion", MAKEWORD( win_versions[selection].wServicePackMinor, @@ -449,6 +454,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "ProductName", NULL); set_reg_key(config_key, keypath(""), "Version", NULL); break; @@ -456,11 +462,13 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyWindNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyEnvNT, "OS", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "ProductName", NULL); set_reg_key(config_key, keypath(""), "Version", win_versions[selection].szVersion); break; }

1 0

Louis Lenders : wine.inf: Add registry key HKLM, %CurrentVersionNT%, " ProductName".
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: e3edf08e8ca6862868fadc7598f56f51ab462e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3edf08e8ca6862868fadc759… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Aug 15 21:11:36 2011 +0200 wine.inf: Add registry key HKLM,%CurrentVersionNT%,"ProductName". --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1113400..e317a0d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3049,6 +3049,7 @@ HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

1 0

Alexandre Julliard : secur32/tests: Avoid crash on test failure.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 0359f9d430ea95df3f349d2f6be67d59f8cdd1e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0359f9d430ea95df3f349d2f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 15:53:49 2011 +0200 secur32/tests: Avoid crash on test failure. --- dlls/secur32/tests/schannel.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 1b6fdf8..a729394 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -746,12 +746,15 @@ static void test_communication(void) buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = pDecryptMessage(&context, &buffers[0], 0, NULL); ok(status == SEC_E_OK, "DecryptMessage failed: %08x\n", status); - ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); - ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); - ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); + if (status == SEC_E_OK) + { + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); + ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); + ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); - data = buffers[0].pBuffers[1].pvBuffer; - data[buffers[0].pBuffers[1].cbBuffer] = 0; + data = buffers[0].pBuffers[1].pvBuffer; + data[buffers[0].pBuffers[1].cbBuffer] = 0; + } pDeleteSecurityContext(&context); pFreeCredentialsHandle(&cred_handle);

1 0