Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 40464: - Remove the "ROS-HACK" for gdi32 bitmap font tests -- this doesn't crash the system anymore
by sginsberg＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: sginsberg Date: Sat Apr 11 22:54:22 2009 New Revision: 40464 URL: http://svn.reactos.org/svn/reactos?rev=40464&view=rev Log: - Remove the "ROS-HACK" for gdi32 bitmap font tests -- this doesn't crash the system anymore Modified: trunk/rostests/winetests/gdi32/font.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sat Apr 11 22:54:22 2009 @@ -284,9 +284,6 @@ TEXTMETRICA tm_orig; SIZE size_orig; INT ret, i, width_orig, height_orig, scale, lfWidth; - - skip("ROS-HACK: Skipping bitmap font tests!\n"); - return; hdc = GetDC(0);

1 0

[gedmurphy] 40463: remove downloader from rosapps
by gedmurphy＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: gedmurphy Date: Sat Apr 11 20:58:21 2009 New Revision: 40463 URL: http://svn.reactos.org/svn/reactos?rev=40463&view=rev Log: remove downloader from rosapps Removed: trunk/rosapps/applications/downloader/

1 0

[gedmurphy] 40462: Remove the old rosapps entries
by gedmurphy＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: gedmurphy Date: Sat Apr 11 20:56:22 2009 New Revision: 40462 URL: http://svn.reactos.org/svn/reactos?rev=40462&view=rev Log: Remove the old rosapps entries Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Apr 11 20:56:22 2009 @@ -655,8 +655,6 @@ modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional modules\rosapps\applications\sysutils\gettype\gettype.exe 1 optional -modules\rosapps\applications\downloader\downloader.exe 1 optional -modules\rosapps\applications\downloader\downloader.xml 1 optional modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional modules\rosapps\applications\net\netreg\netreg.exe 1 optional modules\rosapps\applications\net\niclist\niclist.exe 1 optional

1 0

[gedmurphy] 40461: Move the downloader tool into trunk
by gedmurphy＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: gedmurphy Date: Sat Apr 11 20:51:57 2009 New Revision: 40461 URL: http://svn.reactos.org/svn/reactos?rev=40461&view=rev Log: Move the downloader tool into trunk Added: trunk/reactos/base/applications/downloader/ - copied from r40456, trunk/rosapps/applications/downloader/ Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Sat Apr 11 20:51:57 2009 @@ -16,6 +16,9 @@ <directory name="control"> <xi:include href="control/control.rbuild" /> </directory> + <directory name="downloader"> + <xi:include href="downloader/downloader.rbuild" /> + </directory> <directory name="dxdiag"> <xi:include href="dxdiag/dxdiag.rbuild" /> </directory> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Apr 11 20:51:57 2009 @@ -41,6 +41,8 @@ base\applications\cmdutils\more\more.exe 1 base\applications\cmdutils\xcopy\xcopy.exe 1 base\applications\control\control.exe 1 +base\applications\downloader\downloader.exe 1 +base\applications\downloader\downloader.xml 1 base\applications\dxdiag\dxdiag.exe 1 base\applications\fontview\fontview.exe 1 base\applications\mscutils\devmgmt\devmgmt.exe 1

1 0

[gschneider] 40460: - Fix a memory overwrite that was uncovered by recent win32k memory allocation changes (r40268 + r40269) - Fixes a crash in current QiP Infium that was hidden before, bug #4361
by gschneider＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: gschneider Date: Sat Apr 11 20:48:47 2009 New Revision: 40460 URL: http://svn.reactos.org/svn/reactos?rev=40460&view=rev Log: - Fix a memory overwrite that was uncovered by recent win32k memory allocation changes (r40268 + r40269) - Fixes a crash in current QiP Infium that was hidden before, bug #4361 Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sat Apr 11 20:48:47 2009 @@ -257,7 +257,7 @@ { Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - for (i = BltInfo->DestRect.right; BltInfo->DestRect.left <= i; i--) + for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) { *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); }

1 0

[spetreolle] 40459: fix cmd build
by spetreolle＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: spetreolle Date: Sat Apr 11 20:37:08 2009 New Revision: 40459 URL: http://svn.reactos.org/svn/reactos?rev=40459&view=rev Log: fix cmd build Modified: trunk/reactos/base/shell/cmd/cmd.h Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sat Apr 11 20:37:08 2009 @@ -65,7 +65,7 @@ extern SHORT maxx; extern SHORT maxy; extern OSVERSIONINFO osvi; - +extern BOOL bUnicodeOutput; /* Prototypes for ALIAS.C */

1 0

