Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cgutman] 40441: - Deserialized miniports always complete their sends asynchronously so we return NDIS_STATUS_PENDING when we call one (so the ProtocolSendComplete handler doesn't get called twice thus double-completing the packet) - Fixes miniport drivers that use a deserialized SendPackets handler (including the rtl8139) - The rtl8139 driver still doesn't work (likely due to a bug in tcpip)

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Apr 10 23:00:51 2009 New Revision: 40441 URL: http://svn.reactos.org/svn/reactos?rev=40441&view=rev Log: - Deserialized miniports always complete their sends asynchronously so we return NDIS_STATUS_PENDING when we call one (so the ProtocolSendComplete handler doesn't get called twice thus double-completing the packet) - Fixes miniport drivers that use a deserialized SendPackets handler (including the rtl8139) - The rtl8139 driver still doesn't work (likely due to a bug in tcpip) Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Apr 10 23:00:51 2009 @@ -975,7 +975,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, (PPNDIS_PACKET)&WorkItemContext, 1); - NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); + NdisStatus = NDIS_STATUS_PENDING; } else { Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Apr 10 23:00:51 2009 @@ -201,7 +201,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); - NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + NdisStatus = NDIS_STATUS_PENDING; } else { /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); @@ -322,12 +322,6 @@ { (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray, NumberOfPackets); - for (i = 0; i < NumberOfPackets; i++) - { - NdisStatus = NDIS_GET_PACKET_STATUS(PacketArray[i]); - if (NdisStatus != NDIS_STATUS_PENDING) - MiniSendComplete(Adapter, PacketArray[i], NdisStatus); - } } else {

15 years, 9 months

[gschneider] 40440: - Don't copy the original header after the new header is filled correctly, fixes one gdi32 clipping winetest TDB for the other seven remaining clipping tests: - Deprecate rosdc regions and use dc/dclvl regions as soon as the other clip functions are ready for it (currently crashes virtually everywhere; first five failing tests) - Fix imprecision of one pixel (rounding problems?) in XFORMOBJ_bApplyXform (last two failing tests)

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Apr 10 21:49:12 2009 New Revision: 40440 URL: http://svn.reactos.org/svn/reactos?rev=40440&view=rev Log: - Don't copy the original header after the new header is filled correctly, fixes one gdi32 clipping winetest TDB for the other seven remaining clipping tests: - Deprecate rosdc regions and use dc/dclvl regions as soon as the other clip functions are ready for it (currently crashes virtually everywhere; first five failing tests) - Fix imprecision of one pixel (rounding problems?) in XFORMOBJ_bApplyXform (last two failing tests) Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Fri Apr 10 21:49:12 2009 @@ -2539,9 +2539,6 @@ _SEH2_TRY { - /* Copy header */ - Region->rdh = RgnData->rdh; - if (Xform) { ULONG ret;

15 years, 9 months

[cfinck] 40439: - Remove _SHExpandEnvironmentStrings and replace calls to it by usual ExpandEnvironmentStringsW calls. That function didn't really do what it should as it replaced some variables by faulty generated values instead of their actual values. Fixing this gets us rid of our duplicated "Administrator" directory, so the only remaining Admin dir is "Administrator.REACTOS" created by userenv. This might also fix the SHGetFolderPathW timing issue, which was hit by rosautotest from time to t

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 10 20:05:09 2009 New Revision: 40439 URL: http://svn.reactos.org/svn/reactos?rev=40439&view=rev Log: - Remove _SHExpandEnvironmentStrings and replace calls to it by usual ExpandEnvironmentStringsW calls. That function didn't really do what it should as it replaced some variables by faulty generated values instead of their actual values. Fixing this gets us rid of our duplicated "Administrator" directory, so the only remaining Admin dir is "Administrator.REACTOS" created by userenv. This might also fix the SHGetFolderPathW timing issue, which was hit by rosautotest from time to time. - In turn, removing that function makes it possible to get rid of the now unused _SHOpenProfilesKey and _SHGetProfilesValue functions. Modified: trunk/reactos/dll/win32/shell32/shellpath.c Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Fri Apr 10 20:05:09 2009 @@ -909,8 +909,6 @@ } }; -static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest); - /* Gets the value named value from the registry key * rootKey\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders * (or from rootKey\userPrefix\... if userPrefix is not NULL) into path, which @@ -974,7 +972,7 @@ { WCHAR szTemp[MAX_PATH]; - _SHExpandEnvironmentStrings(path, szTemp); + ExpandEnvironmentStringsW(path, szTemp, MAX_PATH); lstrcpynW(path, szTemp, MAX_PATH); } ret = RegSetValueExW(shellFolderKey, value, 0, REG_SZ, (LPBYTE)path, @@ -1240,164 +1238,6 @@ hr = _SHGetDefaultValue(folder, pszPath); } TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); - return hr; -} - -static HRESULT _SHOpenProfilesKey(PHKEY pKey) -{ - LONG lRet; - DWORD disp; - - lRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ProfileListW, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, pKey, &disp); - return HRESULT_FROM_WIN32(lRet); -} - -/* Reads the value named szValueName from the key profilesKey (assumed to be - * opened by _SHOpenProfilesKey) into szValue, which is assumed to be MAX_PATH - * WCHARs in length. If it doesn't exist, returns szDefault (and saves - * szDefault to the registry). - */ -static HRESULT _SHGetProfilesValue(HKEY profilesKey, LPCWSTR szValueName, - LPWSTR szValue, LPCWSTR szDefault) -{ - HRESULT hr; - DWORD type, dwPathLen = MAX_PATH * sizeof(WCHAR); - LONG lRet; - - TRACE("%p,%s,%p,%s\n", profilesKey, debugstr_w(szValueName), szValue, - debugstr_w(szDefault)); - lRet = RegQueryValueExW(profilesKey, szValueName, NULL, &type, - (LPBYTE)szValue, &dwPathLen); - if (!lRet && (type == REG_SZ || type == REG_EXPAND_SZ) && dwPathLen - && *szValue) - { - dwPathLen /= sizeof(WCHAR); - szValue[dwPathLen] = '\0'; - hr = S_OK; - } - else - { - /* Missing or invalid value, set a default */ - lstrcpynW(szValue, szDefault, MAX_PATH); - TRACE("Setting missing value %s to %s\n", debugstr_w(szValueName), - debugstr_w(szValue)); - lRet = RegSetValueExW(profilesKey, szValueName, 0, REG_EXPAND_SZ, - (LPBYTE)szValue, - (wcslen(szValue) + 1) * sizeof(WCHAR)); - if (lRet) - hr = HRESULT_FROM_WIN32(lRet); - else - hr = S_OK; - } - TRACE("returning 0x%08x (output value is %s)\n", hr, debugstr_w(szValue)); - return hr; -} - -/* Attempts to expand environment variables from szSrc into szDest, which is - * assumed to be MAX_PATH characters in length. Before referring to the - * environment, handles a few variables directly, because the environment - * variables may not be set when this is called (as during Wine's installation - * when default values are being written to the registry). - * The directly handled environment variables, and their source, are: - * - ALLUSERSPROFILE, USERPROFILE: reads from the registry - * - SystemDrive: uses GetSystemDirectoryW and uses the drive portion of its - * path - * If one of the directly handled environment variables is expanded, only - * expands a single variable, and only in the beginning of szSrc. - */ -static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) -{ - HRESULT hr; - WCHAR szTemp[MAX_PATH], szProfilesPrefix[MAX_PATH] = { 0 }; - HKEY key = NULL; - - TRACE("%s, %p\n", debugstr_w(szSrc), szDest); - - if (!szSrc || !szDest) return E_INVALIDARG; - - /* short-circuit if there's nothing to expand */ - if (szSrc[0] != '%') - { - wcscpy(szDest, szSrc); - hr = S_OK; - goto end; - } - /* Get the profile prefix, we'll probably be needing it */ - hr = _SHOpenProfilesKey(&key); - if (SUCCEEDED(hr)) - { - WCHAR szDefaultProfilesPrefix[MAX_PATH]; - - GetWindowsDirectoryW(szDefaultProfilesPrefix, MAX_PATH); - PathAddBackslashW(szDefaultProfilesPrefix); - PathAppendW(szDefaultProfilesPrefix, szDefaultProfileDirW); - hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, - szDefaultProfilesPrefix); - } - - *szDest = 0; - wcscpy(szTemp, szSrc); - while (SUCCEEDED(hr) && szTemp[0] == '%') - { - if (!strncmpiW(szTemp, AllUsersProfileW, wcslen(AllUsersProfileW))) - { - WCHAR szAllUsers[MAX_PATH]; - - wcscpy(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); - PathAppendW(szDest, szAllUsers); - PathAppendW(szDest, szTemp + wcslen(AllUsersProfileW)); - } - else if (!strncmpiW(szTemp, UserProfileW, wcslen(UserProfileW))) - { - WCHAR userName[MAX_PATH]; - DWORD userLen = MAX_PATH; - - wcscpy(szDest, szProfilesPrefix); - GetUserNameW(userName, &userLen); - PathAppendW(szDest, userName); - PathAppendW(szDest, szTemp + wcslen(UserProfileW)); - } - else if (!strncmpiW(szTemp, SystemDriveW, wcslen(SystemDriveW))) - { - GetSystemDirectoryW(szDest, MAX_PATH); - if (szDest[1] != ':') - { - FIXME("non-drive system paths unsupported\n"); - hr = E_FAIL; - } - else - { - wcscpy(szDest + 3, szTemp + wcslen(SystemDriveW) + 1); - hr = S_OK; - } - } - else - { - DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); - - if (ret > MAX_PATH) - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - else if (ret == 0) - hr = HRESULT_FROM_WIN32(GetLastError()); - else - hr = S_OK; - } - if (SUCCEEDED(hr) && szDest[0] == '%') - wcscpy(szTemp, szDest); - else - { - /* terminate loop */ - szTemp[0] = '\0'; - } - } -end: - if (key) - RegCloseKey(key); - TRACE("returning 0x%08x (input was %s, output is %s)\n", hr, - debugstr_w(szSrc), debugstr_w(szDest)); return hr; } @@ -1557,9 +1397,20 @@ /* Expand environment strings if necessary */ if (*szTemp == '%') - hr = _SHExpandEnvironmentStrings(szTemp, szBuildPath); + { + DWORD ExpandRet = ExpandEnvironmentStringsW(szTemp, szBuildPath, MAX_PATH); + + if (ExpandRet > MAX_PATH) + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + else if (ExpandRet == 0) + hr = HRESULT_FROM_WIN32(GetLastError()); + else + hr = S_OK; + } else + { wcscpy(szBuildPath, szTemp); + } if (FAILED(hr)) goto end;

15 years, 9 months

[fireball] 40438: - Fix a couple more assumptions about first primary partition being the active one. - If no active partitions found, set active primary partition number to 0. This fixes uninitialized variable usage, which revealed itself as a bug with unattended setup. - Silence a DPRINT1.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Apr 10 17:27:09 2009 New Revision: 40438 URL: http://svn.reactos.org/svn/reactos?rev=40438&view=rev Log: - Fix a couple more assumptions about first primary partition being the active one. - If no active partitions found, set active primary partition number to 0. This fixes uninitialized variable usage, which revealed itself as a bug with unattended setup. - Silence a DPRINT1. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Apr 10 17:27:09 2009 @@ -3345,7 +3345,8 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - PartitionType = PartitionList->ActiveBootPartition->PartInfo[0].PartitionType; + PartitionType = PartitionList->ActiveBootPartition-> + PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; if (PartitionType == PARTITION_ENTRY_UNUSED) { @@ -3518,7 +3519,8 @@ UCHAR PartitionType; NTSTATUS Status; - PartitionType = PartitionList->ActiveBootPartition->PartInfo[0].PartitionType; + PartitionType = PartitionList->ActiveBootPartition-> + PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; if ((PartitionType == PARTITION_FAT_12) || (PartitionType == PARTITION_FAT_16) || (PartitionType == PARTITION_HUGE) || Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Apr 10 17:27:09 2009 @@ -2361,6 +2361,7 @@ /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ List->ActiveBootDisk = DiskEntry; List->ActiveBootPartition = PartEntry; + List->ActiveBootPartitionNumber = 0; return; } @@ -2391,7 +2392,7 @@ List->ActiveBootPartition = PartEntry; List->ActiveBootPartitionNumber = i; - DPRINT1("Found bootable partition disk %d, drive letter %c\n", + DPRINT("Found bootable partition disk %d, drive letter %c\n", DiskEntry->BiosDiskNumber, PartEntry->DriveLetter[i]); break;

15 years, 9 months

[fireball] 40437: - Add a new property to the disk entry: NoMbr flag. It's set, if MBR's first two bytes are zero (same algorithm is used by our cdrom bootsector). - If this flag is set for a boot disk, ReactOS MBR code will be installed on it. See issue #4355 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Apr 10 14:37:08 2009 New Revision: 40437 URL: http://svn.reactos.org/svn/reactos?rev=40437&view=rev Log: - Add a new property to the disk entry: NoMbr flag. It's set, if MBR's first two bytes are zero (same algorithm is used by our cdrom bootsector). - If this flag is set for a boot disk, ReactOS MBR code will be installed on it. See issue #4355 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Apr 10 14:37:08 2009 @@ -2380,6 +2380,28 @@ CheckActiveBootPartition(PartitionList); } + /* Install MBR if necessary */ + if (DiskEntry->NoMbr && + DiskEntry->BiosDiskNumber == 0) + { + wcscpy(PathBuffer, SourceRootPath.Buffer); + wcscat(PathBuffer, L"\\loader\\dosmbr.bin"); + + DPRINT("Install MBR bootcode: %S ==> %S\n", + PathBuffer, DestinationRootPath.Buffer); + + /* Install MBR bootcode */ + Status = InstallMbrBootCodeToDisk(PathBuffer, DestinationRootPath.Buffer); + if (!NT_SUCCESS (Status)) + { + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", + Status); + return FALSE; + } + + DiskEntry->NoMbr = FALSE; + } + if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) { /* FIXME: Install boot code. This is a hack! */ Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Apr 10 14:37:08 2009 @@ -775,10 +775,6 @@ } Checksum = ~Checksum + 1; - RtlFreeHeap (ProcessHeap, - 0, - Mbr); - swprintf(Identifier, L"%08x-%08x-A", Checksum, Signature); DPRINT("Identifier: %S\n", Identifier); @@ -798,6 +794,17 @@ DiskEntry->Modified = TRUE; } DiskEntry->BiosFound = FALSE; + + /* Check if this disk has a valid MBR */ + if (Mbr->BootCode[0] == 0 && Mbr->BootCode[1] == 0) + DiskEntry->NoMbr = TRUE; + else + DiskEntry->NoMbr = FALSE; + + /* Free Mbr sector buffer */ + RtlFreeHeap (ProcessHeap, + 0, + Mbr); ListEntry = List->BiosDiskListHead.Flink; while(ListEntry != &List->BiosDiskListHead) @@ -2672,6 +2679,7 @@ } DiskEntry1->NewDisk = FALSE; + DiskEntry1->NoMbr = FALSE; } } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Fri Apr 10 14:37:08 2009 @@ -109,6 +109,7 @@ BOOLEAN Modified; BOOLEAN NewDisk; + BOOLEAN NoMbr; /* MBR is absent */ UNICODE_STRING DriverName;

15 years, 9 months

[cgutman] 40436: - Complete send requests along with the other types when we get an EOF - Fail the requests with STATUS_CANCELLED

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Apr 10 06:38:45 2009 New Revision: 40436 URL: http://svn.reactos.org/svn/reactos?rev=40436&view=rev Log: - Complete send requests along with the other types when we get an EOF - Fail the requests with STATUS_CANCELLED 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] Fri Apr 10 06:38:45 2009 @@ -218,27 +218,22 @@ if( NewState & SEL_FIN ) { PLIST_ENTRY ListsToErase[4]; - NTSTATUS IrpStatus[4]; UINT i; TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); ListsToErase[0] = &Connection->ReceiveRequest; - IrpStatus [0] = STATUS_SUCCESS; ListsToErase[1] = &Connection->ListenRequest; - IrpStatus [1] = STATUS_UNSUCCESSFUL; ListsToErase[2] = &Connection->ConnectRequest; - IrpStatus [2] = STATUS_UNSUCCESSFUL; - ListsToErase[3] = 0; - IrpStatus [3] = 0; - - for( i = 0; ListsToErase[i]; i++ ) { + ListsToErase[3] = &Connection->SendRequest; + + for( i = 0; i < 4; i++ ) { while( !IsListEmpty( ListsToErase[i] ) ) { Entry = RemoveHeadList( ListsToErase[i] ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - Complete( Bucket->Request.RequestContext, IrpStatus[i], 0 ); - exFreePool( Bucket ); + Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + exFreePool( Bucket ); } } }

15 years, 9 months

[tkreuzer] 40435: fix DEVMODE, 2nd try

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Apr 10 02:58:35 2009 New Revision: 40435 URL: http://svn.reactos.org/svn/reactos?rev=40435&view=rev Log: fix DEVMODE, 2nd try Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Fri Apr 10 02:58:35 2009 @@ -1507,7 +1507,7 @@ #ifdef __WINESRC__ } DUMMYUNIONNAME1; #else - } DUMMYUNIONNAME2; + } DUMMYUNIONNAME; #endif short dmColor;

15 years, 9 months

[tkreuzer] 40434: Rename PALGDI to PALETTE as it's called in gdikdx.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Apr 10 02:28:54 2009 New Revision: 40434 URL: http://svn.reactos.org/svn/reactos?rev=40434&view=rev Log: Rename PALGDI to PALETTE as it's called in gdikdx. Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/pdevobj.h trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/palobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/palette.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -36,7 +36,7 @@ // // VOID FASTCALL -ColorCorrection(PPALGDI PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors) +ColorCorrection(PPALETTE PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors) { PPDEVOBJ ppdev = (PPDEVOBJ)PalGDI->hPDev; @@ -91,10 +91,10 @@ ULONG APIENTRY PALOBJ_cGetColors(PALOBJ *PalObj, ULONG Start, ULONG Colors, ULONG *PaletteEntry) { - PALGDI *PalGDI; + PALETTE *PalGDI; - PalGDI = (PALGDI*)PalObj; - /* PalGDI = (PALGDI*)AccessInternalObjectFromUserObject(PalObj); */ + PalGDI = (PALETTE*)PalObj; + /* PalGDI = (PALETTE*)AccessInternalObjectFromUserObject(PalObj); */ if (Start >= PalGDI->NumColors) return 0; Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -95,7 +95,7 @@ } static __inline VOID -BitMasksFromPal(USHORT PalType, PPALGDI Palette, +BitMasksFromPal(USHORT PalType, PPALETTE Palette, PULONG RedMask, PULONG BlueMask, PULONG GreenMask) { static const union { PALETTEENTRY Color; ULONG Mask; } Red = {{0xFF, 0x00, 0x00}}; @@ -152,8 +152,8 @@ { XLATEOBJ *XlateObj; XLATEGDI *XlateGDI; - PALGDI *SourcePalGDI = 0; - PALGDI *DestPalGDI = 0; + PALETTE *SourcePalGDI = 0; + PALETTE *DestPalGDI = 0; ULONG SourceRedMask = 0, SourceGreenMask = 0, SourceBlueMask = 0; ULONG DestRedMask = 0, DestGreenMask = 0, DestBlueMask = 0; ULONG i; @@ -297,7 +297,7 @@ { XLATEOBJ *XlateObj; XLATEGDI *XlateGDI; - PALGDI *SourcePalGDI; + PALETTE *SourcePalGDI; XlateGDI = EngAllocMem(0, sizeof(XLATEGDI), TAG_XLATEOBJ); if (XlateGDI == NULL) @@ -363,7 +363,7 @@ { XLATEOBJ *XlateObj; XLATEGDI *XlateGDI; - PALGDI *DestPalGDI; + PALETTE *DestPalGDI; DestPalGDI = PALETTE_LockPalette(PaletteDest); if (DestPalGDI == NULL) @@ -487,7 +487,7 @@ /* DIB sections need special handling */ if (psurfSrc->hSecure) { - PPALGDI ppal = PALETTE_LockPalette(psurfSrc->hDIBPalette); + PPALETTE ppal = PALETTE_LockPalette(psurfSrc->hDIBPalette); if (ppal) { XlateObj = IntEngCreateSrcMonoXlate(DestPalette, ((ULONG*)ppal->IndexedColors)[0], ((ULONG*)ppal->IndexedColors)[1]); @@ -564,7 +564,7 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color) { XLATEGDI *XlateGDI; - PALGDI *PalGDI; + PALETTE *PalGDI; ULONG Closest; /* Return the original color if there's no color translation object. */ @@ -623,7 +623,7 @@ { HPALETTE hPalette; XLATEGDI *XlateGDI; - PALGDI *PalGDI; + PALETTE *PalGDI; ULONG *InPal; XlateGDI = ObjToGDI(XlateObj, XLATE); Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -43,7 +43,7 @@ typedef struct _DCLEVEL { HPALETTE hpal; - struct _PALGDI * ppal; + struct _PALETTE * ppal; PVOID pColorSpace; /* COLORSPACE* */ LONG lIcmMode; LONG lSaveDepth; Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -40,7 +40,7 @@ int max; } ColorShifts; -typedef struct _PALGDI +typedef struct _PALETTE { /* Header for all gdi objects in the handle table. Do not (re)move this. */ @@ -56,7 +56,7 @@ ULONG GreenMask; ULONG BlueMask; HDEV hPDev; -} PALGDI, *PPALGDI; +} PALETTE, *PPALETTE; HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, ULONG NumColors, @@ -68,7 +68,7 @@ CONST RGBQUAD *Colors); #define PALETTE_FreePalette(pPalette) GDIOBJ_FreeObj((POBJ)pPalette, GDIObjType_PAL_TYPE) #define PALETTE_FreePaletteByHandle(hPalette) GDIOBJ_FreeObjByHandle((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE) -#define PALETTE_LockPalette(hPalette) ((PPALGDI)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)) +#define PALETTE_LockPalette(hPalette) ((PPALETTE)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)) #define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((POBJ)pPalette) BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody); @@ -79,7 +79,7 @@ #endif INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color); -INT FASTCALL PALETTE_GetObject(PPALGDI pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer); +INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer); PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID); HPALETTE FASTCALL GdiSelectPalette(HDC, HPALETTE, BOOL); Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -86,7 +86,7 @@ // ULONG TagSig; // PLDEVOBJ pldev; DHPDEV hPDev; /* dhpdev, DHPDEV for device. */ - PVOID ppalSurf; /* PEPALOBJ/PPALGDI for this device. */ + PVOID ppalSurf; /* PEPALOBJ/PPALETTE for this device. */ DEVINFO DevInfo; // devinfo GDIINFO GDIInfo; // gdiinfo HSURF pSurface; /* SURFACE for this device., FIXME: PSURFACE */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -347,7 +347,7 @@ SURFACE *BitmapDest, *BitmapSrc = NULL; XLATEOBJ *XlateObj = NULL; HPALETTE SourcePalette = 0, DestPalette = 0; - PPALGDI PalDestGDI, PalSourceGDI; + PPALETTE PalDestGDI, PalSourceGDI; USHORT PalDestMode, PalSrcMode; ULONG TransparentColor = 0; BOOL Ret = FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -218,7 +218,7 @@ { /* Copy the color table */ UINT Index; - PPALGDI PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); + PPALETTE PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); if (!PalGDI) { Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -84,14 +84,14 @@ if( hPal != NtGdiGetStockObject(DEFAULT_PALETTE) ) { - PPALGDI palPtr; + PPALETTE palPtr; UINT pal_entries; HDC hDC; PDC dc; PWINDOW_OBJECT Wnd; const PALETTEENTRY *pptr = PaletteColors; - palPtr = (PPALGDI)PALETTE_LockPalette(hPal); + palPtr = (PPALETTE)PALETTE_LockPalette(hPal); if (!palPtr) return FALSE; pal_entries = palPtr->NumColors; @@ -246,7 +246,7 @@ HPALETTE APIENTRY NtGdiCreatePaletteInternal ( IN LPLOGPALETTE pLogPal, IN UINT cEntries ) { - PPALGDI PalGDI; + PPALETTE PalGDI; HPALETTE NewPalette; pLogPal->palNumEntries = cEntries; @@ -260,7 +260,7 @@ return NULL; } - PalGDI = (PPALGDI) PALETTE_LockPalette(NewPalette); + PalGDI = (PPALETTE) PALETTE_LockPalette(NewPalette); if (PalGDI != NULL) { PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); @@ -295,14 +295,14 @@ { COLORREF nearest = CLR_INVALID; PDC dc; - PPALGDI palGDI; + PPALETTE palGDI; LONG RBits, GBits, BBits; dc = DC_LockDc(hDC); if (NULL != dc) { HPALETTE hpal = dc->dclevel.hpal; - palGDI = (PPALGDI) PALETTE_LockPalette(hpal); + palGDI = (PPALETTE) PALETTE_LockPalette(hpal); if (!palGDI) { DC_UnlockDc(dc); @@ -339,7 +339,7 @@ UINT APIENTRY NtGdiGetNearestPaletteIndex(HPALETTE hpal, COLORREF Color) { - PPALGDI palGDI = (PPALGDI) PALETTE_LockPalette(hpal); + PPALETTE palGDI = (PPALETTE) PALETTE_LockPalette(hpal); UINT index = 0; if (NULL != palGDI) @@ -358,10 +358,10 @@ UINT Entries, LPPALETTEENTRY pe) { - PPALGDI palGDI; + PPALETTE palGDI; UINT numEntries; - palGDI = (PPALGDI) PALETTE_LockPalette(hpal); + palGDI = (PPALETTE) PALETTE_LockPalette(hpal); if (NULL == palGDI) { return 0; @@ -403,7 +403,7 @@ UINT Entries, LPPALETTEENTRY pe) { - PPALGDI palGDI = NULL; + PPALETTE palGDI = NULL; PDC dc = NULL; UINT EntriesSize = 0; UINT Ret = 0; @@ -489,7 +489,7 @@ * of bugs in it. */ - PPALGDI palGDI, sysGDI; + PPALETTE palGDI, sysGDI; int realized = 0; PDC dc; HPALETTE systemPalette; @@ -608,7 +608,7 @@ UINT Entries, CONST LPPALETTEENTRY pe) { - PPALGDI palGDI; + PPALETTE palGDI; WORD numEntries; if ((UINT)hpal & GDI_HANDLE_STOCK_MASK) @@ -670,7 +670,7 @@ NtGdiUnrealizeObject(HGDIOBJ hgdiobj) { BOOL Ret = FALSE; - PPALGDI palGDI; + PPALETTE palGDI; if ( !hgdiobj || ((UINT)hgdiobj & GDI_HANDLE_STOCK_MASK) || Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -247,7 +247,7 @@ { PDC pdc; HPALETTE oldPal = NULL; - PPALGDI ppal; + PPALETTE ppal; // FIXME: mark the palette as a [fore\back]ground pal pdc = DC_LockDc(hDC); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -74,7 +74,7 @@ { PDC dc; PSURFACE psurf; - PPALGDI PalGDI; + PPALETTE PalGDI; UINT Index; ULONG biBitCount; @@ -143,7 +143,7 @@ { PDC dc; PSURFACE psurf; - PPALGDI PalGDI; + PPALETTE PalGDI; UINT Index; ULONG biBitCount; @@ -226,7 +226,7 @@ POINTL ZeroPoint; RECTL DestRect; XLATEOBJ *XlateObj; - PPALGDI hDCPalette; + PPALETTE hDCPalette; //RGBQUAD *lpRGB; HPALETTE DDB_Palette, DIB_Palette; ULONG DDB_Palette_Type, DIB_Palette_Type; @@ -446,7 +446,7 @@ INT DIBWidth; SIZEL SourceSize; XLATEOBJ *XlateObj = NULL; - PPALGDI pDCPalette; + PPALETTE pDCPalette; HPALETTE DDBPalette, DIBPalette = NULL; ULONG DDBPaletteType, DIBPaletteType; @@ -606,8 +606,8 @@ HBITMAP hDestBitmap = NULL; HPALETTE hSourcePalette = NULL; HPALETTE hDestPalette = NULL; - PPALGDI SourcePalette = NULL; - PPALGDI DestPalette = NULL; + PPALETTE SourcePalette = NULL; + PPALETTE DestPalette = NULL; NTSTATUS Status = STATUS_SUCCESS; ULONG Result = 0; BOOL bPaletteMatch = FALSE; @@ -1615,7 +1615,7 @@ RGBQUAD *lpRGB; ULONG nNumColors,i; USHORT *lpIndex; - PPALGDI palGDI; + PPALETTE palGDI; palGDI = PALETTE_LockPalette(dc->dclevel.hpal); Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -851,7 +851,7 @@ ULONG ulMode) { SURFACE *psurf; - PPALGDI PalDestGDI; + PPALETTE PalDestGDI; XLATEOBJ *XlateObj; RECTL Extent; POINTL DitherOrg; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -50,7 +50,7 @@ {1, sizeof(SURFACE), TAG_SURFACE, SURFACE_Cleanup}, /* 05 SURFACE */ {1, sizeof(CLIENTOBJ), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CLIENTOBJ: METADC,... */ {1, sizeof(PATH), TAG_PATH, GDI_CleanupDummy}, /* 07 PATH */ - {1, sizeof(PALGDI), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */ + {1, sizeof(PALETTE), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */ {1, sizeof(COLORSPACE), TAG_ICMLCS, GDI_CleanupDummy}, /* 09 ICMLCS, */ {1, sizeof(TEXTOBJ), TAG_LFONT, GDI_CleanupDummy}, /* 0a LFONT */ {0, 0, TAG_RFONT, NULL}, /* 0b RFONT, unused */ @@ -1721,7 +1721,7 @@ break; case GDI_OBJECT_TYPE_PALETTE: - Result = PALETTE_GetObject((PPALGDI) pGdiObject, cbCount, lpBuffer); + Result = PALETTE_GetObject((PPALETTE) pGdiObject, cbCount, lpBuffer); break; default: Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -232,7 +232,7 @@ UpdateDeviceGammaRamp( HDEV hPDev ) { BOOL Ret = FALSE; - PPALGDI palGDI; + PPALETTE palGDI; PALOBJ *palPtr; PPDEVOBJ pGDev = (PPDEVOBJ) hPDev; Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] Fri Apr 10 02:28:54 2009 @@ -42,7 +42,7 @@ BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody) { - PPALGDI pPal = (PPALGDI)ObjectBody; + PPALETTE pPal = (PPALETTE)ObjectBody; if (NULL != pPal->IndexedColors) { ExFreePool(pPal->IndexedColors); @@ -61,9 +61,9 @@ ULONG Blue) { HPALETTE NewPalette; - PPALGDI PalGDI; - - PalGDI = (PPALGDI)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE); + PPALETTE PalGDI; + + PalGDI = (PPALETTE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE); if (!PalGDI) { return NULL; @@ -108,10 +108,10 @@ CONST RGBQUAD *Colors) { HPALETTE NewPalette; - PPALGDI PalGDI; + PPALETTE PalGDI; UINT i; - PalGDI = (PPALGDI)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE); + PalGDI = (PPALETTE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE); if (!PalGDI) { return NULL; @@ -229,8 +229,8 @@ int index, iRemapped = 0; int *mapping; HPALETTE hSysPal = NtGdiGetStockObject(DEFAULT_PALETTE); - PPALGDI pSysPal = PALETTE_LockPalette(hSysPal); - PPALGDI palGDI = CONTAINING_RECORD(palPtr,PALGDI,PalObj); + PPALETTE pSysPal = PALETTE_LockPalette(hSysPal); + PPALETTE palGDI = CONTAINING_RECORD(palPtr,PALETTE,PalObj); /* FIXME - handle pSysPal == NULL!!!!!!! */ COLOR_sysPal = pSysPal->IndexedColors; @@ -339,7 +339,7 @@ #endif INT FASTCALL -PALETTE_GetObject(PPALGDI pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer) +PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer) { if (!lpBuffer) {

15 years, 9 months

[tkreuzer] 40433: Fix definition of DEVMODE

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Apr 10 02:13:59 2009 New Revision: 40433 URL: http://svn.reactos.org/svn/reactos?rev=40433&view=rev Log: Fix definition of DEVMODE Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Fri Apr 10 02:13:59 2009 @@ -1438,9 +1438,11 @@ #else } DUMMYSTRUCTNAME; #endif - POINTL dmPosition; - DWORD dmDisplayOrientation; - DWORD dmDisplayFixedOutput; + struct { + POINTL dmPosition; + DWORD dmDisplayOrientation; + DWORD dmDisplayFixedOutput; + } DUMMYSTRUCTNAME2; #ifdef __WINESRC__ } DUMMYUNIONNAME1; #else @@ -1497,13 +1499,15 @@ #else } DUMMYSTRUCTNAME; #endif - POINTL dmPosition; - DWORD dmDisplayOrientation; - DWORD dmDisplayFixedOutput; + struct { + POINTL dmPosition; + DWORD dmDisplayOrientation; + DWORD dmDisplayFixedOutput; + } DUMMYSTRUCTNAME2; #ifdef __WINESRC__ } DUMMYUNIONNAME1; #else - } DUMMYUNIONNAME; + } DUMMYUNIONNAME2; #endif short dmColor; @@ -1533,7 +1537,7 @@ DWORD dmPanningHeight; #endif #endif /* WINVER >= 0x0400 */ -} DEVMODEW,*LPDEVMODEW,*PDEVMODEW; +} DEVMODEW,*LPDEVMODEW,*PDEVMODEW,*NPDEVMODEW; typedef struct tagDIBSECTION { BITMAP dsBm; BITMAPINFOHEADER dsBmih;

15 years, 9 months

[mjmartin] 40432: - rw.c: After the write wait has been satisfied, check that the pipe is not closed before trying to acquire the mutex. Fix bug #4351.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Apr 10 01:10:04 2009 New Revision: 40432 URL: http://svn.reactos.org/svn/reactos?rev=40432&view=rev Log: - rw.c: After the write wait has been satisfied, check that the pipe is not closed before trying to acquire the mutex. Fix bug #4351. Modified: trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Fri Apr 10 01:10:04 2009 @@ -836,6 +836,17 @@ Status = STATUS_PIPE_BROKEN; goto done; } + /* Check that the pipe has not been closed */ + if (ReaderCcb->PipeState != FILE_PIPE_CONNECTED_STATE) + { + /* If the other side is valid, fire event */ + if (Ccb) + { + KeResetEvent(&Ccb->WriteEvent); + } + Status = STATUS_PIPE_BROKEN; + goto done; + } ExAcquireFastMutex(&ReaderCcb->DataListLock); }

15 years, 9 months

← Newer
1
...
32
33
34
35
36
37
38
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009