Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

by fireball＠svn.reactos.org

Author: fireball Date: Sat May 8 22:38:58 2010 New Revision: 47135 URL: http://svn.reactos.org/svn/reactos?rev=47135&view=rev Log: - Fix release build. Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Sat May 8 22:38:58 2010 @@ -5,13 +5,13 @@ <library>freeldr_startup</library> <library>freeldr_base64k</library> <library>freeldr_base</library> + <library>mini_hal</library> <library>freeldr_arch</library> <library>setupldr_main</library> <library>rossym</library> <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> - <library>mini_hal</library> <group linkerset="ld"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag>

14 years, 4 months

[khornicek] 47134: [WIN32K] - Bring back support for RLE compressed bitmaps. - Merge the decompress functions for 4bb and 8bpp bitmaps to one generic function. - Simplify SURFMEM_bCreateDib a bit by not allowing PNG/JPEG compression at all. See issue #5276 for more details.

by khornicek＠svn.reactos.org

Author: khornicek Date: Sat May 8 20:09:45 2010 New Revision: 47134 URL: http://svn.reactos.org/svn/reactos?rev=47134&view=rev Log: [WIN32K] - Bring back support for RLE compressed bitmaps. - Merge the decompress functions for 4bb and 8bpp bitmaps to one generic function. - Simplify SURFMEM_bCreateDib a bit by not allowing PNG/JPEG compression at all. See issue #5276 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sat May 8 20:09:45 2010 @@ -204,48 +204,59 @@ return NewBitmap; } -VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) -{ - int x = 0; - int y = Size.cy - 1; - int c; - int length; - int width = ((Size.cx+1)/2); - int height = Size.cy - 1; +BOOL DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG Format) +{ + INT x = 0; + INT y = Size.cy - 1; + INT c; + INT length; + INT width; + INT height = Size.cy - 1; BYTE *begin = CompressedBits; BYTE *bits = CompressedBits; BYTE *temp; - while (y >= 0) - { - length = *bits++ / 2; - if (length) - { - c = *bits++; - while (length--) - { - if (x >= width) break; - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - else - { - length = *bits++; - switch (length) - { + INT shift = 0; + + if (Format == BMF_4RLE) + shift = 1; + else if(Format != BMF_8RLE) + return FALSE; + + width = ((Size.cx + shift) >> shift); + + _SEH2_TRY + { + while (y >= 0) + { + length = (*bits++) >> shift; + if (length) + { + c = *bits++; + while (length--) + { + if (x >= width) break; + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } + } + else + { + length = *bits++; + switch (length) + { case RLE_EOL: x = 0; y--; break; case RLE_END: - return; + _SEH2_YIELD(return TRUE); case RLE_DELTA: - x += (*bits++)/2; - y -= (*bits++)/2; + x += (*bits++) >> shift; + y -= (*bits++) >> shift; break; default: - length /= 2; + length = length >> shift; while (length--) { c = *bits++; @@ -260,69 +271,18 @@ { bits++; } - } - } - } -} - -VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) -{ - int x = 0; - int y = Size.cy - 1; - int c; - int length; - int width = Size.cx; - int height = Size.cy - 1; - BYTE *begin = CompressedBits; - BYTE *bits = CompressedBits; - BYTE *temp; - while (y >= 0) - { - length = *bits++; - if (length) - { - c = *bits++; - while (length--) - { - if (x >= width) break; - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - else - { - length = *bits++; - switch (length) - { - case RLE_EOL: - x = 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x += *bits++; - y -= *bits++; - break; - default: - while (length--) - { - c = *bits++; - if (x < width) - { - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - if ((bits - begin) & 1) - { - bits++; - } - } - } - } + } + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Decoding error\n"); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + return TRUE; } HBITMAP FASTCALL @@ -362,7 +322,7 @@ pso->cjBits = pso->lDelta * Size.cy; UncompressedFormat = BMF_4BPP; UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); + DecompressBitmap(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta, Format); } else if (Format == BMF_8RLE) { @@ -370,7 +330,7 @@ pso->cjBits = pso->lDelta * Size.cy; UncompressedFormat = BMF_8BPP; UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); + DecompressBitmap(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta, Format); } else { @@ -467,6 +427,7 @@ PSURFACE psurf; SIZEL LocalSize; BOOLEAN AllocatedLocally = FALSE; + PVOID DecompressedBits = NULL; /* * First, check the format so we can get the aligned scanline width. @@ -500,17 +461,29 @@ break; case BMF_8RLE: + ScanLine = (BitmapInfo->Width + 3) & ~3; + Compressed = TRUE; + break; case BMF_4RLE: + ScanLine = ((BitmapInfo->Width + 7) & ~7) >> 1; + Compressed = TRUE; + break; + case BMF_JPEG: case BMF_PNG: - Compressed = TRUE; - break; + ASSERT(FALSE); // ENGDDI shouldn't be creating PNGs for drivers ;-) + DPRINT1("No support for JPEG and PNG formats\n"); + return NULL; default: DPRINT1("Invalid bitmap format\n"); return NULL; } + /* Save local bitmap size */ + LocalSize.cy = BitmapInfo->Height; + LocalSize.cx = BitmapInfo->Width; + /* Does the device manage its own surface? */ if (!Bits) { @@ -519,7 +492,8 @@ { /* Note: we should not be seeing this scenario from ENGDDI */ ASSERT(FALSE); - Size = BitmapInfo->Size; + DPRINT1("RLE compressed bitmap requested with no valid bitmap bits\n"); + return NULL; } else { @@ -551,6 +525,22 @@ { /* Should not have asked for user memory */ ASSERT((BitmapInfo->Flags & BMF_USERMEM) == 0); + + if (Compressed) + { + DecompressedBits = EngAllocMem(FL_ZERO_MEMORY, BitmapInfo->Height * ScanLine, TAG_DIB); + + if(!DecompressedBits) + return NULL; + + if(!DecompressBitmap(LocalSize, (BYTE *)Bits, (BYTE *)DecompressedBits, ScanLine, BitmapInfo->Format)) + { + EngFreeMem(DecompressedBits); + return NULL; + } + + BitmapInfo->Format = (BitmapInfo->Format == BMF_4RLE) ? BMF_4BPP : BMF_8BPP; + } } /* Allocate the actual surface object structure */ @@ -564,6 +554,8 @@ else EngFreeMem(Bits); } + if (DecompressedBits) + EngFreeMem(DecompressedBits); return NULL; } @@ -584,11 +576,9 @@ pso->fjBitmap = BitmapInfo->Flags & (BMF_TOPDOWN | BMF_UMPDMEM | BMF_USERMEM); /* Save size and type */ - LocalSize.cy = BitmapInfo->Height; - LocalSize.cx = BitmapInfo->Width; pso->sizlBitmap = LocalSize; pso->iType = STYPE_BITMAP; - + /* Device-managed surface, no flags or dimension */ pso->dhsurf = 0; pso->dhpdev = NULL; @@ -599,48 +589,28 @@ psurf->hSecure = NULL; psurf->hDIBSection = NULL; psurf->flHooks = 0; - + /* Set bits */ - pso->pvBits = Bits; - - /* Check for bitmap type */ - if (!Compressed) - { - /* Number of bits is based on the height times the scanline */ - pso->cjBits = BitmapInfo->Height * ScanLine; - if (BitmapInfo->Flags & BMF_TOPDOWN) - { - /* For topdown, the base address starts with the bits */ - pso->pvScan0 = pso->pvBits; - pso->lDelta = ScanLine; - } - else - { - /* Otherwise we start with the end and go up */ - pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ScanLine); - pso->lDelta = -ScanLine; - } + if(Compressed) + pso->pvBits = DecompressedBits; + else + pso->pvBits = Bits; + + /* Number of bits is based on the height times the scanline */ + pso->cjBits = BitmapInfo->Height * ScanLine; + if (BitmapInfo->Flags & BMF_TOPDOWN) + { + /* For topdown, the base address starts with the bits */ + pso->pvScan0 = pso->pvBits; + pso->lDelta = ScanLine; } else { - /* Compressed surfaces don't have scanlines! */ - pso->lDelta = 0; - pso->cjBits = BitmapInfo->Size; - - /* Check for JPG or PNG */ - if ((BitmapInfo->Format != BMF_JPEG) && (BitmapInfo->Format != BMF_PNG)) - { - /* Wherever the bit data is */ - pso->pvScan0 = pso->pvBits; - } - else - { - /* Fancy formats don't use a base address */ - pso->pvScan0 = NULL; - ASSERT(FALSE); // ENGDDI shouldn't be creating PNGs for drivers ;-) - } - } - + /* Otherwise we start with the end and go up */ + pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ScanLine); + pso->lDelta = -ScanLine; + } + /* Finally set the handle and uniq */ pso->hsurf = (HSURF)psurf->BaseObject.hHmgr; pso->iUniq = 0;

