wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Alexandre Julliard : sfnt2fon: Use getopt_long to allow arbitrary option order.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 207ae9f5c23af91d678c62e8bcf0833c286e5978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=207ae9f5c23af91d678c62e8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 17:06:49 2014 +0100 sfnt2fon: Use getopt_long to allow arbitrary option order. --- tools/sfnt2fon/sfnt2fon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 4b47682..7612bc2 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -646,7 +646,7 @@ static char **parse_options( int argc, char **argv ) { int optc; - while ((optc = getopt( argc, argv, "d:ho:qr:s" )) != -1) + while ((optc = getopt_long( argc, argv, "d:ho:qr:s", NULL, NULL )) != -1) { switch(optc) {

1 0

Alexandre Julliard : tools: Remove no longer used fnt2fon tool.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: ab588410917dcae4ec1d769c5375c2fc6718183c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab588410917dcae4ec1d769c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 10:53:04 2014 +0100 tools: Remove no longer used fnt2fon tool. --- tools/Makefile.in | 5 - tools/fnt2fon.c | 388 ----------------------------------------------------- 2 files changed, 393 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab588410917dcae4ec1d7…

1 0

Alexandre Julliard : tools: Move sfnt2fnt to its own directory.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 7307e2be69db349ec98f75a91308e608da22e260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7307e2be69db349ec98f75a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 10:44:47 2014 +0100 tools: Move sfnt2fnt to its own directory. Also rename to sfnt2fon to better reflect usage and avoid conflicts with the previous binary on updates. --- Make.vars.in | 1 - Makefile.in | 6 +++--- configure | 1 + configure.ac | 1 + tools/Makefile.in | 12 ++---------- tools/makedep.c | 4 ++-- tools/sfnt2fon/Makefile.in | 9 +++++++++ tools/{sfnt2fnt.c => sfnt2fon/sfnt2fon.c} | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index a0727bd..684d673 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -50,7 +50,6 @@ CROSSTARGET = @CROSSTARGET@ LINGUAS = @LINGUAS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) -SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT) WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) LIBPORT = $(top_builddir)/libs/port/libwine_port.a diff --git a/Makefile.in b/Makefile.in index 8d4dec4..5c163b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,11 +53,11 @@ __builddeps__: __tooldeps__ include .PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__ loader server: libs/port libs/wine tools -fonts: tools +fonts: tools/sfnt2fon include: tools tools/widl -libs/wine: libs/port +libs/wine tools: libs/port tools/wmc tools/wrc: tools -tools tools/wmc tools/wrc: libs/wine +tools/sfnt2fon tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp libs/port libs/wine libs/wpp: include/config.h diff --git a/configure b/configure index 8c3e28e..d2c416e 100755 --- a/configure +++ b/configure @@ -17331,6 +17331,7 @@ wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib,manpage wine_fn_config_tool tools clean,install-dev,install-lib,manpage +wine_fn_config_tool tools/sfnt2fon clean wine_fn_config_tool tools/widl clean,install-dev,manpage wine_fn_config_tool tools/winebuild clean,install-dev,manpage wine_fn_config_tool tools/winedump clean,install-dev,manpage diff --git a/configure.ac b/configure.ac index c6769fc..de6c687 100644 --- a/configure.ac +++ b/configure.ac @@ -3356,6 +3356,7 @@ WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) WINE_CONFIG_TOOL(tools,[clean,install-dev,install-lib,manpage]) +WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage]) diff --git a/tools/Makefile.in b/tools/Makefile.in index a7cc154..582b140 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,11 +1,7 @@ -EXTRAINCL = $(FREETYPE_CFLAGS) -FREETYPELIBS = $(FREETYPE_LIBS) - PROGRAMS = \ fnt2fon$(EXEEXT) \ make_ctests$(EXEEXT) \ - make_xftmpl$(EXEEXT) \ - sfnt2fnt$(EXEEXT) + make_xftmpl$(EXEEXT) MANPAGES = \ winemaker.de.UTF-8.man.in \ @@ -16,8 +12,7 @@ C_SRCS = \ fnt2fon.c \ make_ctests.c \ make_xftmpl.c \ - makedep.c \ - sfnt2fnt.c + makedep.c IN_SRCS = \ wineapploader.in @@ -35,9 +30,6 @@ make_xftmpl$(EXEEXT): make_xftmpl.o fnt2fon$(EXEEXT): fnt2fon.o $(CC) $(CFLAGS) -o $@ fnt2fon.o $(LIBPORT) $(LDFLAGS) -sfnt2fnt$(EXEEXT): sfnt2fnt.o - $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) - .PHONY: install install-lib install-dev uninstall install install-lib:: diff --git a/tools/makedep.c b/tools/makedep.c index 8ce9da0..11c921c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1655,9 +1655,9 @@ static struct strarray output_sources(void) else if (!strcmp( ext, "fon" )) /* bitmap font file */ { strarray_add( &all_targets, source->name ); - output( "%s.fon: %s %s\n", obj, tools_dir_path( "sfnt2fnt" ), + output( "%s.fon: %s %s\n", obj, tools_path( "sfnt2fon" ), src_dir_path( source->sourcename )); - output( "\t%s -o $@ %s %s\n", tools_dir_path( "sfnt2fnt" ), + output( "\t%s -o $@ %s %s\n", tools_path( "sfnt2fon" ), src_dir_path( source->sourcename ), source->args ); output( "install install-lib:: %s\n", source->name ); output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s\n", source->name, source->name ); diff --git a/tools/sfnt2fon/Makefile.in b/tools/sfnt2fon/Makefile.in new file mode 100644 index 0000000..a975154 --- /dev/null +++ b/tools/sfnt2fon/Makefile.in @@ -0,0 +1,9 @@ +PROGRAMS = sfnt2fon$(EXEEXT) + +C_SRCS = sfnt2fon.c + +EXTRAINCL = $(FREETYPE_CFLAGS) +EXTRALIBS = $(FREETYPE_LIBS) + +sfnt2fon$(EXEEXT): sfnt2fon.o + $(CC) $(CFLAGS) -o $@ sfnt2fon.o $(LIBWINE_STATIC) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fon/sfnt2fon.c similarity index 99% rename from tools/sfnt2fnt.c rename to tools/sfnt2fon/sfnt2fon.c index 925855f..4b47682 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -1,5 +1,5 @@ /* - * sfnttofnt. Bitmap only ttf to Window fnt file converter + * sfnt2fon. Bitmap-only ttf to Windows font file converter * * Copyright 2004 Huw Davies *

1 0

André Hentschel : Fix link to wwn xml source
by Jeremy Newman 06 Feb '14

06 Feb '14

Module: website Branch: master Commit: 231725e7e23281e62bc25e839a08b086d3ff81b2 URL: http://source.winehq.org/git/website.git/?a=commit;h=231725e7e23281e62bc25e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 5 00:32:59 2014 +0100 Fix link to wwn xml source --- templates/en/wwn_content.template | 2 +- templates/he/wwn_content.template | 2 +- templates/tr/wwn_content.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/wwn_content.template b/templates/en/wwn_content.template index 5707b77..9a3110c 100644 --- a/templates/en/wwn_content.template +++ b/templates/en/wwn_content.template @@ -6,7 +6,7 @@ <div style="width: 250px; float: left; padding: 0 10px 0 10px;"> {$summary} - <p class="small"><a href="{$root}/wwn/source/{$xml}">XML source</a><br> + <p class="small"><a href="{$root}/wwn/en/{$xml}.xml">XML source</a><br> <a href="{$root}/wwn/">More Issues...</a></p> </div> diff --git a/templates/he/wwn_content.template b/templates/he/wwn_content.template index d6c2ae1..dc36383 100644 --- a/templates/he/wwn_content.template +++ b/templates/he/wwn_content.template @@ -6,7 +6,7 @@ <div style="width: 250px; float: left; padding: 0 10px 0 10px;"> {$summary} - <p class="small"><a href="{$root}/wwn/source/{$xml}">מקור XML</a><br> + <p class="small"><a href="{$root}/wwn/en/{$xml}.xml">מקור XML</a><br> <a href="{$root}/wwn/">דיווחים נוספים...</a></p> </div> diff --git a/templates/tr/wwn_content.template b/templates/tr/wwn_content.template index 6188d48..a1d7757 100644 --- a/templates/tr/wwn_content.template +++ b/templates/tr/wwn_content.template @@ -6,7 +6,7 @@ <div style="width: 250px; float: left; padding: 0 10px 0 10px;"> {$summary} - <p class="small"><a href="{$root}/wwn/source/{$xml}">XML kaynağı</a><br> + <p class="small"><a href="{$root}/wwn/en/{$xml}.xml">XML kaynağı</a><br> <a href="{$root}/wwn/">Daha Fazla Sorun...</a></p> </div>

1 0

Nikolay Sivov : crypt32/tests: Accept another error code on Win8.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: c7a11f9ed619dfd586e96917faa1ee83d64c7352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a11f9ed619dfd586e96917f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 21:50:32 2014 +0400 crypt32/tests: Accept another error code on Win8. --- dlls/crypt32/tests/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index bd67c18..9c95629 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3724,7 +3724,7 @@ static void testAcquireCertPrivateKey(void) &keyProvInfo); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); - ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY, + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_KEYSET /* win8 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Bruno Jesus : bcrypt/tests: Add tests for BCryptGenRandom.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: a5807d08c57e60e600f746a1d057db8688a39290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5807d08c57e60e600f746a1d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 3 16:24:48 2014 -0200 bcrypt/tests: Add tests for BCryptGenRandom. --- configure | 1 + configure.ac | 1 + dlls/bcrypt/tests/Makefile.in | 5 +++ dlls/bcrypt/tests/bcrypt.c | 76 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+) diff --git a/configure b/configure index 4e999a9..8c3e28e 100755 --- a/configure +++ b/configure @@ -16653,6 +16653,7 @@ wine_fn_config_test dlls/avifil32/tests avifil32_test wine_fn_config_dll avifile.dll16 enable_win16 wine_fn_config_dll avrt enable_avrt implib wine_fn_config_dll bcrypt enable_bcrypt +wine_fn_config_test dlls/bcrypt/tests bcrypt_test wine_fn_config_dll browseui enable_browseui clean,po wine_fn_config_test dlls/browseui/tests browseui_test wine_fn_config_dll cabinet enable_cabinet implib diff --git a/configure.ac b/configure.ac index 7f3c35b..c6769fc 100644 --- a/configure.ac +++ b/configure.ac @@ -2678,6 +2678,7 @@ WINE_CONFIG_TEST(dlls/avifil32/tests) WINE_CONFIG_DLL(avifile.dll16,enable_win16) WINE_CONFIG_DLL(avrt,,[implib]) WINE_CONFIG_DLL(bcrypt) +WINE_CONFIG_TEST(dlls/bcrypt/tests) WINE_CONFIG_DLL(browseui,,[clean,po]) WINE_CONFIG_TEST(dlls/browseui/tests) WINE_CONFIG_DLL(cabinet,,[implib]) diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in new file mode 100644 index 0000000..b193519 --- /dev/null +++ b/dlls/bcrypt/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = bcrypt.dll +IMPORTS = user32 + +C_SRCS = \ + bcrypt.c diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c new file mode 100644 index 0000000..1d18634 --- /dev/null +++ b/dlls/bcrypt/tests/bcrypt.c @@ -0,0 +1,76 @@ +/* + * Unit test for bcrypt functions + * + * Copyright 2014 Bruno Jesus + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <bcrypt.h> + +#include "wine/test.h" + +static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, + ULONG cbBuffer, ULONG dwFlags); + +static BOOL Init(void) +{ + HMODULE hbcrypt = LoadLibraryA("bcrypt.dll"); + if (!hbcrypt) + { + win_skip("bcrypt library not available\n"); + return FALSE; + } + + pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); + + return TRUE; +} + +static void test_BCryptGenRandom(void) +{ + NTSTATUS ret; + UCHAR buffer[256]; + + if (!pBCryptGenRandom) + { + win_skip("BCryptGenRandom is not available\n"); + return; + } + + todo_wine { + ret = pBCryptGenRandom(NULL, NULL, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); + } +} + +START_TEST(bcrypt) +{ + if (!Init()) + return; + + test_BCryptGenRandom(); +}

1 0

Bruno Jesus : bcrypt: Add BCryptGenRandom stub.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 52aca431e4acb099ae66d5689616793b11314ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52aca431e4acb099ae66d5689… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 3 16:24:21 2014 -0200 bcrypt: Add BCryptGenRandom stub. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 17 ++++++++++++++--- include/bcrypt.h | 5 +++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index e1ffb8a..87623f8 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -24,7 +24,7 @@ @ stub BCryptFinalizeKeyPair @ stub BCryptFinishHash @ stub BCryptFreeBuffer -@ stub BCryptGenRandom +@ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey @ stub BCryptGetFipsAlgorithmMode diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 441b3ef..02d0a7d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -18,11 +18,15 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" #include "winbase.h" #include "bcrypt.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); @@ -48,5 +52,12 @@ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, *ppAlgList=NULL; *pAlgCount=0; - return ERROR_CALL_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULONG count, ULONG flags) +{ + FIXME("%p, %p, %u, %08x - stub\n", algorithm, buffer, count, flags); + + return STATUS_NOT_IMPLEMENTED; } diff --git a/include/bcrypt.h b/include/bcrypt.h index 43d1f94..e7e7a59 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -47,4 +47,9 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER ULONG dwFlags; } BCRYPT_ALGORITHM_IDENTIFIER; +typedef PVOID BCRYPT_ALG_HANDLE; + +#define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 +#define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002 + #endif /* __WINE_BCRYPT_H */

1 0

Hans Leidekker : winhttp/tests: Move the remaining tests to test.winehq.org.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 97505a7475a5c7fcfa2cc03bcea0438aa5af5e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97505a7475a5c7fcfa2cc03bc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 5 15:31:51 2014 +0100 winhttp/tests: Move the remaining tests to test.winehq.org. --- dlls/winhttp/tests/winhttp.c | 57 +++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97505a7475a5c7fcfa2cc…

1 0

Hans Leidekker : winhttp/tests: Move the status notification tests to test.winehq.org.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 5b409fb0d4de686148452331b591c8ae2e21b46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b409fb0d4de686148452331b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 5 15:31:21 2014 +0100 winhttp/tests: Move the status notification tests to test.winehq.org. --- dlls/winhttp/tests/notification.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index f2a3692..f81a952 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -27,6 +27,7 @@ #include "wine/test.h" static const WCHAR user_agent[] = {'w','i','n','e','t','e','s','t',0}; +static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; enum api { @@ -157,8 +158,6 @@ static void setup_test( struct info *info, enum api function, unsigned int line static void test_connection_cache( void ) { - static const WCHAR codeweavers[] = {'w','w','w','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - HANDLE ses, con, req; DWORD size, status; BOOL ret; @@ -178,7 +177,7 @@ static void test_connection_cache( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, codeweavers, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); @@ -242,7 +241,7 @@ static void test_connection_cache( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, codeweavers, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); @@ -300,8 +299,8 @@ static const struct notification redirect_test[] = { { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, @@ -309,8 +308,8 @@ static const struct notification redirect_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, FALSE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, @@ -326,8 +325,6 @@ static const struct notification redirect_test[] = static void test_redirect( void ) { - static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - HANDLE ses, con, req; DWORD size, status; BOOL ret; @@ -347,7 +344,7 @@ static void test_redirect( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, codeweavers, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); @@ -387,8 +384,8 @@ static const struct notification async_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, FALSE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, @@ -409,8 +406,6 @@ static const struct notification async_test[] = static void test_async( void ) { - static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; - HANDLE ses, con, req; DWORD size, status; BOOL ret; @@ -431,7 +426,7 @@ static void test_async( void ) ok(ret, "failed to set context value %u\n", GetLastError()); setup_test( &info, winhttp_connect, __LINE__ ); - con = WinHttpConnect( ses, codeweavers, 0, 0 ); + con = WinHttpConnect( ses, test_winehq, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ );

1 0

Dmitry Timoshkov : msxml3: IXMLElementCollection:: QueryInterface should return NULL interface on error.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: fdba11a263f9a1f447f7b7aedc4f2b20836aa920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdba11a263f9a1f447f7b7aed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 15:18:57 2014 +0900 msxml3: IXMLElementCollection::QueryInterface should return NULL interface on error. --- dlls/msxml3/xmlelem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 52eef62..e1ef0eb 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -573,6 +573,7 @@ static HRESULT WINAPI xmlelem_collection_QueryInterface(IXMLElementCollection *i else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014