Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 15859: speed up 24bpp small fill and fill
by greatlrd＠svn.reactos.com 11 Jun '05

11 Jun '05

speed up 24bpp small fill and fill Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-11 12:13:28 UTC (rev 15858) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-11 13:36:00 UTC (rev 15859) @@ -392,11 +392,97 @@ { ULONG DestY; +#ifdef _M_IX86 + PBYTE xaddr = DestSurface->pvScan0 + DestRect->top * DestSurface->lDelta + (DestRect->left << 1) + DestRect->left; + PBYTE addr; + ULONG Count; + ULONG xCount=DestRect->right - DestRect->left; + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + Count = xCount; + addr = xaddr; + xaddr = (PBYTE)((ULONG_PTR)addr + DestSurface->lDelta); + + if (Count < 8) + { + /* For small fills, don't bother doing anything fancy */ + while (Count--) + { + *(PUSHORT)(addr) = color; + addr += 2; + *(addr) = color >> 16; + addr += 1; + } + } + else + { + /* Align to 4-byte address */ + while (0 != ((ULONG_PTR) addr & 0x3)) + { + *(PUSHORT)(addr) = color; + addr += 2; + *(addr) = color >> 16; + addr += 1; + Count--; + } + /* If the color we need to fill with is 0ABC, then the final mem pattern + * (note little-endianness) would be: + * + * |C.B.A|C.B.A|C.B.A|C.B.A| <- pixel borders + * |C.B.A.C|B.A.C.B|A.C.B.A| <- ULONG borders + * + * So, taking endianness into account again, we need to fill with these + * ULONGs: CABC BCAB ABCA */ + + /* This is about 30% faster than the generic C code below */ + __asm__ __volatile__ ( +" movl %1, %%ecx\n" +" andl $0xffffff, %%ecx\n" /* 0ABC */ +" movl %%ecx, %%ebx\n" /* Construct BCAB in ebx */ +" shrl $8, %%ebx\n" +" movl %%ecx, %%eax\n" +" shll $16, %%eax\n" +" orl %%eax, %%ebx\n" +" movl %%ecx, %%edx\n" /* Construct ABCA in edx */ +" shll $8, %%edx\n" +" movl %%ecx, %%eax\n" +" shrl $16, %%eax\n" +" orl %%eax, %%edx\n" +" movl %%ecx, %%eax\n" /* Construct CABC in eax */ +" shll $24, %%eax\n" +" orl %%ecx, %%eax\n" +" movl %2, %%ecx\n" /* Load count */ +" shr $2, %%ecx\n" +" movl %3, %%edi\n" /* Load dest */ +".FL1:\n" +" movl %%eax, (%%edi)\n" /* Store 4 pixels, 12 bytes */ +" movl %%ebx, 4(%%edi)\n" +" movl %%edx, 8(%%edi)\n" +" addl $12, %%edi\n" +" dec %%ecx\n" +" jnz .FL1\n" +" movl %%edi, %0\n" + : "=m"(addr) + : "m"(color), "m"(Count), "m"(addr) + : "%eax", "%ebx", "%ecx", "%edx", "%edi"); + Count = Count & 0x03; + while (0 != Count--) + { + *(PUSHORT)(addr) = color; + addr += 2; + *(addr) = color >> 16; + addr += 1; + } + } + } +#else + + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) { DIB_24BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color); } - +#endif return TRUE; }

1 0

[greatlrd] 15858: Speed up Fill and Small fill. for 16bpp
by greatlrd＠svn.reactos.com 11 Jun '05

11 Jun '05

Speed up Fill and Small fill. for 16bpp Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-11 10:19:33 UTC (rev 15857) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-11 12:13:28 UTC (rev 15858) @@ -47,7 +47,7 @@ /* This is about 10% faster than the generic C code below */ LONG Count = x2 - x1; - __asm__( + __asm__ __volatile__ ( " cld\n" " mov %0, %%eax\n" " shl $16, %%eax\n" @@ -344,6 +344,24 @@ PULONG DestBits; ULONG RoundedRight; + /* + switch (BltInfo->Rop4) + { + case ROP4_PATCOPY: + if (!BltInfo->PatternSurface) + { + Pattern = BltInfo->Brush->iSolidColor | (BltInfo->Brush->iSolidColor << 16); + DIB_16BPP_ColorFill(BltInfo->DestSurface, BltInfo->DestRect, Pattern); + return TRUE; + } + + break; + + default: + break; + } +*/ + UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); @@ -430,10 +448,47 @@ DIB_16BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) { ULONG DestY; + +#ifdef _M_IX86 + /* This is about 10% faster than the generic C code below */ + ULONG delta = DestSurface->lDelta; + ULONG width = (DestRect->right - DestRect->left) ; + PULONG pos = (PULONG) (DestSurface->pvScan0 + DestRect->top * delta + (DestRect->left<<1)); + + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + __asm__ __volatile__ ( + " cld\n" + " mov %0, %%eax\n" + " mov %%eax, %%ecx\n" + " shl $16, %%eax\n" + " andl $0xffff, %%ecx\n" /* If the pixel value is "abcd", put "abcdabcd" in %eax */ + " or %%ecx, %%eax\n" + " test $0x03, %%edi\n" /* Align to fullword boundary */ + " jz .FL1\n" + " stosw\n" + " dec %1\n" + " jz .FL2\n" + ".FL1:\n" + " mov %1,%%ecx\n" /* Setup count of fullwords to fill */ + " shr $1,%%ecx\n" + " rep stosl\n" /* The actual fill */ + " test $0x01, %1\n" /* One left to do at the right side? */ + " jz .FL2\n" + " stosw\n" + ".FL2:\n" + : /* no output */ + : "r"(color), "r"(width), "D"(pos) + : "%eax", "%ecx"); + pos =(PULONG)((ULONG_PTR)pos + delta); + } +#else /* _M_IX86 */ + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) { DIB_16BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); } +#endif return TRUE; } /*

1 0

[greatlrd] 15857: adding __volatile__ on all DIB32 inline asm to ensure it doesn't get modified when optimizations are enabled
by greatlrd＠svn.reactos.com 11 Jun '05

11 Jun '05

adding __volatile__ on all DIB32 inline asm to ensure it doesn't get modified when optimizations are enabled Thx w3seek Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-11 09:53:14 UTC (rev 15856) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-11 10:19:33 UTC (rev 15857) @@ -49,7 +49,7 @@ PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; PDWORD addr = (PDWORD)byteaddr + x1; - __asm__( + __asm__ __volatile__ ( " cld\n" " mov %0, %%eax\n" " test $0x03, %%edi\n" /* Align to fullword boundary */ @@ -713,7 +713,7 @@ for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) { - __asm__( + __asm__ __volatile__ ( " cld\n" " mov %0, %%eax\n" " test $0x03, %%edi\n" /* Align to fullword boundary */

1 0

[greatlrd] 15856: Fix align 4 problem with color fill and hline.
by greatlrd＠svn.reactos.com 11 Jun '05

11 Jun '05

Fix align 4 problem with color fill and hline. Now OARCH=pentium2 working with 32bpp Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-10 22:54:11 UTC (rev 15855) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-11 09:53:14 UTC (rev 15856) @@ -48,10 +48,29 @@ LONG cx = (x2 - x1) ; PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; PDWORD addr = (PDWORD)byteaddr + x1; - memset4(addr, c, cx); + + __asm__( +" cld\n" +" mov %0, %%eax\n" +" test $0x03, %%edi\n" /* Align to fullword boundary */ +" jnz .L1\n" +" mov %1,%%ecx\n" /* Setup count of fullwords to fill */ +" rep stosl\n" /* The actual fill */ +" jz .L2\n" +".L1:\n" +" mov %%eax, %%ecx\n" +" stosw\n" +" sub $0x04,%1\n" +" mov %1,%%ecx\n" /* Setup count of fullwords to fill */ +" rep stosl\n" /* The actual fill */ +" shr $0x08,%%eax\n" +" stosw\n" +".L2:\n" + : /* no output */ + : "r"(c), "r"(cx), "D"(addr) + : "%eax", "%ecx"); + - - } #else VOID @@ -693,9 +712,28 @@ pos = (PULONG) (DestSurface->pvScan0 + DestRect->top * delta + (DestRect->left<<2)); for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) - { - memset4( ((PDWORD)(pos)), color, width); - pos =(PULONG)((ULONG_PTR)pos + delta); + { + __asm__( + " cld\n" + " mov %0, %%eax\n" + " test $0x03, %%edi\n" /* Align to fullword boundary */ + " jnz .FL1\n" + " mov %1,%%ecx\n" /* Setup count of fullwords to fill */ + " rep stosl\n" /* The actual fill */ + " jz .FL2\n" + ".FL1:\n" + " mov %%eax, %%ecx\n" + " stosw\n" + " sub $0x04,%1\n" + " mov %1,%%ecx\n" /* Setup count of fullwords to fill */ + " rep stosl\n" /* The actual fill */ + " shr $0x08,%%eax\n" + " stosw\n" + ".FL2:\n" + : /* no output */ + : "r"(color), "r"(width), "D"(pos) + : "%eax", "%ecx"); + pos =(PULONG)((ULONG_PTR)pos + delta); } #else

1 0

[hpoussin] 15855: Set svn:eol-style property to native
by hpoussin＠svn.reactos.com 10 Jun '05

10 Jun '05

Set svn:eol-style property to native Property changes on: trunk/reactos/ntoskrnl/io/disk.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/io/efi.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/io/plugplay.c ___________________________________________________________________ Name: svn:eol-style + native

1 0

[ion] 15854: Support QEMU Hardware Acceleration
by ion＠svn.reactos.com 10 Jun '05

10 Jun '05

Support QEMU Hardware Acceleration Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-06-10 21:25:55 UTC (rev 15853) +++ trunk/reactos/bootdata/hivesys.inf 2005-06-10 21:46:16 UTC (rev 15854) @@ -941,7 +941,23 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.YResolution",0x00010001,480 +; QEMU SVGA Driver +HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","ErrorControl",0x000100 01,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","Group",0x00000000,"Vid eo Save SVGA" +HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","ImagePath",0x00020000, "system32\drivers\cl54xx.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","Start",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","Type",0x00010001,0x000 00001 +HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","Tag",0x00010001,0x0000 000C +HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX\Device0","InstalledDispl ayDrivers",0x00010000,"CL54XX" + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.VgaCompatible",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.VRefresh",0x00010001,60 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.BitsPerPel",0x00010001,16 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.Interlaced",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.XResolution",0x00010001,800 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.YResolution",0x00010001,600 + ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0 x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save"

1 0

[hpoussin] 15853: Add a pointer to the root hub PDO in the usb controller device extension
by hpoussin＠svn.reactos.com 10 Jun '05

10 Jun '05

Add a pointer to the root hub PDO in the usb controller device extension Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h --- trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-06-10 21:13:15 UTC (rev 15852) +++ trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-06-10 21:25:55 UTC (rev 15853) @@ -45,6 +45,7 @@ //CHAR MiniPortDeviceExtension[1]; BOOLEAN IsFDO; struct pci_dev * pdev; + PDEVICE_OBJECT RootHubPdo; } OHCI_DEVICE_EXTENSION, *POHCI_DEVICE_EXTENSION;

1 0

[fireball] 15852: Add scrollbar to timezone selection comboboxes. Patch by unC0Rr.
by fireball＠svn.reactos.com 10 Jun '05

10 Jun '05

Add scrollbar to timezone selection comboboxes. Patch by unC0Rr. Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc Modified: trunk/reactos/lib/syssetup/syssetup_De.rc Modified: trunk/reactos/lib/syssetup/syssetup_En.rc Modified: trunk/reactos/lib/syssetup/syssetup_Fr.rc _____ Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc --- trunk/reactos/lib/syssetup/syssetup_Cz.rc 2005-06-10 20:41:26 UTC (rev 15851) +++ trunk/reactos/lib/syssetup/syssetup_Cz.rc 2005-06-10 21:13:15 UTC (rev 15852) @@ -119,7 +119,7 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, - CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END _____ Modified: trunk/reactos/lib/syssetup/syssetup_De.rc --- trunk/reactos/lib/syssetup/syssetup_De.rc 2005-06-10 20:41:26 UTC (rev 15851) +++ trunk/reactos/lib/syssetup/syssetup_De.rc 2005-06-10 21:13:15 UTC (rev 15852) @@ -121,7 +121,7 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Zeitzone", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, - CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "&Uhr automatisch auf Sommer-/Winterzeit umstellen", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END _____ Modified: trunk/reactos/lib/syssetup/syssetup_En.rc --- trunk/reactos/lib/syssetup/syssetup_En.rc 2005-06-10 20:41:26 UTC (rev 15851) +++ trunk/reactos/lib/syssetup/syssetup_En.rc 2005-06-10 21:13:15 UTC (rev 15852) @@ -121,7 +121,7 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, - CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END _____ Modified: trunk/reactos/lib/syssetup/syssetup_Fr.rc --- trunk/reactos/lib/syssetup/syssetup_Fr.rc 2005-06-10 20:41:26 UTC (rev 15851) +++ trunk/reactos/lib/syssetup/syssetup_Fr.rc 2005-06-10 21:13:15 UTC (rev 15852) @@ -122,7 +122,7 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, - CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END

1 0

[mf] 15851: Patch from WineHQ:
by mf＠svn.reactos.com 10 Jun '05

10 Jun '05

Patch from WineHQ: Mike McCormack <mike(a)codeweavers.com> Fix more warnings. Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-09 20:40:44 UTC (rev 15850) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-10 20:41:26 UTC (rev 15851) @@ -154,10 +154,7 @@ } ChildWnd; -extern void WineLicense(HWND hwnd); -extern void WineWarranty(HWND hwnd); - #ifdef __WINE__ /* functions in unixcalls.c */ @@ -211,9 +208,9 @@ static void get_path(Entry* dir, PTSTR path); static void format_date(const FILETIME* ft, TCHAR* buffer, int visible_cols); -LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); -LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); -LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); +static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); +static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); +static LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); /* globals */ @@ -723,7 +720,7 @@ } -HRESULT name_from_pidl(IShellFolder* folder, LPITEMIDLIST pidl, LPTSTR buffer, int len, SHGDNF flags) +static HRESULT name_from_pidl(IShellFolder* folder, LPITEMIDLIST pidl, LPTSTR buffer, int len, SHGDNF flags) { STRRET str; @@ -739,7 +736,7 @@ } -HRESULT path_from_pidlA(IShellFolder* folder, LPITEMIDLIST pidl, LPSTR buffer, int len) +static HRESULT path_from_pidlA(IShellFolder* folder, LPITEMIDLIST pidl, LPSTR buffer, int len) { STRRET str; @@ -755,7 +752,7 @@ return hr; } -HRESULT path_from_pidlW(IShellFolder* folder, LPITEMIDLIST pidl, LPWSTR buffer, int len) +static HRESULT path_from_pidlW(IShellFolder* folder, LPITEMIDLIST pidl, LPWSTR buffer, int len) { STRRET str; @@ -827,7 +824,7 @@ } -HICON extract_icon(IShellFolder* folder, LPCITEMIDLIST pidl) +static HICON extract_icon(IShellFolder* folder, LPCITEMIDLIST pidl) { IExtractIcon* pExtract; @@ -1606,7 +1603,7 @@ static HHOOK hcbthook; static ChildWnd* newchild = NULL; -LRESULT CALLBACK CBTProc(int code, WPARAM wparam, LPARAM lparam) +static LRESULT CALLBACK CBTProc(int code, WPARAM wparam, LPARAM lparam) { if (code==HCBT_CREATEWND && newchild) { ChildWnd* child = newchild; @@ -1971,7 +1968,7 @@ FALSE }; -void frame_get_clientspace(HWND hwnd, PRECT prect) +static void frame_get_clientspace(HWND hwnd, PRECT prect) { RECT rt; @@ -2072,7 +2069,7 @@ resize_frame_client(hwnd); } -BOOL activate_drive_window(LPCTSTR path) +static BOOL activate_drive_window(LPCTSTR path) { TCHAR drv1[_MAX_DRIVE], drv2[_MAX_DRIVE]; HWND child_wnd; @@ -2100,7 +2097,7 @@ return FALSE; } -BOOL activate_fs_window(LPCTSTR filesys) +static BOOL activate_fs_window(LPCTSTR filesys) { HWND child_wnd; @@ -2123,7 +2120,7 @@ return FALSE; } -LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) +static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; @@ -2821,7 +2818,7 @@ _stprintf(buffer, sLongNumFmt, bytes); } -static void set_space_status() +static void set_space_status(void) { ULARGE_INTEGER ulFreeBytesToCaller, ulTotalBytes, ulFreeBytes; TCHAR fmt[64], b1[64], b2[64], buffer[BUFFER_LEN]; @@ -3743,7 +3740,7 @@ } -static void create_drive_bar() +static void create_drive_bar(void) { TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}; #ifndef _NO_EXTENSIONS @@ -3809,7 +3806,7 @@ } } -static void refresh_drives() +static void refresh_drives(void) { RECT rect; @@ -3826,7 +3823,7 @@ } -BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow) +static BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow) { HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow); @@ -3839,7 +3836,7 @@ } #ifdef UNICODE -BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow) +static BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow) { HINSTANCE hinst = ShellExecuteA(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow); @@ -3853,7 +3850,7 @@ #endif -BOOL launch_entry(Entry* entry, HWND hwnd, UINT nCmdShow) +static BOOL launch_entry(Entry* entry, HWND hwnd, UINT nCmdShow) { TCHAR cmd[MAX_PATH]; @@ -4072,7 +4069,7 @@ #endif } -IContextMenu* CtxMenu_query_interfaces(IContextMenu* pcm1) +static IContextMenu* CtxMenu_query_interfaces(IContextMenu* pcm1) { IContextMenu* pcm = NULL; @@ -4158,7 +4155,7 @@ } -LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) +static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { ChildWnd* child = (ChildWnd*) GetWindowLong(hwnd, GWL_USERDATA); ASSERT(child); @@ -4542,7 +4539,7 @@ } -LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) +static LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { ChildWnd* child = (ChildWnd*) GetWindowLong(GetParent(hwnd), GWL_USERDATA); Pane* pane = (Pane*) GetWindowLong(hwnd, GWL_USERDATA); @@ -4670,7 +4667,7 @@ } -void show_frame(HWND hwndParent, int cmdshow) +static void show_frame(HWND hwndParent, int cmdshow) { const static TCHAR sMDICLIENT[] = {'M','D','I','C','L','I','E','N','T','\0'}; @@ -4768,7 +4765,7 @@ UpdateWindow(Globals.hMainWnd); } -void ExitInstance() +static void ExitInstance(void) { #ifdef _SHELL_FOLDERS (*Globals.iDesktop->lpVtbl->Release)(Globals.iDesktop); @@ -4779,6 +4776,7 @@ ImageList_Destroy(Globals.himl); } +#ifdef _NO_EXTENSIONS /* search for already running win[e]files */ @@ -4799,7 +4797,7 @@ } /* search for window of given class name to allow only one running instance */ -int find_window_class(LPCTSTR classname) +static int find_window_class(LPCTSTR classname) { EnumWindows(EnumWndProc, (LPARAM)classname); @@ -4809,8 +4807,9 @@ return 0; } +#endif -int winefile_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow) +static int winefile_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow) { MSG msg; _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-06-09 20:40:44 UTC (rev 15850) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-06-10 20:41:26 UTC (rev 15851) @@ -145,6 +145,9 @@ extern WINEFILE_GLOBALS Globals; #ifdef __WINE__ +extern void WineLicense(HWND hwnd); +extern void WineWarranty(HWND hwnd); + #ifdef UNICODE extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); #else

1 0

[gvg] 15850: Re-apply fix to dib16bpp and fix the root cause
by gvg＠svn.reactos.com 09 Jun '05

09 Jun '05

Re-apply fix to dib16bpp and fix the root cause Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/eng/lineto.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 20:18:32 UTC (rev 15849) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-09 20:40:44 UTC (rev 15850) @@ -53,7 +53,7 @@ " shl $16, %%eax\n" " andl $0xffff, %0\n" /* If the pixel value is "abcd", put "abcdabcd" in %eax */ " or %0, %%eax\n" -" test $0x01, %%edi\n" /* Align to fullword boundary */ +" test $0x03, %%edi\n" /* Align to fullword boundary */ " jz .L1\n" " stosw\n" " dec %1\n" _____ Modified: trunk/reactos/subsys/win32k/eng/lineto.c --- trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-09 20:18:32 UTC (rev 15849) +++ trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-09 20:40:44 UTC (rev 15850) @@ -381,6 +381,11 @@ deltax = x2 - x1; deltay = y2 - y1; + if (0 == deltax && 0 == deltay) + { + return TRUE; + } + if (deltax < 0) { xchange = -1;

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