Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cgutman] 36621: - Adapter is PLOGICAL_ADAPTER not PNDIS_MINIPORT_BLOCK
by cgutman＠svn.reactos.org 02 Oct '08

02 Oct '08

Author: cgutman Date: Wed Oct 1 21:13:19 2008 New Revision: 36621 URL: http://svn.reactos.org/svn/reactos?rev=36621&view=rev Log: - Adapter is PLOGICAL_ADAPTER not PNDIS_MINIPORT_BLOCK Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Wed Oct 1 21:13:19 2008 @@ -57,20 +57,20 @@ NDIS_STATUS EXPORT NdisMPciAssignResources( - IN NDIS_HANDLE MiniportHandle, + IN NDIS_HANDLE MiniportAdapterHandle, IN ULONG SlotNumber, OUT PNDIS_RESOURCE_LIST *AssignedResources) { - PNDIS_MINIPORT_BLOCK MiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportHandle; - - if (MiniportBlock->BusType != PCIBus || - MiniportBlock->AllocatedResources == NULL) + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + + if (Adapter->NdisMiniportBlock.BusType != PCIBus || + Adapter->NdisMiniportBlock.AllocatedResources == NULL) { *AssignedResources = NULL; return NDIS_STATUS_FAILURE; } - *AssignedResources = &MiniportBlock->AllocatedResources->List[0].PartialResourceList; + *AssignedResources = &Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList; return NDIS_STATUS_SUCCESS; } @@ -99,7 +99,7 @@ */ { PNDIS_WRAPPER_CONTEXT WrapperContext = (PNDIS_WRAPPER_CONTEXT)WrapperConfigurationContext; - PNDIS_MINIPORT_BLOCK MiniportBlock = WrapperContext->DeviceObject->DeviceExtension; + PLOGICAL_ADAPTER Adapter = WrapperContext->DeviceObject->DeviceExtension; ULONG ResourceListSize; PAGED_CODE(); @@ -107,7 +107,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); - if (MiniportBlock->AllocatedResources == NULL) + if (Adapter->NdisMiniportBlock.AllocatedResources == NULL) { NDIS_DbgPrint(MIN_TRACE, ("No allocated resources!\n")); *Status = NDIS_STATUS_FAILURE; @@ -116,13 +116,13 @@ ResourceListSize = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + - MiniportBlock->AllocatedResources->List[0].PartialResourceList.Count * + Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); if (*BufferSize >= ResourceListSize) { RtlCopyMemory(ResourceList, - &MiniportBlock->AllocatedResources->List[0].PartialResourceList, + &Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList, ResourceListSize); *BufferSize = ResourceListSize; *Status = NDIS_STATUS_SUCCESS; @@ -196,10 +196,10 @@ IN PVOID Buffer, IN ULONG Length) { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)NdisAdapterHandle; + PLOGICAL_ADAPTER Adapter = NdisAdapterHandle; /* Slot number is ignored since W2K for all NDIS drivers. */ return HalGetBusDataByOffset(PCIConfiguration, - Adapter->BusNumber, Adapter->SlotNumber, + Adapter->NdisMiniportBlock.BusNumber, Adapter->NdisMiniportBlock.SlotNumber, Buffer, Offset, Length); } @@ -216,10 +216,10 @@ IN PVOID Buffer, IN ULONG Length) { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)NdisAdapterHandle; + PLOGICAL_ADAPTER Adapter = NdisAdapterHandle; /* Slot number is ignored since W2K for all NDIS drivers. */ return HalSetBusDataByOffset(PCIConfiguration, - Adapter->BusNumber, Adapter->SlotNumber, + Adapter->NdisMiniportBlock.BusNumber, Adapter->NdisMiniportBlock.SlotNumber, Buffer, Offset, Length); } Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Oct 1 21:13:19 2008 @@ -216,15 +216,15 @@ * - Called at IRQL = DISPATCH_LEVEL */ { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)Context; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - Adapter->MapRegisters[Adapter->CurrentMapRegister].MapRegister = MapRegisterBase; + PLOGICAL_ADAPTER Adapter = Context; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + Adapter->NdisMiniportBlock.MapRegisters[Adapter->NdisMiniportBlock.CurrentMapRegister].MapRegister = MapRegisterBase; NDIS_DbgPrint(MAX_TRACE, ("setting event and leaving.\n")); - KeSetEvent(Adapter->AllocationEvent, 0, FALSE); + KeSetEvent(Adapter->NdisMiniportBlock.AllocationEvent, 0, FALSE); /* this is only the thing to do for busmaster NICs */ return DeallocateObjectKeepRegisters;

