Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 69951: [WSHOM_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:21:37 2015 New Revision: 69951 URL: http://svn.reactos.org/svn/reactos?rev=69951&view=rev Log: [WSHOM_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/wshom/wshom.idl Modified: trunk/rostests/winetests/wshom/wshom.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.idl… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] Fri Nov 20 10:21:37 2015 @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "oaidl.idl"; cpp_quote("#undef ExpandEnvironmentStrings")

1 0

[akhaldi] 69950: [WSHOM.OCX] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:21:19 2015 New Revision: 69950 URL: http://svn.reactos.org/svn/reactos?rev=69950&view=rev Log: [WSHOM.OCX] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt trunk/reactos/dll/win32/wshom.ocx/shell.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt [iso-8859-1] Fri Nov 20 10:21:19 2015 @@ -28,7 +28,7 @@ set_source_files_properties(wshom.rc PROPERTIES OBJECT_DEPENDS "${wshom_rc_deps}") set_module_type(wshom win32ocx) target_link_libraries(wshom uuid wine) -add_importlibs(wshom oleaut32 ole32 shell32 advapi32 user32 msvcrt kernel32 ntdll) +add_importlibs(wshom oleaut32 ole32 shell32 advapi32 advapi32_vista user32 msvcrt kernel32 ntdll) add_dependencies(wshom stdole2 wshom_idlheader) add_pch(wshom wshom_private.h SOURCE) add_cd_file(TARGET wshom DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wshom.ocx/shell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/shell.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] Fri Nov 20 10:21:19 2015 @@ -24,25 +24,6 @@ #include <winreg.h> #include <wine/unicode.h> - -/* FIXME: Vista+*/ -LONG WINAPI RegSetKeyValueW( HKEY hkey, LPCWSTR subkey, LPCWSTR name, DWORD type, const void *data, DWORD len ) -{ - HKEY hsubkey = NULL; - DWORD ret; - - TRACE("(%p,%s,%s,%d,%p,%d)\n", hkey, debugstr_w(subkey), debugstr_w(name), type, data, len ); - - if (subkey && subkey[0]) /* need to create the subkey */ - { - if ((ret = RegCreateKeyW( hkey, subkey, &hsubkey )) != ERROR_SUCCESS) return ret; - hkey = hsubkey; - } - - ret = RegSetValueExW( hkey, name, 0, type, (const BYTE*)data, len ); - if (hsubkey) RegCloseKey( hsubkey ); - return ret; -} static IWshShell3 WshShell3; 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] Fri Nov 20 10:21:19 2015 @@ -216,7 +216,7 @@ reactos/dll/win32/wmi # Synced to WineStaging-1.7.47 reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.47 reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.47 -reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.47 +reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.55 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47 reactos/dll/win32/wuapi # Synced to WineStaging-1.7.47 reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69949: [HNETCFG] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:14:10 2015 New Revision: 69949 URL: http://svn.reactos.org/svn/reactos?rev=69949&view=rev Log: [HNETCFG] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/hnetcfg/apps.c trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h trunk/reactos/dll/win32/hnetcfg/port.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hnetcfg/apps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] Fri Nov 20 10:14:10 2015 @@ -25,6 +25,7 @@ { INetFwAuthorizedApplication INetFwAuthorizedApplication_iface; LONG refs; + BSTR filename; } fw_app; static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface ) @@ -47,6 +48,7 @@ if (!refs) { TRACE("destroying %p\n", fw_app); + if (fw_app->filename) SysFreeString( fw_app->filename ); HeapFree( GetProcessHeap(), 0, fw_app ); } return refs; @@ -96,6 +98,7 @@ &IID_INetFwAuthorizedApplications, &IID_INetFwMgr, &IID_INetFwOpenPort, + &IID_INetFwOpenPorts, &IID_INetFwPolicy, &IID_INetFwProfile }; @@ -237,7 +240,18 @@ fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %p\n", This, imageFileName); - return E_NOTIMPL; + + if (!imageFileName) + return E_INVALIDARG; + + if (!This->filename) + { + *imageFileName = NULL; + return S_OK; + } + + *imageFileName = SysAllocString( This->filename ); + return *imageFileName ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI fw_app_put_ProcessImageFileName( @@ -247,7 +261,15 @@ fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %s\n", This, debugstr_w(imageFileName)); - return S_OK; + + if (!imageFileName) + { + This->filename = NULL; + return S_OK; + } + + This->filename = SysAllocString( imageFileName ); + return This->filename ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI fw_app_get_IpVersion( @@ -370,6 +392,7 @@ fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl; fa->refs = 1; + fa->filename = NULL; *ppObj = &fa->INetFwAuthorizedApplication_iface; Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Fri Nov 20 10:14:10 2015 @@ -43,6 +43,7 @@ INetFwAuthorizedApplications_tid, INetFwMgr_tid, INetFwOpenPort_tid, + INetFwOpenPorts_tid, INetFwPolicy_tid, INetFwProfile_tid, last_tid Modified: trunk/reactos/dll/win32/hnetcfg/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/port.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/port.c [iso-8859-1] Fri Nov 20 10:14:10 2015 @@ -18,10 +18,15 @@ #include "hnetcfg_private.h" +#include <ole2.h> + typedef struct fw_port { INetFwOpenPort INetFwOpenPort_iface; LONG refs; + BSTR name; + NET_FW_IP_PROTOCOL protocol; + LONG port; } fw_port; static inline fw_port *impl_from_INetFwOpenPort( INetFwOpenPort *iface ) @@ -44,6 +49,7 @@ if (!refs) { TRACE("destroying %p\n", fw_port); + SysFreeString( fw_port->name ); HeapFree( GetProcessHeap(), 0, fw_port ); } return refs; @@ -163,8 +169,14 @@ { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %s\n", This, debugstr_w(name)); - return E_NOTIMPL; + TRACE("%p %s\n", This, debugstr_w(name)); + + if (!(name = SysAllocString( name ))) + return E_OUTOFMEMORY; + + SysFreeString( This->name ); + This->name = name; + return S_OK; } static HRESULT WINAPI fw_port_get_IpVersion( @@ -203,8 +215,13 @@ { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %u\n", This, ipProtocol); - return E_NOTIMPL; + TRACE("%p %u\n", This, ipProtocol); + + if (ipProtocol != NET_FW_IP_PROTOCOL_TCP && ipProtocol != NET_FW_IP_PROTOCOL_UDP) + return E_INVALIDARG; + + This->protocol = ipProtocol; + return S_OK; } static HRESULT WINAPI fw_port_get_Port( @@ -223,8 +240,9 @@ { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %d\n", This, portNumber); - return E_NOTIMPL; + TRACE("%p %d\n", This, portNumber); + This->port = portNumber; + return S_OK; } static HRESULT WINAPI fw_port_get_Scope( @@ -286,7 +304,7 @@ fw_port *This = impl_from_INetFwOpenPort( iface ); FIXME("%p %d\n", This, enabled); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI fw_port_get_BuiltIn( @@ -336,6 +354,9 @@ fp->INetFwOpenPort_iface.lpVtbl = &fw_port_vtbl; fp->refs = 1; + fp->name = NULL; + fp->protocol = NET_FW_IP_PROTOCOL_TCP; + fp->port = 0; *ppObj = &fp->INetFwOpenPort_iface; @@ -404,8 +425,9 @@ { fw_ports *This = impl_from_INetFwOpenPorts( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_ports_GetTypeInfo( @@ -416,8 +438,8 @@ { fw_ports *This = impl_from_INetFwOpenPorts( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwOpenPorts_tid, ppTInfo ); } static HRESULT WINAPI fw_ports_GetIDsOfNames( @@ -429,9 +451,18 @@ DISPID *rgDispId ) { fw_ports *This = impl_from_INetFwOpenPorts( iface ); - - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwOpenPorts_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_ports_Invoke( @@ -446,10 +477,20 @@ UINT *puArgErr ) { fw_ports *This = impl_from_INetFwOpenPorts( iface ); - - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwOpenPorts_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwOpenPorts_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_ports_get_Count( 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] Fri Nov 20 10:14:10 2015 @@ -72,7 +72,7 @@ reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.47 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.47 reactos/dll/win32/hlink # Synced to WineStaging-1.7.47 -reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.47 +reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.55 reactos/dll/win32/httpapi # Synced to WineStaging-1.7.47 reactos/dll/win32/iccvid # Synced to WineStaging-1.7.47 reactos/dll/win32/icmp # Out of sync

1 0

[akhaldi] 69948: [XMLLITE_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:11:33 2015 New Revision: 69948 URL: http://svn.reactos.org/svn/reactos?rev=69948&view=rev Log: [XMLLITE_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/xmllite/reader.c trunk/rostests/winetests/xmllite/writer.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Fri Nov 20 10:11:33 2015 @@ -1436,6 +1436,7 @@ ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); IXmlReader_Release(reader); + IStream_Release(stream); } static struct test_entry cdata_tests[] = { Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Fri Nov 20 10:11:33 2015 @@ -30,6 +30,7 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <objbase.h> #include <ole2.h> #include <xmllite.h> @@ -43,6 +44,10 @@ IMalloc *imalloc, LPCWSTR encoding_name, IXmlWriterOutput **output); +static HRESULT (WINAPI *pCreateXmlWriterOutputWithEncodingCodePage)(IUnknown *stream, + IMalloc *imalloc, + UINT codepage, + IXmlWriterOutput **output); static HRESULT WINAPI testoutput_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { @@ -175,6 +180,7 @@ #define MAKEFUNC(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return FALSE; MAKEFUNC(CreateXmlWriter); MAKEFUNC(CreateXmlWriterOutputWithEncodingName); + MAKEFUNC(CreateXmlWriterOutputWithEncodingCodePage); #undef MAKEFUNC return TRUE; @@ -193,6 +199,20 @@ IUnknown_Release(output); hr = pCreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + unk = NULL; + hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); + ok(hr == S_OK, "got %08x\n", hr); + ok(unk != NULL, "got %p\n", unk); + /* releasing 'unk' crashes on native */ + IUnknown_Release(output); + + output = NULL; + hr = pCreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, ~0u, &output); + ok(hr == S_OK, "got %08x\n", hr); + IUnknown_Release(output); + + hr = pCreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, CP_UTF8, &output); ok(hr == S_OK, "got %08x\n", hr); unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk);

1 0

[akhaldi] 69947: [XMLLITE] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:10:53 2015 New Revision: 69947 URL: http://svn.reactos.org/svn/reactos?rev=69947&view=rev Log: [XMLLITE] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/writer.c trunk/reactos/dll/win32/xmllite/xmllite.spec trunk/reactos/dll/win32/xmllite/xmllite_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Fri Nov 20 10:10:53 2015 @@ -148,6 +148,16 @@ const WCHAR *get_encoding_name(xml_encoding encoding) { return xml_encoding_map[encoding].name; +} + +xml_encoding get_encoding_from_codepage(UINT codepage) +{ + int i; + for (i = 0; i < sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]); i++) + { + if (xml_encoding_map[i].cp == codepage) return xml_encoding_map[i].enc; + } + return XmlEncoding_Unknown; } typedef struct @@ -2835,7 +2845,7 @@ static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) { FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + return FALSE; } static const struct IXmlReaderVtbl xmlreader_vtbl = Modified: trunk/reactos/dll/win32/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Fri Nov 20 10:10:53 2015 @@ -1075,18 +1075,11 @@ return S_OK; } -HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, - IMalloc *imalloc, - LPCWSTR encoding, - IXmlWriterOutput **output) -{ - static const WCHAR utf8W[] = {'U','T','F','-','8',0}; +static HRESULT create_writer(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + IXmlWriterOutput **output) +{ xmlwriteroutput *writeroutput; HRESULT hr; - - TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); - - if (!stream || !output) return E_INVALIDARG; *output = NULL; @@ -1100,7 +1093,7 @@ writeroutput->ref = 1; writeroutput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); - writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); + writeroutput->encoding = encoding; writeroutput->stream = NULL; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { @@ -1116,3 +1109,34 @@ return S_OK; } + +HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, + IMalloc *imalloc, + LPCWSTR encoding, + IXmlWriterOutput **output) +{ + static const WCHAR utf8W[] = {'U','T','F','-','8',0}; + xml_encoding xml_enc; + + TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); + + if (!stream || !output) return E_INVALIDARG; + + xml_enc = parse_encoding_name(encoding ? encoding : utf8W, -1); + return create_writer(stream, imalloc, xml_enc, output); +} + +HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, + IMalloc *imalloc, + UINT codepage, + IXmlWriterOutput **output) +{ + xml_encoding xml_enc; + + TRACE("%p %p %u %p\n", stream, imalloc, codepage, output); + + if (!stream || !output) return E_INVALIDARG; + + xml_enc = get_encoding_from_codepage(codepage); + return create_writer(stream, imalloc, xml_enc, output); +} Modified: trunk/reactos/dll/win32/xmllite/xmllite.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite.… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite.spec [iso-8859-1] Fri Nov 20 10:10:53 2015 @@ -2,5 +2,5 @@ @ stub CreateXmlReaderInputWithEncodingCodePage @ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr ptr long ptr ptr) @ stdcall CreateXmlWriter(ptr ptr ptr) -@ stub CreateXmlWriterOutputWithEncodingCodePage +@ stdcall CreateXmlWriterOutputWithEncodingCodePage(ptr ptr long ptr) @ stdcall CreateXmlWriterOutputWithEncodingName(ptr ptr wstr ptr) Modified: trunk/reactos/dll/win32/xmllite/xmllite_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite_… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite_private.h [iso-8859-1] Fri Nov 20 10:10:53 2015 @@ -89,5 +89,6 @@ xml_encoding parse_encoding_name(const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; const WCHAR *get_encoding_name(xml_encoding) DECLSPEC_HIDDEN; +xml_encoding get_encoding_from_codepage(UINT) DECLSPEC_HIDDEN; #endif /* __XMLLITE_PRIVATE__ */ 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] Fri Nov 20 10:10:53 2015 @@ -223,7 +223,7 @@ reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.47 reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.47 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.47 -reactos/dll/win32/xmllite # Synced to WineStaging-1.7.47 +reactos/dll/win32/xmllite # Synced to WineStaging-1.7.55 reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69946: [BOOTLIB] Use the correct size in BlockIoEfiGetDeviceInformation(). Spotted by Andrew Cook.
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 09:51:23 2015 New Revision: 69946 URL: http://svn.reactos.org/svn/reactos?rev=69946&view=rev Log: [BOOTLIB] Use the correct size in BlockIoEfiGetDeviceInformation(). Spotted by Andrew Cook. Modified: trunk/reactos/boot/environ/lib/io/device.c Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Fri Nov 20 09:51:23 2015 @@ -1023,7 +1023,7 @@ /* Copy it */ RtlCopyMemory(&BlockDevice->Disk.Gpt.Signature, &Device->Local.HardDisk.Gpt.PartitionSignature, - sizeof(&BlockDevice->Disk.Gpt.Signature)); + sizeof(BlockDevice->Disk.Gpt.Signature)); Found = TRUE; } }

1 0

[jimtabor] 69945: [Win32k] - Fix crash while closing global hooked application. See CORE-10549.
by jimtabor＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: jimtabor Date: Fri Nov 20 08:22:20 2015 New Revision: 69945 URL: http://svn.reactos.org/svn/reactos?rev=69945&view=rev Log: [Win32k] - Fix crash while closing global hooked application. See CORE-10549. Modified: trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/hook.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Fri Nov 20 08:22:20 2015 @@ -647,7 +647,13 @@ Common->offPfn = offPfn; Common->Ansi = Ansi; RtlZeroMemory(&Common->ModuleName, sizeof(Common->ModuleName)); - RtlCopyMemory(&Common->ModuleName, ModuleName->Buffer, ModuleName->Length); + if (ModuleName->Buffer && ModuleName->Length) + { + RtlCopyMemory(&Common->ModuleName, ModuleName->Buffer, ModuleName->Length); + // If ModuleName->Buffer NULL while in destroy, + // this will make User32:Hook.c complain about not loading the library module. + // Fix symptom for CORE-10549. + } Extra = (PCHAR) Common + sizeof(HOOKPROC_CALLBACK_ARGUMENTS); switch(HookId) @@ -738,7 +744,7 @@ if (!NT_SUCCESS(Status)) { - ERR("Failure to make Callback! Status 0x%x",Status); + ERR("Failure to make Callback! Status 0x%x\n",Status); goto Fault_Exit; } Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Fri Nov 20 08:22:20 2015 @@ -342,6 +342,9 @@ case WH_KEYBOARD: break; } + + if (!UserObjectInDestroy(UserHMGetHandle(phk))) //// Fix CORE-10549. + { /* The odds are high for this to be a Global call. */ Result = co_IntCallHookProc( HookId, Code, @@ -352,7 +355,7 @@ phk->offPfn, phk->Ansi, &phk->ModuleName); - + } /* The odds so high, no one is waiting for the results. */ if (pHP->pHookStructs) ExFreePoolWithTag(pHP->pHookStructs, TAG_HOOK); ExFreePoolWithTag(pHP, TAG_HOOK);

1 0

[spetreolle] 69944: [IPHLPAPI] GetAdapters: Don't stop looking for the dns servers if an interface hasn't an entry. This is not an error condtion, the loopback doesn't have one.
by spetreolle＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: spetreolle Date: Thu Nov 19 21:43:55 2015 New Revision: 69944 URL: http://svn.reactos.org/svn/reactos?rev=69944&view=rev Log: [IPHLPAPI] GetAdapters: Don't stop looking for the dns servers if an interface hasn't an entry. This is not an error condtion, the loopback doesn't have one. Modified: trunk/reactos/dll/win32/iphlpapi/address.c Modified: trunk/reactos/dll/win32/iphlpapi/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/address… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] Thu Nov 19 21:43:55 2015 @@ -397,12 +397,7 @@ "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%*s", Entry->if_descrlen, &Entry->if_descr[0]); - if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, KeyName, 0, KEY_READ, &InterfaceKey) != ERROR_SUCCESS) - { - ERR("Failed opening interface key for interface %*s\n", Entry->if_descrlen, &Entry->if_descr[0]); - Flags |= GAA_FLAG_SKIP_DNS_SERVER; - } - else + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, KeyName, 0, KEY_READ, &InterfaceKey) == ERROR_SUCCESS) { EnumNameServers(InterfaceKey, NULL, &CurrentAASize, EnumerateServerNameSize); RegCloseKey(InterfaceKey); @@ -471,7 +466,7 @@ if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, KeyName, 0, KEY_READ, &InterfaceKey) != ERROR_SUCCESS) { - ERR("Failed opening interface key for interface %*s\n", Entry->if_descrlen, &Entry->if_descr[0]); + TRACE("Failed opening interface key for interface %*s\n", Entry->if_descrlen, &Entry->if_descr[0]); } else { @@ -567,7 +562,7 @@ } } - ERR("address is 0x%08x, mask is 0x%08x\n", AddrEntries[j].iae_addr, AddrEntries[j].iae_mask); + TRACE("address is 0x%08x, mask is 0x%08x\n", AddrEntries[j].iae_addr, AddrEntries[j].iae_mask); //FIXME: For now reactos only supports unicast addresses if (!(Flags & GAA_FLAG_SKIP_UNICAST))

1 0

[rnaumann] 69943: [BROWSEUI] Handle Alt+Up. Patch by Jared Smudde CORE-10528 This commit is dedicated to Samuel Serapion!
by rnaumann＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: rnaumann Date: Thu Nov 19 19:37:15 2015 New Revision: 69943 URL: http://svn.reactos.org/svn/reactos?rev=69943&view=rev Log: [BROWSEUI] Handle Alt+Up. Patch by Jared Smudde CORE-10528 This commit is dedicated to Samuel Serapion! Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/browseui/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -125,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -143,6 +143,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -143,6 +143,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -126,6 +126,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "Q", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -127,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -125,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -133,6 +133,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -127,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -127,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -144,6 +144,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -125,6 +125,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -127,6 +127,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT Modified: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Thu Nov 19 19:37:15 2015 @@ -145,6 +145,7 @@ "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT VK_BACK, 41010, NOINVERT, VIRTKEY "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT

1 0

[akhaldi] 69942: [EXPLORER] Fix MSVC build.
by akhaldi＠svn.reactos.org 19 Nov '15

19 Nov '15

Author: akhaldi Date: Thu Nov 19 16:46:51 2015 New Revision: 69942 URL: http://svn.reactos.org/svn/reactos?rev=69942&view=rev Log: [EXPLORER] Fix MSVC build. Modified: trunk/reactos/base/shell/explorer/resource.h Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] Thu Nov 19 16:46:51 2015 @@ -189,4 +189,4 @@ #define ID_SHELL_CMD_TILE_WND_H (ID_SHELL_CMD_LAST + 9) #define ID_SHELL_CMD_CASCADE_WND (ID_SHELL_CMD_LAST + 10) #define ID_SHELL_CMD_CUST_NOTIF (ID_SHELL_CMD_LAST + 11) -#define ID_SHELL_CMD_ADJUST_DAT (ID_SHELL_CMD_LAST + 12) +#define ID_SHELL_CMD_ADJUST_DAT (ID_SHELL_CMD_LAST + 12)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs