Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[cwittich] 45136: [MSHTML_WINETEST] update mshtml winetest to wine 1.1.36

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 18 17:59:11 2010 New Revision: 45136 URL: http://svn.reactos.org/svn/reactos?rev=45136&view=rev Log: [MSHTML_WINETEST] update mshtml winetest to wine 1.1.36 Added: trunk/rostests/winetests/mshtml/htmllocation.c (with props) trunk/rostests/winetests/mshtml/jstest.html (with props) trunk/rostests/winetests/mshtml/rsrc.rc (with props) Modified: trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/events.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/mshtml.rbuild trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/mshtml/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… Modified: trunk/rostests/winetests/mshtml/events.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.c… Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… Added: trunk/rostests/winetests/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca… Added: trunk/rostests/winetests/mshtml/jstest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/jstest.h… Modified: trunk/rostests/winetests/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/mshtml.r… Added: trunk/rostests/winetests/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/rsrc.rc?… Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… Modified: trunk/rostests/winetests/mshtml/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/testlist…

14 years, 8 months

[cwittich] 45135: [MSXML3] update msxml3 to wine 1.1.36

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 18 17:53:59 2010 New Revision: 45135 URL: http://svn.reactos.org/svn/reactos?rev=45135&view=rev Log: [MSXML3] update msxml3 to wine 1.1.36 Modified: trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/node.c Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] Mon Jan 18 17:53:59 2010 @@ -104,7 +104,6 @@ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_FALSE; } Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Mon Jan 18 17:53:59 2010 @@ -1118,7 +1118,8 @@ if(!V_BSTR(&src)) return E_OUTOFMEMORY; - hres = VariantChangeType(v, &src, 0, V_VT(v)); + hres = VariantChangeTypeEx(v, &src, MAKELCID(MAKELANGID( + LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT),0, V_VT(v)); VariantClear(&src); return hres; }

14 years, 8 months

[tkreuzer] 45134: [NTOS] Fix buffer overrun in ExFreePoolWithTag when dealing with a PoolType other than NonPagedPool and PagedPool. Spotted by Amine Khaldi.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 18 17:43:58 2010 New Revision: 45134 URL: http://svn.reactos.org/svn/reactos?rev=45134&view=rev Log: [NTOS] Fix buffer overrun in ExFreePoolWithTag when dealing with a PoolType other than NonPagedPool and PagedPool. Spotted by Amine Khaldi. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Mon Jan 18 17:43:58 2010 @@ -520,7 +520,7 @@ // for this pool type // BlockSize = Entry->BlockSize; - PoolType = (Entry->PoolType & 3) - 1; + PoolType = (Entry->PoolType - 1) & BASE_POOL_TYPE_MASK; PoolDesc = PoolVector[PoolType]; //

14 years, 8 months

