Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 47708: - Add "bootcdregtest" in the list of well-known targets.
by fireball＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: fireball Date: Wed Jun 9 12:34:35 2010 New Revision: 47708 URL: http://svn.reactos.org/svn/reactos?rev=47708&view=rev Log: - Add "bootcdregtest" in the list of well-known targets. Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=47708&r1=4770… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Wed Jun 9 12:34:35 2010 @@ -45,6 +45,10 @@ # with the name of the module for which you want to check dependencies. # This is faster than the depends target which does a complete dependency # check of the ReactOS codebase. +# +# bootcdregtest +# This target builds an ISO (ReactOS-RegTest.ISO) which is used for unattended +# regression testing. # # # Accepted environment variables:

1 0

[fireball] 47707: [SYSREG3] - Print a message if maximum number of retries is exceeded. - Stop executing if ProcessDebugOutput asked so. - Report stopping reason to console.
by fireball＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: fireball Date: Wed Jun 9 11:12:07 2010 New Revision: 47707 URL: http://svn.reactos.org/svn/reactos?rev=47707&view=rev Log: [SYSREG3] - Print a message if maximum number of retries is exceeded. - Stop executing if ProcessDebugOutput asked so. - Report stopping reason to console. Modified: trunk/tools/sysreg3/Program.cs Modified: trunk/tools/sysreg3/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg3/Program.cs?rev=47707… ============================================================================== --- trunk/tools/sysreg3/Program.cs [iso-8859-1] (original) +++ trunk/tools/sysreg3/Program.cs [iso-8859-1] Wed Jun 9 11:12:07 2010 @@ -22,7 +22,7 @@ string machineName = "ReactOS"; int maxRetries = 3; int numStages = 3; - int vmTimeout = 5 * 1000; // 120 secs + int vmTimeout = 30 * 1000; // 120 secs IMachine rosVM; IVirtualBox vBox; @@ -73,7 +73,7 @@ if (waitingTime >= vmTimeout) { /* We hit the timeout, quit */ - Console.WriteLine("[SYSREG] Timeout"); + Console.WriteLine("[SYSREG] timeout"); Result = ContinueType.EXIT_CONTINUE; quitLoop = true; break; @@ -147,6 +147,7 @@ public void RunTests() { + ContinueType Ret = ContinueType.EXIT_DONT_CONTINUE; IProgress vmProgress; // TODO: Load settings @@ -188,7 +189,8 @@ /* Start main testing loop */ for (int stage = 0; stage < numStages; stage++) { - for (int retries = 0; retries < maxRetries; retries++) + int retries; + for (retries = 0; retries < maxRetries; retries++) { /* Start the VM */ try @@ -210,7 +212,7 @@ Console.WriteLine("[SYSREG] Running stage {0}...", stage + 1); Console.WriteLine("[SYSREG] Domain {0} started.\n", rosVM.Name); - ContinueType Ret = ProcessDebugOutput(vmSession, stage); + Ret = ProcessDebugOutput(vmSession, stage); /* Kill the VM */ vmProgress = vmSession.Console.PowerDown(); @@ -229,14 +231,33 @@ } catch (Exception exc) { - Console.WriteLine("Running the VM failed with exception: " + exc.ToString()); + Console.WriteLine("[SYSREG] Running the VM failed with exception: " + exc.ToString()); break; } - - break; } - break; + /* Check for a maximum number of retries */ + if (retries == maxRetries) + { + Console.WriteLine("[SYSREG] Maximum number of allowed retries exceeded, aborting!"); + break; + } + + /* Stop executing if asked so */ + if (Ret == ContinueType.EXIT_DONT_CONTINUE) break; + } + + switch (Ret) + { + case ContinueType.EXIT_CHECKPOINT_REACHED: + Console.WriteLine("[SYSREG] Status: Reached the checkpoint!"); + break; + case ContinueType.EXIT_CONTINUE: + Console.WriteLine("[SYSREG] Status: Failed to reach the checkpoint!!"); + break; + case ContinueType.EXIT_DONT_CONTINUE: + Console.WriteLine("[SYSREG] Status: Testing process aborted!"); + break; } } }

1 0

