Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[tkreuzer] 58052: [GDI32_APITEST] Add tests for SetDIBitsToDevice

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 30 12:56:55 2012 New Revision: 58052 URL: http://svn.reactos.org/svn/reactos?rev=58052&view=rev Log: [GDI32_APITEST] Add tests for SetDIBitsToDevice Added: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Sun Dec 30 12:56:55 2012 @@ -53,6 +53,7 @@ SetBrushOrgEx.c SetDCPenColor.c SetDIBits.c + SetDIBitsToDevice.c SetMapMode.c SetPixel.c SetSysColors.c Added: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBitsT… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c (added) +++ trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] Sun Dec 30 12:56:55 2012 @@ -1,0 +1,513 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for SetDIBitsToDevice + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "init.h" + +static void +Test_SetDIBitsToDevice_Params() +{ + UCHAR ajBmiBuffer[sizeof(BITMAPINFO) + 4]; + PBITMAPINFO pbmi = (PBITMAPINFO)ajBmiBuffer; + ULONG aulBits[16]; + INT ret; + + /* Setup the bitmap info */ + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 2; + pbmi->bmiHeader.biHeight = -2; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 32; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biClrUsed = 0; + pbmi->bmiHeader.biClrImportant = 0; + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + NULL, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* test unaligned buffer */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + (BYTE*)aulBits + 1, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + /* test unaligned and huge scanline buffer */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2000000, // cScanLines, + (BYTE*)aulBits + 1, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* test unaligned illegal buffer */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + (BYTE*)0x7fffffff, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + -100, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + LONG_MAX, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 100, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 100, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 66, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 66); + ok_err(0xdeadc0de); + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 200, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 2000, // uStartScan, + 66, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 66); + ok_err(0xdeadc0de); + + /* Test pbmi == NULL */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + NULL, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* Test illegal bitmap info */ + pbmi->bmiHeader.biSize = 0; + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + +} + + +static void +Test_SetDIBitsToDevice() +{ + UCHAR ajBmiBuffer[sizeof(BITMAPINFO) + 4]; + PBITMAPINFO pbmi = (PBITMAPINFO)ajBmiBuffer; + ULONG aulBits[16]; + INT ret; + + /* Setup the bitmap info */ + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 2; + pbmi->bmiHeader.biHeight = -2; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 32; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biClrUsed = 0; + pbmi->bmiHeader.biClrImportant = 0; + + /* Set pixels */ + aulBits[0] = 0x11000000; + aulBits[1] = 0x00000011; + aulBits[2] = 0xFF000000; + aulBits[3] = 0x000000FF; + + + memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 2); + ok_hex(pulDIB32Bits[0], 0x11000000); + ok_hex(pulDIB32Bits[1], 0x00000011); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + ok_hex(pulDIB32Bits[4], 0xFF000000); + ok_hex(pulDIB32Bits[5], 0x000000FF); + ok_hex(pulDIB32Bits[6], 0x00000000); + ok_hex(pulDIB32Bits[7], 0x00000000); + + memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 1, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 2); + ok_hex(pulDIB32Bits[0], 0x00000000); + ok_hex(pulDIB32Bits[1], 0x00000000); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + ok_hex(pulDIB32Bits[4], 0x11000000); + ok_hex(pulDIB32Bits[5], 0x00000011); + ok_hex(pulDIB32Bits[6], 0x00000000); + ok_hex(pulDIB32Bits[7], 0x00000000); + ok_hex(pulDIB32Bits[8], 0xFF000000); + ok_hex(pulDIB32Bits[9], 0x000000FF); + ok_hex(pulDIB32Bits[10], 0x00000000); + ok_hex(pulDIB32Bits[11], 0x00000000); + + memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 1, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 1); + ok_hex(pulDIB32Bits[0], 0x00000000); + ok_hex(pulDIB32Bits[1], 0x00000000); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + ok_hex(pulDIB32Bits[4], 0x11000000); + ok_hex(pulDIB32Bits[5], 0x00000011); + ok_hex(pulDIB32Bits[6], 0x00000000); + ok_hex(pulDIB32Bits[7], 0x00000000); + + + memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 1, // uStartScan, + 1, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 1); + ok_hex(pulDIB32Bits[0], 0x11000000); + ok_hex(pulDIB32Bits[1], 0x00000011); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + ok_hex(pulDIB32Bits[4], 0x00000000); + ok_hex(pulDIB32Bits[5], 0x00000000); + ok_hex(pulDIB32Bits[6], 0x00000000); + ok_hex(pulDIB32Bits[7], 0x00000000); + + /*****************/ + + /* Use bottom-up bitmap */ + pbmi->bmiHeader.biHeight = 2; + + memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 2); + ok_hex(pulDIB32Bits[0], 0xFF000000); + ok_hex(pulDIB32Bits[1], 0x000000FF); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + ok_hex(pulDIB32Bits[4], 0x11000000); + ok_hex(pulDIB32Bits[5], 0x00000011); + ok_hex(pulDIB32Bits[6], 0x00000000); + ok_hex(pulDIB32Bits[7], 0x00000000); + + memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 1, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 2); + ok_hex(pulDIB32Bits[0], 0x00000000); + ok_hex(pulDIB32Bits[1], 0x00000000); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + ok_hex(pulDIB32Bits[4], 0xFF000000); + ok_hex(pulDIB32Bits[5], 0x000000FF); + ok_hex(pulDIB32Bits[6], 0x00000000); + ok_hex(pulDIB32Bits[7], 0x00000000); + ok_hex(pulDIB32Bits[8], 0x11000000); + ok_hex(pulDIB32Bits[9], 0x00000011); + ok_hex(pulDIB32Bits[10], 0x00000000); + ok_hex(pulDIB32Bits[11], 0x00000000); + + memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 1, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 1); + ok_hex(pulDIB32Bits[0], 0x00000000); + ok_hex(pulDIB32Bits[1], 0x00000000); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + ok_hex(pulDIB32Bits[4], 0x11000000); + ok_hex(pulDIB32Bits[5], 0x00000011); + ok_hex(pulDIB32Bits[6], 0x00000000); + ok_hex(pulDIB32Bits[7], 0x00000000); + + + memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 1, // uStartScan, + 1, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 1); + ok_hex(pulDIB32Bits[0], 0x11000000); + ok_hex(pulDIB32Bits[1], 0x00000011); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + ok_hex(pulDIB32Bits[4], 0x00000000); + ok_hex(pulDIB32Bits[5], 0x00000000); + ok_hex(pulDIB32Bits[6], 0x00000000); + ok_hex(pulDIB32Bits[7], 0x00000000); + +} + + +START_TEST(SetDIBitsToDevice) +{ + InitStuff(); + + Test_SetDIBitsToDevice_Params(); + Test_SetDIBitsToDevice(); + + +} Propchange: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sun Dec 30 12:56:55 2012 @@ -55,6 +55,7 @@ extern void func_SetBrushOrgEx(void); extern void func_SetDCPenColor(void); extern void func_SetDIBits(void); +extern void func_SetDIBitsToDevice(void); extern void func_SetMapMode(void); extern void func_SetPixel(void); extern void func_SetSysColors(void); @@ -113,6 +114,7 @@ { "SetBrushOrgEx", func_SetBrushOrgEx }, { "SetDCPenColor", func_SetDCPenColor }, { "SetDIBits", func_SetDIBits }, + { "SetDIBitsToDevice", func_SetDIBitsToDevice }, { "SetMapMode", func_SetMapMode }, { "SetPixel", func_SetPixel }, { "SetSysColors", func_SetSysColors },