[cwittich] 45133: [MSHTML] update mshtml to wine 1.1.36

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 18 17:27:14 2010 New Revision: 45133 URL: http://svn.reactos.org/svn/reactos?rev=45133&view=rev Log: [MSHTML] update mshtml to wine 1.1.36 Added: trunk/reactos/dll/win32/mshtml/htmlform.c (with props) trunk/reactos/dll/win32/mshtml/htmlscreen.c (with props) Modified: trunk/reactos/dll/win32/mshtml/De.rc trunk/reactos/dll/win32/mshtml/Lt.rc trunk/reactos/dll/win32/mshtml/Ru.rc trunk/reactos/dll/win32/mshtml/Sv.rc trunk/reactos/dll/win32/mshtml/conpoint.c trunk/reactos/dll/win32/mshtml/dispex.c trunk/reactos/dll/win32/mshtml/htmlanchor.c trunk/reactos/dll/win32/mshtml/htmlbody.c trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmldoc3.c trunk/reactos/dll/win32/mshtml/htmlelem.c trunk/reactos/dll/win32/mshtml/htmlelem2.c trunk/reactos/dll/win32/mshtml/htmlelemcol.c trunk/reactos/dll/win32/mshtml/htmlevent.c trunk/reactos/dll/win32/mshtml/htmlevent.h trunk/reactos/dll/win32/mshtml/htmlframebase.c trunk/reactos/dll/win32/mshtml/htmliframe.c trunk/reactos/dll/win32/mshtml/htmlimg.c trunk/reactos/dll/win32/mshtml/htmllocation.c trunk/reactos/dll/win32/mshtml/htmlscript.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmlstyle.h trunk/reactos/dll/win32/mshtml/htmlstyle2.c trunk/reactos/dll/win32/mshtml/htmlstyle3.c trunk/reactos/dll/win32/mshtml/htmltable.c trunk/reactos/dll/win32/mshtml/htmltextcont.c trunk/reactos/dll/win32/mshtml/htmltextnode.c trunk/reactos/dll/win32/mshtml/htmlwindow.c trunk/reactos/dll/win32/mshtml/install.c trunk/reactos/dll/win32/mshtml/main.c trunk/reactos/dll/win32/mshtml/mshtml.rbuild trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/mutation.c trunk/reactos/dll/win32/mshtml/navigate.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsevents.c trunk/reactos/dll/win32/mshtml/nsiface.idl trunk/reactos/dll/win32/mshtml/nsio.c trunk/reactos/dll/win32/mshtml/oleobj.c trunk/reactos/dll/win32/mshtml/persist.c trunk/reactos/dll/win32/mshtml/script.c trunk/reactos/dll/win32/mshtml/secmgr.c trunk/reactos/dll/win32/mshtml/service.c trunk/reactos/dll/win32/mshtml/task.c trunk/reactos/dll/win32/mshtml/txtrange.c trunk/reactos/dll/win32/mshtml/view.c trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtml.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/mshtml/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/De.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Lt.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ru.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Sv.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/conpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/conpoint.… Modified: trunk/reactos/dll/win32/mshtml/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/dispex.c?… Modified: trunk/reactos/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho… Modified: trunk/reactos/dll/win32/mshtml/htmlbody.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlbody.… Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… Modified: trunk/reactos/dll/win32/mshtml/htmldoc3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc3.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2… Modified: trunk/reactos/dll/win32/mshtml/htmlelemcol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelemc… Modified: trunk/reactos/dll/win32/mshtml/htmlevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Modified: trunk/reactos/dll/win32/mshtml/htmlevent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Added: trunk/reactos/dll/win32/mshtml/htmlform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlform.… Modified: trunk/reactos/dll/win32/mshtml/htmlframebase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe… Modified: trunk/reactos/dll/win32/mshtml/htmliframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlifram… Modified: trunk/reactos/dll/win32/mshtml/htmlimg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlimg.c… Modified: trunk/reactos/dll/win32/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllocat… Added: trunk/reactos/dll/win32/mshtml/htmlscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscree… Modified: trunk/reactos/dll/win32/mshtml/htmlscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmltextcont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextc… Modified: trunk/reactos/dll/win32/mshtml/htmltextnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextn… Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo… Modified: trunk/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c… Modified: trunk/reactos/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re… Modified: trunk/reactos/dll/win32/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.rb… Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… Modified: trunk/reactos/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mutation.… Modified: trunk/reactos/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.… Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… Modified: trunk/reactos/dll/win32/mshtml/nsevents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsevents.… Modified: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… Modified: trunk/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re… Modified: trunk/reactos/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?… Modified: trunk/reactos/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c… Modified: trunk/reactos/dll/win32/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?… Modified: trunk/reactos/dll/win32/mshtml/secmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/secmgr.c?… Modified: trunk/reactos/dll/win32/mshtml/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/service.c… Modified: trunk/reactos/dll/win32/mshtml/task.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/task.c?re… Modified: trunk/reactos/dll/win32/mshtml/txtrange.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/txtrange.… Modified: trunk/reactos/dll/win32/mshtml/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/view.c?re… Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re…

14 years, 8 months

[tkreuzer] 45132: [NTOS] KiTrap0DHandler: fix buffer overrun (Spotted by Amine Khaldi) and optimize the code by checking the counter variable, instead of Instruction, this works the same, but the compiler can make sense of it and safe one comparison.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 18 17:16:59 2010 New Revision: 45132 URL: http://svn.reactos.org/svn/reactos?rev=45132&view=rev Log: [NTOS] KiTrap0DHandler: fix buffer overrun (Spotted by Amine Khaldi) and optimize the code by checking the counter variable, instead of Instruction, this works the same, but the compiler can make sense of it and safe one comparison. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon Jan 18 17:16:59 2010 @@ -1078,7 +1078,7 @@ /* FIXME: Use SEH */ Instructions = (PUCHAR)TrapFrame->Eip; - /* Scan next 15 opcodes */ + /* Scan next 15 bytes */ for (i = 0; i < 15; i++) { /* Skip prefix instructions */ @@ -1093,7 +1093,7 @@ } /* Is this NOT any prefix instruction? */ - if (Instructions[i] != KiTrapPrefixTable[j]) + if (j == sizeof(KiTrapPrefixTable)) { /* We can go ahead and handle the fault now */ Instruction = Instructions[i]; @@ -1102,7 +1102,7 @@ } /* If all we found was prefixes, then this instruction is too long */ - if (!Instruction) + if (i == 15) { /* Setup illegal instruction fault */ KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION,