[gedmurphy] 47706: This bug seems to have gone now. Tried to replicate it the devmgmt treeview.
by gedmurphy＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: gedmurphy Date: Wed Jun 9 10:09:35 2010 New Revision: 47706 URL: http://svn.reactos.org/svn/reactos?rev=47706&view=rev Log: This bug seems to have gone now. Tried to replicate it the devmgmt treeview. Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Wed Jun 9 10:09:35 2010 @@ -120,22 +120,3 @@ + } return 0; } - -Index: treeview.c -=================================================================== ---- treeview.c (revision 38890) -+++ treeview.c (working copy) -@@ -2830,7 +2830,12 @@ - } - } - -- TREEVIEW_UpdateScrollBars(infoPtr); -+ // -+ // This is correct, but is causes and infinite loop of WM_PAINT messages, resulting -+ // in continuous painting of the scroll bar in reactos. Comment out until the real -+ // bug is found -+ // -+ //TREEVIEW_UpdateScrollBars(infoPtr); - - if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) - infoPtr->cdmode =

1 0

[gedmurphy] 47705: Merge second part of the comctl32 Wine 1.2 sync. All code currently omits the reactos specific patches. It's been a long time since we synched this lib so it's possible we no longer need them. Time will tell.
by gedmurphy＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: gedmurphy Date: Wed Jun 9 10:04:35 2010 New Revision: 47705 URL: http://svn.reactos.org/svn/reactos?rev=47705&view=rev Log: Merge second part of the comctl32 Wine 1.2 sync. All code currently omits the reactos specific patches. It's been a long time since we synched this lib so it's possible we no longer need them. Time will tell. Modified: trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/string.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/theme_combo.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… Modified: trunk/reactos/dll/win32/comctl32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/string.… Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… Modified: trunk/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_c… Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.…

1 0

[cgutman] 47704: [IP] - Handle socket operations that can be completed immediately before terminating the socket to avoid losing data sitting in the receive buffer
by cgutman＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: cgutman Date: Wed Jun 9 06:45:17 2010 New Revision: 47704 URL: http://svn.reactos.org/svn/reactos?rev=47704&view=rev Log: [IP] - Handle socket operations that can be completed immediately before terminating the socket to avoid losing data sitting in the receive buffer Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Jun 9 06:45:17 2010 @@ -25,7 +25,6 @@ NTSTATUS Status; PIRP Irp; PMDL Mdl; - ULONG SocketError = 0; KIRQL OldIrql; PTCP_COMPLETION_ROUTINE Complete; @@ -34,69 +33,6 @@ TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n", Connection, Connection->SocketContext)); - - if( Connection->SignalState & SEL_FIN ) { - TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); - - /* If OskitTCP initiated the disconnect, try to read the socket error that occurred */ - if (Connection->SocketContext) - SocketError = TCPTranslateError(OskitTCPGetSocketError(Connection->SocketContext)); - - /* Default to STATUS_CANCELLED if we initiated the disconnect or no socket error was reported */ - if (!Connection->SocketContext || !SocketError) - SocketError = STATUS_CANCELLED; - - while (!IsListEmpty(&Connection->ReceiveRequest)) - { - Entry = RemoveHeadList( &Connection->ReceiveRequest ); - - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Bucket->Status = SocketError; - Bucket->Information = 0; - - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - - while (!IsListEmpty(&Connection->SendRequest)) - { - Entry = RemoveHeadList( &Connection->SendRequest ); - - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Bucket->Status = SocketError; - Bucket->Information = 0; - - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - - while (!IsListEmpty(&Connection->ListenRequest)) - { - Entry = RemoveHeadList( &Connection->ListenRequest ); - - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Bucket->Status = SocketError; - Bucket->Information = 0; - DereferenceObject(Bucket->AssociatedEndpoint); - - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - - while (!IsListEmpty(&Connection->ConnectRequest)) - { - Entry = RemoveHeadList( &Connection->ConnectRequest ); - - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Bucket->Status = SocketError; - Bucket->Information = 0; - - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - - Connection->SignalState = SEL_FIN; - } /* Things that can happen when we try the initial connection */ if( Connection->SignalState & SEL_CONNECT ) { @@ -140,11 +76,11 @@ TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); - if( Status == STATUS_PENDING ) { + if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); break; } else { - Bucket->Status = Status; + Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; Bucket->Information = 0; DereferenceObject(Bucket->AssociatedEndpoint); @@ -194,7 +130,7 @@ TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); - if( Status == STATUS_PENDING ) { + if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); break; } else { @@ -202,8 +138,8 @@ ("Completing Receive request: %x %x\n", Bucket->Request, Status)); - Bucket->Status = Status; - Bucket->Information = (Status == STATUS_SUCCESS) ? Received : 0; + Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; + Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Received : 0; InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); } @@ -248,7 +184,7 @@ TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); - if( Status == STATUS_PENDING ) { + if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { InsertHeadList( &Connection->SendRequest, &Bucket->Entry ); break; } else { @@ -256,8 +192,8 @@ ("Completing Send request: %x %x\n", Bucket->Request, Status)); - Bucket->Status = Status; - Bucket->Information = (Status == STATUS_SUCCESS) ? Sent : 0; + Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; + Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Sent : 0; InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); } @@ -737,7 +673,7 @@ Connection->SocketContext = NULL; /* Don't try to close again if the other side closed us already */ - if (Connection->SignalState != SEL_FIN) + if (!(Connection->SignalState & SEL_FIN)) { /* We need to close here otherwise oskit will never indicate * SEL_FIN and we will never fully close the connection */

