#include <intrin.h>
-#define NDEBUG
-#include <debug.h>
+DBG_DEFAULT_CHANNEL(UserDisplay);
BOOL InitSysParams();
HKEY hkey;
DEVMODEW dmDefault;
- DPRINT1("InitDisplayDriver(%S, %S);\n",
+ ERR("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: %ls\n", pwszRegKey);
+ ERR("Failed to open registry key: %ls\n", pwszRegKey);
return NULL;
}
&cbSize);
if (!NT_SUCCESS(Status))
{
- DPRINT1("Didn't find 'InstalledDisplayDrivers', status = 0x%lx\n", Status);
+ ERR("Didn't find 'InstalledDisplayDrivers', status = 0x%lx\n", Status);
ZwClose(hkey);
return NULL;
}
ULONG cbValue;
HKEY hkey;
- DPRINT("----------------------------- InitVideo() -------------------------------\n");
+ TRACE("----------------------------- InitVideo() -------------------------------\n");
/* Open the key for the boot command line */
Status = RegOpenKey(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control", &hkey);
/* Check if VGA mode is requested. */
if (wcsstr(awcBuffer, L"/BASEVIDEO") != 0)
{
- DPRINT1("VGA mode requested.\n");
+ ERR("VGA mode requested.\n");
gbBaseVideo = TRUE;
}
}
Status = RegOpenKey(KEY_VIDEO, &hkey);
if (!NT_SUCCESS(Status))
{
- DPRINT1("Could not open device registry key!\n");
+ ERR("Could not open device registry key!\n");
return Status;
}
if (NT_SUCCESS(Status))
{
iVGACompatible = _wtoi(&awcDeviceName[13]);
- DPRINT1("VGA adapter = %ld\n", iVGACompatible);
+ ERR("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");
+ ERR("Could not read MaxObjectNumber, defaulting to 0.\n");
}
- DPRINT("Found %ld devices\n", ulMaxObjectNumber);
+ TRACE("Found %ld devices\n", ulMaxObjectNumber);
/* Loop through all adapters */
for (iDevNum = 0; iDevNum <= ulMaxObjectNumber; iDevNum++)
Status = RegQueryValue(hkey, awcDeviceName, REG_SZ, awcBuffer, &cbValue);
if (!NT_SUCCESS(Status))
{
- DPRINT1("failed to query the registry path:0x%lx\n", Status);
+ ERR("failed to query the registry path:0x%lx\n", Status);
continue;
}
{
/* Set the VGA device as primary */
gpVgaGraphicsDevice = pGraphicsDevice;
- DPRINT1("gpVgaGraphicsDevice = %p\n", gpVgaGraphicsDevice);
+ ERR("gpVgaGraphicsDevice = %p\n", gpVgaGraphicsDevice);
}
/* Set the first one as primary device */
/* Check if we had any success */
if (!gpPrimaryGraphicsDevice)
{
- DPRINT1("No usable display driver was found.\n");
+ ERR("No usable display driver was found.\n");
return STATUS_UNSUCCESSFUL;
}
}
else
{
- DPRINT1("Could not find VGA compatible driver. Trying normal.\n");
+ ERR("Could not find VGA compatible driver. Trying normal.\n");
}
}
if (!pGraphicsDevice)
{
/* No device found */
- DPRINT1("No GRAPHICS_DEVICE found\n");
+ ERR("No GRAPHICS_DEVICE found\n");
return STATUS_UNSUCCESSFUL;
}
if (!NT_SUCCESS(Status))
{
/* No device found */
- DPRINT1("Could not open reg key\n");
+ ERR("Could not open reg key\n");
return STATUS_UNSUCCESSFUL;
}
DISPLAY_DEVICEW dispdev;
NTSTATUS Status;
- DPRINT("Enter NtUserEnumDisplayDevices(%wZ, %ld)\n",
+ TRACE("Enter NtUserEnumDisplayDevices(%wZ, %ld)\n",
pustrDevice, iDevNum);
// FIXME: HACK, desk.cpl passes broken crap
_SEH2_END
}
- DPRINT1("Leave NtUserEnumDisplayDevices, Status = 0x%lx\n", Status);
+ ERR("Leave NtUserEnumDisplayDevices, Status = 0x%lx\n", Status);
/* Return the result */
// return Status;
return NT_SUCCESS(Status); // FIXME
if (!ppdev)
{
/* No device found */
- DPRINT1("No PDEV found!\n");
+ ERR("No PDEV found!\n");
return STATUS_UNSUCCESSFUL;
}
PDEVMODEENTRY pdmentry;
ULONG i, iFoundMode;
- DPRINT("Enter UserEnumDisplaySettings('%ls', %ld)\n",
+ TRACE("Enter UserEnumDisplaySettings('%ls', %ld)\n",
pustrDevice ? pustrDevice->Buffer : NULL, iModeNum);
/* Ask gdi for the GRAPHICS_DEVICE */
if (!pGraphicsDevice)
{
/* No device found */
- DPRINT1("No device found!\n");
+ ERR("No device found!\n");
return STATUS_UNSUCCESSFUL;
}
ULONG cbSize, cbExtra;
DEVMODEW dmReg, *pdm;
- DPRINT("Enter NtUserEnumDisplaySettings(%ls, %ld)\n",
+ TRACE("Enter NtUserEnumDisplaySettings(%ls, %ld)\n",
pustrDevice ? pustrDevice->Buffer : 0, iModeNum);
if (pustrDevice)
Status = UserEnumRegistryDisplaySettings(pustrDevice, &dm);
if (!NT_SUCCESS(Status))
{
- DPRINT1("Could not load registry settings\n");
+ ERR("Could not load registry settings\n");
return DISP_CHANGE_BADPARAM;
}
}
/* Check params */
if ((dm.dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT))
{
- DPRINT1("devmode doesn't specify the resolution.\n");
+ ERR("devmode doesn't specify the resolution.\n");
return DISP_CHANGE_BADMODE;
}
ppdev = EngpGetPDEV(pustrDevice);
if (!ppdev)
{
- DPRINT1("failed to get PDEV\n");
+ ERR("failed to get PDEV\n");
return DISP_CHANGE_BADPARAM;
}
pdm = PDEVOBJ_pdmMatchDevMode(ppdev, &dm);
if (!pdm)
{
- DPRINT1("Could not find a matching DEVMODE\n");
+ ERR("Could not find a matching DEVMODE\n");
lResult = DISP_CHANGE_BADMODE;
goto leave;
}
}
else
{
- DPRINT1("Could not open registry key\n");
+ ERR("Could not open registry key\n");
lResult = DISP_CHANGE_NOTUPDATED;
}
}
/* Check if DEVMODE matches the current mode */
if (pdm == ppdev->pdmwDev && !(flags & CDS_RESET))
{
- DPRINT1("DEVMODE matches, nothing to do\n");
+ ERR("DEVMODE matches, nothing to do\n");
goto leave;
}
/* Check for failure */
if (!ulResult)
{
- DPRINT1("failed to set mode\n");
+ ERR("failed to set mode\n");
lResult = (lResult == DISP_CHANGE_NOTUPDATED) ?
DISP_CHANGE_FAILED : DISP_CHANGE_RESTART;
if (dmLocal.dmDriverExtra > 0)
{
/* FIXME: TODO */
- DPRINT1("lpDevMode->dmDriverExtra is IGNORED!\n");
+ ERR("lpDevMode->dmDriverExtra is IGNORED!\n");
dmLocal.dmDriverExtra = 0;
}