Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 26391: Make disk ident work on qemu. Revision to bootcd method.
by arty＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: arty Date: Wed Apr 18 10:55:07 2007 New Revision: 26391 URL: http://svn.reactos.org/svn/reactos?rev=26391&view=rev Log: Make disk ident work on qemu. Revision to bootcd method. Added: branches/powerpc/reactos/tools/ppc.lost+found/hfsmap.lst Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c branches/powerpc/reactos/tools/ppc.lost+found/bootcd Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Wed Apr 18 10:55:07 2007 @@ -5,7 +5,7 @@ int prep_serial = 0x800003f8; -void sync() { __asm__("sync\n\teieio"); } +void sync() { __asm__("eieio\n\tsync"); } /* Simple serial */ @@ -63,7 +63,6 @@ void PpcPrepVideoPrepareForReactOS() { } - ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize ) { @@ -77,7 +76,8 @@ void PpcPrepInit() { MachVtbl.ConsPutChar = PpcPrepPutChar; - printf("Breathing ...\n"); + + printf("Serial on\n"); ide_setup( &ide1_desc ); Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h Wed Apr 18 10:55:07 2007 @@ -6,7 +6,7 @@ void sync(); void PpcPrepInit(); void ide_seek( void *extension, int low, int high ); -void ide_read( void *extension, char *buffer, int bytes ); +int ide_read( void *extension, char *buffer, int bytes ); void ide_setup( void *extension ); #endif//FREELDR_ARCH_POWERPC_PREP_H Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c Wed Apr 18 10:55:07 2007 @@ -30,12 +30,21 @@ /* Wait for ready */ void ide_rdy( void *extension ) { idectl_desc *desc = (idectl_desc *)extension; - while( !(GetPhysByte(desc->port+7) & 8) ) sync(); + while( !(GetPhysByte(desc->port+7) & 0x40) ) sync(); +} + +void ide_drq( void *extension ) { + idectl_desc *desc = (idectl_desc *)extension; + while( !(GetPhysByte(desc->port+7) & 0x08) ) sync(); } void ide_bsy( void *extension ) { idectl_desc *desc = (idectl_desc *)extension; - while( GetPhysByte(desc->port+7) & 0x80 ) sync(); + while( GetPhysByte(desc->port+7) & 0x80 ) + { + printf("Waiting for not busy\n"); + sync(); + } } int ide_read( void *extension, char *buffer, int bytes ) { @@ -52,10 +61,7 @@ SetPhysByte(desc->port+6, desc->seek_head | 0xa0); SetPhysByte(desc->port+7, 0x20); - sync(); - for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) { - ide_rdy( extension ); in = GetPhysHalf(desc->port); databuf[inwords] = SWAP_W(in); sync(); @@ -74,14 +80,18 @@ short *databuf = (short *)identbuffer, in; int inwords; + ide_rdy( extension ); ide_bsy( extension ); + desc->bytespersec = 512; + SetPhysByte(desc->port+2, 1); + SetPhysByte(desc->port+3, 0); + SetPhysByte(desc->port+4, 0); + SetPhysByte(desc->port+5, 0); + SetPhysByte(desc->port+6, 0); SetPhysByte(desc->port+7, 0xec); - desc->bytespersec = 512; - - sync(); + ide_drq( extension ); for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) { - ide_rdy( extension ); in = GetPhysHalf(desc->port); databuf[inwords] = SWAP_W(in); sync(); Modified: branches/powerpc/reactos/tools/ppc.lost+found/bootcd URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/bootcd (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/bootcd Wed Apr 18 10:55:07 2007 @@ -7,8 +7,9 @@ CD=output-ppc/ppcboot I=$CD/install +TOOLS=tools/ppc.lost+found -tools/ppc.lost+found/link-freeldr +$TOOLS/link-freeldr mkdir -p $I cp freeldr.elf $I/yaboot @@ -16,5 +17,5 @@ mkisofs -chrp-boot -U -part -hfs -T -r -l -J -A "ReactOS" -sysid PPC \ -V "ReactOS" -volset 1 -volset-size 1 -volset-seqno 1 \ - -hfs-volid "ReactOS" -hfs-bless $I -map hfsmap.lst \ + -hfs-volid "ReactOS" -hfs-bless $I -map $TOOLS/hfsmap.lst \ -no-desktop -allow-multidot -o ppcboot.iso $CD Added: branches/powerpc/reactos/tools/ppc.lost+found/hfsmap.lst URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/hfsmap.lst (added) +++ branches/powerpc/reactos/tools/ppc.lost+found/hfsmap.lst Wed Apr 18 10:55:07 2007 @@ -1,0 +1,12 @@ +# ext. xlate creator type comment +.hqx Ascii 'BnHx' 'TEXT' "BinHex file" +.sit Raw 'SIT!' 'SITD' "StuffIT Expander" +.mov Raw 'TVOD' 'MooV' "QuickTime Movie" +.deb Raw 'Debn' 'bina' "Debian package" +.bin Raw 'ddsk' 'DDim' "Floppy or ramdisk image" +.img Raw 'ddsk' 'DDim' "Floppy or ramdisk image" +.b Raw 'UNIX' 'tbxi' "bootstrap" +yaboot Raw 'UNIX' 'boot' "bootstrap" +vmlinux Raw 'UNIX' 'boot' "bootstrap" +.conf Raw 'UNIX' 'conf' "bootstrap" +* Ascii '????' '????' "Text file"

