Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 49269: [Win32k] - Fix typos found by Mephisto on IRC, also add some debug prints in SetWindowsHookEx to see what hooks are installed.
by jimtabor＠svn.reactos.org 25 Oct '10

25 Oct '10

Author: jimtabor Date: Mon Oct 25 01:37:14 2010 New Revision: 49269 URL: http://svn.reactos.org/svn/reactos?rev=49269&view=rev Log: [Win32k] - Fix typos found by Mephisto on IRC, also add some debug prints in SetWindowsHookEx to see what hooks are installed. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Oct 25 01:37:14 2010 @@ -503,7 +503,7 @@ RtlCopyMemory( &CbtCreatewndExtra->Cs, CbtCreateWnd->lpcs, sizeof(CREATESTRUCTW) ); CbtCreatewndExtra->WndInsertAfter = CbtCreateWnd->hwndInsertAfter; Extra = (PCHAR) (CbtCreatewndExtra + 1); - CbtCreatewndExtra->Cs.lpszClass = ClassName.Buffer; // if Atom + CbtCreatewndExtra->Cs.lpszClass = CbtCreateWnd->lpcs->lpszClass; // if Atom if (Ansi) { @@ -517,7 +517,7 @@ } else { - if (asWindowName.Buffer) + if (WindowName.Buffer) RtlCopyMemory(Extra, WindowName.Buffer, WindowName.Length); CbtCreatewndExtra->Cs.lpszName = (LPCWSTR) (Extra - (PCHAR) CbtCreatewndExtra); Extra += WindowName.Length; @@ -526,7 +526,7 @@ Extra += sizeof(WCHAR); } - if (!IS_ATOM(ClassName.Buffer)) + if (!IS_ATOM(CbtCreateWnd->lpcs->lpszClass)) { if (Ansi) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Oct 25 01:37:14 2010 @@ -1178,6 +1178,7 @@ HookId == WH_MOUSE_LL || HookId == WH_SYSMSGFILTER) { + DPRINT1("Local hook installing Global HookId: %d\n",HookId); /* these can only be global */ SetLastWin32Error(ERROR_GLOBAL_ONLY_HOOK); RETURN( NULL); @@ -1196,6 +1197,7 @@ if ( pti->rpdesk != ptiCurrent->rpdesk) // gptiCurrent->rpdesk) { + DPRINT1("Local hook wrong desktop HookId: %d\n",HookId); SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN( NULL); } @@ -1212,6 +1214,7 @@ HookId == WH_FOREGROUNDIDLE || HookId == WH_CALLWNDPROCRET) ) { + DPRINT1("Local hook needs hMod HookId: %d\n",HookId); SetLastWin32Error(ERROR_HOOK_NEEDS_HMOD); RETURN( NULL); } @@ -1245,6 +1248,7 @@ HookId == WH_FOREGROUNDIDLE || HookId == WH_CALLWNDPROCRET) ) { + DPRINT1("Global hook needs hMod HookId: %d\n",HookId); SetLastWin32Error(ERROR_HOOK_NEEDS_HMOD); RETURN( NULL); } @@ -1376,6 +1380,7 @@ else Hook->offPfn = 0; + DPRINT1("Installing: HookId %d Global %s\n", HookId, !ThreadId ? "TRUE" : "FALSE"); RETURN( Handle); CLEANUP:

1 0

[jimtabor] 49268: [User32] - One more leftover to add. Now we test for both Local and Global hooks in user32. This will force any message sent to win32k if there are any Global hookers so we loose ...
by jimtabor＠svn.reactos.org 25 Oct '10

25 Oct '10

Author: jimtabor Date: Mon Oct 25 00:15:35 2010 New Revision: 49268 URL: http://svn.reactos.org/svn/reactos?rev=49268&view=rev Log: [User32] - One more leftover to add. Now we test for both Local and Global hooks in user32. This will force any message sent to win32k if there are any Global hookers so we loose in performance. We need to rethink our usage of these Global hookers in our code. Modified: trunk/reactos/dll/win32/user32/include/user32.h Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Mon Oct 25 00:15:35 2010 @@ -169,7 +169,7 @@ static __inline BOOL IsThreadHooked(PCLIENTINFO pci) { - return pci->fsHooks != 0; + return (pci->fsHooks|pci->pDeskInfo->fsHooks) != 0; } static __inline PDESKTOPINFO

1 0

[khornicek] 49267: [WIN32K] Simplify the RLE hack and avoid code duplication. Bail out of UserEnumDisplaySettings early in case invalid ModeNum was requested. Use default BPP value in UserChangeDis...
by khornicek＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: khornicek Date: Sun Oct 24 23:40:23 2010 New Revision: 49267 URL: http://svn.reactos.org/svn/reactos?rev=49267&view=rev Log: [WIN32K] Simplify the RLE hack and avoid code duplication. Bail out of UserEnumDisplaySettings early in case invalid ModeNum was requested. Use default BPP value in UserChangeDisplaySettings if DM_BITSPERPEL is not set. Partially fixes "fullscreen issue" as described on the yarotows wiki page. Remove some unused variables + misc cleanup. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sun Oct 24 23:40:23 2010 @@ -243,9 +243,9 @@ if (pustrDevice) { /* Loop through the list of devices */ - for (pGraphicsDevice = gpGraphicsDeviceFirst, i = 0; + for (pGraphicsDevice = gpGraphicsDeviceFirst; pGraphicsDevice; - pGraphicsDevice = pGraphicsDevice->pNextGraphicsDevice, i++) + pGraphicsDevice = pGraphicsDevice->pNextGraphicsDevice) { /* Compare the device name */ RtlInitUnicodeString(&ustrCurrent, pGraphicsDevice->szWinDeviceName); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/rlecomp.c [iso-8859-1] Sun Oct 24 23:40:23 2010 @@ -18,48 +18,59 @@ RLE_DELTA = 2 /* Delta */ }; -VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) +VOID DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG Format) { - int x = 0; - int y = Size.cy - 1; - int c; - int length; - int width = ((Size.cx+1)/2); - int height = Size.cy - 1; + INT x = 0; + INT y = Size.cy - 1; + INT c; + INT length; + INT width; + INT height = Size.cy - 1; BYTE *begin = CompressedBits; BYTE *bits = CompressedBits; BYTE *temp; - while (y >= 0) + INT shift = 0; + + if (Format == BMF_4RLE) + shift = 1; + else if(Format != BMF_8RLE) + return; + + width = ((Size.cx + shift) >> shift); + + _SEH2_TRY { - length = *bits++ / 2; - if (length) + while (y >= 0) { - c = *bits++; - while (length--) + length = (*bits++) >> shift; + if (length) { - if (x >= width) break; - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; + c = *bits++; + while (length--) + { + if (x >= width) break; + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } } - } - else - { - length = *bits++; - switch (length) + else { + length = *bits++; + switch (length) + { case RLE_EOL: x = 0; y--; break; case RLE_END: - return; + _SEH2_YIELD(return); case RLE_DELTA: - x += (*bits++)/2; - y -= (*bits++)/2; + x += (*bits++) >> shift; + y -= (*bits++) >> shift; break; default: - length /= 2; + length = length >> shift; while (length--) { c = *bits++; @@ -74,67 +85,15 @@ { bits++; } + } } } } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Decoding error\n"); + } + _SEH2_END; + + return; } - -VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta) -{ - int x = 0; - int y = Size.cy - 1; - int c; - int length; - int width = Size.cx; - int height = Size.cy - 1; - BYTE *begin = CompressedBits; - BYTE *bits = CompressedBits; - BYTE *temp; - while (y >= 0) - { - length = *bits++; - if (length) - { - c = *bits++; - while (length--) - { - if (x >= width) break; - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - else - { - length = *bits++; - switch (length) - { - case RLE_EOL: - x = 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x += *bits++; - y -= *bits++; - break; - default: - while (length--) - { - c = *bits++; - if (x < width) - { - temp = UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp = c; - } - } - if ((bits - begin) & 1) - { - bits++; - } - } - } - } -} Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/eng.h [iso-8859-1] Sun Oct 24 23:40:23 2010 @@ -36,6 +36,4 @@ IN SIZE_T cjSize, IN ULONG ulTag); -VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta); -VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta); - +VOID DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG iFormat); Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sun Oct 24 23:40:23 2010 @@ -430,11 +430,12 @@ PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; - DPRINT1("Enter UserEnumDisplaySettings('%ls', %ld)\n", + DPRINT("Enter UserEnumDisplaySettings('%ls', %ld)\n", pustrDevice ? pustrDevice->Buffer : NULL, iModeNum); /* Ask gdi for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); + if (!pGraphicsDevice) { /* No device found */ @@ -442,19 +443,19 @@ return STATUS_UNSUCCESSFUL; } - if (iModeNum == 0) - { - DPRINT1("Should initialize modes somehow\n"); - // Update DISPLAY_DEVICEs? - } + if (iModeNum >= pGraphicsDevice->cDevModes) + return STATUS_NO_MORE_ENTRIES; iFoundMode = 0; for (i = 0; i < pGraphicsDevice->cDevModes; i++) { pdmentry = &pGraphicsDevice->pDevModeList[i]; -// if ((!(dwFlags & EDS_RAWMODE) && (pdmentry->dwFlags & 1)) || // FIXME! -// (dwFlags & EDS_RAWMODE)) + /* FIXME: consider EDS_RAWMODE */ +#if 0 + if ((!(dwFlags & EDS_RAWMODE) && (pdmentry->dwFlags & 1)) ||! + (dwFlags & EDS_RAWMODE)) +#endif { /* Is this the one we want? */ if (iFoundMode == iModeNum) @@ -536,7 +537,7 @@ DEVMODEW dmReg, *pdm; DPRINT1("Enter NtUserEnumDisplaySettings(%ls, %ld)\n", - pustrDevice ? pustrDevice->Buffer:0, iModeNum); + pustrDevice ? pustrDevice->Buffer : 0, iModeNum); if (pustrDevice) { @@ -668,8 +669,12 @@ } /* Fixup values */ - if((dm.dmFields & DM_BITSPERPEL) && (dm.dmBitsPerPel == 0)) + if(dm.dmBitsPerPel == 0 || !(dm.dmFields & DM_BITSPERPEL)) + { dm.dmBitsPerPel = ppdev->pdmwDev->dmBitsPerPel; + dm.dmFields |= DM_BITSPERPEL; + } + if((dm.dmFields & DM_DISPLAYFREQUENCY) && (dm.dmDisplayFrequency == 0)) dm.dmDisplayFrequency = ppdev->pdmwDev->dmDisplayFrequency; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Oct 24 23:40:23 2010 @@ -101,20 +101,13 @@ pso = &psurf->SurfObj; /* The infamous RLE hack */ - if (iFormat == BMF_4RLE) - { - sizl.cx = nWidth; sizl.cy = nHeight; + if (iFormat == BMF_4RLE || iFormat == BMF_8RLE) + { + sizl.cx = nWidth; + sizl.cy = nHeight; pvCompressedBits = pvBits; pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress4bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); - fjBitmap |= BMF_RLE_HACK; - } - else if (iFormat == BMF_8RLE) - { - sizl.cx = nWidth; sizl.cy = nHeight; - pvCompressedBits = pvBits; - pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress8bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); + DecompressBitmap(sizl, pvCompressedBits, pvBits, pso->lDelta, iFormat); fjBitmap |= BMF_RLE_HACK; } @@ -239,10 +232,7 @@ if (Dc->dctype != DC_TYPE_MEMORY) { PSURFACE psurf; - SIZEL size; - - size.cx = abs(Width); - size.cy = abs(Height); + Bmp = GreCreateBitmap(abs(Width), abs(Height), 1, @@ -268,11 +258,9 @@ { if (Count == sizeof(BITMAP)) { - SIZEL size; PSURFACE psurfBmp; - size.cx = abs(Width); - size.cy = abs(Height); - Bmp = GreCreateBitmap(abs(Width), + + Bmp = GreCreateBitmap(abs(Width), abs(Height), 1, dibs.dsBm.bmBitsPixel,