[cgutman] 40458: - Revert 40446 and 40447 - More research needs to be done on when exactly we should be locking
by cgutman＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: cgutman Date: Sat Apr 11 18:00:48 2009 New Revision: 40458 URL: http://svn.reactos.org/svn/reactos?rev=40458&view=rev Log: - Revert 40446 and 40447 - More research needs to be done on when exactly we should be locking Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Apr 11 18:00:48 2009 @@ -355,9 +355,11 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( @@ -365,7 +367,7 @@ Request, Status); } - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeLowerIrql(OldIrql); } VOID NTAPI @@ -382,7 +384,6 @@ * Status = Status of send operation */ { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; @@ -390,12 +391,12 @@ AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[0]; - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeLowerIrql(OldIrql); } @@ -416,7 +417,6 @@ IN NDIS_STATUS Status, IN UINT BytesTransferred) { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; @@ -424,13 +424,13 @@ AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[0]; - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*AdapterBinding->ProtocolBinding->Chars.TransferDataCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status, BytesTransferred); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeLowerIrql(OldIrql); } @@ -605,7 +605,7 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); /* call the miniport's queryinfo handler */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.QueryInformationHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, Oid, @@ -613,7 +613,7 @@ Size, BytesWritten, &BytesNeeded); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeLowerIrql(OldIrql); /* FIXME: Wait in pending case! */ @@ -634,11 +634,11 @@ BOOLEAN Ret = FALSE; KIRQL OldIrql; - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler) Ret = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeLowerIrql(OldIrql); return Ret; } @@ -667,14 +667,16 @@ NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, AddressingReset); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.ResetStatus = Status; - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + + KeLowerIrql(OldIrql); if (Status != NDIS_STATUS_PENDING) { NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); @@ -852,9 +854,11 @@ KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.PendingRequest = NdisRequest; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); switch (NdisRequest->RequestType) { @@ -883,10 +887,12 @@ } if (Status != NDIS_STATUS_PENDING) { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.PendingRequest = NULL; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + } + + KeLowerIrql(OldIrql); return Status; } @@ -903,10 +909,12 @@ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; + KIRQL OldIrql; ASSERT(Adapter); - /* This isn't a handler supplied by the miniport */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if (Adapter->NdisMiniportBlock.SetCompleteHandler) (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); + KeLowerIrql(OldIrql); } @@ -922,10 +930,12 @@ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; + KIRQL OldIrql; ASSERT(Adapter); - /* This isn't a handler supplied by the miniport */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( Adapter->NdisMiniportBlock.QueryCompleteHandler ) (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); + KeLowerIrql(OldIrql); } VOID @@ -970,11 +980,13 @@ else { /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &RaiseOldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + { NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, (PPNDIS_PACKET)&WorkItemContext, 1); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, RaiseOldIrql); + } + KeLowerIrql(RaiseOldIrql); NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); if( NdisStatus == NDIS_STATUS_RESOURCES ) { @@ -996,13 +1008,13 @@ else { /* Send is called at DISPATCH_LEVEL for all serialized miniports */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &RaiseOldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, ((PNDIS_PACKET)WorkItemContext)->Private.Flags); NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, RaiseOldIrql); + KeLowerIrql(RaiseOldIrql); if( NdisStatus == NDIS_STATUS_RESOURCES ) { MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); break; @@ -1034,14 +1046,19 @@ NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &AddressingReset); - Adapter->NdisMiniportBlock.ResetStatus = NdisStatus; - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + if (NdisStatus == NDIS_STATUS_PENDING) + { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = NDIS_STATUS_PENDING; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + } + + KeLowerIrql(OldIrql); if (NdisStatus != NDIS_STATUS_PENDING) MiniResetComplete(Adapter, NdisStatus, AddressingReset); Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sat Apr 11 18:00:48 2009 @@ -204,11 +204,13 @@ NdisStatus = NDIS_STATUS_PENDING; } else { /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &RaiseOldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + { NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, RaiseOldIrql); + } + KeLowerIrql(RaiseOldIrql); NdisStatus = NDIS_GET_PACKET_STATUS(Packet); if (NdisStatus == NDIS_STATUS_RESOURCES) { @@ -227,12 +229,12 @@ NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); } else { /* Send is called at DISPATCH_LEVEL for all serialized miniports */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &RaiseOldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, Packet->Private.Flags); NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, RaiseOldIrql); + KeLowerIrql(RaiseOldIrql); if (NdisStatus == NDIS_STATUS_RESOURCES) { MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); @@ -272,6 +274,8 @@ Adapter = AdapterBinding->Adapter; ASSERT(Adapter); + + /* if the following is not true, KeRaiseIrql() below will break */ ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); /* XXX what is this crazy black magic? */ @@ -322,10 +326,10 @@ else { /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &RaiseOldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray, NumberOfPackets); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, RaiseOldIrql); + KeLowerIrql(RaiseOldIrql); for (i = 0; i < NumberOfPackets; i++) { NdisStatus = NDIS_GET_PACKET_STATUS(PacketArray[i]); @@ -349,15 +353,15 @@ else { /* Send is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); for (i = 0; i < NumberOfPackets; i++) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &RaiseOldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray[i], PacketArray[i]->Private.Flags); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, RaiseOldIrql); if (NdisStatus != NDIS_STATUS_PENDING) MiniSendComplete(Adapter, PacketArray[i], NdisStatus); } + KeLowerIrql(RaiseOldIrql); } } } @@ -404,7 +408,7 @@ return NDIS_STATUS_SUCCESS; } - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.TransferDataHandler)( Packet, @@ -414,7 +418,7 @@ ByteOffset, BytesToTransfer); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeLowerIrql(OldIrql); return Status; }

1 0