1 0

[tkreuzer] 47703: [WIN32K] - Initialize the palettes before creating any bitmaps. - Replace SURFACE_vSetDefaultPalette with an array of default palettes. - Check iFormat in SURFACE_AllocSurface
by tkreuzer＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: tkreuzer Date: Wed Jun 9 04:57:52 2010 New Revision: 47703 URL: http://svn.reactos.org/svn/reactos?rev=47703&view=rev Log: [WIN32K] - Initialize the palettes before creating any bitmaps. - Replace SURFACE_vSetDefaultPalette with an array of default palettes. - Check iFormat in SURFACE_AllocSurface Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Wed Jun 9 04:57:52 2010 @@ -140,45 +140,6 @@ return TRUE; } -static -void -SURFACE_vSetDefaultPalette( - PSURFACE psurfBmp) -{ - ULONG cBitsPixel = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); - - /* Find a suitable palette for this bitmap - * Increment internal objects share count - * so we can call PALETTE_ShareUnlockPalette - * or GDIOBJ_IncrementShareCount safely */ - switch(cBitsPixel) - { - case 1: - psurfBmp->ppal = &gpalMono; - GDIOBJ_IncrementShareCount(&gpalMono.BaseObject); - break; - case 4: - case 8: - psurfBmp->ppal = PALETTE_ShareLockPalette(StockObjects[DEFAULT_PALETTE]); - break; - case 15: - psurfBmp->ppal = &gpalRGB555; - GDIOBJ_IncrementShareCount(&gpalRGB555.BaseObject); - break; - case 16: - psurfBmp->ppal = &gpalRGB565; - GDIOBJ_IncrementShareCount(&gpalRGB565.BaseObject); - break; - case 24: - case 32: - psurfBmp->ppal = &gpalBGR; - GDIOBJ_IncrementShareCount(&gpalBGR.BaseObject); - break; - default: - DPRINT1("Could not determine palette for bit depth %u.\n", cBitsPixel); - break; - } -} PSURFACE NTAPI @@ -190,7 +151,14 @@ { PSURFACE psurf; SURFOBJ *pso; - + + /* Verify format */ + if (iFormat < BMF_1BPP || iFormat > BMF_PNG) + { + DPRINT1("Invalid bitmap format: %ld\n", iFormat); + return NULL; + } + /* Allocate a SURFACE object */ psurf = (PSURFACE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BITMAP); @@ -205,7 +173,9 @@ pso->iType = iType; pso->iUniq = InterlockedIncrement((PLONG)&giUniqueSurface); - SURFACE_vSetDefaultPalette(psurf); + /* Assign a default palette amd increment its reference count */ + psurf->ppal = appalSurfaceDefault[iFormat]; + GDIOBJ_IncrementShareCount(&psurf->ppal->BaseObject); } return psurf; Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h [iso-8859-1] Wed Jun 9 04:57:52 2010 @@ -54,8 +54,8 @@ HDEV hPDev; } PALETTE, *PPALETTE; -extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565; - +extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault; +extern PPALETTE appalSurfaceDefault[]; HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, ULONG NumColors, Modified: branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Wed Jun 9 04:57:52 2010 @@ -439,6 +439,9 @@ return STATUS_UNSUCCESSFUL; } + /* Initialize default palettes */ + PALETTE_Init(); + /* Create stock objects, ie. precreated objects commonly used by win32 applications */ CreateStockObjects(); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Wed Jun 9 04:57:52 2010 @@ -14,7 +14,8 @@ static UINT SystemPaletteUse = SYSPAL_NOSTATIC; /* the program need save the pallete and restore it */ -PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565; +PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault; +PPALETTE appalSurfaceDefault[11]; const PALETTEENTRY g_sysPalTemplate[NB_RESERVED_COLORS] = { @@ -132,6 +133,19 @@ gpalMono.Mode = PAL_MONOCHROME; gpalMono.BaseObject.ulShareCount = 0; gpalMono.BaseObject.BaseFlags = 0 ; + + /* Initialize default surface palettes */ + gppalDefault = PALETTE_ShareLockPalette(hpalette); + appalSurfaceDefault[BMF_1BPP] = &gpalMono; + appalSurfaceDefault[BMF_4BPP] = gppalDefault; + appalSurfaceDefault[BMF_8BPP] = gppalDefault; + appalSurfaceDefault[BMF_16BPP] = &gpalRGB565; + appalSurfaceDefault[BMF_24BPP] = &gpalRGB; + appalSurfaceDefault[BMF_32BPP] = &gpalRGB; + appalSurfaceDefault[BMF_4RLE] = gppalDefault; + appalSurfaceDefault[BMF_8RLE] = gppalDefault; + appalSurfaceDefault[BMF_JPEG] = &gpalRGB; + appalSurfaceDefault[BMF_PNG] = &gpalRGB; return hpalette; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Wed Jun 9 04:57:52 2010 @@ -190,7 +190,7 @@ (void) TextIntCreateFontIndirect(&SystemFixedFont, (HFONT*)&StockObjects[SYSTEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&DefaultGuiFont, (HFONT*)&StockObjects[DEFAULT_GUI_FONT]); - StockObjects[DEFAULT_PALETTE] = (HGDIOBJ)PALETTE_Init(); + StockObjects[DEFAULT_PALETTE] = (HGDIOBJ)gppalDefault->BaseObject.hHmgr; for (Object = 0; Object < NB_STOCK_OBJECTS; Object++) {