1 0

[tkreuzer] 49266: [WIN32K] - Rewrite InitVideo - Move registry functions to the appropriate file - Silence some DPRINTs
by tkreuzer＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: tkreuzer Date: Sun Oct 24 23:32:18 2010 New Revision: 49266 URL: http://svn.reactos.org/svn/reactos?rev=49266&view=rev Log: [WIN32K] - Rewrite InitVideo - Move registry functions to the appropriate file - Silence some DPRINTs Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c branches/reactos-yarotows/subsystems/win32/win32k/eng/ldevobj.c branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c branches/reactos-yarotows/subsystems/win32/win32k/include/device.h branches/reactos-yarotows/subsystems/win32/win32k/include/misc.h branches/reactos-yarotows/subsystems/win32/win32k/misc/registry.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sun Oct 24 23:32:18 2010 @@ -11,6 +11,9 @@ #define NDEBUG #include <debug.h> + +PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; +PGRAPHICS_DEVICE gpVgaGraphicsDevice; static PGRAPHICS_DEVICE gpGraphicsDeviceFirst = NULL; static PGRAPHICS_DEVICE gpGraphicsDeviceLast = NULL; Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Sun Oct 24 23:32:18 2010 @@ -54,7 +54,8 @@ gpldevWin32k->cRefs = 1; gpldevWin32k->ulDriverVersion = GDI_ENGINE_VERSION; gpldevWin32k->pGdiDriverInfo = (PVOID)(gpldevWin32k + 1); - gpldevWin32k->pGdiDriverInfo->DriverName.Buffer = NULL; // FIXME + RtlInitUnicodeString(&gpldevWin32k->pGdiDriverInfo->DriverName, + L"\\SystemRoot\\System32\\win32k.sys"); gpldevWin32k->pGdiDriverInfo->ImageAddress = &__ImageBase; gpldevWin32k->pGdiDriverInfo->SectionPointer = NULL; gpldevWin32k->pGdiDriverInfo->EntryPoint = (PVOID)DriverEntry; @@ -107,7 +108,7 @@ ULONG cbSize, cbFull; PDEVMODEINFO pdminfo; - DPRINT1("LDEVOBJ_pdmiGetModes(%p, %p)\n", pldev, hDriver); + DPRINT("LDEVOBJ_pdmiGetModes(%p, %p)\n", pldev, hDriver); /* Call the driver to get the required size */ cbSize = pldev->pfn.GetModes(hDriver, 0, NULL); @@ -167,16 +168,11 @@ return FALSE; } - /* Initialize the UNICODE_STRING */ - pDriverInfo->DriverName.Buffer = (PWSTR)(pDriverInfo + 1); - pDriverInfo->DriverName.Length = pstrPathName->Length; - pDriverInfo->DriverName.MaximumLength = pstrPathName->Length; - - /* Copy the driver name */ -// RtlCopyUnicodeString(pDriverInfo->DriverName, pstrPathName); - RtlCopyMemory(pDriverInfo->DriverName.Buffer, - pstrPathName->Buffer, - pstrPathName->Length); + /* Initialize the UNICODE_STRING and copy the driver name */ + RtlInitEmptyUnicodeString(&pDriverInfo->DriverName, + (PWSTR)(pDriverInfo + 1), + pstrPathName->Length); + RtlCopyUnicodeString(&pDriverInfo->DriverName, pstrPathName); /* Try to load the driver */ Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation, Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Sun Oct 24 23:32:18 2010 @@ -13,8 +13,9 @@ #define NDEBUG #include <debug.h> +PPDEVOBJ gppdevPrimary = NULL; + static PPDEVOBJ gppdevList = NULL; -PPDEVOBJ gppdevPrimary = NULL; static HSEMAPHORE ghsemPDEV; BOOL @@ -225,7 +226,6 @@ return NULL; } - static PPDEVOBJ EngpCreatePDEV( @@ -236,12 +236,19 @@ PPDEVOBJ ppdev; /* Try to find the GRAPHICS_DEVICE */ - pGraphicsDevice = EngpFindGraphicsDevice(pustrDeviceName, 0, 0); - if (!pGraphicsDevice) - { - DPRINT1("No GRAPHICS_DEVICE found for %ls!\n", - pustrDeviceName ? pustrDeviceName->Buffer : 0); - return NULL; + if (pustrDeviceName) + { + pGraphicsDevice = EngpFindGraphicsDevice(pustrDeviceName, 0, 0); + if (!pGraphicsDevice) + { + DPRINT1("No GRAPHICS_DEVICE found for %ls!\n", + pustrDeviceName ? pustrDeviceName->Buffer : 0); + return NULL; + } + } + else + { + pGraphicsDevice = gpPrimaryGraphicsDevice; } /* Allocate a new PDEVOBJ */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/device.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/device.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/device.h [iso-8859-1] Sun Oct 24 23:32:18 2010 @@ -41,22 +41,6 @@ //#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl(TAG('R', 'o', 's', 'D'), (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); - -NTSTATUS -NTAPI -RegOpenKey( - LPCWSTR pwszKeyName, - PHKEY phkey); - -NTSTATUS -NTAPI -RegQueryValue( - IN HKEY hkey, - IN PCWSTR pwszValueName, - IN ULONG ulType, - OUT PVOID pvData, - IN OUT PULONG pcbValue); - BOOL NTAPI PDEVOBJ_bSwitchMode( @@ -68,3 +52,6 @@ PDEVOBJ_pdmMatchDevMode( PPDEVOBJ ppdev, PDEVMODEW pdm); + +extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; +extern PGRAPHICS_DEVICE gpVgaGraphicsDevice; Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/misc.h [iso-8859-1] Sun Oct 24 23:32:18 2010 @@ -29,6 +29,33 @@ PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); VOID APIENTRY HackUnsecureVirtualMemory(IN PVOID); +NTSTATUS +NTAPI +RegOpenKey( + LPCWSTR pwszKeyName, + PHKEY phkey); + +NTSTATUS +NTAPI +RegQueryValue( + IN HKEY hkey, + IN PCWSTR pwszValueName, + IN ULONG ulType, + OUT PVOID pvData, + IN OUT PULONG pcbValue); + +VOID +NTAPI +RegWriteSZ(HKEY hkey, PWSTR pwszValue, PWSTR pwszData); + +VOID +NTAPI +RegWriteDWORD(HKEY hkey, PWSTR pwszValue, DWORD dwData); + +BOOL +NTAPI +RegReadDWORD(HKEY hkey, PWSTR pwszValue, PDWORD pdwData); + BOOL NTAPI RegReadUserSetting( Modified: branches/reactos-yarotows/subsystems/win32/win32k/misc/registry.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/misc/registry.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/misc/registry.c [iso-8859-1] Sun Oct 24 23:32:18 2010 @@ -55,7 +55,7 @@ UNICODE_STRING ustrValueName; BYTE ajBuffer[100]; PKEY_VALUE_PARTIAL_INFORMATION pInfo; - ULONG cbInfoSize; + ULONG cbInfoSize, cbDataSize; /* Check if the local buffer is sufficient */ cbInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + *pcbValue; @@ -81,20 +81,23 @@ (PVOID)pInfo, cbInfoSize, &cbInfoSize); + + cbDataSize = cbInfoSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + if (NT_SUCCESS(Status)) { /* Did we get the right type */ if (pInfo->Type == ulType) { /* Copy the contents to the caller */ - RtlCopyMemory(pvData, pInfo->Data, *pcbValue); + RtlCopyMemory(pvData, pInfo->Data, min(*pcbValue, cbDataSize)); } else Status = STATUS_OBJECT_TYPE_MISMATCH; } /* Return the data size to the caller */ - *pcbValue = cbInfoSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + *pcbValue = cbDataSize; /* Cleanup */ if (pInfo != (PVOID)ajBuffer) @@ -104,6 +107,37 @@ } +VOID +NTAPI +RegWriteSZ(HKEY hkey, PWSTR pwszValue, PWSTR pwszData) +{ + UNICODE_STRING ustrValue; + UNICODE_STRING ustrData; + + RtlInitUnicodeString(&ustrValue, pwszValue); + RtlInitUnicodeString(&ustrData, pwszData); + ZwSetValueKey(hkey, &ustrValue, 0, REG_SZ, &ustrData, ustrData.Length + sizeof(WCHAR)); +} + +VOID +NTAPI +RegWriteDWORD(HKEY hkey, PWSTR pwszValue, DWORD dwData) +{ + UNICODE_STRING ustrValue; + + RtlInitUnicodeString(&ustrValue, pwszValue); + ZwSetValueKey(hkey, &ustrValue, 0, REG_DWORD, &dwData, sizeof(DWORD)); +} + +BOOL +NTAPI +RegReadDWORD(HKEY hkey, PWSTR pwszValue, PDWORD pdwData) +{ + NTSTATUS Status; + ULONG cbSize = sizeof(DWORD); + Status = RegQueryValue(hkey, pwszValue, REG_DWORD, pdwData, &cbSize); + return NT_SUCCESS(Status); +} BOOL NTAPI Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sun Oct 24 23:32:18 2010 @@ -13,48 +13,12 @@ #define NDEBUG #include <debug.h> -PDEVOBJ *gpdevPrimary; - -const PWCHAR KEY_ROOT = L""; -const PWCHAR KEY_VIDEO = L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO"; - -NTSTATUS -NTAPI -UserEnumDisplayDevices( - PUNICODE_STRING pustrDevice, - DWORD iDevNum, - PDISPLAY_DEVICEW pdispdev, - DWORD dwFlags); - -VOID -RegWriteSZ(HKEY hkey, PWSTR pwszValue, PWSTR pwszData) -{ - UNICODE_STRING ustrValue; - UNICODE_STRING ustrData; - - RtlInitUnicodeString(&ustrValue, pwszValue); - RtlInitUnicodeString(&ustrData, pwszData); - ZwSetValueKey(hkey, &ustrValue, 0, REG_SZ, &ustrData, ustrData.Length + sizeof(WCHAR)); -} - -VOID -RegWriteDWORD(HKEY hkey, PWSTR pwszValue, DWORD dwData) -{ - UNICODE_STRING ustrValue; - - RtlInitUnicodeString(&ustrValue, pwszValue); - ZwSetValueKey(hkey, &ustrValue, 0, REG_DWORD, &dwData, sizeof(DWORD)); -} - - -BOOL -RegReadDWORD(HKEY hkey, PWSTR pwszValue, PDWORD pdwData) -{ - NTSTATUS Status; - ULONG cbSize = sizeof(DWORD); - Status = RegQueryValue(hkey, pwszValue, REG_DWORD, pdwData, &cbSize); - return NT_SUCCESS(Status); -} +BOOL InitSysParams(); + +BOOL gbBaseVideo = 0; + +static const PWCHAR KEY_ROOT = L""; +static const PWCHAR KEY_VIDEO = L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO"; VOID RegWriteDisplaySettings(HKEY hkey, PDEVMODEW pdm) @@ -103,96 +67,12 @@ READ(dmPosition.y, "Attach.RelativeY", DM_POSITION); } - -enum -{ - VF_USEVGA = 0x1, -}; - -BOOL +PGRAPHICS_DEVICE +NTAPI InitDisplayDriver( - PUNICODE_STRING pustrRegPath, - FLONG flags) -{ -// PWSTR pwszDriverName; - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; - - /* Setup QueryTable for direct registry query */ - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED|RTL_QUERY_REGISTRY_DIRECT; - - - /* Check if vga mode is requested */ - if (flags & VF_USEVGA) - { - DWORD dwVgaCompatible; - - /* */ - QueryTable[0].Name = L"VgaCompatible"; - QueryTable[0].EntryContext = &dwVgaCompatible; - - /* Check if the driver is vga */ - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - pustrRegPath->Buffer, - QueryTable, - NULL, - NULL); - - if (!dwVgaCompatible) - { - /* This driver is not a vga driver */ - return FALSE; - } - } - -#if 0 - - /* Query the adapter's registry path */ - swprintf(awcBuffer, L"\\Device\\Video%lu", iDevNum); - QueryTable[0].Name = pGraphicsDevice->szNtDeviceName; - - /* Set string for the registry key */ - ustrRegistryPath.Buffer = pdispdev->DeviceKey; - ustrRegistryPath.Length = 128; - ustrRegistryPath.MaximumLength = 128; - QueryTable[0].EntryContext = &ustrRegistryPath; - - /* Query the registry */ - Status = RtlQueryRegistryValues(RTL_REGISTRY_DEVICEMAP, - L"VIDEO", - QueryTable, - NULL, - NULL); - - RegQueryValue(KEY_VIDEO, awcBuffer, REG_SZ, pdispdev->DeviceKey, 256); - - { - HANDLE hmod; - - hmod = EngLoadImage(pwszDriverName); - - /* Jump to next name */ - pwszDriverName += wcslen(pwszDriverName) + 1; - } - while (pwszDriverName < 0); -#endif - - return 0; -} - - -NTSTATUS -NTAPI -DisplayDriverQueryRoutine( - IN PWSTR ValueName, - IN ULONG ValueType, - IN PVOID ValueData, - IN ULONG ValueLength, - IN PVOID Context, - IN PVOID EntryContext) -{ - PWSTR pwszRegKey = ValueData; + IN PWSTR pwszDeviceName, + IN PWSTR pwszRegKey) +{ PGRAPHICS_DEVICE pGraphicsDevice; UNICODE_STRING ustrDeviceName, ustrDisplayDrivers, ustrDescription; NTSTATUS Status; @@ -201,31 +81,16 @@ HKEY hkey; DEVMODEW dmDefault; - UNREFERENCED_PARAMETER(ValueLength); - UNREFERENCED_PARAMETER(Context); - UNREFERENCED_PARAMETER(EntryContext); - - DPRINT1("DisplayDriverQueryRoutine(%S, %S);\n", - ValueName, pwszRegKey); - - /* Check if we have a correct entry */ - if (ValueType != REG_SZ || ValueName[0] != '\\') - { - /* Something else, just skip it */ - return STATUS_SUCCESS; - } + DPRINT1("InitDisplayDriver(%S, %S);\n", + pwszDeviceName, pwszRegKey); /* Open the driver's registry key */ Status = RegOpenKey(pwszRegKey, &hkey); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open registry key\n"); - return STATUS_SUCCESS; - } - -// HACK: only use 1st adapter -//if (ValueName[13] != '0') -// return STATUS_SUCCESS; + DPRINT1("Failed to open registry key: %ls\n", pwszRegKey); + return NULL; + } /* Query the diplay drivers */ cbSize = sizeof(awcBuffer) - 10; @@ -238,7 +103,7 @@ { DPRINT1("Didn't find 'InstalledDisplayDrivers', status = 0x%lx\n", Status); ZwClose(hkey); - return STATUS_SUCCESS; + return NULL; } /* Initialize the UNICODE_STRING */ @@ -273,43 +138,118 @@ ZwClose(hkey); /* Register the device with GDI */ - RtlInitUnicodeString(&ustrDeviceName, ValueName); + RtlInitUnicodeString(&ustrDeviceName, pwszDeviceName); pGraphicsDevice = EngpRegisterGraphicsDevice(&ustrDeviceName, &ustrDisplayDrivers, &ustrDescription, &dmDefault); - // FIXME: what to do with pGraphicsDevice? - - return STATUS_SUCCESS; -} - -BOOL InitSysParams(); + return pGraphicsDevice; +} BOOL -InitVideo(FLONG flags) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; +InitVideo( + PUNICODE_STRING pustrRegPath, + FLONG flags) +{ + ULONG iDevNum, iVGACompatible = -1, ulMaxObjectNumber = 0; + WCHAR awcDeviceName[20]; + WCHAR awcBuffer[256]; NTSTATUS Status; + PGRAPHICS_DEVICE pGraphicsDevice; + ULONG cbValue; + HKEY hkey; DPRINT1("----------------------------- InitVideo() -------------------------------\n"); - /* Setup QueryTable for registry query */ - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - QueryTable[0].QueryRoutine = DisplayDriverQueryRoutine; - - /* Query the registry */ - Status = RtlQueryRegistryValues(RTL_REGISTRY_DEVICEMAP, - L"VIDEO", - QueryTable, - NULL, - NULL); + Status = RegOpenKey(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control", &hkey); + if (NT_SUCCESS(Status)) + { + cbValue = 256; + Status = RegQueryValue(hkey, L"SystemStartOptions", REG_SZ, awcBuffer, &cbValue); + if (NT_SUCCESS(Status)) + { + /* Check if VGA mode is requested. */ + if (wcsstr(awcBuffer, L"/BASEVIDEO") != 0) + { + DPRINT1("VGA mode requested.\n"); + gbBaseVideo = TRUE; + } + } + + ZwClose(hkey); + } + + /* Open the key for the adapters */ + Status = RegOpenKey(KEY_VIDEO, &hkey); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not open device registry key!\n"); + ASSERT(FALSE); + } + + /* Read the name of the VGA adapter */ + cbValue = 20; + Status = RegQueryValue(hkey, L"VgaCompatible", REG_SZ, awcDeviceName, &cbValue); + if (NT_SUCCESS(Status)) + { + iVGACompatible = _wtoi(&awcDeviceName[13]); + DPRINT1("VGA adapter = %ld\n", iVGACompatible); + } + + /* Get the maximum mumber of adapters */ + if (!RegReadDWORD(hkey, L"MaxObjectNumber", &ulMaxObjectNumber)) + { + DPRINT1("Could not read MaxObjectNumber, defaulting to 0.\n"); + } + + DPRINT("Found %ld devices\n", ulMaxObjectNumber); + + /* Loop through all adapters */ + cbValue = 256; + for (iDevNum = 0; iDevNum <= ulMaxObjectNumber; iDevNum++) + { + /* Create the adapter's key name */ + swprintf(awcDeviceName, L"\\Device\\Video%lu", iDevNum); + + /* Read the reg key name */ + Status = RegQueryValue(hkey, awcDeviceName, REG_SZ, awcBuffer, &cbValue); + + pGraphicsDevice = InitDisplayDriver(awcDeviceName, awcBuffer); + + /* Check if this is the VGA adapter */ + if (iDevNum == iVGACompatible) + { + /* Set the VGA device as primary */ + gpVgaGraphicsDevice = pGraphicsDevice; + DPRINT1("gpVgaGraphicsDevice = %p\n", gpVgaGraphicsDevice); + } + + /* Set the first one as primary device */ + if (!gpPrimaryGraphicsDevice) + gpPrimaryGraphicsDevice = pGraphicsDevice; + } + + ZwClose(hkey); + + if (gbBaseVideo) + { + if (gpVgaGraphicsDevice) + { + /* Set the VgaAdapter as primary */ + gpPrimaryGraphicsDevice = gpVgaGraphicsDevice; + // FIXME: DEVMODE + } + else + { + DPRINT1("Could not find VGA compatible driver. Trying normal.\n"); + } + } InitSysParams(); - return 0; -} - + return 1; +} NTSTATUS NTAPI