1 0

[cgutman] 36620: - Only call MiniportISR if the miniport driver called NdisMRegisterInterrupt with RequestIsr TRUE - If RequestIsr is FALSE call the MiniportDisableInterrupt handler
by cgutman＠svn.reactos.org 02 Oct '08

02 Oct '08

Author: cgutman Date: Wed Oct 1 21:04:57 2008 New Revision: 36620 URL: http://svn.reactos.org/svn/reactos?rev=36620&view=rev Log: - Only call MiniportISR if the miniport driver called NdisMRegisterInterrupt with RequestIsr TRUE - If RequestIsr is FALSE call the MiniportDisableInterrupt handler Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Oct 1 21:04:57 2008 @@ -60,22 +60,31 @@ * TRUE if a miniport controlled device generated the interrupt */ { - BOOLEAN InterruptRecognized; - BOOLEAN QueueMiniportHandleInterrupt; + BOOLEAN InterruptRecognized = FALSE; + BOOLEAN QueueMiniportHandleInterrupt = FALSE; PLOGICAL_ADAPTER Adapter = ServiceContext; NDIS_DbgPrint(MAX_TRACE, ("Called. Adapter (0x%X)\n", Adapter)); - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( - &InterruptRecognized, - &QueueMiniportHandleInterrupt, - Adapter->NdisMiniportBlock.MiniportAdapterContext); + if (Adapter->NdisMiniportBlock.Interrupt->IsrRequested) { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( + &InterruptRecognized, + &QueueMiniportHandleInterrupt, + Adapter->NdisMiniportBlock.MiniportAdapterContext); + + } else if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext); + QueueMiniportHandleInterrupt = TRUE; + InterruptRecognized = TRUE; + } + if (QueueMiniportHandleInterrupt) - { - NDIS_DbgPrint(MAX_TRACE, ("Queueing DPC.\n")); + { + NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n")); KeInsertQueueDpc(&Adapter->NdisMiniportBlock.Interrupt->InterruptDpc, NULL, NULL); - } + } NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -767,6 +776,7 @@ KeInitializeEvent(&Interrupt->DpcsCompletedEvent, NotificationEvent, FALSE); Interrupt->SharedInterrupt = SharedInterrupt; + Interrupt->IsrRequested = RequestIsr; Adapter->NdisMiniportBlock.Interrupt = Interrupt;

1 0

[cgutman] 36619: - Adapter not NdisMiniportBlock is passed to ServiceRoutine
by cgutman＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: cgutman Date: Wed Oct 1 18:10:00 2008 New Revision: 36619 URL: http://svn.reactos.org/svn/reactos?rev=36619&view=rev Log: - Adapter not NdisMiniportBlock is passed to ServiceRoutine Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Oct 1 18:10:00 2008 @@ -62,19 +62,19 @@ { BOOLEAN InterruptRecognized; BOOLEAN QueueMiniportHandleInterrupt; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)ServiceContext; + PLOGICAL_ADAPTER Adapter = ServiceContext; NDIS_DbgPrint(MAX_TRACE, ("Called. Adapter (0x%X)\n", Adapter)); - (*Adapter->DriverHandle->MiniportCharacteristics.ISRHandler)( + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, &QueueMiniportHandleInterrupt, - Adapter->MiniportAdapterContext); + Adapter->NdisMiniportBlock.MiniportAdapterContext); if (QueueMiniportHandleInterrupt) { NDIS_DbgPrint(MAX_TRACE, ("Queueing DPC.\n")); - KeInsertQueueDpc(&Adapter->Interrupt->InterruptDpc, NULL, NULL); + KeInsertQueueDpc(&Adapter->NdisMiniportBlock.Interrupt->InterruptDpc, NULL, NULL); } NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n"));

1 0

[gschneider] 36618: Initialize iCodePage to 0, because if might be used uninitialized.
by gschneider＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: gschneider Date: Wed Oct 1 15:08:50 2008 New Revision: 36618 URL: http://svn.reactos.org/svn/reactos?rev=36618&view=rev Log: Initialize iCodePage to 0, because if might be used uninitialized. Modified: trunk/reactos/base/applications/notepad/text.c Modified: trunk/reactos/base/applications/notepad/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/text.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/text.c [iso-8859-1] Wed Oct 1 15:08:50 2008 @@ -58,7 +58,7 @@ BOOL bSuccess = FALSE; BYTE b = 0; int iEncoding = ENCODING_ANSI; - int iCodePage; + int iCodePage = 0; WCHAR szCrlf[2] = { '\r', '\n' }; DWORD adwEolnCount[3] = { 0, 0, 0 }; @@ -223,7 +223,7 @@ DWORD dwPos = 0; DWORD dwByteCount; BYTE buffer[1024]; - UINT iCodePage; + UINT iCodePage = 0; DWORD dwDummy, i; BOOL bSuccess = FALSE; int iBufferSize, iRequiredBytes;

1 0

[gschneider] 36617: After entering a case on iEncoding for ANSI/UTF, iEncoding can only have those two values. Fixes Coverity CIDS 19, 20.
by gschneider＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: gschneider Date: Wed Oct 1 14:56:51 2008 New Revision: 36617 URL: http://svn.reactos.org/svn/reactos?rev=36617&view=rev Log: After entering a case on iEncoding for ANSI/UTF, iEncoding can only have those two values. Fixes Coverity CIDS 19, 20. Modified: trunk/reactos/base/applications/notepad/text.c Modified: trunk/reactos/base/applications/notepad/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/text.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/text.c [iso-8859-1] Wed Oct 1 14:56:51 2008 @@ -120,8 +120,6 @@ iCodePage = CP_ACP; else if (iEncoding == ENCODING_UTF8) iCodePage = CP_UTF8; - else - goto done; if ((dwSize - dwPos) > 0) { @@ -263,8 +261,6 @@ iCodePage = CP_ACP; else if (iEncoding == ENCODING_UTF8) iCodePage = CP_UTF8; - else - goto done; iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); if (iRequiredBytes <= 0)

1 0

