Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[fireball] 26878: - Add tracing DPRINTs to all public APIs.

by fireball＠svn.reactos.org

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,

17 years, 7 months

[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

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;

17 years, 7 months

[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

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;

17 years, 7 months

[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

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

17 years, 7 months

[fireball] 26874: - Merge 25417 by hpoussin (Disable some boot options on non-x86 platforms. You can enable them again for specific platforms if needed). - Minor: Add debug_filesystem into DEBUG_CUSTOM, but commented out.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 24 01:11:35 2007 New Revision: 26874 URL: http://svn.reactos.org/svn/reactos?rev=26874&view=rev Log: - Merge 25417 by hpoussin (Disable some boot options on non-x86 platforms. You can enable them again for specific platforms if needed). - Minor: Add debug_filesystem into DEBUG_CUSTOM, but commented out. Modified: branches/winldr/bootmgr.c branches/winldr/custom.c branches/winldr/debug.c branches/winldr/drivemap.c branches/winldr/include/drivemap.h branches/winldr/include/linux.h branches/winldr/include/miscboot.h branches/winldr/include/options.h branches/winldr/linuxboot.c branches/winldr/miscboot.c Modified: branches/winldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/bootmgr.c?rev=26874&r1=2… ============================================================================== --- branches/winldr/bootmgr.c (original) +++ branches/winldr/bootmgr.c Thu May 24 01:11:35 2007 @@ -119,11 +119,14 @@ } // Install the drive mapper according to this sections drive mappings +#ifdef __i386__ DriveMapMapDrivesInSection(OperatingSystemSectionNames[SelectedOperatingSystem]); +#endif if (_stricmp(SettingValue, "ReactOS") == 0) { LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]); } +#ifdef __i386__ else if (_stricmp(SettingValue, "WindowsNT40") == 0) { LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_NT4); @@ -156,6 +159,7 @@ { LoadAndBootDrive(OperatingSystemSectionNames[SelectedOperatingSystem]); } +#endif } Modified: branches/winldr/custom.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/custom.c?rev=26874&r1=26… ============================================================================== --- branches/winldr/custom.c (original) +++ branches/winldr/custom.c Thu May 24 01:11:35 2007 @@ -33,7 +33,15 @@ VOID OptionMenuCustomBoot(VOID) { - PCSTR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; + PCSTR CustomBootMenuList[] = { +#ifdef __i386__ + "Disk", + "Partition", + "Boot Sector File", + "ReactOS", + "Linux" +#endif /* __i386__ */ + }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; @@ -45,6 +53,7 @@ switch (SelectedMenuItem) { +#ifdef __i386__ case 0: // Disk OptionMenuCustomBootDisk(); break; @@ -60,9 +69,11 @@ case 4: // Linux OptionMenuCustomBootLinux(); break; - } -} - +#endif /* __i386__ */ + } +} + +#ifdef __i386__ VOID OptionMenuCustomBootDisk(VOID) { CHAR SectionName[100]; @@ -397,3 +408,4 @@ LoadAndBootLinux(SectionName, "Custom Linux Setup"); } +#endif /* __i386__ */ Modified: branches/winldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/debug.c?rev=26874&r1=268… ============================================================================== --- branches/winldr/debug.c (original) +++ branches/winldr/debug.c Thu May 24 01:11:35 2007 @@ -38,7 +38,7 @@ #elif defined (DEBUG_REACTOS) ULONG DebugPrintMask = DPRINT_REACTOS | DPRINT_REGISTRY; #elif defined (DEBUG_CUSTOM) -ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | +ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | /*DPRINT_FILESYSTEM |*/ DPRINT_REACTOS | DPRINT_WINDOWS | DPRINT_HWDETECT; #else //#elif defined (DEBUG_NONE) ULONG DebugPrintMask = 0; Modified: branches/winldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/drivemap.c?rev=26874&r1=… ============================================================================== --- branches/winldr/drivemap.c (original) +++ branches/winldr/drivemap.c Thu May 24 01:11:35 2007 @@ -22,6 +22,7 @@ #define NDEBUG #include <debug.h> +#ifdef __i386__ BOOLEAN DriveMapInstalled = FALSE; // Tells us if we have already installed our drive map int 13h handler code ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler @@ -222,3 +223,4 @@ DriveMapInstalled = FALSE; } } +#endif /* __i386__ */ Modified: branches/winldr/include/drivemap.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/drivemap.h?rev=2… ============================================================================== --- branches/winldr/include/drivemap.h (original) +++ branches/winldr/include/drivemap.h Thu May 24 01:11:35 2007 @@ -20,7 +20,7 @@ #ifndef __DRIVEMAP_H #define __DRIVEMAP_H - +#ifdef __i386__ typedef struct { UCHAR DriveMapCount; // Count of drives currently mapped @@ -39,5 +39,6 @@ extern PVOID DriveMapInt13HandlerEnd; extern ULONG DriveMapOldInt13HandlerAddress; extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; +#endif /* __i386__ */ #endif // #defined __DRIVEMAP_H Modified: branches/winldr/include/linux.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/linux.h?rev=2687… ============================================================================== --- branches/winldr/include/linux.h (original) +++ branches/winldr/include/linux.h Thu May 24 01:11:35 2007 @@ -22,7 +22,7 @@ #ifndef __LINUX_H #define __LINUX_H - +#ifdef __i386__ #define LINUX_LOADER_TYPE_LILO 0x01 #define LINUX_LOADER_TYPE_LOADLIN 0x11 #define LINUX_LOADER_TYPE_BOOTSECT 0x21 @@ -135,5 +135,6 @@ BOOLEAN LinuxReadKernel(PFILE LinuxKernelFile); BOOLEAN LinuxCheckKernelVersion(VOID); BOOLEAN LinuxReadInitrd(PFILE LinuxInitrdFile); +#endif /* __i386__ */ #endif // defined __LINUX_H Modified: branches/winldr/include/miscboot.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/miscboot.h?rev=2… ============================================================================== --- branches/winldr/include/miscboot.h (original) +++ branches/winldr/include/miscboot.h Thu May 24 01:11:35 2007 @@ -20,8 +20,10 @@ #ifndef __BOOT_H #define __BOOT_H +#ifdef __i386__ VOID LoadAndBootBootSector(PCSTR OperatingSystemName); VOID LoadAndBootPartition(PCSTR OperatingSystemName); VOID LoadAndBootDrive(PCSTR OperatingSystemName); +#endif /* __i386__ */ #endif // defined __BOOT_H Modified: branches/winldr/include/options.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/options.h?rev=26… ============================================================================== --- branches/winldr/include/options.h (original) +++ branches/winldr/include/options.h Thu May 24 01:11:35 2007 @@ -25,10 +25,12 @@ VOID OptionMenuReboot(VOID); VOID OptionMenuCustomBoot(VOID); +#ifdef __i386__ VOID OptionMenuCustomBootDisk(VOID); VOID OptionMenuCustomBootPartition(VOID); VOID OptionMenuCustomBootBootSectorFile(VOID); VOID OptionMenuCustomBootReactOS(VOID); VOID OptionMenuCustomBootLinux(VOID); +#endif /* __i386__ */ #endif // #defined __OPTIONS_H Modified: branches/winldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/linuxboot.c?rev=26874&r1… ============================================================================== --- branches/winldr/linuxboot.c (original) +++ branches/winldr/linuxboot.c Thu May 24 01:11:35 2007 @@ -23,6 +23,7 @@ #define NDEBUG #include <debug.h> +#ifdef __i386__ #define LINUX_READ_CHUNK_SIZE 0x20000 // Read 128k at a time @@ -491,3 +492,4 @@ return TRUE; } +#endif /* __i386__ */ Modified: branches/winldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/miscboot.c?rev=26874&r1=… ============================================================================== --- branches/winldr/miscboot.c (original) +++ branches/winldr/miscboot.c Thu May 24 01:11:35 2007 @@ -19,6 +19,7 @@ #include <freeldr.h> +#ifdef __i386__ VOID LoadAndBootBootSector(PCSTR OperatingSystemName) { PFILE FilePointer; @@ -213,3 +214,4 @@ //DisableA20(); ChainLoadBiosBootSectorCode(); } +#endif /* __i386__ */

17 years, 7 months

[greatlrd] 26873: Fixing CreateDirectDraw crash

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 23 23:48:54 2007 New Revision: 26873 URL: http://svn.reactos.org/svn/reactos?rev=26873&view=rev Log: Fixing CreateDirectDraw crash Modified: trunk/reactos/dll/directx/ddraw/main.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Wed May 23 23:48:54 2007 @@ -33,23 +33,14 @@ DirectDrawCreate (LPGUID lpGUID, LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) -{ +{ /* remove this when UML digram are in place this api is finish and is working as it should */ + DX_WINDBG_trace(); - - - /* check see if pUnkOuter is null or not */ - if (pUnkOuter) - { - /* we are using same error code as MS*/ - return CLASS_E_NOAGGREGATION; - } - - /* Create our DirectDraw interface */ - return Create_DirectDraw (lpGUID, lplpDD, &IID_IDirectDraw7, FALSE); + return DirectDrawCreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw2, pUnkOuter); } /*

17 years, 7 months

[greatlrd] 26872: comment out GetDOURCC data from DDHALINFO for it seam some strang crash.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 23 23:27:29 2007 New Revision: 26872 URL: http://svn.reactos.org/svn/reactos?rev=26872&view=rev Log: comment out GetDOURCC data from DDHALINFO for it seam some strang crash. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Wed May 23 23:27:29 2007 @@ -472,7 +472,7 @@ } DX_STUB_str("Here\n"); - +#if 0 /* Alloc mpFourCC */ mpFourCC = NULL; if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 ) @@ -486,7 +486,9 @@ } } DX_STUB_str("Here\n"); - +#else + mpFourCC = NULL; +#endif /* Alloc mpTextures */ #if 0 mpTextures = NULL;

17 years, 7 months

[tkreuzer] 26871: - make fontview look closer to MS fontview, patch by roytam1, modified by me. - Create fonts only once - Remove possibility to get page height without drawing See issue #2260 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 23 04:25:31 2007 New Revision: 26871 URL: http://svn.reactos.org/svn/reactos?rev=26871&view=rev Log: - make fontview look closer to MS fontview, patch by roytam1, modified by me. - Create fonts only once - Remove possibility to get page height without drawing See issue #2260 for more details. Modified: trunk/rosapps/fontview/display.c trunk/rosapps/fontview/display.h trunk/rosapps/fontview/fontview.c trunk/rosapps/fontview/fontview.rc trunk/rosapps/fontview/lang/en-US.rc 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 Wed May 23 04:25:31 2007 @@ -34,10 +34,17 @@ /* Internal data storage type */ typedef struct { - int nHeight; + int nPageHeight; WCHAR szTypeFaceName[MAX_TYPEFACENAME]; WCHAR szFormat[MAX_FORMAT]; WCHAR szString[MAX_STRING]; + + HFONT hCaptionFont; + HFONT hCharSetFont; + HFONT hSizeFont; + HFONT hFonts[MAX_SIZES]; + int nSizes[MAX_SIZES]; + int nHeights[MAX_SIZES]; } DISPLAYDATA; /* This is the only public function, it registers the class */ @@ -69,9 +76,9 @@ } static int -Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos, BOOL bDraw) -{ - HFONT hOldFont, hFont, hFontNums; +Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos) +{ + HFONT hOldFont; TEXTMETRIC tm; int i, y; const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; @@ -81,65 +88,61 @@ /* This is the location on the DC where we draw */ y = -nYPos; - /* Draw font name */ - hFont = 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"); - hOldFont = SelectObject(hDC, hFont); - if (bDraw) + 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); - TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); - } + } + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + y += tm.tmHeight + SPACING1; + + /* Draw a seperation Line */ + SelectObject(hDC, GetStockObject(BLACK_PEN)); + MoveToEx(hDC, 0, y, NULL); + LineTo(hDC, 10000, y); + y += SPACING2; + + /* TODO: Output font info */ + + /* Output Character set */ + hOldFont = SelectObject(hDC, pData->hCharSetFont); GetTextMetrics(hDC, &tm); - y += tm.tmHeight + SPACING1; + swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz"); + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + y += tm.tmHeight + 1; + + swprintf(szCaption, L"ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + y += tm.tmHeight + 1; + + swprintf(szCaption, L"0123456789.:,;(\"~!@#$%^&*')"); + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + y += tm.tmHeight + 1; + + /* Draw a seperation Line */ + SelectObject(hDC, GetStockObject(BLACK_PEN)); + MoveToEx(hDC, 0, y, NULL); + LineTo(hDC, 10000, y); + y += SPACING2; + + /* Output the strings for different sizes */ + for (i = 0; i < MAX_SIZES; i++) + { + SelectObject(hDC, pData->hFonts[i]); + TextOutW(hDC, 20, y, pData->szString, wcslen(pData->szString)); + GetTextMetrics(hDC, &tm); + y += tm.tmHeight + 1; + SelectObject(hDC, pData->hSizeFont); + swprintf(szSize, L"%d", nSizes[i]); + TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, wcslen(szSize)); + } SelectObject(hDC, hOldFont); - DeleteObject(hFont); - - /* Draw a seperation Line */ - if (bDraw) - { - SelectObject(hDC, GetStockObject(BLACK_PEN)); - MoveToEx(hDC, 0, y, NULL); - LineTo(hDC, 10000, y); - } - y += SPACING2; - - /* Output font info */ - hFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); - hOldFont = SelectObject(hDC, hFont); - SelectObject(hDC, hOldFont); - DeleteObject(hFont); - - /* Outout the lines for different sizes */ - hFontNums = 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"); - - for (i = 0; i < 7; i++) - { - hOldFont = SelectObject(hDC, hFontNums); - if (bDraw) - { - swprintf(szSize, L"%d", nSizes[i]); - TextOutW(hDC, 0, y, szSize, wcslen(szSize)); - } - hFont = CreateFontW(nSizes[i], 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); - SelectObject(hDC, hFont); - if (bDraw) - { - TextOutW(hDC, 20, y, pData->szString, wcslen(pData->szString)); - } - GetTextMetrics(hDC, &tm); - y += tm.tmHeight + 2; - SelectObject(hDC, hOldFont); - DeleteObject(hFont); - } - DeleteObject(hFontNums); return y; } @@ -148,13 +151,28 @@ Display_OnCreate(HWND hwnd) { DISPLAYDATA* pData; + const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; + int i; /* Initialize data structure */ pData = malloc(sizeof(DISPLAYDATA)); - pData->nHeight = 0; + 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"); /* Set the window's GWLP_USERDATA to our data structure */ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pData); @@ -182,7 +200,7 @@ FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); /* Draw the text */ - Display_DrawText(ps.hdc, pData, si.nPos, TRUE); + Display_DrawText(ps.hdc, pData, si.nPos); EndPaint(hwnd, &ps); @@ -267,6 +285,7 @@ SetScrollInfo(hwnd, SB_VERT, &si, TRUE); UpdateWindow(hwnd); } + return 0; } @@ -274,17 +293,42 @@ 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 */ - hDC = GetDC(hwnd); - pData->nHeight = Display_DrawText(hDC, pData, 0, FALSE); + pData->nPageHeight = Display_DrawText(hDC, pData, 0); ReleaseDC(hwnd, hDC); /* Set the vertical scrolling range and page size */ @@ -292,7 +336,7 @@ si.cbSize = sizeof(si); si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; si.nMin = 0; - si.nMax = pData->nHeight; + si.nMax = pData->nPageHeight; si.nPage = rect.bottom; si.nPos = 0; si.nTrackPos = 0; @@ -318,9 +362,21 @@ Display_OnDestroy(HWND hwnd) { DISPLAYDATA* pData; + int i; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + /* Delete the fonts */ + DeleteObject(pData->hCaptionFont); + DeleteObject(pData->hCharSetFont); + DeleteObject(pData->hSizeFont); + + for (i = 0; i < MAX_SIZES; i++) + { + DeleteObject(pData->hFonts[i]); + } /* Free the data structure */ - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); free(pData); return 0; @@ -353,7 +409,7 @@ return Display_OnDestroy(hwnd); default: - return DefWindowProc (hwnd, message, wParam, lParam); + return DefWindowProcW(hwnd, message, wParam, lParam); } return 0; Modified: trunk/rosapps/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.h?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.h (original) +++ trunk/rosapps/fontview/display.h Wed May 23 04:25:31 2007 @@ -10,6 +10,8 @@ #define MAX_TYPEFACENAME 32 #define MAX_FORMAT 20 +#define MAX_SIZES 7 + extern const WCHAR g_szFontDisplayClassName[]; /* Public function */ 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 Wed May 23 04:25:31 2007 @@ -23,7 +23,6 @@ #include "fontview.h" HINSTANCE g_hInstance; -WCHAR g_szTitle[MAX_LOADSTRING]; WCHAR g_szTypeFaceName[MAX_TYPEFACENAME]; static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; @@ -130,7 +129,7 @@ } /* The main window class */ - wincl.cbSize = sizeof (WNDCLASSEX); + wincl.cbSize = sizeof (WNDCLASSEXW); wincl.style = CS_DBLCLKS; wincl.lpfnWndProc = MainWndProc; wincl.cbClsExtra = 0; @@ -154,7 +153,7 @@ hMainWnd = CreateWindowExW( 0, /* Extended possibilites for variation */ g_szFontViewClassName, /* Classname */ - g_szTitle, /* Title Text */ + g_szTypeFaceName, /* Title Text */ WS_OVERLAPPEDWINDOW, /* default window */ CW_USEDEFAULT, /* Windows decides the position */ CW_USEDEFAULT, /* where the window ends up on the screen */ @@ -165,7 +164,7 @@ hThisInstance, /* Program Instance handler */ NULL /* No Window Creation data */ ); - ShowWindow (hMainWnd, nCmdShow); + ShowWindow(hMainWnd, nCmdShow); /* Main message loop */ while (GetMessage (&msg, NULL, 0, 0)) @@ -203,11 +202,11 @@ NULL /* Window Creation data */ ); - /* Init the display window wit the font name */ + /* Init the display window with the font name */ LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING); - SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)g_szTypeFaceName); + /* Create the quit button */ LoadStringW(g_hInstance, IDS_QUIT, szQuit, MAX_BUTTONNAME); hButtonQuit = CreateWindowExW( @@ -307,7 +306,7 @@ break; default: /* for messages that we don't deal with */ - return DefWindowProc (hwnd, message, wParam, lParam); + return DefWindowProcW(hwnd, message, wParam, lParam); } return 0; Modified: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=2… ============================================================================== --- trunk/rosapps/fontview/fontview.rc (original) +++ trunk/rosapps/fontview/fontview.rc Wed May 23 04:25:31 2007 @@ -1,5 +1,6 @@ +#include "lang/en-US.rc" #include "lang/de-DE.rc" STRINGTABLE DISCARDABLE Modified: trunk/rosapps/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/en-US.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/en-US.rc (original) +++ trunk/rosapps/fontview/lang/en-US.rc Wed May 23 04:25:31 2007 @@ -2,13 +2,13 @@ #include "windows.h" #include "../resource.h" -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE { IDS_QUIT, "Quit" IDS_PRINT, "Print" - IDS_STRING, "Jackdaws love my big sphinx of quartz. 123456890" + IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" IDS_ERROR, "Error" IDS_ERROR_NOMEM, "There's not enough memory to complete the operation." IDS_ERROR_NOFONT, "The file %1 ist not a valid font file." @@ -16,3 +16,4 @@ IDS_ERROR_BADCMD, "No font file given.\nSyntax:\n fontview.exe <font file>" } +

17 years, 7 months

[gedmurphy] 26870: re-enable ACPI

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue May 22 23:33:20 2007 New Revision: 26870 URL: http://svn.reactos.org/svn/reactos?rev=26870&view=rev Log: re-enable ACPI 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 Tue May 22 23:33:20 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,8 +3083,6 @@ 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"); @@ -3216,7 +3214,6 @@ if (hDeviceKey) ZwClose(hDeviceKey); return ret; -#endif } static NTSTATUS INIT_FUNCTION

17 years, 7 months

[mbosma] 26869: Fix two oversights in GetDisplayMode.

by mbosma＠svn.reactos.org

Author: mbosma Date: Tue May 22 23:30:25 2007 New Revision: 26869 URL: http://svn.reactos.org/svn/reactos?rev=26869&view=rev Log: Fix two oversights in GetDisplayMode. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Tue May 22 23:30:25 2007 @@ -182,14 +182,14 @@ if (pDDSD == NULL) return DDERR_INVALIDPARAMS; - if (pDDSD->dwSize != sizeof(LPDDSURFACEDESC2)) + if (pDDSD->dwSize != sizeof(DDSURFACEDESC2)) return DDERR_INVALIDPARAMS; // FIXME: More stucture members might need to be filled pDDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; - pDDSD->dwHeight = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; - pDDSD->dwWidth = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; + pDDSD->dwHeight = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; + pDDSD->dwWidth = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; pDDSD->ddpfPixelFormat = This->lpLcl->lpGbl->vmiData.ddpfDisplay; pDDSD->dwRefreshRate = This->lpLcl->lpGbl->dwMonitorFrequency; pDDSD->lPitch = This->lpLcl->lpGbl->vmiData.lDisplayPitch;

17 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007