February 2013 - Wine-commits

Hans Leidekker : wmiutils: Implement IWbemPathKeyList::RemoveAllKeys.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 612caa5d393c45dd4e3e6491f0835bdeb22df603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612caa5d393c45dd4e3e6491f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:46:54 2013 +0100 wmiutils: Implement IWbemPathKeyList::RemoveAllKeys. --- dlls/wmiutils/path.c | 54 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 98f22db..dcade46 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -39,6 +39,14 @@ struct keylist LONG refs; }; +struct key +{ + WCHAR *name; + int len_name; + WCHAR *value; + int len_value; +}; + struct path { IWbemPath IWbemPath_iface; @@ -191,12 +199,37 @@ static HRESULT WINAPI keylist_RemoveKey( return E_NOTIMPL; } +static void free_keys( struct key *keys, unsigned int count ) +{ + unsigned int i; + + for (i = 0; i < count; i++) + { + heap_free( keys[i].name ); + heap_free( keys[i].value ); + } + heap_free( keys ); +} + static HRESULT WINAPI keylist_RemoveAllKeys( IWbemPathKeyList *iface, ULONG uFlags ) { - FIXME("%p, 0x%x\n", iface, uFlags); - return E_NOTIMPL; + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + struct path *parent = impl_from_IWbemPath( keylist->parent ); + + TRACE("%p, 0x%x\n", iface, uFlags); + + if (uFlags) return WBEM_E_INVALID_PARAMETER; + + EnterCriticalSection( &parent->cs ); + + free_keys( parent->keys, parent->num_keys ); + parent->num_keys = 0; + parent->keys = NULL; + + LeaveCriticalSection( &parent->cs ); + return S_OK; } static HRESULT WINAPI keylist_MakeSingleton( @@ -262,14 +295,6 @@ static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, L return S_OK; } -struct key -{ - WCHAR *name; - int len_name; - WCHAR *value; - int len_value; -}; - static void init_path( struct path *path ) { path->text = NULL; @@ -288,19 +313,12 @@ static void init_path( struct path *path ) static void clear_path( struct path *path ) { - unsigned int i; - heap_free( path->text ); heap_free( path->server ); heap_free( path->namespaces ); heap_free( path->len_namespaces ); heap_free( path->class ); - for (i = 0; i < path->num_keys; i++) - { - heap_free( path->keys[i].name ); - heap_free( path->keys[i].value ); - } - heap_free( path->keys ); + free_keys( path->keys, path->num_keys ); init_path( path ); }

1 0

Hans Leidekker : rpcrt4: Accept HTTP idle packets while waiting for the second prepare header.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 164ddbca8c232470c825a0b75e183cef5250490a URL: http://source.winehq.org/git/wine.git/?a=commit;h=164ddbca8c232470c825a0b75… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:47:45 2013 +0100 rpcrt4: Accept HTTP idle packets while waiting for the second prepare header. --- dlls/rpcrt4/rpc_transport.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 54f0faa..e3e428b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2324,9 +2324,22 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, if (status != RPC_S_OK) return status; TRACE("received (%d) from first prepare header\n", field1); - status = rpcrt4_http_read_http_packet(out_request, &pkt_from_server, - &data_from_server); - if (status != RPC_S_OK) return status; + for (;;) + { + status = rpcrt4_http_read_http_packet(out_request, &pkt_from_server, + &data_from_server); + if (status != RPC_S_OK) return status; + if (pkt_from_server.http.flags != 0x0001) break; + + TRACE("http idle packet, waiting for real packet\n"); + HeapFree(GetProcessHeap(), 0, data_from_server); + if (pkt_from_server.http.num_data_items != 0) + { + ERR("HTTP idle packet should have no data items instead of %d\n", + pkt_from_server.http.num_data_items); + return RPC_S_PROTOCOL_ERROR; + } + } status = RPCRT4_ParseHttpPrepareHeader2(&pkt_from_server, data_from_server, &field1, flow_control_increment, &field3);

1 0

Francois Gouget : d3d9/tests: CheckDeviceType() may also return D3DERR_NOTAVAILABLE for D3DFMT_X1R5G5B5.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: ce34094f5f3f60fe3d4ce0a1b69eb29deedba9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce34094f5f3f60fe3d4ce0a1b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 21 16:22:42 2013 +0100 d3d9/tests: CheckDeviceType() may also return D3DERR_NOTAVAILABLE for D3DFMT_X1R5G5B5. Spice's QXL driver claims to support X1R5G5B5 but then returns NOTAVAILABLE just like the Windows Standard VGA driver does for R5G6B5 and X8R8G8B8. --- dlls/d3d9/tests/device.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ba8a3ef..bbbcbbc 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2325,7 +2325,7 @@ static void test_display_formats(void) if(r5g6b5_format_list[i].shouldPass) ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE), + broken(hr == D3DERR_NOTAVAILABLE) /* Windows VGA driver */, "format %d %d didn't pass with hr=%#08x\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, hr); else ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat); @@ -2342,7 +2342,9 @@ static void test_display_formats(void) hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, FALSE); if(x1r5g5b5_format_list[i].shouldPass) - ok(hr == D3D_OK, "format %d %d didn't pass with hr=%#08x\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, hr); + ok(hr == D3D_OK || + broken(hr == D3DERR_NOTAVAILABLE) /* Spice QXL driver */, + "format %d %d didn't pass with hr=%#08x\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, hr); else ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat); } @@ -2356,10 +2358,11 @@ static void test_display_formats(void) for(i=0; x8r8g8b8_format_list[i].DisplayFormat != 0; i++) { hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, FALSE); + trace("CheckDeviceType(%d %d) = %08x shouldPass = %d\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr, x8r8g8b8_format_list[i].shouldPass); if(x8r8g8b8_format_list[i].shouldPass) ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE), + broken(hr == D3DERR_NOTAVAILABLE) /* Windows VGA driver */, "format %d %d didn't pass with hr=%#08x\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr); else ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat);

1 0

Alistair Leslie-Hughes : webservices: Add new dll.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: ee9689b4d0f936fdbe89aeb11e699cba16e6a9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9689b4d0f936fdbe89aeb11… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 21 13:53:44 2013 +1100 webservices: Add new dll. --- configure | 1 + configure.ac | 1 + dlls/webservices/Makefile.in | 7 ++ dlls/webservices/main.c | 51 ++++++++++ dlls/webservices/webservices.spec | 193 +++++++++++++++++++++++++++++++++++++ 5 files changed, 253 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2fa08a6..5a29243 100755 --- a/configure +++ b/configure @@ -16175,6 +16175,7 @@ wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemprox enable_wbemprox wine_fn_config_test dlls/wbemprox/tests wbemprox_test +wine_fn_config_dll webservices enable_webservices implib wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi diff --git a/configure.ac b/configure.ac index fd7d0b7..836c4e7 100644 --- a/configure.ac +++ b/configure.ac @@ -3058,6 +3058,7 @@ WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) WINE_CONFIG_TEST(dlls/wbemprox/tests) +WINE_CONFIG_DLL(webservices,,[implib]) WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in new file mode 100644 index 0000000..919e9a0 --- /dev/null +++ b/dlls/webservices/Makefile.in @@ -0,0 +1,7 @@ +MODULE = webservices.dll +IMPORTLIB = webservices + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/webservices/main.c b/dlls/webservices/main.c new file mode 100644 index 0000000..f00e6f3 --- /dev/null +++ b/dlls/webservices/main.c @@ -0,0 +1,51 @@ +/* + * Web Services + * + * Copyright 2013 Alistair Leslie-Hughes + * + * 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "wincodec.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(webservices); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec new file mode 100644 index 0000000..7bbf5dd --- /dev/null +++ b/dlls/webservices/webservices.spec @@ -0,0 +1,193 @@ +@ stub WsAbandonCall +@ stub WsAbandonMessage +@ stub WsAbortChannel +@ stub WsAbortListener +@ stub WsAbortServiceHost +@ stub WsAbortServiceProxy +@ stub WsAcceptChannel +@ stub WsAddCustomHeader +@ stub WsAddErrorString +@ stub WsAddMappedHeader +@ stub WsAddressMessage +@ stub WsAlloc +@ stub WsAsyncExecute +@ stub WsCall +@ stub WsCheckMustUnderstandHeaders +@ stub WsCloseChannel +@ stub WsCloseListener +@ stub WsCloseServiceHost +@ stub WsCloseServiceProxy +@ stub WsCombineUrl +@ stub WsCopyError +@ stub WsCopyNode +@ stub WsCreateChannel +@ stub WsCreateChannelForListener +@ stub WsCreateError +@ stub WsCreateFaultFromError +@ stub WsCreateHeap +@ stub WsCreateListener +@ stub WsCreateMessage +@ stub WsCreateMessageForChannel +@ stub WsCreateMetadata +@ stub WsCreateReader +@ stub WsCreateServiceEndpointFromTemplate +@ stub WsCreateServiceHost +@ stub WsCreateServiceProxy +@ stub WsCreateServiceProxyFromTemplate +@ stub WsCreateWriter +@ stub WsCreateXmlBuffer +@ stub WsCreateXmlSecurityToken +@ stub WsDateTimeToFileTime +@ stub WsDecodeUrl +@ stub WsEncodeUrl +@ stub WsEndReaderCanonicalization +@ stub WsEndWriterCanonicalization +@ stub WsFileTimeToDateTime +@ stub WsFillBody +@ stub WsFillReader +@ stub WsFindAttribute +@ stub WsFlushBody +@ stub WsFlushWriter +@ stub WsFreeChannel +@ stub WsFreeError +@ stub WsFreeHeap +@ stub WsFreeListener +@ stub WsFreeMessage +@ stub WsFreeMetadata +@ stub WsFreeReader +@ stub WsFreeSecurityToken +@ stub WsFreeServiceHost +@ stub WsFreeServiceProxy +@ stub WsFreeWriter +@ stub WsGetChannelProperty +@ stub WsGetCustomHeader +@ stub WsGetDictionary +@ stub WsGetErrorProperty +@ stub WsGetErrorString +@ stub WsGetFaultErrorDetail +@ stub WsGetFaultErrorProperty +@ stub WsGetHeader +@ stub WsGetHeaderAttributes +@ stub WsGetHeapProperty +@ stub WsGetListenerProperty +@ stub WsGetMappedHeader +@ stub WsGetMessageProperty +@ stub WsGetMetadataEndpoints +@ stub WsGetMetadataProperty +@ stub WsGetMissingMetadataDocumentAddress +@ stub WsGetNamespaceFromPrefix +@ stub WsGetOperationContextProperty +@ stub WsGetPolicyAlternativeCount +@ stub WsGetPolicyProperty +@ stub WsGetPrefixFromNamespace +@ stub WsGetReaderNode +@ stub WsGetReaderPosition +@ stub WsGetReaderProperty +@ stub WsGetSecurityContextProperty +@ stub WsGetSecurityTokenProperty +@ stub WsGetServiceHostProperty +@ stub WsGetServiceProxyProperty +@ stub WsGetWriterPosition +@ stub WsGetWriterProperty +@ stub WsGetXmlAttribute +@ stub WsInitializeMessage +@ stub WsMarkHeaderAsUnderstood +@ stub WsMatchPolicyAlternative +@ stub WsMoveReader +@ stub WsMoveWriter +@ stub WsOpenChannel +@ stub WsOpenListener +@ stub WsOpenServiceHost +@ stub WsOpenServiceProxy +@ stub WsPullBytes +@ stub WsPushBytes +@ stub WsReadArray +@ stub WsReadAttribute +@ stub WsReadBody +@ stub WsReadBytes +@ stub WsReadChars +@ stub WsReadCharsUtf8 +@ stub WsReadElement +@ stub WsReadEndAttribute +@ stub WsReadEndElement +@ stub WsReadEndpointAddressExtension +@ stub WsReadEnvelopeEnd +@ stub WsReadEnvelopeStart +@ stub WsReadMessageEnd +@ stub WsReadMessageStart +@ stub WsReadMetadata +@ stub WsReadNode +@ stub WsReadQualifiedName +@ stub WsReadStartAttribute +@ stub WsReadStartElement +@ stub WsReadToStartElement +@ stub WsReadType +@ stub WsReadValue +@ stub WsReadXmlBuffer +@ stub WsReadXmlBufferFromBytes +@ stub WsReceiveMessage +@ stub WsRegisterOperationForCancel +@ stub WsRemoveCustomHeader +@ stub WsRemoveHeader +@ stub WsRemoveMappedHeader +@ stub WsRemoveNode +@ stub WsRequestReply +@ stub WsRequestSecurityToken +@ stub WsResetChannel +@ stub WsResetError +@ stub WsResetHeap +@ stub WsResetListener +@ stub WsResetMessage +@ stub WsResetMetadata +@ stub WsResetServiceHost +@ stub WsResetServiceProxy +@ stub WsRevokeSecurityContext +@ stub WsSendFaultMessageForError +@ stub WsSendMessage +@ stub WsSendReplyMessage +@ stub WsSetChannelProperty +@ stub WsSetErrorProperty +@ stub WsSetFaultErrorDetail +@ stub WsSetFaultErrorProperty +@ stub WsSetHeader +@ stub WsSetInput +@ stub WsSetInputToBuffer +@ stub WsSetListenerProperty +@ stub WsSetMessageProperty +@ stub WsSetOutput +@ stub WsSetOutputToBuffer +@ stub WsSetReaderPosition +@ stub WsSetWriterPosition +@ stub WsShutdownSessionChannel +@ stub WsSkipNode +@ stub WsStartReaderCanonicalization +@ stub WsStartWriterCanonicalization +@ stub WsTrimXmlWhitespace +@ stub WsVerifyXmlNCName +@ stub WsWriteArray +@ stub WsWriteAttribute +@ stub WsWriteBody +@ stub WsWriteBytes +@ stub WsWriteChars +@ stub WsWriteCharsUtf8 +@ stub WsWriteElement +@ stub WsWriteEndAttribute +@ stub WsWriteEndCData +@ stub WsWriteEndElement +@ stub WsWriteEndStartElement +@ stub WsWriteEnvelopeEnd +@ stub WsWriteEnvelopeStart +@ stub WsWriteMessageEnd +@ stub WsWriteMessageStart +@ stub WsWriteNode +@ stub WsWriteQualifiedName +@ stub WsWriteStartAttribute +@ stub WsWriteStartCData +@ stub WsWriteStartElement +@ stub WsWriteText +@ stub WsWriteType +@ stub WsWriteValue +@ stub WsWriteXmlBuffer +@ stub WsWriteXmlBufferToBytes +@ stub WsWriteXmlnsAttribute +@ stub WsXmlStringEquals

1 0

Jörg Höhle : mmdevapi/tests: Produce audible 16bit output too.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: c771fe923178972dc1a990c6c2bcb08c771b6681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c771fe923178972dc1a990c6c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 15 22:23:34 2012 +0100 mmdevapi/tests: Produce audible 16bit output too. --- dlls/mmdevapi/tests/render.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e753299..beebfb6 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -75,8 +75,10 @@ static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) DWORD cn, i; double delta, y; - if(!winetest_interactive || wfxe->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE || - !IsEqualGUID(&wfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) + if(!winetest_interactive) + return AUDCLNT_BUFFERFLAGS_SILENT; + if(wfxe->Format.wBitsPerSample != ((wfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&wfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) ? 8 * sizeof(float) : 16)) return AUDCLNT_BUFFERFLAGS_SILENT; for(delta = phase, cn = 0; cn < wfxe->Format.nChannels; @@ -84,8 +86,10 @@ static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) for(i = 0; i < frames; i++){ y = sin(2*PI*(440.* i / wfxe->Format.nSamplesPerSec + delta)); /* assume alignment is granted */ - ((float*)data)[cn+i*wfxe->Format.nChannels] = y; - /* fixme: 16bit for exclusive mode */ + if(wfxe->Format.wBitsPerSample == 16) + ((short*)data)[cn+i*wfxe->Format.nChannels] = y * 32767.9; + else + ((float*)data)[cn+i*wfxe->Format.nChannels] = y; } } phase += 440.* frames / wfxe->Format.nSamplesPerSec;

