Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 26884: Wrote one new header this morning compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 13:32:37 2007 New Revision: 26884 URL: http://svn.reactos.org/svn/reactos?rev=26884&view=rev Log: Wrote one new header this morning compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/dsetup.h (with props) Added: trunk/reactos/include/dxsdk/dsetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dsetup.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dsetup.h (added) +++ trunk/reactos/include/dxsdk/dsetup.h Fri May 25 13:32:37 2007 @@ -1,0 +1,190 @@ +#ifndef __DSETUP_H__ +#define __DSETUP_H__ + +#include <windows.h> + +#ifdef _WIN32 +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +enum _DSETUP_CB_PROGRESS_PHASE +{ + DSETUP_INITIALIZING, + DSETUP_EXTRACTING, + DSETUP_COPYING, + DSETUP_FINALIZING +}; + +typedef struct _DSETUP_CB_PROGRESS +{ + DWORD dwPhase; + DWORD dwInPhaseMaximum; + DWORD dwInPhaseProgress; + DWORD dwOverallMaximum; + DWORD dwOverallProgress; +} DSETUP_CB_PROGRESS; + +#ifdef _WIN32 + +INT WINAPI DirectXUnRegisterApplication( HWND hWnd, LPGUID lpGUID); + +#ifndef ANSI_ONLY + typedef struct _DIRECTXREGISTERAPPW + { + DWORD dwSize; + DWORD dwFlags; + LPWSTR lpszApplicationName; + LPGUID lpGUID; + LPWSTR lpszFilename; + LPWSTR lpszCommandLine; + LPWSTR lpszPath; + LPWSTR lpszCurrentDirectory; + } DIRECTXREGISTERAPPW, *PDIRECTXREGISTERAPPW, *LPDIRECTXREGISTERAPPW; + + typedef struct _DIRECTXREGISTERAPP2W + { + DWORD dwSize; + DWORD dwFlags; + LPWSTR lpszApplicationName; + LPGUID lpGUID; + LPWSTR lpszFilename; + LPWSTR lpszCommandLine; + LPWSTR lpszPath; + LPWSTR lpszCurrentDirectory; + LPWSTR lpszLauncherName; + } DIRECTXREGISTERAPP2W, *PDIRECTXREGISTERAPP2W, *LPDIRECTXREGISTERAPP2W; + + INT WINAPI DirectXSetupW( HWND hWnd, LPWSTR lpszRootPath, DWORD dwFlags); + INT WINAPI DirectXRegisterApplicationW( HWND hWnd, LPVOID lpDXRegApp); + UINT WINAPI DirectXSetupGetEULAW( LPWSTR lpszEULA, UINT cchEULA, WORD LangID); +#endif + +#ifndef UNICODE_ONLY + typedef struct _DIRECTXREGISTERAPPA + { + DWORD dwSize; + DWORD dwFlags; + LPSTR lpszApplicationName; + LPGUID lpGUID; + LPSTR lpszFilename; + LPSTR lpszCommandLine; + LPSTR lpszPath; + LPSTR lpszCurrentDirectory; + } DIRECTXREGISTERAPPA, *PDIRECTXREGISTERAPPA, *LPDIRECTXREGISTERAPPA; + + typedef struct _DIRECTXREGISTERAPP2A + { + DWORD dwSize; + DWORD dwFlags; + LPSTR lpszApplicationName; + LPGUID lpGUID; + LPSTR lpszFilename; + LPSTR lpszCommandLine; + LPSTR lpszPath; + LPSTR lpszCurrentDirectory; + LPSTR lpszLauncherName; + } DIRECTXREGISTERAPP2A, *PDIRECTXREGISTERAPP2A, *LPDIRECTXREGISTERAPP2A; + + INT WINAPI DirectXSetupA( HWND hWnd, LPSTR lpszRootPath, DWORD dwFlags); + INT WINAPI DirectXRegisterApplicationA( HWND hWnd, LPVOID lpDXRegApp); + UINT WINAPI DirectXSetupGetEULAA( LPSTR lpszEULA, UINT cchEULA, WORD LangID); +#endif + +#ifdef UNICODE + typedef DIRECTXREGISTERAPPW DIRECTXREGISTERAPP; + typedef PDIRECTXREGISTERAPPW PDIRECTXREGISTERAPP; + typedef LPDIRECTXREGISTERAPPW LPDIRECTXREGISTERAPP; + typedef DIRECTXREGISTERAPP2W DIRECTXREGISTERAPP2; + typedef PDIRECTXREGISTERAPP2W PDIRECTXREGISTERAPP2; + typedef LPDIRECTXREGISTERAPP2W LPDIRECTXREGISTERAPP2; + + typedef INT (WINAPI * LPDIRECTXSETUP)(HWND, LPWSTR, DWORD); + typedef INT (WINAPI * LPDIRECTXREGISTERAPPLICATION)(HWND, LPVOID); + typedef UINT (WINAPI * LPDIRECTXSETUPGETEULA)(LPWSTR, UINT, WORD); + + #define DirectXSetup DirectXSetupW + #define DirectXRegisterApplication DirectXRegisterApplicationW + #define DirectXSetupGetEULA DirectXSetupGetEULAW + + + +#else + typedef DIRECTXREGISTERAPPA DIRECTXREGISTERAPP; + typedef PDIRECTXREGISTERAPPA PDIRECTXREGISTERAPP; + typedef LPDIRECTXREGISTERAPPA LPDIRECTXREGISTERAPP; + typedef DIRECTXREGISTERAPP2A DIRECTXREGISTERAPP2; + typedef PDIRECTXREGISTERAPP2A PDIRECTXREGISTERAPP2; + typedef LPDIRECTXREGISTERAPP2A LPDIRECTXREGISTERAPP2; + + typedef INT (WINAPI * LPDIRECTXSETUP)(HWND, LPSTR, DWORD); + typedef INT (WINAPI * LPDIRECTXREGISTERAPPLICATION)(HWND, LPVOID); + typedef UINT (WINAPI * LPDIRECTXSETUPGETEULA)(LPSTR, UINT, WORD); + + #define DirectXSetup DirectXSetupA + #define DirectXRegisterApplication DirectXRegisterApplicationA + #define DirectXSetupGetEULA DirectXSetupGetEULAA + +#endif + + typedef DWORD (*DSETUP_CALLBACK)( DWORD Reason, DWORD MsgType, LPSTR szMessage, + LPSTR szName, void *pInfo); + + INT WINAPI DirectXSetupSetCallback(DSETUP_CALLBACK Callback); + INT WINAPI DirectXSetupGetVersion(DWORD *lpdwVersion, DWORD *lpdwMinorVersion); + INT WINAPI DirectXSetupShowEULA(HWND hWndParent); + +#endif + +#define FOURCC_VERS mmioFOURCC('v','e','r','s') +#define DSETUPERR_SUCCESS_RESTART 1 +#define DSETUPERR_SUCCESS 0 +#define DSETUPERR_BADWINDOWSVERSION -1 +#define DSETUPERR_SOURCEFILENOTFOUND -2 +#define DSETUPERR_NOCOPY -5 +#define DSETUPERR_OUTOFDISKSPACE -6 +#define DSETUPERR_CANTFINDINF -7 +#define DSETUPERR_CANTFINDDIR -8 +#define DSETUPERR_INTERNAL -9 +#define DSETUPERR_UNKNOWNOS -11 +#define DSETUPERR_NEWERVERSION -14 +#define DSETUPERR_NOTADMIN -15 +#define DSETUPERR_UNSUPPORTEDPROCESSOR -16 +#define DSETUPERR_MISSINGCAB_MANAGEDDX -17 +#define DSETUPERR_NODOTNETFRAMEWORKINSTALLED -18 +#define DSETUPERR_CABDOWNLOADFAIL -19 +#define DSETUP_DDRAWDRV 0x00000008 +#define DSETUP_DSOUNDDRV 0x00000010 +#define DSETUP_DXCORE 0x00010000 +#define DSETUP_DIRECTX (DSETUP_DXCORE|DSETUP_DDRAWDRV|DSETUP_DSOUNDDRV) +#define DSETUP_MANAGEDDX 0x00004000 +#define DSETUP_TESTINSTALL 0x00020000 +#define DSETUP_DDRAW 0x00000001 +#define DSETUP_DSOUND 0x00000002 +#define DSETUP_DPLAY 0x00000004 +#define DSETUP_DPLAYSP 0x00000020 +#define DSETUP_DVIDEO 0x00000040 +#define DSETUP_D3D 0x00000200 +#define DSETUP_DINPUT 0x00000800 +#define DSETUP_DIRECTXSETUP 0x00001000 +#define DSETUP_NOUI 0x00002000 +#define DSETUP_PROMPTFORDRIVERS 0x10000000 +#define DSETUP_RESTOREDRIVERS 0x20000000 +#define DSETUP_CB_MSG_NOMESSAGE 0 +#define DSETUP_CB_MSG_INTERNAL_ERROR 10 +#define DSETUP_CB_MSG_BEGIN_INSTALL 13 +#define DSETUP_CB_MSG_BEGIN_INSTALL_RUNTIME 14 +#define DSETUP_CB_MSG_PROGRESS 18 +#define DSETUP_CB_MSG_WARNING_DISABLED_COMPONENT 19 + + +#ifdef __cplusplus +}; +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/dsetup.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 26883: - initialize display class with "Ms Shell Dlg" - don't show display window until font is set - use negative value for font size (patch by roytam1) See issue #2260 for more details.
by tkreuzer＠svn.reactos.org 25 May '07