14 years, 8 months

[spetreolle] 45131: [ADVAPI] Sync OpenEventLogA with wine. RtlCreateUnicodeStringFromAsciiz breaks null checks.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Jan 18 17:03:30 2010 New Revision: 45131 URL: http://svn.reactos.org/svn/reactos?rev=45131&view=rev Log: [ADVAPI] Sync OpenEventLogA with wine. RtlCreateUnicodeStringFromAsciiz breaks null checks. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Mon Jan 18 17:03:30 2010 @@ -28,6 +28,18 @@ static RPC_UNICODE_STRING EmptyString = { 0, 0, L"" }; +static inline LPWSTR SERV_dup( LPCSTR str ) +{ + UINT len; + LPWSTR wstr; + + if( !str ) + return NULL; + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + wstr = HeapAlloc( GetProcessHeap(), 0, len*sizeof (WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, str, -1, wstr, len ); + return wstr; +} handle_t __RPC_USER EVENTLOG_HANDLE_A_bind(EVENTLOG_HANDLE_A UNCServerName) @@ -575,35 +587,32 @@ /****************************************************************************** * OpenEventLogA [ADVAPI32.@] + * + * Opens a handle to the specified event log. + * + * PARAMS + * lpUNCServerName [I] UNC name of the server on which the event log is + * opened. + * lpSourceName [I] Name of the log. + * + * RETURNS + * Success: Handle to an event log. + * Failure: NULL */ HANDLE WINAPI -OpenEventLogA(IN LPCSTR lpUNCServerName, - IN LPCSTR lpSourceName) -{ - UNICODE_STRING UNCServerName; - UNICODE_STRING SourceName; - HANDLE Handle; - - if (!RtlCreateUnicodeStringFromAsciiz(&UNCServerName, lpUNCServerName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - if (!RtlCreateUnicodeStringFromAsciiz(&SourceName, lpSourceName)) - { - RtlFreeUnicodeString(&UNCServerName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - Handle = OpenEventLogW(UNCServerName.Buffer, - SourceName.Buffer); - - RtlFreeUnicodeString(&UNCServerName); - RtlFreeUnicodeString(&SourceName); - - return Handle; +OpenEventLogA(IN LPCSTR uncname, + IN LPCSTR source) +{ + LPWSTR uncnameW, sourceW; + HANDLE handle; + + uncnameW = SERV_dup(uncname); + sourceW = SERV_dup(source); + handle = OpenEventLogW(uncnameW, sourceW); + HeapFree(GetProcessHeap(), 0, uncnameW); + HeapFree(GetProcessHeap(), 0, sourceW); + + return handle; }

14 years, 8 months