1 0

[cwittich] 26390: forgot to commit this file
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 06:50:29 2007 New Revision: 26390 URL: http://svn.reactos.org/svn/reactos?rev=26390&view=rev Log: forgot to commit this file Added: trunk/reactos/dll/directx/d3d9/d3d9.rbuild Added: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (added) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Wed Apr 18 06:50:29 2007 @@ -1,0 +1,5 @@ +<module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll"> + <importlibrary definition="d3d9.def" /> + <file>d3d9.c</file> + <file>d3d9.rc</file> +</module>

1 0

[cwittich] 26389: fix build of d3d9.dll and add it to bootcd
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 06:40:09 2007 New Revision: 26389 URL: http://svn.reactos.org/svn/reactos?rev=26389&view=rev Log: fix build of d3d9.dll and add it to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/directx.rbuild 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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Apr 18 06:40:09 2007 @@ -114,6 +114,7 @@ dll\directx\dxdiagn\dxdiagn.dll 1 dll\directx\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 +dll\directx\d3d9\d3d9.dll 1 dll\directx\devenum\devenum.dll 1 dll\keyboard\kbdbe\kbdbe.dll 1 Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Wed Apr 18 06:40:09 2007 @@ -1,39 +1,41 @@ #include <windows.h> #include "d3d9.h" +#include <debug.h> + HRESULT DLLAPI Direct3DShaderValidatorCreate9(void) { - OutputDebugString("Direct3DShaderValidatorCreate9 not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI PSGPError(void) { - OutputDebugString("PSGPError not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI PSGPSampleTexture(void) { - OutputDebugString("PSGPSampleTexture not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI DebugSetLevel(void) { - OutputDebugString("DebugSetLevel not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI DebugSetMute(DWORD dw1) { - OutputDebugString("DebugSetMute not implemented."); + UNIMPLEMENTED return 0; } DWORD DLLAPI Direct3DCreate9( UINT SDKVersion ) { - OutputDebugString("Direct3DCreate9 not implemented."); + UNIMPLEMENTED return 0; } Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild (original) +++ trunk/reactos/dll/directx/directx.rbuild Wed Apr 18 06:40:09 2007 @@ -28,5 +28,8 @@ <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" /> </directory> +<directory name="d3d9"> + <xi:include href="d3d9/d3d9.rbuild" /> +</directory> </group>

1 0

[cwittich] 26388: include npfs.h before debug.h - this fixes compilation with MSVC
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 05:51:27 2007 New Revision: 26388 URL: http://svn.reactos.org/svn/reactos?rev=26388&view=rev Log: include npfs.h before debug.h - this fixes compilation with MSVC Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.c trunk/reactos/drivers/filesystems/npfs/rw.c trunk/reactos/drivers/filesystems/npfs/volume.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c Wed Apr 18 05:51:27 2007 @@ -9,10 +9,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.c (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volume.c (original) +++ trunk/reactos/drivers/filesystems/npfs/volume.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES *****************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS ****************************************************************/

1 0

[cwittich] 26387: fix formatting (no code changes)
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 05:25:28 2007 New Revision: 26387 URL: http://svn.reactos.org/svn/reactos?rev=26387&view=rev Log: fix formatting (no code changes) Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.c trunk/reactos/drivers/filesystems/npfs/npfs.h trunk/reactos/drivers/filesystems/npfs/rw.c trunk/reactos/drivers/filesystems/npfs/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… Modified: trunk/reactos/drivers/filesystems/npfs/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v…