11 years, 8 months

[tkreuzer] 58051: [DIBLIB] - Use memmove explicitly in Dib_BitBlt_SRCCOPY_EqSurf and use it for right-to-left copy as well.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 30 12:32:00 2012 New Revision: 58051 URL: http://svn.reactos.org/svn/reactos?rev=58051&view=rev Log: [DIBLIB] - Use memmove explicitly in Dib_BitBlt_SRCCOPY_EqSurf and use it for right-to-left copy as well. Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c branches/dib_rewrite/win32ss/gdi/diblib/DibLib.h Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] Sun Dec 30 12:32:00 2012 @@ -1,6 +1,7 @@ #include "DibLib.h" +/* This is a fast xlateless memmove version that can be used for R2L as well */ VOID FASTCALL Dib_BitBlt_SRCCOPY_EqSurf(PBLTDATA pBltData) @@ -16,7 +17,8 @@ cLines = pBltData->ulHeight; while (cLines--) { - memcpy(pjDestBase, pjSrcBase, cjWidth); + /* Use memmove to handle copying right-to-left with overlap */ + memmove(pjDestBase, pjSrcBase, cjWidth); pjDestBase += pBltData->siDst.cjAdvanceY; pjSrcBase += pBltData->siSrc.cjAdvanceY; } @@ -25,18 +27,23 @@ #define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf Dib_BitBlt_SRCCOPY_EqSurf #define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf Dib_BitBlt_SRCCOPY_EqSurf #define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurf -/* special movsd optimization on x86 */ +/* special movsd optimization on x86, only for left-to-right */ #if defined(_M_IX86) || defined(_M_AMD64) VOID FASTCALL Dib_BitBlt_SRCCOPY_S32_D32_EqSurf(PBLTDATA pBltData) { - ULONG cLines, cRows = pBltData->ulWidth; + ULONG cLines, cRows; PBYTE pjDestBase = pBltData->siDst.pjBase; PBYTE pjSrcBase = pBltData->siSrc.pjBase; /* Loop all lines */ + cRows = pBltData->ulWidth; cLines = pBltData->ulHeight; while (cLines--) { Modified: branches/dib_rewrite/win32ss/gdi/diblib/DibLib.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/DibLib.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/DibLib.h [iso-8859-1] Sun Dec 30 12:32:00 2012 @@ -37,7 +37,6 @@ #define __DIB_FUNCTION_NAME_DST2(name, dst_bpp) Dib_ ## name ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_DST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_DST2(name, dst_bpp) #define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurf) -#define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurfL2R) #define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurfR2L) #define _ReadPixel_1(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 1)

11 years, 8 months

[tkreuzer] 58050: [NTOSKRNL] Fix a number of 64bit issues.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 30 11:54:40 2012 New Revision: 58050 URL: http://svn.reactos.org/svn/reactos?rev=58050&view=rev Log: [NTOSKRNL] Fix a number of 64bit issues. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Dec 30 11:54:40 2012 @@ -876,7 +876,8 @@ NTSTATUS Status; PMMPTE SuperProtoPte; PMMPFN Pfn1, OutPfn = NULL; - PFN_NUMBER PageFrameIndex, PteCount, ProcessedPtes; + PFN_NUMBER PageFrameIndex; + PFN_COUNT PteCount, ProcessedPtes; DPRINT("ARM3 Page Fault Dispatcher for address: %p in process: %p\n", Address, Process); @@ -1055,7 +1056,7 @@ if (ProcessedPtes) { /* Bump the transition count */ - InterlockedExchangeAdd(&KeGetCurrentPrcb()->MmTransitionCount, ProcessedPtes); + InterlockedExchangeAddSizeT(&KeGetCurrentPrcb()->MmTransitionCount, ProcessedPtes); ProcessedPtes--; /* Loop all the processing we did */ @@ -1208,9 +1209,15 @@ if (TrapInformation) { PKTRAP_FRAME TrapFrame = TrapInformation; +#ifdef _M_IX86 DbgPrint("MM:***EIP %p, EFL %p\n", TrapFrame->Eip, TrapFrame->EFlags); DbgPrint("MM:***EAX %p, ECX %p EDX %p\n", TrapFrame->Eax, TrapFrame->Ecx, TrapFrame->Edx); DbgPrint("MM:***EBX %p, ESI %p EDI %p\n", TrapFrame->Ebx, TrapFrame->Esi, TrapFrame->Edi); +#elif defined(_M_AMD64) + DbgPrint("MM:***RIP %p, EFL %p\n", TrapFrame->Rip, TrapFrame->EFlags); + DbgPrint("MM:***RAX %p, RCX %p RDX %p\n", TrapFrame->Rax, TrapFrame->Rcx, TrapFrame->Rdx); + DbgPrint("MM:***RBX %p, RSI %p RDI %p\n", TrapFrame->Rbx, TrapFrame->Rsi, TrapFrame->Rdi); +#endif } /* Tell the trap handler to fail */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Dec 30 11:54:40 2012 @@ -1324,8 +1324,10 @@ /* Initialize the first page table */ Index = (ULONG_PTR)MmSessionSpace->PagedPoolStart - (ULONG_PTR)MmSessionBase; Index >>= 22; +#ifndef _M_AMD64 // FIXME ASSERT(MmSessionSpace->PageTables[Index].u.Long == 0); MmSessionSpace->PageTables[Index] = *PointerPde; +#endif /* Bump up counters */ InterlockedIncrementSizeT(&MmSessionSpace->NonPageablePages); Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Dec 30 11:54:40 2012 @@ -1580,7 +1580,9 @@ DPRINT1("Last process in sessino %d going down!!!\n", SessionId); /* Free the session page tables */ +#ifndef _M_AMD64 ExFreePool(SessionGlobal->PageTables); +#endif ASSERT(!MI_IS_PHYSICAL_ADDRESS(SessionGlobal)); /* Capture the data page PFNs */ @@ -1744,8 +1746,9 @@ /* Add this into the list */ Index = ((ULONG_PTR)WorkingSetList - (ULONG_PTR)MmSessionBase) >> 22; +#ifndef _M_AMD64 MmSessionSpace->PageTables[Index] = TempPte; - +#endif /* Initialize the page directory page, and now zero the working set list itself */ MiInitializePfnForOtherProcess(PageFrameIndex, PointerPde, @@ -1977,8 +1980,10 @@ MmSessionSpace->Color = Color; MmSessionSpace->NonPageablePages = MiSessionCreateCharge; MmSessionSpace->CommittedPages = MiSessionCreateCharge; +#ifndef _M_AMD64 MmSessionSpace->PageTables = PageTables; MmSessionSpace->PageTables[PointerPde - MiAddressToPde(MmSessionBase)] = *PointerPde; +#endif InitializeListHead(&MmSessionSpace->ImageList); DPRINT1("Session %d is ready to go: 0x%p 0x%p, %lx 0x%p\n", *SessionId, MmSessionSpace, SessionGlobal, SessionPageDirIndex, PageTables); Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Dec 30 11:54:40 2012 @@ -906,9 +906,10 @@ Index = ((ULONG_PTR)StartVa - (ULONG_PTR)MmSessionBase) >> 22; while (StartPde <= EndPde) { +#ifndef _M_AMD64 /* If we don't already have a page table for it, increment count */ if (MmSessionSpace->PageTables[Index].u.Long == 0) PageCount++; - +#endif /* Move to the next one */ StartPde++; Index++; @@ -924,6 +925,7 @@ /* Loop each PDE while holding the working set lock */ // MiLockWorkingSet(PsGetCurrentThread(), // &MmSessionSpace->GlobalVirtualAddress->Vm); +#ifndef _M_AMD64 while (StartPde <= EndPde) { /* Check if we already have a page table */ @@ -966,6 +968,7 @@ StartPde++; Index++; } +#endif /* Make sure we didn't do more pages than expected */ ASSERT(ActualPages <= PageCount);