[cwittich] 45130: [QUARTZ] update quartz to wine 1.1.36

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 18 15:28:36 2010 New Revision: 45130 URL: http://svn.reactos.org/svn/reactos?rev=45130&view=rev Log: [QUARTZ] update quartz to wine 1.1.36 Added: trunk/reactos/dll/directx/quartz/quartz_strmif.idl (with props) Modified: trunk/reactos/dll/directx/quartz/filtergraph.c trunk/reactos/dll/directx/quartz/main.c trunk/reactos/dll/directx/quartz/mpegsplit.c trunk/reactos/dll/directx/quartz/nullrenderer.c trunk/reactos/dll/directx/quartz/quartz.rbuild trunk/reactos/dll/directx/quartz/regsvr.c trunk/reactos/include/dxsdk/axextend.idl Modified: trunk/reactos/dll/directx/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/filterg… ============================================================================== --- trunk/reactos/dll/directx/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/filtergraph.c [iso-8859-1] Mon Jan 18 15:28:36 2010 @@ -2557,28 +2557,33 @@ MediaSeeking_GetPreroll }; +static inline IFilterGraphImpl *impl_from_IMediaPosition( IMediaPosition *iface ) +{ + return (IFilterGraphImpl *)((char*)iface - FIELD_OFFSET(IFilterGraphImpl, IMediaPosition_vtbl)); +} + /*** IUnknown methods ***/ -static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObj){ - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); +static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObj) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); - return Filtergraph_QueryInterface(This, riid, ppvObj); } -static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface){ - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); +static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); TRACE("(%p/%p)->()\n", This, iface); - return Filtergraph_AddRef(This); } -static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface){ - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); +static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); TRACE("(%p/%p)->()\n", This, iface); - return Filtergraph_Release(This); } @@ -2604,31 +2609,51 @@ } /*** IMediaPosition methods ***/ -static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME *plength){ - FIXME("(%p)->(%p) stub!\n", iface, plength); - return E_NOTIMPL; -} - -static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime){ - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); +static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME *plength) +{ + LONGLONG duration; + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + HRESULT hr = IMediaSeeking_GetDuration( (IMediaSeeking *)&This->IMediaSeeking_vtbl, &duration ); + if (SUCCEEDED(hr)) *plength = duration; + return hr; +} + +static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); LONGLONG reftime = llTime; - return IMediaSeeking_SetPositions((IMediaSeeking *)&This->IMediaSeeking_vtbl, &reftime, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); -} - -static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, REFTIME *pllTime){ - FIXME("(%p)->(%p) stub!\n", iface, pllTime); - return E_NOTIMPL; -} - -static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME *pllTime){ - FIXME("(%p)->(%p) stub!\n", iface, pllTime); - return E_NOTIMPL; -} - -static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME llTime){ - FIXME("(%p)->(%f) stub!\n", iface, llTime); - return E_NOTIMPL; + return IMediaSeeking_SetPositions((IMediaSeeking *)&This->IMediaSeeking_vtbl, + &reftime, AM_SEEKING_AbsolutePositioning, + NULL, AM_SEEKING_NoPositioning); +} + +static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, REFTIME *pllTime) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + LONGLONG pos; + HRESULT hr = IMediaSeeking_GetCurrentPosition( (IMediaSeeking *)&This->IMediaSeeking_vtbl, &pos ); + if (SUCCEEDED(hr)) *pllTime = pos; + return hr; +} + +static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME *pllTime) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + LONGLONG pos; + HRESULT hr = IMediaSeeking_GetStopPosition( (IMediaSeeking *)&This->IMediaSeeking_vtbl, &pos ); + if (SUCCEEDED(hr)) *pllTime = pos; + return hr; +} + +static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME llTime) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + LONGLONG reftime = llTime; + + return IMediaSeeking_SetPositions((IMediaSeeking *)&This->IMediaSeeking_vtbl, + NULL, AM_SEEKING_NoPositioning, + &reftime, AM_SEEKING_AbsolutePositioning); } static HRESULT WINAPI MediaPosition_get_PrerollTime(IMediaPosition * iface, REFTIME *pllTime){ @@ -2641,14 +2666,16 @@ return E_NOTIMPL; } -static HRESULT WINAPI MediaPosition_put_Rate(IMediaPosition * iface, double dRate){ - FIXME("(%p)->(%f) stub!\n", iface, dRate); - return E_NOTIMPL; -} - -static HRESULT WINAPI MediaPosition_get_Rate(IMediaPosition * iface, double *pdRate){ - FIXME("(%p)->(%p) stub!\n", iface, pdRate); - return E_NOTIMPL; +static HRESULT WINAPI MediaPosition_put_Rate(IMediaPosition * iface, double dRate) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + return IMediaSeeking_SetRate((IMediaSeeking *)&This->IMediaSeeking_vtbl, dRate); +} + +static HRESULT WINAPI MediaPosition_get_Rate(IMediaPosition * iface, double *pdRate) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + return IMediaSeeking_GetRate((IMediaSeeking *)&This->IMediaSeeking_vtbl, pdRate); } static HRESULT WINAPI MediaPosition_CanSeekForward(IMediaPosition * iface, LONG *pCanSeekForward){ @@ -4872,6 +4899,9 @@ TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pEvCode); + if (This->state != State_Running) + return VFW_E_WRONG_STATE; + if (WaitForSingleObject(This->hEventCompletion, msTimeout) == WAIT_OBJECT_0) { *pEvCode = This->CompletionStatus; Modified: trunk/reactos/dll/directx/quartz/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/main.c?… ============================================================================== --- trunk/reactos/dll/directx/quartz/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/main.c [iso-8859-1] Mon Jan 18 15:28:36 2010 @@ -28,19 +28,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; +extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; +extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; + static DWORD dll_ref = 0; /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - switch(fdwReason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; + return QUARTZ_DllMain( hInstDLL, fdwReason, lpv ); } /****************************************************************************** @@ -172,36 +169,29 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { unsigned int i; - IClassFactoryImpl *factory; - + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - - if ( !IsEqualGUID( &IID_IClassFactory, riid ) - && ! IsEqualGUID( &IID_IUnknown, riid) ) - return E_NOINTERFACE; - - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + + if (IsEqualGUID( &IID_IClassFactory, riid ) || IsEqualGUID( &IID_IUnknown, riid)) { - if (IsEqualGUID(object_creation[i].clsid, rclsid)) - break; + for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + { + if (IsEqualGUID(object_creation[i].clsid, rclsid)) + { + IClassFactoryImpl *factory = CoTaskMemAlloc(sizeof(*factory)); + if (factory == NULL) return E_OUTOFMEMORY; + + factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->ref = 1; + + factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + + *ppv = &factory->ITF_IClassFactory; + return S_OK; + } + } } - - if (i == sizeof(object_creation)/sizeof(object_creation[0])) - { - FIXME("%s: no class found.\n", debugstr_guid(rclsid)); - return CLASS_E_CLASSNOTAVAILABLE; - } - - factory = CoTaskMemAlloc(sizeof(*factory)); - if (factory == NULL) return E_OUTOFMEMORY; - - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; - factory->ref = 1; - - factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - - *ppv = &(factory->ITF_IClassFactory); - return S_OK; + return QUARTZ_DllGetClassObject( rclsid, riid, ppv ); } /*********************************************************************** @@ -209,7 +199,8 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - return dll_ref != 0 ? S_FALSE : S_OK; + if (dll_ref) return S_FALSE; + return QUARTZ_DllCanUnloadNow(); } @@ -224,6 +215,49 @@ #include "uuids.h" { { 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0} }, NULL } }; + +/*********************************************************************** + * proxies + */ +HRESULT CALLBACK ICaptureGraphBuilder_FindInterface_Proxy( ICaptureGraphBuilder *This, + const GUID *pCategory, + IBaseFilter *pf, + REFIID riid, + void **ppint ) +{ + return ICaptureGraphBuilder_RemoteFindInterface_Proxy( This, pCategory, pf, + riid, (IUnknown **)ppint ); +} + +HRESULT __RPC_STUB ICaptureGraphBuilder_FindInterface_Stub( ICaptureGraphBuilder *This, + const GUID *pCategory, + IBaseFilter *pf, + REFIID riid, + IUnknown **ppint ) +{ + return ICaptureGraphBuilder_FindInterface( This, pCategory, pf, riid, (void **)ppint ); +} + +HRESULT CALLBACK ICaptureGraphBuilder2_FindInterface_Proxy( ICaptureGraphBuilder2 *This, + const GUID *pCategory, + const GUID *pType, + IBaseFilter *pf, + REFIID riid, + void **ppint ) +{ + return ICaptureGraphBuilder2_RemoteFindInterface_Proxy( This, pCategory, pType, + pf, riid, (IUnknown **)ppint ); +} + +HRESULT __RPC_STUB ICaptureGraphBuilder2_FindInterface_Stub( ICaptureGraphBuilder2 *This, + const GUID *pCategory, + const GUID *pType, + IBaseFilter *pf, + REFIID riid, + IUnknown **ppint ) +{ + return ICaptureGraphBuilder2_FindInterface( This, pCategory, pType, pf, riid, (void **)ppint ); +} /*********************************************************************** * qzdebugstr_guid (internal) Modified: trunk/reactos/dll/directx/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/mpegspl… ============================================================================== --- trunk/reactos/dll/directx/quartz/mpegsplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/mpegsplit.c [iso-8859-1] Mon Jan 18 15:28:36 2010 @@ -202,20 +202,20 @@ LONGLONG rtSampleStart = pin->rtNext - MEDIATIME_FROM_BYTES(4); LONGLONG rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(length + 4); - hr = IMemAllocator_GetBuffer(pin->pAlloc, &sample, NULL, NULL, 0); - if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - IMediaSample_SetPreroll(sample, 0); - IMediaSample_SetDiscontinuity(sample, 0); - IMediaSample_SetSyncPoint(sample, 1); - pin->rtCurrent = rtSampleStart; - pin->rtNext = rtSampleStop; - + hr = IMemAllocator_GetBuffer(pin->pAlloc, &sample, NULL, NULL, 0); if (SUCCEEDED(hr)) + { + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetPreroll(sample, 0); + IMediaSample_SetDiscontinuity(sample, 0); + IMediaSample_SetSyncPoint(sample, 1); + pin->rtCurrent = rtSampleStart; + pin->rtNext = rtSampleStop; hr = IAsyncReader_Request(pin->pReader, sample, 0); + } if (FAILED(hr)) FIXME("o_Ox%08x\n", hr); } Modified: trunk/reactos/dll/directx/quartz/nullrenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/nullren… ============================================================================== --- trunk/reactos/dll/directx/quartz/nullrenderer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/nullrenderer.c [iso-8859-1] Mon Jan 18 15:28:36 2010 @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; +static const WCHAR wcsAltInputPinName[] = {'I','n',0}; static const IBaseFilterVtbl NullRenderer_Vtbl; static const IUnknownVtbl IInner_VTable; @@ -472,11 +473,17 @@ TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin); - FIXME("NullRenderer::FindPin(...)\n"); - - /* FIXME: critical section */ - - return E_NOTIMPL; + if (!Id || !ppPin) + return E_POINTER; + + if (!lstrcmpiW(Id,wcsInputPinName) || !lstrcmpiW(Id,wcsAltInputPinName)) + { + *ppPin = (IPin *)This->pInputPin; + IPin_AddRef(*ppPin); + return S_OK; + } + *ppPin = NULL; + return VFW_E_NOT_FOUND; } static HRESULT WINAPI NullRenderer_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) Modified: trunk/reactos/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Mon Jan 18 15:28:36 2010 @@ -7,6 +7,10 @@ <include base="quartz">.</include> <include base="ReactOS">include/reactos/wine</include> <redefine name="_WIN32_WINNT">0x600</redefine> + <define name="__WINESRC__" /> + <define name="ENTRY_PREFIX">QUARTZ_</define> + <define name="REGISTER_PROXY_DLL"/> + <define name="PROXY_DELEGATION"/> <library>wine</library> <library>uuid</library> <library>advapi32</library> @@ -21,6 +25,9 @@ <library>msvfw32</library> <library>msacm32</library> <library>ntdll</library> + <library>quartz_proxy</library> + <library>rpcrt4</library> + <library>pseh</library> <file>avidec.c</file> <file>acmwrapper.c</file> <file>waveparser.c</file> @@ -47,3 +54,10 @@ <file>avisplit.c</file> <file>version.rc</file> </module> +<module name="quartz_proxy" type="rpcproxy" allowwarnings="true"> + <define name="__WINESRC__" /> + <define name="ENTRY_PREFIX">QUARTZ_</define> + <define name="REGISTER_PROXY_DLL"/> + <define name="PROXY_DELEGATION"/> + <file>quartz_strmif.idl</file> +</module> Added: trunk/reactos/dll/directx/quartz/quartz_strmif.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz_… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz_strmif.idl (added) +++ trunk/reactos/dll/directx/quartz/quartz_strmif.idl [iso-8859-1] Mon Jan 18 15:28:36 2010 @@ -1,0 +1,22 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for strmif.idl */ + +cpp_quote("#include <wingdi.h>") +#include "strmif.idl" Propchange: trunk/reactos/dll/directx/quartz/quartz_strmif.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/regsvr.… ============================================================================== --- trunk/reactos/dll/directx/quartz/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/regsvr.c [iso-8859-1] Mon Jan 18 15:28:36 2010 @@ -901,56 +901,6 @@ */ static struct regsvr_interface const interface_list[] = { - { &IID_IFilterGraph, - "IFilterGraph", - NULL, - 11, - NULL, - &CLSID_PSFactoryBuffer - }, - { &IID_IFilterGraph2, - "IFilterGraph2", - NULL, - 21, - NULL, - &CLSID_PSFactoryBuffer - }, - { &IID_IFilterMapper, - "IFilterMapper", - NULL, - 11, - NULL, - &CLSID_PSFactoryBuffer - }, - { &IID_IFilterMapper2, - "IFilterMapper2", - NULL, - 7, - NULL, - &CLSID_PSFactoryBuffer - }, - /* FIXME: - { &IID_SeekingPassThru, - "ISeekingPassThru", - NULL, - 4, - NULL, - &CLSID_PSFactoryBuffer - }, - { &IID_AsyncReader, - "IAsyncReader", - NULL, - 11, - NULL, - &CLSID_PSFactoryBuffer - }, - { &IID_WAVEParser, - "IWAVEParser", - NULL, - 11, - NULL, - &CLSID_PSFactoryBuffer - },*/ { NULL } /* list terminator */ }; @@ -1213,6 +1163,9 @@ { NULL } /* list terminator */ }; +extern HRESULT WINAPI QUARTZ_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI QUARTZ_DllUnregisterServer(void) DECLSPEC_HIDDEN; + /*********************************************************************** * DllRegisterServer (QUARTZ.@) */ @@ -1222,7 +1175,9 @@ TRACE("\n"); - hr = register_coclasses(coclass_list); + hr = QUARTZ_DllRegisterServer(); + if (SUCCEEDED(hr)) + hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); if (SUCCEEDED(hr)) @@ -1252,5 +1207,7 @@ hr = unregister_mediatypes_parsing(mediatype_parsing_list); if (SUCCEEDED(hr)) hr = unregister_mediatypes_extension(mediatype_extension_list); + if (SUCCEEDED(hr)) + hr = QUARTZ_DllUnregisterServer(); return hr; } Modified: trunk/reactos/include/dxsdk/axextend.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/axextend.idl… ============================================================================== --- trunk/reactos/include/dxsdk/axextend.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/axextend.idl [iso-8859-1] Mon Jan 18 15:28:36 2010 @@ -266,7 +266,7 @@ HRESULT UnregisterFilter ( [in] const CLSID *pclsidCategory, - [in] const OLECHAR *szInstance, + [in] LPCOLESTR szInstance, [in] REFCLSID Filter ); @@ -275,7 +275,7 @@ [in] LPCWSTR Name, [in, out] IMoniker **ppMoniker, [in] const CLSID *pclsidCategory, - [in] const OLECHAR *szInstance, + [in] LPCOLESTR szInstance, [in] const REGFILTER2 *prf2 ); @@ -317,7 +317,7 @@ typedef struct tagQuality { QualityMessageType Type; - long Proportion; + LONG Proportion; REFERENCE_TIME Late; REFERENCE_TIME TimeStamp; } Quality; @@ -482,7 +482,7 @@ interface IMediaEventSink : IUnknown { HRESULT Notify( - [in] long EventCode, + [in] LONG EventCode, [in] LONG_PTR EventParam1, [in] LONG_PTR EventParam2 ); @@ -824,11 +824,11 @@ ] interface IAMVideoProcAmp : IUnknown { - HRESULT GetRange( [in] long Property, [out] long *pMin, [out] long *pMax, - [out] long *pSteppingDelta, [out] long *pDefault, - [out] long *pCapsFlags); - HRESULT Set( [in] long Property, [in] long lValue, [in] long Flags); - HRESULT Get( [in] long Property, [out] long *lValue, [out] long *Flags); + HRESULT GetRange( [in] LONG Property, [out] LONG *pMin, [out] LONG *pMax, + [out] LONG *pSteppingDelta, [out] LONG *pDefault, + [out] LONG *pCapsFlags); + HRESULT Set( [in] LONG Property, [in] LONG lValue, [in] LONG Flags); + HRESULT Get( [in] LONG Property, [out] LONG *lValue, [out] LONG *Flags); }

