Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[gedmurphy] 47712: I don't like this, but add the treeview refresh hack. I don't see this bug on my (windows) build but others are reporting it still happens on the (linux) build machine iso. Maybe it's because linux is akin to the devil? Yes, I like this, let's blame linux!

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 9 13:31:02 2010 New Revision: 47712 URL: http://svn.reactos.org/svn/reactos?rev=47712&view=rev Log: I don't like this, but add the treeview refresh hack. I don't see this bug on my (windows) build but others are reporting it still happens on the (linux) build machine iso. Maybe it's because linux is akin to the devil? Yes, I like this, let's blame linux! Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/treeview.c 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 13:31:02 2010 @@ -120,3 +120,22 @@ + } 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 = Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Wed Jun 9 13:31:02 2010 @@ -2865,7 +2865,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 =

14 years, 6 months

[janderwald] 47711: [PORTCLS] - Check if resource list has been allocated

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jun 9 13:27:19 2010 New Revision: 47711 URL: http://svn.reactos.org/svn/reactos?rev=47711&view=rev Log: [PORTCLS] - Check if resource list has been allocated Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Wed Jun 9 13:27:19 2010 @@ -118,11 +118,22 @@ // Clean up DPRINT("IRP_MN_REMOVE_DEVICE\n"); - DeviceExt->resources->Release(); - IoDeleteDevice(DeviceObject); + // sanity check + PC_ASSERT(DeviceExt); + + // FIXME more cleanup */ + if (DeviceExt->resources) + { + // free resource list */ + DeviceExt->resources->Release(); + + // set to null + DeviceExt->resources = NULL; + } // Forward request Status = PcForwardIrpSynchronous(DeviceObject, Irp); + return PcCompleteIrp(DeviceObject, Irp, Status); case IRP_MN_QUERY_INTERFACE:

14 years, 6 months

[akhaldi] 47710: - Leftover from the sync.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 9 12:07:22 2010 New Revision: 47710 URL: http://svn.reactos.org/svn/reactos?rev=47710&view=rev Log: - Leftover from the sync. Modified: branches/header-work/subsystems/subsystems.rbuild Modified: branches/header-work/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/subsyste… ============================================================================== --- branches/header-work/subsystems/subsystems.rbuild [iso-8859-1] (original) +++ branches/header-work/subsystems/subsystems.rbuild [iso-8859-1] Wed Jun 9 12:07:22 2010 @@ -1,9 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <if property="ARCH" value="i386"> <directory name="ntvdm"> <xi:include href="ntvdm/ntvdm.rbuild" /> </directory> + </if> <directory name="win32"> <xi:include href="win32/win32.rbuild" /> </directory>

14 years, 6 months

[tkreuzer] 47709: [WIN32K] Small bug big effects: Use the correct offset when copying the BITMAPINFO, fixes taskbar icons regression.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 9 11:22:19 2010 New Revision: 47709 URL: http://svn.reactos.org/svn/reactos?rev=47709&view=rev Log: [WIN32K] Small bug big effects: Use the correct offset when copying the BITMAPINFO, fixes taskbar icons regression. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c 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 11:22:19 2010 @@ -1936,7 +1936,9 @@ else { /* Copy valid Fields, keep bmiHeader.biSize safe */ - RtlCopyMemory((PBYTE)pbmiDst + sizeof(DWORD), pbmiSrc, pbmiDst->bmiHeader.biSize - sizeof(DWORD)); + RtlCopyMemory(&pbmiDst->bmiHeader.biWidth, + &pbmiSrc->bmiHeader.bV5Width, + pbmiDst->bmiHeader.biSize - sizeof(DWORD)); } if((pbmiDst->bmiHeader.biSize < sizeof(BITMAPV4HEADER)) && (pbmiSrc->bmiHeader.bV5Compression == BI_BITFIELDS))

14 years, 6 months

[fireball] 47708: - Add "bootcdregtest" in the list of well-known targets.

by fireball＠svn.reactos.org

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:

14 years, 6 months

[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

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; } } }

14 years, 6 months

[gedmurphy] 47706: This bug seems to have gone now. Tried to replicate it the devmgmt treeview.

by gedmurphy＠svn.reactos.org

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 =

14 years, 6 months

[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

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.…

14 years, 6 months

[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

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 */

14 years, 6 months

[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

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++) {

14 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
41
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 June 2010