ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
July 2016
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
18 participants
358 discussions
Start a n
N
ew thread
[akhaldi] 71746: [UNICODE] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:46:41 2016 New Revision: 71746 URL:
http://svn.reactos.org/svn/reactos?rev=71746&view=rev
Log: [UNICODE] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/tools/unicode/fold.c trunk/reactos/sdk/tools/unicode/mbtowc.c trunk/reactos/sdk/tools/unicode/string.c Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 13:46:41 2016 @@ -15,7 +15,7 @@ The following build tools are shared with Wine. -reactos/tools/unicode # Synced to WineStaging-1.9.4 +reactos/tools/unicode # Synced to WineStaging-1.9.11 reactos/tools/widl # Synced to WineStaging-1.7.55 reactos/tools/wpp # Synced to WineStaging-1.9.4 Modified: trunk/reactos/sdk/tools/unicode/fold.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/unicode/fold.c?r…
============================================================================== --- trunk/reactos/sdk/tools/unicode/fold.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/unicode/fold.c [iso-8859-1] Sat Jul 2 13:46:41 2016 @@ -22,13 +22,13 @@ static inline WCHAR to_unicode_digit( WCHAR ch ) { - extern const WCHAR wine_digitmap[]; + extern const WCHAR wine_digitmap[] DECLSPEC_HIDDEN; return ch + wine_digitmap[wine_digitmap[ch >> 8] + (ch & 0xff)]; } static inline WCHAR to_unicode_native( WCHAR ch ) { - extern const WCHAR wine_compatmap[]; + extern const WCHAR wine_compatmap[] DECLSPEC_HIDDEN; return ch + wine_compatmap[wine_compatmap[ch >> 8] + (ch & 0xff)]; } Modified: trunk/reactos/sdk/tools/unicode/mbtowc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/unicode/mbtowc.c…
============================================================================== --- trunk/reactos/sdk/tools/unicode/mbtowc.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/unicode/mbtowc.c [iso-8859-1] Sat Jul 2 13:46:41 2016 @@ -131,7 +131,7 @@ for (len = 0; srclen; srclen--, src++, len++) { - if (cp2uni_lb[*src] && srclen > 1) + if (cp2uni_lb[*src] && srclen > 1 && src[1]) { src++; srclen--; @@ -183,7 +183,7 @@ for (len = dstlen; srclen && len; len--, srclen--, src++, dst++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--; @@ -212,7 +212,7 @@ for (len = 0; srclen; srclen--, src++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--; @@ -227,7 +227,7 @@ for (len = dstlen; srclen && len; srclen--, src++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--; Modified: trunk/reactos/sdk/tools/unicode/string.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/unicode/string.c…
============================================================================== --- trunk/reactos/sdk/tools/unicode/string.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/unicode/string.c [iso-8859-1] Sat Jul 2 13:46:41 2016 @@ -19,6 +19,7 @@ */ #include <assert.h> +#include <errno.h> #include <limits.h> #include <stdio.h> @@ -164,6 +165,7 @@ if (overflow) { + errno = ERANGE; return negative ? LONG_MIN : LONG_MAX; } @@ -276,6 +278,7 @@ if (overflow) { + errno = ERANGE; return ULONG_MAX; }
8 years, 5 months
1
0
0
0
[akhaldi] 71745: [AMSTREAM] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:35:40 2016 New Revision: 71745 URL:
http://svn.reactos.org/svn/reactos?rev=71745&view=rev
Log: [AMSTREAM] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/…
============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastream.c [iso-8859-1] Sat Jul 2 13:35:40 2016 @@ -102,7 +102,7 @@ { DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); if (!multi_media_stream) return E_POINTER; @@ -265,17 +265,17 @@ /*** IMediaStream methods ***/ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiMediaStream(IDirectDrawMediaStream *iface, - IMultiMediaStream** ppMultiMediaStream) + IMultiMediaStream **multi_media_stream) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); - - if (!ppMultiMediaStream) + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + + if (!multi_media_stream) return E_POINTER; IMultiMediaStream_AddRef(This->parent); - *ppMultiMediaStream = This->parent; + *multi_media_stream = This->parent; return S_OK; } @@ -678,17 +678,17 @@ /*** IMediaStream methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface, - IMultiMediaStream** multimedia_stream) + IMultiMediaStream **multi_media_stream) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, multimedia_stream); - - if (!multimedia_stream) + TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream); + + if (!multi_media_stream) return E_POINTER; IMultiMediaStream_AddRef(This->parent); - *multimedia_stream = This->parent; + *multi_media_stream = This->parent; return S_OK; } Modified: trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/…
============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] Sat Jul 2 13:35:40 2016 @@ -58,7 +58,7 @@ static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) { - return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter); + return CONTAINING_RECORD((IBaseFilter *)iface, IMediaStreamFilterImpl, filter.IBaseFilter_iface); } static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt) Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 13:35:40 2016 @@ -21,7 +21,7 @@ The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4
8 years, 5 months
1
0
0
0
[akhaldi] 71744: [INETCPL] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:28:27 2016 New Revision: 71744 URL:
http://svn.reactos.org/svn/reactos?rev=71744&view=rev
Log: [INETCPL] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/cpl/inetcpl/general.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/cpl/inetcpl/general.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/general.c?…
============================================================================== --- trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] Sat Jul 2 13:28:27 2016 @@ -25,12 +25,8 @@ #include <shlobj.h> static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; -#ifdef __REACTOS__ -static const WCHAR default_home[] = {'h','t','t','p',':','/','/','w','w','w','.','r','e','a','c','t','o','s','.','o','r','g',0}; -#else -static const WCHAR default_home[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -#endif static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; +static const WCHAR default_page[] = {'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0}; static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', @@ -169,6 +165,10 @@ */ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) { + WCHAR buffer[INTERNET_MAX_URL_LENGTH]; + DWORD len; + DWORD type; + LONG res; switch (wparam) { @@ -182,7 +182,10 @@ break; case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED): - SetDlgItemTextW(hwnd, IDC_HOME_EDIT, default_home); + len = sizeof(buffer); + type = REG_SZ; + res = SHRegGetUSValueW(reg_ie_main, default_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + if (!res && (type == REG_SZ)) SetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer); break; case MAKEWPARAM(IDC_HISTORY_DELETE, BN_CLICKED): Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 13:28:27 2016 @@ -224,7 +224,7 @@ reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.4 reactos/dll/win32/xmllite # Synced to WineStaging-1.9.11 -reactos/dll/cpl/inetcpl # Synced to WineStaging-1.9.4 +reactos/dll/cpl/inetcpl # Synced to WineStaging-1.9.11 ReactOS shares the following programs with Winehq.
8 years, 5 months
1
0
0
0
[akhaldi] 71743: [RPCRT4] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:24:53 2016 New Revision: 71743 URL:
http://svn.reactos.org/svn/reactos?rev=71743&view=rev
Log: [RPCRT4] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r…
============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] Sat Jul 2 13:24:53 2016 @@ -41,7 +41,7 @@ static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) { - return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); + return CONTAINING_RECORD((void *)iface, cstdstubbuffer_delegating_t, stub_buffer); } HRESULT CStdStubBuffer_Construct(REFIID riid, Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c…
============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_ole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_ole.c [iso-8859-1] Sat Jul 2 13:24:53 2016 @@ -19,7 +19,6 @@ * * TODO: * - fix the wire-protocol to match MS/RPC - * - finish RpcStream_Vtbl */ #include "precomp.h" Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve…
============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] Sat Jul 2 13:24:53 2016 @@ -1079,7 +1079,7 @@ RPC_STATUS WINAPI RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ) { TRACE("(%p,%s,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv); - return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL ); + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL, NULL ); } /*********************************************************************** @@ -1089,7 +1089,7 @@ UINT Flags, UINT MaxCalls, RPC_IF_CALLBACK_FN* IfCallbackFn ) { TRACE("(%p,%s,%p,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, IfCallbackFn); - return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, (UINT)-1, IfCallbackFn ); + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, (UINT)-1, IfCallbackFn, NULL ); } /*********************************************************************** @@ -1097,13 +1097,26 @@ */ RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn ) +{ + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, MaxRpcSize, IfCallbackFn, NULL ); +} + +/*********************************************************************** + * RpcServerRegisterIf3 (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcServerRegisterIf3( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, + UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn, void* SecurityDescriptor) { PRPC_SERVER_INTERFACE If = IfSpec; RpcServerInterface* sif; unsigned int i; - TRACE("(%p,%s,%p,%u,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, - MaxRpcSize, IfCallbackFn); + TRACE("(%p,%s,%p,%u,%u,%u,%p,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, + MaxRpcSize, IfCallbackFn, SecurityDescriptor); + + if (SecurityDescriptor) + FIXME("Unsupported SecurityDescriptor argument.\n"); + TRACE(" interface id: %s %d.%d\n", debugstr_guid(&If->InterfaceId.SyntaxGUID), If->InterfaceId.SyntaxVersion.MajorVersion, If->InterfaceId.SyntaxVersion.MinorVersion); Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro…
============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Sat Jul 2 13:24:53 2016 @@ -1,7 +1,7 @@ diff -pudN --strip-trailing-cr e:\wine\dlls\rpcrt4/cproxy.c e:\reactos\dll\win32\rpcrt4/cproxy.c ---- e:\wine\dlls\rpcrt4/cproxy.c 2015-02-21 17:13:10 +0100 +--- e:\wine\dlls\rpcrt4/cproxy.c 2016-05-31 18:02:22 +0100 +++ e:\reactos\dll\win32\rpcrt4/cproxy.c 2015-08-27 22:03:34 +0100 -@@ -167,6 +150,30 @@ static inline void init_thunk( struct th +@@ -150,6 +150,30 @@ static inline void init_thunk( struct th thunk->call_stubless = call_stubless_func; } @@ -33,9 +33,9 @@ #warning You must implement stubless proxies for your CPU diff -pudN --strip-trailing-cr e:\wine\dlls\rpcrt4/cstub.c e:\reactos\dll\win32\rpcrt4/cstub.c ---- e:\wine\dlls\rpcrt4/cstub.c 2015-10-30 18:41:53 +0100 -+++ e:\reactos\dll\win32\rpcrt4/cstub.c 2015-11-16 22:55:49 +0100 -@@ -174,6 +156,13 @@ typedef struct +--- e:\wine\dlls\rpcrt4/cstub.c 2016-05-31 18:02:22 +0100 ++++ e:\reactos\dll\win32\rpcrt4/cstub.c 2016-05-20 23:26:31 +0100 +@@ -156,6 +156,13 @@ typedef struct static const BYTE opcodes[16] = { 0x48, 0x8b, 0x49, 0x20, 0x48, 0x8b, 0x01, 0xff, 0xa0, 0, 0, 0, 0, 0x48, 0x8d, 0x36 }; @@ -50,9 +50,9 @@ #warning You must implement delegated proxies/stubs for your CPU diff -pudN --strip-trailing-cr e:\wine\dlls\rpcrt4/rpc_epmap.c e:\reactos\dll\win32\rpcrt4/rpc_epmap.c ---- e:\wine\dlls\rpcrt4/rpc_epmap.c 2015-02-21 17:13:10 +0100 +--- e:\wine\dlls\rpcrt4/rpc_epmap.c 2016-05-31 18:02:22 +0100 +++ e:\reactos\dll\win32\rpcrt4/rpc_epmap.c 2015-11-16 22:55:50 +0100 -@@ -162,7 +150,7 @@ static RPC_STATUS get_epm_handle_server( +@@ -150,7 +150,7 @@ static RPC_STATUS get_epm_handle_server( static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) { @@ -62,9 +62,9 @@ case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION: diff -pudN --strip-trailing-cr e:\wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_transport.c ---- e:\wine\dlls\rpcrt4/rpc_transport.c 2015-11-01 09:49:28 +0100 +--- e:\wine\dlls\rpcrt4/rpc_transport.c 2016-05-31 18:02:23 +0100 +++ e:\reactos\dll\win32\rpcrt4/rpc_transport.c 2015-11-16 22:55:50 +0100 -@@ -102,6 +79,7 @@ +@@ -79,6 +79,7 @@ #define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000) @@ -72,7 +72,7 @@ #define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) WINE_DEFAULT_DEBUG_CHANNEL(rpc); -@@ -114,31 +92,41 @@ typedef struct _RpcConnection_np +@@ -91,31 +92,41 @@ typedef struct _RpcConnection_np { RpcConnection common; HANDLE pipe; @@ -121,7 +121,7 @@ case ERROR_NO_DATA_DETECTED: /* client has disconnected, retry */ DisconnectNamedPipe( npc->pipe ); -@@ -151,6 +139,7 @@ static DWORD CALLBACK listen_thread(void +@@ -128,6 +139,7 @@ static DWORD CALLBACK listen_thread(void } } @@ -129,7 +129,7 @@ static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) { if (npc->listening) -@@ -166,13 +155,14 @@ static RPC_STATUS rpcrt4_conn_listen_pip +@@ -143,13 +155,14 @@ static RPC_STATUS rpcrt4_conn_listen_pip } return RPC_S_OK; } @@ -145,7 +145,7 @@ PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); -@@ -184,6 +174,9 @@ static RPC_STATUS rpcrt4_conn_create_pip +@@ -161,6 +174,9 @@ static RPC_STATUS rpcrt4_conn_create_pip return RPC_S_CANT_CREATE_ENDPOINT; } @@ -155,7 +155,7 @@ /* Note: we don't call ConnectNamedPipe here because it must be done in the * server thread as the thread must be alertable */ return RPC_S_OK; -@@ -230,6 +223,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( +@@ -207,6 +223,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( if (err == ERROR_PIPE_BUSY) { TRACE("connection failed, error=%x\n", err); return RPC_S_SERVER_TOO_BUSY; @@ -165,7 +165,7 @@ } if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { err = GetLastError(); -@@ -239,9 +235,11 @@ static RPC_STATUS rpcrt4_conn_open_pipe( +@@ -216,9 +235,11 @@ static RPC_STATUS rpcrt4_conn_open_pipe( } /* success */ @@ -177,7 +177,7 @@ npc->pipe = pipe; return RPC_S_OK; -@@ -262,6 +260,7 @@ static char *ncalrpc_pipe_name(const cha +@@ -239,6 +260,7 @@ static char *ncalrpc_pipe_name(const cha static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -185,7 +185,7 @@ RPC_STATUS r; LPSTR pname; -@@ -269,7 +268,10 @@ static RPC_STATUS rpcrt4_ncalrpc_open(Rp +@@ -246,7 +268,10 @@ static RPC_STATUS rpcrt4_ncalrpc_open(Rp if (npc->pipe) return RPC_S_OK; @@ -197,7 +197,7 @@ r = rpcrt4_conn_open_pipe(Connection, pname, TRUE); I_RpcFree(pname); -@@ -278,6 +280,7 @@ static RPC_STATUS rpcrt4_ncalrpc_open(Rp +@@ -255,6 +280,7 @@ static RPC_STATUS rpcrt4_ncalrpc_open(Rp static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, const char *endpoint) { @@ -205,7 +205,7 @@ RPC_STATUS r; LPSTR pname; RpcConnection *Connection; -@@ -298,7 +301,10 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc +@@ -275,7 +301,10 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc if (r != RPC_S_OK) return r; @@ -217,7 +217,7 @@ r = rpcrt4_conn_create_pipe(Connection, pname); I_RpcFree(pname); -@@ -324,15 +330,64 @@ static char *ncacn_pipe_name(const char +@@ -301,15 +330,64 @@ static char *ncacn_pipe_name(const char static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -284,7 +284,7 @@ I_RpcFree(pname); return r; -@@ -340,6 +395,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(R +@@ -317,6 +395,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(R static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { @@ -292,7 +292,7 @@ RPC_STATUS r; LPSTR pname; RpcConnection *Connection; -@@ -360,7 +416,9 @@ static RPC_STATUS rpcrt4_protseq_ncacn_n +@@ -337,7 +416,9 @@ static RPC_STATUS rpcrt4_protseq_ncacn_n if (r != RPC_S_OK) return r; @@ -303,7 +303,7 @@ r = rpcrt4_conn_create_pipe(Connection, pname); I_RpcFree(pname); -@@ -378,9 +436,9 @@ static void rpcrt4_conn_np_handoff(RpcCo +@@ -355,9 +436,9 @@ static void rpcrt4_conn_np_handoff(RpcCo * to the child, then reopen the server binding to continue listening */ new_npc->pipe = old_npc->pipe; @@ -315,7 +315,7 @@ old_npc->listening = FALSE; } -@@ -388,10 +446,12 @@ static RPC_STATUS rpcrt4_ncacn_np_handof +@@ -365,10 +446,12 @@ static RPC_STATUS rpcrt4_ncacn_np_handof { RPC_STATUS status; LPSTR pname; @@ -329,7 +329,7 @@ status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); -@@ -429,12 +489,14 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff +@@ -406,12 +489,14 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff { RPC_STATUS status; LPSTR pname; @@ -345,7 +345,7 @@ status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); -@@ -448,12 +510,17 @@ static int rpcrt4_conn_np_read(RpcConnec +@@ -425,12 +510,17 @@ static int rpcrt4_conn_np_read(RpcConnec char *buf = buffer; BOOL ret = TRUE; unsigned int bytes_left = count; @@ -365,7 +365,7 @@ if (!ret && GetLastError() == ERROR_MORE_DATA) ret = TRUE; if (!ret || !bytes_read) -@@ -461,7 +528,7 @@ static int rpcrt4_conn_np_read(RpcConnec +@@ -438,7 +528,7 @@ static int rpcrt4_conn_np_read(RpcConnec bytes_left -= bytes_read; buf += bytes_read; } @@ -374,7 +374,7 @@ return ret ? count : -1; } -@@ -472,16 +539,23 @@ static int rpcrt4_conn_np_write(RpcConne +@@ -449,16 +539,23 @@ static int rpcrt4_conn_np_write(RpcConne const char *buf = buffer; BOOL ret = TRUE; unsigned int bytes_left = count; @@ -399,7 +399,7 @@ return ret ? count : -1; } -@@ -493,9 +567,9 @@ static int rpcrt4_conn_np_close(RpcConne +@@ -470,9 +567,9 @@ static int rpcrt4_conn_np_close(RpcConne CloseHandle(npc->pipe); npc->pipe = 0; } @@ -412,7 +412,7 @@ } return 0; } -@@ -699,7 +773,7 @@ static void *rpcrt4_protseq_np_get_wait_ +@@ -676,7 +773,7 @@ static void *rpcrt4_protseq_np_get_wait_ conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { rpcrt4_conn_listen_pipe(conn); @@ -421,7 +421,7 @@ (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } -@@ -720,7 +794,7 @@ static void *rpcrt4_protseq_np_get_wait_ +@@ -697,7 +794,7 @@ static void *rpcrt4_protseq_np_get_wait_ *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { @@ -430,7 +430,7 @@ (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } -@@ -767,18 +841,12 @@ static int rpcrt4_protseq_np_wait_for_ne +@@ -744,18 +841,12 @@ static int rpcrt4_protseq_np_wait_for_ne EnterCriticalSection(&protseq->cs); conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 13:24:53 2016 @@ -163,7 +163,7 @@ reactos/dll/win32/resutils # Synced to WineStaging-1.9.4 reactos/dll/win32/riched20 # Synced to WineStaging-1.9.11 reactos/dll/win32/riched32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.9.4 +reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.9.11 reactos/dll/win32/rsabase # Synced to WineStaging-1.9.4 reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.4 reactos/dll/win32/sccbase # Synced to WineStaging-1.9.4
8 years, 5 months
1
0
0
0
[akhaldi] 71742: [SETUPAPI] Properly stub SetupAddSectionToDiskSpaceListA, SetupAddToDiskSpaceListA and SetupQueryDrivesInDiskSpaceListA.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:17:44 2016 New Revision: 71742 URL:
http://svn.reactos.org/svn/reactos?rev=71742&view=rev
Log: [SETUPAPI] Properly stub SetupAddSectionToDiskSpaceListA, SetupAddToDiskSpaceListA and SetupQueryDrivesInDiskSpaceListA. Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap…
============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sat Jul 2 13:17:44 2016 @@ -219,9 +219,9 @@ @ stdcall MyRealloc(ptr long) @ stdcall SetupAddInstallSectionToDiskSpaceListA(long long long str ptr long) @ stub SetupAddInstallSectionToDiskSpaceListW -@ stub SetupAddSectionToDiskSpaceListA +@ stdcall -stub SetupAddSectionToDiskSpaceListA(long long long str long ptr long) @ stub SetupAddSectionToDiskSpaceListW -@ stub SetupAddToDiskSpaceListA +@ stdcall -stub SetupAddToDiskSpaceListA(long str double long ptr long) @ stub SetupAddToDiskSpaceListW @ stub SetupAddToSourceListA @ stub SetupAddToSourceListW @@ -468,7 +468,7 @@ @ stdcall SetupPromptForDiskA(ptr str str str str str long ptr long ptr) @ stdcall SetupPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) @ stdcall SetupPromptReboot(ptr ptr long) -@ stub SetupQueryDrivesInDiskSpaceListA +@ stdcall -stub SetupQueryDrivesInDiskSpaceListA(ptr ptr long ptr) @ stub SetupQueryDrivesInDiskSpaceListW @ stub SetupQueryFileLogA @ stub SetupQueryFileLogW
8 years, 5 months
1
0
0
0
[akhaldi] 71741: [SHLWAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:17:08 2016 New Revision: 71741 URL:
http://svn.reactos.org/svn/reactos?rev=71741&view=rev
Log: [SHLWAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/shlwapi/assoc.c trunk/rostests/winetests/shlwapi/istream.c trunk/rostests/winetests/shlwapi/path.c trunk/rostests/winetests/shlwapi/url.c Modified: trunk/rostests/winetests/shlwapi/assoc.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/assoc.c…
============================================================================== --- trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] Sat Jul 2 13:17:08 2016 @@ -108,9 +108,11 @@ hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || - hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ - "Unexpected result : %08x\n", hr); - ok(len == 0xdeadbeef, "got %u\n", len); + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND) /* Win8 */ || + hr == S_FALSE, /* Win10 */ + "Unexpected result : %08x\n", hr); + ok((hr == S_FALSE && len < sizeof(buf)/sizeof(buf[0])) || len == 0xdeadbeef, + "got hr=%08x and len=%u\n", hr, len); len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); Modified: trunk/rostests/winetests/shlwapi/istream.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/istream…
============================================================================== --- trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] Sat Jul 2 13:17:08 2016 @@ -253,11 +253,24 @@ } else { -todo_wine ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written); ok(count == 0, "expected 0, got %u\n", count); } + ret = stream->lpVtbl->Seek(stream, start, STREAM_SEEK_SET, NULL); + ok(ret == S_OK, "Seek error %#x\n", ret); + + count = 0xdeadbeaf; + ret = stream->lpVtbl->Read(stream, buf, 0, &count); + ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); + ok(count == 0, "expected 0, got %u\n", count); + + count = 0xdeadbeaf; + ret = stream->lpVtbl->Read(stream, buf, sizeof(buf), &count); + ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written); + ok(count == written, "expected %u, got %u\n", written, count); + if (count) + ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); } static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) Modified: trunk/rostests/winetests/shlwapi/path.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/path.c?…
============================================================================== --- trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] Sat Jul 2 13:17:08 2016 @@ -291,9 +291,7 @@ for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); - if (!(TEST_PATHFROMURL[i].todo & 0x1)) - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1) ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { if(!(TEST_PATHFROMURL[i].todo & 0x2)) { @@ -310,9 +308,7 @@ urlW = GetWideString(TEST_PATHFROMURL[i].url); ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),NULL,NULL); - if (!(TEST_PATHFROMURL[i].todo & 0x1)) - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1) ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { if(!(TEST_PATHFROMURL[i].todo & 0x2)) { @@ -331,9 +327,7 @@ len2 = 2; ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0); ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url %s\n", ret, TEST_PATHFROMURL[i].url); - if(!(TEST_PATHFROMURL[i].todo & 0x4)) - ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x4) ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); } Modified: trunk/rostests/winetests/shlwapi/url.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/url.c?r…
============================================================================== --- trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] Sat Jul 2 13:17:08 2016 @@ -861,10 +861,7 @@ ok(ret == dwExpectReturn || ret == dwExpectReturnAlt, "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index %d\n", dwExpectReturn, dwExpectReturnAlt, ret, index); - if (todo) - todo_wine - ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); - else + todo_wine_if (todo) ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); if (pUrlCanonicalizeW) {
8 years, 5 months
1
0
0
0
[akhaldi] 71740: [SHLWAPI] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:15:50 2016 New Revision: 71740 URL:
http://svn.reactos.org/svn/reactos?rev=71740&view=rev
Log: [SHLWAPI] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/shlwapi/istream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shlwapi/istream.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/istream.…
============================================================================== --- trunk/reactos/dll/win32/shlwapi/istream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/istream.c [iso-8859-1] Sat Jul 2 13:15:50 2016 @@ -116,7 +116,7 @@ } if (pcbRead) *pcbRead = dwRead; - return S_OK; + return dwRead == cb ? S_OK : S_FALSE; } /************************************************************************** Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 13:15:50 2016 @@ -177,7 +177,7 @@ reactos/dll/win32/shdocvw # Synced to WineStaging-1.9.4 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-1.9.4 -reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.11 reactos/dll/win32/slbcsp # Synced to WineStaging-1.9.4 reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.4 reactos/dll/win32/softpub # Synced to WineStaging-1.9.4
8 years, 5 months
1
0
0
0
[akhaldi] 71739: [T2EMBED] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:14:52 2016 New Revision: 71739 URL:
http://svn.reactos.org/svn/reactos?rev=71739&view=rev
Log: [T2EMBED] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/t2embed/main.c trunk/reactos/dll/win32/t2embed/stubs.c trunk/reactos/dll/win32/t2embed/t2embed.spec trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/include/psdk/t2embapi.h Modified: trunk/reactos/dll/win32/t2embed/main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/main.c?r…
============================================================================== --- trunk/reactos/dll/win32/t2embed/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/main.c [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -19,9 +19,13 @@ #define WIN32_NO_STATUS #include <stdarg.h> + #include <windef.h> #include <winbase.h> +#include <wingdi.h> +#include <winreg.h> #include <t2embapi.h> + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(t2embed); @@ -70,16 +74,100 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { - FIXME("(%p %p) stub\n", hDC, status); - if (status) *status = EMBED_NOEMBEDDING; - return E_API_NOTIMPL; + OUTLINETEXTMETRICW otm; + + TRACE("(%p %p)\n", hDC, status); + + if (!hDC) + return E_HDCINVALID; + + otm.otmSize = sizeof(otm); + if (!GetOutlineTextMetricsW(hDC, otm.otmSize, &otm)) + return E_NOTATRUETYPEFONT; + + if (!status) + return E_PERMISSIONSINVALID; + + if (otm.otmfsType == LICENSE_INSTALLABLE) + *status = EMBED_INSTALLABLE; + else if (otm.otmfsType & LICENSE_NOEMBEDDING) + *status = EMBED_NOEMBEDDING; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; + else if (otm.otmfsType & LICENSE_EDITABLE) + *status = EMBED_EDITABLE; + + return E_NONE; +} + +LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) +{ + static const WCHAR exclusionlistW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'S','h','a','r','e','d',' ','T','o','o','l','s','\\','t','2','e','m','b','e','d',0}; + DWORD index; + HKEY hkey; + LONG ret; + + TRACE("(%s %p)\n", debugstr_a(facename), enabled); + + if (!facename) + return E_FACENAMEINVALID; + + if (!enabled) + return E_PBENABLEDINVALID; + + *enabled = TRUE; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) + return E_NONE; + + *enabled = TRUE; + ret = ERROR_SUCCESS; + index = 0; + while (ret != ERROR_NO_MORE_ITEMS) + { + DWORD name_len, value_len, value, type; + CHAR name[LF_FACESIZE]; + + name_len = sizeof(name)/sizeof(*name); + value_len = sizeof(value); + ret = RegEnumValueA(hkey, index++, name, &name_len, NULL, &type, (BYTE*)&value, &value_len); + if (ret || type != REG_DWORD) + continue; + + if (!lstrcmpiA(name, facename)) + { + *enabled = !!value; + break; + } + } + RegCloseKey(hkey); + + return E_NONE; } LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) { - FIXME("(%p %p) stub\n", hDC, enabled); - if (enabled) *enabled = FALSE; - return E_API_NOTIMPL; + OUTLINETEXTMETRICA *otm; + LONG ret; + UINT len; + + TRACE("(%p %p)\n", hDC, enabled); + + if (!hDC) + return E_HDCINVALID; + + len = GetOutlineTextMetricsA(hDC, 0, NULL); + if (!len) + return E_ERRORACCESSINGFACENAME; + + otm = HeapAlloc(GetProcessHeap(), 0, len); + if (!otm) + return E_NOFREEMEMORY; + + GetOutlineTextMetricsA(hDC, len, otm); + ret = TTIsEmbeddingEnabledForFacename(otm->otmpFaceName, enabled); + HeapFree(GetProcessHeap(), 0, otm); + return ret; } LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) Modified: trunk/reactos/dll/win32/t2embed/stubs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/stubs.c?…
============================================================================== --- trunk/reactos/dll/win32/t2embed/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/stubs.c [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -68,15 +68,6 @@ LONG WINAPI -TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, - BOOL* pbEnabled) -{ - UNIMPLEMENTED; - return E_NONE; -} - -LONG -WINAPI TTRunValidationTests(HDC hDC, TTVALIDATIONTESTPARAMS* pTestParam) { Modified: trunk/reactos/dll/win32/t2embed/t2embed.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.…
============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -1,11 +1,11 @@ @ stdcall TTCharToUnicode(ptr ptr long ptr long long) -@ stdcall TTDeleteEmbeddedFont(ptr long ptr) -@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTDeleteEmbeddedFont(long long ptr) +@ stdcall TTEmbedFont(long long long ptr ptr ptr ptr ptr long long ptr) @ stdcall TTEmbedFontFromFileA(ptr str long long long ptr ptr ptr ptr ptr long long ptr) @ stdcall TTEnableEmbeddingForFacename(str long) @ stdcall TTGetEmbeddedFontInfo(long ptr long ptr ptr ptr ptr) -@ stdcall TTGetEmbeddingType(ptr ptr) -@ stdcall TTIsEmbeddingEnabled(ptr ptr) +@ stdcall TTGetEmbeddingType(long ptr) +@ stdcall TTIsEmbeddingEnabled(long ptr) @ stdcall TTIsEmbeddingEnabledForFacename(str ptr) @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stdcall TTRunValidationTests(ptr ptr) @@ -17,7 +17,7 @@ @ stub _TTGetEmbeddedFontInfo@28 @ stdcall _TTGetEmbeddingType@8(long ptr) TTGetEmbeddingType @ stdcall _TTIsEmbeddingEnabled@8(long ptr) TTIsEmbeddingEnabled -@ stub _TTIsEmbeddingEnabledForFacename@8 +@ stdcall _TTIsEmbeddingEnabledForFacename@8(str ptr) TTIsEmbeddingEnabledForFacename @ stdcall _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests@8 @ stdcall TTEmbedFontEx(ptr long long ptr ptr ptr ptr ptr long long ptr) Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -186,7 +186,7 @@ reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.4 reactos/dll/win32/sti # Synced to WineStaging-1.9.4 reactos/dll/win32/sxs # Synced to WineStaging-1.9.4 -reactos/dll/win32/t2embed # Synced to WineStaging-1.9.4 +reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11 reactos/dll/win32/tapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/traffic # Synced to WineStaging-1.9.4 reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.4 Modified: trunk/reactos/sdk/include/psdk/t2embapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/t2embapi.…
============================================================================== --- trunk/reactos/sdk/include/psdk/t2embapi.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/t2embapi.h [iso-8859-1] Sat Jul 2 13:14:52 2016 @@ -233,7 +233,7 @@ LONG WINAPI -TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, +TTIsEmbeddingEnabledForFacename(LPCSTR lpszFacename, BOOL* pbEnabled); LONG
8 years, 5 months
1
0
0
0
[akhaldi] 71738: [URLMON_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:12:56 2016 New Revision: 71738 URL:
http://svn.reactos.org/svn/reactos?rev=71738&view=rev
Log: [URLMON_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/urlmon/misc.c trunk/rostests/winetests/urlmon/sec_mgr.c trunk/rostests/winetests/urlmon/uri.c Modified: trunk/rostests/winetests/urlmon/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?r…
============================================================================== --- trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] Sat Jul 2 13:12:56 2016 @@ -1730,14 +1730,9 @@ for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); - if(default_feature_tests[i].todo) { - todo_wine + todo_wine_if (default_feature_tests[i].todo) ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", hres, default_feature_tests[i].expected, i); - } else { - ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, default_feature_tests[i].expected, i); - } } } @@ -1883,24 +1878,15 @@ for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) { hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags, internet_feature_tests[i].enable); - if(internet_feature_tests[i].set_todo) { - todo_wine + todo_wine_if (internet_feature_tests[i].set_todo) ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", hres, internet_feature_tests[i].set_expected, i); - } else { - ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, internet_feature_tests[i].set_expected, i); - } hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags); - if(internet_feature_tests[i].get_todo) { - todo_wine + todo_wine_if (internet_feature_tests[i].get_todo) ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", hres, internet_feature_tests[i].get_expected, i); - } else { - ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, internet_feature_tests[i].get_expected, i); - } + } } Modified: trunk/rostests/winetests/urlmon/sec_mgr.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/sec_mgr.…
============================================================================== --- trunk/rostests/winetests/urlmon/sec_mgr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/sec_mgr.c [iso-8859-1] Sat Jul 2 13:12:56 2016 @@ -948,11 +948,7 @@ hres = IInternetSecurityManager_MapUrlToZone(secmgr, urlW, &zone, 0); ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres); - if(test->todo) - todo_wine - ok(zone == test->zone || broken(test->broken_zone == zone), - "Expected %d, but got %d on test %d\n", test->zone, zone, i); - else + todo_wine_if (test->todo) ok(zone == test->zone || broken(test->broken_zone == zone), "Expected %d, but got %d on test %d\n", test->zone, zone, i); @@ -1644,12 +1640,7 @@ result = NULL; hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_DEFAULT, 0); - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(hr == sec_url_ex_tests[i].default_hres, - "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", - hr, sec_url_ex_tests[i].default_hres, i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(hr == sec_url_ex_tests[i].default_hres, "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", hr, sec_url_ex_tests[i].default_hres, i); @@ -1660,12 +1651,7 @@ hr = IUri_GetDisplayUri(result, &received); ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, wine_dbgstr_w(received), i); @@ -1677,12 +1663,7 @@ result = NULL; hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_SECURITY_URL_ONLY, 0); - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(hr == sec_url_ex_tests[i].default_hres, - "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", - hr, sec_url_ex_tests[i].default_hres, i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(hr == sec_url_ex_tests[i].default_hres, "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", hr, sec_url_ex_tests[i].default_hres, i); @@ -1693,12 +1674,7 @@ hr = IUri_GetDisplayUri(result, &received); ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, wine_dbgstr_w(received), i); @@ -1866,14 +1842,7 @@ ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].uri); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); - if(sec_mgr_ex2_tests[i].map_todo) { - todo_wine - ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x for '%s'\n", - hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); - todo_wine - ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, - zone, sec_mgr_ex2_tests[i].uri); - } else { + todo_wine_if (sec_mgr_ex2_tests[i].map_todo) { ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, @@ -1884,19 +1853,7 @@ memset(buf, 0xf0, buf_size); hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, 0); - if(sec_mgr_ex2_tests[i].secid_todo) { - todo_wine - ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", - hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); - if(sec_mgr_ex2_tests[i].secid) { - todo_wine { - ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong security id size=%d, expected %d on test '%s'\n", - buf_size, sec_mgr_ex2_tests[i].secid_size, sec_mgr_ex2_tests[i].uri); - ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid, sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test '%s'\n", - sec_mgr_ex2_tests[i].uri); - } - } - } else { + todo_wine_if (sec_mgr_ex2_tests[i].secid_todo) { ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); if(sec_mgr_ex2_tests[i].secid) { Modified: trunk/rostests/winetests/urlmon/uri.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re…
============================================================================== --- trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] Sat Jul 2 13:12:56 2016 @@ -5775,7 +5775,7 @@ 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE }, - /* UserName can't contain any character that is a delimeter for another + /* UserName can't contain any character that is a delimiter for another * component that appears after it in a normal URI. */ { "
http://google.com/
",0,S_OK,FALSE,
8 years, 5 months
1
0
0
0
[akhaldi] 71737: [URLMON] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 13:11:50 2016 New Revision: 71737 URL:
http://svn.reactos.org/svn/reactos?rev=71737&view=rev
Log: [URLMON] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c trunk/reactos/dll/win32/urlmon/mk.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte…
============================================================================== --- trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] Sat Jul 2 13:11:50 2016 @@ -686,7 +686,7 @@ if(dwReserved) WARN("dwReserved=%d\n", dwReserved); - /* pBC seams to not be used */ + /* pBC seems to not be used */ if(!ppwzMimeOut || (!pwzUrl && !pBuffer)) return E_INVALIDARG; Modified: trunk/reactos/dll/win32/urlmon/mk.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mk.c?rev=…
============================================================================== --- trunk/reactos/dll/win32/urlmon/mk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mk.c [iso-8859-1] Sat Jul 2 13:11:50 2016 @@ -197,9 +197,8 @@ { MkProtocol *This = impl_from_IInternetProtocolEx(iface); LPWSTR mime, progid, display_name, colon_ptr; - DWORD path_size = INTERNET_MAX_URL_LENGTH; DWORD bindf=0, eaten=0, scheme=0, len; - BSTR url, path_tmp, path = NULL; + BSTR url, path = NULL; IParseDisplayName *pdn; BINDINFO bindinfo; STATSTG statstg; @@ -238,22 +237,20 @@ CoTaskMemFree(mime); } - hres = IUri_GetPath(pUri, &path_tmp); - if(FAILED(hres)) - return hres; - path = heap_alloc(path_size); - hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0); - SysFreeString(path_tmp); - if (FAILED(hres)) - { - heap_free(path); + hres = IUri_GetPath(pUri, &path); + if(FAILED(hres)) + return hres; + len = SysStringLen(path)+1; + hres = UrlUnescapeW(path, NULL, &len, URL_UNESCAPE_INPLACE); + if (FAILED(hres)) { + SysFreeString(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } + progid = path+1; /* skip '@' symbol */ colon_ptr = strchrW(path, ':'); - if(!colon_ptr) - { - heap_free(path); + if(!colon_ptr) { + SysFreeString(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } @@ -263,7 +260,7 @@ progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */ hres = CLSIDFromProgID(progid, &clsid); - heap_free(path); + SysFreeString(path); if(FAILED(hres)) { heap_free(display_name); Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 13:11:50 2016 @@ -192,7 +192,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.4 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.4 reactos/dll/win32/url # Synced to WineStaging-1.9.4 -reactos/dll/win32/urlmon # Synced to WineStaging-1.9.4 +reactos/dll/win32/urlmon # Synced to WineStaging-1.9.11 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11
8 years, 5 months
1
0
0
0
← Newer
1
...
30
31
32
33
34
35
36
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
Results per page:
10
25
50
100
200