[cfinck] 40457: Alter "userenv.spec" to match the output of "dumpbin /exports" for the Windows Server 2003 SP1 userenv.dll exactly. I found out the real function names of the functions exported by ordinal and their parameter sizes in a PDB file. Some functions we didn't have yet are also documented in MSDN, so I could get the exact parameters. The comment beside each stub details each function as far as I could find out.
by cfinck＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: cfinck Date: Sat Apr 11 17:00:00 2009 New Revision: 40457 URL: http://svn.reactos.org/svn/reactos?rev=40457&view=rev Log: Alter "userenv.spec" to match the output of "dumpbin /exports" for the Windows Server 2003 SP1 userenv.dll exactly. I found out the real function names of the functions exported by ordinal and their parameter sizes in a PDB file. Some functions we didn't have yet are also documented in MSDN, so I could get the exact parameters. The comment beside each stub details each function as far as I could find out. Modified: trunk/reactos/dll/win32/userenv/userenv.spec Modified: trunk/reactos/dll/win32/userenv/userenv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.spec [iso-8859-1] Sat Apr 11 17:00:00 2009 @@ -1,17 +1,51 @@ - @ stdcall CreateEnvironmentBlock(ptr ptr long) - @ stdcall DestroyEnvironmentBlock(ptr) - @ stdcall ExpandEnvironmentStringsForUserA(ptr str ptr long) - @ stdcall ExpandEnvironmentStringsForUserW(ptr wstr ptr long) - @ stdcall GetProfilesDirectoryA(ptr ptr) - @ stdcall GetProfilesDirectoryW(ptr ptr) - @ stub GetProfileType - @ stdcall GetUserProfileDirectoryA(ptr ptr ptr) - @ stdcall GetUserProfileDirectoryW(ptr ptr ptr) - @ stdcall LoadUserProfileA(ptr ptr) - @ stdcall LoadUserProfileW(ptr ptr) - @ stdcall RegisterGPNotification(long long) - @ stdcall UnloadUserProfile(ptr ptr) - @ stdcall UnregisterGPNotification(long) +132 stdcall CreateEnvironmentBlock(ptr ptr long) +133 stdcall DeleteProfileA(str str str) +134 stdcall DeleteProfileW(wstr wstr wstr) +176 stdcall DestroyEnvironmentBlock(ptr) +177 stub DllCanUnloadNow #stdcall DllCanUnloadNow() +178 stub DllGetClassObject #stdcall DllGetClassObject(ptr ptr ptr) +179 stub DllInstall #stdcall DllInstall(long wstr) +180 stub DllRegisterServer #stdcall DllRegisterServer() +181 stub DllUnregisterServer #stdcall DllUnregisterServer() +182 stdcall EnterCriticalPolicySection(long) +183 stdcall ExpandEnvironmentStringsForUserA(ptr str str long) +184 stdcall ExpandEnvironmentStringsForUserW(ptr wstr wstr long) +185 stub ForceSyncFgPolicy #stdcall ForceSyncFgPolicy(4) +186 stub FreeGPOListA #stdcall FreeGPOListA(ptr) +187 stub FreeGPOListW #stdcall FreeGPOListW(ptr) +188 stub GenerateRsopPolicy #stdcall GenerateRsopPolicy(48) +189 stdcall GetAllUsersProfileDirectoryA(str ptr) +190 stdcall GetAllUsersProfileDirectoryW(wstr ptr) +191 stub GetAppliedGPOListA #stdcall GetAppliedGPOListA(long str ptr ptr ptr) +192 stub GetAppliedGPOListW #stdcall GetAppliedGPOListW(long wstr ptr ptr ptr) +193 stdcall GetDefaultUserProfileDirectoryA(str ptr) +194 stdcall GetDefaultUserProfileDirectoryW(wstr ptr) +195 stub GetGPOListA #stdcall GetGPOListA(ptr str str str long ptr) +196 stub GetGPOListW #stdcall GetGPOListW(ptr wstr wstr wstr long ptr) +197 stub GetNextFgPolicyRefreshInfo #stdcall GetNextFgPolicyRefreshInfo(8) +198 stub GetPreviousFgPolicyRefreshInfo #stdcall GetPreviousFgPolicyRefreshInfo(8) +199 stub GetProfileType #stdcall GetProfileType(ptr) +202 stdcall GetProfilesDirectoryA(str ptr) +203 stdcall GetProfilesDirectoryW(wstr ptr) +204 stdcall GetUserProfileDirectoryA(ptr str ptr) +205 stdcall GetUserProfileDirectoryW(ptr wstr ptr) +206 stdcall LeaveCriticalPolicySection(ptr) +207 stdcall LoadUserProfileA(ptr ptr) +208 stdcall LoadUserProfileW(ptr ptr) +209 stub ProcessGroupPolicyCompleted #stdcall ProcessGroupPolicyCompleted(ptr ptr long) +210 stub ProcessGroupPolicyCompletedEx #stdcall ProcessGroupPolicyCompletedEx(ptr ptr long ptr) +211 stdcall RefreshPolicy(long) +212 stdcall RefreshPolicyEx(long long) +213 stdcall RegisterGPNotification(ptr long) +214 stub RsopAccessCheckByType #stdcall RsopAccessCheckByType(ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) +215 stub RsopFileAccessCheck #stdcall RsopFileAccessCheck(wstr ptr long ptr ptr) +216 stub RsopLoggingEnabled #stdcall RsopLoggingEnabled() +217 stub RsopResetPolicySettingStatus #stdcall RsopResetPolicySettingStatus(long ptr ptr) +218 stub RsopSetPolicySettingStatus #stdcall RsopSetPolicySettingStatus(long ptr ptr long ptr) +219 stdcall UnloadUserProfile(ptr ptr) +220 stdcall UnregisterGPNotification(ptr) +221 stdcall WaitForMachinePolicyForegroundProcessing() +222 stdcall WaitForUserPolicyForegroundProcessing() 100 stdcall -noname InitializeProfiles() 101 stdcall -noname CreateGroupA(str long) 102 stdcall -noname CreateGroupW(wstr long) @@ -29,15 +63,61 @@ 114 stdcall -noname AddDesktopItemW(long wstr wstr wstr long wstr long long) 115 stdcall -noname DeleteDesktopItemA(long str) 116 stdcall -noname DeleteDesktopItemW(long wstr) - @ stdcall EnterCriticalPolicySection(long) - @ stdcall GetAllUsersProfileDirectoryA(str ptr) - @ stdcall GetAllUsersProfileDirectoryW(wstr ptr) - @ stdcall GetDefaultUserProfileDirectoryA(str ptr) - @ stdcall GetDefaultUserProfileDirectoryW(wstr ptr) - @ stdcall LeaveCriticalPolicySection(long) - @ stdcall RefreshPolicy(long) - @ stdcall RefreshPolicyEx(long long) - @ stdcall WaitForUserPolicyForegroundProcessing() - @ stdcall WaitForMachinePolicyForegroundProcessing() - @ stdcall DeleteProfileW(wstr wstr wstr) - @ stdcall DeleteProfileA(str str str) +117 stub -noname ApplyGroupPolicy #stdcall -noname ApplyGroupPolicy(20) +118 stub -noname ShutdownGPOProcessing #stdcall -noname ShutdownGPOProcessing(4) +119 stub -noname CreateLinkFileA #stdcall -noname CreateLinkFileA(40) +120 stub -noname CreateLinkFileW #stdcall -noname CreateLinkFileW(40) +121 stub -noname DeleteLinkFileA #stdcall -noname DeleteLinkFileA(16) +122 stub -noname DeleteLinkFileW #stdcall -noname DeleteLinkFileW(16) +123 stub -noname CopyProfileDirectoryExA #stdcall -noname CopyProfileDirectoryExA(20) +124 stub -noname CopyProfileDirectoryExW #stdcall -noname CopyProfileDirectoryExW(20) +125 stub -noname GetSystemTempDirectoryA #stdcall -noname GetSystemTempDirectoryA(8) +126 stub -noname GetSystemTempDirectoryW #stdcall -noname GetSystemTempDirectoryW(8) +127 stub -noname MigrateNT4ToNT5 #stdcall -noname MigrateNT4ToNT5() +128 stub -noname ResetUserSpecialFolderPaths #stdcall -noname ResetUserSpecialFolderPaths() +129 stub -noname ApplySystemPolicyA #stdcall -noname ApplySystemPolicyA(24) +130 stub -noname ApplySystemPolicyW #stdcall -noname ApplySystemPolicyW(24) +131 stub -noname DetermineProfilesLocation #stdcall -noname DetermineProfilesLocation(4) +135 stub -noname PingComputer #stdcall -noname PingComputer(8) +136 stub -noname CreateGroupExA #stdcall -noname CreateGroupExA(16) +137 stub -noname CreateGroupExW #stdcall -noname CreateGroupExW(16) +138 stub -noname CreateLinkFileExA #stdcall -noname CreateLinkFileExA(48) +139 stub -noname CreateLinkFileExW #stdcall -noname CreateLinkFileExW(48) +140 stub -noname InitializeUserProfile #stdcall -noname InitializeUserProfile() +#141 cdecl -noname RsopSidsFromToken@@YGJPAXPAPAU_TOKEN_GROUPS@@@Z +142 stub -noname GetUserSid #stdcall -noname GetUserSid(4) +143 stub -noname SecureUserProfiles #stdcall -noname SecureUserProfiles() +144 stub -noname EnterUserProfileLock #stdcall -noname EnterUserProfileLock(4) +145 stub -noname LeaveUserProfileLock #stdcall -noname LeaveUserProfileLock(4) +146 stub -noname CheckAccessForPolicyGeneration #stdcall -noname CheckAccessForPolicyGeneration(20) +147 stub -noname GetGroupPolicyNetworkName #stdcall -noname GetGroupPolicyNetworkName(8) +148 stub -noname GetUserAppDataPathA #stdcall -noname GetUserAppDataPathA(12) +149 stub -noname GetUserAppDataPathW #stdcall -noname GetUserAppDataPathW(12) +150 stub -noname SignalUserPolicyForegroundProcessingDone #stdcall -noname SignalUserPolicyForegroundProcessingDone() +151 stub -noname SignalMachinePolicyForegroundProcessingDone #stdcall -noname SignalMachinePolicyForegroundProcessingDone() +152 stub -noname IsSyncForegroundPolicyRefresh #stdcall -noname IsSyncForegroundPolicyRefresh(8) +153 stub -noname CreateUserProfileExA #stdcall -noname CreateUserProfileExA(24) +154 stub -noname CreateUserProfileExW #stdcall -noname CreateUserProfileExW(24) +155 stub -noname CopySystemProfile #stdcall -noname CopySystemProfile(4) +156 stub -noname GetUserProfileDirFromSidA #stdcall -noname GetUserProfileDirFromSidA(12) +157 stub -noname GetUserProfileDirFromSidW #stdcall -noname GetUserProfileDirFromSidW(12) +158 stub -noname SetNextFgPolicyRefreshInfo #stdcall -noname SetNextFgPolicyRefreshInfo(12) +159 stub -noname TranslateNameXForest #stdcall -noname TranslateNameXForest(20) +160 stub -noname AllocGpContainer #stdcall -noname AllocGpContainer(60) +161 stub -noname AddGPO #stdcall -noname AddGPO(84) +162 stub -noname GetWbemServices #stdcall -noname GetWbemServices(20) +163 stub -noname FilterGPOs #stdcall -noname FilterGPOs(8) +164 stub -noname ProcessMachAndUserGpoList #stdcall -noname ProcessMachAndUserGpoList(48) +165 stub -noname GPOExceptionFilter #stdcall -noname GPOExceptionFilter(4) +166 stub -noname LogExtSessionStatus #stdcall -noname LogExtSessionStatus(16) +167 stub -noname UpdateExtSessionStatus #stdcall -noname UpdateExtSessionStatus(16) +168 stub -noname UnloadGPExtensions #stdcall -noname UnloadGPExtensions(4) +169 stub -noname FreeGpoInfo #stdcall -noname FreeGpoInfo(4) +170 stub -noname LogSessionData #stdcall -noname LogSessionData(8) +171 stub -noname LogGpoData #stdcall -noname LogGpoData(4) +172 stub -noname ReadGPExtensions #stdcall -noname ReadGPExtensions(4) +173 stub -noname CheckForSkippedExtensions #stdcall -noname CheckForSkippedExtensions(8) +174 stub -noname SetupGPOFilter #stdcall -noname SetupGPOFilter(4) +175 stub -noname CheckXForestLogon #stdcall -noname CheckXForestLogon(4) +200 stub -noname CreateURLFile #stdcall -noname CreateURLFile(36) +201 stub -noname DeleteURLFile #stdcall -noname DeleteURLFile(16)