14 years, 4 months

[jgardou] 47133: Sync with trunk r47129

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat May 8 19:23:51 2010 New Revision: 47133 URL: http://svn.reactos.org/svn/reactos?rev=47133&view=rev Log: Sync with trunk r47129 Added: branches/reactos-yarotows/base/system/winlogon/environment.c - copied unchanged from r47132, trunk/reactos/base/system/winlogon/environment.c branches/reactos-yarotows/include/reactos/wine/commctrl.h - copied unchanged from r47132, trunk/reactos/include/reactos/wine/commctrl.h Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/base/applications/wordpad/wordpad.rbuild branches/reactos-yarotows/base/shell/explorer/taskbar/traynotify.cpp branches/reactos-yarotows/base/system/winlogon/sas.c branches/reactos-yarotows/base/system/winlogon/winlogon.c branches/reactos-yarotows/base/system/winlogon/winlogon.h branches/reactos-yarotows/base/system/winlogon/winlogon.rbuild branches/reactos-yarotows/dll/cpl/usrmgr/usrmgr.rbuild branches/reactos-yarotows/dll/win32/comctl32/comctl32.rbuild branches/reactos-yarotows/dll/win32/gdi32/objects/region.c branches/reactos-yarotows/dll/win32/netcfgx/netcfgx.rbuild branches/reactos-yarotows/dll/win32/netshell/netshell.rbuild branches/reactos-yarotows/dll/win32/user32/user32.rbuild branches/reactos-yarotows/dll/win32/userenv/environment.c branches/reactos-yarotows/include/psdk/commctrl.h branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/include/msgqueue.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/focus.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/winpos.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/shell/explorer/taskbar/traynotify.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/shell/exp… Modified: branches/reactos-yarotows/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/usrmgr… Modified: branches/reactos-yarotows/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/comc… Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… Modified: branches/reactos-yarotows/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/netc… Modified: branches/reactos-yarotows/dll/win32/netshell/netshell.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/nets… Modified: branches/reactos-yarotows/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/c… Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…

14 years, 4 months