[cwittich] 36616: fix formatting
by cwittich＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: cwittich Date: Wed Oct 1 13:19:42 2008 New Revision: 36616 URL: http://svn.reactos.org/svn/reactos?rev=36616&view=rev Log: fix formatting Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 1 13:19:42 2008 @@ -354,43 +354,43 @@ } #ifdef CPU_TRANSMETA - if (Vendor == CPU_TRANSMETA) - { - /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ - if ((Reg[0] & 0x0F00) >= 0x0500 && (Reg[0] & 0x00FF) >= 0x0042) - { - WRMSR(0x80860004, RDMSR(0x80860004) | 0x0100); - FeatureBits |= KF_CMPXCHG8B; - } - } + if (Vendor == CPU_TRANSMETA) + { + /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ + if ((Reg[0] & 0x0F00) >= 0x0500 && (Reg[0] & 0x00FF) >= 0x0042) + { + WRMSR(0x80860004, RDMSR(0x80860004) | 0x0100); + FeatureBits |= KF_CMPXCHG8B; + } + } #endif #ifdef CPU_CENTAUR - if (Vendor == CPU_CENTAUR) - { - /* If CMPXCHG8B is not detected, try to enable it */ - if (!(CpuFeatures & 0x00000100)) - { - if ((Reg[0] & 0x0F00) == 0x0500) - { - WRMSR(0x0107, RDMSR(0x0107) | 0x02); - FeatureBits |= KF_CMPXCHG8B; - } - else if ((Reg[0] & 0x0F00) >= 0x0600) - { - WRMSR(0x1107, (RDMSR(0x1107) | 0x02) & ~((LONGLONG)0x01)); - FeatureBits |= KF_CMPXCHG8B; - } - } - } + if (Vendor == CPU_CENTAUR) + { + /* If CMPXCHG8B is not detected, try to enable it */ + if (!(CpuFeatures & 0x00000100)) + { + if ((Reg[0] & 0x0F00) == 0x0500) + { + WRMSR(0x0107, RDMSR(0x0107) | 0x02); + FeatureBits |= KF_CMPXCHG8B; + } + else if ((Reg[0] & 0x0F00) >= 0x0600) + { + WRMSR(0x1107, (RDMSR(0x1107) | 0x02) & ~((LONGLONG)0x01)); + FeatureBits |= KF_CMPXCHG8B; + } + } + } #endif #ifdef CPU_RISE - if (Vendor == CPU_RISE) - { - /* Windows Vista assumes CMPXCHG8B is always supported on Rise */ - FeatureBits |= KF_CMPXCHG8B; - } + if (Vendor == CPU_RISE) + { + /* Windows Vista assumes CMPXCHG8B is always supported on Rise */ + FeatureBits |= KF_CMPXCHG8B; + } #endif /* Convert all CPUID Feature bits into our format */

1 0

[dreimer] 36615: Be a bit more friendly to ppl who want different RosBE Versions installed. Don't force a unistallation to continue setup.
by dreimer＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: dreimer Date: Wed Oct 1 13:02:19 2008 New Revision: 36615 URL: http://svn.reactos.org/svn/reactos?rev=36615&view=rev Log: Be a bit more friendly to ppl who want different RosBE Versions installed. Don't force a unistallation to continue setup. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Oct 1 13:02:19 2008 @@ -398,8 +398,7 @@ "DisplayVersion" ${If} $R1 == "${PRODUCT_VERSION}" messageBox MB_OK|MB_ICONEXCLAMATION \ - "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. Please manually uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." - Quit + "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. You should uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." ${EndIf} ${If} $R0 == "" ReadRegStr $R0 HKLM \ @@ -413,18 +412,17 @@ ${EndIf} ${EndIf} MessageBox MB_YESNO|MB_ICONQUESTION \ - "A previous version of the ${PRODUCT_NAME} was found. You must uninstall it before installing this version.$\n$\nDo you want to do that now?" \ + "A previous version of the ${PRODUCT_NAME} was found. You should uninstall it before installing this version.$\n$\nDo you want to do that now?" \ IDNO UninstallPrevious_no \ IDYES UninstallPrevious_yes Abort - UninstallPrevious_no: - Quit UninstallPrevious_yes: Var /global PREVIOUSINSTDIR Push $R0 Call GetParent Pop $PREVIOUSINSTDIR ExecWait '$R0 _?=$PREVIOUSINSTDIR' + UninstallPrevious_no: FunctionEnd Function GetParent Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Oct 1 13:02:19 2008 @@ -212,8 +212,7 @@ "DisplayVersion" ${If} $R1 == "${PRODUCT_VERSION}" messageBox MB_OK|MB_ICONEXCLAMATION \ - "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. Please manually uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." - Quit + "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. You should uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." ${EndIf} ${If} $R0 == "" ReadRegStr $R0 HKLM \ @@ -227,18 +226,17 @@ ${EndIf} ${EndIf} MessageBox MB_YESNO|MB_ICONQUESTION \ - "A previous version of the ${PRODUCT_NAME} was found. You must uninstall it before installing this version.$\n$\nDo you want to do that now?" \ + "A previous version of the ${PRODUCT_NAME} was found. You should uninstall it before installing this version.$\n$\nDo you want to do that now?" \ IDNO UninstallPrevious_no \ IDYES UninstallPrevious_yes Abort - UninstallPrevious_no: - Quit UninstallPrevious_yes: Var /global PREVIOUSINSTDIR Push $R0 Call GetParent Pop $PREVIOUSINSTDIR ExecWait '$R0 _?=$PREVIOUSINSTDIR' + UninstallPrevious_no: FunctionEnd Function GetParent