1 0

[cwittich] 26386: don't cast HBITMAP to HICON in when type is IMAGE_BITMAP
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 04:55:04 2007 New Revision: 26386 URL: http://svn.reactos.org/svn/reactos?rev=26386&view=rev Log: don't cast HBITMAP to HICON in when type is IMAGE_BITMAP Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Wed Apr 18 04:55:04 2007 @@ -763,7 +763,7 @@ } } HeapFree(GetProcessHeap(), 0, bi); - return (HICON)res; + return res; } case IMAGE_ICON: {

1 0

[cwittich] 26385: take care of DIB_PAL_COLORS in NtGdiStretchDIBits
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 04:38:36 2007 New Revision: 26385 URL: http://svn.reactos.org/svn/reactos?rev=26385&view=rev Log: take care of DIB_PAL_COLORS in NtGdiStretchDIBits Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Wed Apr 18 04:38:36 2007 @@ -575,6 +575,7 @@ { HBITMAP hBitmap, hOldBitmap; HDC hdcMem; + HPALETTE hPal = NULL; if (!Bits || !BitsInfo) { @@ -586,6 +587,12 @@ hBitmap = NtGdiCreateCompatibleBitmap(hDC, BitsInfo->bmiHeader.biWidth, BitsInfo->bmiHeader.biHeight); hOldBitmap = NtGdiSelectObject(hdcMem, hBitmap); + + if(Usage == DIB_PAL_COLORS) + { + hPal = NtGdiGetCurrentObject(hDC, OBJ_PAL); + hPal = NtGdiSelectPalette(hdcMem, hPal, FALSE); + } if (BitsInfo->bmiHeader.biCompression == BI_RLE4 || BitsInfo->bmiHeader.biCompression == BI_RLE8) @@ -613,6 +620,9 @@ NtGdiStretchBlt(hDC, XDest, YDest, DestWidth, DestHeight, hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, SrcWidth, SrcHeight, ROP, 0); + + if(hPal) + NtGdiSelectPalette(hdcMem, hPal, FALSE); NtGdiSelectObject(hdcMem, hOldBitmap); NtGdiDeleteObjectApp(hdcMem);

1 0

[cwittich] 26384: fix console font
by cwittich＠svn.reactos.org 17 Apr '07

17 Apr '07

Author: cwittich Date: Wed Apr 18 03:38:39 2007 New Revision: 26384 URL: http://svn.reactos.org/svn/reactos?rev=26384&view=rev Log: fix console font Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Wed Apr 18 03:38:39 2007 @@ -860,7 +860,7 @@ PWCHAR To; BYTE LastAttribute, Attribute; ULONG CursorX, CursorY, CursorHeight; - HBRUSH CursorBrush, OldBrush; + HBRUSH CursorBrush, OldBrush, BackgroundBrush; HFONT OldFont; Buff = Console->ActiveBuffer; @@ -881,6 +881,10 @@ OldFont = SelectObject(hDC, GuiData->Font); + + BackgroundBrush = CreateSolidBrush(GuiData->ScreenBackground); + FillRect(hDC, rc, BackgroundBrush); + DeleteObject(BackgroundBrush); for (Line = TopLine; Line <= BottomLine; Line++) {

1 0

[gedmurphy] 26383: - fix GetObject call for bitmaps - Windows returns the number of bytes copied, not the size of the struct. - fix NtGdiGetObject, 'count' is now irrelevant - this breaks CopyImage, but it's broken anyway so it can wait until tomorrow.
by gedmurphy＠svn.reactos.org 17 Apr '07

17 Apr '07