1 0

[jgardou] 47702: [GDI32] - Header describes the bitmap to be created, not the bits we are passed. - Circumvent gcc weirdness (sigh...)
by jgardou＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: jgardou Date: Wed Jun 9 02:18:29 2010 New Revision: 47702 URL: http://svn.reactos.org/svn/reactos?rev=47702&view=rev Log: [GDI32] - Header describes the bitmap to be created, not the bits we are passed. - Circumvent gcc weirdness (sigh...) Modified: branches/reactos-yarotows/dll/win32/gdi32/include/gdi32p.h branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c Modified: branches/reactos-yarotows/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Wed Jun 9 02:18:29 2010 @@ -146,7 +146,7 @@ typedef BOOL (WINAPI *SEEKPRINTER) (HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD,BOOL); typedef BOOL (WINAPI *SPLREADPRINTER) (HANDLE,LPBYTE *,DWORD); // Same as ddk/winsplp.h DriverUnloadComplete? -typedef BOOL (WINAPI *SPLDRIVERUNLOADCOMPLETE) (LPWSTR); +typedef BOOL (WINAPI *SPLDRIVERUNLOADCOMPLETE) (LPWSTR); // Driver support: // DrvDocumentEvent api/winddiui.h not W2k8 DocumentEventAW typedef INT (WINAPI *DOCUMENTEVENT) (HANDLE,HDC,INT,ULONG,PVOID,ULONG,PVOID); @@ -173,10 +173,10 @@ VOID HEAP_free(LPVOID memory); -VOID +VOID FASTCALL FONT_TextMetricWToA( - const TEXTMETRICW *ptmW, + const TEXTMETRICW *ptmW, LPTEXTMETRICA ptmA ); @@ -279,7 +279,7 @@ GdiSetLastError( DWORD dwErrCode ); DWORD WINAPI GdiGetCodePage(HDC); -UINT FASTCALL DIB_BitmapBitsSize( PBITMAPINFO ); +UINT FASTCALL DIB_BitmapBitsSize( CONST BITMAPINFO* ); int WINAPI Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Wed Jun 9 02:18:29 2010 @@ -34,7 +34,7 @@ UINT FASTCALL -DIB_BitmapBitsSize( PBITMAPINFO Info ) +DIB_BitmapBitsSize( CONST BITMAPINFO* Info ) { UINT Ret; @@ -476,7 +476,8 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)Header); + /* Mmmh, this is not really safe */ + cjBmpScanSize = DIB_BitmapBitsSize(Data); DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize); if ( !width || !height )