1 0

[khornicek] 49265: [WIN32K] Set proper flags and masks in BuildDIBPalette. Set PAL_BGR for 24/32 BPP in AllocPalette. Rename Mode to Flags to better reflect its usage. Fixes "red icons" and dibtest.
by khornicek＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: khornicek Date: Sun Oct 24 22:52:50 2010 New Revision: 49265 URL: http://svn.reactos.org/svn/reactos?rev=49265&view=rev Log: [WIN32K] Set proper flags and masks in BuildDIBPalette. Set PAL_BGR for 24/32 BPP in AllocPalette. Rename Mode to Flags to better reflect its usage. Fixes "red icons" and dibtest. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c branches/reactos-yarotows/subsystems/win32/win32k/objects/icm.c branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Sun Oct 24 22:52:50 2010 @@ -362,19 +362,19 @@ EXLATEOBJ_vInitTrivial(pexlo); if (ppalDst == ppalSrc || !ppalSrc || !ppalDst || - ((ppalDst->Mode == PAL_RGB || ppalDst->Mode == PAL_BGR) && - ppalDst->Mode == ppalSrc->Mode)) + ((ppalDst->flFlags == PAL_RGB || ppalDst->flFlags == PAL_BGR) && + ppalDst->flFlags == ppalSrc->flFlags)) { return; } pexlo->ppalSrc = ppalSrc; pexlo->ppalDst = ppalDst; - pexlo->xlo.iSrcType = ppalSrc->Mode; - pexlo->xlo.iDstType = ppalDst->Mode; + pexlo->xlo.iSrcType = ppalSrc->flFlags; + pexlo->xlo.iDstType = ppalDst->flFlags; /* Chack if both of the pallettes are indexed */ - if (!(ppalSrc->Mode & PAL_INDEXED) || !(ppalDst->Mode & PAL_INDEXED)) + if (!(ppalSrc->flFlags & PAL_INDEXED) || !(ppalDst->flFlags & PAL_INDEXED)) { /* At least one palette is not indexed, calculate shifts/masks */ ULONG aulMasksSrc[3], aulMasksDst[3]; @@ -391,10 +391,10 @@ pexlo->ulBlueShift = CalculateShift(aulMasksSrc[2], aulMasksDst[2]); } - if (ppalSrc->Mode & PAL_MONOCHROME) + if (ppalSrc->flFlags & PAL_MONOCHROME) { /* This is a monochrome palette */ - if (!(ppalDst->Mode & PAL_MONOCHROME)) + if (!(ppalDst->flFlags & PAL_MONOCHROME)) { /* Mono to color, use the dest DC's fore and back color */ pexlo->pfnXlate = EXLATEOBJ_iXlateTable; @@ -406,28 +406,28 @@ PALETTE_ulGetNearestIndex(ppalDst, crDstBackColor); } } - else if (ppalDst->Mode & PAL_MONOCHROME) + else if (ppalDst->flFlags & PAL_MONOCHROME) { pexlo->pfnXlate = EXLATEOBJ_iXlateToMono; pexlo->xlo.flXlate |= XO_TO_MONO; pexlo->xlo.cEntries = 1; - if (ppalSrc->Mode & PAL_INDEXED) + if (ppalSrc->flFlags & PAL_INDEXED) { pexlo->aulXlate[0] = PALETTE_ulGetNearestPaletteIndex(ppalSrc, crSrcBackColor); } - else if (ppalSrc->Mode & PAL_BGR) + else if (ppalSrc->flFlags & PAL_BGR) { pexlo->aulXlate[0] = crSrcBackColor; } - else if (ppalSrc->Mode & PAL_RGB) + else if (ppalSrc->flFlags & PAL_RGB) { pexlo->aulXlate[0] = RGB(GetBValue(crSrcBackColor), GetGValue(crSrcBackColor), GetRValue(crSrcBackColor)); } - else if (ppalSrc->Mode & PAL_BITFIELDS) + else if (ppalSrc->flFlags & PAL_BITFIELDS) { PALETTE_vGetBitMasks(ppalSrc, &pexlo->ulRedMask); pexlo->ulRedShift = CalculateShift(0xFF, pexlo->ulRedMask); @@ -437,7 +437,7 @@ pexlo->aulXlate[0] = EXLATEOBJ_iXlateShiftAndMask(pexlo, crSrcBackColor); } } - else if (ppalSrc->Mode & PAL_INDEXED) + else if (ppalSrc->flFlags & PAL_INDEXED) { cEntries = ppalSrc->NumColors; @@ -458,7 +458,7 @@ pexlo->xlo.cEntries = cEntries; pexlo->pfnXlate = EXLATEOBJ_iXlateTable; - if (ppalDst->Mode & PAL_INDEXED) + if (ppalDst->flFlags & PAL_INDEXED) { pexlo->xlo.flXlate |= XO_TABLE; @@ -504,78 +504,78 @@ } } } - else if (ppalSrc->Mode & PAL_RGB) - { - if (ppalDst->Mode & PAL_INDEXED) + else if (ppalSrc->flFlags & PAL_RGB) + { + if (ppalDst->flFlags & PAL_INDEXED) pexlo->pfnXlate = EXLATEOBJ_iXlateRGBtoPal; - else if (ppalDst->Mode & PAL_BGR) + else if (ppalDst->flFlags & PAL_BGR) pexlo->pfnXlate = EXLATEOBJ_iXlateRGBtoBGR; - else if (ppalDst->Mode & PAL_RGB16_555) + else if (ppalDst->flFlags & PAL_RGB16_555) pexlo->pfnXlate = EXLATEOBJ_iXlateRGBto555; - else if (ppalDst->Mode & PAL_RGB16_565) + else if (ppalDst->flFlags & PAL_RGB16_565) pexlo->pfnXlate = EXLATEOBJ_iXlateRGBto565; - else if (ppalDst->Mode & PAL_BITFIELDS) + else if (ppalDst->flFlags & PAL_BITFIELDS) pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; } - else if (ppalSrc->Mode & PAL_BGR) - { - if (ppalDst->Mode & PAL_INDEXED) + else if (ppalSrc->flFlags & PAL_BGR) + { + if (ppalDst->flFlags & PAL_INDEXED) pexlo->pfnXlate = EXLATEOBJ_iXlateBitfieldsToPal; - else if (ppalDst->Mode & PAL_RGB) + else if (ppalDst->flFlags & PAL_RGB) /* The inverse function works the same */ pexlo->pfnXlate = EXLATEOBJ_iXlateRGBtoBGR; - else if (ppalDst->Mode & PAL_RGB16_555) + else if (ppalDst->flFlags & PAL_RGB16_555) pexlo->pfnXlate = EXLATEOBJ_iXlateBGRto555; - else if (ppalDst->Mode & PAL_RGB16_565) + else if (ppalDst->flFlags & PAL_RGB16_565) pexlo->pfnXlate = EXLATEOBJ_iXlateBGRto565; - else if (ppalDst->Mode & PAL_BITFIELDS) + else if (ppalDst->flFlags & PAL_BITFIELDS) pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; } - else if (ppalSrc->Mode & PAL_RGB16_555) - { - if (ppalDst->Mode & PAL_INDEXED) + else if (ppalSrc->flFlags & PAL_RGB16_555) + { + if (ppalDst->flFlags & PAL_INDEXED) pexlo->pfnXlate = EXLATEOBJ_iXlate555toPal; - else if (ppalDst->Mode & PAL_RGB) + else if (ppalDst->flFlags & PAL_RGB) pexlo->pfnXlate = EXLATEOBJ_iXlate555toRGB; - else if (ppalDst->Mode & PAL_BGR) + else if (ppalDst->flFlags & PAL_BGR) pexlo->pfnXlate = EXLATEOBJ_iXlate555toBGR; - else if (ppalDst->Mode & PAL_RGB16_565) + else if (ppalDst->flFlags & PAL_RGB16_565) pexlo->pfnXlate = EXLATEOBJ_iXlate555to565; - else if (ppalDst->Mode & PAL_BITFIELDS) + else if (ppalDst->flFlags & PAL_BITFIELDS) pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; } - else if (ppalSrc->Mode & PAL_RGB16_565) - { - if (ppalDst->Mode & PAL_INDEXED) + else if (ppalSrc->flFlags & PAL_RGB16_565) + { + if (ppalDst->flFlags & PAL_INDEXED) pexlo->pfnXlate = EXLATEOBJ_iXlate565toPal; - else if (ppalDst->Mode & PAL_RGB) + else if (ppalDst->flFlags & PAL_RGB) pexlo->pfnXlate = EXLATEOBJ_iXlate565toRGB; - else if (ppalDst->Mode & PAL_BGR) + else if (ppalDst->flFlags & PAL_BGR) pexlo->pfnXlate = EXLATEOBJ_iXlate565toBGR; - else if (ppalDst->Mode & PAL_RGB16_555) + else if (ppalDst->flFlags & PAL_RGB16_555) pexlo->pfnXlate = EXLATEOBJ_iXlate565to555; - else if (ppalDst->Mode & PAL_BITFIELDS) + else if (ppalDst->flFlags & PAL_BITFIELDS) pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; } - else if (ppalSrc->Mode & PAL_BITFIELDS) - { - if (ppalDst->Mode & PAL_INDEXED) + else if (ppalSrc->flFlags & PAL_BITFIELDS) + { + if (ppalDst->flFlags & PAL_INDEXED) pexlo->pfnXlate = EXLATEOBJ_iXlateBitfieldsToPal; else pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; @@ -694,9 +694,9 @@ /* Verify palette type match */ if (!ppal || ((iPal == XO_SRCPALETTE || iPal == XO_DESTPALETTE) - && !(ppal->Mode & PAL_INDEXED)) || + && !(ppal->flFlags & PAL_INDEXED)) || ((iPal == XO_SRCBITFIELDS || iPal == XO_DESTBITFIELDS) - && !(ppal->Mode & PAL_BITFIELDS))) + && !(ppal->flFlags & PAL_BITFIELDS))) { return 0; } @@ -707,7 +707,7 @@ } /* Copy the values into the buffer */ - if (ppal->Mode & PAL_INDEXED) + if (ppal->flFlags & PAL_INDEXED) { cPal = min(cPal, ppal->NumColors); for (i = 0; i < cPal; i++) 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] Sun Oct 24 22:52:50 2010 @@ -40,7 +40,7 @@ PALOBJ PalObj; XLATEOBJ *logicalToSystem; HPALETTE Self; - ULONG Mode; // PAL_INDEXED, PAL_BITFIELDS, PAL_RGB, PAL_BGR + FLONG flFlags; // PAL_INDEXED, PAL_BITFIELDS, PAL_RGB, PAL_BGR ULONG NumColors; PALETTEENTRY *IndexedColors; ULONG RedMask; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Oct 24 22:52:50 2010 @@ -949,7 +949,7 @@ pds->dsBmih.biHeight = pds->dsBm.bmHeight; pds->dsBmih.biPlanes = pds->dsBm.bmPlanes; pds->dsBmih.biBitCount = pds->dsBm.bmBitsPixel; - if(psurf->ppal->Mode & PAL_BITFIELDS) + if(psurf->ppal->flFlags & PAL_BITFIELDS) { pds->dsBmih.biCompression = BI_BITFIELDS; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Sun Oct 24 22:52:50 2010 @@ -166,7 +166,7 @@ /* Is this a valid palette for this depth? */ if ((BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) <= 8 - && ppal->Mode == PAL_INDEXED) || + && (ppal->flFlags & PAL_INDEXED)) || (BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) > 8)) { /* Get old palette, set new one */ 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] Sun Oct 24 22:52:50 2010 @@ -1690,7 +1690,7 @@ USHORT *lpIndex; HPALETTE hpal; - if (ppal->Mode != PAL_INDEXED) + if (!(ppal->flFlags & PAL_INDEXED)) { return NULL; } @@ -1764,17 +1764,33 @@ GreenMask = pdwColors[1]; BlueMask = pdwColors[2]; } - else if (bits == 15) - { - paletteType = PAL_RGB16_555; - } - else if (bits == 16) - { - paletteType = PAL_RGB16_565; - } else { - paletteType = PAL_BGR; + paletteType = PAL_BITFIELDS; + switch (bits) + { + case 15: + paletteType |= PAL_RGB16_555; + RedMask = 0x7C00; + GreenMask = 0x03E0; + BlueMask = 0x001F; + break; + + case 16: + paletteType |= PAL_RGB16_565; + RedMask = 0xF800; + GreenMask = 0x07E0; + BlueMask = 0x001F; + break; + + case 24: + case 32: + paletteType |= PAL_BGR; + RedMask = 0xFF0000; + GreenMask = 0x00FF00; + BlueMask = 0x0000FF; + break; + } } if (bmi->bmiHeader.biClrUsed == 0) Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Sun Oct 24 22:52:50 2010 @@ -256,9 +256,9 @@ palPtr = (PALOBJ*) palGDI; if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) - palGDI->Mode |= PAL_GAMMACORRECTION; + palGDI->flFlags |= PAL_GAMMACORRECTION; else - palGDI->Mode &= ~PAL_GAMMACORRECTION; + palGDI->flFlags &= ~PAL_GAMMACORRECTION; if (!(pGDev->flFlags & PDEV_DRIVER_PUNTED_CALL)) // No punting, we hook { 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] Sun Oct 24 22:52:50 2010 @@ -85,28 +85,28 @@ /* palette_size = visual->map_entries; */ - gpalRGB.Mode = PAL_RGB; + gpalRGB.flFlags = PAL_RGB; gpalRGB.RedMask = RGB(0xFF, 0x00, 0x00); gpalRGB.GreenMask = RGB(0x00, 0xFF, 0x00); gpalRGB.BlueMask = RGB(0x00, 0x00, 0xFF); gpalRGB.BaseObject.ulShareCount = 0; gpalRGB.BaseObject.BaseFlags = 0 ; - gpalBGR.Mode = PAL_BGR; + gpalBGR.flFlags = PAL_BGR; gpalBGR.RedMask = RGB(0x00, 0x00, 0xFF); gpalBGR.GreenMask = RGB(0x00, 0xFF, 0x00); gpalBGR.BlueMask = RGB(0xFF, 0x00, 0x00); gpalBGR.BaseObject.ulShareCount = 0; gpalBGR.BaseObject.BaseFlags = 0 ; - gpalRGB555.Mode = PAL_RGB16_555 | PAL_BITFIELDS; + gpalRGB555.flFlags = PAL_RGB16_555 | PAL_BITFIELDS; gpalRGB555.RedMask = 0x7C00; gpalRGB555.GreenMask = 0x3E0; gpalRGB555.BlueMask = 0x1F; gpalRGB555.BaseObject.ulShareCount = 0; gpalRGB555.BaseObject.BaseFlags = 0 ; - gpalRGB565.Mode = PAL_RGB16_565 | PAL_BITFIELDS; + gpalRGB565.flFlags = PAL_RGB16_565 | PAL_BITFIELDS; gpalRGB565.RedMask = 0xF800; gpalRGB565.GreenMask = 0x7E0; gpalRGB565.BlueMask = 0x1F; @@ -114,7 +114,7 @@ gpalRGB565.BaseObject.BaseFlags = 0 ; memset(&gpalMono, 0, sizeof(PALETTE)); - gpalMono.Mode = PAL_MONOCHROME; + gpalMono.flFlags = PAL_MONOCHROME; gpalMono.BaseObject.ulShareCount = 0; gpalMono.BaseObject.BaseFlags = 0 ; @@ -162,7 +162,7 @@ NewPalette = PalGDI->BaseObject.hHmgr; PalGDI->Self = NewPalette; - PalGDI->Mode = Mode; + PalGDI->flFlags = Mode; if (NULL != Colors) { @@ -178,20 +178,22 @@ RtlCopyMemory(PalGDI->IndexedColors, Colors, sizeof(PALETTEENTRY) * NumColors); } - if (PAL_INDEXED == Mode) + if (Mode & PAL_INDEXED) { PalGDI->NumColors = NumColors; } - else if (PAL_BITFIELDS == Mode) + else if (Mode & PAL_BITFIELDS) { PalGDI->RedMask = Red; PalGDI->GreenMask = Green; PalGDI->BlueMask = Blue; if (Red == 0x7c00 && Green == 0x3E0 && Blue == 0x1F) - PalGDI->Mode |= PAL_RGB16_555; + PalGDI->flFlags |= PAL_RGB16_555; else if (Red == 0xF800 && Green == 0x7E0 && Blue == 0x1F) - PalGDI->Mode |= PAL_RGB16_565; + PalGDI->flFlags |= PAL_RGB16_565; + else if (Red == 0xFF0000 && Green == 0xFF00 && Blue == 0xFF) + PalGDI->flFlags |= PAL_BGR; } PALETTE_UnlockPalette(PalGDI); @@ -217,7 +219,7 @@ NewPalette = PalGDI->BaseObject.hHmgr; PalGDI->Self = NewPalette; - PalGDI->Mode = PAL_INDEXED; + PalGDI->flFlags = PAL_INDEXED; PalGDI->IndexedColors = ExAllocatePoolWithTag(PagedPool, sizeof(PALETTEENTRY) * NumColors, @@ -321,7 +323,7 @@ NTAPI PALETTE_ulGetNearestIndex(PALETTE* ppal, ULONG ulColor) { - if (ppal->Mode & PAL_INDEXED) // use fl & PALINDEXED + if (ppal->flFlags & PAL_INDEXED) // use fl & PALINDEXED return PALETTE_ulGetNearestPaletteIndex(ppal, ulColor); else return PALETTE_ulGetNearestBitFieldsIndex(ppal, ulColor); @@ -333,19 +335,19 @@ { ASSERT(pulColors); - if (ppal->Mode & PAL_INDEXED || ppal->Mode & PAL_RGB) + if (ppal->flFlags & PAL_INDEXED || ppal->flFlags & PAL_RGB) { pulColors[0] = RGB(0xFF, 0x00, 0x00); pulColors[1] = RGB(0x00, 0xFF, 0x00); pulColors[2] = RGB(0x00, 0x00, 0xFF); } - else if (ppal->Mode & PAL_BGR) + else if (ppal->flFlags & PAL_BGR) { pulColors[0] = RGB(0x00, 0x00, 0xFF); pulColors[1] = RGB(0x00, 0xFF, 0x00); pulColors[2] = RGB(0xFF, 0x00, 0x00); } - else if (ppal->Mode & PAL_BITFIELDS) + else if (ppal->flFlags & PAL_BITFIELDS) { pulColors[0] = ppal->RedMask; pulColors[1] = ppal->GreenMask; @@ -433,7 +435,7 @@ /* NOTE: PaletteEntry ULONGs are in the same order as PALETTEENTRY. */ RtlCopyMemory(PaletteEntry, PalGDI->IndexedColors + Start, sizeof(ULONG) * Colors); - if (PalGDI->Mode & PAL_GAMMACORRECTION) + if (PalGDI->flFlags & PAL_GAMMACORRECTION) ColorCorrection(PalGDI, (PPALETTEENTRY)PaletteEntry, Colors); return Colors; @@ -664,17 +666,17 @@ return nearest; } - if (palGDI->Mode & PAL_INDEXED) + if (palGDI->flFlags & PAL_INDEXED) { ULONG index; index = PALETTE_ulGetNearestPaletteIndex(palGDI, Color); nearest = PALETTE_ulGetRGBColorFromIndex(palGDI, index); } - else if (palGDI->Mode & PAL_RGB || palGDI->Mode & PAL_BGR) + else if (palGDI->flFlags & PAL_RGB || palGDI->flFlags & PAL_BGR) { nearest = Color; } - else if (palGDI->Mode & PAL_BITFIELDS) + else if (palGDI->flFlags & PAL_BITFIELDS) { RBits = 8 - GetNumberOfBits(palGDI->RedMask); GBits = 8 - GetNumberOfBits(palGDI->GreenMask); @@ -702,7 +704,7 @@ if (ppal) { - if (ppal->Mode & PAL_INDEXED) + if (ppal->flFlags & PAL_INDEXED) { /* Return closest match for the given RGB color */ index = PALETTE_ulGetNearestPaletteIndex(ppal, crColor);