1 0

[sserapion] 36614: Convert to spec. Fix definitions (taken from WINE).
by sserapion＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: sserapion Date: Wed Oct 1 11:39:19 2008 New Revision: 36614 URL: http://svn.reactos.org/svn/reactos?rev=36614&view=rev Log: Convert to spec. Fix definitions (taken from WINE). Added: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec (contents, props changed) - copied, changed from r36479, branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def Removed: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.c branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.c [iso-8859-1] Wed Oct 1 11:39:19 2008 @@ -3,24 +3,31 @@ #include <debug.h> -HRESULT DLLAPI ValidatePixelShader(void) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) { UNIMPLEMENTED return 0; } -HRESULT DLLAPI ValidateVertexShader(void) -{ - UNIMPLEMENTED - return 0; -} -HRESULT DLLAPI DebugSetMute(DWORD dw1) +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) { UNIMPLEMENTED return 0; } -DWORD DLLAPI Direct3DCreate8( UINT SDKVersion ) +HRESULT WINAPI D3D8GetSWInfo(void) +{ + UNIMPLEMENTED + return 0; +} + +HRESULT WINAPI DebugSetMute(void) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI Direct3DCreate8( UINT SDKVersion ) { UNIMPLEMENTED return 0; Removed: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def (removed) @@ -1,6 +1,0 @@ -LIBRARY d3d8 -EXPORTS - ValidatePixelShader - ValidateVertexShader - DebugSetMute - Direct3DCreate8 Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] Wed Oct 1 11:39:19 2008 @@ -1,7 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="d3d8" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8.dll"> - <importlibrary definition="d3d8.def" /> + <importlibrary definition="d3d8.spec.def" /> <file>d3d8.c</file> <file>d3d8.rc</file> + <file>d3d8.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec (from r36479, branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec [iso-8859-1] Wed Oct 1 11:39:19 2008 @@ -1,6 +1,5 @@ -LIBRARY d3d8 -EXPORTS - ValidatePixelShader - ValidateVertexShader - DebugSetMute - Direct3DCreate8 +@ stdcall D3D8GetSWInfo() +@ stdcall DebugSetMute() +@ stdcall Direct3DCreate8(long) +@ stdcall ValidatePixelShader(ptr long long ptr) +@ stdcall ValidateVertexShader(ptr ptr ptr long ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[dreimer] 36613: sync winhlp32 and wordpad with wine
by dreimer＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: dreimer Date: Wed Oct 1 09:17:09 2008 New Revision: 36613 URL: http://svn.reactos.org/svn/reactos?rev=36613&view=rev Log: sync winhlp32 and wordpad with wine Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -68,7 +68,7 @@ IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" CAPTION "õø" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER @@ -76,7 +76,7 @@ IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" CAPTION "õ" { LTEXT "¢À", -1, 10, 10, 180, 150 Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -18,12 +18,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(65001) + IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN MENUITEM "&Neu...\tStrg+N", ID_FILE_NEW - MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN + MENUITEM "Ã&ffnen...\tStrg+O", ID_FILE_OPEN MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern &unter...", ID_FILE_SAVEAS MENUITEM SEPARATOR @@ -35,21 +37,21 @@ END POPUP "&Bearbeiten" BEGIN - MENUITEM "&Rückgängig\tStrg+Z", ID_EDIT_UNDO + MENUITEM "&RÃ¼ckgÃ¤ngig\tStrg+Z", ID_EDIT_UNDO MENUITEM "&Wiederholen\tStrg+Y", ID_EDIT_REDO MENUITEM SEPARATOR MENUITEM "&Ausschneiden\tStrg+X", ID_EDIT_CUT MENUITEM "&Kopieren\tStrg+C", ID_EDIT_COPY - MENUITEM "&Einfügen\tStrg+V", ID_EDIT_PASTE - MENUITEM "&Löschen\tEntf", ID_EDIT_CLEAR + MENUITEM "&EinfÃ¼gen\tStrg+V", ID_EDIT_PASTE + MENUITEM "&LÃ¶schen\tEntf", ID_EDIT_CLEAR MENUITEM "Alles &markieren\tStrg+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "&Suchen...\tStrg+F", ID_FIND MENUITEM "&Weitersuchen\tF3", ID_FIND_NEXT MENUITEM "Erset&zen...\tStrg+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY - MENUITEM "&Geändert", ID_EDIT_MODIFIED + MENUITEM "SchreibgeschÃ¼&tzt", ID_EDIT_READONLY + MENUITEM "&GeÃ¤ndert", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "&Extras" BEGIN @@ -69,14 +71,14 @@ MENUITEM SEPARATOR MENUITEM "&Optionen...", ID_VIEWPROPERTIES END - POPUP "&Einfügen" + POPUP "&EinfÃ¼gen" BEGIN MENUITEM "&Datum und Uhrzeit...", ID_DATETIME END POPUP "Forma&t" BEGIN MENUITEM "Sch&riftart...", ID_FONTSETTINGS - MENUITEM "Auf&zählungszeichen" ID_BULLET + MENUITEM "Auf&zÃ¤hlungszeichen" ID_BULLET MENUITEM "&Absatz..." ID_PARAFORMAT MENUITEM "&Tabstopps..." ID_TABSTOPS POPUP "&Hintergrund" @@ -87,7 +89,7 @@ END POPUP "&?" BEGIN - MENUITEM "Ü&ber Wine Wordpad" ID_ABOUT + MENUITEM "Ã&ber Wine Wordpad" ID_ABOUT END END @@ -97,9 +99,9 @@ BEGIN MENUITEM "Aus&schneiden", ID_EDIT_CUT MENUITEM "&Kopieren", ID_EDIT_COPY - MENUITEM "&Einfügen", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "Auf&zählungszeichen" ID_BULLET + MENUITEM "&EinfÃ¼gen", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Auf&zÃ¤hlungszeichen" ID_BULLET MENUITEM "&Absatz..." ID_PARAFORMAT END END @@ -109,7 +111,7 @@ CAPTION "Datum und Uhrzeit" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Verfügbare Formate",0,3,2,100,15 + LTEXT "VerfÃ¼gbare Formate",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12 @@ -152,10 +154,10 @@ GROUPBOX "Tabstoppposition", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&LÃ¶schen", ID_TAB_DEL, 72, 80, 45, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15 + PUSHBUTTON "&Alle lÃ¶schen", ID_TAB_EMPTY, 137, 51, 50, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -211,11 +213,11 @@ STRINGTABLE DISCARDABLE BEGIN STRING_PREVIEW_PRINT, "&Drucken" - STRING_PREVIEW_NEXTPAGE, "&Nächste" + STRING_PREVIEW_NEXTPAGE, "&NÃ¤chste" STRING_PREVIEW_PREVPAGE, "&Vorherige" STRING_PREVIEW_TWOPAGES, "Zwei Seiten" STRING_PREVIEW_ONEPAGE, "Eine Seite" - STRING_PREVIEW_CLOSE, "&Schließen" + STRING_PREVIEW_CLOSE, "&SchlieÃen" END STRINGTABLE DISCARDABLE @@ -226,12 +228,18 @@ STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" - STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?" + STRING_PROMPT_SAVE_CHANGES, "Ãnderungen an '%s' speichern?" STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet." STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden." STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \ "Dadurch geht die Formatierung verloren. " \ - "Möchten Sie den Vorgang trotzdem fortsetzen?" - STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig." - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt." -END + "MÃ¶chten Sie den Vorgang trotzdem fortsetzen?" + STRING_INVALID_NUMBER, "Diese MaÃeinheit ist nicht zulÃ¤ssig." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstÃ¼tzt." + STRING_WRITE_FAILED, "Die Datei konnte nicht gespeichert werden." + STRING_WRITE_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu speichern." + STRING_OPEN_FAILED, "Die Datei konnte nicht geÃ¶ffnet werden." + STRING_OPEN_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu Ã¶ffnen." +END + +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -222,16 +222,3 @@ BEGIN STRING_UNITS_CM, "cm" END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" - STRING_INVALID_NUMBER, "Invalid number format" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" -END Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -107,7 +107,7 @@ IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "útÆ" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "pÅ«é`®",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY @@ -118,7 +118,7 @@ IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "VKì¬" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "Vµ¢¶`®",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT @@ -129,7 +129,7 @@ IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "iÌÝè" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "Cfg", 0, 10, 10, 120, 68 LTEXT "¶(&L)", 0, 15, 22, 40, 13 @@ -147,7 +147,7 @@ IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "^uÌÝè" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "^uÌâ~Êu(&T)", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT @@ -161,7 +161,7 @@ IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 STYLE DS_SYSMODAL CAPTION "" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "sÌÜèÔµ", 0, 10, 10, 130, 85 RADIOBUTTON "EBhEÌ«EÅÜèÔ·(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Wed Oct 1 09:17:09 2008 @@ -467,7 +467,7 @@ SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } -static void on_fontlist_modified(HWND hwndFontList, LPWSTR wszNewFaceName) +static void on_fontlist_modified(LPWSTR wszNewFaceName) { CHARFORMAT2W format; ZeroMemory(&format, sizeof(format)); @@ -1702,7 +1702,7 @@ return 0; } -static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnCreate( HWND hWnd ) { HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); @@ -1858,7 +1858,7 @@ return 0; } -static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnUser( HWND hWnd ) { HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); @@ -1910,7 +1910,7 @@ return 0; } -static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnNotify( HWND hWnd, LPARAM lParam) { HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); @@ -1925,10 +1925,10 @@ NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam; if(pHdr->hwndFrom == hwndFontList) { - on_fontlist_modified(hwndFontList, (LPWSTR)endEdit->szText); + on_fontlist_modified((LPWSTR)endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndSizeList, (LPWSTR)endEdit->szText); + on_sizelist_modified(hwndFontList,(LPWSTR)endEdit->szText); } } return 0; @@ -2322,7 +2322,7 @@ WCHAR buffer[LF_FACESIZE]; HWND hwndFontList = (HWND)lParam; get_comboexlist_selection(hwndFontList, buffer, LF_FACESIZE); - on_fontlist_modified(hwndFontList, buffer); + on_fontlist_modified(buffer); } break; @@ -2343,7 +2343,7 @@ return 0; } -static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) +static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam ) { HMENU hMenu = (HMENU)wParam; HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); @@ -2456,13 +2456,13 @@ switch(msg) { case WM_CREATE: - return OnCreate( hWnd, wParam, lParam ); + return OnCreate( hWnd ); case WM_USER: - return OnUser( hWnd, wParam, lParam ); + return OnUser( hWnd ); case WM_NOTIFY: - return OnNotify( hWnd, wParam, lParam ); + return OnNotify( hWnd, lParam ); case WM_COMMAND: if(preview_isactive()) @@ -2494,7 +2494,7 @@ return 0; case WM_INITMENUPOPUP: - return OnInitPopupMenu( hWnd, wParam, lParam ); + return OnInitPopupMenu( hWnd, wParam ); case WM_SIZE: return OnSize( hWnd, wParam, lParam );