1 0

[dchapyshev] 40456: - Sync gdiplus, iccvid, imaadp32.acm, inetcomm with Wine 1.1.19 - Remove unneeded gdiplus_ros.diff
by dchapyshev＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: dchapyshev Date: Sat Apr 11 12:58:56 2009 New Revision: 40456 URL: http://svn.reactos.org/svn/reactos?rev=40456&view=rev Log: - Sync gdiplus, iccvid, imaadp32.acm, inetcomm with Wine 1.1.19 - Remove unneeded gdiplus_ros.diff Removed: trunk/reactos/dll/win32/gdiplus/gdiplus_ros.diff Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/iccvid/iccvid.c trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c trunk/reactos/dll/win32/inetcomm/internettransport.c Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] Sat Apr 11 12:58:56 2009 @@ -214,7 +214,7 @@ unstretch_angle(&startAngle, x2 / 2.0, y2 / 2.0); unstretch_angle(&endAngle, x2 / 2.0, y2 / 2.0); - count = ceil(fabs(endAngle - startAngle) / M_PI_2) * 3 + 1; + count = ceilf(fabs(endAngle - startAngle) / M_PI_2) * 3 + 1; /* don't make more than a full circle */ count = min(MAX_ARC_PTS, count); Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sat Apr 11 12:58:56 2009 @@ -47,7 +47,7 @@ @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) @ stub GdipCloneBitmapArea -@ stub GdipCloneBitmapAreaI +@ stdcall GdipCloneBitmapAreaI(long long long long long ptr ptr) @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) @ stdcall GdipCloneFont(ptr ptr) Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sat Apr 11 12:58:56 2009 @@ -61,7 +61,7 @@ static inline INT roundr(REAL x) { - return (INT) floor(x + 0.5); + return (INT) floorf(x + 0.5); } static inline REAL deg2rad(REAL degrees) Removed: trunk/reactos/dll/win32/gdiplus/gdiplus_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_ros.diff (removed) @@ -1,58 +1,0 @@ -Index: gdiplus.c -=================================================================== -RCS file: /home/wine/wine/dlls/gdiplus/gdiplus.c,v -retrieving revision 1.15 -diff -u -r1.15 gdiplus.c ---- gdiplus.c 8 Jan 2008 16:22:52 -0000 1.15 -+++ gdiplus.c 23 Mar 2008 21:21:23 -0000 -@@ -200,7 +200,7 @@ - unstretch_angle(&startAngle, x2 / 2.0, y2 / 2.0); - unstretch_angle(&endAngle, x2 / 2.0, y2 / 2.0); - -- count = ceilf(fabs(endAngle - startAngle) / M_PI_2) * 3 + 1; -+ count = ceil(fabs(endAngle - startAngle) / M_PI_2) * 3 + 1; - /* don't make more than a full circle */ - count = min(MAX_ARC_PTS, count); - -Index: gdiplus_private.h -=================================================================== -RCS file: /home/wine/wine/dlls/gdiplus/gdiplus_private.h,v -retrieving revision 1.58 -diff -u -r1.58 gdiplus_private.h ---- gdiplus_private.h 15 Aug 2007 09:36:31 -0000 1.58 -+++ gdiplus_private.h 23 Mar 2008 09:25:54 -0000 -@@ -46,7 +46,7 @@ - - static inline INT roundr(REAL x) - { -- return (INT) floorf(x + 0.5); -+ return (INT) floor(x + 0.5); - } - - static inline REAL deg2rad(REAL degrees) -Index: graphics.c -=================================================================== -RCS file: /home/wine/wine/dlls/gdiplus/graphics.c,v -retrieving revision 1.102 -diff -u -r1.102 graphics.c ---- graphics.c 1 Mar 2008 12:15:48 -0000 1.102 -+++ graphics.c 23 Mar 2008 21:21:23 -0000 -@@ -1464,7 +1464,7 @@ - DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw))); - - for(i = 0, j = 0; i < length; i++){ -- if(!isprintW(string[i]) && (string[i] != '\n')) -+ if(!isprint(string[i]) && (string[i] != '\n')) - continue; - - stringdup[j] = string[i]; -@@ -1873,7 +1873,7 @@ - nwidth = nheight = INT_MAX; - - for(i = 0, j = 0; i < length; i++){ -- if(!isprintW(string[i]) && (string[i] != '\n')) -+ if(!isprint(string[i]) && (string[i] != '\n')) - continue; - - stringdup[j] = string[i]; - Modified: trunk/reactos/dll/win32/iccvid/iccvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] Sat Apr 11 12:58:56 2009 @@ -57,6 +57,7 @@ static HINSTANCE ICCVID_hModule; #define ICCVID_MAGIC mmioFOURCC('c', 'v', 'i', 'd') +#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) #define DBUG 0 #define MAX_STRIPS 32 @@ -975,7 +976,7 @@ TRACE("Opened\n"); - if (icinfo && icinfo->fccType != ICTYPE_VIDEO) return 0; + if (icinfo && compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return 0; info = heap_alloc( sizeof (ICCVID_Info) ); if( info ) Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] Sat Apr 11 12:58:56 2009 @@ -120,7 +120,50 @@ return i; } + switch (wfx->wFormatTag) + { + case WAVE_FORMAT_PCM: + if(3 > wfx->nChannels && + wfx->nChannels > 0 && + wfx->nAvgBytesPerSec == 2 * wfx->nSamplesPerSec * wfx->nChannels && + wfx->nBlockAlign == 2 * wfx->nChannels && + wfx->wBitsPerSample == 16) + return hi; + break; + case WAVE_FORMAT_IMA_ADPCM: + if(3 > wfx->nChannels && + wfx->nChannels > 0 && + wfx->wBitsPerSample == 4 && + wfx->cbSize == 2) + return hi; + break; + } + return 0xFFFFFFFF; +} + +static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/) +{ + register WAVEFORMATEX* pwfx = &awfx->wfx; + + /* we assume wFormatTag, nChannels, nSamplesPerSec and wBitsPerSample + * have been initialized... */ + + if (pwfx->wFormatTag != WAVE_FORMAT_IMA_ADPCM) {FIXME("wrong FT\n"); return;} + if (ADPCM_GetFormatIndex(pwfx) == 0xFFFFFFFF) {FIXME("wrong fmt\n"); return;} + + switch (pwfx->nSamplesPerSec) + { + case 8000: pwfx->nBlockAlign = 256 * pwfx->nChannels; break; + case 11025: pwfx->nBlockAlign = 256 * pwfx->nChannels; break; + case 22050: pwfx->nBlockAlign = 512 * pwfx->nChannels; break; + case 44100: pwfx->nBlockAlign = 1024 * pwfx->nChannels; break; + default: /*pwfx->nBlockAlign = nba;*/ break; + } + pwfx->cbSize = sizeof(WORD); + + awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels) * 2) / pwfx->nChannels + 1; + pwfx->nAvgBytesPerSec = (pwfx->nSamplesPerSec * pwfx->nBlockAlign) / awfx->wSamplesPerBlock; } /*********************************************************************** @@ -612,6 +655,7 @@ /* some tests ... */ if (adfs->cbwfxSrc < sizeof(PCMWAVEFORMAT) || adfs->cbwfxDst < sizeof(PCMWAVEFORMAT) || + adfs->pwfxSrc->wFormatTag == adfs->pwfxDst->wFormatTag || ADPCM_GetFormatIndex(adfs->pwfxSrc) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; /* FIXME: should do those tests against the real size (according to format tag */ @@ -636,26 +680,24 @@ adfs->pwfxDst->wFormatTag = WAVE_FORMAT_PCM; } - /* check if result is ok */ - if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; - /* recompute other values */ switch (adfs->pwfxDst->wFormatTag) { case WAVE_FORMAT_PCM: adfs->pwfxDst->nBlockAlign = (adfs->pwfxDst->nChannels * adfs->pwfxDst->wBitsPerSample) / 8; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; + /* check if result is ok */ + if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; case WAVE_FORMAT_IMA_ADPCM: - adfs->pwfxDst->nBlockAlign = 1024; + init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT*)adfs->pwfxDst); /* FIXME: not handling header overhead */ - adfs->pwfxDst->nAvgBytesPerSec = ((adfs->pwfxDst->nSamplesPerSec * 4) / 8) * adfs->pwfxSrc->nChannels; - ((IMAADPCMWAVEFORMAT*)adfs->pwfxDst)->wSamplesPerBlock = (1024 - 4 * adfs->pwfxSrc->nChannels) * (2 / adfs->pwfxSrc->nChannels) + 1; TRACE("setting spb=%u\n", ((IMAADPCMWAVEFORMAT*)adfs->pwfxDst)->wSamplesPerBlock); + /* check if result is ok */ + if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; default: - FIXME("\n"); - break; + return ACMERR_NOTPOSSIBLE; } return MMSYSERR_NOERROR; @@ -775,6 +817,8 @@ */ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZE adss) { + DWORD nblocks; + switch (adss->fdwSize) { case ACM_STREAMSIZEF_DESTINATION: @@ -782,14 +826,18 @@ if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_IMA_ADPCM) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbSrcLength = adss->cbDstLength * 4; + nblocks = adss->cbDstLength / adsi->pwfxDst->nBlockAlign; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * adsi->pwfxSrc->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxDst)->wSamplesPerBlock; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_IMA_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - FIXME("misses the block header overhead\n"); - adss->cbSrcLength = 256 + adss->cbDstLength / 4; + nblocks = adss->cbDstLength / (adsi->pwfxDst->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * adsi->pwfxSrc->nBlockAlign; } else { @@ -801,14 +849,24 @@ if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_IMA_ADPCM) { - FIXME("misses the block header overhead\n"); - adss->cbDstLength = 256 + adss->cbSrcLength / 4; + nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxDst)->wSamplesPerBlock); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + if (adss->cbSrcLength % (adsi->pwfxSrc->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxDst)->wSamplesPerBlock)) + /* Round block count up. */ + nblocks++; + adss->cbDstLength = nblocks * adsi->pwfxDst->nBlockAlign; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_IMA_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbDstLength = adss->cbSrcLength * 4; + nblocks = adss->cbSrcLength / adsi->pwfxSrc->nBlockAlign; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + if (adss->cbSrcLength % adsi->pwfxSrc->nBlockAlign) + /* Round block count up. */ + nblocks++; + adss->cbDstLength = nblocks * adsi->pwfxDst->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; } else { Modified: trunk/reactos/dll/win32/inetcomm/internettransport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/interne… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/internettransport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/internettransport.c [iso-8859-1] Sat Apr 11 12:58:56 2009 @@ -20,18 +20,14 @@ #define COBJMACROS -#include <stdarg.h> -#include <stdio.h> - +#include "ws2tcpip.h" #include "windef.h" -#include "winbase.h" #include "winnt.h" -#include "winuser.h" -#include "winsock2.h" -#include "ws2tcpip.h" #include "objbase.h" #include "ole2.h" #include "mimeole.h" + +#include <stdio.h> #include "wine/debug.h"