1 0

[khornicek] 49264: [WIN32K] Follow-up to r48681. Fixes text on disabled controls.
by khornicek＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: khornicek Date: Sun Oct 24 22:51:51 2010 New Revision: 49264 URL: http://svn.reactos.org/svn/reactos?rev=49264&view=rev Log: [WIN32K] Follow-up to r48681. Fixes text on disabled controls. Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Sun Oct 24 22:51:51 2010 @@ -150,9 +150,6 @@ 0xF0F0F00F /* 1110 */, 0xF0F0F0F0 /* 1111 */, }; - - /* Ignore alpha channel in Pattern */ - Pattern &= 0x00ffffff ; /* Optimized code for the various named rop codes. */ switch (Rop)

1 0

[spetreolle] 49263: [CMAKE] Use msvc friendly macro. Add network drivers to livecd.
by spetreolle＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: spetreolle Date: Sun Oct 24 21:19:00 2010 New Revision: 49263 URL: http://svn.reactos.org/svn/reactos?rev=49263&view=rev Log: [CMAKE] Use msvc friendly macro. Add network drivers to livecd. Modified: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt Modified: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/a… ============================================================================== --- branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:19:00 2010 @@ -19,7 +19,7 @@ add_library(afd SHARED ${CMAKE_CURRENT_BINARY_DIR}/afd_afd.h.gch ${SOURCE}) -set_target_properties(afd PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(afd kernelmodedriver) target_link_libraries(afd pseh @@ -28,4 +28,5 @@ add_pch(afd ${CMAKE_CURRENT_SOURCE_DIR}/include/afd.h ${SOURCE}) add_dependencies(afd psdk bugcodes buildno_header) + add_livecd_target(afd reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/d… ============================================================================== --- branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:19:00 2010 @@ -8,7 +8,7 @@ add_library(ne2000 SHARED ${SOURCE}) -set_target_properties(ne2000 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(ne2000 kernelmodedriver) target_link_libraries(ne2000 -lndis @@ -16,3 +16,5 @@ -lhal) add_dependencies(ne2000 psdk bugcodes buildno_header) + +add_livecd_target(ne2000 reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/d… ============================================================================== --- branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:19:00 2010 @@ -11,7 +11,7 @@ add_library(pcnet SHARED ${SOURCE}) -set_target_properties(pcnet PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(pcnet kernelmodedriver) target_link_libraries(pcnet -lndis @@ -19,3 +19,5 @@ -lhal) add_dependencies(pcnet psdk bugcodes buildno_header) + +add_livecd_target(pcnet reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… ============================================================================== --- branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:19:00 2010 @@ -25,7 +25,7 @@ add_library(tcpip SHARED ${CMAKE_CURRENT_BINARY_DIR}/tcpip_precomp.h.gch ${SOURCE}) -set_target_properties(tcpip PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(tcpip kernelmodedriver) target_link_libraries(tcpip ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def @@ -39,3 +39,5 @@ add_pch(tcpip ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) add_dependencies(tcpip tcpip_def psdk bugcodes buildno_header) + +add_livecd_target(tcpip reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… ============================================================================== --- branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:19:00 2010 @@ -19,7 +19,7 @@ add_library(tdi SHARED ${SOURCE}) -set_target_properties(tdi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(tdi kernelmodedriver) target_link_libraries(tdi ${CMAKE_CURRENT_BINARY_DIR}/tdi.def @@ -27,3 +27,5 @@ -lhal) add_dependencies(tdi tdi_def psdk bugcodes buildno_header) + +add_livecd_target(tdi reactos/system32/drivers)