Author: gedmurphy Date: Wed Apr 18 02:58:34 2007 New Revision: 26383 URL: http://svn.reactos.org/svn/reactos?rev=26383&view=rev Log: - fix GetObject call for bitmaps - Windows returns the number of bytes copied, not the size of the struct. - fix NtGdiGetObject, 'count' is now irrelevant - this breaks CopyImage, but it's broken anyway so it can wait until tomorrow. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Wed Apr 18 02:58:34 2007 @@ -1564,24 +1564,18 @@ if( buffer == NULL ) return sizeof(BITMAP); if (Count < sizeof(BITMAP)) return 0; + Count = sizeof(BITMAP); + if(bmp->dib) { - - if(Count < (INT) sizeof(DIBSECTION)) - { - if (Count > (INT) sizeof(BITMAP)) Count = sizeof(BITMAP); - } - else - { - if (Count > (INT) sizeof(DIBSECTION)) Count = sizeof(DIBSECTION); - } memcpy(buffer, bmp->dib, Count); + /* Windows returns bytes copied, not DIBSECTION size */ return Count; } else { BITMAP Bitmap; - if (Count > (INT) sizeof(BITMAP)) Count = sizeof(BITMAP); + Bitmap.bmType = 0; Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx; Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Apr 18 02:58:34 2007 @@ -1841,20 +1841,20 @@ return Ret; } - if ((RetCount) && (count)) - { - SafeBuf = ExAllocatePoolWithTag(PagedPool, count, TAG_GDIOBJ); + if (RetCount) + { + SafeBuf = ExAllocatePoolWithTag(PagedPool, RetCount, TAG_GDIOBJ); if(!SafeBuf) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return Ret; } - Ret = IntGdiGetObject(handle, count, SafeBuf); + Ret = IntGdiGetObject(handle, RetCount, SafeBuf); _SEH_TRY { /* pointer already probed! */ - RtlCopyMemory(buffer, SafeBuf, count); + RtlCopyMemory(buffer, SafeBuf, RetCount); } _SEH_HANDLE {

1 0

[dgorbachev] 26382: Simplified Chinese translation by zhangbing (bug #2175).
by dgorbachev＠svn.reactos.org 17 Apr '07

17 Apr '07

Author: dgorbachev Date: Wed Apr 18 00:38:03 2007 New Revision: 26382 URL: http://svn.reactos.org/svn/reactos?rev=26382&view=rev Log: Simplified Chinese translation by zhangbing (bug #2175). Added: trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc Added: trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc Wed Apr 18 00:38:03 2007 @@ -1,0 +1,108 @@ +/* + * WineMine (Simplified Chinese resources) + * + * Copyright 2007 zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "resource.h" + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "É¨À×" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "ÓÎÏ·(&O)" { + MENUITEM "¿ª¾Ö(&N)", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "±ê¼Ç(?)(&M)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "³õ¼¶(&B)", IDM_BEGINNER + MENUITEM "ÖÐ¼¶(&A)", IDM_ADVANCED + MENUITEM "¸ß¼¶(&E)", IDM_EXPERT + MENUITEM "×Ô¶¨Òå(&C)...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "ÍË³ö(&X)", IDM_EXIT + } + POPUP "ÐÅÏ¢(&I)" { + MENUITEM "É¨À×Ó¢ÐÛ°ñ(&F)...", IDM_TIMES + MENUITEM "¹ØÓÚÉ¨À×(&A)...", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +FONT 9, "MS Shell Dlg" +CAPTION "É¨À×Ó¢ÐÛ°ñ" +{ + GROUPBOX "×î¸ß¼ÍÂ¼", IDNONE, 10, 10, 140, 45 + LTEXT "³õ¼¶", IDNONE, 20, 20, 40, 8 + LTEXT "ÖÐ¼¶", IDNONE, 20, 30, 40, 8 + LTEXT "¸ß¼¶", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "È·¶¨", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +FONT 9, "MS Shell Dlg" +CAPTION "Ë¢ÐÂ¼ÍÂ¼!" +{ + LTEXT "ÒÑÆÆ¼ÍÂ¼,ÇëÊäÈëÄãµÄÃû×Ö", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "È·¶¨", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +FONT 9, "MS Shell Dlg" +CAPTION "×Ô¶¨ÒåÀ×Çø" +{ + LTEXT "¸ß¶È", IDNONE, 5, 5, 30, 10 + LTEXT "¿í¶È", IDNONE, 5, 35, 30, 10 + LTEXT "À×Êý", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "È·¶¨", IDOK, 40, 30, 50, 15 + PUSHBUTTON "È¡Ïû", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +FONT 9, "MS Shell Dlg" +CAPTION "¹ØÓÚÉ¨À×" +{ + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "°æÈ¨ 2000, Joshua Thielen", IDNONE, 35, 20, 100, 10 + LTEXT "under the Wine license", IDNONE, 35, 30, 100, 10 + //LTEXT "ÖÐÎÄ·Òë:ÕÅ±ù\n(ezb@mail.gywb.cn)", IDNONE, 35, 39, 100, 25 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "È·¶¨", IDOK, 50, 60, 55, 15 +} Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc Wed Apr 18 00:38:03 2007 @@ -23,3 +23,4 @@ #include "lang/pl-PL.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc"

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