wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

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

22 Feb '13

Module: wine Branch: master Commit: faaeeea9376b16a71f0bdf647aa6200ce2b173d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faaeeea9376b16a71f0bdf647… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 21 22:30:15 2013 +0000 ole32: Avoid signed-unsigned integer comparisons. --- dlls/ole32/compositemoniker.c | 12 ++++++------ dlls/ole32/storage32.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index a6cfd62..ed154f2 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1638,10 +1638,10 @@ static const IEnumMonikerVtbl VT_EnumMonikerImpl = ******************************************************************************/ static HRESULT EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, ULONG tabSize, - ULONG currentPos, BOOL leftToRigth, IEnumMoniker ** ppmk) + ULONG currentPos, BOOL leftToRight, IEnumMoniker ** ppmk) { EnumMonikerImpl* newEnumMoniker; - int i; + ULONG i; if (currentPos > tabSize) return E_INVALIDARG; @@ -1665,17 +1665,17 @@ EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, ULONG tabSize, return E_OUTOFMEMORY; } - if (leftToRigth) + if (leftToRight) for (i=0;i<tabSize;i++){ newEnumMoniker->tabMoniker[i]=tabMoniker[i]; IMoniker_AddRef(tabMoniker[i]); } else - for (i=tabSize-1;i>=0;i--){ + for (i = tabSize; i > 0; i--){ - newEnumMoniker->tabMoniker[tabSize-i-1]=tabMoniker[i]; - IMoniker_AddRef(tabMoniker[i]); + newEnumMoniker->tabMoniker[tabSize-i]=tabMoniker[i - 1]; + IMoniker_AddRef(tabMoniker[i - 1]); } *ppmk=&newEnumMoniker->IEnumMoniker_iface; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f259d24..1d64ab0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1767,7 +1767,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( StorageBaseImpl *This = impl_from_IStorage(iface); BOOL skip_storage = FALSE, skip_stream = FALSE; - int i; + DWORD i; TRACE("(%p, %d, %p, %p, %p)\n", iface, ciidExclude, rgiidExclude, @@ -2822,7 +2822,7 @@ static HRESULT StorageImpl_Construct( { ULONG current_block = This->extBigBlockDepotStart; ULONG cache_size = This->extBigBlockDepotCount * 2; - int i; + ULONG i; This->extBigBlockDepotLocations = HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * cache_size); if (!This->extBigBlockDepotLocations)

1 0

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

22 Feb '13

Module: wine Branch: master Commit: eedf2f6fab3756eebd575c42aea45d8251f569fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedf2f6fab3756eebd575c42a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 21 22:30:17 2013 +0000 oleaut32: Avoid signed-unsigned integer comparisons. --- dlls/oleaut32/olepicture.c | 4 ++-- dlls/oleaut32/olepropframe.c | 2 +- dlls/oleaut32/typelib.c | 17 +++++++++++------ dlls/oleaut32/typelib2.c | 4 +++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 3fdb1c7..4b3e9dd 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1420,8 +1420,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) } while (!headerisdata); if (statfailed) { /* we don't know the size ... read all we get */ - int sizeinc = 4096; - int origsize = sizeinc; + unsigned int sizeinc = 4096; + unsigned int origsize = sizeinc; ULONG nread = 42; TRACE("Reading all data from stream.\n"); diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index e566266..9a563f1 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -168,7 +168,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) IPropertyPage **property_page; PropertyPageSite *property_page_site; HRESULT res; - int i; + ULONG i; HMODULE hcomctl; HRSRC property_sheet_dialog_find = NULL; HGLOBAL property_sheet_dialog_load = NULL; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0f3ca6b..6d37bd4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4388,7 +4388,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoOfGuid( ITypeInfo **ppTInfo) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT i; + int i; TRACE("%p %s %p\n", This, debugstr_guid(guid), ppTInfo); @@ -4553,7 +4553,8 @@ static HRESULT WINAPI ITypeLib2_fnIsName( BOOL *pfName) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), tic, fdc, vrc, pc; + int tic; + UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), fdc, vrc; TRACE("(%p)->(%s,%08x,%p)\n", This, debugstr_w(szNameBuf), lHashVal, pfName); @@ -4564,6 +4565,8 @@ static HRESULT WINAPI ITypeLib2_fnIsName( if(!memcmp(szNameBuf,pTInfo->Name, nNameBufLen)) goto ITypeLib2_fnIsName_exit; for(fdc = 0; fdc < pTInfo->TypeAttr.cFuncs; ++fdc) { TLBFuncDesc *pFInfo = &pTInfo->funcdescs[fdc]; + int pc; + if(!memcmp(szNameBuf,pFInfo->Name, nNameBufLen)) goto ITypeLib2_fnIsName_exit; for(pc=0; pc < pFInfo->funcdesc.cParams; pc++) if(!memcmp(szNameBuf,pFInfo->pParamDesc[pc].Name, nNameBufLen)) @@ -4599,7 +4602,8 @@ static HRESULT WINAPI ITypeLib2_fnFindName( UINT16 *found) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT tic, count = 0; + int tic; + UINT count = 0; UINT len; TRACE("(%p)->(%s %u %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found); @@ -4616,7 +4620,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName( if(!memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; for(fdc = 0; fdc < pTInfo->TypeAttr.cFuncs; ++fdc) { TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; - UINT pc; + int pc; if(!memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; for(pc = 0; pc < func->funcdesc.cParams; pc++) { @@ -4995,7 +4999,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeComp ** ppTComp) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - UINT i; + int i; TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); @@ -5097,7 +5101,7 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { - UINT i, j; + UINT i; TRACE("destroying ITypeInfo(%p)\n",This); @@ -5112,6 +5116,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for (i = 0; i < This->TypeAttr.cFuncs; ++i) { + int j; TLBFuncDesc *pFInfo = &This->funcdescs[i]; for(j = 0; j < pFInfo->funcdesc.cParams; j++) { diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 689d9af..354ec8a 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2050,8 +2050,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( if(This->dual) This->dual->typedata = This->typedata; } else { + unsigned int j; + iter = This->typedata->next; - for(i=0; i<index; i++) + for (j = 0; j < index; j++) iter = iter->next; insert->next = iter->next;

1 0

Daniel Jelinski : comctl32/listview: Implement overlay image support.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: b9fe178f3657b1955d27e9676ef5c2c4a7aed432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fe178f3657b1955d27e9676… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Feb 21 21:51:36 2013 +0100 comctl32/listview: Implement overlay image support. --- dlls/comctl32/listview.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 83bdf56..2dc0a95 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -75,7 +75,6 @@ * States * -- LVIS_ACTIVATING (not currently supported by comctl32.dll version 6.0) * -- LVIS_DROPHILITED - * -- LVIS_OVERLAYMASK * * Styles * -- LVS_NOLABELWRAP @@ -4586,7 +4585,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; if (nSubItem == 0) lvItem.mask |= LVIF_STATE; if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; lvItem.iItem = nItem; lvItem.iSubItem = nSubItem; lvItem.state = 0; @@ -4707,7 +4706,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, lvItem.state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, - style); + style | (lvItem.state & LVIS_OVERLAYMASK)); } /* Don't bother painting item being edited */

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

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

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

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 + +@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

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

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

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

← Newer
1
...
9
10
11
12
13
14
15
...
46
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 2013