1 0

Jacek Caban : winhttp: Removed no longer used netconn_init argument.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 42750e340e9947e2c48e319bc0f61409d2439fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=42750e340e9947e2c48e319bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 21 18:08:25 2013 +0100 winhttp: Removed no longer used netconn_init argument. --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 2 +- dlls/winhttp/winhttp_private.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d2fdb86..fa8cad0 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -267,7 +267,7 @@ static BOOL ensure_cred_handle(void) return ret; } -BOOL netconn_init( netconn_t *conn, BOOL secure ) +BOOL netconn_init( netconn_t *conn ) { memset(conn, 0, sizeof(*conn)); conn->socket = -1; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 584f27d..301478d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1636,7 +1636,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) if (!(ret = set_server_for_hostname( connect, hostname, port ))) goto end; netconn_close( &request->netconn ); - if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; + if (!(ret = netconn_init( &request->netconn ))) goto end; } if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d5aa153..41b266a 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -959,7 +959,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->connect = connect; list_add_head( &connect->hdr.children, &request->hdr.entry ); - if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; + if (!netconn_init( &request->netconn )) goto end; request->resolve_timeout = connect->session->resolve_timeout; request->connect_timeout = connect->session->connect_timeout; request->send_timeout = connect->session->send_timeout; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 72605af..963abec 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -231,7 +231,7 @@ BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ) DECLSPEC_HIDDEN; -BOOL netconn_init( netconn_t *, BOOL ) DECLSPEC_HIDDEN; +BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Fail in NETCON_secure_connect instead of create_netconn if OpenSSL is not available .
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 85991a7cddd1bde0480cd981179f8241b5d2d9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=85991a7cddd1bde0480cd9811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 21 18:08:46 2013 +0100 wininet: Fail in NETCON_secure_connect instead of create_netconn if OpenSSL is not available. --- dlls/wininet/netconnection.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 8d5fc6f..4869d60 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -463,7 +463,6 @@ static long get_tls_option(void) { #endif return tls_option; } -#endif /* SONAME_LIBSSL */ static CRITICAL_SECTION init_ssl_cs; static CRITICAL_SECTION_DEBUG init_ssl_cs_debug = @@ -477,7 +476,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static DWORD init_openssl(void) { -#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) +#ifdef SONAME_LIBCRYPTO int i; if(OpenSSL_ssl_handle) @@ -600,10 +599,11 @@ static DWORD init_openssl(void) return ERROR_SUCCESS; #else - FIXME("can't use SSL, not compiled in.\n"); + FIXME("can't use SSL, libcrypto not compiled in.\n"); return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; #endif } +#endif /* SONAME_LIBSSL */ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { @@ -663,6 +663,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m netconn_t *netconn; int result; +#ifdef SONAME_LIBSSL if(useSSL) { DWORD res; @@ -674,6 +675,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m if(res != ERROR_SUCCESS) return res; } +#endif netconn = heap_alloc_zero(sizeof(*netconn)); if(!netconn) @@ -910,6 +912,8 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) res = netcon_secure_connect_setup(connection, get_tls_option()|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); } #endif +#else + FIXME("Cannot connect, OpenSSL not available.\n"); #endif return res; } @@ -943,6 +947,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, return ERROR_INTERNET_CONNECTION_ABORTED; return ERROR_SUCCESS; #else + FIXME("not supported on this platform\n"); return ERROR_NOT_SUPPORTED; #endif } @@ -980,6 +985,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, return *recvd > 0 ? ERROR_SUCCESS : ERROR_INTERNET_CONNECTION_ABORTED; #else + FIXME("not supported on this platform\n"); return ERROR_NOT_SUPPORTED; #endif } @@ -1010,6 +1016,9 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { #ifdef SONAME_LIBSSL *available = connection->ssl_s ? pSSL_pending(connection->ssl_s) : 0; +#else + FIXME("not supported on this platform\n"); + return FALSE; #endif } return TRUE; @@ -1058,6 +1067,7 @@ LPCVOID NETCON_GetCert(netconn_t *connection) r = X509_to_cert_context(cert); return r; #else + FIXME("not supported on this platform\n"); return NULL; #endif } @@ -1080,6 +1090,7 @@ int NETCON_GetCipherStrength(netconn_t *connection) pSSL_CIPHER_get_bits(cipher, &bits); return bits; #else + FIXME("not supported on this platform\n"); return 0; #endif }

1 0

André Hentschel : kernel32: Add stub for GetCurrentPackageId.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 2976b6342fdcf1f4c1e9a4dd38bf14083f5c8ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2976b6342fdcf1f4c1e9a4dd3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 19 23:19:34 2013 +0100 kernel32: Add stub for GetCurrentPackageId. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 6 +++ include/winerror.h | 78 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f2f039b..93bfb77 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -498,6 +498,7 @@ @ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) +@ stdcall GetCurrentPackageId(ptr ptr) @ stdcall GetCurrentProcess() @ stdcall GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 9f21435..b9d13e4 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -201,3 +201,9 @@ BOOL WINAPI GetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD return RtlGetProductInfo(dwOSMajorVersion, dwOSMinorVersion, dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); } + +LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) +{ + FIXME("(%p %p): stub\n", len, buffer); + return APPMODEL_ERROR_NO_PACKAGE; +} diff --git a/include/winerror.h b/include/winerror.h index b6281f8..edd8af0 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1934,6 +1934,84 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_RESOURCE_ENUM_USER_STOP 15106 #define ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED 15107 #define ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME 15108 +#define ERROR_MRM_RUNTIME_NO_DEFAULT_OR_NEUTRAL_RESOURCE 15110 +#define ERROR_MRM_INVALID_PRICONFIG 15111 +#define ERROR_MRM_INVALID_FILE_TYPE 15112 +#define ERROR_MRM_UNKNOWN_QUALIFIER 15113 +#define ERROR_MRM_INVALID_QUALIFIER_VALUE 15114 +#define ERROR_MRM_NO_CANDIDATE 15115 +#define ERROR_MRM_NO_MATCH_OR_DEFAULT_CANDIDATE 15116 +#define ERROR_MRM_RESOURCE_TYPE_MISMATCH 15117 +#define ERROR_MRM_DUPLICATE_MAP_NAME 15118 +#define ERROR_MRM_DUPLICATE_ENTRY 15119 +#define ERROR_MRM_INVALID_RESOURCE_IDENTIFIER 15120 +#define ERROR_MRM_FILEPATH_TOO_LONG 15121 +#define ERROR_MRM_UNSUPPORTED_DIRECTORY_TYPE 15122 +#define ERROR_MRM_INVALID_PRI_FILE 15126 +#define ERROR_MRM_NAMED_RESOURCE_NOT_FOUND 15127 +#define ERROR_MRM_MAP_NOT_FOUND 15135 +#define ERROR_MRM_UNSUPPORTED_PROFILE_TYPE 15136 +#define ERROR_MRM_INVALID_QUALIFIER_OPERATOR 15137 +#define ERROR_MRM_INDETERMINATE_QUALIFIER_VALUE 15138 +#define ERROR_MRM_AUTOMERGE_ENABLED 15139 +#define ERROR_MRM_TOO_MANY_RESOURCES 15140 +#define ERROR_MCA_INVALID_CAPABILITIES_STRING 15200 +#define ERROR_MCA_INVALID_VCP_VERSION 15201 +#define ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION 15202 +#define ERROR_MCA_MCCS_VERSION_MISMATCH 15203 +#define ERROR_MCA_UNSUPPORTED_MCCS_VERSION 15204 +#define ERROR_MCA_INTERNAL_ERROR 15205 +#define ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED 15206 +#define ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE 15207 +#define ERROR_AMBIGUOUS_SYSTEM_DEVICE 15250 +#define ERROR_SYSTEM_DEVICE_NOT_FOUND 15299 +#define ERROR_HASH_NOT_SUPPORTED 15300 +#define ERROR_HASH_NOT_PRESENT 15301 +#define ERROR_SECONDARY_IC_PROVIDER_NOT_REGISTERED 15321 +#define ERROR_GPIO_CLIENT_INFORMATION_INVALID 15322 +#define ERROR_GPIO_VERSION_NOT_SUPPORTED 15323 +#define ERROR_GPIO_INVALID_REGISTRATION_PACKET 15324 +#define ERROR_GPIO_OPERATION_DENIED 15325 +#define ERROR_GPIO_INCOMPATIBLE_CONNECT_MODE 15326 +#define ERROR_GPIO_INTERRUPT_ALREADY_UNMASKED 15327 +#define ERROR_CANNOT_SWITCH_RUNLEVEL 15400 +#define ERROR_INVALID_RUNLEVEL_SETTING 15401 +#define ERROR_RUNLEVEL_SWITCH_TIMEOUT 15402 +#define ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT 15403 +#define ERROR_RUNLEVEL_SWITCH_IN_PROGRESS 15404 +#define ERROR_SERVICES_FAILED_AUTOSTART 15405 +#define ERROR_COM_TASK_STOP_PENDING 15501 +#define ERROR_INSTALL_OPEN_PACKAGE_FAILED 15600 +#define ERROR_INSTALL_PACKAGE_NOT_FOUND 15601 +#define ERROR_INSTALL_INVALID_PACKAGE 15602 +#define ERROR_INSTALL_RESOLVE_DEPENDENCY_FAILED 15603 +#define ERROR_INSTALL_OUT_OF_DISK_SPACE 15604 +#define ERROR_INSTALL_NETWORK_FAILURE 15605 +#define ERROR_INSTALL_REGISTRATION_FAILURE 15606 +#define ERROR_INSTALL_DEREGISTRATION_FAILURE 15607 +#define ERROR_INSTALL_CANCEL 15608 +#define ERROR_INSTALL_FAILED 15609 +#define ERROR_REMOVE_FAILED 15610 +#define ERROR_PACKAGE_ALREADY_EXISTS 15611 +#define ERROR_NEEDS_REMEDIATION 15612 +#define ERROR_INSTALL_PREREQUISITE_FAILED 15613 +#define ERROR_PACKAGE_REPOSITORY_CORRUPTED 15614 +#define ERROR_INSTALL_POLICY_FAILURE 15615 +#define ERROR_PACKAGE_UPDATING 15616 +#define ERROR_DEPLOYMENT_BLOCKED_BY_POLICY 15617 +#define ERROR_PACKAGES_IN_USE 15618 +#define ERROR_RECOVERY_FILE_CORRUPT 15619 +#define ERROR_INVALID_STAGED_SIGNATURE 15620 +#define ERROR_DELETING_EXISTING_APPLICATIONDATA_STORE_FAILED 15621 +#define ERROR_INSTALL_PACKAGE_DOWNGRADE 15622 +#define ERROR_SYSTEM_NEEDS_REMEDIATION 15623 +#define ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN 15624 +#define ERROR_RESILIENCY_FILE_CORRUPT 15625 +#define ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING 15626 +#define APPMODEL_ERROR_NO_PACKAGE 15700 +#define APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT 15701 +#define APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT 15702 +#define APPMODEL_ERROR_NO_APPLICATION 15703 /* HRESULT values for OLE, SHELL and other Interface stuff */ /* the codes 4000-40ff are reserved for OLE */