14 years, 8 months

[cgutman] 45129: - Fix calculation of the maximum data size (it previously calculated 65519 (0xFFFF - sizeof(ICMPv4Header) - sizeof(LARGE_INTEGER)) which was wrong because the real maximum was 65499 (0xFFFF - sizeof(IPv4Header) - sizeof(ICMPv4Header) - sizeof(LARGE_INTEGER))) - Implement -f and -i options - Note: This raises our max ping data size to 65507 (0xFFFF - sizeof(IPv4Header) - sizeof(ICMPv4Header)) so we match linux's (iputils) ping max size but Windows' max is 65500 and I'm not sure i

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 18 01:52:31 2010 New Revision: 45129 URL: http://svn.reactos.org/svn/reactos?rev=45129&view=rev Log: - Fix calculation of the maximum data size (it previously calculated 65519 (0xFFFF - sizeof(ICMPv4Header) - sizeof(LARGE_INTEGER)) which was wrong because the real maximum was 65499 (0xFFFF - sizeof(IPv4Header) - sizeof(ICMPv4Header) - sizeof(LARGE_INTEGER))) - Implement -f and -i options - Note: This raises our max ping data size to 65507 (0xFFFF - sizeof(IPv4Header) - sizeof(ICMPv4Header)) so we match linux's (iputils) ping max size but Windows' max is 65500 and I'm not sure if we should change our code to match Windows or not Modified: branches/aicom-network-branch/base/applications/network/ping/ping.c Modified: branches/aicom-network-branch/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/base/appli… ============================================================================== --- branches/aicom-network-branch/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ branches/aicom-network-branch/base/applications/network/ping/ping.c [iso-8859-1] Mon Jan 18 01:52:31 2010 @@ -7,6 +7,7 @@ */ #include <winsock2.h> +#include <ws2tcpip.h> #include <tchar.h> #include <stdarg.h> #include <string.h> @@ -53,7 +54,6 @@ typedef struct _ICMP_ECHO_PACKET { ICMP_HEADER Icmp; - LARGE_INTEGER Timestamp; } ICMP_ECHO_PACKET, *PICMP_ECHO_PACKET; #pragma pack(1) @@ -83,6 +83,7 @@ LARGE_INTEGER AvgRTT; LARGE_INTEGER TicksPerMs; /* Ticks per millisecond */ LARGE_INTEGER TicksPerUs; /* Ticks per microsecond */ +LARGE_INTEGER SentTime; BOOL UsePerformanceCounter; #ifndef NDEBUG @@ -218,10 +219,10 @@ case 'n': PingCount = GetULONG2(&argv[i][2], argv[i + 1], &i); break; case 'l': DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i); - if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)) + if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET) - sizeof(IPv4_HEADER)) { printf("Bad value for option -l, valid range is from 0 to %d.\n", - ICMP_MAXSIZE - (int)sizeof(ICMP_ECHO_PACKET)); + ICMP_MAXSIZE - (int)sizeof(ICMP_ECHO_PACKET) - (int)sizeof(IPv4_HEADER)); return FALSE; } break; @@ -314,6 +315,27 @@ return FALSE; } + if (setsockopt(IcmpSock, + IPPROTO_IP, + IP_DONTFRAGMENT, + (const char *)&DontFragment, + sizeof(DontFragment)) == SOCKET_ERROR) + { + printf("setsockopt failed (%d).\n", WSAGetLastError()); + return FALSE; + } + + if (setsockopt(IcmpSock, + IPPROTO_IP, + IP_TTL, + (const char *)&TTLValue, + sizeof(TTLValue)) == SOCKET_ERROR) + { + printf("setsockopt failed (%d).\n", WSAGetLastError()); + return FALSE; + } + + ZeroMemory(&Target, sizeof(Target)); phe = NULL; Addr = inet_addr(TargetName); @@ -447,7 +469,7 @@ QueryTime(&LargeTime); - RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart); + RelativeTime.QuadPart = (LargeTime.QuadPart - SentTime.QuadPart); if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) { @@ -505,10 +527,6 @@ Packet->Icmp.SeqNum = htons((USHORT)CurrentSeqNum); Packet->Icmp.Checksum = 0; - /* Timestamp is part of data area */ - QueryTime(&Packet->Timestamp); - - CopyMemory(Buffer, &Packet->Icmp, sizeof(ICMP_ECHO_PACKET) + DataSize); /* Calculate checksum for ICMP header and data area */ Packet->Icmp.Checksum = Checksum((PUSHORT)&Packet->Icmp, sizeof(ICMP_ECHO_PACKET) + DataSize); @@ -532,6 +550,7 @@ Status = sendto(IcmpSock, Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize, 0, (SOCKADDR*)&Target, sizeof(Target)); + QueryTime(&SentTime); SentCount++; } if (Status == SOCKET_ERROR)