11 years, 8 months

[tkreuzer] 58049: [NTOSKRNL] Fix value of MmUserProbeAddress, which is MI_USER_PROBE_ADDRESS (0x7FFF0000) and not MI_HIGHEST_USER_ADDRESS (0x7FFEFFFF)!

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 30 11:52:05 2012 New Revision: 58049 URL: http://svn.reactos.org/svn/reactos?rev=58049&view=rev Log: [NTOSKRNL] Fix value of MmUserProbeAddress, which is MI_USER_PROBE_ADDRESS (0x7FFF0000) and not MI_HIGHEST_USER_ADDRESS (0x7FFEFFFF)! Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sun Dec 30 11:52:05 2012 @@ -2043,7 +2043,7 @@ // Define the basic user vs. kernel address space separation // MmSystemRangeStart = (PVOID)MI_DEFAULT_SYSTEM_RANGE_START; - MmUserProbeAddress = (ULONG_PTR)MI_HIGHEST_USER_ADDRESS; + MmUserProbeAddress = (ULONG_PTR)MI_USER_PROBE_ADDRESS; MmHighestUserAddress = (PVOID)MI_HIGHEST_USER_ADDRESS; /* Highest PTE and PDE based on the addresses above */

11 years, 8 months

[tfaber] 58048: [SHELL32] - Fix exports CORE-6846 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Dec 30 10:07:38 2012 New Revision: 58048 URL: http://svn.reactos.org/svn/reactos?rev=58048&view=rev Log: [SHELL32] - Fix exports CORE-6846 #resolve Modified: trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sun Dec 30 10:07:38 2012 @@ -1,4 +1,3 @@ -# Functions exported by the WinXP SP3 shell32.dll (6.0.2900.5686) 2 stdcall SHChangeNotifyRegister(long long long long long ptr) 3 stdcall SHDefExtractIconA(str long long ptr ptr long) 4 stdcall SHChangeNotifyDeregister(long) @@ -27,7 +26,7 @@ 27 stdcall ILSaveToStream(ptr ptr) 28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW -30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW +30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW # FIXME: should be PathBuildRootW 31 stdcall -noname PathFindExtension(wstr) PathFindExtensionW 32 stdcall -noname PathAddBackslash(wstr) PathAddBackslashW 33 stdcall -noname PathRemoveBlanks(wstr) PathRemoveBlanksW @@ -41,7 +40,6 @@ 41 stdcall IsLFNDriveA(str) 42 stdcall IsLFNDriveW(wstr) 43 stdcall PathIsExe(ptr) PathIsExeAW -44 stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA 45 stdcall -noname PathFileExists(ptr) PathFileExistsAW # Fixme 46 stdcall -noname PathMatchSpec(wstr wstr) PathMatchSpecW 47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW @@ -50,7 +48,7 @@ 50 stdcall -noname PathStripToRoot(wstr) PathStripToRootW 51 stdcall PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(wstr) PathGetArgsW -53 stdcall -noname IsSuspendAllowed() +53 stdcall -noname IsSuspendAllowed() # FIXME: Wine says DoEnvironmentSubst 54 stdcall -noname LogoffWindowsDialog(ptr) 55 stdcall -noname PathQuoteSpaces(wstr) PathQuoteSpacesW 56 stdcall -noname PathUnquoteSpaces(wstr) PathUnquoteSpacesW @@ -68,27 +66,26 @@ 68 stdcall SHGetSetSettings(ptr long long) 69 stdcall -noname SHGetNetResource(ptr long ptr long) 70 stdcall -noname SHCreateDefClassObject(long long long long long) -71 stdcall -noname Shell_GetImageLists(ptr ptr) +71 stdcall Shell_GetImageLists(ptr ptr) 72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW 73 stdcall SHShellFolderView_Message(long long long) 74 stdcall SHCreateStdEnumFmtEtc(long ptr ptr) 75 stdcall PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) -76 stdcall DragQueryInfo(ptr ptr) +76 stdcall -noname DragQueryInfo(ptr ptr) 77 stdcall SHMapPIDLToSystemImageListIndex(ptr ptr ptr) 78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW # Fixme 79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW # Fixme 80 stdcall SHOpenPropSheetW(wstr ptr long ptr ptr ptr wstr) -81 stdcall OpenAs_RunDLLA(long long str long) 82 stdcall -noname DDECreatePostNotify(ptr) 83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) -84 stdcall SHIsBadInterfacePtr(ptr long) # Fixme +84 stdcall -noname SHIsBadInterfacePtr(ptr long) # Fixme 85 stdcall OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA 86 stdcall -noname SHRegisterDragDrop(long ptr) 87 stdcall -noname SHRevokeDragDrop(long) 88 stdcall SHDoDragDrop(long ptr ptr long ptr) 89 stdcall SHCloneSpecialIDList(long long long) 90 stdcall SHFindFiles(ptr ptr) -91 stdcall SHFindComputer(ptr ptr) +91 stdcall -noname SHFindComputer(ptr ptr) 92 stdcall PathGetShortPath(ptr) PathGetShortPathAW 93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryW 94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryW @@ -98,31 +95,12 @@ 98 stdcall SHGetRealIDL(ptr ptr ptr) 99 stdcall -noname SetAppStartingCursor(long long) # Fixme 100 stdcall SHRestricted(long) -101 stdcall OpenAs_RunDLLW(long long wstr long) 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr) -103 stdcall SignalFileOpen(long) -104 stdcall Activate_RunDLL(long ptr ptr ptr) -105 stdcall AppCompat_RunDLLW(ptr ptr wstr long) -106 stdcall CheckEscapesA(str long) -107 stdcall CheckEscapesW(wstr long) -108 stdcall CommandLineToArgvW(wstr ptr) -109 stdcall Control_FillCache_RunDLL(long long long long) Control_FillCache_RunDLLA -110 stdcall Control_FillCache_RunDLLA(long long long long) -111 stdcall Control_FillCache_RunDLLW(long long long long) -112 stdcall Control_RunDLL(ptr ptr str long) Control_RunDLLA -113 stdcall Control_RunDLLA(ptr ptr str long) -114 stdcall Control_RunDLLAsUserW(ptr ptr wstr long) -115 stdcall Control_RunDLLW(ptr ptr wstr long) -@ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) -118 stdcall DllGetVersion(ptr) +103 stdcall SignalFileOpen(ptr) 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW -@ stdcall -private DllInstall(long wstr) 121 stdcall SHFlushClipboard() 122 stdcall -noname RunDLL_CallEntry16(long long long str long) # Fixme #name wrong? 123 stdcall -noname SHFreeUnusedLibraries() -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) # Fixme 127 stdcall -noname SHWinHelp(long long long long) 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject @@ -130,24 +108,14 @@ 130 stdcall -noname DAD_DragEnter(long) 131 stdcall DAD_DragEnterEx(long double) 132 stdcall DAD_DragLeave() -133 stdcall DoEnvironmentSubstA(str str) 134 stdcall DAD_DragMove(double) -135 stdcall DoEnvironmentSubstW(wstr wstr) 136 stdcall DAD_SetDragImage(long long) 137 stdcall DAD_ShowDragImage(long) -138 stdcall DragAcceptFiles(long long) -139 stdcall DragFinish(long) -140 stdcall DragQueryFile(long long ptr long) DragQueryFileA -141 stdcall DragQueryFileA(long long ptr long) -142 stdcall DragQueryFileAorW(ptr long wstr long long long) -143 stdcall DragQueryFileW(long long ptr long) -144 stdcall DragQueryPoint(long ptr) 145 stdcall -noname PathFindOnPath(wstr wstr) PathFindOnPathW 146 stdcall -noname RLBuildListOfPaths() 147 stdcall SHCLSIDFromString(long long) SHCLSIDFromStringAW 148 stdcall SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) 149 stdcall SHFind_InitMenuPopup(long long long long) -150 stdcall DuplicateIcon(long long) 151 stdcall SHLoadOLE(long) 152 stdcall ILGetSize(ptr) 153 stdcall ILGetNext(ptr) @@ -157,7 +125,7 @@ 157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW 158 stdcall -noname PathGetExtension(wstr long long) SHPathGetExtensionW 159 stdcall -noname PathIsDirectory(wstr) PathIsDirectoryW -160 stdcall SHNetConnectionDialog(ptr wstr long) # Fixme +160 stdcall -noname SHNetConnectionDialog(ptr wstr long) # Fixme 161 stdcall SHRunControlPanel(long long) 162 stdcall SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW # Fixme 163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW # Fixme @@ -179,8 +147,8 @@ 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) -182 varargs ShellMessageBoxA(long long str str long) -183 varargs ShellMessageBoxW(long long wstr wstr long) +182 varargs ShellMessageBoxW(long long wstr wstr long) +183 varargs ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long) # Fixme 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) @@ -196,16 +164,13 @@ 196 stdcall SHAlloc(long) 197 stdcall -noname SHGlobalDefect(long) 198 stdcall -noname SHAbortInvokeCommand() -199 stdcall ExtractAssociatedIconA(long str ptr) +# FIXME: Wine has SHGetFileIcon/SHLocalAlloc/SHLocalFree/SHLocalReAlloc from 199-202 200 stdcall -noname SHCreateDesktop(ptr) 201 stdcall -noname SHDesktopMessageLoop(ptr) 202 stub -noname DDEHandleViewFolderNotify 203 stdcall -noname AddCommasW(long wstr) 204 stdcall -noname ShortSizeFormatW(double) -205 stdcall Printer_LoadIconsW(wstr ptr ptr) -206 stdcall ExtractAssociatedIconExA(long str long long) -207 stdcall ExtractAssociatedIconExW(long wstr long long) -208 stdcall ExtractAssociatedIconW(long wstr ptr) +205 stdcall -noname Printer_LoadIconsW(wstr ptr ptr) 209 stdcall -noname Int64ToString(double wstr long long ptr long) # Fixme 210 stdcall -noname LargeIntegerToString(ptr wstr long long ptr long) # Fixme 211 stdcall -noname Printers_GetPidl(ptr str) # Fixme @@ -213,20 +178,6 @@ 213 stdcall -noname Printers_RegisterWindowW(wstr long ptr ptr) 214 stdcall -noname Printers_UnregisterWindow(long long) 215 stdcall -noname SHStartNetConnectionDialog(long str long) -216 stdcall ExtractIconA(long str long) -217 stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA -218 stdcall ExtractIconExA(str long ptr ptr long) -219 stdcall ExtractIconExW(wstr long ptr ptr long) -220 stdcall ExtractIconResInfoA(ptr str long ptr ptr) -221 stdcall ExtractIconResInfoW(ptr wstr long ptr ptr) -222 stdcall ExtractIconW(long wstr long) -223 stdcall ExtractVersionResource16W(wstr ptr) -224 stdcall FindExeDlgProc(ptr long ptr ptr) -225 stdcall FindExecutableA(str str ptr) -226 stdcall FindExecutableW(wstr wstr ptr) -227 stdcall FreeIconList(long) -228 stdcall InternalExtractIconListA(ptr str ptr) -229 stdcall InternalExtractIconListW(ptr wstr ptr) 230 stdcall -noname FirstUserLogon(wstr wstr) 231 stdcall -noname SHSetFolderPathA(long ptr long str) 232 stdcall -noname SHSetFolderPathW(long ptr long wstr) @@ -235,7 +186,6 @@ 235 stdcall -noname SHOpenEffectiveToken(ptr) 236 stdcall -noname SHTestTokenPrivilegeW(ptr ptr) 237 stdcall -noname SHShouldShowWizards(ptr) -238 stdcall Options_RunDLL(ptr ptr str long) 239 stdcall PathIsSlowW(wstr long) 240 stdcall PathIsSlowA(str long) 241 stdcall -noname SHGetUserDisplayName(wstr ptr) @@ -252,148 +202,10 @@ 252 stdcall -noname PathIsURL(wstr) shlwapi.PathIsURLW 253 stub -noname SHIsCurrentProcessConsoleSession 254 stub -noname DisconnectWindowsDialog -255 stdcall Options_RunDLLA(ptr ptr str long) 256 stdcall SHCreateShellFolderView(ptr ptr) 257 stdcall -noname SHGetShellFolderViewCB(ptr) 258 stdcall -noname LinkWindow_RegisterClass() 259 stdcall -noname LinkWindow_UnregisterClass() -260 stdcall Options_RunDLLW(ptr ptr wstr long) -261 stdcall PrintersGetCommand_RunDLL(ptr ptr wstr long) -262 stdcall PrintersGetCommand_RunDLLA(ptr ptr str long) -263 stdcall PrintersGetCommand_RunDLLW(ptr ptr wstr long) -264 stdcall RealShellExecuteA(ptr str str str str str str str long ptr) -265 stdcall RealShellExecuteExA(ptr str str str str str str str long ptr long) -266 stdcall RealShellExecuteExW(ptr str str str str str str str long ptr long) -267 stdcall RealShellExecuteW(ptr wstr wstr wstr wstr wstr wstr wstr long ptr) -268 stdcall RegenerateUserEnvironment(ptr long) -269 stdcall SHAddToRecentDocs(long ptr) -270 stdcall SHAppBarMessage(long ptr) -271 stdcall SHBindToParent(ptr ptr ptr ptr) -272 stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA -273 stdcall SHBrowseForFolderA(ptr) -274 stdcall SHBrowseForFolderW(ptr) -275 stdcall SHChangeNotify(long long ptr ptr) -276 stdcall SHChangeNotifySuspendResume(long ptr long long) -277 stdcall SHCreateDirectoryExA(long str ptr) -278 stdcall SHCreateDirectoryExW(long wstr ptr) -279 stub SHCreateLocalServerRunDll -280 stdcall SHCreateProcessAsUserW(ptr) -281 stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) -282 stdcall SHCreateShellItem(ptr ptr ptr ptr) -283 stdcall SHEmptyRecycleBinA(long str long) -284 stdcall SHEmptyRecycleBinW(long wstr long) -285 stub SHEnableServiceObject -286 stub SHEnumerateUnreadMailAccountsW -287 stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW -288 stdcall SHFileOperation(ptr) SHFileOperationA -289 stdcall SHFileOperationA(ptr) -290 stdcall SHFileOperationW(ptr) -291 stdcall SHFormatDrive(long long long long) -292 stdcall SHFreeNameMappings(ptr) -293 stdcall SHGetDataFromIDListA(ptr ptr long ptr long) -294 stdcall SHGetDataFromIDListW(ptr ptr long ptr long) -295 stdcall SHGetDesktopFolder(ptr) -296 stdcall SHGetDiskFreeSpaceA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA -297 stdcall SHGetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA -298 stdcall SHGetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW -299 stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA -300 stdcall SHGetFileInfoA(ptr long ptr long long) -301 stdcall SHGetFileInfoW(ptr long ptr long long) -302 stdcall SHGetFolderLocation(long long long long ptr) -303 stdcall SHGetFolderPathA(long long long long ptr) -304 stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) -305 stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) -306 stdcall SHGetFolderPathW(long long long long ptr) -307 stdcall SHGetIconOverlayIndexA(str long) -308 stdcall SHGetIconOverlayIndexW(wstr long) -309 stdcall SHGetInstanceExplorer(long) -310 stdcall SHGetMalloc(ptr) -311 stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA -312 stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA -313 stdcall SHGetPathFromIDListA(ptr ptr) -314 stdcall SHGetPathFromIDListW(ptr ptr) -315 stdcall SHGetSettings(ptr long) -316 stdcall SHGetSpecialFolderLocation(long long ptr) -317 stdcall SHGetSpecialFolderPathA(long ptr long long) -318 stdcall SHGetSpecialFolderPathW(long ptr long long) -319 stdcall SHGetUnreadMailCountW (long wstr long ptr wstr long) -320 stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA -321 stdcall SHHelpShortcuts_RunDLLA(long long long long) -322 stdcall SHHelpShortcuts_RunDLLW(long long long long) -323 stdcall SHInvokePrinterCommandA(ptr long str str long) -324 stdcall SHInvokePrinterCommandW(ptr long wstr wstr long) -325 stdcall SHIsFileAvailableOffline(wstr ptr) -326 stdcall SHLoadInProc(long) -327 stdcall SHLoadNonloadedIconOverlayIdentifiers() -328 stdcall SHOpenFolderAndSelectItems(ptr long ptr long) -329 stdcall SHParseDisplayName(wstr ptr ptr long ptr) -330 stdcall SHPathPrepareForWriteA(long ptr str long) -331 stdcall SHPathPrepareForWriteW(long ptr wstr long) -332 stdcall SHQueryRecycleBinA(str ptr) -333 stdcall SHQueryRecycleBinW(wstr ptr) -334 stdcall SHSetLocalizedName(wstr wstr long) -335 stdcall SHSetUnreadMailCountW (wstr long wstr) -336 stdcall SHUpdateRecycleBinIcon() -337 stdcall SheChangeDirA(str) -338 stdcall SheChangeDirExA(str) -339 stdcall SheChangeDirExW(wstr) -340 stdcall SheChangeDirW(wstr) -341 stdcall SheConvertPathW(wstr wstr long) -342 stdcall SheFullPathA(str long str) -343 stdcall SheFullPathW(wstr long wstr) -344 stdcall SheGetCurDrive() -345 stdcall SheGetDirA(long long) -346 stdcall SheGetDirExW(wstr ptr wstr) -347 stdcall SheGetDirW(long long) -348 stdcall SheGetPathOffsetW(wstr) -349 stdcall SheRemoveQuotesA(str) -350 stdcall SheRemoveQuotesW(wstr) -351 stdcall SheSetCurDrive(long) -352 stdcall SheShortenPathA(str long) -353 stdcall SheShortenPathW(wstr long) -354 stdcall ShellAboutA(long str str long) -355 stdcall ShellAboutW(long wstr wstr long) -356 stdcall ShellExec_RunDLL(ptr ptr wstr long) -357 stdcall ShellExec_RunDLLA(ptr ptr str long) -358 stdcall ShellExec_RunDLLW(ptr ptr wstr long) -359 stdcall ShellExecuteA(long str str str str long) -360 stdcall ShellExecuteEx(long) ShellExecuteExA -361 stdcall ShellExecuteExA (long) -362 stdcall ShellExecuteExW (long) -363 stdcall ShellExecuteW(long wstr wstr wstr wstr long) -364 stdcall ShellHookProc(long ptr ptr) -365 stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA -366 stdcall Shell_NotifyIconA(long ptr) -367 stdcall Shell_NotifyIconW(long ptr) -368 stdcall StrChrA(str long) shlwapi.StrChrA -369 stdcall StrChrIA(str long) shlwapi.StrChrIA -370 stdcall StrChrIW(wstr long) shlwapi.StrChrIW -371 stdcall StrChrW(wstr long) shlwapi.StrChrW -372 stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -373 stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -374 stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW -375 stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW -376 stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA -377 stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW -378 stdcall StrNCmpA(str str long) shlwapi.StrCmpNA -379 stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA -380 stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW -381 stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW -382 stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA -383 stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW -384 stdcall StrRChrA(str str long) shlwapi.StrRChrA -385 stdcall StrRChrIA(str str long) shlwapi.StrRChrIA -386 stdcall StrRChrIW(str str long) shlwapi.StrRChrIW -387 stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW -388 stdcall StrRStrA(str str str) -389 stdcall StrRStrIA(str str str) shlwapi.StrRStrIA -390 stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW -391 stdcall StrRStrW(wstr wstr wstr) -392 stdcall StrStrA(str str) shlwapi.StrStrA -393 stdcall StrStrIA(str str) shlwapi.StrStrIA -394 stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW -395 stdcall StrStrW(wstr wstr) shlwapi.StrStrW -396 stdcall WOWShellExecute(ptr wstr wstr wstr wstr long ptr) 520 stdcall SHAllocShared(ptr long long) 521 stdcall SHLockShared(long long) 522 stdcall SHUnlockShared(ptr) @@ -465,6 +277,195 @@ 755 stdcall -noname PathIsEqualOrSubFolder(wstr wstr) 756 stub -noname DeleteFileThumbnail +@ stdcall Activate_RunDLL(long ptr ptr ptr) +@ stdcall AppCompat_RunDLLW(ptr ptr wstr long) +@ stdcall CheckEscapesA(str long) +@ stdcall CheckEscapesW(wstr long) +@ stdcall CommandLineToArgvW(wstr ptr) +@ stdcall Control_FillCache_RunDLL(long long long long) Control_FillCache_RunDLLA +@ stdcall Control_FillCache_RunDLLA(long long long long) +@ stdcall Control_FillCache_RunDLLW(long long long long) +@ stdcall Control_RunDLL(ptr ptr str long) Control_RunDLLA +@ stdcall Control_RunDLLA(ptr ptr str long) +@ stdcall Control_RunDLLAsUserW(ptr ptr wstr long) +@ stdcall Control_RunDLLW(ptr ptr wstr long) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall DoEnvironmentSubstA(str str) +@ stdcall DoEnvironmentSubstW(wstr wstr) +@ stdcall DragAcceptFiles(long long) +@ stdcall DragFinish(long) +@ stdcall DragQueryFile(long long ptr long) DragQueryFileA +@ stdcall DragQueryFileA(long long ptr long) +@ stdcall DragQueryFileAorW(ptr long wstr long long long) +@ stdcall DragQueryFileW(long long ptr long) +@ stdcall DragQueryPoint(long ptr) +@ stdcall DuplicateIcon(long long) +@ stdcall ExtractAssociatedIconA(long str ptr) +@ stdcall ExtractAssociatedIconExA(long str long long) +@ stdcall ExtractAssociatedIconExW(long wstr long long) +@ stdcall ExtractAssociatedIconW(long wstr ptr) +@ stdcall ExtractIconA(long str long) +@ stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA +@ stdcall ExtractIconExA(str long ptr ptr long) +@ stdcall ExtractIconExW(wstr long ptr ptr long) +@ stdcall ExtractIconResInfoA(ptr str long ptr ptr) +@ stdcall ExtractIconResInfoW(ptr wstr long ptr ptr) +@ stdcall ExtractIconW(long wstr long) +@ stdcall ExtractVersionResource16W(wstr ptr) +@ stdcall FindExecutableA(str str ptr) +@ stdcall FindExecutableW(wstr wstr ptr) +@ stdcall FindExeDlgProc(ptr long ptr ptr) +@ stdcall FreeIconList(long) +@ stdcall InternalExtractIconListA(ptr str ptr) +@ stdcall InternalExtractIconListW(ptr wstr ptr) +@ stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA +@ stdcall OpenAs_RunDLLA(long long str long) +@ stdcall OpenAs_RunDLLW(long long wstr long) +@ stdcall Options_RunDLL(ptr ptr str long) +@ stdcall Options_RunDLLA(ptr ptr str long) +@ stdcall Options_RunDLLW(ptr ptr wstr long) +@ stdcall PrintersGetCommand_RunDLL(ptr ptr wstr long) +@ stdcall PrintersGetCommand_RunDLLA(ptr ptr str long) +@ stdcall PrintersGetCommand_RunDLLW(ptr ptr wstr long) +@ stdcall RealShellExecuteA(ptr str str str str str str str long ptr) +@ stdcall RealShellExecuteExA(ptr str str str str str str str long ptr long) +@ stdcall RealShellExecuteExW(ptr str str str str str str str long ptr long) +@ stdcall RealShellExecuteW(ptr wstr wstr wstr wstr wstr wstr wstr long ptr) +@ stdcall RegenerateUserEnvironment(ptr long) +@ stdcall SHAddToRecentDocs(long ptr) +@ stdcall SHAppBarMessage(long ptr) +@ stdcall SHBindToParent(ptr ptr ptr ptr) +@ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA +@ stdcall SHBrowseForFolderA(ptr) +@ stdcall SHBrowseForFolderW(ptr) +@ stdcall SHChangeNotify(long long ptr ptr) +@ stdcall SHChangeNotifySuspendResume(long ptr long long) +@ stdcall SHCreateDirectoryExA(long str ptr) +@ stdcall SHCreateDirectoryExW(long wstr ptr) +@ stub SHCreateLocalServerRunDll +@ stdcall SHCreateProcessAsUserW(ptr) +@ stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) +@ stdcall SHCreateShellItem(ptr ptr ptr ptr) +@ stdcall SHEmptyRecycleBinA(long str long) +@ stdcall SHEmptyRecycleBinW(long wstr long) +@ stub SHEnableServiceObject +@ stub SHEnumerateUnreadMailAccountsW +@ stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW +@ stdcall SHFileOperation(ptr) SHFileOperationA +@ stdcall SHFileOperationA(ptr) +@ stdcall SHFileOperationW(ptr) +@ stdcall SHFormatDrive(long long long long) +@ stdcall SHFreeNameMappings(ptr) +@ stdcall SHGetDataFromIDListA(ptr ptr long ptr long) +@ stdcall SHGetDataFromIDListW(ptr ptr long ptr long) +@ stdcall SHGetDesktopFolder(ptr) +@ stdcall SHGetDiskFreeSpaceA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +@ stdcall SHGetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +@ stdcall SHGetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW +@ stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA +@ stdcall SHGetFileInfoA(ptr long ptr long long) +@ stdcall SHGetFileInfoW(ptr long ptr long long) +@ stdcall SHGetFolderLocation(long long long long ptr) +@ stdcall SHGetFolderPathA(long long long long ptr) +@ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) +@ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) +@ stdcall SHGetFolderPathW(long long long long ptr) +@ stdcall SHGetIconOverlayIndexA(str long) +@ stdcall SHGetIconOverlayIndexW(wstr long) +@ stdcall SHGetInstanceExplorer(long) +@ stdcall SHGetMalloc(ptr) +@ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA +@ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA +@ stdcall SHGetPathFromIDListA(ptr ptr) +@ stdcall SHGetPathFromIDListW(ptr ptr) +@ stdcall SHGetSettings(ptr long) +@ stdcall SHGetSpecialFolderLocation(long long ptr) +@ stdcall SHGetSpecialFolderPathA(long ptr long long) +@ stdcall SHGetSpecialFolderPathW(long ptr long long) +@ stdcall SHGetUnreadMailCountW (long wstr long ptr wstr long) +@ stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA +@ stdcall SHHelpShortcuts_RunDLLA(long long long long) +@ stdcall SHHelpShortcuts_RunDLLW(long long long long) +@ stdcall SHInvokePrinterCommandA(ptr long str str long) +@ stdcall SHInvokePrinterCommandW(ptr long wstr wstr long) +@ stdcall SHIsFileAvailableOffline(wstr ptr) +@ stdcall SHLoadInProc(long) +@ stdcall SHLoadNonloadedIconOverlayIdentifiers() +@ stdcall SHOpenFolderAndSelectItems(ptr long ptr long) +@ stdcall SHParseDisplayName(wstr ptr ptr long ptr) +@ stdcall SHPathPrepareForWriteA(long ptr str long) +@ stdcall SHPathPrepareForWriteW(long ptr wstr long) +@ stdcall SHQueryRecycleBinA(str ptr) +@ stdcall SHQueryRecycleBinW(wstr ptr) +@ stdcall SHSetLocalizedName(wstr wstr long) +@ stdcall SHSetUnreadMailCountW (wstr long wstr) +@ stdcall SHUpdateRecycleBinIcon() +@ stdcall SheChangeDirA(str) +@ stdcall SheChangeDirExA(str) +@ stdcall SheChangeDirExW(wstr) +@ stdcall SheChangeDirW(wstr) +@ stdcall SheConvertPathW(wstr wstr long) +@ stdcall SheFullPathA(str long str) +@ stdcall SheFullPathW(wstr long wstr) +@ stdcall SheGetCurDrive() +@ stdcall SheGetDirA(long long) +@ stdcall SheGetDirExW(wstr ptr wstr) +@ stdcall SheGetDirW(long long) +@ stdcall SheGetPathOffsetW(wstr) +@ stdcall SheRemoveQuotesA(str) +@ stdcall SheRemoveQuotesW(wstr) +@ stdcall SheSetCurDrive(long) +@ stdcall SheShortenPathA(str long) +@ stdcall SheShortenPathW(wstr long) +@ stdcall ShellAboutA(long str str long) +@ stdcall ShellAboutW(long wstr wstr long) +@ stdcall ShellExec_RunDLL(ptr ptr wstr long) +@ stdcall ShellExec_RunDLLA(ptr ptr str long) +@ stdcall ShellExec_RunDLLW(ptr ptr wstr long) +@ stdcall ShellExecuteA(long str str str str long) +@ stdcall ShellExecuteEx(long) ShellExecuteExA +@ stdcall ShellExecuteExA (long) +@ stdcall ShellExecuteExW (long) +@ stdcall ShellExecuteW(long wstr wstr wstr wstr long) +@ stdcall ShellHookProc(long ptr ptr) +@ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA +@ stdcall Shell_NotifyIconA(long ptr) +@ stdcall Shell_NotifyIconW(long ptr) +@ stdcall StrChrA(str long) shlwapi.StrChrA +@ stdcall StrChrIA(str long) shlwapi.StrChrIA +@ stdcall StrChrIW(wstr long) shlwapi.StrChrIW +@ stdcall StrChrW(wstr long) shlwapi.StrChrW +@ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA +@ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA +@ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW +@ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW +@ stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA +@ stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrNCmpA(str str long) shlwapi.StrCmpNA +@ stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA +@ stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW +@ stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW +@ stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA +@ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrRChrA(str str long) shlwapi.StrRChrA +@ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA +@ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW +@ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW +@ stdcall StrRStrA(str str str) +@ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA +@ stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW +@ stdcall StrRStrW(wstr wstr wstr) +@ stdcall StrStrA(str str) shlwapi.StrStrA +@ stdcall StrStrIA(str str) shlwapi.StrStrIA +@ stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW +@ stdcall StrStrW(wstr wstr) shlwapi.StrStrW +@ stdcall WOWShellExecute(ptr str str str str long ptr) + # Functions exported by the WinVista shell32.dll @ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) @ stdcall SHCreateDefaultExtractIcon(ptr ptr) @@ -495,6 +496,7 @@ @ stdcall FileMenu_GetItemExtent(long long) # 4.0 (NT) and higher. Until discontinued in 5.0 +# FIXME: ordinals 505-512? @ stdcall SHRegCloseKey(long) @ stdcall SHRegOpenKeyA(long str long) @ stdcall SHRegOpenKeyW(long wstr long)

