Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 69954: [PSDK] Update dwmapi.h. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 20 10:31:08 2015 New Revision: 69954 URL: http://svn.reactos.org/svn/reactos?rev=69954&view=rev Log: [PSDK] Update dwmapi.h. CORE-10536 Modified: trunk/reactos/include/psdk/dwmapi.h Modified: trunk/reactos/include/psdk/dwmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dwmapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] Fri Nov 20 10:31:08 2015 @@ -95,8 +95,6 @@ DOUBLE DY; } MilMatrix3x2D; -#include <poppack.h> - #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -109,6 +107,18 @@ BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +typedef struct _DWM_THUMBNAIL_PROPERTIES +{ + DWORD dwFlags; + RECT rcDestination; + RECT rcSource; + BYTE opacity; + BOOL fVisible; + BOOL fSourceClientAreaOnly; +} DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; + +#include <poppack.h> + DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); @@ -116,10 +126,12 @@ DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); +DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); +DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *); #ifdef __cplusplus }

9 years, 1 month

[akhaldi] 69953: [JSCRIPT_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 20 10:28:29 2015 New Revision: 69953 URL: http://svn.reactos.org/svn/reactos?rev=69953&view=rev Log: [JSCRIPT_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/jscript/run.c Modified: trunk/rostests/winetests/jscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/run.c?r… ============================================================================== --- trunk/rostests/winetests/jscript/run.c [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/run.c [iso-8859-1] Fri Nov 20 10:28:29 2015 @@ -91,6 +91,7 @@ DEFINE_EXPECT(global_propputref_i); DEFINE_EXPECT(global_propdelete_d); DEFINE_EXPECT(global_nopropdelete_d); +DEFINE_EXPECT(global_propdeleteerror_d); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); @@ -117,6 +118,7 @@ DEFINE_EXPECT(invoke_func); DEFINE_EXPECT(DeleteMemberByDispID); DEFINE_EXPECT(DeleteMemberByDispID_false); +DEFINE_EXPECT(DeleteMemberByDispID_error); DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_TESTPROPGET 0x1000 @@ -150,8 +152,9 @@ #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d -#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 -#define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 +#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 +#define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 +#define DISPID_GLOBAL_TESTPROPDELETEERROR 0x2002 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -714,6 +717,12 @@ CHECK_EXPECT(global_nopropdelete_d); test_grfdex(grfdex, fdexNameCaseSensitive); *pid = DISPID_GLOBAL_TESTNOPROPDELETE; + return S_OK; + } + if(!strcmp_wa(bstrName, "testPropDeleteError")) { + CHECK_EXPECT(global_propdeleteerror_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_TESTPROPDELETEERROR; return S_OK; } if(!strcmp_wa(bstrName, "getVT")) { @@ -1368,6 +1377,9 @@ case DISPID_GLOBAL_TESTNOPROPDELETE: CHECK_EXPECT(DeleteMemberByDispID_false); return S_FALSE; + case DISPID_GLOBAL_TESTPROPDELETEERROR: + CHECK_EXPECT(DeleteMemberByDispID_error); + return E_FAIL; default: ok(0, "id = %d\n", id); } @@ -1853,6 +1865,17 @@ static void parse_script_a(const char *src) { parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); +} + +static void parse_script_ae(const char *src, HRESULT exhres) +{ + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(src); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp); + SysFreeString(tmp); + ok(hres == exhres, "parse_script failed: %08x, expected %08x\n", hres, exhres); } static void parse_script_with_error_a(const char *src, SCODE errorcode, ULONG line, LONG pos, LPCSTR source, LPCSTR desc, LPCSTR linetext) @@ -2455,6 +2478,12 @@ CHECK_CALLED(global_nopropdelete_d); CHECK_CALLED(DeleteMemberByDispID_false); + SET_EXPECT(global_propdeleteerror_d); + SET_EXPECT(DeleteMemberByDispID_error); + parse_script_ae("delete testPropDeleteError;", E_FAIL); + CHECK_CALLED(global_propdeleteerror_d); + CHECK_CALLED(DeleteMemberByDispID_error); + SET_EXPECT(puredisp_prop_d); parse_script_a("ok((delete pureDisp.prop) === false, 'delete pureDisp.prop did not return true');"); CHECK_CALLED(puredisp_prop_d);

9 years, 1 month

[akhaldi] 69952: [JSCRIPT] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 20 10:28:06 2015 New Revision: 69952 URL: http://svn.reactos.org/svn/reactos?rev=69952&view=rev Log: [JSCRIPT] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] Fri Nov 20 10:28:06 2015 @@ -1636,7 +1636,7 @@ hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); IDispatch_Release(exprval.u.idref.disp); if(FAILED(hres)) - return ret; + return hres; break; case EXPRVAL_INVALID: ret = TRUE; 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:28:06 2015 @@ -87,7 +87,7 @@ reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-1.7.47 reactos/dll/win32/itss # Synced to WineStaging-1.7.47 -reactos/dll/win32/jscript # Synced to WineStaging-1.7.47 +reactos/dll/win32/jscript # Synced to WineStaging-1.7.55 reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.47 reactos/dll/win32/loadperf # Synced to WineStaging-1.7.47 reactos/dll/win32/localspl # Synced to WineStaging-1.7.47

9 years, 1 month

[akhaldi] 69951: [WSHOM_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

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")

9 years, 1 month

[akhaldi] 69950: [WSHOM.OCX] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

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

9 years, 1 month

[akhaldi] 69949: [HNETCFG] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

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

9 years, 1 month

[akhaldi] 69948: [XMLLITE_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

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);

9 years, 1 month

[akhaldi] 69947: [XMLLITE] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

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

9 years, 1 month

[akhaldi] 69946: [BOOTLIB] Use the correct size in BlockIoEfiGetDeviceInformation(). Spotted by Andrew Cook.

by akhaldi＠svn.reactos.org

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; } }

9 years, 1 month

[jimtabor] 69945: [Win32k] - Fix crash while closing global hooked application. See CORE-10549.

by jimtabor＠svn.reactos.org

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);

9 years, 1 month

← Newer
1
...
25
26
27
28
29
30
31
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015