1 0

[jgardou] 47701: [WIN32K] - More BITMAPV5INFO fun - Probe max size we are asked for when converting to V5 Info [USER32] [WIN32K] - CreateDIBitmap : Move safety handling to win32k, where it belongs. More code cleanness!
by jgardou＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: jgardou Date: Wed Jun 9 02:08:50 2010 New Revision: 47701 URL: http://svn.reactos.org/svn/reactos?rev=47701&view=rev Log: [WIN32K] - More BITMAPV5INFO fun - Probe max size we are asked for when converting to V5 Info [USER32] [WIN32K] - CreateDIBitmap : Move safety handling to win32k, where it belongs. More code cleanness! Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Wed Jun 9 02:08:50 2010 @@ -43,16 +43,16 @@ if ( Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info; - Ret = Core->bcHeight * + Ret = Core->bcHeight * ((Core->bcWidth * Core->bcPlanes * Core->bcBitCount + 31) & ~31 ) / 8; } else /* assume BITMAPINFOHEADER */ { - if ((Info->bmiHeader.biCompression) && + if ((Info->bmiHeader.biCompression) && (Info->bmiHeader.biCompression != BI_BITFIELDS)) return Info->bmiHeader.biSizeImage; // Make Height positive always.... - Ret = abs(Info->bmiHeader.biHeight) * + Ret = abs(Info->bmiHeader.biHeight) * ((Info->bmiHeader.biWidth * Info->bmiHeader.biPlanes * Info->bmiHeader.biBitCount + 31) & ~31 ) / 8; } return Ret; @@ -132,12 +132,12 @@ GdiGetBitmapBitsSize(BITMAPINFO *lpbmi) { int retSize; - + if (lpbmi->bmiHeader.biSize == FIELD_OFFSET(BITMAPINFOHEADER, biPlanes)) { /* Calc the bits Size and align it*/ - retSize = HIWORD(lpbmi->bmiHeader.biWidth) * ((LOWORD(lpbmi->bmiHeader.biWidth) * - LOWORD(lpbmi->bmiHeader.biHeight) * HIWORD(lpbmi->bmiHeader.biHeight) + 31) + retSize = HIWORD(lpbmi->bmiHeader.biWidth) * ((LOWORD(lpbmi->bmiHeader.biWidth) * + LOWORD(lpbmi->bmiHeader.biHeight) * HIWORD(lpbmi->bmiHeader.biHeight) + 31) & -32) / 8; } else @@ -148,13 +148,13 @@ if (lpbmi->bmiHeader.biHeight >=0 ) { /* Calc the bits Size and align it*/ - retSize = lpbmi->bmiHeader.biHeight * ((lpbmi->bmiHeader.biWidth * + retSize = lpbmi->bmiHeader.biHeight * ((lpbmi->bmiHeader.biWidth * lpbmi->bmiHeader.biPlanes * lpbmi->bmiHeader.biBitCount + 31) & -32) / 8; } else { /* Make height postiive if it negitve then calc the bits Size and align it*/ - retSize = (-lpbmi->bmiHeader.biHeight) * ((lpbmi->bmiHeader.biWidth * + retSize = (-lpbmi->bmiHeader.biHeight) * ((lpbmi->bmiHeader.biWidth * lpbmi->bmiHeader.biPlanes * lpbmi->bmiHeader.biBitCount + 31) & -32) / 8; } } @@ -189,7 +189,7 @@ { // Verify header due to converted may == info. if ( pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) { - if ( pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + if ( pConvertedInfo->bmiHeader.biCompression == BI_JPEG || pConvertedInfo->bmiHeader.biCompression == BI_PNG ) { SetLastError(ERROR_INVALID_PARAMETER); @@ -319,7 +319,7 @@ (!(pbm->bmWidthBytes & 1)) ) { - + bitmap = CreateBitmap(pbm->bmWidth, pbm->bmHeight, pbm->bmPlanes, @@ -409,7 +409,7 @@ { if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) { - if ( lpbmi->bmiHeader.biCompression == BI_JPEG || + if ( lpbmi->bmiHeader.biCompression == BI_JPEG || lpbmi->bmiHeader.biCompression == BI_PNG ) { SetLastError(ERROR_INVALID_PARAMETER); @@ -461,16 +461,11 @@ LONG width, height, compr, dibsize; WORD planes, bpp; // PDC_ATTR pDc_Attr; - PBITMAPINFO pConvertedInfo; UINT ConvertedInfoSize; UINT cjBmpScanSize; - PVOID pvSafeBits = NULL; HBITMAP hBmp; if (!Header) return 0; - - pConvertedInfo = ConvertBitmapInfo(Data, ColorUse, - &ConvertedInfoSize, FALSE); if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) { @@ -478,61 +473,28 @@ return NULL; } - if ( pConvertedInfo ) - { - if ( pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) - { - if ( pConvertedInfo->bmiHeader.biCompression == BI_JPEG || - pConvertedInfo->bmiHeader.biCompression == BI_PNG ) - { - hBmp = NULL; - goto Exit; - } - } - } - // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)pConvertedInfo); - DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", pConvertedInfo,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize); + cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)Header); + DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize); if ( !width || !height ) hBmp = GetStockObject(DEFAULT_BITMAP); else { - if ( Bits && Init == CBM_INIT ) - { - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); - if (pvSafeBits == NULL) - { - hBmp = NULL; - goto Exit; - } - else - { - RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); - } - } - hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, - (LPBYTE)pvSafeBits, - (PBITMAPINFO)pConvertedInfo, + (LPBYTE)Bits, + (LPBITMAPINFO)Data, ColorUse, ConvertedInfoSize, cjBmpScanSize, 0, 0); - - if ( Bits && Init == CBM_INIT ) - RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); - } -Exit: - if (Data != pConvertedInfo) - RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); + } return hBmp; } @@ -588,7 +550,7 @@ if ( hOldBitmap ) { - if ( hDC ) + if ( hDC ) hPal = SelectPalette(SavehDC, (HPALETTE)GetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE), FALSE); if ( lpbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) @@ -782,7 +744,7 @@ /* if ( !pDc_Attr || ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && - (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ { LinesCopied = NtGdiSetDIBitsToDeviceInternal( hdc, @@ -806,7 +768,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); if (lpbmi != pConvertedInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); - + return LinesCopied; } @@ -933,7 +895,7 @@ /* if ( !pDc_Attr || ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && - (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ { LinesCopied = NtGdiStretchDIBitsInternal( hdc, Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Wed Jun 9 02:08:50 2010 @@ -13,7 +13,7 @@ HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); -NTSTATUS FASTCALL ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, IN DWORD dwUse); +NTSTATUS FASTCALL ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, IN DWORD dwUse, UINT MaxSize); VOID FASTCALL GetBMIFromBitmapV5Info(IN PBITMAPV5INFO pbmiSrc, OUT PBITMAPINFO pbmiDst, IN DWORD dwUse); HBITMAP Modified: branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c [iso-8859-1] Wed Jun 9 02:08:50 2010 @@ -199,7 +199,8 @@ { Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, pbmi, - DIB_RGB_COLORS); + DIB_RGB_COLORS, + 0); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jun 9 02:08:50 2010 @@ -354,7 +354,8 @@ _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse, 0); + /* Don't check Bits and hope we won't die */ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -427,7 +428,8 @@ _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse, cjMaxInfo); + ProbeForRead(Bits, cjMaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -595,7 +597,7 @@ _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, Info, Usage); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, Info, Usage, MaxInfo); if (ChkBits) ProbeForWrite(ChkBits, MaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -842,7 +844,7 @@ bmiLocal.bmiHeader.bV5BitCount) * DestSize.cy; hDestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, + DIB_GetDIBWidthBytes(DestSize.cx, bmiLocal.bmiHeader.bV5BitCount), BitmapFormat(bmiLocal.bmiHeader.bV5BitCount, bmiLocal.bmiHeader.bV5Compression), @@ -942,7 +944,8 @@ HDC hdcMem; HPALETTE hPal = NULL; PDC pDC; - BOOL Hit = FALSE; + NTSTATUS Status; + BITMAPV5INFO bmiLocal ; if (!Bits || !BitsInfo) { @@ -952,16 +955,16 @@ _SEH2_TRY { - ProbeForRead(BitsInfo, cjMaxInfo, 1); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, BitsInfo, Usage, cjMaxInfo); ProbeForRead(Bits, cjMaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + Status = _SEH2_GetExceptionCode(); } _SEH2_END - if (Hit) + if (!NT_SUCCESS(Status)) { DPRINT1("NtGdiStretchDIBitsInternal fail to read BitMapInfo: %x or Bits: %x\n",BitsInfo,Bits); return 0; @@ -975,8 +978,8 @@ } hBitmap = NtGdiCreateCompatibleBitmap(hDC, - abs(BitsInfo->bmiHeader.biWidth), - abs(BitsInfo->bmiHeader.biHeight)); + abs(bmiLocal.bmiHeader.bV5Width), + abs(bmiLocal.bmiHeader.bV5Height)); if (hBitmap == NULL) { DPRINT1("NtGdiCreateCompatibleBitmap fail create bitmap\n"); @@ -995,15 +998,15 @@ hPal = GdiSelectPalette(hdcMem, hPal, FALSE); } - if (BitsInfo->bmiHeader.biCompression == BI_RLE4 || - BitsInfo->bmiHeader.biCompression == BI_RLE8) + if (bmiLocal.bmiHeader.bV5Compression == BI_RLE4 || + bmiLocal.bmiHeader.bV5Compression == BI_RLE8) { /* copy existing bitmap from destination dc */ if (SrcWidth == DestWidth && SrcHeight == DestHeight) - NtGdiBitBlt(hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, + NtGdiBitBlt(hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, SrcWidth, SrcHeight, hDC, XDest, YDest, ROP, 0, 0); else - NtGdiStretchBlt(hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, + NtGdiStretchBlt(hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, SrcWidth, SrcHeight, hDC, XDest, YDest, DestWidth, DestHeight, ROP, 0); } @@ -1015,8 +1018,8 @@ * if it negitve we getting to many scanline for scanline is UINT not * a INT, so we need make the negtive value to positve and that make the * count correct for negtive bitmap, TODO : we need testcase for this api */ - IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, - BitsInfo, Usage); + IntSetDIBits(pDC, hBitmap, 0, abs(bmiLocal.bmiHeader.bV5Height), Bits, + (PBITMAPINFO)&bmiLocal, Usage); DC_UnlockDc(pDC); } @@ -1026,11 +1029,11 @@ left (negative biHeight) */ if (SrcWidth == DestWidth && SrcHeight == DestHeight) NtGdiBitBlt(hDC, XDest, YDest, DestWidth, DestHeight, - hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, + hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, ROP, 0, 0); else NtGdiStretchBlt(hDC, XDest, YDest, DestWidth, DestHeight, - hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, + hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, SrcWidth, SrcHeight, ROP, 0); /* cleanup */ @@ -1057,7 +1060,7 @@ UINT bpp, DWORD init, LPBYTE bits, - PBITMAPINFO data, + PBITMAPV5INFO data, DWORD coloruse) { HBITMAP handle; @@ -1070,40 +1073,19 @@ else if ((coloruse != DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE; else { - if (data->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - const RGBQUAD *rgb = data->bmiColors; - DWORD col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); - - // Check if the first color of the colormap is black - if ((col == RGB(0, 0, 0))) - { - rgb++; - col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); - - // If the second color is white, create a monochrome bitmap - fColor = (col != RGB(0xff,0xff,0xff)); - } - else fColor = TRUE; - } - else if (data->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - RGBTRIPLE *rgb = ((BITMAPCOREINFO *)data)->bmciColors; - DWORD col = RGB(rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue); - - if ((col == RGB(0,0,0))) - { - rgb++; - col = RGB(rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue); - fColor = (col != RGB(0xff,0xff,0xff)); - } - else fColor = TRUE; - } - else - { - DPRINT("(%ld): wrong size for data\n", data->bmiHeader.biSize); - return 0; - } + const RGBQUAD *rgb = data->bmiColors; + DWORD col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); + + // Check if the first color of the colormap is black + if ((col == RGB(0, 0, 0))) + { + rgb++; + col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); + + // If the second color is white, create a monochrome bitmap + fColor = (col != RGB(0xff,0xff,0xff)); + } + else fColor = TRUE; } // Now create the bitmap @@ -1125,7 +1107,7 @@ if (NULL != handle && CBM_INIT == init) { - IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse); + IntSetDIBits(Dc, handle, 0, height, bits, (BITMAPINFO*)data, coloruse); } return handle; @@ -1151,6 +1133,25 @@ PDC Dc; HBITMAP Bmp; UINT bpp; + BITMAPV5INFO bmiLocal ; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + if(pbmi) Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, pbmi, iUsage, cjMaxInitInfo); + if(pjInit && (fInit == CBM_INIT)) ProbeForRead(pjInit, cjMaxBits, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } if (!hDc) // CreateBitmap { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. @@ -1169,7 +1170,7 @@ return NULL; } bpp = 1; - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi ? &bmiLocal : NULL, iUsage); DC_UnlockDc(Dc); NtGdiDeleteObjectApp(hDc); @@ -1187,7 +1188,7 @@ should match that of the hdc and not that supplied in bmih. */ if (pbmi) - bpp = pbmi->bmiHeader.biBitCount; + bpp = bmiLocal.bmiHeader.bV5BitCount; else { if (Dc->dctype != DC_TYPE_MEMORY) @@ -1211,7 +1212,7 @@ } } } - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi ? &bmiLocal : NULL, iUsage); DC_UnlockDc(Dc); } return Bmp; @@ -1760,7 +1761,8 @@ ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, - IN DWORD dwColorUse) + IN DWORD dwColorUse, + IN UINT MaxSize) { DWORD dwSize; ULONG ulWidthBytes; @@ -1769,7 +1771,8 @@ /* Get the size and probe */ ProbeForRead(&pbmiUnsafe->bmiHeader.biSize, sizeof(DWORD), 1); dwSize = pbmiUnsafe->bmiHeader.biSize; - ProbeForRead(pbmiUnsafe, dwSize, 1); + /* At least dwSize bytes must be valids */ + ProbeForRead(pbmiUnsafe, max(dwSize, MaxSize), 1); /* Check the size */ // FIXME: are intermediate sizes allowed? As what are they interpreted?