1 0

[dchapyshev] 40455: - Sync qmgr, msvidc32, msvfw32, msrle32, msctf, msadp32.acm, mlang, localspl with Wine 1.1.19
by dchapyshev＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: dchapyshev Date: Sat Apr 11 12:56:29 2009 New Revision: 40455 URL: http://svn.reactos.org/svn/reactos?rev=40455&view=rev Log: - Sync qmgr, msvidc32, msvfw32, msrle32, msctf, msadp32.acm, mlang, localspl with Wine 1.1.19 Added: trunk/reactos/dll/win32/msctf/version.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Pt.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Zh.rc (with props) Modified: trunk/reactos/dll/win32/localspl/provider.c trunk/reactos/dll/win32/mlang/mlang.c trunk/reactos/dll/win32/msadp32.acm/msadp32.c trunk/reactos/dll/win32/msctf/msctf.rbuild trunk/reactos/dll/win32/msrle32/msrle32.c trunk/reactos/dll/win32/msvfw32/mciwnd.c trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc trunk/reactos/dll/win32/msvfw32/msvideo16.c trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/dll/win32/msvfw32/msvideo_private.h trunk/reactos/dll/win32/msvfw32/rsrc.rc trunk/reactos/dll/win32/msvidc32/msvideo1.c trunk/reactos/dll/win32/qmgr/qmgr.c trunk/reactos/dll/win32/qmgr/service.c Modified: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide… ============================================================================== --- trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -251,25 +251,26 @@ ptr = strchrW(server, '\\'); serverlen = (ptr) ? ptr - server : lstrlenW(server); - /* servername is empty or to long */ + /* servername is empty */ if (serverlen == 0) return 0; TRACE("found %s\n", debugstr_wn(server, serverlen)); if (serverlen > MAX_COMPUTERNAME_LENGTH) return -serverlen; + + if (target) { + memcpy(target, server, serverlen * sizeof(WCHAR)); + target[serverlen] = '\0'; + } len = sizeof(buffer) / sizeof(buffer[0]); if (GetComputerNameW(buffer, &len)) { if ((serverlen == len) && (strncmpiW(server, buffer, len) == 0)) { /* The requested Servername is our computername */ - if (target) { - memcpy(target, server, serverlen * sizeof(WCHAR)); - target[serverlen] = '\0'; - } - return serverlen; - } - } - return 0; + return 0; + } + } + return serverlen; } /****************************************************************** Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -1907,15 +1907,15 @@ static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( IMLangFontLink* iface, const WCHAR* pszSrc, - long cchSrc, + LONG cchSrc, DWORD dwPriorityCodePages, DWORD* pdwCodePages, - long* pcchCodePages) -{ - long i; + LONG* pcchCodePages) +{ + LONG i; DWORD cps = 0; - TRACE("(%p)->%s %ld %x %p %p\n", iface, debugstr_wn(pszSrc,cchSrc),cchSrc,dwPriorityCodePages,pdwCodePages,pcchCodePages); + TRACE("(%p)->%s %d %x %p %p\n", iface, debugstr_wn(pszSrc, cchSrc), cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); if (pdwCodePages) *pdwCodePages = 0; if (pcchCodePages) *pcchCodePages = 0; @@ -3203,8 +3203,8 @@ } static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, - const WCHAR *pszSrc, long cchSrc, DWORD dwPriorityCodePages, - DWORD *pdwCodePages, long *pcchCodePages) + const WCHAR *pszSrc, LONG cchSrc, DWORD dwPriorityCodePages, + DWORD *pdwCodePages, LONG *pcchCodePages) { return fnIMLangFontLink_GetStrCodePages((IMLangFontLink *)This, pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); @@ -3354,14 +3354,14 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML( IMLangLineBreakConsole* iface, IMLangString* pSrcMLStr, - long lSrcPos, - long lSrcLen, - long cMinColumns, - long cMaxColumns, - long* plLineLen, - long* plSkipLen) -{ - FIXME("(%p)->%p %li %li %li %li %p %p\n", iface, pSrcMLStr, lSrcPos, lSrcLen, cMinColumns, cMaxColumns, plLineLen, plSkipLen); + LONG lSrcPos, + LONG lSrcLen, + LONG cMinColumns, + LONG cMaxColumns, + LONG* plLineLen, + LONG* plSkipLen) +{ + FIXME("(%p)->%p %i %i %i %i %p %p\n", iface, pSrcMLStr, lSrcPos, lSrcLen, cMinColumns, cMaxColumns, plLineLen, plSkipLen); return E_NOTIMPL; } @@ -3369,12 +3369,12 @@ IMLangLineBreakConsole* iface, LCID locale, const WCHAR* pszSrc, - long cchSrc, - long cMaxColumns, - long* pcchLine, - long* pcchSkip ) -{ - FIXME("(%p)->%i %s %li %li %p %p\n", iface, locale, debugstr_wn(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); + LONG cchSrc, + LONG cMaxColumns, + LONG* pcchLine, + LONG* pcchSkip ) +{ + FIXME("(%p)->%i %s %i %i %p %p\n", iface, locale, debugstr_wn(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); *pcchLine = cchSrc; *pcchSkip = 0; @@ -3386,12 +3386,12 @@ LCID locale, UINT uCodePage, const CHAR* pszSrc, - long cchSrc, - long cMaxColumns, - long* pcchLine, - long* pcchSkip) -{ - FIXME("(%p)->%i %i %s %li %li %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); + LONG cchSrc, + LONG cMaxColumns, + LONG* pcchLine, + LONG* pcchSkip) +{ + FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); *pcchLine = cchSrc; *pcchSkip = 0; Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -512,8 +512,7 @@ if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; default: - FIXME("\n"); - break; + return ACMERR_NOTPOSSIBLE; } return MMSYSERR_NOERROR; Modified: trunk/reactos/dll/win32/msctf/msctf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.rbui… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.rbuild [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -12,6 +12,7 @@ <file>msctf.c</file> <file>regsvr.c</file> <file>threadmgr.c</file> + <file>version.rc</file> <library>wine</library> <library>uuid</library> <library>ole32</library> Added: trunk/reactos/dll/win32/msctf/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/version.rc… ============================================================================== --- trunk/reactos/dll/win32/msctf/version.rc (added) +++ trunk/reactos/dll/win32/msctf/version.rc [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -1,0 +1,26 @@ +/* + * Copyright 2009 CodeWeavers, Aric Stewart + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Msctf" +#define WINE_FILENAME_STR "msctf.dll" +#define WINE_FILEVERSION 5,1,2600,3319 +#define WINE_FILEVERSION_STR " 5.1.2600.3319" +#define WINE_PRODUCTVERSION 5,1,2600,3319 +#define WINE_PRODUCTVERSION_STR "5.1.2600.3319" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/msctf/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msrle32/msrle32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle32.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msrle32); static HINSTANCE MSRLE32_hModule = 0; + +#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) #define ABS(a) ((a) < 0 ? -(a) : (a)) #define SQR(a) ((a) * (a)) @@ -1114,7 +1116,7 @@ return (LPVOID)0xFFFF0000; } - if (icinfo->fccType != ICTYPE_VIDEO) return NULL; + if (compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return NULL; TRACE("(%p = {%u,0x%08X(%4.4s),0x%08X(%4.4s),0x%X,0x%X,...})\n", icinfo, icinfo->dwSize, icinfo->fccType, (char*)&icinfo->fccType, Modified: trunk/reactos/dll/win32/msvfw32/mciwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/mciwnd.c… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/mciwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/mciwnd.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -309,7 +309,7 @@ /* MCI wnd class is prepared to be embedded as an MDI child window */ if (cs->dwExStyle & WS_EX_MDICHILD) { - MDICREATESTRUCTW *mdics = (MDICREATESTRUCTW *)cs->lpCreateParams; + MDICREATESTRUCTW *mdics = cs->lpCreateParams; lParam = mdics->lParam; } else @@ -449,7 +449,7 @@ TRACE("%p %04x %08lx %08lx\n", hWnd, wMsg, wParam, lParam); - mwi = (MCIWndInfo*)GetWindowLongW(hWnd, 0); + mwi = (MCIWndInfo*)GetWindowLongPtrW(hWnd, 0); if (!mwi && wMsg != WM_CREATE) return DefWindowProcW(hWnd, wMsg, wParam, lParam); @@ -568,7 +568,7 @@ hCursor = SetCursor(hCursor); mci_open.lpstrElementName = (LPWSTR)lParam; - wsprintfW(aliasW, formatW, (int)hWnd + 1); + wsprintfW(aliasW, formatW, HandleToLong(hWnd) + 1); mci_open.lpstrAlias = aliasW; mwi->lasterror = mciSendCommandW(mwi->mci, MCI_OPEN, MCI_OPEN_ELEMENT | MCI_OPEN_ALIAS | MCI_WAIT, @@ -588,7 +588,7 @@ } mwi->mci = mci_open.wDeviceID; - mwi->alias = (int)hWnd + 1; + mwi->alias = HandleToLong(hWnd) + 1; mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (strlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR)); strcpyW(mwi->lpName, (LPWSTR)lParam); @@ -752,7 +752,7 @@ MCIWND_notify_error(mwi); return 0; } - TRACE("MCIWNDM_GETLENGTH: %d\n", mci_status.dwReturn); + TRACE("MCIWNDM_GETLENGTH: %ld\n", mci_status.dwReturn); return mci_status.dwReturn; } @@ -769,7 +769,7 @@ MCIWND_notify_error(mwi); return 0; } - TRACE("MCIWNDM_GETSTART: %d\n", mci_status.dwReturn); + TRACE("MCIWNDM_GETSTART: %ld\n", mci_status.dwReturn); return mci_status.dwReturn; } Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -17,12 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ºñµð¿À ¾ÐÃà" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "È®ÀÎ",IDOK,129,2,49,14 PUSHBUTTON "Ãë¼Ò",IDCANCEL,129,18,49,14 Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Pt.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Pt.rc [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -1,0 +1,51 @@ +/* + * Copyright 2008 Ricardo Filipe + * + * 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 + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Compressão de vídeo" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Cancelar",IDCANCEL,129,18,49,14 + + LTEXT "&Compressor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Con&figurar...",882,129,36,49,14 + PUSHBUTTON "&Sobre...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "&Qualidade de compressão:",886,9,34,80,8 + + CONTROL "&Imagem chave todos os",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "frames",889,103,62,26,10 + + CONTROL "&Cadência de dados",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Imagens Completas (Descomprimidas)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Pt.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Zh.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Zh.rc [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -1,0 +1,92 @@ +/* + * msvfw32 (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "è§é¢åç¼©" +FONT 9, "MS Shell Dlg" +{ + DEFPUSHBUTTON "ç¡®å®",IDOK,129,2,49,14 + PUSHBUTTON "åæ¶",IDCANCEL,129,18,49,14 + + LTEXT "åç¼©å¨(&C):",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "éç½®(&F)...",882,129,36,49,14 + PUSHBUTTON "å³äº(&A)...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "åç¼©è´¨é(&Q):",886,9,34,80,8 + + CONTROL "å³é®å¸§/æ¯(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "å¸§",889,103,62,26,10 + + CONTROL "æ°æ®éåº¦(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "å¨å¸§(æªåç¼©)" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "è¦é »å£ç¸®" +FONT 9, "MS Shell Dlg" +{ + DEFPUSHBUTTON "ç¢ºå®",IDOK,129,2,49,14 + PUSHBUTTON "åæ¶",IDCANCEL,129,18,49,14 + + LTEXT "å£ç¸®å¨(&C):",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "éç½®(&F)...",882,129,36,49,14 + PUSHBUTTON "éæ¼(&A)...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "å£ç¸®è³ªé(&Q):",886,9,34,80,8 + + CONTROL "ééµå¹/æ¯(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "å¹",889,103,62,26,10 + + CONTROL "æ¸æéåº¦(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "å¨å¹(æªå£ç¸®)" +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msvfw32/msvideo16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo1… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo16.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo16.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -602,7 +602,7 @@ case ICM_GETINFO: { ICINFO *ici = (ICINFO*)(*lParam1); - ICINFO16 *ici16 = (ICINFO16*)data16; + ICINFO16 *ici16 = data16; UNCOPY(ici, fccType); UNCOPY(ici, fccHandler); Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -1,7 +1,7 @@ /* * Copyright 1998 Marcus Meissner * Copyright 2000 Bradley Baetz - * Copyright 2003 Michael Günnewig + * Copyright 2003 Michael GÃ¼nnewig * Copyright 2005 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or @@ -102,7 +102,7 @@ return strncasecmp(fcc_str1, fcc_str2, 4); } -typedef BOOL (*enum_handler_t)(const char*, int, void*); +typedef BOOL (*enum_handler_t)(const char*, unsigned int, void*); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) { @@ -173,9 +173,9 @@ return 0x040003B6; /* 4.950 */ } -static BOOL ICInfo_enum_handler(const char *drv, int nr, void *param) -{ - ICINFO *lpicinfo = (ICINFO *)param; +static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) +{ + ICINFO *lpicinfo = param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); /* exact match of fccHandler or nth driver found */ @@ -519,9 +519,9 @@ return 0; } -static BOOL ICLocate_enum_handler(const char *drv, int nr, void *param) -{ - driver_info_t *info = (driver_info_t *)param; +static BOOL ICLocate_enum_handler(const char *drv, unsigned int nr, void *param) +{ + driver_info_t *info = param; info->fccHandler = mmioStringToFOURCCA(drv + 5, 0); info->hic = try_driver(info); return info->hic != 0; @@ -1026,9 +1026,9 @@ LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2) { LRESULT ret; - -#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break; - + +#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break + switch (msg) { /* DRV_* */ XX(DRV_LOAD); @@ -1299,7 +1299,7 @@ pHdr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,cbHdr+sizeof(RGBQUAD)*256); if ( pHdr == NULL ) goto err; - if ( ICDecompressGetFormat( hic, lpbiIn, (BITMAPINFO*)pHdr ) != ICERR_OK ) + if ( ICDecompressGetFormat( hic, lpbiIn, pHdr ) != ICERR_OK ) goto err; lpbiOut = (BITMAPINFO*)pHdr; if ( lpbiOut->bmiHeader.biBitCount <= 8 && @@ -1337,7 +1337,7 @@ WARN( "out of memory\n" ); goto err; } - pMem = (BYTE*)GlobalLock( hMem ); + pMem = GlobalLock( hMem ); if ( pMem == NULL ) goto err; memcpy( pMem, lpbiOut, cbHdr ); @@ -1368,7 +1368,7 @@ */ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL *pfKey, LONG *plSize) { - ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState; + ICCOMPRESS* icComp = pc->lpState; DWORD ret; TRACE("(%p, 0x%08x, %p, %p, %p)\n", pc, uiFlags, lpBits, pfKey, plSize); @@ -1490,7 +1490,7 @@ TRACE(" -- %x\n", ret); if (ret == ICERR_OK) { - ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState; + ICCOMPRESS* icComp = pc->lpState; /* Initialise some variables */ pc->lFrame = 0; pc->lKeyCount = 0; Modified: trunk/reactos/dll/win32/msvfw32/msvideo_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_private.h [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -18,9 +18,6 @@ #ifndef __WINE_MSVIDEO_PRIVATE_H #define __WINE_MSVIDEO_PRIVATE_H - -/* Installable Compressor Manager */ -#define ICVERSION 0x0104 #define ICM_CHOOSE_COMPRESSOR 1 #define IDC_COMP_LIST 880 Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -30,7 +30,9 @@ #include "msvfw32_Nl.rc" #include "msvfw32_No.rc" #include "msvfw32_Pl.rc" +#include "msvfw32_Pt.rc" #include "msvfw32_Ru.rc" #include "msvfw32_Si.rc" #include "msvfw32_Sv.rc" #include "msvfw32_Tr.rc" +#include "msvfw32_Zh.rc" Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvideo… ============================================================================== --- trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -7,7 +7,7 @@ * 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 of the License, or (at your option) any later version. + * 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 @@ -50,6 +50,7 @@ #define CRAM_MAGIC mmioFOURCC('C', 'R', 'A', 'M') #define MSVC_MAGIC mmioFOURCC('M', 'S', 'V', 'C') #define WHAM_MAGIC mmioFOURCC('W', 'H', 'A', 'M') +#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) #define PALETTE_COUNT 256 #define LE_16(x) ((((const uint8_t *)(x))[1] << 8) | ((const uint8_t *)(x))[0]) @@ -502,7 +503,7 @@ TRACE("Opened\n"); - if (icinfo && icinfo->fccType != ICTYPE_VIDEO) return 0; + if (icinfo && compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return 0; info = HeapAlloc( GetProcessHeap(), 0, sizeof (Msvideo1Context) ); if( info ) Modified: trunk/reactos/dll/win32/qmgr/qmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -157,7 +157,14 @@ /* Check if it's the stop_event */ if (WaitForMultipleObjects(2, events, FALSE, INFINITE) == WAIT_OBJECT_0) + { + LIST_FOR_EACH_ENTRY_SAFE(job, jobCur, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) + { + list_remove(&job->entryFromQmgr); + IBackgroundCopyJob_Release((IBackgroundCopyJob *) job); + } return 0; + } /* Note that other threads may add files to the job list, but only this thread ever deletes them so we don't need to worry about jobs Modified: trunk/reactos/dll/win32/qmgr/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/service.c?r… ============================================================================== --- trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] Sat Apr 11 12:56:29 2009 @@ -153,4 +153,6 @@ UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); CloseHandle(stop_event); TRACE("service stoped\n"); + + CoUninitialize(); }

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