25 May '07

Author: tkreuzer Date: Fri May 25 11:48:17 2007 New Revision: 26883 URL: http://svn.reactos.org/svn/reactos?rev=26883&view=rev Log: - initialize display class with "Ms Shell Dlg" - don't show display window until font is set - use negative value for font size (patch by roytam1) See issue #2260 for more details. Modified: trunk/rosapps/fontview/display.c trunk/rosapps/fontview/fontview.c Modified: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.c (original) +++ trunk/rosapps/fontview/display.c Fri May 25 11:48:17 2007 @@ -91,14 +91,7 @@ hOldFont = SelectObject(hDC, pData->hCaptionFont); GetTextMetrics(hDC, &tm); - if (*pData->szFormat == 0) - { - swprintf(szCaption, pData->szTypeFaceName); - } - else - { - swprintf(szCaption, L"%s (%s)", pData->szTypeFaceName, pData->szFormat); - } + swprintf(szCaption, L"%s%s", pData->szTypeFaceName, pData->szFormat); TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); y += tm.tmHeight + SPACING1; @@ -148,34 +141,109 @@ } static LRESULT +Display_SetTypeFace(HWND hwnd, LPARAM lParam) +{ + DISPLAYDATA* pData; + TEXTMETRIC tm; + HDC hDC; + RECT rect; + SCROLLINFO si; + int i; + + /* Set the new type face name */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); + + /* Create the new fonts */ + hDC = GetDC(hwnd); + DeleteObject(pData->hCharSetFont); + pData->hCharSetFont = CreateFontW(-MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72), + 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + + /* Get font format */ + // FIXME: Get the real font format (OpenType?) + SelectObject(hDC, pData->hCharSetFont); + GetTextMetrics(hDC, &tm); + if ((tm.tmPitchAndFamily & TMPF_TRUETYPE) == TMPF_TRUETYPE) + { + swprintf(pData->szFormat, L" (TrueType)"); + } + + for (i = 0; i < MAX_SIZES; i++) + { + DeleteObject(pData->hFonts[i]); + pData->hFonts[i] = CreateFontW(-MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72), + 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + } + + /* Calculate new page dimensions */ + pData->nPageHeight = Display_DrawText(hDC, pData, 0); + ReleaseDC(hwnd, hDC); + + /* Set the vertical scrolling range and page size */ + GetClientRect(hwnd, &rect); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; + si.nMin = 0; + si.nMax = pData->nPageHeight; + si.nPage = rect.bottom; + si.nPos = 0; + si.nTrackPos = 0; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + + return 0; +} + +static LRESULT +Display_SetString(HWND hwnd, LPARAM lParam) +{ + DISPLAYDATA* pData; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam); + + // FIXME: redraw the window + + return 0; +} + +static LRESULT Display_OnCreate(HWND hwnd) { DISPLAYDATA* pData; const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; int i; - /* Initialize data structure */ + /* Create data structure */ pData = malloc(sizeof(DISPLAYDATA)); - pData->nPageHeight = 0; - swprintf(pData->szTypeFaceName, L""); - swprintf(pData->szFormat, L""); - swprintf(pData->szString, L""); - - for (i = 0; i < MAX_SIZES; i++) - { - pData->nSizes[i] = nSizes[i]; - } - - pData->hCaptionFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"Ms Shell Dlg"); - - pData->hSizeFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"Ms Shell Dlg"); + ZeroMemory(pData, sizeof(DISPLAYDATA)); /* Set the window's GWLP_USERDATA to our data structure */ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + + for (i = 0; i < MAX_SIZES; i++) + { + pData->nSizes[i] = nSizes[i]; + } + + pData->hCaptionFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + + pData->hSizeFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + + Display_SetString(hwnd, (LPARAM)L"Jackdaws love my big sphinx of quartz. 1234567890"); + Display_SetTypeFace(hwnd, (LPARAM)L"Ms Shell Dlg"); return 0; } @@ -196,7 +264,7 @@ BeginPaint(hwnd, &ps); - /* Fill with white */ + /* Erase background */ FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); /* Draw the text */ @@ -216,7 +284,7 @@ GetClientRect(hwnd, &rect); - /* Get the old pos */ + /* Get the old scroll pos */ si.cbSize = sizeof(si); si.fMask = SIF_POS; GetScrollInfo(hwnd, SB_VERT, &si); @@ -227,15 +295,15 @@ si.nPage = rect.bottom; SetScrollInfo(hwnd, SB_VERT, &si, TRUE); - /* Get the new pos */ + /* Get the new scroll pos */ si.fMask = SIF_POS; GetScrollInfo(hwnd, SB_VERT, &si); - /* If the don't match ... */ + /* If they don't match ... */ if (nOldPos != si.nPos) { /* ... scroll the window */ - ScrollWindowEx(hwnd, 0, -(si.nPos - nOldPos), NULL, NULL, NULL, NULL, SW_INVALIDATE); + ScrollWindowEx(hwnd, 0, nOldPos - si.nPos, NULL, NULL, NULL, NULL, SW_INVALIDATE); UpdateWindow(hwnd); } @@ -278,7 +346,7 @@ nPos = min(nPos, si.nMax); if (nPos != si.nPos) { - ScrollWindowEx(hwnd, 0, -(nPos - si.nPos), NULL, NULL, NULL, NULL, SW_INVALIDATE); + ScrollWindowEx(hwnd, 0, si.nPos - nPos, NULL, NULL, NULL, NULL, SW_INVALIDATE); si.cbSize = sizeof(si); si.nPos = nPos; si.fMask = SIF_POS; @@ -290,75 +358,6 @@ } static LRESULT -Display_SetTypeFace(HWND hwnd, LPARAM lParam) -{ - DISPLAYDATA* pData; - TEXTMETRIC tm; - HDC hDC; - RECT rect; - SCROLLINFO si; - int i; - - /* Set the new type face name */ - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); - - /* Create the new fonts */ - hDC = GetDC(hwnd); - pData->hCharSetFont = CreateFontW(-MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72), 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); - - /* Get font format */ - SelectObject(hDC, pData->hCharSetFont); - GetTextMetrics(hDC, &tm); - if ((tm.tmPitchAndFamily & TMPF_TRUETYPE) == TMPF_TRUETYPE) - { - swprintf(pData->szFormat, L"TrueType"); - } - - for (i = 0; i < MAX_SIZES; i++) - { - pData->hFonts[i] = CreateFontW(MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72), - 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); - SelectObject(hDC, pData->hFonts[i]); - } - - /* Calculate new page dimensions */ - pData->nPageHeight = Display_DrawText(hDC, pData, 0); - ReleaseDC(hwnd, hDC); - - /* Set the vertical scrolling range and page size */ - GetClientRect(hwnd, &rect); - si.cbSize = sizeof(si); - si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; - si.nMin = 0; - si.nMax = pData->nPageHeight; - si.nPage = rect.bottom; - si.nPos = 0; - si.nTrackPos = 0; - SetScrollInfo(hwnd, SB_VERT, &si, TRUE); - - return 0; -} - -static LRESULT -Display_SetString(HWND hwnd, LPARAM lParam) -{ - DISPLAYDATA* pData; - - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam); - - // FIXME: redraw the window - - return 0; -} - -static LRESULT Display_OnDestroy(HWND hwnd) { DISPLAYDATA* pData; @@ -385,8 +384,8 @@ LRESULT CALLBACK DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) - { + switch (message) + { case WM_CREATE: return Display_OnCreate(hwnd); @@ -405,13 +404,13 @@ case FVM_SETSTRING: return Display_SetString(hwnd, lParam); - case WM_DESTROY: + case WM_DESTROY: return Display_OnDestroy(hwnd); - default: - return DefWindowProcW(hwnd, message, wParam, lParam); - } - - return 0; -} - + default: + return DefWindowProcW(hwnd, message, wParam, lParam); + } + + return 0; +} + Modified: trunk/rosapps/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.c?rev=26… ============================================================================== --- trunk/rosapps/fontview/fontview.c (original) +++ trunk/rosapps/fontview/fontview.c Fri May 25 11:48:17 2007 @@ -191,7 +191,7 @@ 0, /* Extended style */ g_szFontDisplayClassName, /* Classname */ L"", /* Title text */ - WS_CHILD | WS_VSCROLL| WS_VISIBLE, /* Window style */ + WS_CHILD | WS_VSCROLL, /* Window style */ 0, /* X-pos */ HEADER_SIZE, /* Y-Pos */ 550, /* Width */ @@ -202,10 +202,12 @@ NULL /* Window Creation data */ ); - /* Init the display window with the font name */ LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING); SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); + + /* Init the display window with the font name */ SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)g_szTypeFaceName); + ShowWindow(hDisplay, SW_SHOWNORMAL); /* Create the quit button */ LoadStringW(g_hInstance, IDS_QUIT, szQuit, MAX_BUTTONNAME);

