Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[hbelusca] 64852: [NTVDM]: Now that HLT is implemented, use it in the INT32 handlers.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 20 19:45:37 2014 New Revision: 64852 URL: http://svn.reactos.org/svn/reactos?rev=64852&view=rev Log: [NTVDM]: Now that HLT is implemented, use it in the INT32 handlers. Modified: trunk/reactos/subsystems/ntvdm/int32.c Modified: trunk/reactos/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/int32.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/int32.c [iso-8859-1] Mon Oct 20 19:45:37 2014 @@ -49,8 +49,7 @@ 0xFB, // sti - // HACK: The following instruction should be HLT! - 0x90, // nop + 0xF4, // hlt 0xEB, 0xF5, // jmp BOP_SEQ (offset -11)

9 years, 11 months

[hbelusca] 64851: [FAST486] - Control register 0 is CR0: use FAST486_REG_CR0 instead of 0, as it is done in the rest of the code. - Improve a if/else if control. - Don't halt the processor in the m...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 20 19:42:52 2014 New Revision: 64851 URL: http://svn.reactos.org/svn/reactos?rev=64851&view=rev Log: [FAST486] - Control register 0 is CR0: use FAST486_REG_CR0 instead of 0, as it is done in the rest of the code. - Improve a if/else if control. - Don't halt the processor in the middle of prefixes processing. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/debug.c trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Mon Oct 20 19:42:52 2014 @@ -55,7 +55,7 @@ } /* Check for protected mode */ - if (State->ControlRegisters[0] & FAST486_CR0_PE) + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) { /* Privilege checks */ @@ -122,7 +122,7 @@ } /* Check for protected mode */ - if (State->ControlRegisters[0] & FAST486_CR0_PE) + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) { /* Privilege checks */ Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Mon Oct 20 19:42:52 2014 @@ -762,7 +762,7 @@ ModRegRm->Register = (ModRmByte >> 3) & 0x07; /* Check the mode */ - if ((ModRmByte >> 6) == 3) + if (Mode == 3) { /* The second operand is also a register */ ModRegRm->Memory = FALSE; @@ -886,7 +886,6 @@ /* [BX + SI] */ ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBX].LowWord + State->GeneralRegs[FAST486_REG_ESI].LowWord; - break; } @@ -895,7 +894,6 @@ /* [BX + DI] */ ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBX].LowWord + State->GeneralRegs[FAST486_REG_EDI].LowWord; - break; } @@ -904,7 +902,6 @@ /* SS:[BP + SI] */ ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBP].LowWord + State->GeneralRegs[FAST486_REG_ESI].LowWord; - break; } @@ -913,7 +910,6 @@ /* SS:[BP + DI] */ ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBP].LowWord + State->GeneralRegs[FAST486_REG_EDI].LowWord; - break; } @@ -921,7 +917,6 @@ { /* [SI] */ ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_ESI].LowWord; - break; } @@ -929,7 +924,6 @@ { /* [DI] */ ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EDI].LowWord; - break; } @@ -953,7 +947,6 @@ { /* [BX] */ ModRegRm->MemoryAddress = State->GeneralRegs[FAST486_REG_EBX].LowWord; - break; } } Modified: trunk/reactos/lib/fast486/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/debug.c?rev=64… ============================================================================== --- trunk/reactos/lib/fast486/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/debug.c [iso-8859-1] Mon Oct 20 19:42:52 2014 @@ -137,7 +137,7 @@ { DbgPrint("\nFast486DumpState -->\n"); DbgPrint("\nCPU currently executing in %s mode at %04X:%08X\n", - (State->ControlRegisters[0] & FAST486_CR0_PE) ? "protected" : "real", + (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) ? "protected" : "real", State->SegmentRegs[FAST486_REG_CS].Selector, State->InstPtr.Long); DbgPrint("\nGeneral purpose registers:\n" Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Mon Oct 20 19:42:52 2014 @@ -54,9 +54,9 @@ /* Main execution loop */ do { + if (!State->Halted) + { NextInst: - if (!State->Halted) - { /* Check if this is a new instruction */ if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Mon Oct 20 19:42:52 2014 @@ -4985,8 +4985,7 @@ /* Additional rule for LOOPNZ */ if (State->Flags.Zf) Condition = FALSE; } - - if (Opcode == 0xE1) + else if (Opcode == 0xE1) { /* Additional rule for LOOPZ */ if (!State->Flags.Zf) Condition = FALSE;

9 years, 11 months

[akhaldi] 64850: [STRMBASE] * Zap TransformFilter_Vtbl. Already accepted upstream.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 20 17:38:06 2014 New Revision: 64850 URL: http://svn.reactos.org/svn/reactos?rev=64850&view=rev Log: [STRMBASE] * Zap TransformFilter_Vtbl. Already accepted upstream. Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] Mon Oct 20 17:38:06 2014 @@ -24,7 +24,6 @@ static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; -static const IBaseFilterVtbl TransformFilter_Vtbl; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; @@ -420,25 +419,6 @@ return E_NOTIMPL; } - -static const IBaseFilterVtbl TransformFilter_Vtbl = -{ - TransformFilterImpl_QueryInterface, - BaseFilterImpl_AddRef, - TransformFilterImpl_Release, - BaseFilterImpl_GetClassID, - TransformFilterImpl_Stop, - TransformFilterImpl_Pause, - TransformFilterImpl_Run, - BaseFilterImpl_GetState, - BaseFilterImpl_SetSyncSource, - BaseFilterImpl_GetSyncSource, - BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, - BaseFilterImpl_QueryFilterInfo, - BaseFilterImpl_JoinFilterGraph, - BaseFilterImpl_QueryVendorInfo -}; static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) {

9 years, 11 months

[akhaldi] 64849: [CMAKE] * Use the x86 toolchain for host tools if the targeting platform is ARM. Brought to you by Yuntian Zhang. CORE-7407 #resolve #comment Committed in r64849. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 20 17:35:22 2014 New Revision: 64849 URL: http://svn.reactos.org/svn/reactos?rev=64849&view=rev Log: [CMAKE] * Use the x86 toolchain for host tools if the targeting platform is ARM. Brought to you by Yuntian Zhang. CORE-7407 #resolve #comment Committed in r64849. Thanks! Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=64849&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Mon Oct 20 17:35:22 2014 @@ -77,6 +77,7 @@ set CMAKE_GENERATOR="Visual Studio 11 Win64" ) else if "!ARCH!" == "arm" ( set CMAKE_GENERATOR="Visual Studio 11 ARM" + set CMAKE_GENERATOR_HOST="Visual Studio 11" ) else ( set CMAKE_GENERATOR="Visual Studio 11" ) @@ -85,6 +86,7 @@ set CMAKE_GENERATOR="Visual Studio 12 Win64" ) else if "!ARCH!" == "arm" ( set CMAKE_GENERATOR="Visual Studio 12 ARM" + set CMAKE_GENERATOR_HOST="Visual Studio 12" ) else ( set CMAKE_GENERATOR="Visual Studio 12" ) @@ -116,6 +118,9 @@ ) else ( set CMAKE_GENERATOR="Ninja" ) + if "!ARCH!" == "arm" ( + set CMAKE_GENERATOR_HOST=!CMAKE_GENERATOR! + ) ) :: Create directories @@ -146,7 +151,7 @@ :: Use x86 for ARM host tools if "%ARCH%" == "arm" ( :: Launch new script instance for x86 host tools configuration - start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR% + start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR_HOST% ) else ( cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%" )

9 years, 11 months

[zguo] 64848: [TCPIP] Merge in Jerome's fix for Firefox crash. CORE-8648

by zguo＠svn.reactos.org

Author: zguo Date: Mon Oct 20 15:59:52 2014 New Revision: 64848 URL: http://svn.reactos.org/svn/reactos?rev=64848&view=rev Log: [TCPIP] Merge in Jerome's fix for Firefox crash. CORE-8648 Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/lib/drivers/ip/transport/tcp/tcp.c Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 20 15:59:52 2014 @@ -18,3 +18,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 +/trunk/reactos:64769 Modified: branches/0.3.17/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/lib/drivers/ip/t… ============================================================================== --- branches/0.3.17/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Oct 20 15:59:52 2014 @@ -679,8 +679,12 @@ PCONNECTION_ENDPOINT Connection, BOOLEAN Set) { + if (!Connection) + return STATUS_UNSUCCESSFUL; + if (Connection->SocketContext == NULL) return STATUS_UNSUCCESSFUL; + LibTCPSetNoDelay(Connection->SocketContext, Set); return STATUS_SUCCESS; }

9 years, 11 months

[khornicek] 64847: [WIN32K] - add a missing break and reshuffle the code a tiny bit to fix CIDs 514466 and 513487 - don't skip the terminating debug print for ft_glyph_format_bitmap

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Oct 20 14:26:47 2014 New Revision: 64847 URL: http://svn.reactos.org/svn/reactos?rev=64847&view=rev Log: [WIN32K] - add a missing break and reshuffle the code a tiny bit to fix CIDs 514466 and 513487 - don't skip the terminating debug print for ft_glyph_format_bitmap Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon Oct 20 14:26:47 2014 @@ -2083,7 +2083,7 @@ src += ft_face->glyph->bitmap.pitch; dst += pitch; } - return needed; + break; } case ft_glyph_format_outline: { @@ -2113,22 +2113,24 @@ { return GDI_ERROR; } + + start = pvBuf; + for (row = 0; row < height; row++) + { + ptr = start; + for (col = 0; col < width; col++, ptr++) + { + *ptr = (((int)*ptr) * mult + 128) / 256; + } + start += pitch; + } + + break; } default: DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format); return GDI_ERROR; } - start = pvBuf; - for (row = 0; row < height; row++) - { - ptr = start; - for (col = 0; col < width; col++, ptr++) - { - *ptr = (((int)*ptr) * mult + 128) / 256; - } - start += pitch; - } - break; } case GGO_NATIVE:

9 years, 11 months

[cwittich] 64846: [devmgr] don't free stack memory with LocalFree CID 1101901

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Oct 20 13:32:33 2014 New Revision: 64846 URL: http://svn.reactos.org/svn/reactos?rev=64846&view=rev Log: [devmgr] don't free stack memory with LocalFree CID 1101901 Modified: trunk/reactos/dll/win32/devmgr/devprblm.c Modified: trunk/reactos/dll/win32/devmgr/devprblm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devprblm.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] Mon Oct 20 13:32:33 2014 @@ -586,7 +586,6 @@ &szProblem, szInfo, uProblemId); - LocalFree((HLOCAL)szInfo); } else {

9 years, 11 months

[khornicek] 64845: [SETUPAPI] - actually use the icon source we get from registry instead of loading all icons from setupapi itself CORE-8614

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Oct 20 13:08:42 2014 New Revision: 64845 URL: http://svn.reactos.org/svn/reactos?rev=64845&view=rev Log: [SETUPAPI] - actually use the icon source we get from registry instead of loading all icons from setupapi itself CORE-8614 Modified: trunk/reactos/dll/win32/setupapi/devclass.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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Mon Oct 20 13:08:42 2014 @@ -22,6 +22,7 @@ #include "setupapi_private.h" #include <wingdi.h> +#include <shellapi.h> /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; @@ -76,6 +77,7 @@ }; #undef ADD_PARAM_HANDLER +#define UNKNOWN_ICON_INDEX 18 /*********************************************************************** * SetupDiDestroyClassImageList(SETUPAPI.@) @@ -330,9 +332,6 @@ return rc; } -/*********************************************************************** - * SetupDiGetClassImageIndex (SETUPAPI.@) - */ static BOOL SETUP_GetIconIndex( IN HKEY hClassKey, @@ -378,6 +377,9 @@ return ret; } +/*********************************************************************** + * SetupDiGetClassImageIndex (SETUPAPI.@) + */ BOOL WINAPI SetupDiGetClassImageIndex( IN PSP_CLASSIMAGELIST_DATA ClassImageListData, @@ -457,6 +459,102 @@ return ret; } + +static BOOL WINAPI +SETUP_GetClassIconInfo(IN CONST GUID *ClassGuid, OUT PINT OutIndex, OUT LPWSTR *OutDllName) +{ + LPWSTR Buffer = NULL; + INT iconIndex = -UNKNOWN_ICON_INDEX; + HKEY hKey = INVALID_HANDLE_VALUE; + BOOL ret = FALSE; + + if (ClassGuid) + { + hKey = SetupDiOpenClassRegKey(ClassGuid, KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + SETUP_GetIconIndex(hKey, &iconIndex); + } + } + + if (iconIndex > 0) + { + /* Look up icon in dll specified by Installer32 or EnumPropPages32 key */ + PWCHAR Comma; + LONG rc; + DWORD dwRegType, dwLength; + rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) + { + Buffer = MyMalloc(dwLength + sizeof(WCHAR)); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + /* make sure the returned buffer is NULL-terminated */ + Buffer[dwLength / sizeof(WCHAR)] = 0; + } + else if + (ERROR_SUCCESS == (rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, &dwRegType, NULL, &dwLength)) + && dwRegType == REG_SZ) + { + Buffer = MyMalloc(dwLength + sizeof(WCHAR)); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + /* make sure the returned buffer is NULL-terminated */ + Buffer[dwLength / sizeof(WCHAR)] = 0; + } + else + { + /* Unable to find where to load the icon */ + SetLastError(ERROR_FILE_NOT_FOUND); + goto cleanup; + } + Comma = strchrW(Buffer, ','); + if (!Comma) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + *Comma = '\0'; + *OutDllName = Buffer; + } + else + { + /* Look up icon in setupapi.dll */ + iconIndex = -iconIndex; + *OutDllName = NULL; + } + + *OutIndex = iconIndex; + ret = TRUE; + + TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(*OutDllName ? *OutDllName : SetupapiDll)); + +cleanup: + + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + + return ret; +} + /*********************************************************************** * SetupDiGetClassImageListExW(SETUPAPI.@) @@ -570,24 +668,32 @@ for (i = 0; i < list->NumberOfGuids; i++) { INT miniIconIndex; - - ret = SetupDiLoadClassIcon( - &list->Guids[i], - NULL, - &miniIconIndex); - if (ret) - { - hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - if (hIcon) + LPWSTR DllName = NULL; + + if (SETUP_GetClassIconInfo(&list->Guids[i], &miniIconIndex, &DllName)) + { + if (DllName && ExtractIconExW(DllName, -miniIconIndex, NULL, &hIcon, 1) == 1) { list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + } + else if(!DllName) + { + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + } + + if(hIcon) DestroyIcon(hIcon); - } else list->IconIndexes[i] = -1; + + if(DllName) + MyFree(DllName); } else + { list->IconIndexes[i] = -1; /* Special value to indicate that the icon is unavailable */ + } } /* Finally, add the overlay icons to the image list */ @@ -660,105 +766,43 @@ OUT HICON *LargeIcon OPTIONAL, OUT PINT MiniIconIndex OPTIONAL) { - LPWSTR Buffer = NULL; - LPCWSTR DllName; - INT iconIndex = -18; - HKEY hKey = INVALID_HANDLE_VALUE; - + INT iconIndex = 0; + LPWSTR DllName = NULL; BOOL ret = FALSE; - - if (ClassGuid) - { - hKey = SetupDiOpenClassRegKey(ClassGuid, KEY_QUERY_VALUE); - if (hKey != INVALID_HANDLE_VALUE) - SETUP_GetIconIndex(hKey, &iconIndex); - } - - if (iconIndex > 0) - { - /* Look up icon in dll specified by Installer32 or EnumPropPages32 key */ - PWCHAR Comma; - LONG rc; - DWORD dwRegType, dwLength; - rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, &dwRegType, NULL, &dwLength); - if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) - { - Buffer = MyMalloc(dwLength + sizeof(WCHAR)); - if (Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - /* make sure the returned buffer is NULL-terminated */ - Buffer[dwLength / sizeof(WCHAR)] = 0; - } - else if - (ERROR_SUCCESS == (rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, &dwRegType, NULL, &dwLength)) - && dwRegType == REG_SZ) - { - Buffer = MyMalloc(dwLength + sizeof(WCHAR)); - if (Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - /* make sure the returned buffer is NULL-terminated */ - Buffer[dwLength / sizeof(WCHAR)] = 0; + HICON hIcon = NULL; + + if (LargeIcon) + { + if(!SETUP_GetClassIconInfo(ClassGuid, &iconIndex, &DllName)) + return FALSE; + + if (DllName && ExtractIconExW(DllName, -iconIndex, &hIcon, NULL, 1) == 1 && hIcon != NULL) + { + ret = TRUE; } else { - /* Unable to find where to load the icon */ - SetLastError(ERROR_FILE_NOT_FOUND); - goto cleanup; - } - Comma = strchrW(Buffer, ','); - if (!Comma) - { - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - *Comma = '\0'; - DllName = Buffer; - } - else - { - /* Look up icon in setupapi.dll */ - DllName = SetupapiDll; - iconIndex = -iconIndex; - } - - TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(DllName)); - if (LargeIcon) - { - *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); - if (!*LargeIcon) - { - SetLastError(ERROR_INVALID_INDEX); - goto cleanup; - } - } + /* load the default unknown device icon if ExtractIcon failed */ + if(DllName) + iconIndex = UNKNOWN_ICON_INDEX; + + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + + if(!LargeIcon) + goto cleanup; + } + } + if (MiniIconIndex) *MiniIconIndex = iconIndex; + ret = TRUE; + *LargeIcon = hIcon; cleanup: - if (hKey != INVALID_HANDLE_VALUE) - RegCloseKey(hKey); - - if (Buffer != NULL) - MyFree(Buffer); + + if(DllName) + MyFree(DllName); TRACE("Returning %d\n", ret); return ret;

9 years, 11 months

[cwittich] 64844: [explorer] DragQueryFile expects size in characters

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Oct 20 10:05:30 2014 New Revision: 64844 URL: http://svn.reactos.org/svn/reactos?rev=64844&view=rev Log: [explorer] DragQueryFile expects size in characters Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] Mon Oct 20 10:05:30 2014 @@ -110,7 +110,7 @@ UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0); for(UINT i=0; i<cFiles; ++i) { - DragQueryFile(hDrop, i, szFileName, sizeof(szFileName)); + DragQueryFile(hDrop, i, szFileName, sizeof(szFileName) / sizeof(szFileName[0])); if (DROPEFFECT_COPY & *pdwEffect) { // copy the file or dir

9 years, 11 months

[tfaber] 64843: [FASTFAT] - Move FCB list removal to vfatDelFCBFromTable, since vfatAddFCBToTable does the insert. Fixes list corruption in vfatUpdateFCB.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 20 09:31:50 2014 New Revision: 64843 URL: http://svn.reactos.org/svn/reactos?rev=64843&view=rev Log: [FASTFAT] - Move FCB list removal to vfatDelFCBFromTable, since vfatAddFCBToTable does the insert. Fixes list corruption in vfatUpdateFCB. Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Mon Oct 20 09:31:50 2014 @@ -199,6 +199,8 @@ } entry->next = pFCB->Hash.next; } + + RemoveEntryList(&pFCB->FcbListEntry); } static @@ -302,7 +304,6 @@ { ASSERT(pFCB->OpenHandleCount == 0); tmpFcb = pFCB->parentFcb; - RemoveEntryList (&pFCB->FcbListEntry); vfatDelFCBFromTable(pVCB, pFCB); vfatDestroyFCB(pFCB); }

9 years, 11 months

← Newer
1
...
29
30
31
32
33
34
35
...
73
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 October 2014