1 0

[spetreolle] 49262: [CMAKE] Add network applications to build and livecd.
by spetreolle＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: spetreolle Date: Sun Oct 24 21:07:56 2010 New Revision: 49262 URL: http://svn.reactos.org/svn/reactos?rev=49262&view=rev Log: [CMAKE] Add network applications to build and livecd. Modified: branches/cmake-bringup/base/applications/network/CMakeLists.txt branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt branches/cmake-bringup/base/applications/network/net/CMakeLists.txt branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt branches/cmake-bringup/base/applications/network/route/CMakeLists.txt branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -1,14 +1,14 @@ add_subdirectory(arp) -#add_subdirectory(dwnl) +add_subdirectory(dwnl) add_subdirectory(finger) -#add_subdirectory(ftp) +add_subdirectory(ftp) add_subdirectory(ipconfig) add_subdirectory(net) add_subdirectory(netstat) add_subdirectory(nslookup) add_subdirectory(ping) -#add_subdirectory(route) +add_subdirectory(route) add_subdirectory(telnet) add_subdirectory(tracert) -#add_subdirectory(whois) +add_subdirectory(whois) Modified: branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -4,3 +4,5 @@ set_module_type(arp win32cui) add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) + +add_livecd_target(arp reactos/system32) Modified: branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -8,3 +8,5 @@ target_link_libraries(dwnl uuid) add_importlibs(dwnl urlmon wininet msvcrt kernel32) + +add_livecd_target(dwnl reactos/system32) Modified: branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -10,3 +10,5 @@ set_module_type(finger win32cui) add_importlibs(finger ws2_32 msvcrt kernel32) + +add_livecd_target(finger reactos/system32) Modified: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -11,3 +11,5 @@ set_module_type(ftp win32cui) add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32) + +add_livecd_target(ftp reactos/system32) Modified: branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -4,3 +4,5 @@ set_module_type(ipconfig win32cui) add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32) + +add_livecd_target(ipconfig reactos/system32) Modified: branches/cmake-bringup/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/net/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -13,3 +13,5 @@ set_module_type(net win32cui) add_importlibs(net ws2_32 msvcrt kernel32) + +add_livecd_target(net reactos/system32) Modified: branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -4,3 +4,5 @@ set_module_type(netstat win32cui) add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) + +add_livecd_target(netstat reactos/system32) Modified: branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -7,3 +7,5 @@ set_module_type(nslookup win32cui) add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) + +add_livecd_target(nslookup reactos/system32) Modified: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -5,3 +5,5 @@ set_module_type(ping win32cui) add_importlibs(ping ws2_32 msvcrt kernel32) + +add_livecd_target(ping reactos/system32) Modified: branches/cmake-bringup/base/applications/network/route/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -5,3 +5,5 @@ set_module_type(route win32cui) add_importlibs(route ws2_32 iphlpapi msvcrt kernel32) + +add_livecd_target(route reactos/system32) Modified: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -27,3 +27,5 @@ set_module_type(telnet win32cui) add_importlibs(telnet ws2_32 user32 kernel32 msvcrt) + +add_livecd_target(telnet reactos/system32) Modified: branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -5,3 +5,5 @@ set_module_type(tracert win32cui) add_importlibs(tracert ws2_32 msvcrt kernel32) + +add_livecd_target(tracert reactos/system32) Modified: branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] Sun Oct 24 21:07:56 2010 @@ -4,3 +4,5 @@ set_module_type(whois win32cui) add_importlibs(whois ws2_32 msvcrt kernel32) + +add_livecd_target(whois reactos/system32)