1 0

[fireball] 26882: - ACPI was intentionally disabled. Reverting 26870, thus unregressing VMWare video driver installation (since PCI bus is now again being enumerated).
by fireball＠svn.reactos.org 25 May '07

25 May '07

Author: fireball Date: Fri May 25 11:46:48 2007 New Revision: 26882 URL: http://svn.reactos.org/svn/reactos?rev=26882&view=rev Log: - ACPI was intentionally disabled. Reverting 26870, thus unregressing VMWare video driver installation (since PCI bus is now again being enumerated). Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri May 25 11:46:48 2007 @@ -2695,9 +2695,9 @@ const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI BIOS"); UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); static ULONG DeviceIndexPci = 0; - const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); + /*const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0"); - static ULONG DeviceIndexAcpi = 0; + static ULONG DeviceIndexAcpi = 0;*/ const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); static ULONG DeviceIndexSerial = 0; @@ -2957,11 +2957,11 @@ pHardwareId = &HardwareIdPci; DeviceIndex = DeviceIndexPci++; } - else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) + /*else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) { pHardwareId = &HardwareIdAcpi; DeviceIndex = DeviceIndexAcpi++; - } + }*/ else { /* Unknown device */ @@ -3083,6 +3083,8 @@ static BOOLEAN INIT_FUNCTION IopIsAcpiComputer(VOID) { + return FALSE; +#if 0 UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS"); @@ -3214,6 +3216,7 @@ if (hDeviceKey) ZwClose(hDeviceKey); return ret; +#endif } static NTSTATUS INIT_FUNCTION

1 0

[gedmurphy] 26881: add a tool to allow the RosBE cmd window to flash when the build has stopped.
by gedmurphy＠svn.reactos.org 24 May '07

24 May '07

Author: gedmurphy Date: Fri May 25 00:48:20 2007 New Revision: 26881 URL: http://svn.reactos.org/svn/reactos?rev=26881&view=rev Log: add a tool to allow the RosBE cmd window to flash when the build has stopped. Added: trunk/tools/RosBE-Windows/Tools/flash.c Added: trunk/tools/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/flash.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/flash.c (added) +++ trunk/tools/RosBE-Windows/Tools/flash.c Fri May 25 00:48:20 2007 @@ -1,0 +1,47 @@ +#include <windows.h> + +HWND GetConsoleHwnd(void) +{ + WCHAR szNewTitle[MAX_PATH]; + WCHAR szOldTitle[MAX_PATH]; + HWND hwnd = NULL; + + if (GetConsoleTitleW(szOldTitle, MAX_PATH)) + { + wsprintfW(szNewTitle, + L"%d/%d", + GetTickCount(), + GetCurrentProcessId()); + + if (SetConsoleTitleW(szNewTitle)) + { + Sleep(40); + + hwnd = FindWindowW(NULL, szNewTitle); + + SetConsoleTitleW(szOldTitle); + } + } + + return hwnd; +} + + +int main() +{ + HWND hwnd; + FLASHWINFO fwi = {0,}; + + hwnd = GetConsoleHwnd(); + if (hwnd) + { + fwi.cbSize = sizeof(FLASHWINFO); + fwi.hwnd = hwnd; + fwi.dwFlags = FLASHW_ALL | FLASHW_TIMERNOFG; + fwi.uCount = 20; + + FlashWindowEx(&fwi); + } + + return 0; +}

1 0

[fireball] 26880: - Fix wrong access-rights when referencing the object (fixes NtEnumerateKey() API). - Add DPRINTs for problems with objects referencing.
by fireball＠svn.reactos.org 24 May '07

24 May '07

Author: fireball Date: Thu May 24 17:23:33 2007 New Revision: 26880 URL: http://svn.reactos.org/svn/reactos?rev=26880&view=rev Log: - Fix wrong access-rights when referencing the object (fixes NtEnumerateKey() API). - Add DPRINTs for problems with objects referencing. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu May 24 17:23:33 2007 @@ -726,7 +726,11 @@ ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -772,6 +776,128 @@ DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n", KeyHandle, Index, KeyInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_ENUMERATE_SUB_KEYS, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Index = Index; + EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; + EnumerateKeyInfo.Length = Length; + EnumerateKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateKey(KeyObject, + Index, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); + } + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtEnumerateValueKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", + KeyHandle, Index, KeyValueInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Index = Index; + EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; + EnumerateValueKeyInfo.Length = Length; + EnumerateValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, + &EnumerateValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateValueKey(KeyObject, + Index, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); + } + + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtQueryKey(IN HANDLE KeyHandle, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_KEY_INFORMATION QueryKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", + KeyHandle, KeyInformationClass, Length); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, @@ -782,31 +908,34 @@ ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Index = Index; - EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; - EnumerateKeyInfo.Length = Length; - EnumerateKeyInfo.ResultLength = ResultLength; + QueryKeyInfo.Object = (PVOID)KeyObject; + QueryKeyInfo.KeyInformationClass = KeyInformationClass; + QueryKeyInfo.KeyInformation = KeyInformation; + QueryKeyInfo.Length = Length; + QueryKeyInfo.ResultLength = ResultLength; /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); + Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); if (NT_SUCCESS(Status)) { /* Call the internal API */ - Status = CmEnumerateKey(KeyObject, - Index, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); + Status = CmQueryKey(KeyObject, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); /* Do the post callback */ PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); + CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); } /* Dereference and return status */ @@ -816,21 +945,21 @@ NTSTATUS NTAPI -NtEnumerateValueKey(IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) +NtQueryValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) { NTSTATUS Status; PKEY_OBJECT KeyObject; - REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; + REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); - DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", - KeyHandle, Index, KeyValueInformationClass, Length); + DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", + KeyHandle, ValueName, KeyValueInformationClass, Length); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, @@ -839,122 +968,11 @@ ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Index = Index; - EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; - EnumerateValueKeyInfo.Length = Length; - EnumerateValueKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, - &EnumerateValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmEnumerateValueKey(KeyObject, - Index, - KeyValueInformationClass, - KeyValueInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); - } - - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtQueryKey(IN HANDLE KeyHandle, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_QUERY_KEY_INFORMATION QueryKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", - KeyHandle, KeyInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - (KeyInformationClass != - KeyNameInformation) ? - KEY_QUERY_VALUE : 0, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.KeyInformationClass = KeyInformationClass; - QueryKeyInfo.KeyInformation = KeyInformation; - QueryKeyInfo.Length = Length; - QueryKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmQueryKey(KeyObject, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); - } - - /* Dereference and return status */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtQueryValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", - KeyHandle, ValueName, KeyValueInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -981,6 +999,8 @@ CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); } + DPRINT("NtQueryValueKey() returning 0x%08X\n", Status); + /* Dereference and return status */ ObDereferenceObject(KeyObject); return Status; @@ -1011,7 +1031,11 @@ ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Setup callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -1063,7 +1087,11 @@ PreviousMode, (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Do the callback */ DeleteValueKeyInfo.Object = (PVOID)KeyObject;