[tkreuzer] 47132: Revert r47130, it was already comitted.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 8 18:42:03 2010 New Revision: 47132 URL: http://svn.reactos.org/svn/reactos?rev=47132&view=rev Log: Revert r47130, it was already comitted. Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] Sat May 8 18:42:03 2010 @@ -21,8 +21,6 @@ /* The default pen should be GetStockObject(BLACK_PEN) */ hObj = SelectObject(hDC, GetStockObject(WHITE_PEN)); TEST(hObj == GetStockObject(BLACK_PEN)); - - TEST(NtGdiDeleteObjectApp(hDC) != 0); TEST(NtGdiDeleteObjectApp(hDC) != 0); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Sat May 8 18:42:03 2010 @@ -23,27 +23,7 @@ TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); - - /* Delete a display DC */ - SetLastError(0); - hdc = CreateDC("DISPLAY", NULL, NULL, NULL); - ASSERT(IsHandleValid(hdc) == 1); - TEST(NtGdiDeleteObjectApp(hdc) != 0); - TEST(GetLastError() == 0); - TEST(IsHandleValid(hdc) == 1); - TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); - TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); - - /* Once more */ - SetLastError(0); - hdc = GetDC(0); - ASSERT(IsHandleValid(hdc) == 1); - TEST(NtGdiDeleteObjectApp(hdc) != 0); - TEST(GetLastError() == 0); - TEST(IsHandleValid(hdc) == 1); - TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); - TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); - + /* Delete a display DC */ SetLastError(0); hdc = CreateDC("DISPLAY", NULL, NULL, NULL);

14 years, 4 months

[jgardou] 47131: [WIN32K] - Allow NtGdiDeleteObjectApp to delete a permanent DC, as windows does it. This is not exactly what windows does, but no one should use a DeletedDC'ed DC anyway. Fixes "No! You Naughty Application" debug spam and some wine tests

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat May 8 18:41:41 2010 New Revision: 47131 URL: http://svn.reactos.org/svn/reactos?rev=47131&view=rev Log: [WIN32K] - Allow NtGdiDeleteObjectApp to delete a permanent DC, as windows does it. This is not exactly what windows does, but no one should use a DeletedDC'ed DC anyway. Fixes "No! You Naughty Application" debug spam and some wine tests Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat May 8 18:41:41 2010 @@ -801,11 +801,28 @@ if (!Force) { + /* Windows permits NtGdiDeleteObjectApp to delete a permanent DC + * For some reason, it's still a valid handle, pointing to some kernel data. + * Not sure if this is a bug, a feature, some cache stuff... Who knows? + * See NtGdiDeleteObjectApp test for details */ if (DCToDelete->fs & DC_FLAG_PERMANENT) { - DPRINT1("No! You Naughty Application!\n"); DC_UnlockDc(DCToDelete); - return UserReleaseDC(NULL, hDC, FALSE); + if(UserReleaseDC(NULL, hDC, FALSE)) + { + /* ReactOs feature : call UserReleaseDC + * I don't think windows does it. + * Still, complain, no one should ever call DeleteDC + * on a window DC */ + DPRINT1("No, you naughty application!\n"); + return TRUE; + } + else + { + /* This is not a window owned DC. + * Force its deletion */ + return IntGdiDeleteDC(hDC, TRUE); + } } }

14 years, 4 months

[tkreuzer] 47130: [w32knapi} Patch by Jerome Gardou: add some more tests for NtGdiDeleteObjectApp

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 8 18:38:05 2010 New Revision: 47130 URL: http://svn.reactos.org/svn/reactos?rev=47130&view=rev Log: [w32knapi} Patch by Jerome Gardou: add some more tests for NtGdiDeleteObjectApp Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] Sat May 8 18:38:05 2010 @@ -21,6 +21,8 @@ /* The default pen should be GetStockObject(BLACK_PEN) */ hObj = SelectObject(hDC, GetStockObject(WHITE_PEN)); TEST(hObj == GetStockObject(BLACK_PEN)); + + TEST(NtGdiDeleteObjectApp(hDC) != 0); TEST(NtGdiDeleteObjectApp(hDC) != 0); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Sat May 8 18:38:05 2010 @@ -23,7 +23,27 @@ TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); - + + /* Delete a display DC */ + SetLastError(0); + hdc = CreateDC("DISPLAY", NULL, NULL, NULL); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + + /* Once more */ + SetLastError(0); + hdc = GetDC(0); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + /* Delete a display DC */ SetLastError(0); hdc = CreateDC("DISPLAY", NULL, NULL, NULL);

14 years, 4 months