14 years, 8 months

[mkupfer] 45128: - fix file path in header - add German translation

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jan 17 23:37:09 2010 New Revision: 45128 URL: http://svn.reactos.org/svn/reactos?rev=45128&view=rev Log: - fix file path in header - add German translation Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Sun Jan 17 23:37:09 2010 @@ -63,6 +63,22 @@ PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 218,155,80,15 LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Erstelle Partition" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "Erstelle und formatiere Partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Größe:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "Dateisystem:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Abbrechen",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Sun Jan 17 23:37:09 2010 @@ -20,7 +20,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application - * FILE: subsys/system/reactos/reactos.c + * FILE: base/setup/reactos/reactos.c * PROGRAMMERS: Eric Kohl * Matthias Kupfer * Dmitry Chapyshev (dmitry(a)reactos.org)

14 years, 8 months

[sserapion] 45127: Try fix build again

by sserapion＠svn.reactos.org

Author: sserapion Date: Sun Jan 17 23:36:11 2010 New Revision: 45127 URL: http://svn.reactos.org/svn/reactos?rev=45127&view=rev Log: Try fix build again Modified: branches/ros-amd64-bringup/reactos/config.template.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: branches/ros-amd64-bringup/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… ============================================================================== --- branches/ros-amd64-bringup/reactos/config.template.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/config.template.rbuild [iso-8859-1] Sun Jan 17 23:36:11 2010 @@ -97,7 +97,7 @@  -<property name="BUILD_MP" value="0" /> +<property name="BUILD_MP" value="1" /> <!-- Whether to compile any usermode parts. This is while kernel mode is under Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def [iso-8859-1] Sun Jan 17 23:36:11 2010 @@ -290,11 +290,11 @@ _fstat64 @284 _fstati64 @285 _ftime @286 -; _ftime64 @287 ??? + _ftime64 @287 ; _ftol @288 ??? _fullpath @289 _futime @290 -; _futime64 @291 + _futime64 @291 _gcvt @292 ; _get_heap_handle @293 _get_osfhandle @294 @@ -848,3 +848,13 @@ wctomb @840 wprintf @841 wscanf @842 + + _mbsnbcpy_s + wcscpy_s + wcsncpy_s + ;_ftol2=_ftol + ;_ftol2_sse=_ftol + strcat_s + strcpy_s + _swprintf=swprintf + Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun Jan 17 23:36:11 2010 @@ -419,7 +419,7 @@ BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg, - HKL dwhkl) + UINT flags) { PTHREADINFO pti; static INT dead_char = 0;

14 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
53
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 January 2010