1 0

[dreimer] 36612: Sync winfile and write with wine
by dreimer＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: dreimer Date: Wed Oct 1 09:14:39 2008 New Revision: 36612 URL: http://svn.reactos.org/svn/reactos?rev=36612&view=rev Log: Sync winfile and write with wine Added: trunk/rosapps/applications/write/lang/ja-JP.rc (with props) Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/write/rsrc.rc Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -148,7 +148,7 @@ IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Às" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "R}h(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -162,7 +162,7 @@ IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ú®æðIð" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "pX(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -175,7 +175,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Sans Serif" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -197,7 +197,7 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Sans Serif" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -201,14 +201,13 @@ /* load resource string */ -static LPTSTR load_string(LPTSTR buffer, UINT id) -{ - LoadString(Globals.hInstance, id, buffer, BUFFER_LEN); - +static LPTSTR load_string(LPTSTR buffer, DWORD size, UINT id) +{ + LoadString(Globals.hInstance, id, buffer, size); return buffer; } -#define RS(b, i) load_string(b, i) +#define RS(b, i) load_string(b, sizeof(b)/sizeof(b[0]), i) /* display error message for the specified WIN32 error code */ @@ -1407,9 +1406,9 @@ root->drive_type = DRIVE_UNKNOWN; drv[0] = '\\'; drv[1] = '\0'; - load_string(root->volname, IDS_DESKTOP); + load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_DESKTOP); root->fs_flags = 0; - load_string(root->fs, IDS_SHELL); + load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_SHELL); return read_tree_shell(root, pidl, sortOrder, hwnd); } @@ -1422,9 +1421,9 @@ root->drive_type = GetDriveType(path); lstrcat(drv, sSlash); - load_string(root->volname, IDS_ROOT_FS); + load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_ROOT_FS); root->fs_flags = 0; - load_string(root->fs, IDS_UNIXFS); + load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_UNIXFS); lstrcpy(root->path, sSlash); @@ -1509,7 +1508,7 @@ #ifdef _SHELL_FOLDERS if (root->entry.etype == ET_SHELL) - load_string(root->entry.data.cFileName, IDS_DESKTOP); + load_string(root->entry.data.cFileName, sizeof(root->entry.data.cFileName)/sizeof(root->entry.data.cFileName[0]), IDS_DESKTOP); else #endif wsprintf(root->entry.data.cFileName, RS(b1,IDS_TITLEFMT), drv, root->fs); @@ -3865,7 +3864,7 @@ #endif #ifdef _SHELL_FOLDERS /* insert shell namespace button */ - load_string(b1, IDS_SHELL); + load_string(b1, sizeof(b1)/sizeof(b1[0]), IDS_SHELL); b1[lstrlen(b1)+1] = '\0'; SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b1); @@ -4720,18 +4719,18 @@ /* load column strings */ col = 1; - load_string(g_pos_names[col++], IDS_COL_NAME); - load_string(g_pos_names[col++], IDS_COL_SIZE); - load_string(g_pos_names[col++], IDS_COL_CDATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_NAME); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SIZE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_CDATE); #ifndef _NO_EXTENSIONS - load_string(g_pos_names[col++], IDS_COL_ADATE); - load_string(g_pos_names[col++], IDS_COL_MDATE); - load_string(g_pos_names[col++], IDS_COL_IDX); - load_string(g_pos_names[col++], IDS_COL_LINKS); -#endif - load_string(g_pos_names[col++], IDS_COL_ATTR); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ADATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_MDATE); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_IDX); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_LINKS); +#endif + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ATTR); #ifndef _NO_EXTENSIONS - load_string(g_pos_names[col++], IDS_COL_SEC); + load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SEC); #endif } Added: trunk/rosapps/applications/write/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/ja… ============================================================================== --- trunk/rosapps/applications/write/lang/ja-JP.rc (added) +++ trunk/rosapps/applications/write/lang/ja-JP.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -1,0 +1,26 @@ +/* + * Japanese language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * 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_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Wordpad ÌN®É¸sµÜµ½" +} Propchange: trunk/rosapps/applications/write/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/rsrc.rc… ============================================================================== --- trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] Wed Oct 1 09:14:39 2008 @@ -27,6 +27,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008