[ekohl] 47129: [WINLOGON] - Move environment creation to a separate file. - Impersonate the new user and create the 'Volatile Environment' key for the new user.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat May 8 18:30:56 2010 New Revision: 47129 URL: http://svn.reactos.org/svn/reactos?rev=47129&view=rev Log: [WINLOGON] - Move environment creation to a separate file. - Impersonate the new user and create the 'Volatile Environment' key for the new user. Added: trunk/reactos/base/system/winlogon/environment.c (with props) Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/winlogon.rbuild Added: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… ============================================================================== --- trunk/reactos/base/system/winlogon/environment.c (added) +++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Sat May 8 18:30:56 2010 @@ -1,0 +1,129 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Winlogon + * FILE: base/system/winlogon/environment.c + * PURPOSE: User environment routines + * PROGRAMMERS: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * Hervé Poussineau (hpoussin(a)reactos.org) + * Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "winlogon.h" + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(winlogon); + +/* GLOBALS ******************************************************************/ + + +/* FUNCTIONS ****************************************************************/ + +BOOL +CreateUserEnvironment(IN PWLSESSION Session, + IN LPVOID *lpEnvironment, + IN LPWSTR *lpFullEnv) +{ + LPCWSTR wstr; + SIZE_T EnvBlockSize = 0, ProfileSize = 0; + LPVOID lpEnviron = NULL; + LPWSTR lpFullEnviron = NULL; + HKEY hKey; + DWORD dwDisp; + LONG lError; + HKEY hKeyCurrentUser; + + TRACE("WL: CreateUserEnvironment called\n"); + + /* Create environment block for the user */ + if (!CreateEnvironmentBlock(&lpEnviron, + Session->UserToken, + TRUE)) + { + WARN("WL: CreateEnvironmentBlock() failed\n"); + return FALSE; + } + + if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) + { + /* Count required size for full environment */ + wstr = (LPCWSTR)lpEnviron; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + EnvBlockSize += size; + } + + wstr = Session->Profile->pszEnvironment; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + ProfileSize += size; + } + + /* Allocate enough memory */ + lpFullEnviron = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); + if (!lpFullEnviron) + { + TRACE("HeapAlloc() failed\n"); + return FALSE; + } + + /* Fill user environment block */ + CopyMemory(lpFullEnviron, + lpEnviron, + EnvBlockSize * sizeof(WCHAR)); + CopyMemory(&lpFullEnviron[EnvBlockSize], + Session->Profile->pszEnvironment, + ProfileSize * sizeof(WCHAR)); + lpFullEnviron[EnvBlockSize + ProfileSize] = UNICODE_NULL; + } + else + { + lpFullEnviron = (LPWSTR)lpEnviron; + } + + /* Impersonate the new user */ + ImpersonateLoggedOnUser(Session->UserToken); + + /* Open the new users HKCU key */ + lError = RegOpenCurrentUser(KEY_CREATE_SUB_KEY, + &hKeyCurrentUser); + if (lError == ERROR_SUCCESS) + { + /* Create the 'Volatile Environment' key */ + lError = RegCreateKeyExW(hKeyCurrentUser, + L"Volatile Environment", + 0, + NULL, + REG_OPTION_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + &dwDisp); + if (lError == ERROR_SUCCESS) + { + RegCloseKey(hKey); + } + else + { + WARN("WL: RegCreateKeyExW() failed (Error: %ld)\n", lError); + } + + RegCloseKey(hKeyCurrentUser); + } + + /* Revert the impersonation */ + RevertToSelf(); + + *lpEnvironment = lpEnviron; + *lpFullEnv = lpFullEnviron; + + TRACE("WL: CreateUserEnvironment done\n"); + + return TRUE; +} Propchange: trunk/reactos/base/system/winlogon/environment.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/winlogon/environment.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat May 8 18:30:56 2010 @@ -171,8 +171,6 @@ PROFILEINFOW ProfileInfo; LPVOID lpEnvironment = NULL; LPWSTR lpFullEnv = NULL; - LPCWSTR wstr; - SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; @@ -210,55 +208,10 @@ } /* Create environment block for the user */ - if (!CreateEnvironmentBlock( - &lpEnvironment, - Session->UserToken, - TRUE)) - { - WARN("WL: CreateEnvironmentBlock() failed\n"); - goto cleanup; - } - - if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) - { - /* Count required size for full environment */ - wstr = (LPCWSTR)lpEnvironment; - while (*wstr != UNICODE_NULL) - { - SIZE_T size = wcslen(wstr) + 1; - wstr += size; - EnvBlockSize += size; - } - wstr = Session->Profile->pszEnvironment; - while (*wstr != UNICODE_NULL) - { - SIZE_T size = wcslen(wstr) + 1; - wstr += size; - ProfileSize += size; - } - - /* Allocate enough memory */ - lpFullEnv = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); - if (!lpFullEnv) - { - TRACE("HeapAlloc() failed\n"); - goto cleanup; - } - - /* Fill user environment block */ - CopyMemory( - lpFullEnv, - lpEnvironment, - EnvBlockSize * sizeof(WCHAR)); - CopyMemory( - &lpFullEnv[EnvBlockSize], - Session->Profile->pszEnvironment, - ProfileSize * sizeof(WCHAR)); - lpFullEnv[EnvBlockSize + ProfileSize] = UNICODE_NULL; - } - else - { - lpFullEnv = (LPWSTR)lpEnvironment; + if (!CreateUserEnvironment(Session, &lpEnvironment, &lpFullEnv)) + { + WARN("WL: SetUserEnvironment() failed\n"); + goto cleanup; } DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sat May 8 18:30:56 2010 @@ -179,6 +179,12 @@ BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwUnknown, DWORD dwReserved); + +/* environment.c */ +BOOL +CreateUserEnvironment(IN PWLSESSION Session, + IN LPVOID *lpEnvironment, + IN LPWSTR *lpFullEnv); /* sas.c */ BOOL Modified: trunk/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] Sat May 8 18:30:56 2010 @@ -8,6 +8,7 @@ <library>advapi32</library> <library>userenv</library> <library>secur32</library> + <file>environment.c</file> <file>sas.c</file> <file>screensaver.c</file> <file>setup.c</file>

14 years, 4 months

[gschneider] 47128: Add some win32k/gdi DC tests created by Jerome Gardou

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat May 8 18:27:36 2010 New Revision: 47128 URL: http://svn.reactos.org/svn/reactos?rev=47128&view=rev Log: Add some win32k/gdi DC tests created by Jerome Gardou Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] Sat May 8 18:27:36 2010 @@ -22,6 +22,8 @@ hObj = SelectObject(hDC, GetStockObject(WHITE_PEN)); TEST(hObj == GetStockObject(BLACK_PEN)); + TEST(NtGdiDeleteObjectApp(hDC) != 0); + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Sat May 8 18:27:36 2010 @@ -16,13 +16,33 @@ TEST(NtGdiDeleteObjectApp((PVOID)(GDI_HANDLE_STOCK_MASK | 0x1234)) == 1); TEST(GetLastError() == 0); - /* Delete a DC */ + /* Delete a compatible DC */ SetLastError(0); hdc = CreateCompatibleDC(NULL); ASSERT(IsHandleValid(hdc) == 1); TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); + + /* Delete a display DC */ + SetLastError(0); + hdc = CreateDC("DISPLAY", NULL, NULL, NULL); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + + /* Once more */ + SetLastError(0); + hdc = GetDC(0); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); /* Delete a brush */ SetLastError(0);