1 0

Andrew Talbot : msxml3: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 5360780a9b412def4cbf17f64cebff042549aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5360780a9b412def4cbf17f64… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 19 22:24:44 2013 +0000 msxml3: Avoid signed-unsigned integer comparisons. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/factory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 49e6168..7a3543f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3245,7 +3245,7 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * ConnectionPoint *This = impl_from_IConnectionPoint(iface); IUnknown *sink; HRESULT hr; - int i; + DWORD i; TRACE("(%p)->(%p %p)\n", This, unk_sink, cookie); diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 1ad3a1e..d308c12 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -98,7 +98,7 @@ static const struct clsid_version_t clsid_versions_table[] = static MSXML_VERSION get_msxml_version(const GUID *clsid) { - int i; + unsigned int i; for (i = 0; i < sizeof(clsid_versions_table)/sizeof(struct clsid_version_t); i++) if (IsEqualGUID(clsid, clsid_versions_table[i].clsid))

1 0

Andrew Talbot : msvcrt: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: d8efcc9cb341e0ad7df2dad63a2a422d1dc42e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8efcc9cb341e0ad7df2dad63… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 19 22:24:42 2013 +0000 msvcrt: Avoid signed-unsigned integer comparisons. --- dlls/msvcrt/file.c | 9 +++++---- dlls/msvcrt/locale.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fc4154c..612f470 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -363,7 +363,7 @@ static int msvcrt_alloc_fd(HANDLE hand, int flag) /* caller must hold the files lock */ static MSVCRT_FILE* msvcrt_alloc_fp(void) { - unsigned int i; + int i; MSVCRT_FILE *file; for (i = 3; i < MSVCRT_max_streams; i++) @@ -1047,7 +1047,8 @@ int CDECL MSVCRT__fcloseall(void) /* free everything on process exit */ void msvcrt_free_io(void) { - int i; + unsigned int i; + int j; MSVCRT__fcloseall(); /* The Win32 _fcloseall() function explicitly doesn't close stdin, @@ -1061,9 +1062,9 @@ void msvcrt_free_io(void) for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) MSVCRT_free(MSVCRT___pioinfo[i]); - for(i=0; i<MSVCRT_stream_idx; i++) + for(j=0; j<MSVCRT_stream_idx; j++) { - MSVCRT_FILE *file = msvcrt_get_file(i); + MSVCRT_FILE *file = msvcrt_get_file(j); if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) { ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4540e9a..7fa4882 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -492,7 +492,7 @@ char* CDECL _Getmonths(void) void* CDECL _Gettnames(void) { MSVCRT___lc_time_data *ret, *cur = get_locinfo()->lc_time_curr; - int i, size = sizeof(MSVCRT___lc_time_data); + unsigned int i, size = sizeof(MSVCRT___lc_time_data); TRACE("\n");

1 0