1 0

[fireball] 49261: [N[NTOS/MM] - Initialize Found to FALSE in NtQueryVirtualMemory. I wonder how GCC missed uninitialized var usage? - Implement case when NtQueryVirtualMemory is called with non-exi...
by fireball＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: fireball Date: Sun Oct 24 20:02:04 2010 New Revision: 49261 URL: http://svn.reactos.org/svn/reactos?rev=49261&view=rev Log: [N[NTOS/MM] - Initialize Found to FALSE in NtQueryVirtualMemory. I wonder how GCC missed uninitialized var usage? - Implement case when NtQueryVirtualMemory is called with non-existing virtual address. See issue #3755 for more details. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Oct 24 20:02:04 2010 @@ -2306,7 +2306,7 @@ NTSTATUS Status; PMMVAD Vad = NULL; PVOID Address, NextAddress; - BOOLEAN Found; + BOOLEAN Found = FALSE; ULONG NewProtect, NewState, BaseVpn; MEMORY_BASIC_INFORMATION MemoryInfo; KAPC_STATE ApcState; @@ -2390,11 +2390,44 @@ /* Was a VAD found? */ if (!Found) { - /* We don't handle this yet */ - UNIMPLEMENTED; - while (TRUE); - } - + Address = PAGE_ALIGN(BaseAddress); + + /* Calculate region size */ + if (Vad) + { + /* We don't handle this yet */ + UNIMPLEMENTED; + while (TRUE); + } + else + { + /* Maximum possible region size with that base address */ + MemoryInfo.RegionSize = (PCHAR)MM_HIGHEST_VAD_ADDRESS + 1 - (PCHAR)Address; + } + + /* Check if we were attached */ + if (ProcessHandle != NtCurrentProcess()) + { + /* Detach and derefernece the process */ + KeUnstackDetachProcess(&ApcState); + ObDereferenceObject(TargetProcess); + } + + /* Build the rest of the initial information block */ + MemoryInfo.BaseAddress = Address; + MemoryInfo.AllocationBase = NULL; + MemoryInfo.AllocationProtect = 0; + MemoryInfo.State = MEM_FREE; + MemoryInfo.Protect = PAGE_NOACCESS; + MemoryInfo.Type = 0; + + /* Return the data (FIXME: Use SEH) */ + *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; + if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); + + return STATUS_SUCCESS; + } + /* This must be a VM VAD */ ASSERT(Vad->u.VadFlags.PrivateMemory);

1 0

[spetreolle] 49260: [CMAKE] Fix winspool loading.
by spetreolle＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: spetreolle Date: Sun Oct 24 15:03:07 2010 New Revision: 49260 URL: http://svn.reactos.org/svn/reactos?rev=49260&view=rev Log: [CMAKE] Fix winspool loading. Added: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def (with props) branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Sun Oct 24 15:03:07 2010 @@ -3,21 +3,19 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(winspool ${CMAKE_CURRENT_SOURCE_DIR}/winspool.spec ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) - add_library(winspool SHARED info.c stubs.c + winspool_winspool.stubs.c winspool.rc) set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll) target_link_libraries(winspool - ${CMAKE_CURRENT_BINARY_DIR}/winspool.def + ${CMAKE_CURRENT_SOURCE_DIR}/winspool_winspool.auto.def wine) add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) add_dependencies(winspool winspool_def) -#add_livecd_target(winspool reactos/system32 winspool.drv) add_livecd_target(winspool reactos/system32) Added: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def (added) +++ branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def [iso-8859-1] Sun Oct 24 15:03:07 2010 @@ -1,0 +1,197 @@ +; File generated automatically from dll\win32\winspool\winspool.spec; do not edit! + +LIBRARY winspool.drv + +EXPORTS + EnumPrinterPropertySheets=__wine_stub_winspool_drv_100 @100 NONAME + ClusterSplOpen=__wine_stub_winspool_drv_101 @101 NONAME + ClusterSplClose=__wine_stub_winspool_drv_102 @102 NONAME + ClusterSplIsAlive=__wine_stub_winspool_drv_103 @103 NONAME + PerfClose=__wine_stub_winspool_drv_104 @104 + PerfCollect=__wine_stub_winspool_drv_105 @105 + PerfOpen=__wine_stub_winspool_drv_106 @106 + GetDefaultPrinterA@8 @201 + SetDefaultPrinterA@4 @202 + GetDefaultPrinterW@8 @203 + SetDefaultPrinterW@4 @204 + SplReadPrinter=__wine_stub_winspool_drv_205 @205 NONAME + AddPerMachineConnectionA=__wine_stub_winspool_drv_206 @206 NONAME + AddPerMachineConnectionW=__wine_stub_winspool_drv_207 @207 NONAME + DeletePerMachineConnectionA=__wine_stub_winspool_drv_208 @208 NONAME + DeletePerMachineConnectionW=__wine_stub_winspool_drv_209 @209 NONAME + EnumPerMachineConnectionsA=__wine_stub_winspool_drv_210 @210 NONAME + EnumPerMachineConnectionsW=__wine_stub_winspool_drv_211 @211 NONAME + LoadPrinterDriver=__wine_stub_winspool_drv_212 @212 NONAME + RefCntLoadDriver=__wine_stub_winspool_drv_213 @213 NONAME + RefCntUnloadDriver=__wine_stub_winspool_drv_214 @214 NONAME + ForceUnloadDriver=__wine_stub_winspool_drv_215 @215 NONAME + PublishPrinterA=__wine_stub_winspool_drv_216 @216 NONAME + PublishPrinterW=__wine_stub_winspool_drv_217 @217 NONAME + CallCommonPropertySheetUI=__wine_stub_winspool_drv_218 @218 NONAME + PrintUIQueueCreate=__wine_stub_winspool_drv_219 @219 NONAME + PrintUIPrinterPropPages=__wine_stub_winspool_drv_220 @220 NONAME + PrintUIDocumentDefaults=__wine_stub_winspool_drv_221 @221 NONAME + SendRecvBidiData=__wine_stub_winspool_drv_222 @222 NONAME + RouterFreeBidiResponseContainer=__wine_stub_winspool_drv_223 @223 NONAME + ExternalConnectToLd64In32Server=__wine_stub_winspool_drv_224 @224 NONAME + PrintUIWebPnpEntry=__wine_stub_winspool_drv_226 @226 NONAME + PrintUIWebPnpPostEntry=__wine_stub_winspool_drv_227 @227 NONAME + PrintUICreateInstance=__wine_stub_winspool_drv_228 @228 NONAME + PrintUIDocumentPropertiesWrap=__wine_stub_winspool_drv_229 @229 NONAME + PrintUIPrinterSetup=__wine_stub_winspool_drv_230 @230 NONAME + PrintUIServerPropPages=__wine_stub_winspool_drv_231 @231 NONAME + AddDriverCatalog=__wine_stub_winspool_drv_232 @232 NONAME + ADVANCEDSETUPDIALOG=__wine_stub_winspool_drv_107 @107 + AbortPrinter@4 @108 + AddFormA@12 @109 + AddFormW@12 @110 + AddJobA@20 @111 + AddJobW@20 @112 + AddMonitorA@12 @113 + AddMonitorW@12 @114 + AddPortA@12 @115 + AddPortExA@16 @116 + AddPortExW@16 @117 + AddPortW@12 @118 + AddPrinterA@12 @119 + AddPrinterConnectionA@4 @120 + AddPrinterConnectionW@4 @121 + AddPrinterDriverA@12 @122 + AddPrinterDriverExA@16 @123 + AddPrinterDriverExW@16 @124 + AddPrinterDriverW@12 @125 + AddPrinterW@12 @126 + AddPrintProcessorA@16 @127 + AddPrintProcessorW@16 @128 + AddPrintProvidorA@12 @129 + AddPrintProvidorW@12 @130 + AdvancedDocumentPropertiesA@20 @131 + AdvancedDocumentPropertiesW@20 @132 + AdvancedSetupDialog=__wine_stub_winspool_drv_133 @133 + ClosePrinter@4 @134 + CloseSpoolFileHandle=__wine_stub_winspool_drv_135 @135 + ConfigurePortA@12 @136 + ConfigurePortW@12 @137 + ConnectToPrinterDlg@8 @138 + ConvertAnsiDevModeToUnicodeDevMode=__wine_stub_winspool_drv_139 @139 + ConvertUnicodeDevModeToAnsiDevMode=__wine_stub_winspool_drv_140 @140 + CommitSpoolData=__wine_stub_winspool_drv_141 @141 + CreatePrinterIC=__wine_stub_winspool_drv_142 @142 + DEVICECAPABILITIES=__wine_stub_winspool_drv_143 @143 + DEVICEMODE=__wine_stub_winspool_drv_144 @144 + DeleteFormA@8 @145 + DeleteFormW@8 @146 + DeleteMonitorA@12 @147 + DeleteMonitorW@12 @148 + DeletePortA@12 @149 + DeletePortW@12 @150 + DeletePrinter@4 @151 + DeletePrinterConnectionA@4 @152 + DeletePrinterConnectionW@4 @153 + DeletePrinterDataExA@12 @154 + DeletePrinterDataExW@12 @155 + DeletePrinterDataA@8 @156 + DeletePrinterDataW@8 @157 + DeletePrinterDriverA@12 @158 + DeletePrinterDriverExA@20 @159 + DeletePrinterDriverExW@20 @160 + DeletePrinterDriverW@12 @161 + DeletePrinterIC=__wine_stub_winspool_drv_162 @162 + DevQueryPrint=__wine_stub_winspool_drv_163 @163 + DeletePrintProcessorA@12 @164 + DeletePrintProcessorW@12 @165 + DeletePrintProvidorA@12 @166 + DeletePrintProvidorW@12 @167 + DeviceCapabilitiesA@20 @168 + DeviceCapabilitiesW@20 @169 + DeviceMode=__wine_stub_winspool_drv_170 @170 + DocumentEvent=__wine_stub_winspool_drv_171 @171 + DllMain@12 @172 + DocumentPropertiesA@24 @173 + DocumentPropertiesW@24 @174 + EXTDEVICEMODE=__wine_stub_winspool_drv_175 @175 + EndDocPrinter@4 @176 + EndPagePrinter@4 @177 + EnumFormsA@24 @178 + EnumFormsW@24 @179 + EnumJobsA@32 @180 + EnumJobsW@32 @181 + EnumMonitorsA@24 @182 + EnumMonitorsW@24 @183 + EnumPortsA@24 @184 + EnumPortsW@24 @185 + EnumPrinterDataA@36 @186 + EnumPrinterDataExA@24 @187 + EnumPrinterDataExW@24 @188 + EnumPrinterDataW@36 @189 + EnumPrinterDriversA@28 @190 + EnumPrinterDriversW@28 @191 + EnumPrintersA@28 @192 + EnumPrintersW@28 @193 + EnumPrinterKeyA@20 @194 + EnumPrinterKeyW@20 @195 + ExtDeviceMode@32 @196 + EnumPrintProcessorDatatypesA@28 @197 + EnumPrintProcessorDatatypesW@28 @198 + EnumPrintProcessorsA@28 @199 + EnumPrintProcessorsW@28 @200 + FindClosePrinterChangeNotification@4 @225 + FindFirstPrinterChangeNotification@16 @233 + FindNextPrinterChangeNotification@16 @234 + FreePrinterNotifyInfo@4 @235 + GetFormA@24 @236 + GetFormW@24 @237 + GetJobA@24 @238 + GetJobW@24 @239 + GetPrinterA@20 @240 + GetPrinterDataA@24 @241 + GetPrinterDataExA@28 @242 + GetPrinterDataExW@28 @243 + GetPrinterDataW@24 @244 + GetPrinterDriverA@24 @245 + GetPrinterDriverDirectoryA@24 @246 + GetPrinterDriverDirectoryW@24 @247 + GetPrinterDriverW@24 @248 + GetPrinterW@20 @249 + GetPrintProcessorDirectoryA@24 @250 + GetPrintProcessorDirectoryW@24 @251 + GetSpoolFileHandle=__wine_stub_winspool_drv_252 @252 + IsValidDevmodeA=__wine_stub_winspool_drv_253 @253 + IsValidDevmodeW=__wine_stub_winspool_drv_254 @254 + OpenPrinterA@12 @255 + OpenPrinterW@12 @256 + PlayGdiScriptOnPrinterIC=__wine_stub_winspool_drv_257 @257 + PrinterMessageBoxA@24 @258 + PrinterMessageBoxW@24 @259 + PrinterProperties@8 @260 + QueryColorProfile=__wine_stub_winspool_drv_261 @261 + QuerySpoolMode=__wine_stub_winspool_drv_262 @262 + QueryRemoteFonts=__wine_stub_winspool_drv_263 @263 + ReadPrinter@16 @264 + ResetPrinterA@8 @265 + ResetPrinterW@8 @266 + ScheduleJob@8 @267 + SeekPrinter=__wine_stub_winspool_drv_268 @268 + SetAllocFailCount=__wine_stub_winspool_drv_269 @269 + SetFormA@16 @270 + SetFormW@16 @271 + SetJobA@20 @272 + SetJobW@20 @273 + SetPrinterA@16 @274 + SetPrinterDataA@20 @275 + SetPrinterDataExA@24 @276 + SetPrinterDataExW@24 @277 + SetPrinterDataW@20 @278 + SetPrinterW@16 @279 + SplDriverUnloadComplete=__wine_stub_winspool_drv_280 @280 + SpoolerDevQueryPrintW=__wine_stub_winspool_drv_281 @281 + SpoolerInit@0 @282 + SpoolerPrinterEvent=__wine_stub_winspool_drv_283 @283 + StartDocDlgA=__wine_stub_winspool_drv_284 @284 + StartDocDlgW=__wine_stub_winspool_drv_285 @285 + StartDocPrinterA@12 @286 + StartDocPrinterW@12 @287 + StartPagePrinter@4 @288 + WaitForPrinterChange@8 @289 + WritePrinter@16 @290 + XcvDataW@32 @291 Propchange: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c (added) +++ branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c [iso-8859-1] Sun Oct 24 15:03:07 2010 @@ -1,0 +1,82 @@ +/* File generated automatically from dll\win32\winspool\winspool.spec; do not edit! */ +/* This file can be copied, modified and distributed without restriction. */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/config.h" +#include "wine/exception.h" + +void __wine_spec_unimplemented_stub( const char *module, const char *function ) +{ + ULONG_PTR args[2]; + + args[0] = (ULONG_PTR)module; + args[1] = (ULONG_PTR)function; + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); +} + +static const char __wine_spec_file_name[] = "winspool.drv"; + +void __wine_stub_winspool_drv_100(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPrinterPropertySheets"); } +void __wine_stub_winspool_drv_101(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplOpen"); } +void __wine_stub_winspool_drv_102(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplClose"); } +void __wine_stub_winspool_drv_103(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplIsAlive"); } +void __wine_stub_winspool_drv_104(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfClose"); } +void __wine_stub_winspool_drv_105(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfCollect"); } +void __wine_stub_winspool_drv_106(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfOpen"); } +void __wine_stub_winspool_drv_205(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SplReadPrinter"); } +void __wine_stub_winspool_drv_206(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddPerMachineConnectionA"); } +void __wine_stub_winspool_drv_207(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddPerMachineConnectionW"); } +void __wine_stub_winspool_drv_208(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePerMachineConnectionA"); } +void __wine_stub_winspool_drv_209(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePerMachineConnectionW"); } +void __wine_stub_winspool_drv_210(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPerMachineConnectionsA"); } +void __wine_stub_winspool_drv_211(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPerMachineConnectionsW"); } +void __wine_stub_winspool_drv_212(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "LoadPrinterDriver"); } +void __wine_stub_winspool_drv_213(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RefCntLoadDriver"); } +void __wine_stub_winspool_drv_214(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RefCntUnloadDriver"); } +void __wine_stub_winspool_drv_215(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ForceUnloadDriver"); } +void __wine_stub_winspool_drv_216(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PublishPrinterA"); } +void __wine_stub_winspool_drv_217(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PublishPrinterW"); } +void __wine_stub_winspool_drv_218(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CallCommonPropertySheetUI"); } +void __wine_stub_winspool_drv_219(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIQueueCreate"); } +void __wine_stub_winspool_drv_220(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIPrinterPropPages"); } +void __wine_stub_winspool_drv_221(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIDocumentDefaults"); } +void __wine_stub_winspool_drv_222(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SendRecvBidiData"); } +void __wine_stub_winspool_drv_223(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RouterFreeBidiResponseContainer"); } +void __wine_stub_winspool_drv_224(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ExternalConnectToLd64In32Server"); } +void __wine_stub_winspool_drv_226(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIWebPnpEntry"); } +void __wine_stub_winspool_drv_227(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIWebPnpPostEntry"); } +void __wine_stub_winspool_drv_228(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUICreateInstance"); } +void __wine_stub_winspool_drv_229(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIDocumentPropertiesWrap"); } +void __wine_stub_winspool_drv_230(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIPrinterSetup"); } +void __wine_stub_winspool_drv_231(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIServerPropPages"); } +void __wine_stub_winspool_drv_232(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddDriverCatalog"); } +void __wine_stub_winspool_drv_107(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ADVANCEDSETUPDIALOG"); } +void __wine_stub_winspool_drv_133(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AdvancedSetupDialog"); } +void __wine_stub_winspool_drv_135(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CloseSpoolFileHandle"); } +void __wine_stub_winspool_drv_139(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConvertAnsiDevModeToUnicodeDevMode"); } +void __wine_stub_winspool_drv_140(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConvertUnicodeDevModeToAnsiDevMode"); } +void __wine_stub_winspool_drv_141(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CommitSpoolData"); } +void __wine_stub_winspool_drv_142(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CreatePrinterIC"); } +void __wine_stub_winspool_drv_143(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DEVICECAPABILITIES"); } +void __wine_stub_winspool_drv_144(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DEVICEMODE"); } +void __wine_stub_winspool_drv_162(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePrinterIC"); } +void __wine_stub_winspool_drv_163(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DevQueryPrint"); } +void __wine_stub_winspool_drv_170(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeviceMode"); } +void __wine_stub_winspool_drv_171(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DocumentEvent"); } +void __wine_stub_winspool_drv_175(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EXTDEVICEMODE"); } +void __wine_stub_winspool_drv_252(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetSpoolFileHandle"); } +void __wine_stub_winspool_drv_253(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsValidDevmodeA"); } +void __wine_stub_winspool_drv_254(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsValidDevmodeW"); } +void __wine_stub_winspool_drv_257(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PlayGdiScriptOnPrinterIC"); } +void __wine_stub_winspool_drv_261(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryColorProfile"); } +void __wine_stub_winspool_drv_262(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QuerySpoolMode"); } +void __wine_stub_winspool_drv_263(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryRemoteFonts"); } +void __wine_stub_winspool_drv_268(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SeekPrinter"); } +void __wine_stub_winspool_drv_269(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetAllocFailCount"); } +void __wine_stub_winspool_drv_280(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SplDriverUnloadComplete"); } +void __wine_stub_winspool_drv_281(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SpoolerDevQueryPrintW"); } +void __wine_stub_winspool_drv_283(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SpoolerPrinterEvent"); } +void __wine_stub_winspool_drv_284(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "StartDocDlgA"); } +void __wine_stub_winspool_drv_285(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "StartDocDlgW"); } Propchange: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

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