14 years, 4 months

[spetreolle] 47127: Disable test_GetLongPathNameW() in kernel32:path test for now. Fixes testbot crash, bug 5370

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat May 8 18:27:15 2010 New Revision: 47127 URL: http://svn.reactos.org/svn/reactos?rev=47127&view=rev Log: Disable test_GetLongPathNameW() in kernel32:path test for now. Fixes testbot crash, bug 5370 Modified: trunk/rostests/winetests/kernel32/path.c Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… ============================================================================== --- trunk/rostests/winetests/kernel32/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/path.c [iso-8859-1] Sat May 8 18:27:15 2010 @@ -1601,7 +1601,8 @@ test_CleanupPathA(origdir,curdir); test_GetTempPath(); test_GetLongPathNameA(); - test_GetLongPathNameW(); + skip("skipping test_GetLongPathNameW(), bug 5370\n"); + //test_GetLongPathNameW(); test_GetShortPathNameW(); test_GetSystemDirectory(); test_GetWindowsDirectory();

14 years, 4 months

[mjmartin] 47126: [win32k] - Modify how non-queued messages are send that originate from the Win23k subsystem. Non-queued messages must go directly to the windows WNDPROC and not through the message pump (previews ROS behavior). More importantly sending these messages must not cause the sending thread to block waiting for a reply. - Add a messaging handling function that always sends message from Win32k to the windows thread without waiting. This will also allow the implementation of message cal

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat May 8 17:49:02 2010 New Revision: 47126 URL: http://svn.reactos.org/svn/reactos?rev=47126&view=rev Log: [win32k] - Modify how non-queued messages are send that originate from the Win23k subsystem. Non-queued messages must go directly to the windows WNDPROC and not through the message pump (previews ROS behavior). More importantly sending these messages must not cause the sending thread to block waiting for a reply. - Add a messaging handling function that always sends message from Win32k to the windows thread without waiting. This will also allow the implementation of message call back later. - Modify PackParam and UnpackParam to accept a BOOL value to determine whether LParam needs to be allocated from NonPagedPool. Use with new message handling as if message sent to another thread have any pointers they must be allocated from NonPagedPool. - Fixed broken logic in can_active_window function and co_WinPosShowWindow. - Fixed broken logic in co_IntSendActivateMessages. The WM_ACTIVATEAPP message was being sent to every window belonging to the desktop twice. Once with flag saying window was activated and again with deactivated. - These changes should fix bugs #969, #3171, #4501, #4676, #4677, #4948. Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sat May 8 17:49:02 2010 @@ -6,6 +6,7 @@ #define MSQ_NORMAL 0 #define MSQ_ISHOOK 1 #define MSQ_ISEVENT 2 +#define MSQ_SENTNOWAIT 0x80000000 typedef struct _USER_MESSAGE { @@ -28,6 +29,7 @@ /* entry in the dispatching list of the sender's message queue */ LIST_ENTRY DispatchingListEntry; INT HookMessage; + BOOL HasPackedLParam; } USER_SENT_MESSAGE, *PUSER_SENT_MESSAGE; typedef struct _USER_SENT_MESSAGE_NOTIFY @@ -184,6 +186,20 @@ UINT uFlags, UINT uTimeout, ULONG_PTR *uResult); + +LRESULT FASTCALL co_IntSendMessageNoWait(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); +LRESULT FASTCALL +co_IntSendMessageWithCallBack(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + SENDASYNCPROC CompletionCallback, + ULONG_PTR CompletionCallbackContext, + ULONG_PTR *uResult); + LRESULT FASTCALL IntDispatchMessage(MSG* Msg); BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Sat May 8 17:49:02 2010 @@ -53,8 +53,8 @@ { if (hWndPrev) { - co_IntPostOrSendMessage(hWndPrev, WM_NCACTIVATE, FALSE, 0); - co_IntPostOrSendMessage(hWndPrev, WM_ACTIVATE, + co_IntSendMessageNoWait(hWndPrev, WM_NCACTIVATE, FALSE, 0); + co_IntSendMessageNoWait(hWndPrev, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, UserGetWindowLong(hWndPrev, GWL_STYLE, FALSE) & WS_MINIMIZE), (LPARAM)hWnd); } @@ -105,38 +105,19 @@ if (Window && WindowPrev) { - PWINDOW_OBJECT cWindow; - HWND *List, *phWnd; HANDLE OldTID = IntGetWndThreadId(WindowPrev); HANDLE NewTID = IntGetWndThreadId(Window); - DPRINT("SendActiveMessage Old -> %x, New -> %x\n", OldTID, NewTID); + DPRINT1("SendActiveMessage Old -> %x, New -> %x\n", OldTID, NewTID); + if (Window->Wnd->style & WS_MINIMIZE) + { + DPRINT1("Widow was nminimized\n"); + } if (OldTID != NewTID) { - List = IntWinListChildren(UserGetWindowObject(IntGetDesktopWindow())); - if (List) - { - for (phWnd = List; *phWnd; ++phWnd) - { - cWindow = UserGetWindowObject(*phWnd); - if (cWindow && (IntGetWndThreadId(cWindow) == OldTID)) - { // FALSE if the window is being deactivated, - // ThreadId that owns the window being activated. - co_IntPostOrSendMessage(*phWnd, WM_ACTIVATEAPP, FALSE, (LPARAM)NewTID); - } - } - for (phWnd = List; *phWnd; ++phWnd) - { - cWindow = UserGetWindowObject(*phWnd); - if (cWindow && (IntGetWndThreadId(cWindow) == NewTID)) - { // TRUE if the window is being activated, - // ThreadId that owns the window being deactivated. - co_IntPostOrSendMessage(*phWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)OldTID); - } - } - ExFreePool(List); - } + co_IntSendMessageNoWait(hWndPrev, WM_ACTIVATEAPP, FALSE, (LPARAM)NewTID); + co_IntSendMessageNoWait(hWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)OldTID); } UserDerefObjectCo(WindowPrev); // Now allow the previous window to die. } @@ -144,10 +125,9 @@ UserDerefObjectCo(Window); /* FIXME: IntIsWindow */ - - co_IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(hWnd == UserGetForegroundWindow()), 0); + co_IntSendMessageNoWait(hWnd, WM_NCACTIVATE, (WPARAM)(hWnd == UserGetForegroundWindow()), 0); /* FIXME: WA_CLICKACTIVE */ - co_IntPostOrSendMessage(hWnd, WM_ACTIVATE, + co_IntSendMessageNoWait(hWnd, WM_ACTIVATE, MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, UserGetWindowLong(hWnd, GWL_STYLE, FALSE) & WS_MINIMIZE), (LPARAM)hWndPrev); @@ -241,7 +221,9 @@ co_IntSendDeactivateMessages(hWndPrev, hWnd); co_IntSendKillFocusMessages(hWndFocusPrev, hWndFocus); + IntSetFocusMessageQueue(Window->pti->MessageQueue); + if (Window->pti->MessageQueue) { Window->pti->MessageQueue->ActiveWindow = hWnd; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat May 8 17:49:02 2010 @@ -165,7 +165,7 @@ } static NTSTATUS -PackParam(LPARAM *lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam) +PackParam(LPARAM *lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL NonPagedPoolNeeded) { NCCALCSIZE_PARAMS *UnpackedNcCalcsize; NCCALCSIZE_PARAMS *PackedNcCalcsize; @@ -173,28 +173,34 @@ CREATESTRUCTW *PackedCs; PUNICODE_STRING WindowName; PUNICODE_STRING ClassName; + POOL_TYPE PoolType; UINT Size; PCHAR CsData; *lParamPacked = lParam; + + if (NonPagedPoolNeeded) + PoolType = NonPagedPool; + else + PoolType = PagedPool; + if (WM_NCCALCSIZE == Msg && wParam) { + UnpackedNcCalcsize = (NCCALCSIZE_PARAMS *) lParam; - if (UnpackedNcCalcsize->lppos != (PWINDOWPOS) (UnpackedNcCalcsize + 1)) - { - PackedNcCalcsize = ExAllocatePoolWithTag(PagedPool, - sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS), - TAG_MSG); - if (NULL == PackedNcCalcsize) - { - DPRINT1("Not enough memory to pack lParam\n"); - return STATUS_NO_MEMORY; - } - RtlCopyMemory(PackedNcCalcsize, UnpackedNcCalcsize, sizeof(NCCALCSIZE_PARAMS)); - PackedNcCalcsize->lppos = (PWINDOWPOS) (PackedNcCalcsize + 1); - RtlCopyMemory(PackedNcCalcsize->lppos, UnpackedNcCalcsize->lppos, sizeof(WINDOWPOS)); - *lParamPacked = (LPARAM) PackedNcCalcsize; - } + PackedNcCalcsize = ExAllocatePoolWithTag(PoolType, + sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS), + TAG_MSG); + + if (NULL == PackedNcCalcsize) + { + DPRINT1("Not enough memory to pack lParam\n"); + return STATUS_NO_MEMORY; + } + RtlCopyMemory(PackedNcCalcsize, UnpackedNcCalcsize, sizeof(NCCALCSIZE_PARAMS)); + PackedNcCalcsize->lppos = (PWINDOWPOS) (PackedNcCalcsize + 1); + RtlCopyMemory(PackedNcCalcsize->lppos, UnpackedNcCalcsize->lppos, sizeof(WINDOWPOS)); + *lParamPacked = (LPARAM) PackedNcCalcsize; } else if (WM_CREATE == Msg || WM_NCCREATE == Msg) { @@ -210,7 +216,7 @@ { Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR); } - PackedCs = ExAllocatePoolWithTag(PagedPool, Size, TAG_MSG); + PackedCs = ExAllocatePoolWithTag(PoolType, Size, TAG_MSG); if (NULL == PackedCs) { DPRINT1("Not enough memory to pack lParam\n"); @@ -244,11 +250,28 @@ *lParamPacked = (LPARAM) PackedCs; } + else if (PoolType == NonPagedPool) + { + PMSGMEMORY MsgMemoryEntry; + PVOID PackedData; + + MsgMemoryEntry = FindMsgMemory(Msg); + + if ((!MsgMemoryEntry) || (MsgMemoryEntry->Size < 0)) + { + /* Keep previous behavior */ + return STATUS_SUCCESS; + } + PackedData = ExAllocatePoolWithTag(NonPagedPool, MsgMemorySize(MsgMemoryEntry, wParam, lParam), TAG_MSG); + RtlCopyMemory(PackedData, (PVOID)lParam, MsgMemorySize(MsgMemoryEntry, wParam, lParam)); + *lParamPacked = (LPARAM)PackedData; + } + return STATUS_SUCCESS; } static NTSTATUS -UnpackParam(LPARAM lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam) +UnpackParam(LPARAM lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL NonPagedPoolUsed) { NCCALCSIZE_PARAMS *UnpackedParams; NCCALCSIZE_PARAMS *PackedParams; @@ -275,6 +298,23 @@ { ExFreePool((PVOID) lParamPacked); + return STATUS_SUCCESS; + } + else if (NonPagedPoolUsed) + { + PMSGMEMORY MsgMemoryEntry; + MsgMemoryEntry = FindMsgMemory(Msg); + if (MsgMemoryEntry->Size < 0) + { + /* Keep previous behavior */ + return STATUS_INVALID_PARAMETER; + } + + if (MsgMemory->Flags == MMS_FLAG_READWRITE) + { + //RtlCopyMemory((PVOID)lParam, (PVOID)lParamPacked, MsgMemory->Size); + } + ExFreePool((PVOID) lParamPacked); return STATUS_SUCCESS; } @@ -394,7 +434,7 @@ lParamBufferSize = MsgMemorySize(MsgMemoryEntry, pMsg->wParam, pMsg->lParam); } - if (! NT_SUCCESS(PackParam(&lParamPacked, pMsg->message, pMsg->wParam, pMsg->lParam))) + if (! NT_SUCCESS(PackParam(&lParamPacked, pMsg->message, pMsg->wParam, pMsg->lParam, FALSE))) { DPRINT1("Failed to pack message parameters\n"); return 0; @@ -408,7 +448,7 @@ lParamPacked, lParamBufferSize); - if (! NT_SUCCESS(UnpackParam(lParamPacked, pMsg->message, pMsg->wParam, pMsg->lParam))) + if (! NT_SUCCESS(UnpackParam(lParamPacked, pMsg->message, pMsg->wParam, pMsg->lParam, FALSE))) { DPRINT1("Failed to unpack message parameters\n"); } @@ -1372,7 +1412,7 @@ lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); } - if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam))) + if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam, FALSE))) { DPRINT1("Failed to pack message parameters\n"); RETURN( FALSE); @@ -1392,7 +1432,7 @@ IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam))) + if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { DPRINT1("Failed to unpack message parameters\n"); RETURN( TRUE); @@ -1499,6 +1539,148 @@ return (LRESULT) TRUE; } +LRESULT FASTCALL co_IntSendMessageNoWait(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + ULONG_PTR Result = 0; + co_IntSendMessageWithCallBack(hWnd, + Msg, + wParam, + lParam, + NULL, + 0, + &Result); + return Result; +} + +LRESULT FASTCALL +co_IntSendMessageWithCallBack( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + SENDASYNCPROC CompletionCallback, + ULONG_PTR CompletionCallbackContext, + ULONG_PTR *uResult) +{ + ULONG_PTR Result; + PWINDOW_OBJECT Window = NULL; + PMSGMEMORY MsgMemoryEntry; + INT lParamBufferSize; + LPARAM lParamPacked; + PTHREADINFO Win32Thread; + DECLARE_RETURN(LRESULT); + USER_REFERENCE_ENTRY Ref; + PUSER_SENT_MESSAGE Message; + + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN(FALSE); + } + + UserRefObjectCo(Window, &Ref); + + if (Window->state & WINDOWSTATUS_DESTROYING) + { + /* FIXME - last error? */ + DPRINT1("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); + RETURN(FALSE); + } + + Win32Thread = PsGetCurrentThreadWin32Thread(); + + IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + + if (Win32Thread == NULL) + { + ASSERT(FALSE); + RETURN(FALSE); + } + + if (Win32Thread->TIF_flags & TIF_INCLEANUP) + { + /* Never send messages to exiting threads */ + RETURN(FALSE); + } + + /* See if this message type is present in the table */ + MsgMemoryEntry = FindMsgMemory(Msg); + if (NULL == MsgMemoryEntry) + { + lParamBufferSize = -1; + } + else + { + lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); + } + + if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam, Window->pti->MessageQueue != Win32Thread->MessageQueue))) + { + DPRINT1("Failed to pack message parameters\n"); + RETURN( FALSE); + } + + /* If this is not a callback and it can be sent now, then send it. */ + if ((Window->pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + { + + Result = (ULONG_PTR)co_IntCallWindowProc( Window->Wnd->lpfnWndProc, + !Window->Wnd->Unicode, + hWnd, + Msg, + wParam, + lParamPacked, + lParamBufferSize ); + if(uResult) + { + *uResult = Result; + } + } + + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); + + if (Window->pti->MessageQueue == Win32Thread->MessageQueue) + { + if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) + { + DPRINT1("Failed to unpack message parameters\n"); + RETURN(TRUE); + } + RETURN(TRUE); + } + + if(!(Message = ExAllocatePoolWithTag(NonPagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) + { + DPRINT1("MsqSendMessage(): Not enough memory to allocate a message"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Message->Msg.hwnd = hWnd; + Message->Msg.message = Msg; + Message->Msg.wParam = wParam; + Message->Msg.lParam = lParamPacked; + Message->CompletionEvent = NULL; + Message->Result = 0; + Message->SenderQueue = Win32Thread->MessageQueue; + IntReferenceMessageQueue(Message->SenderQueue); + IntReferenceMessageQueue(Window->pti->MessageQueue); + Message->CompletionCallback = CompletionCallback; + Message->CompletionCallbackContext = CompletionCallbackContext; + Message->HookMessage = MSQ_NORMAL | MSQ_SENTNOWAIT; + Message->HasPackedLParam = (lParamBufferSize > 0); + + InsertTailList(&Window->pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); + InsertTailList(&Win32Thread->MessageQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + IntDereferenceMessageQueue(Window->pti->MessageQueue); + IntDereferenceMessageQueue(Message->SenderQueue); + + RETURN(TRUE); + +CLEANUP: + if (Window) UserDerefObjectCo(Window); + END_CLEANUP; +} /* This function posts a message if the destination's message queue belongs to another thread, otherwise it sends the message. It does not support broadcast Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat May 8 17:49:02 2010 @@ -969,7 +969,7 @@ /* remove the message from the dispatching list, so lock the sender's message queue */ SenderReturned = (Message->DispatchingListEntry.Flink == NULL); - if(!SenderReturned) + if (!SenderReturned) { /* only remove it from the dispatching list if not already removed by a timeout */ RemoveEntryList(&Message->DispatchingListEntry); @@ -981,6 +981,12 @@ if (Message->Result != NULL) { *Message->Result = Result; + } + + if (Message->HasPackedLParam == TRUE) + { + if (Message->Msg.lParam) + ExFreePool((PVOID)Message->Msg.lParam); } /* Notify the sender. */ @@ -1010,9 +1016,12 @@ Notified: - /* dereference both sender and our queue */ - IntDereferenceMessageQueue(MessageQueue); - IntDereferenceMessageQueue(Message->SenderQueue); + /* Only if it is not a no wait message */ + if (!(Message->HookMessage & MSQ_SENTNOWAIT)) + { + IntDereferenceMessageQueue(Message->SenderQueue); + IntDereferenceMessageQueue(MessageQueue); + } /* free the message */ ExFreePool(Message); @@ -1147,6 +1156,7 @@ IntReferenceMessageQueue(ThreadQueue); Message->CompletionCallback = NULL; Message->HookMessage = HookMessage; + Message->HasPackedLParam = FALSE; IntReferenceMessageQueue(MessageQueue); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sat May 8 17:49:02 2010 @@ -69,9 +69,6 @@ return TRUE; } - - - BOOL FASTCALL UserGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point) { @@ -120,8 +117,13 @@ style = Wnd->Wnd->style; if (!(style & WS_VISIBLE) && Wnd->pti->pEThread->ThreadsProcess != CsrProcess) return FALSE; + if ((style & WS_MINIMIZE) && + Wnd->pti->pEThread->ThreadsProcess != CsrProcess) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; - return !(style & WS_DISABLED); + return TRUE; + /* FIXME: This window could be disable because the child that closed + was a popup. */ + //return !(style & WS_DISABLED); } @@ -312,7 +314,7 @@ if (Wnd->style & WS_MINIMIZE) { - if (!co_IntSendMessage(Window->hSelf, WM_QUERYOPEN, 0, 0)) + if (!co_IntSendMessageNoWait(Window->hSelf, WM_QUERYOPEN, 0, 0)) { return(SWP_NOSIZE | SWP_NOMOVE); } @@ -531,7 +533,7 @@ params.lppos = &winposCopy; winposCopy = *WinPos; - wvrFlags = co_IntSendMessage(Window->hSelf, WM_NCCALCSIZE, TRUE, (LPARAM) &params); + wvrFlags = co_IntSendMessageNoWait(Window->hSelf, WM_NCCALCSIZE, TRUE, (LPARAM) &params); /* If the application send back garbage, ignore it */ if (params.rgrc[0].left <= params.rgrc[0].right && @@ -590,7 +592,7 @@ if (!(WinPos->flags & SWP_NOSENDCHANGING)) { - co_IntPostOrSendMessage(Window->hSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); + co_IntSendMessageNoWait(Window->hSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); } *WindowRect = Wnd->rcWindow; @@ -1320,7 +1322,7 @@ { if ((Window->Wnd->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) { - co_IntSendMessage(WinPos.hwnd, WM_CHILDACTIVATE, 0, 0); + co_IntSendMessageNoWait(WinPos.hwnd, WM_CHILDACTIVATE, 0, 0); } else { @@ -1330,7 +1332,7 @@ } if ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) - co_IntPostOrSendMessage(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); + co_IntSendMessageNoWait(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); return TRUE; } @@ -1343,7 +1345,7 @@ ASSERT_REFS_CO(Window); *ClientRect = *WindowRect; - Result = co_IntSendMessage(Window->hSelf, WM_NCCALCSIZE, FALSE, (LPARAM) ClientRect); + Result = co_IntSendMessageNoWait(Window->hSelf, WM_NCCALCSIZE, FALSE, (LPARAM) ClientRect); FixClientRect(ClientRect, WindowRect); @@ -1462,7 +1464,7 @@ if (ShowFlag != WasVisible) { - co_IntSendMessage(Window->hSelf, WM_SHOWWINDOW, ShowFlag, 0); + co_IntSendMessageNoWait(Window->hSelf, WM_SHOWWINDOW, ShowFlag, 0); } /* We can't activate a child window */ @@ -1476,7 +1478,7 @@ ? HWND_TOPMOST : HWND_TOP, NewPos.left, NewPos.top, NewPos.right, NewPos.bottom, LOWORD(Swp)); - if (Cmd == SW_HIDE) + if ((Cmd == SW_HIDE) || (Cmd == SW_MINIMIZE)) { PWINDOW_OBJECT ThreadFocusWindow; @@ -1520,12 +1522,12 @@ wParam = SIZE_MINIMIZED; } - co_IntSendMessage(Window->hSelf, WM_SIZE, wParam, + co_IntSendMessageNoWait(Window->hSelf, WM_SIZE, wParam, MAKELONG(Wnd->rcClient.right - Wnd->rcClient.left, Wnd->rcClient.bottom - Wnd->rcClient.top)); - co_IntSendMessage(Window->hSelf, WM_MOVE, 0, + co_IntSendMessageNoWait(Window->hSelf, WM_MOVE, 0, MAKELONG(Wnd->rcClient.left, Wnd->rcClient.top)); IntEngWindowChanged(Window, WOC_RGN_CLIENT);

14 years, 4 months

← Newer
1
...
35
36
37
38
39
40
41
...
44
Older →

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 May 2010