11 years, 8 months

[tkreuzer] 58047: [NTOSKRNL] In NtAllocateVirtualMemory, when MEM_RESET is passed, silence the DPRINT and also return STATUS_SUCCESS, since MEM_RESET is only an optimization (tells the memory manag...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 29 21:40:41 2012 New Revision: 58047 URL: http://svn.reactos.org/svn/reactos?rev=58047&view=rev Log: [NTOSKRNL] In NtAllocateVirtualMemory, when MEM_RESET is passed, silence the DPRINT and also return STATUS_SUCCESS, since MEM_RESET is only an optimization (tells the memory manager that the contents shouldn't be written to the pagefile) and it won't hurt (except the performance) to pretend success. On the other hand paging out is probably never done anyway due to broken Mm. This fixes spamming the log by Firefox. It does not fix the hangs that firfox suffers from. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Dec 29 21:40:41 2012 @@ -3861,8 +3861,9 @@ } if ((AllocationType & MEM_RESET) == MEM_RESET) { - DPRINT1("MEM_RESET not supported\n"); - Status = STATUS_INVALID_PARAMETER; + /// @todo HACK: pretend success + DPRINT("MEM_RESET not supported\n"); + Status = STATUS_SUCCESS; goto FailPathNoLock; } if (Process->VmTopDown == 1)

11 years, 8 months

[hbelusca] 58046: Sync with trunk revision r58045 to bring the corrections on configure.cmd and on widl/wpp.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 29 20:57:10 2012 New Revision: 58046 URL: http://svn.reactos.org/svn/reactos?rev=58046&view=rev Log: Sync with trunk revision r58045 to bring the corrections on configure.cmd and on widl/wpp. Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/rapps/rapps/abiword28x.txt branches/ros-csrss/base/applications/rapps/rapps/bittorrent.txt branches/ros-csrss/base/applications/rapps/rapps/fap.txt branches/ros-csrss/base/applications/rapps/rapps/firefox5.txt branches/ros-csrss/base/applications/rapps/rapps/irfanview.txt branches/ros-csrss/base/applications/rapps/rapps/irfanviewplugins.txt branches/ros-csrss/base/applications/rapps/rapps/libreoffice.txt branches/ros-csrss/base/applications/rapps/rapps/mirandaim.txt branches/ros-csrss/base/applications/rapps/rapps/mirc.txt branches/ros-csrss/base/applications/rapps/rapps/mpc.txt branches/ros-csrss/base/applications/rapps/rapps/openttd.txt branches/ros-csrss/base/applications/rapps/rapps/opera.txt branches/ros-csrss/base/applications/rapps/rapps/rosbe.txt branches/ros-csrss/base/applications/rapps/rapps/scite.txt branches/ros-csrss/base/applications/rapps/rapps/seamonkey.txt branches/ros-csrss/base/applications/rapps/rapps/smplayer.txt branches/ros-csrss/base/applications/rapps/rapps/sumatrapdf.txt branches/ros-csrss/base/applications/rapps/rapps/thunderbird5.txt branches/ros-csrss/base/applications/rapps/rapps/ultravnc.txt branches/ros-csrss/base/applications/rapps/rapps/utorrent.txt branches/ros-csrss/base/applications/rapps/rapps/vlc.txt branches/ros-csrss/configure.cmd branches/ros-csrss/dll/win32/netapi32/apibuf.c branches/ros-csrss/dll/win32/samsrv/database.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/samsrv/samsrv.h branches/ros-csrss/include/ddk/ntsam.h branches/ros-csrss/include/reactos/idl/sam.idl branches/ros-csrss/tools/widl/header.c branches/ros-csrss/tools/widl/parser.tab.c branches/ros-csrss/tools/widl/parser.y branches/ros-csrss/tools/widl/proxy.c branches/ros-csrss/tools/widl/typegen.c branches/ros-csrss/tools/wpp/preproc.c branches/ros-csrss/win32ss/drivers/videoprt/child.c branches/ros-csrss/win32ss/gdi/ntgdi/cliprgn.h branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/accelerator.c branches/ros-csrss/win32ss/user/ntuser/callproc.c branches/ros-csrss/win32ss/user/ntuser/class.c branches/ros-csrss/win32ss/user/ntuser/clipboard.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c branches/ros-csrss/win32ss/user/ntuser/event.c branches/ros-csrss/win32ss/user/ntuser/hook.c branches/ros-csrss/win32ss/user/ntuser/kbdlayout.c branches/ros-csrss/win32ss/user/ntuser/menu.c branches/ros-csrss/win32ss/user/ntuser/monitor.c branches/ros-csrss/win32ss/user/ntuser/object.c branches/ros-csrss/win32ss/user/ntuser/object.h branches/ros-csrss/win32ss/user/ntuser/painting.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/ntuser/timer.c branches/ros-csrss/win32ss/user/ntuser/win32.h branches/ros-csrss/win32ss/user/ntuser/window.c branches/ros-csrss/win32ss/user/ntuser/winpos.c branches/ros-csrss/win32ss/user/user32/misc/misc.c branches/ros-csrss/win32ss/user/user32/windows/menu.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/rapps/rapps/abiword28x.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/configure.cmd?rev=580… Modified: branches/ros-csrss/dll/win32/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netapi32/ap… Modified: branches/ros-csrss/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/data… Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… Modified: branches/ros-csrss/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/sams… Modified: branches/ros-csrss/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/ntsam.h?r… Modified: branches/ros-csrss/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/idl/s… Modified: branches/ros-csrss/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/header.c?r… Modified: branches/ros-csrss/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/parser.tab… Modified: branches/ros-csrss/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/parser.y?r… Modified: branches/ros-csrss/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/proxy.c?re… Modified: branches/ros-csrss/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/typegen.c?… Modified: branches/ros-csrss/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/wpp/preproc.c?r… Modified: branches/ros-csrss/win32ss/drivers/videoprt/child.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/drivers/video… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/cliprgn.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/cli… Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… Modified: branches/ros-csrss/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/a… Modified: branches/ros-csrss/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/e… Modified: branches/ros-csrss/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/h… Modified: branches/ros-csrss/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/k… Modified: branches/ros-csrss/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… Modified: branches/ros-csrss/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… Modified: branches/ros-csrss/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/p… Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… Modified: branches/ros-csrss/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/t… Modified: branches/ros-csrss/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… Modified: branches/ros-csrss/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w…

11 years, 8 months

[ekohl] 58045: [NETAPI32] Formatting! No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 29 20:51:38 2012 New Revision: 58045 URL: http://svn.reactos.org/svn/reactos?rev=58045&view=rev Log: [NETAPI32] Formatting! No code changes! Modified: trunk/reactos/dll/win32/netapi32/apibuf.c Modified: trunk/reactos/dll/win32/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/apibuf.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/apibuf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/apibuf.c [iso-8859-1] Sat Dec 29 20:51:38 2012 @@ -54,19 +54,20 @@ LPVOID* NewBuffer) { TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer); - if (NewByteCount) + if (NewByteCount) { if (OldBuffer) *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); else *NewBuffer = HeapAlloc(GetProcessHeap(), 0, NewByteCount); - return *NewBuffer ? NERR_Success : GetLastError(); - } - else + return *NewBuffer ? NERR_Success : GetLastError(); + } + else { - if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError(); - *NewBuffer = 0; - return NERR_Success; + if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) + return GetLastError(); + *NewBuffer = 0; + return NERR_Success; } }

11 years, 8 months

[hbelusca] 58044: [WPP] Apply Wine commit "wpp: Fix path separator on Windows platforms." by Hermès Bélusca-Maïto (9dbd1969fca9c31155c6d85ea8129d249467926b) Indeed, Windows systems use ':' as part ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 29 20:16:21 2012 New Revision: 58044 URL: http://svn.reactos.org/svn/reactos?rev=58044&view=rev Log: [WPP] Apply Wine commit "wpp: Fix path separator on Windows platforms." by Hermès Bélusca-Maïto (9dbd1969fca9c31155c6d85ea8129d249467926b) Indeed, Windows systems use ':' as part of paths and therefore, use another separator character. This enables compiling ReactOS from source files located in a different disk partition as the generated (output) files. CORE-6442 #resolve #comment Committed in r58044. Modified: trunk/reactos/tools/wpp/preproc.c Modified: trunk/reactos/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/preproc.c?rev=58… ============================================================================== --- trunk/reactos/tools/wpp/preproc.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/preproc.c [iso-8859-1] Sat Dec 29 20:16:21 2012 @@ -447,7 +447,7 @@ * Include management *------------------------------------------------------------------------- */ -#if defined(_Windows) || defined(__MSDOS__) +#if defined(_WIN32) || defined(__MSDOS__) #define INCLUDESEPARATOR ";" #else #define INCLUDESEPARATOR ":"

11 years, 8 months

[hbelusca] 58043: [CONFIGURE] Fix MSVC configure build (problem of expansion of environment variables).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 29 19:23:02 2012 New Revision: 58043 URL: http://svn.reactos.org/svn/reactos?rev=58043&view=rev Log: [CONFIGURE] Fix MSVC configure build (problem of expansion of environment variables). Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=58043&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sat Dec 29 19:23:02 2012 @@ -1,4 +1,11 @@ @echo off + +:: This is needed so as to avoid static expansion of environment variables +:: inside if (...) conditionals. +:: See http://stackoverflow.com/questions/305605/weird-scope-issue-in-bat-file +:: for more explanation. +:: Precisely needed for configuring Visual Studio Environment. +setlocal enabledelayedexpansion :: Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR% if /I "%1" == "arm_hosttools" ( @@ -46,7 +53,7 @@ set USE_WDK_HEADERS=0 ) else if defined VCINSTALLDIR ( - :: VS command prompt does not put this in enviroment vars + :: VS command prompt does not put this in environment vars cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm @@ -59,30 +66,30 @@ exit /b ) - echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% + echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH! if /I "%1" == "VSSolution" ( - if "%BUILD_ENVIRONMENT%" == "VS8" ( - if "%ARCH%" == "amd64" ( + if "!BUILD_ENVIRONMENT!" == "VS8" ( + if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 8 2005 Win64" ) else ( set CMAKE_GENERATOR="Visual Studio 8 2005" ) - ) else if "%BUILD_ENVIRONMENT%" == "VS9" ( - if "%ARCH%" == "amd64" ( + ) else if "!BUILD_ENVIRONMENT!" == "VS9" ( + if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 9 2008 Win64" ) else ( set CMAKE_GENERATOR="Visual Studio 9 2008" ) - ) else if "%BUILD_ENVIRONMENT%" == "VS10" ( - if "%ARCH%" == "amd64" ( + ) else if "!BUILD_ENVIRONMENT!" == "VS10" ( + if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 10 Win64" ) else ( set CMAKE_GENERATOR="Visual Studio 10" ) - ) else if "%BUILD_ENVIRONMENT%" == "VS11" ( - if "%ARCH%" == "amd64" ( + ) else if "!BUILD_ENVIRONMENT!" == "VS11" ( + if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 11 Win64" - ) else if "%ARCH%" == "arm" ( + ) else if "!ARCH!" == "arm" ( set CMAKE_GENERATOR="Visual Studio 11 ARM" ) else ( set CMAKE_GENERATOR="Visual Studio 11" @@ -111,7 +118,7 @@ :: Checkpoint if not defined ARCH ( - echo unknown build architecture + echo Unknown build architecture exit /b )

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2012