1 0

[tkreuzer] 47700: Sync trunk (r47699)
by tkreuzer＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: tkreuzer Date: Wed Jun 9 00:20:26 2010 New Revision: 47700 URL: http://svn.reactos.org/svn/reactos?rev=47700&view=rev Log: Sync trunk (r47699) Modified: branches/header-work/ (props changed) branches/header-work/dll/win32/ws2_32_new/src/addrinfo.c branches/header-work/include/ndk/rtlfuncs.h branches/header-work/lib/rtl/network.c Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 9 00:20:26 2010 @@ -1,4 +1,4 @@ /branches/reactos-yarotows:46966 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 -/trunk/reactos:45691-47697 +/trunk/reactos:45691-47699 Modified: branches/header-work/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ws2_32_ne… ============================================================================== --- branches/header-work/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ branches/header-work/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Wed Jun 9 00:20:26 2010 @@ -91,7 +91,7 @@ LPWSTR Ip = 0; /* Do the conversion, don't accept wildcard */ - RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, Ip, (IN_ADDR *)&Address); + RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, &Ip, (IN_ADDR *)&Address); /* Return the address and success */ *pAddress = Address; Modified: branches/header-work/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/rtlfunc… ============================================================================== --- branches/header-work/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/ndk/rtlfuncs.h [iso-8859-1] Wed Jun 9 00:20:26 2010 @@ -3185,9 +3185,9 @@ NTSTATUS NTAPI RtlIpv4StringToAddressW( - IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, + IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr ); Modified: branches/header-work/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/rtl/network.c?r… ============================================================================== --- branches/header-work/lib/rtl/network.c [iso-8859-1] (original) +++ branches/header-work/lib/rtl/network.c [iso-8859-1] Wed Jun 9 00:20:26 2010 @@ -103,9 +103,9 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressW(IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, +RtlIpv4StringToAddressW(IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED;

1 0

[spetreolle] 47699: Merge RtlIpv4StringToAddressW fix from network branch.
by spetreolle＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: spetreolle Date: Tue Jun 8 22:24:15 2010 New Revision: 47699 URL: http://svn.reactos.org/svn/reactos?rev=47699&view=rev Log: Merge RtlIpv4StringToAddressW fix from network branch. Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Tue Jun 8 22:24:15 2010 @@ -91,7 +91,7 @@ LPWSTR Ip = 0; /* Do the conversion, don't accept wildcard */ - RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, Ip, (IN_ADDR *)&Address); + RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, &Ip, (IN_ADDR *)&Address); /* Return the address and success */ *pAddress = Address; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue Jun 8 22:24:15 2010 @@ -3185,9 +3185,9 @@ NTSTATUS NTAPI RtlIpv4StringToAddressW( - IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, + IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr ); Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=4769… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Tue Jun 8 22:24:15 2010 @@ -103,9 +103,9 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressW(IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, +RtlIpv4StringToAddressW(IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs