Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 36312: -import quartz from wine 1.1.4 -autoregister devenum
by cwittich＠svn.reactos.org 19 Sep '08

19 Sep '08

Author: cwittich Date: Fri Sep 19 03:35:33 2008 New Revision: 36312 URL: http://svn.reactos.org/svn/reactos?rev=36312&view=rev Log: -import quartz from wine 1.1.4 -autoregister devenum Added: trunk/reactos/dll/directx/quartz/acmwrapper.c (with props) trunk/reactos/dll/directx/quartz/avidec.c (with props) trunk/reactos/dll/directx/quartz/avisplit.c (with props) trunk/reactos/dll/directx/quartz/control.c (with props) trunk/reactos/dll/directx/quartz/control_private.h (with props) trunk/reactos/dll/directx/quartz/dsoundrender.c (with props) trunk/reactos/dll/directx/quartz/enumfilters.c (with props) trunk/reactos/dll/directx/quartz/enummedia.c (with props) trunk/reactos/dll/directx/quartz/enummoniker.c (with props) trunk/reactos/dll/directx/quartz/enumpins.c (with props) trunk/reactos/dll/directx/quartz/enumregfilters.c (with props) trunk/reactos/dll/directx/quartz/filesource.c (with props) trunk/reactos/dll/directx/quartz/filtergraph.c (with props) trunk/reactos/dll/directx/quartz/filtermapper.c (with props) trunk/reactos/dll/directx/quartz/main.c (with props) trunk/reactos/dll/directx/quartz/memallocator.c (with props) trunk/reactos/dll/directx/quartz/mpegsplit.c (with props) trunk/reactos/dll/directx/quartz/nullrenderer.c (with props) trunk/reactos/dll/directx/quartz/parser.c (with props) trunk/reactos/dll/directx/quartz/parser.h (with props) trunk/reactos/dll/directx/quartz/pin.c (with props) trunk/reactos/dll/directx/quartz/pin.h (with props) trunk/reactos/dll/directx/quartz/quartz_private.h (with props) trunk/reactos/dll/directx/quartz/regsvr.c (with props) trunk/reactos/dll/directx/quartz/systemclock.c (with props) trunk/reactos/dll/directx/quartz/transform.c (with props) trunk/reactos/dll/directx/quartz/transform.h (with props) trunk/reactos/dll/directx/quartz/version.rc (with props) trunk/reactos/dll/directx/quartz/videorenderer.c (with props) trunk/reactos/dll/directx/quartz/waveparser.c (with props) trunk/reactos/include/dxsdk/axcore.idl (props changed) - copied unchanged from r36311, trunk/reactos/include/psdk/axcore.idl trunk/reactos/include/dxsdk/axextend.idl (props changed) - copied unchanged from r36311, trunk/reactos/include/psdk/axextend.idl trunk/reactos/include/psdk/msacm.h (with props) Removed: trunk/reactos/dll/directx/quartz/quartz.c trunk/reactos/dll/directx/quartz/quartz.rc trunk/reactos/include/psdk/axcore.idl trunk/reactos/include/psdk/axextend.idl Modified: trunk/reactos/dll/directx/devenum/devenum.rbuild trunk/reactos/dll/directx/quartz/quartz.rbuild trunk/reactos/include/dxsdk/aviriff.h trunk/reactos/include/dxsdk/dxsdk.rbuild trunk/reactos/include/dxsdk/errors.h trunk/reactos/include/dxsdk/uuids.h trunk/reactos/include/psdk/control.idl trunk/reactos/include/psdk/mmreg.h trunk/reactos/include/psdk/vfw.h trunk/reactos/include/psdk/vfwmsgs.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/devenum/devenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… Added: trunk/reactos/dll/directx/quartz/acmwrapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/acmwrap… Added: trunk/reactos/dll/directx/quartz/avidec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/avidec.… Added: trunk/reactos/dll/directx/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/avispli… Added: trunk/reactos/dll/directx/quartz/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/control… Added: trunk/reactos/dll/directx/quartz/control_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/control… Added: trunk/reactos/dll/directx/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/dsoundr… Added: trunk/reactos/dll/directx/quartz/enumfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enumfil… Added: trunk/reactos/dll/directx/quartz/enummedia.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enummed… Added: trunk/reactos/dll/directx/quartz/enummoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enummon… Added: trunk/reactos/dll/directx/quartz/enumpins.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enumpin… Added: trunk/reactos/dll/directx/quartz/enumregfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enumreg… Added: trunk/reactos/dll/directx/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/filesou… Added: trunk/reactos/dll/directx/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/filterg… Added: trunk/reactos/dll/directx/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/filterm… Added: trunk/reactos/dll/directx/quartz/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/main.c?… Added: trunk/reactos/dll/directx/quartz/memallocator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/memallo… Added: trunk/reactos/dll/directx/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/mpegspl… Added: trunk/reactos/dll/directx/quartz/nullrenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/nullren… Added: trunk/reactos/dll/directx/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/parser.… Added: trunk/reactos/dll/directx/quartz/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/parser.… Added: trunk/reactos/dll/directx/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/pin.c?r… Added: trunk/reactos/dll/directx/quartz/pin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/pin.h?r… Removed: trunk/reactos/dll/directx/quartz/quartz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… Modified: trunk/reactos/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… Removed: trunk/reactos/dll/directx/quartz/quartz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… Added: trunk/reactos/dll/directx/quartz/quartz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz_… Added: trunk/reactos/dll/directx/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/regsvr.… Added: trunk/reactos/dll/directx/quartz/systemclock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/systemc… Added: trunk/reactos/dll/directx/quartz/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/transfo… Added: trunk/reactos/dll/directx/quartz/transform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/transfo… Added: trunk/reactos/dll/directx/quartz/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/version… Added: trunk/reactos/dll/directx/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/videore… Added: trunk/reactos/dll/directx/quartz/waveparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/wavepar… Modified: trunk/reactos/include/dxsdk/aviriff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/aviriff.h?re… Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… Modified: trunk/reactos/include/dxsdk/errors.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/errors.h?rev… Modified: trunk/reactos/include/dxsdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/uuids.h?rev=… Removed: trunk/reactos/include/psdk/axcore.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/axcore.idl?re… Removed: trunk/reactos/include/psdk/axextend.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/axextend.idl?… Modified: trunk/reactos/include/psdk/control.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/control.idl?r… Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=3… Added: trunk/reactos/include/psdk/msacm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msacm.h?rev=3… Modified: trunk/reactos/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vfw.h?rev=363… Modified: trunk/reactos/include/psdk/vfwmsgs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vfwmsgs.h?rev…

1 0

[cgutman] 36311: - Fail if TCPSocket doesn't complete successfully
by cgutman＠svn.reactos.org 19 Sep '08

19 Sep '08

Author: cgutman Date: Thu Sep 18 23:38:25 2008 New Revision: 36311 URL: http://svn.reactos.org/svn/reactos?rev=36311&view=rev Log: - Fail if TCPSocket doesn't complete successfully Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Sep 18 23:38:25 2008 @@ -409,6 +409,11 @@ Status = TCPSocket( Connection, AF_INET, SOCK_STREAM, IPPROTO_TCP ); + if( !NT_SUCCESS(Status) ) { + TCPFreeConnectionEndpoint( Connection ); + return Status; + } + /* Return connection endpoint file object */ Request->Handle.ConnectionContext = Connection;

1 0

[cgutman] 36310: - Add the adapter to the adapter list only after it is bound to the IP layer
by cgutman＠svn.reactos.org 19 Sep '08

19 Sep '08

Author: cgutman Date: Thu Sep 18 23:18:59 2008 New Revision: 36310 URL: http://svn.reactos.org/svn/reactos?rev=36310&view=rev Log: - Add the adapter to the adapter list only after it is bound to the IP layer Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu Sep 18 23:18:59 2008 @@ -1207,17 +1207,17 @@ /* Convert returned link speed to bps (it is in 100bps increments) */ IF->Speed = Speed * 100L; - /* Add adapter to the adapter list */ - ExInterlockedInsertTailList(&AdapterListHead, - &IF->ListEntry, - &AdapterListLock); - /* Bind adapter to IP layer */ if( !BindAdapter(IF, RegistryPath) ) { TI_DbgPrint(DEBUG_DATALINK,("denying adapter %wZ (BindAdapter)\n", AdapterName)); exFreePool(IF); return NDIS_STATUS_NOT_ACCEPTED; } + + /* Add adapter to the adapter list */ + ExInterlockedInsertTailList(&AdapterListHead, + &IF->ListEntry, + &AdapterListLock); TI_DbgPrint(DEBUG_DATALINK, ("Leaving.\n"));

1 0

[cgutman] 36309: - Exit the loop when we find the matching Bucket - Make sure we allocated Bucket - Remove a useless if - Return OSK_ENOBUFS if we can't allocate SleepingThread
by cgutman＠svn.reactos.org 19 Sep '08

19 Sep '08

Author: cgutman Date: Thu Sep 18 21:12:55 2008 New Revision: 36309 URL: http://svn.reactos.org/svn/reactos?rev=36309&view=rev Log: - Exit the loop when we find the matching Bucket - Make sure we allocated Bucket - Remove a useless if - Return OSK_ENOBUFS if we can't allocate SleepingThread Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Thu Sep 18 21:12:55 2008 @@ -117,6 +117,7 @@ if( Bucket->AssociatedEndpoint == Connection ) { RemoveEntryList( ListEntry->Blink ); ExFreePool( Bucket ); + break; } } @@ -141,10 +142,14 @@ if( Status == STATUS_PENDING ) { Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) ); - Bucket->AssociatedEndpoint = Connection; - Bucket->Request.RequestNotifyObject = Complete; - Bucket->Request.RequestContext = Context; - InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); + + if( Bucket ) { + Bucket->AssociatedEndpoint = Connection; + Bucket->Request.RequestNotifyObject = Complete; + Bucket->Request.RequestContext = Context; + InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); + } else + Status = STATUS_NO_MEMORY; } TcpipRecursiveMutexLeave( &TCPLock ); Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Thu Sep 18 21:12:55 2008 @@ -104,8 +104,7 @@ IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ); - if( !NT_SUCCESS(NdisStatus) ) return OSK_EINVAL; - else return 0; + return 0; } int TCPSleep( void *ClientData, void *token, int priority, char *msg, @@ -144,7 +143,9 @@ TcpipRecursiveMutexEnter( &TCPLock, TRUE ); PoolFreeBuffer( SleepingThread ); - } + } else + return OSK_ENOBUFS; + TI_DbgPrint(DEBUG_TCP,("Waiting finished: %x\n", token)); return 0; }

1 0

[cgutman] 36308: - Only continue sending fragments if the last one succeeded
by cgutman＠svn.reactos.org 19 Sep '08

19 Sep '08

Author: cgutman Date: Thu Sep 18 19:40:13 2008 New Revision: 36308 URL: http://svn.reactos.org/svn/reactos?rev=36308&view=rev Log: - Only continue sending fragments if the last one succeeded Modified: branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c [iso-8859-1] Thu Sep 18 19:40:13 2008 @@ -34,10 +34,7 @@ ("Called. Context (0x%X) NdisPacket (0x%X) NdisStatus (0x%X)\n", Context, NdisPacket, NdisStatus)); - /* FIXME: Stop sending fragments and cleanup datagram buffers if - there was an error */ - - if (PrepareNextFragment(IFC)) { + if (NT_SUCCESS(NdisStatus) && PrepareNextFragment(IFC)) { /* A fragment was prepared for transmission, so send it */ IPSendFragment(IFC->NdisPacket, IFC->NCE, IFC); } else {

1 0

[frik85] 36307: RosCMS update * new logon system * svn roscms dir clean up
by frik85＠svn.reactos.org 18 Sep '08

18 Sep '08

1 0

[cwittich] 36306: forgot to fix this as well
by cwittich＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: cwittich Date: Thu Sep 18 11:49:53 2008 New Revision: 36306 URL: http://svn.reactos.org/svn/reactos?rev=36306&view=rev Log: forgot to fix this as well Modified: trunk/reactos/dll/directx/quartz/quartz.c Modified: trunk/reactos/dll/directx/quartz/quartz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.c [iso-8859-1] Thu Sep 18 11:49:53 2008 @@ -40,7 +40,7 @@ } DWORD WINAPI -AMGetErrorTextA(HRESULT hr, LPTSTR buffer, DWORD maxlen) +AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) { int len; static const char format[] = "Error: 0x%lx";

1 0

[cwittich] 36305: fix some of the mess Lentin created here -don't use TCHAR in ANSI functions -add a DllMain otherwise a random memory address is called when loading the dll -add DPRINT1 to all stubs
by cwittich＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: cwittich Date: Thu Sep 18 11:48:38 2008 New Revision: 36305 URL: http://svn.reactos.org/svn/reactos?rev=36305&view=rev Log: fix some of the mess Lentin created here -don't use TCHAR in ANSI functions -add a DllMain otherwise a random memory address is called when loading the dll -add DPRINT1 to all stubs Modified: trunk/reactos/dll/directx/quartz/quartz.c Modified: trunk/reactos/dll/directx/quartz/quartz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.c [iso-8859-1] Thu Sep 18 11:48:38 2008 @@ -21,21 +21,37 @@ #include <windows.h> #include <stdio.h> #include <wchar.h> -#include <tchar.h> +#include <debug.h> + +#define NDEBUG #define MAX_ERROR_TEXT_LEN 160 + +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; +} DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPTSTR buffer, DWORD maxlen) { int len; - static const TCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0}; - TCHAR error[MAX_ERROR_TEXT_LEN]; + static const char format[] = "Error: 0x%lx"; + char error[MAX_ERROR_TEXT_LEN]; + + DPRINT1("FIXME (%x,%p,%d) stub\n", hr, buffer, maxlen); if (!buffer) return 0; - _stprintf(error, format, hr); - if ((len = _tcslen(error)) >= maxlen) return 0; - _tcscpy(buffer, error); + sprintf(error, format, hr); + if ((len = strlen(error)) >= maxlen) return 0; + strcpy(buffer, error); return len; } @@ -45,6 +61,8 @@ int len; static const WCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0}; WCHAR error[MAX_ERROR_TEXT_LEN]; + + DPRINT1("FIXME (%x,%p,%d) stub\n", hr, buffer, maxlen); if (!buffer) return 0; swprintf(error, format, hr); @@ -56,22 +74,24 @@ LONG WINAPI AmpFactorToDB(LONG ampfactor) { + DPRINT1("FIXME (%d) Stub!\n", ampfactor); return 0; } LONG WINAPI DBToAmpFactor(LONG db) { + DPRINT1("FIXME (%d) Stub!\n", db); /* Avoid divide by zero (probably during range computation) in Windows Media Player 6.4 */ if (db < -1000) - return 0; + return 0; return 100; } HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_OK; } HRESULT WINAPI @@ -83,11 +103,11 @@ HRESULT WINAPI DllRegisterServer(void) { - return S_OK; + return S_OK; } HRESULT WINAPI DllUnregisterServer(void) { - return S_OK; + return S_OK; }

1 0

[fireball] 36304: - Implement MmCallDllInitialize (partially based on a patch from bug 3730). See issue #3730 for more details.
by fireball＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: fireball Date: Thu Sep 18 10:45:16 2008 New Revision: 36304 URL: http://svn.reactos.org/svn/reactos?rev=36304&view=rev Log: - Implement MmCallDllInitialize (partially based on a patch from bug 3730). See issue #3730 for more details. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Thu Sep 18 10:45:16 2008 @@ -368,16 +368,60 @@ MmCallDllInitialize(IN PLDR_DATA_TABLE_ENTRY LdrEntry, IN PLIST_ENTRY ListHead) { + UNICODE_STRING ServicesKeyName = RTL_CONSTANT_STRING( + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); PMM_DLL_INITIALIZE DllInit; + UNICODE_STRING RegPath, ImportName; + NTSTATUS Status; /* Try to see if the image exports a DllInitialize routine */ DllInit = (PMM_DLL_INITIALIZE)MiLocateExportName(LdrEntry->DllBase, "DllInitialize"); if (!DllInit) return STATUS_SUCCESS; - /* FIXME: TODO */ - DPRINT1("DllInitialize not called!\n"); - return STATUS_UNSUCCESSFUL; + /* Do a temporary copy of BaseDllName called ImportName + * because we'll alter the length of the string + */ + ImportName.Length = LdrEntry->BaseDllName.Length; + ImportName.MaximumLength = LdrEntry->BaseDllName.MaximumLength; + ImportName.Buffer = LdrEntry->BaseDllName.Buffer; + + /* Obtain the path to this dll's service in the registry */ + RegPath.MaximumLength = ServicesKeyName.Length + + ImportName.Length + sizeof(UNICODE_NULL); + RegPath.Buffer = ExAllocatePoolWithTag(NonPagedPool, + RegPath.MaximumLength, + TAG_LDR_WSTR); + + /* Check if this allocation was unsuccessful */ + if (!RegPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; + + /* Build and append the service name itself */ + RegPath.Length = ServicesKeyName.Length; + RtlCopyMemory(RegPath.Buffer, + ServicesKeyName.Buffer, + ServicesKeyName.Length); + + /* Check if there is a dot in the filename */ + if (wcschr(ImportName.Buffer, L'.')) + { + /* Remove the extension */ + ImportName.Length = (wcschr(ImportName.Buffer, L'.') - + ImportName.Buffer) * sizeof(WCHAR); + } + + /* Append service name (the basename without extension) */ + RtlAppendUnicodeStringToString(&RegPath, &ImportName); + + /* Now call the DllInit func */ + DPRINT("Calling DllInit(%wZ)\n", &RegPath); + Status = DllInit(&RegPath); + + /* Clean up */ + ExFreePool(RegPath.Buffer); + + /* Return status value which DllInitialize returned */ + return Status; } VOID

1 0

[fireball] 36303: - Select ANSI_VAR_FONT in explorer when drawing start button text and desktop switching buttons text. Based on Juriy Sidorov's patch from bug 3484. See issue #3484 for more details.
by fireball＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: fireball Date: Thu Sep 18 07:56:52 2008 New Revision: 36303 URL: http://svn.reactos.org/svn/reactos?rev=36303&view=rev Log: - Select ANSI_VAR_FONT in explorer when drawing start button text and desktop switching buttons text. Based on Juriy Sidorov's patch from bug 3484. See issue #3484 for more details. Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Thu Sep 18 07:56:52 2008 @@ -93,6 +93,7 @@ // create start button ResString start_str(IDS_START); WindowCanvas canvas(_hwnd); + FontSelection font(canvas, GetStockFont(ANSI_VAR_FONT)); RECT rect = {0, 0}; DrawText(canvas, start_str, -1, &rect, DT_SINGLELINE|DT_CALCRECT); int start_btn_width = rect.right+16+8; @@ -101,6 +102,7 @@ // create "Start" button HWND hwndStart = Button(_hwnd, start_str, 1, 1, start_btn_width, REBARBAND_HEIGHT, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW); + SetWindowFont(hwndStart, GetStockFont(ANSI_VAR_FONT), FALSE); new StartButton(hwndStart); /* Save the handle to the window, needed for push-state handling */ Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Thu Sep 18 07:56:52 2008 @@ -141,6 +141,7 @@ HBITMAP hbmp = CreateCompatibleBitmap(canvas, cx, cy); HBITMAP hbmp_old = SelectBitmap(hdc, hbmp); + FontSelection font(hdc, GetStockFont(ANSI_VAR_FONT)); FmtString num_txt(TEXT("%d"), i+1); TextColor color(hdc, RGB(64,64,64)); BkMode mode(hdc, TRANSPARENT);

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