1 0

[gedmurphy] 26879: add a check for .NET 2.0
by gedmurphy＠svn.reactos.org 24 May '07

24 May '07

Author: gedmurphy Date: Thu May 24 16:34:09 2007 New Revision: 26879 URL: http://svn.reactos.org/svn/reactos?rev=26879&view=rev Log: add a check for .NET 2.0 Modified: trunk/tools/RosTE/installer/RosTE.nsi Modified: trunk/tools/RosTE/installer/RosTE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/installer/RosTE.nsi?re… ============================================================================== --- trunk/tools/RosTE/installer/RosTE.nsi (original) +++ trunk/tools/RosTE/installer/RosTE.nsi Thu May 24 16:34:09 2007 @@ -61,7 +61,24 @@ ShowInstDetails show ShowUnInstDetails show +!macro Check_DotNet + ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\.NETFramework" "InstallRoot" + + StrCmp $R0 "" NotFound VerifyVersion + + VerifyVersion: + IfFileExists "$R0\v2.0.50727\*.*" Found NotFound + + NotFound: + MessageBox MB_OK|MB_ICONEXCLAMATION "This application requires the .NET 2.0 framework." + Quit + + Found: +macroend + + Section "InstallGui" SEC01 + !insertmacro Check_DotNet SetOutPath "$INSTDIR\GUI" SetOverwrite ifnewer File "${SOURCE_DIR}\GUI\QemuGUI.exe"

1 0

[fireball] 26878: - Add tracing DPRINTs to all public APIs.
by fireball＠svn.reactos.org 24 May '07

24 May '07

Author: fireball Date: Thu May 24 12:59:34 2007 New Revision: 26878 URL: http://svn.reactos.org/svn/reactos?rev=26878&view=rev Log: - Add tracing DPRINTs to all public APIs. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu May 24 12:59:34 2007 @@ -154,6 +154,10 @@ HANDLE hKey; PAGED_CODE(); + + DPRINT("NtCreateKey(TI 0x%x, DA 0x%x, Class '%wZ', OA 0x%p, OA->ON '%wZ'\n", + TitleIndex, DesiredAccess, Class, ObjectAttributes, + ObjectAttributes ? ObjectAttributes->ObjectName : NULL); PreviousMode = ExGetPreviousMode(); @@ -713,6 +717,8 @@ REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); + DPRINT("NtDeleteKey(KH 0x%p)\n", KeyHandle); + /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, DELETE, @@ -763,6 +769,9 @@ REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); + + DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n", + KeyHandle, Index, KeyInformationClass, Length); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, @@ -820,6 +829,9 @@ REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); + DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", + KeyHandle, Index, KeyValueInformationClass, Length); + /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_QUERY_VALUE, @@ -873,6 +885,9 @@ REG_QUERY_KEY_INFORMATION QueryKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); + + DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", + KeyHandle, KeyInformationClass, Length); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, @@ -929,6 +944,9 @@ REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); + DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", + KeyHandle, ValueName, KeyValueInformationClass, Length); + /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_QUERY_VALUE, @@ -982,6 +1000,9 @@ REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); + + DPRINT("NtSetValueKey() KH 0x%x, VN '%wZ', TI %x, T %d, DS %d\n", + KeyHandle, ValueName, TitleIndex, Type, DataSize); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle,

1 0

[jimtabor] 26877: - Fixed arithmetic semantics. Making it more Windows compatible. - This example work now. double F2F(PFLOATOBJ f) { if(SIGN(f->ul1)) // negate mant return (double) -(-f->ul1 * pow(2,(double)f->ul2-32)); else return (double) f->ul1 * pow(2,(double)f->ul2-32); }
by jimtabor＠svn.reactos.org 24 May '07

24 May '07

Author: jimtabor Date: Thu May 24 05:39:31 2007 New Revision: 26877 URL: http://svn.reactos.org/svn/reactos?rev=26877&view=rev Log: - Fixed arithmetic semantics. Making it more Windows compatible. - This example work now. double F2F(PFLOATOBJ f) { if(SIGN(f->ul1)) // negate mant return (double) -(-f->ul1 * pow(2,(double)f->ul2-32)); else return (double) f->ul1 * pow(2,(double)f->ul2-32); } Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/subsystems/win32/win32k/eng/float.c Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Thu May 24 05:39:31 2007 @@ -31,8 +31,9 @@ Sign = SIGN(Mant); //// M$ storage emulation + if( Sign ) Mant = -Mant; Mant = ((Mant & 0x3fffffff) >> 7); - Exp += (1 - EXCESS); + Exp += (EXCESS-1); //// Mant = MANT(Mant); return PACK(Sign, Exp, Mant); @@ -42,7 +43,7 @@ FASTCALL FtoEF( EFLOAT_S * efp, FLOATL f) { - long Mant, Exp; + long Mant, Exp, Sign = 0; gxf_long worker; #ifdef _X86_ @@ -53,10 +54,12 @@ Exp = EXP(worker.l); Mant = MANT(worker.l); - + if (SIGN(worker.l)) Sign = -1; //// M$ storage emulation - Mant = ((Mant << 7) | 0x40000000 | SIGN(worker.l)); - Exp -= (1 - EXCESS); + Mant = ((Mant << 7) | 0x40000000); + Mant ^= Sign; + Mant -= Sign; + Exp -= (EXCESS-1); //// efp->lMant = Mant; efp->lExp = Exp; Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c Thu May 24 05:39:31 2007 @@ -101,9 +101,7 @@ FASTCALL EF_Negate(EFLOAT_S * efp) { -// Do it this way since ReactOS uses real FP. - if (SIGN(efp->lMant)) efp->lMant = efp->lMant & ~SIGNBIT; - else efp->lMant = efp->lMant | SIGNBIT; + efp->lMant = -efp->lMant; } LONG @@ -119,8 +117,9 @@ Sign = SIGN(Mant); //// M$ storage emulation - Mant = ((Mant & 0x3fffffff)>>7); - Exp += (1 - EXCESS); + if( Sign ) Mant = -Mant; + Mant = ((Mant & 0x3fffffff) >> 7); + Exp += (EXCESS-1); //// Mant = MANT(Mant); return PACK(Sign, Exp, Mant); @@ -130,7 +129,7 @@ FASTCALL FtoEF( EFLOAT_S * efp, FLOATL f) { - long Mant, Exp; + long Mant, Exp, Sign = 0; gxf_long worker; #ifdef _X86_ @@ -141,10 +140,12 @@ Exp = EXP(worker.l); Mant = MANT(worker.l); - + if (SIGN(worker.l)) Sign = -1; //// M$ storage emulation - Mant = ((Mant << 7) | 0x40000000 | SIGN(worker.l)); - Exp -= (1 - EXCESS); + Mant = ((Mant << 7) | 0x40000000); + Mant ^= Sign; + Mant -= Sign; + Exp -= (EXCESS-1); //// efp->lMant = Mant; efp->lExp = Exp;

1 0

[hpoussin] 26876: Specify W suffix when possible Don't allocate unneeded memory in SetupDiCreateDeviceInfoListExW Replace strings by array of WCHARs
by hpoussin＠svn.reactos.org 23 May '07

23 May '07

Author: hpoussin Date: Thu May 24 01:40:46 2007 New Revision: 26876 URL: http://svn.reactos.org/svn/reactos?rev=26876&view=rev Log: Specify W suffix when possible Don't allocate unneeded memory in SetupDiCreateDeviceInfoListExW Replace strings by array of WCHARs Modified: trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/driver.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/queue.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Thu May 24 01:40:46 2007 @@ -30,6 +30,7 @@ static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; static const WCHAR DotServices[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR InterfaceInstall32[] = {'I','n','t','e','r','f','a','c','e','I','n','s','t','a','l','l','3','2',0}; +static const WCHAR SetupapiDll[] = {'s','e','t','u','p','a','p','i','.','d','l','l',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; typedef BOOL @@ -633,7 +634,7 @@ if (RequiredSize) *RequiredSize = dwLength / sizeof(WCHAR) + 1; - if (ClassNameSize * sizeof(WCHAR) >= dwLength + sizeof(UNICODE_STRING)) + if (ClassNameSize * sizeof(WCHAR) >= dwLength + sizeof(UNICODE_NULL)) { if (ClassNameSize > sizeof(UNICODE_NULL)) ClassName[ClassNameSize / sizeof(WCHAR)] = UNICODE_NULL; @@ -835,7 +836,7 @@ if (RequiredSize) *RequiredSize = dwLength / sizeof(WCHAR) + 1; - if (ClassDescriptionSize * sizeof(WCHAR) >= dwLength + sizeof(UNICODE_STRING)) + if (ClassDescriptionSize * sizeof(WCHAR) >= dwLength + sizeof(UNICODE_NULL)) { if (ClassDescriptionSize > sizeof(UNICODE_NULL)) ClassDescription[ClassDescriptionSize / sizeof(WCHAR)] = UNICODE_NULL; @@ -1597,7 +1598,7 @@ else { /* Look up icon in setupapi.dll */ - DllName = L"setupapi.dll"; + DllName = SetupapiDll; iconIndex = -iconIndex; } Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Thu May 24 01:40:46 2007 @@ -27,10 +27,13 @@ static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR Class[] = {'C','l','a','s','s',0}; +static const WCHAR DateFormat[] = {'%','u','-','%','u','-','%','u',0}; static const WCHAR DotCoInstallers[] = {'.','C','o','I','n','s','t','a','l','l','e','r','s',0}; static const WCHAR DotHW[] = {'.','H','W',0}; static const WCHAR DotServices[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR InfDirectory[] = {'i','n','f','\\',0}; +static const WCHAR InstanceKeyFormat[] = {'%','0','4','l','u',0}; +static const WCHAR VersionFormat[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; static const WCHAR REGSTR_DRIVER_DATE[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR REGSTR_DRIVER_DATE_DATA[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; @@ -170,7 +173,6 @@ IN PVOID Reserved) { struct DeviceInfoSet *list; - LPWSTR UNCServerName = NULL; DWORD size; DWORD rc; CONFIGRET cr; @@ -206,15 +208,7 @@ SetLastError(rc); goto cleanup; } - UNCServerName = MyMalloc((strlenW(MachineName) + 3) * sizeof(WCHAR)); - if (!UNCServerName) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - - UNCServerName[0] = UNCServerName[1] = '\\'; - strcpyW(UNCServerName + 2, MachineName); + list->szData[0] = list->szData[1] = '\\'; strcpyW(list->szData + 2, MachineName); list->MachineName = list->szData; @@ -224,7 +218,7 @@ list->HKLM = HKEY_LOCAL_MACHINE; list->MachineName = NULL; } - cr = CM_Connect_MachineW(UNCServerName, &list->hMachine); + cr = CM_Connect_MachineW(list->MachineName, &list->hMachine); if (cr != CR_SUCCESS) { SetLastError(GetErrorCodeFromCrCode(cr)); @@ -245,7 +239,6 @@ MyFree(list); } } - MyFree(UNCServerName); return ret; } @@ -733,7 +726,7 @@ OSVERSIONINFOEX VersionInfo; SYSTEM_INFO SystemInfo; VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - ret = GetVersionEx((POSVERSIONINFO)&VersionInfo); + ret = GetVersionExW((OSVERSIONINFO*)&VersionInfo); if (!ret) goto done; GetSystemInfo(&SystemInfo); @@ -1540,7 +1533,7 @@ } if (CanHandle & CLASS_COINSTALLER) { - rc = RegOpenKeyEx( + rc = RegOpenKeyExW( HKEY_LOCAL_MACHINE, REGSTR_PATH_CODEVICEINSTALLERS, 0, /* Options */ @@ -2139,7 +2132,7 @@ else { WCHAR subKey[5]; - snprintfW(subKey, 4, L"%04lu", HwProfile); + snprintfW(subKey, 4, InstanceKeyFormat, HwProfile); subKey[4] = '\0'; rc = RegOpenKeyExW( hHWProfilesKey, @@ -2266,7 +2259,7 @@ if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) != RPC_S_OK) goto cleanup; /* The driver key is in \System\CurrentControlSet\Control\Class\{GUID}\Index */ - DriverKey = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpGuidString) + 7) * sizeof(WCHAR) + sizeof(UNICODE_STRING)); + DriverKey = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpGuidString) + 7) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!DriverKey) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -2274,8 +2267,9 @@ } DriverKey[0] = '{'; strcpyW(&DriverKey[1], lpGuidString); - strcatW(DriverKey, L"}\\"); pDeviceInstance = &DriverKey[strlenW(DriverKey)]; + *pDeviceInstance++ = '}'; + *pDeviceInstance++ = '\\'; rc = RegOpenKeyExW(RootKey, REGSTR_PATH_CLASS_NT, 0, @@ -2292,8 +2286,8 @@ while (Index <= 9999) { DWORD Disposition; - wsprintf(pDeviceInstance, L"%04lu", Index); - rc = RegCreateKeyEx(hClassKey, + sprintfW(pDeviceInstance, InstanceKeyFormat, Index); + rc = RegCreateKeyExW(hClassKey, DriverKey, 0, NULL, @@ -2328,7 +2322,7 @@ hDeviceKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, Scope, HwProfile, DIREG_DEV, KEY_SET_VALUE); if (hDeviceKey == INVALID_HANDLE_VALUE) goto cleanup; - rc = RegSetValueEx(hDeviceKey, REGSTR_VAL_DRIVER, 0, REG_SZ, (const BYTE *)DriverKey, (strlenW(DriverKey) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hDeviceKey, REGSTR_VAL_DRIVER, 0, REG_SZ, (const BYTE *)DriverKey, (strlenW(DriverKey) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -2883,7 +2877,7 @@ /* Return the current hardware profile id, or -1 if error */ static DWORD -GetCurrentHwProfile( +SETUPAPI_GetCurrentHwProfile( IN HDEVINFO DeviceInfoSet) { HKEY hKey = NULL; @@ -3032,7 +3026,7 @@ dwConfigFlags &= ~(PropChange->Scope == DICS_FLAG_GLOBAL ? CONFIGFLAG_DISABLED : CSCONFIGFLAG_DISABLED); else dwConfigFlags |= (PropChange->Scope == DICS_FLAG_GLOBAL ? CONFIGFLAG_DISABLED : CSCONFIGFLAG_DISABLED); - rc = RegSetValueEx( + rc = RegSetValueExW( hKey, RegistryValueName, 0, @@ -3047,7 +3041,7 @@ /* Enable/disable device if needed */ if (PropChange->Scope == DICS_FLAG_GLOBAL || PropChange->HwProfile == 0 - || PropChange->HwProfile == GetCurrentHwProfile(DeviceInfoSet)) + || PropChange->HwProfile == SETUPAPI_GetCurrentHwProfile(DeviceInfoSet)) { if (PropChange->StateChange == DICS_ENABLE) ret = ResetDevice(DeviceInfoSet, DeviceInfoData); @@ -3169,7 +3163,7 @@ Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, DoAction, hKey, SelectedDriver->InfFileDetails->DirectoryName, SP_COPY_NEWER, - SetupDefaultQueueCallback, Context, + SetupDefaultQueueCallbackW, Context, DeviceInfoSet, DeviceInfoData); if (!Result) goto cleanup; @@ -3415,7 +3409,7 @@ Result = SetupInstallFromInfSectionW(InstallParams.hwndParent, SelectedDriver->InfFileDetails->hInf, SectionName, DoAction, hKey, SelectedDriver->InfFileDetails->DirectoryName, SP_COPY_NEWER, - SetupDefaultQueueCallback, Context, + SetupDefaultQueueCallbackW, Context, DeviceInfoSet, DeviceInfoData); if (!Result) goto cleanup; @@ -3434,27 +3428,27 @@ TRACE("InfSectionExt : '%s'\n", debugstr_w(&SectionName[strlenW(SelectedDriver->Details.SectionName)])); TRACE("MatchingDeviceId: '%s'\n", debugstr_w(SelectedDriver->MatchingId)); TRACE("ProviderName : '%s'\n", debugstr_w(SelectedDriver->Info.ProviderName)); - sprintfW(Buffer, L"%u-%u-%u", DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); - rc = RegSetValueEx(hKey, REGSTR_DRIVER_DATE, 0, REG_SZ, (const BYTE *)Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR)); + sprintfW(Buffer, DateFormat, DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); + rc = RegSetValueExW(hKey, REGSTR_DRIVER_DATE, 0, REG_SZ, (const BYTE *)Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_DRIVER_DATE_DATA, 0, REG_BINARY, (const BYTE *)&SelectedDriver->Info.DriverDate, sizeof(FILETIME)); + rc = RegSetValueExW(hKey, REGSTR_DRIVER_DATE_DATA, 0, REG_BINARY, (const BYTE *)&SelectedDriver->Info.DriverDate, sizeof(FILETIME)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_DRVDESC, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (strlenW(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_DRVDESC, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (strlenW(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) { - sprintfW(Buffer, L"%u.%u.%u.%u", fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); - rc = RegSetValueEx(hKey, REGSTR_DRIVER_VERSION, 0, REG_SZ, (const BYTE *)Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR)); + sprintfW(Buffer, VersionFormat, fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); + rc = RegSetValueExW(hKey, REGSTR_DRIVER_VERSION, 0, REG_SZ, (const BYTE *)Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR)); } if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_INFPATH, 0, REG_SZ, (const BYTE *)SelectedDriver->InfFileDetails->FileName, (strlenW(SelectedDriver->InfFileDetails->FileName) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_INFPATH, 0, REG_SZ, (const BYTE *)SelectedDriver->InfFileDetails->FileName, (strlenW(SelectedDriver->InfFileDetails->FileName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_INFSECTION, 0, REG_SZ, (const BYTE *)SelectedDriver->Details.SectionName, (strlenW(SelectedDriver->Details.SectionName) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_INFSECTION, 0, REG_SZ, (const BYTE *)SelectedDriver->Details.SectionName, (strlenW(SelectedDriver->Details.SectionName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_INFSECTIONEXT, 0, REG_SZ, (const BYTE *)&SectionName[strlenW(SelectedDriver->Details.SectionName)], (strlenW(SectionName) - strlenW(SelectedDriver->Details.SectionName) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_INFSECTIONEXT, 0, REG_SZ, (const BYTE *)&SectionName[strlenW(SelectedDriver->Details.SectionName)], (strlenW(SectionName) - strlenW(SelectedDriver->Details.SectionName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_MATCHINGDEVID, 0, REG_SZ, (const BYTE *)SelectedDriver->MatchingId, (strlenW(SelectedDriver->MatchingId) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_MATCHINGDEVID, 0, REG_SZ, (const BYTE *)SelectedDriver->MatchingId, (strlenW(SelectedDriver->MatchingId) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_PROVIDER_NAME, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.ProviderName, (strlenW(SelectedDriver->Info.ProviderName) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_PROVIDER_NAME, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.ProviderName, (strlenW(SelectedDriver->Info.ProviderName) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -3504,13 +3498,13 @@ TRACE("ClassGUID : '%s'\n", debugstr_w(lpFullGuidString)); TRACE("DeviceDesc : '%s'\n", debugstr_w(SelectedDriver->Info.Description)); TRACE("Mfg : '%s'\n", debugstr_w(SelectedDriver->Info.MfgName)); - rc = RegSetValueEx(hKey, REGSTR_VAL_CLASS, 0, REG_SZ, (const BYTE *)ClassName, (strlenW(ClassName) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_CLASS, 0, REG_SZ, (const BYTE *)ClassName, (strlenW(ClassName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_CLASSGUID, 0, REG_SZ, (const BYTE *)lpFullGuidString, (strlenW(lpFullGuidString) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_CLASSGUID, 0, REG_SZ, (const BYTE *)lpFullGuidString, (strlenW(lpFullGuidString) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_DEVDESC, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (strlenW(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_DEVDESC, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.Description, (strlenW(SelectedDriver->Info.Description) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueEx(hKey, REGSTR_VAL_MFG, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.MfgName, (strlenW(SelectedDriver->Info.MfgName) + 1) * sizeof(WCHAR)); + rc = RegSetValueExW(hKey, REGSTR_VAL_MFG, 0, REG_SZ, (const BYTE *)SelectedDriver->Info.MfgName, (strlenW(SelectedDriver->Info.MfgName) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { SetLastError(rc); Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c (original) +++ trunk/reactos/dll/win32/setupapi/driver.c Thu May 24 01:40:46 2007 @@ -138,15 +138,15 @@ driverInfo->Params.cbSize = sizeof(SP_DRVINSTALL_PARAMS); driverInfo->Params.Reserved = (ULONG_PTR)driverInfo; - driverInfo->Details.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA); + driverInfo->Details.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA_W); driverInfo->Details.Reserved = (ULONG_PTR)driverInfo; /* Copy InfFileName field */ - strncpyW(driverInfo->Details.InfFileName, InfFile, MAX_PATH - 1); + lstrcpynW(driverInfo->Details.InfFileName, InfFile, MAX_PATH - 1); driverInfo->Details.InfFileName[MAX_PATH - 1] = '\0'; /* Fill InfDate field */ - hFile = CreateFile( + hFile = CreateFileW( InfFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); @@ -157,13 +157,13 @@ goto cleanup; /* Fill SectionName field */ - strncpyW(driverInfo->Details.SectionName, SectionName, LINE_LEN); + lstrcpynW(driverInfo->Details.SectionName, SectionName, LINE_LEN); pDot = strchrW(driverInfo->Details.SectionName, '.'); if (pDot) *pDot = UNICODE_NULL; /* Fill DrvDescription field */ - strncpyW(driverInfo->Details.DrvDescription, DriverDescription, LINE_LEN); + lstrcpynW(driverInfo->Details.DrvDescription, DriverDescription, LINE_LEN); /* Copy MatchingId information */ if (MatchingId) @@ -188,13 +188,13 @@ memcpy(&driverInfo->ClassGuid, ClassGuid, sizeof(GUID)); driverInfo->Info.DriverType = DriverType; driverInfo->Info.Reserved = (ULONG_PTR)driverInfo; - strncpyW(driverInfo->Info.Description, driverInfo->Details.DrvDescription, LINE_LEN - 1); + lstrcpynW(driverInfo->Info.Description, driverInfo->Details.DrvDescription, LINE_LEN - 1); driverInfo->Info.Description[LINE_LEN - 1] = '\0'; - strncpyW(driverInfo->Info.MfgName, ManufacturerName, LINE_LEN - 1); + lstrcpynW(driverInfo->Info.MfgName, ManufacturerName, LINE_LEN - 1); driverInfo->Info.MfgName[LINE_LEN - 1] = '\0'; if (ProviderName) { - strncpyW(driverInfo->Info.ProviderName, ProviderName, LINE_LEN - 1); + lstrcpynW(driverInfo->Info.ProviderName, ProviderName, LINE_LEN - 1); driverInfo->Info.ProviderName[LINE_LEN - 1] = '\0'; } else @@ -2152,7 +2152,7 @@ Context = SetupInitDefaultQueueCallback(InstallParams.hwndParent); if (!Context) goto cleanup; - InstallMsgHandler = SetupDefaultQueueCallback; + InstallMsgHandler = SetupDefaultQueueCallbackW; InstallMsgHandlerContext = Context; } ret = SetupInstallFromInfSectionW(InstallParams.hwndParent, Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Thu May 24 01:40:46 2007 @@ -25,7 +25,20 @@ /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; +static const WCHAR GroupOrderListKey[] = {'S','Y','S','T','E','M','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','G','r','o','u','p','O','r','d','e','r','L','i','s','t',0}; static const WCHAR InfDirectory[] = {'i','n','f','\\',0}; +static const WCHAR OemFileMask[] = {'o','e','m','*','.','i','n','f',0}; +static const WCHAR OemFileSpecification[] = {'o','e','m','%','l','u','.','i','n','f',0}; + +static const WCHAR DependenciesKey[] = {'D','e','p','e','n','d','e','n','c','i','e','s',0}; +static const WCHAR DescriptionKey[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR DisplayNameKey[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; +static const WCHAR ErrorControlKey[] = {'E','r','r','o','r','C','o','n','t','r','o','l',0}; +static const WCHAR LoadOrderGroupKey[] = {'L','o','a','d','O','r','d','e','r','G','r','o','u','p',0}; +static const WCHAR SecurityKey[] = {'S','e','c','u','r','i','t','y',0}; +static const WCHAR ServiceBinaryKey[] = {'S','e','r','v','i','c','e','B','i','n','a','r','y',0}; +static const WCHAR ServiceTypeKey[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR StartTypeKey[] = {'S','t','a','r','t','T','y','p','e',0}; /* info passed to callback functions dealing with files */ struct files_callback_info @@ -90,6 +103,9 @@ static const WCHAR Include[] = {'I','n','c','l','u','d','e',0}; static const WCHAR Needs[] = {'N','e','e','d','s',0}; static const WCHAR DotSecurity[] = {'.','S','e','c','u','r','i','t','y',0}; +#ifdef __WINESRC__ +static const WCHAR WineFakeDlls[] = {'W','i','n','e','F','a','k','e','D','l','l','s',0}; +#endif /*********************************************************************** @@ -411,7 +427,7 @@ MyFree(security_key); if (ok) { - if (!SetupGetLineText( &security_context, NULL, NULL, NULL, NULL, 0, &required )) + if (!SetupGetLineTextW( &security_context, NULL, NULL, NULL, NULL, 0, &required )) return FALSE; security_descriptor = MyMalloc( required * sizeof(WCHAR) ); if (!security_descriptor) @@ -419,7 +435,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - if (!SetupGetLineText( &security_context, NULL, NULL, NULL, security_descriptor, required, NULL )) + if (!SetupGetLineTextW( &security_context, NULL, NULL, NULL, security_descriptor, required, NULL )) return FALSE; ok = ConvertStringSecurityDescriptorToSecurityDescriptorW( security_descriptor, SDDL_REVISION_1, &sd, NULL ); MyFree( security_descriptor ); @@ -1306,7 +1322,7 @@ SC_HANDLE hSCManager = NULL; SC_HANDLE hService = NULL; LPDWORD GroupOrder = NULL; - LPQUERY_SERVICE_CONFIG ServiceConfig = NULL; + LPQUERY_SERVICE_CONFIGW ServiceConfig = NULL; BOOL ret = FALSE; HKEY hGroupOrderListKey = NULL; @@ -1322,11 +1338,11 @@ DWORD tagId = (DWORD)-1; BOOL useTag; - if (!GetIntField(hInf, ServiceSection, L"ServiceType", &ServiceType)) + if (!GetIntField(hInf, ServiceSection, ServiceTypeKey, &ServiceType)) goto cleanup; - if (!GetIntField(hInf, ServiceSection, L"StartType", &StartType)) + if (!GetIntField(hInf, ServiceSection, StartTypeKey, &StartType)) goto cleanup; - if (!GetIntField(hInf, ServiceSection, L"ErrorControl", &ErrorControl)) + if (!GetIntField(hInf, ServiceSection, ErrorControlKey, &ErrorControl)) goto cleanup; useTag = (ServiceType == SERVICE_BOOT_START || ServiceType == SERVICE_SYSTEM_START); @@ -1334,15 +1350,15 @@ if (hSCManager == NULL) goto cleanup; - if (!GetLineText(hInf, ServiceSection, L"ServiceBinary", &ServiceBinary)) + if (!GetLineText(hInf, ServiceSection, ServiceBinaryKey, &ServiceBinary)) goto cleanup; /* Don't check return value, as these fields are optional and * GetLineText initialize output parameter even on failure */ - GetLineText(hInf, ServiceSection, L"LoadOrderGroup", &LoadOrderGroup); - GetLineText(hInf, ServiceSection, L"DisplayName", &DisplayName); - GetLineText(hInf, ServiceSection, L"Description", &Description); - GetLineText(hInf, ServiceSection, L"Dependencies", &Dependencies); + GetLineText(hInf, ServiceSection, LoadOrderGroupKey, &LoadOrderGroup); + GetLineText(hInf, ServiceSection, DisplayNameKey, &DisplayName); + GetLineText(hInf, ServiceSection, DescriptionKey, &Description); + GetLineText(hInf, ServiceSection, DependenciesKey, &Dependencies); hService = OpenServiceW( hSCManager, @@ -1413,7 +1429,7 @@ } /* Set security */ - if (GetLineText(hInf, ServiceSection, L"Security", &SecurityDescriptor)) + if (GetLineText(hInf, ServiceSection, SecurityKey, &SecurityDescriptor)) { ret = ConvertStringSecurityDescriptorToSecurityDescriptorW(SecurityDescriptor, SDDL_REVISION_1, &sd, NULL); if (!ret) @@ -1436,9 +1452,9 @@ if ((ServiceFlags & SPSVCINST_NOCLOBBER_LOADORDERGROUP) && ServiceConfig && ServiceConfig->lpLoadOrderGroup) lpLoadOrderGroup = ServiceConfig->lpLoadOrderGroup; - rc = RegOpenKey( + rc = RegOpenKeyW( list ? list->HKLM : HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Control\\GroupOrderList", + GroupOrderListKey, &hGroupOrderListKey); if (rc != ERROR_SUCCESS) { @@ -1809,7 +1825,7 @@ strcatW(pFullFileName, BackSlash); strcatW(pFullFileName, InfDirectory); pFileName = &pFullFileName[strlenW(pFullFileName)]; - sprintfW(pFileName, L"oem*.inf", NextFreeNumber); + sprintfW(pFileName, OemFileMask, NextFreeNumber); hSearch = FindFirstFileW(pFullFileName, &FindFileData); if (hSearch == INVALID_HANDLE_VALUE) { @@ -1821,12 +1837,12 @@ do { DWORD CurrentNumber; - if (swscanf(FindFileData.cFileName, L"oem%lu.inf", &CurrentNumber) == 1 + if (swscanf(FindFileData.cFileName, OemFileSpecification, &CurrentNumber) == 1 && CurrentNumber <= 99999) { NextFreeNumber = CurrentNumber + 1; } - } while (FindNextFile(hSearch, &FindFileData)); + } while (FindNextFileW(hSearch, &FindFileData)); } if (NextFreeNumber > 99999) @@ -1837,7 +1853,7 @@ } /* Create the full path: %WINDIR%\Inf\OEM{XXXXX}.inf */ - sprintfW(pFileName, L"oem%lu.inf", NextFreeNumber); + sprintfW(pFileName, OemFileSpecification, NextFreeNumber); TRACE("Next available file is %s\n", debugstr_w(pFileName)); if (RequiredSize) Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c (original) +++ trunk/reactos/dll/win32/setupapi/misc.c Thu May 24 01:40:46 2007 @@ -21,6 +21,10 @@ #include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); + +/* Unicode constants */ +static const WCHAR BackSlash[] = {'\\',0}; +static const WCHAR TranslationRegKey[] = {'\\','V','e','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; DWORD GetFunctionPointer( @@ -1190,7 +1194,7 @@ return FALSE; } - if (!VerQueryValueW(lpInfo, L"\\", + if (!VerQueryValueW(lpInfo, BackSlash, (LPVOID*)&lpFixedInfo, &uSize)) { MyFree(lpInfo); @@ -1201,7 +1205,7 @@ lpFileVersion->HighPart = lpFixedInfo->dwFileVersionMS; *lpVersionVarSize = 0; - if (!VerQueryValueW(lpInfo, L"\\VerFileInfo\\Translation", + if (!VerQueryValueW(lpInfo, TranslationRegKey, (LPVOID*)&lpVarSize, &uSize)) { MyFree(lpInfo); Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Thu May 24 01:40:46 2007 @@ -25,6 +25,8 @@ /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; +static const WCHAR Class[] = {'C','l','a','s','s',0}; +static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR InfDirectory[] = {'i','n','f','\\',0}; static const WCHAR InfFileSpecification[] = {'*','.','i','n','f',0}; @@ -1073,7 +1075,7 @@ static BOOL -GetInfClassW( +PARSER_GetInfClassW( IN HINF hInf, OUT LPGUID ClassGuid, OUT PWSTR ClassName, @@ -1085,14 +1087,14 @@ BOOL ret = FALSE; /* Read class Guid */ - if (!SetupGetLineTextW(NULL, hInf, L"Version", L"ClassGUID", guidW, sizeof(guidW), NULL)) + if (!SetupGetLineTextW(NULL, hInf, Version, ClassGUID, guidW, sizeof(guidW), NULL)) goto cleanup; guidW[37] = '\0'; /* Replace the } by a NULL character */ if (UuidFromStringW(&guidW[1], ClassGuid) != RPC_S_OK) goto cleanup; /* Read class name */ - ret = SetupGetLineTextW(NULL, hInf, L"Version", L"Class", ClassName, ClassNameSize, &requiredSize); + ret = SetupGetLineTextW(NULL, hInf, Version, Class, ClassName, ClassNameSize, &requiredSize); if (ret && ClassName == NULL && ClassNameSize == 0) { if (RequiredSize) @@ -1215,7 +1217,7 @@ SetupCloseInfFile((HINF)file); return NULL; } - else if (!GetInfClassW((HINF)file, &ClassGuid, ClassName, strlenW(class) + 1, NULL)) + else if (!PARSER_GetInfClassW((HINF)file, &ClassGuid, ClassName, strlenW(class) + 1, NULL)) { /* Unable to get class name in .inf file */ HeapFree(GetProcessHeap(), 0, ClassName); @@ -2197,7 +2199,7 @@ if (hInf == INVALID_HANDLE_VALUE) goto cleanup; - ret = GetInfClassW(hInf, ClassGuid, ClassName, ClassNameSize, RequiredSize); + ret = PARSER_GetInfClassW(hInf, ClassGuid, ClassName, ClassNameSize, RequiredSize); cleanup: if (hInf != INVALID_HANDLE_VALUE) Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c (original) +++ trunk/reactos/dll/win32/setupapi/queue.c Thu May 24 01:40:46 2007 @@ -763,7 +763,7 @@ MyFree(security_key); if (ret) { - if (!SetupGetLineText( &security_context, NULL, NULL, NULL, NULL, 0, &required )) + if (!SetupGetLineTextW( &security_context, NULL, NULL, NULL, NULL, 0, &required )) return FALSE; security_descriptor = MyMalloc( required * sizeof(WCHAR) ); if (!security_descriptor) @@ -771,7 +771,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - if (!SetupGetLineText( &security_context, NULL, NULL, NULL, security_descriptor, required, NULL )) + if (!SetupGetLineTextW( &security_context, NULL, NULL, NULL, security_descriptor, required, NULL )) { MyFree( security_descriptor ); return FALSE;

1 0

[fireball] 26875: - Merge Revision: 25668 Author: dgorbachev Date: 11:04:23, 1 February 2007. Message: Commit attachment #1151 ---- Modified : /trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c - Merge Revision: 25745 Author: dgorbachev Date: 3:29:50, 7 February 2007. Message: Fix "keyboard does not respond" bug. Thanks to Peter Krawies (breakoutbox /AT/ web /DOT/ de) ---- Modified : /trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
by fireball＠svn.reactos.org 23 May '07

23 May '07

Author: fireball Date: Thu May 24 01:26:24 2007 New Revision: 26875 URL: http://svn.reactos.org/svn/reactos?rev=26875&view=rev Log: - Merge Revision: 25668 Author: dgorbachev Date: 11:04:23, 1 February 2007. Message: Commit attachment #1151 ---- Modified : /trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c - Merge Revision: 25745 Author: dgorbachev Date: 3:29:50, 7 February 2007. Message: Fix "keyboard does not respond" bug. Thanks to Peter Krawies (breakoutbox /AT/ web /DOT/ de) ---- Modified : /trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: branches/winldr/arch/i386/hardware.c branches/winldr/inifile/inifile.c Modified: branches/winldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hardware.c?rev… ============================================================================== --- branches/winldr/arch/i386/hardware.c (original) +++ branches/winldr/arch/i386/hardware.c Thu May 24 01:26:24 2007 @@ -1955,6 +1955,8 @@ { UCHAR Scancode; UCHAR Status; + ULONG Loops; + BOOLEAN Result = TRUE; PS2ControllerWait(); WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_CONTROL, @@ -1965,31 +1967,43 @@ WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA, 0xF2); - StallExecutionProcessor(10000); + /* Wait for reply */ + for (Loops = 0; Loops < 10; Loops++) + { + StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) != 0) + break; + } Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0) - { - return FALSE; - } + Result = FALSE; Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0xFA) - return FALSE; + Result = FALSE; StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0) - { - return FALSE; - } + Result = FALSE; Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0x00) - return FALSE; - - return TRUE; + Result = FALSE; + + /* Flush output buffer */ + for (Loops = 0; Loops < 10; Loops++) + { + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) + break; + StallExecutionProcessor(10000); + } + + return Result; } static VOID Modified: branches/winldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/inifile/inifile.c?rev=26… ============================================================================== --- branches/winldr/inifile/inifile.c (original) +++ branches/winldr/inifile/inifile.c Thu May 24 01:26:24 2007 @@ -104,12 +104,12 @@ DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting value = %s\n", SectionItem->ItemValue)); DbgPrint((DPRINT_INIFILE, "1 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - RtlZeroMemory(SettingName, NameSize); - RtlZeroMemory(SettingValue, ValueSize); DbgPrint((DPRINT_INIFILE, "2 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - strncpy(SettingName, SectionItem->ItemName, NameSize); + strncpy(SettingName, SectionItem->ItemName, NameSize - 1); + SettingName[NameSize - 1] = '\0'; DbgPrint((DPRINT_INIFILE, "3 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - strncpy(SettingValue, SectionItem->ItemValue, ValueSize); + strncpy(SettingValue, SectionItem->ItemValue, ValueSize - 1); + SettingValue[ValueSize - 1] = '\0'; DbgPrint((DPRINT_INIFILE, "4 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); DbgDumpBuffer(DPRINT_INIFILE, SettingName, NameSize); DbgDumpBuffer(DPRINT_INIFILE, SettingValue, ValueSize); @@ -146,8 +146,8 @@ DbgPrint((DPRINT_INIFILE, "IniReadSettingByName() Setting \'%s\' found.\n", SettingName)); DbgPrint((DPRINT_INIFILE, "IniReadSettingByName() Setting value = %s\n", SectionItem->ItemValue)); - RtlZeroMemory(Buffer, BufferSize); - strncpy(Buffer, SectionItem->ItemValue, BufferSize); + strncpy(Buffer, SectionItem->ItemValue, BufferSize - 1); + Buffer[BufferSize - 1] = '\0'; return TRUE; }

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