Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 44651: [paint] Andrew Faulds <ajfweb AT googlemail DOT com>: Add support for deletion of rectangular selections See issue #5043 for more details.
by gschneider＠svn.reactos.org 18 Dec '09

18 Dec '09

Author: gschneider Date: Fri Dec 18 21:33:22 2009 New Revision: 44651 URL: http://svn.reactos.org/svn/reactos?rev=44651&view=rev Log: [paint] Andrew Faulds <ajfweb AT googlemail DOT com>: Add support for deletion of rectangular selections See issue #5043 for more details. Modified: trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Fri Dec 18 21:33:22 2009 @@ -711,8 +711,21 @@ CloseClipboard(); break; case IDM_EDITDELETESELECTION: + { + /* FIXME: deleting freeform selections unsupported */ + RECT selectionRect, areaRect; + long x1, x2, y1, y2; + + GetWindowRect(hSelection, &selectionRect); + GetWindowRect(hImageArea, &areaRect); + x1 = ((selectionRect.left - areaRect.left) / (zoom / 1000)) + 1; + y1 = ((selectionRect.top - areaRect.top) / (zoom / 1000)) + 1; + x2 = (selectionRect.right - areaRect.left) / (zoom / 1000); + y2 = (selectionRect.bottom - areaRect.top) / (zoom / 1000); + Rect(hDrawingDC, x1, y1, x2, y2, bgColor, bgColor, 0, TRUE); ShowWindow(hSelection, SW_HIDE); break; + } case IDM_EDITSELECTALL: if (activeTool == 2) {

1 0

[gschneider] 44650: [kernel32] Viliam Lejcik (lejcik AT gmail DOT com>: Various locale fixes (missing checks, wrong or no errors set etc.) See issue #4898 for more details.
by gschneider＠svn.reactos.org 18 Dec '09

18 Dec '09

Author: gschneider Date: Fri Dec 18 20:54:43 2009 New Revision: 44650 URL: http://svn.reactos.org/svn/reactos?rev=44650&view=rev Log: [kernel32] Viliam Lejcik (lejcik AT gmail DOT com>: Various locale fixes (missing checks, wrong or no errors set etc.) See issue #4898 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Fri Dec 18 20:54:43 2009 @@ -219,8 +219,7 @@ break; default: - // FIXME: Unknown date format - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_FLAGS); return FALSE; } return TRUE; @@ -288,8 +287,7 @@ break; default: - // FIXME: Unknown date format - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_FLAGS); return FALSE; } return TRUE; @@ -334,7 +332,10 @@ InitializeObjectAttributes(&attr, &keyName, OBJ_CASE_INSENSITIVE, hRootKey, NULL); if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) != STATUS_SUCCESS) + { + SetLastError( ERROR_BADDB ); hkey = 0; + } return hkey; } @@ -2397,6 +2398,8 @@ case LGRPID_SUPPORTED: hKey = NLS_RegOpenKey( 0, szLangGroupsKeyName ); + if (!hKey) + break; swprintf( szValueName, szFormat, LanguageGroup ); @@ -2408,10 +2411,13 @@ bInstalled = TRUE; } - if (hKey) - NtClose( hKey ); + NtClose( hKey ); break; + + default: + DPRINT("Invalid flags: %lx\n", dwFlags); + return FALSE; } if ((dwFlags == LGRPID_SUPPORTED && bSupported) || @@ -2440,7 +2446,7 @@ */ BOOL WINAPI IsValidLocale(LCID Locale, - DWORD dwFlags) + DWORD dwFlags) { OBJECT_ATTRIBUTES ObjectAttributes; PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; @@ -2452,6 +2458,7 @@ HANDLE KeyHandle; PWSTR ValueData; NTSTATUS Status; + BOOL Installed = FALSE; DPRINT("IsValidLocale() called\n"); @@ -2485,6 +2492,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + SetLastError(ERROR_BADDB); return FALSE; } @@ -2526,19 +2534,30 @@ ValueData = (PWSTR)&KeyInfo->Data[0]; if ((KeyInfo->Type == REG_SZ) && - (KeyInfo->DataLength == 2 * sizeof(WCHAR)) && - (ValueData[0] == L'1')) - { - DPRINT("Locale is supported and installed\n"); - RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); - return TRUE; + (KeyInfo->DataLength == 2 * sizeof(WCHAR))) + { + /* Find out if there is support for the language group + * installed, to which this language belongs */ + KeyHandle = NLS_RegOpenKey(0, szLangGroupsKeyName); + if (KeyHandle) + { + WCHAR Value[2]; + if (NLS_RegGetDword(KeyHandle, ValueData, (LPDWORD) Value) && + Value[0] == L'1') + { + Installed = TRUE; + DPRINT("Locale is supported and installed\n"); + } + + NtClose(KeyHandle); + } } RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); DPRINT("IsValidLocale() called\n"); - return FALSE; + return Installed; } /* Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Fri Dec 18 20:54:43 2009 @@ -109,7 +109,7 @@ } /************************************************************************** - * NLS_isSystemLocale <internal> + * NLS_getDefaultLocale <internal> * * Return default system or user locale */ @@ -1023,7 +1023,7 @@ { lcid = NLS_getDefaultLocale(lcid); } - else if(!IsValidLocale(lcid, 0)) + else if(!IsValidLocale(lcid, LCID_INSTALLED)) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -1403,8 +1403,17 @@ lpCurrencyStr, cchOut); + if(NLS_isSystemLocale(lcid)) + { + lcid = NLS_getDefaultLocale(lcid); + } + else if(!IsValidLocale(lcid, LCID_INSTALLED)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || - !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep || !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || lpFormat->PositiveOrder > 3)))

1 0

[janderwald] 44648: [MMIXER_TEST - Add support for Opening/Querying/Closing registry keys within the mmixer library
by janderwald＠svn.reactos.org 18 Dec '09

18 Dec '09

Author: janderwald Date: Fri Dec 18 11:42:57 2009 New Revision: 44648 URL: http://svn.reactos.org/svn/reactos?rev=44648&view=rev Log: [MMIXER_TEST - Add support for Opening/Querying/Closing registry keys within the mmixer library Modified: trunk/rostests/tests/mmixer_test/test.c Modified: trunk/rostests/tests/mmixer_test/test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/test.c?… ============================================================================== --- trunk/rostests/tests/mmixer_test/test.c [iso-8859-1] (original) +++ trunk/rostests/tests/mmixer_test/test.c [iso-8859-1] Fri Dec 18 11:42:57 2009 @@ -142,13 +142,15 @@ IN PVOID EnumContext, IN ULONG DeviceIndex, OUT LPWSTR * DeviceName, - OUT PHANDLE OutHandle) + OUT PHANDLE OutHandle, + OUT PHANDLE OutKey) { SP_DEVICE_INTERFACE_DATA InterfaceData; SP_DEVINFO_DATA DeviceData; PSP_DEVICE_INTERFACE_DETAIL_DATA_W DetailData; BOOL Result; DWORD Length; + MIXER_STATUS Status; //printf("Enum EnumContext %p DeviceIndex %lu OutHandle %p\n", EnumContext, DeviceIndex, OutHandle); @@ -193,9 +195,80 @@ return MM_STATUS_UNSUCCESSFUL; } - // copy path - *DeviceName = (LPWSTR)&DetailData->DevicePath[0]; - return Open(DetailData->DevicePath, OutHandle); + + *OutKey = SetupDiOpenDeviceInterfaceRegKey(EnumContext, &InterfaceData, 0, KEY_READ); + if ((HKEY)*OutKey == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, DetailData); + return MM_STATUS_UNSUCCESSFUL; + } + + Status = Open(DetailData->DevicePath, OutHandle); + + if (Status != MM_STATUS_SUCCESS) + { + RegCloseKey((HKEY)*OutKey); + HeapFree(GetProcessHeap(), 0, DetailData); + return Status; + } + + *DeviceName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(DetailData->DevicePath)+1) * sizeof(WCHAR)); + if (*DeviceName == NULL) + { + CloseHandle(*OutHandle); + RegCloseKey((HKEY)*OutKey); + HeapFree(GetProcessHeap(), 0, DetailData); + return MM_STATUS_NO_MEMORY; + } + + wcscpy(*DeviceName, DetailData->DevicePath); + HeapFree(GetProcessHeap(), 0, DetailData); + + return Status; +} + +MIXER_STATUS +QueryKeyValue( + IN HANDLE hKey, + IN LPWSTR KeyName, + OUT PVOID * ResultBuffer, + OUT PULONG ResultLength, + OUT PULONG KeyType) +{ + if (RegQueryValueExW((HKEY)hKey, KeyName, NULL, KeyType, NULL, ResultLength) == ERROR_FILE_NOT_FOUND) + return MM_STATUS_UNSUCCESSFUL; + + *ResultBuffer = HeapAlloc(GetProcessHeap(), 0, *ResultLength); + if (*ResultBuffer == NULL) + return MM_STATUS_NO_MEMORY; + + if (RegQueryValueExW((HKEY)hKey, KeyName, NULL, KeyType, *ResultBuffer, ResultLength) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, *ResultBuffer); + return MM_STATUS_UNSUCCESSFUL; + } + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +OpenKey( + IN HANDLE hKey, + IN LPWSTR SubKey, + IN ULONG DesiredAccess, + OUT PHANDLE OutKey) +{ + if (RegOpenKeyExW((HKEY)hKey, SubKey, 0, DesiredAccess, (PHKEY)OutKey) == ERROR_SUCCESS) + return MM_STATUS_SUCCESS; + + return MM_STATUS_UNSUCCESSFUL; +} + +MIXER_STATUS +CloseKey( + IN HANDLE hKey) +{ + RegCloseKey((HKEY)hKey); + return MM_STATUS_SUCCESS; } @@ -231,6 +304,9 @@ MixerContext.Copy = Copy; MixerContext.Free = Free; MixerContext.Open = Open; + MixerContext.OpenKey = OpenKey; + MixerContext.CloseKey = CloseKey; + MixerContext.QueryKeyValue = QueryKeyValue; Status = MMixerInitialize(&MixerContext, Enum, (PVOID)DeviceHandle);

1 0

[janderwald] 44647: [WDMAUD.DRV] - Add support for Opening/Querying/Closing registry keys within the mmixer library
by janderwald＠svn.reactos.org 18 Dec '09

18 Dec '09

Author: janderwald Date: Fri Dec 18 11:42:29 2009 New Revision: 44647 URL: http://svn.reactos.org/svn/reactos?rev=44647&view=rev Log: [WDMAUD.DRV] - Add support for Opening/Querying/Closing registry keys within the mmixer library Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Fri Dec 18 11:42:29 2009 @@ -16,7 +16,10 @@ VOID Copy(PVOID Src, PVOID Dst, ULONG NumBytes); MIXER_STATUS Open(IN LPWSTR DevicePath, OUT PHANDLE hDevice); MIXER_STATUS Control(IN HANDLE hMixer, IN ULONG dwIoControlCode, IN PVOID lpInBuffer, IN ULONG nInBufferSize, OUT PVOID lpOutBuffer, ULONG nOutBufferSize, PULONG lpBytesReturned); -MIXER_STATUS Enum(IN PVOID EnumContext, IN ULONG DeviceIndex, OUT LPWSTR * DeviceName, OUT PHANDLE OutHandle); +MIXER_STATUS Enum(IN PVOID EnumContext, IN ULONG DeviceIndex, OUT LPWSTR * DeviceName, OUT PHANDLE OutHandle, OUT PHANDLE OutKey); +MIXER_STATUS OpenKey(IN HANDLE hKey, IN LPWSTR SubKey, IN ULONG DesiredAccess, OUT PHANDLE OutKey); +MIXER_STATUS CloseKey(IN HANDLE hKey); +MIXER_STATUS QueryKeyValue(IN HANDLE hKey, IN LPWSTR KeyName, OUT PVOID * ResultBuffer, OUT PULONG ResultLength, OUT PULONG KeyType); MIXER_CONTEXT MixerContext = { @@ -27,10 +30,58 @@ Free, Open, Close, - Copy + Copy, + OpenKey, + QueryKeyValue, + CloseKey }; GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; + +MIXER_STATUS +QueryKeyValue( + IN HANDLE hKey, + IN LPWSTR KeyName, + OUT PVOID * ResultBuffer, + OUT PULONG ResultLength, + OUT PULONG KeyType) +{ + if (RegQueryValueExW((HKEY)hKey, KeyName, NULL, KeyType, NULL, ResultLength) == ERROR_FILE_NOT_FOUND) + return MM_STATUS_UNSUCCESSFUL; + + *ResultBuffer = HeapAlloc(GetProcessHeap(), 0, *ResultLength); + if (*ResultBuffer == NULL) + return MM_STATUS_NO_MEMORY; + + if (RegQueryValueExW((HKEY)hKey, KeyName, NULL, KeyType, *ResultBuffer, ResultLength) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, *ResultBuffer); + return MM_STATUS_UNSUCCESSFUL; + } + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +OpenKey( + IN HANDLE hKey, + IN LPWSTR SubKey, + IN ULONG DesiredAccess, + OUT PHANDLE OutKey) +{ + if (RegOpenKeyExW((HKEY)hKey, SubKey, 0, DesiredAccess, (PHKEY)OutKey) == ERROR_SUCCESS) + return MM_STATUS_SUCCESS; + + return MM_STATUS_UNSUCCESSFUL; +} + +MIXER_STATUS +CloseKey( + IN HANDLE hKey) +{ + RegCloseKey((HKEY)hKey); + return MM_STATUS_SUCCESS; +} + PVOID Alloc(ULONG NumBytes) { @@ -151,13 +202,15 @@ IN PVOID EnumContext, IN ULONG DeviceIndex, OUT LPWSTR * DeviceName, - OUT PHANDLE OutHandle) + OUT PHANDLE OutHandle, + OUT PHANDLE OutKey) { SP_DEVICE_INTERFACE_DATA InterfaceData; SP_DEVINFO_DATA DeviceData; PSP_DEVICE_INTERFACE_DETAIL_DATA_W DetailData; BOOL Result; DWORD Length; + MIXER_STATUS Status; //printf("Enum EnumContext %p DeviceIndex %lu OutHandle %p\n", EnumContext, DeviceIndex, OutHandle); @@ -196,12 +249,40 @@ if (!Result) { - return MM_STATUS_UNSUCCESSFUL; - } - - // copy path - *DeviceName = (LPWSTR)&DetailData->DevicePath[0]; - return Open(DetailData->DevicePath, OutHandle); + DPRINT("SetupDiGetDeviceInterfaceDetailW failed with %lu\n", GetLastError()); + return MM_STATUS_UNSUCCESSFUL; + } + + + *OutKey = SetupDiOpenDeviceInterfaceRegKey(EnumContext, &InterfaceData, 0, KEY_READ); + if ((HKEY)*OutKey == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, DetailData); + return MM_STATUS_UNSUCCESSFUL; + } + + Status = Open(DetailData->DevicePath, OutHandle); + + if (Status != MM_STATUS_SUCCESS) + { + RegCloseKey((HKEY)*OutKey); + HeapFree(GetProcessHeap(), 0, DetailData); + return Status; + } + + *DeviceName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(DetailData->DevicePath)+1) * sizeof(WCHAR)); + if (*DeviceName == NULL) + { + CloseHandle(*OutHandle); + RegCloseKey((HKEY)*OutKey); + HeapFree(GetProcessHeap(), 0, DetailData); + return MM_STATUS_NO_MEMORY; + } + + wcscpy(*DeviceName, DetailData->DevicePath); + HeapFree(GetProcessHeap(), 0, DetailData); + + return Status; } BOOL

1 0

[janderwald] 44646: [MMIXER] - Open all filters before starting enumeration. The advantage is that some filters are not opened twice - Query the Mixer Name from Registry by opening the device interface registry key and querying for the value of FriendlyName. If it cannot be found, try to find the key under the sub key 'Device Parameters'
by janderwald＠svn.reactos.org 18 Dec '09

18 Dec '09

Author: janderwald Date: Fri Dec 18 11:25:41 2009 New Revision: 44646 URL: http://svn.reactos.org/svn/reactos?rev=44646&view=rev Log: [MMIXER] - Open all filters before starting enumeration. The advantage is that some filters are not opened twice - Query the Mixer Name from Registry by opening the device interface registry key and querying for the value of FriendlyName. If it cannot be found, try to find the key under the sub key 'Device Parameters' Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/lib/drivers/sound/mmixer/mmixer.h trunk/reactos/lib/drivers/sound/mmixer/priv.h trunk/reactos/lib/drivers/sound/mmixer/sup.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Fri Dec 18 11:25:41 2009 @@ -667,6 +667,7 @@ MIXER_STATUS MMixerHandlePhysicalConnection( IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, IN OUT LPMIXER_INFO MixerInfo, IN ULONG bInput, IN PKSPIN_PHYSICALCONNECTION OutConnection) @@ -674,47 +675,41 @@ PULONG PinsRef = NULL, PinConnectionIndex = NULL, PinsSrcRef; ULONG PinsRefCount, Index, PinConnectionIndexCount; MIXER_STATUS Status; - HANDLE hDevice = NULL; PKSMULTIPLE_ITEM NodeTypes = NULL; PKSMULTIPLE_ITEM NodeConnections = NULL; PULONG MixerControls; ULONG MixerControlsCount; + LPMIXER_DATA MixerData; // open the connected filter - Status = MixerContext->Open(OutConnection->SymbolicLinkName, &hDevice); - if (Status != MM_STATUS_SUCCESS) - { - DPRINT("OpenDevice failed with %x\n", Status); - return Status; - } + OutConnection->SymbolicLinkName[1] = L'\\'; + MixerData = MMixerGetDataByDeviceName(MixerList, OutConnection->SymbolicLinkName); + ASSERT(MixerData); // get connected filter pin count - PinsRefCount = MMixerGetFilterPinCount(MixerContext, hDevice); + PinsRefCount = MMixerGetFilterPinCount(MixerContext, MixerData->hDevice); ASSERT(PinsRefCount); PinsRef = (PULONG)MixerContext->Alloc(sizeof(ULONG) * PinsRefCount); if (!PinsRef) { // no memory - MixerContext->Close(hDevice); return MM_STATUS_UNSUCCESSFUL; } // get topology node types - Status = MMixerGetFilterTopologyProperty(MixerContext, hDevice, KSPROPERTY_TOPOLOGY_NODES, &NodeTypes); + Status = MMixerGetFilterTopologyProperty(MixerContext, MixerData->hDevice, KSPROPERTY_TOPOLOGY_NODES, &NodeTypes); if (Status != MM_STATUS_SUCCESS) { - MixerContext->Close(hDevice); MixerContext->Free(PinsRef); return Status; } // get topology connections - Status = MMixerGetFilterTopologyProperty(MixerContext, hDevice, KSPROPERTY_TOPOLOGY_CONNECTIONS, &NodeConnections); + Status = MMixerGetFilterTopologyProperty(MixerContext, MixerData->hDevice, KSPROPERTY_TOPOLOGY_CONNECTIONS, &NodeConnections); if (Status != MM_STATUS_SUCCESS) { - MixerContext->Close(hDevice); MixerContext->Free(PinsRef); MixerContext->Free(NodeTypes); return Status; @@ -725,7 +720,6 @@ Status = MMixerGetNodeIndexes(MixerContext, NodeConnections, OutConnection->Pin, FALSE, !bInput, &PinConnectionIndexCount, &PinConnectionIndex); if (Status != MM_STATUS_SUCCESS) { - MixerContext->Close(hDevice); MixerContext->Free(PinsRef); MixerContext->Free(NodeTypes); MixerContext->Free(NodeConnections); @@ -739,7 +733,6 @@ Status = MMixerGetTargetPinsByNodeConnectionIndex(MixerContext, NodeConnections, NodeTypes, FALSE, PinConnectionIndex[0], PinsRef); if (Status != MM_STATUS_SUCCESS) { - MixerContext->Close(hDevice); MixerContext->Free(PinsRef); MixerContext->Free(NodeTypes); MixerContext->Free(NodeConnections); @@ -767,7 +760,6 @@ if (!PinsSrcRef) { /* no memory */ - MixerContext->Close(hDevice); MixerContext->Free(PinsRef); MixerContext->Free(NodeTypes); MixerContext->Free(NodeConnections); @@ -781,7 +773,6 @@ if (Status != MM_STATUS_SUCCESS) { // failed */ - MixerContext->Close(hDevice); MixerContext->Free(PinsRef); MixerContext->Free(NodeTypes); MixerContext->Free(NodeConnections); @@ -800,7 +791,7 @@ } PinsSrcRef[OutConnection->Pin] = TRUE; - Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, hDevice, NodeConnections, NodeTypes, PinsRefCount, OutConnection->Pin, Index, PinsSrcRef); + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, MixerData->hDevice, NodeConnections, NodeTypes, PinsRefCount, OutConnection->Pin, Index, PinsSrcRef); MixerContext->Free(MixerControls); MixerContext->Free(PinsSrcRef); @@ -815,8 +806,7 @@ MMixerInitializeFilter( IN PMIXER_CONTEXT MixerContext, IN PMIXER_LIST MixerList, - IN HANDLE hMixer, - IN LPWSTR DeviceName, + IN LPMIXER_DATA MixerData, IN PKSMULTIPLE_ITEM NodeTypes, IN PKSMULTIPLE_ITEM NodeConnections, IN ULONG PinCount, @@ -847,12 +837,13 @@ MixerInfo->MixCaps.vDriverVersion = 1; //FIXME MixerInfo->MixCaps.fdwSupport = 0; MixerInfo->MixCaps.cDestinations = 1; - MixerInfo->hMixer = hMixer; + MixerInfo->hMixer = MixerData->hDevice; + + // get mixer name + MMixerGetDeviceName(MixerContext, MixerInfo, MixerData->hDeviceInterfaceKey); // initialize line list InitializeListHead(&MixerInfo->LineList); - - /* FIXME find mixer name */ // now allocate an array which will receive the indices of the pin // which has a ADC / DAC nodetype in its path @@ -880,7 +871,7 @@ Pin.Property.Id = KSPROPERTY_PIN_NAME; /* try get pin name size */ - Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), NULL, 0, &BytesReturned); + Status = MixerContext->Control(MixerData->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), NULL, 0, &BytesReturned); if (Status == MM_STATUS_MORE_ENTRIES) { @@ -888,7 +879,7 @@ if (Buffer) { /* try get pin name */ - Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Buffer, BytesReturned, &BytesReturned); + Status = MixerContext->Control(MixerData->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Buffer, BytesReturned, &BytesReturned); if (Status != MM_STATUS_SUCCESS) { MixerContext->Free((PVOID)Buffer); @@ -945,11 +936,11 @@ if (Pins[Index]) { // check if the pin has a physical connection - Status = MMixerGetPhysicalConnection(MixerContext, hMixer, Index, &OutConnection); + Status = MMixerGetPhysicalConnection(MixerContext, MixerData->hDevice, Index, &OutConnection); if (Status == MM_STATUS_SUCCESS) { // the pin has a physical connection - Status = MMixerHandlePhysicalConnection(MixerContext, MixerInfo, bInputMixer, OutConnection); + Status = MMixerHandlePhysicalConnection(MixerContext, MixerList, MixerInfo, bInputMixer, OutConnection); DPRINT("MMixerHandlePhysicalConnection status %u\n", Status); MixerContext->Free(OutConnection); bUsed = TRUE; @@ -957,7 +948,7 @@ else { // filter exposes the topology on the same filter - MMixerAddMixerSourceLine(MixerContext, MixerInfo, hMixer, NodeConnections, NodeTypes, Index, FALSE, FALSE); + MMixerAddMixerSourceLine(MixerContext, MixerInfo, MixerData->hDevice, NodeConnections, NodeTypes, Index, FALSE, FALSE); bUsed = TRUE; } } @@ -994,9 +985,8 @@ MMixerSetupFilter( IN PMIXER_CONTEXT MixerContext, IN PMIXER_LIST MixerList, - IN HANDLE hMixer, - IN PULONG DeviceCount, - IN LPWSTR DeviceName) + IN LPMIXER_DATA MixerData, + IN PULONG DeviceCount) { PKSMULTIPLE_ITEM NodeTypes, NodeConnections; MIXER_STATUS Status; @@ -1004,12 +994,12 @@ ULONG NodeIndex; // get number of pins - PinCount = MMixerGetFilterPinCount(MixerContext, hMixer); + PinCount = MMixerGetFilterPinCount(MixerContext, MixerData->hDevice); ASSERT(PinCount); DPRINT("NumOfPins: %lu\n", PinCount); // get filter node types - Status = MMixerGetFilterTopologyProperty(MixerContext, hMixer, KSPROPERTY_TOPOLOGY_NODES, &NodeTypes); + Status = MMixerGetFilterTopologyProperty(MixerContext, MixerData->hDevice, KSPROPERTY_TOPOLOGY_NODES, &NodeTypes); if (Status != MM_STATUS_SUCCESS) { // failed @@ -1017,7 +1007,7 @@ } // get filter node connections - Status = MMixerGetFilterTopologyProperty(MixerContext, hMixer, KSPROPERTY_TOPOLOGY_CONNECTIONS, &NodeConnections); + Status = MMixerGetFilterTopologyProperty(MixerContext, MixerData->hDevice, KSPROPERTY_TOPOLOGY_CONNECTIONS, &NodeConnections); if (Status != MM_STATUS_SUCCESS) { // failed @@ -1030,7 +1020,7 @@ if (NodeIndex != MAXULONG) { // it has - Status = MMixerInitializeFilter(MixerContext, MixerList, hMixer, DeviceName, NodeTypes, NodeConnections, PinCount, NodeIndex, FALSE); + Status = MMixerInitializeFilter(MixerContext, MixerList, MixerData, NodeTypes, NodeConnections, PinCount, NodeIndex, FALSE); DPRINT("MMixerInitializeFilter Status %u\n", Status); // check for success if (Status == MM_STATUS_SUCCESS) @@ -1046,7 +1036,7 @@ if (NodeIndex != MAXULONG) { // it has - Status = MMixerInitializeFilter(MixerContext, MixerList, hMixer, DeviceName, NodeTypes, NodeConnections, PinCount, NodeIndex, TRUE); + Status = MMixerInitializeFilter(MixerContext, MixerList, MixerData, NodeTypes, NodeConnections, PinCount, NodeIndex, TRUE); DPRINT("MMixerInitializeFilter Status %u\n", Status); // check for success if (Status == MM_STATUS_SUCCESS) Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Fri Dec 18 11:25:41 2009 @@ -409,10 +409,12 @@ IN PVOID EnumContext) { MIXER_STATUS Status; - HANDLE hMixer; + HANDLE hMixer, hKey; ULONG DeviceIndex, Count; LPWSTR DeviceName; + LPMIXER_DATA MixerData; PMIXER_LIST MixerList; + PLIST_ENTRY Entry; if (!MixerContext || !EnumFunction || !EnumContext) { @@ -420,7 +422,8 @@ return MM_STATUS_INVALID_PARAMETER; } - if (!MixerContext->Alloc || !MixerContext->Control || !MixerContext->Free || !MixerContext->Open || !MixerContext->Close) + if (!MixerContext->Alloc || !MixerContext->Control || !MixerContext->Free || !MixerContext->Open || + !MixerContext->Close || !MixerContext->OpenKey || !MixerContext->QueryKeyValue || !MixerContext->CloseKey) { // invalid parameter return MM_STATUS_INVALID_PARAMETER; @@ -436,7 +439,9 @@ //initialize mixer list MixerList->MixerListCount = 0; + MixerList->MixerDataCount = 0; InitializeListHead(&MixerList->MixerList); + InitializeListHead(&MixerList->MixerData); // store mixer list MixerContext->MixerContext = (PVOID)MixerList; @@ -445,12 +450,10 @@ Count = 0; DeviceIndex = 0; - - do { // enumerate a device - Status = EnumFunction(EnumContext, DeviceIndex, &DeviceName, &hMixer); + Status = EnumFunction(EnumContext, DeviceIndex, &DeviceName, &hMixer, &hKey); if (Status != MM_STATUS_SUCCESS) { @@ -463,13 +466,26 @@ } else { - MMixerSetupFilter(MixerContext, MixerList, hMixer, &Count, DeviceName); + // create a mixer data entry + Status = MMixerCreateMixerData(MixerContext, MixerList, DeviceIndex, DeviceName, hMixer, hKey); + if (Status != MM_STATUS_SUCCESS) + break; } // increment device index DeviceIndex++; }while(TRUE); + //now all filters have been pre-opened + // lets enumerate the filters + Entry = MixerList->MixerData.Flink; + while(Entry != &MixerList->MixerData) + { + MixerData = (LPMIXER_DATA)CONTAINING_RECORD(Entry, MIXER_DATA, Entry); + MMixerSetupFilter(MixerContext, MixerList, MixerData, &Count); + Entry = Entry->Flink; + } + // done return MM_STATUS_SUCCESS; } Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Fri Dec 18 11:25:41 2009 @@ -26,7 +26,8 @@ IN PVOID EnumContext, IN ULONG DeviceIndex, OUT LPWSTR * DeviceName, - OUT PHANDLE OutHandle); + OUT PHANDLE OutHandle, + OUT PHANDLE OutDevInterfaceKey); typedef MIXER_STATUS(*PMIXER_DEVICE_CONTROL)( IN HANDLE hMixer, @@ -44,6 +45,9 @@ typedef MIXER_STATUS(*PMIXER_CLOSE)( IN HANDLE hDevice); +typedef MIXER_STATUS(*PMIXER_CLOSEKEY)( + IN HANDLE hKey); + typedef VOID (*PMIXER_EVENT)( IN PVOID MixerEvent); @@ -52,6 +56,18 @@ IN PVOID Src, IN ULONG Length); +typedef MIXER_STATUS(*PMIXER_QUERY_KEY_VALUE)( + IN HANDLE hKey, + IN LPWSTR KeyName, + OUT PVOID * ResultBuffer, + OUT PULONG ResultLength, + OUT PULONG KeyType); + +typedef MIXER_STATUS(*PMIXER_OPEN_KEY)( + IN HANDLE hKey, + IN LPWSTR SubKey, + IN ULONG DesiredAccess, + OUT PHANDLE OutKey); typedef struct { @@ -64,6 +80,9 @@ PMIXER_OPEN Open; PMIXER_CLOSE Close; PMIXER_COPY Copy; + PMIXER_OPEN_KEY OpenKey; + PMIXER_QUERY_KEY_VALUE QueryKeyValue; + PMIXER_CLOSEKEY CloseKey; }MIXER_CONTEXT, *PMIXER_CONTEXT; MIXER_STATUS Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Fri Dec 18 11:25:41 2009 @@ -13,6 +13,8 @@ #include <mmsystem.h> #include "mmixer.h" + +#include <stdio.h> #include <debug.h> @@ -55,8 +57,19 @@ typedef struct { + LIST_ENTRY Entry; + ULONG DeviceId; + HANDLE hDevice; + HANDLE hDeviceInterfaceKey; + LPWSTR DeviceName; +}MIXER_DATA, *LPMIXER_DATA; + +typedef struct +{ ULONG MixerListCount; LIST_ENTRY MixerList; + ULONG MixerDataCount; + LIST_ENTRY MixerData; }MIXER_LIST, *PMIXER_LIST; #define DESTINATION_LINE 0xFFFF0000 @@ -133,9 +146,8 @@ MMixerSetupFilter( IN PMIXER_CONTEXT MixerContext, IN PMIXER_LIST MixerList, - IN HANDLE hMixer, - IN PULONG DeviceCount, - IN LPWSTR DeviceName); + IN LPMIXER_DATA MixerData, + IN PULONG DeviceCount); MIXER_STATUS MMixerGetTargetPinsByNodeConnectionIndex( @@ -206,4 +218,29 @@ IN ULONG Channel, IN PLONG InputValue); +LPMIXER_DATA +MMixerGetDataByDeviceId( + IN PMIXER_LIST MixerList, + IN ULONG DeviceId); + +LPMIXER_DATA +MMixerGetDataByDeviceName( + IN PMIXER_LIST MixerList, + IN LPWSTR DeviceName); + +MIXER_STATUS +MMixerCreateMixerData( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN ULONG DeviceId, + IN LPWSTR DeviceName, + IN HANDLE hDevice, + IN HANDLE hKey); + +MIXER_STATUS +MMixerGetDeviceName( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_INFO MixerInfo, + IN HANDLE hKey); + #endif Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Fri Dec 18 11:25:41 2009 @@ -37,7 +37,8 @@ if (MixerContext->SizeOfStruct != sizeof(MIXER_CONTEXT)) return MM_STATUS_INVALID_PARAMETER; - if (!MixerContext->Alloc || !MixerContext->Control || !MixerContext->Free || !MixerContext->Open || !MixerContext->Close) + if (!MixerContext->Alloc || !MixerContext->Control || !MixerContext->Free || !MixerContext->Open || + !MixerContext->Close || !MixerContext->OpenKey || !MixerContext->QueryKeyValue || !MixerContext->CloseKey) return MM_STATUS_INVALID_PARAMETER; if (!MixerContext->MixerContext) @@ -530,6 +531,7 @@ /* set control details */ if (bSet) { + /* TODO */ Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); } @@ -550,3 +552,106 @@ } return Status; } + +LPMIXER_DATA +MMixerGetDataByDeviceId( + IN PMIXER_LIST MixerList, + IN ULONG DeviceId) +{ + PLIST_ENTRY Entry; + LPMIXER_DATA MixerData; + + Entry = MixerList->MixerData.Flink; + while(Entry != &MixerList->MixerData) + { + MixerData = (LPMIXER_DATA)CONTAINING_RECORD(Entry, MIXER_DATA, Entry); + if (MixerData->DeviceId == DeviceId) + { + return MixerData; + } + Entry = Entry->Flink; + } + return NULL; +} + +LPMIXER_DATA +MMixerGetDataByDeviceName( + IN PMIXER_LIST MixerList, + IN LPWSTR DeviceName) +{ + PLIST_ENTRY Entry; + LPMIXER_DATA MixerData; + + Entry = MixerList->MixerData.Flink; + while(Entry != &MixerList->MixerData) + { + MixerData = (LPMIXER_DATA)CONTAINING_RECORD(Entry, MIXER_DATA, Entry); + if (wcsicmp(DeviceName, MixerData->DeviceName) == 0) + { + // found entry + return MixerData; + } + Entry = Entry->Flink; + } + return NULL; +} + +MIXER_STATUS +MMixerCreateMixerData( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN ULONG DeviceId, + IN LPWSTR DeviceName, + IN HANDLE hDevice, + IN HANDLE hKey) +{ + LPMIXER_DATA MixerData; + + MixerData = (LPMIXER_DATA)MixerContext->Alloc(sizeof(MIXER_DATA)); + if (!MixerData) + return MM_STATUS_NO_MEMORY; + + MixerData->DeviceId = DeviceId; + MixerData->DeviceName = DeviceName; + MixerData->hDevice = hDevice; + MixerData->hDeviceInterfaceKey = hKey; + + InsertTailList(&MixerList->MixerData, &MixerData->Entry); + MixerList->MixerDataCount++; + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +MMixerGetDeviceName( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_INFO MixerInfo, + IN HANDLE hKey) +{ + LPWSTR Name; + HANDLE hTemp; + ULONG Length; + ULONG Type; + MIXER_STATUS Status; + + Status = MixerContext->QueryKeyValue(hKey, L"FriendlyName", (PVOID*)&Name, &Length, &Type); + if (Status == MM_STATUS_SUCCESS) + { + wcscpy(MixerInfo->MixCaps.szPname, Name); + MixerContext->Free(Name); + return Status; + } + + Status = MixerContext->OpenKey(hKey, L"Device Parameters", KEY_READ, &hTemp); + if (Status != MM_STATUS_SUCCESS) + return Status; + + Status = MixerContext->QueryKeyValue(hKey, L"FriendlyName", (PVOID*)&Name, &Length, &Type); + if (Status == MM_STATUS_SUCCESS) + { + wcscpy(MixerInfo->MixCaps.szPname, Name); + MixerContext->Free(Name); + } + + MixerContext->CloseKey(hTemp); + return Status; +}

1 0

[dreimer] 44645: Cleanup of the PS Scripts. (every time i read through the, i find more crap.)
by dreimer＠svn.reactos.org 18 Dec '09

18 Dec '09

Author: dreimer Date: Fri Dec 18 09:36:53 2009 New Revision: 44645 URL: http://svn.reactos.org/svn/reactos?rev=44645&view=rev Log: Cleanup of the PS Scripts. (every time i read through the, i find more crap.) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri Dec 18 09:36:53 2009 @@ -26,8 +26,6 @@ } $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc" $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++" - $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc" - $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$_ROSBE_PREFIX" + "gcc" $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$_ROSBE_PREFIX" + "g++" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Fri Dec 18 09:36:53 2009 @@ -25,14 +25,12 @@ } if ("$ENV:ROS_ARCH" -eq "amd64") { (Get-Host).UI.RawUI.ForegroundColor = 0xB - (Get-Host).UI.RawUI.BackgroundColor = 0x0 } elseif ("$ENV:ROS_ARCH" -eq "arm") { (Get-Host).UI.RawUI.ForegroundColor = 0x9 - (Get-Host).UI.RawUI.BackgroundColor = 0x0 } else { (Get-Host).UI.RawUI.ForegroundColor = 0xA - (Get-Host).UI.RawUI.BackgroundColor = 0x0 } +(Get-Host).UI.RawUI.BackgroundColor = 0x0 clear-host $global:0 = $myInvocation.MyCommand.Definition Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Fri Dec 18 09:36:53 2009 @@ -7,8 +7,6 @@ # $host.ui.RawUI.WindowTitle = "Options" - -$options="$_ROSBE_BASEDIR\Tools\options.exe" if ("$ENV:ROS_ARCH" -ne "i386") { $param = "$ENV:ROS_ARCH" @@ -20,9 +18,9 @@ # Run options.exe -if (Test-Path "$options") { +if (Test-Path "$_ROSBE_BASEDIR\Tools\options.exe") { Push-Location "$_ROSBE_BASEDIR" - &{IEX "& 'options' $param"} | out-null + &options.exe $param | out-null Pop-Location if (Test-Path "$cfgfile") { & "$cfgfile" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Fri Dec 18 09:36:53 2009 @@ -16,7 +16,7 @@ remove-item gcctvers.tmp # LD -$run = "$_ROSBE_TARGET_MINGWPATH\bin\$global:_ROSBE_PREFIX" + "ld" +$run = "$_ROSBE_TARGET_MINGWPATH\bin\$_ROSBE_PREFIX" + "ld" & "$run" -v # NASM or YASM

1 0

[janderwald] 44644: [SETUPAPI] - Implement SetupDiInstallDeviceInterfaces, SetupDiCreateDeviceInterfaceRegKeyW which are required to store device specific information
by janderwald＠svn.reactos.org 18 Dec '09

18 Dec '09

Author: janderwald Date: Fri Dec 18 05:37:15 2009 New Revision: 44644 URL: http://svn.reactos.org/svn/reactos?rev=44644&view=rev Log: [SETUPAPI] - Implement SetupDiInstallDeviceInterfaces, SetupDiCreateDeviceInterfaceRegKeyW which are required to store device specific information Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/interface.c trunk/reactos/dll/win32/setupapi/setupapi_private.h 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Fri Dec 18 05:37:15 2009 @@ -2628,7 +2628,14 @@ HINF InfHandle, PCWSTR InfSectionName) { + HKEY hKey, hDevKey; + LPWSTR SymbolicLink; + DWORD Length, Index; + LONG rc; + WCHAR bracedGuidString[39]; + struct DeviceInterface *DevItf; struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired, InfHandle, InfSectionName); @@ -2650,11 +2657,79 @@ SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - - FIXME("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, - samDesired, InfHandle, InfSectionName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return INVALID_HANDLE_VALUE; + + hKey = SetupDiOpenClassRegKeyExW(&DeviceInterfaceData->InterfaceClassGuid, samDesired, DIOCR_INTERFACE, NULL, NULL); + if (hKey == INVALID_HANDLE_VALUE) + { + hKey = SetupDiOpenClassRegKeyExW(NULL, samDesired, DIOCR_INTERFACE, NULL, NULL); + if (hKey == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + SETUPDI_GuidToString(&DeviceInterfaceData->InterfaceClassGuid, bracedGuidString); + + if (RegCreateKeyExW(hKey, bracedGuidString, 0, NULL, 0, samDesired, NULL, &hDevKey, NULL) != ERROR_SUCCESS) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + RegCloseKey(hKey); + hKey = hDevKey; + } + + DevItf = (struct DeviceInterface *)DeviceInterfaceData->Reserved; + + Length = (wcslen(DevItf->SymbolicLink)+1) * sizeof(WCHAR); + SymbolicLink = HeapAlloc(GetProcessHeap(), 0, Length); + if (!SymbolicLink) + { + RegCloseKey(hKey); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + wcscpy(SymbolicLink, DevItf->SymbolicLink); + + Index = 0; + while(SymbolicLink[Index]) + { + if (SymbolicLink[Index] == L'\\') + { + SymbolicLink[Index] = L'#'; + } + Index++; + } + + rc = RegCreateKeyExW(hKey, SymbolicLink, 0, NULL, 0, samDesired, NULL, &hDevKey, NULL); + + RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, SymbolicLink); + + if (rc == ERROR_SUCCESS) + { + if (InfHandle && InfSectionName) + { + if (!SetupInstallFromInfSection(NULL /*FIXME */, + InfHandle, + InfSectionName, + SPINST_INIFILES | SPINST_REGISTRY | SPINST_INI2REG | SPINST_FILES | SPINST_BITREG | SPINST_REGSVR | SPINST_UNREGSVR | SPINST_PROFILEITEMS | SPINST_COPYINF, + hDevKey, + NULL, + 0, + set->SelectedDevice->InstallParams.InstallMsgHandler, + set->SelectedDevice->InstallParams.InstallMsgHandlerContext, + INVALID_HANDLE_VALUE, + NULL)) + { + RegCloseKey(hDevKey); + return INVALID_HANDLE_VALUE; + } + } + } + + SetLastError(rc); + return hDevKey; } /*********************************************************************** @@ -3611,6 +3686,7 @@ key = INVALID_HANDLE_VALUE; } } + return key; } Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Fri Dec 18 05:37:15 2009 @@ -292,22 +292,118 @@ return rc; } +static LPWSTR +CreateSymbolicLink( + IN LPGUID InterfaceGuid, + IN LPCWSTR ReferenceString, + IN struct DeviceInfo *devInfo) +{ + DWORD Length, Index, Offset; + LPWSTR Key; + + Length = wcslen(devInfo->instanceId) + 4 /* prepend ##?# */ + 41 /* #{GUID} + */ + 1 /* zero byte */; + + Key = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length * sizeof(WCHAR)); + if (!Key) + return NULL; + + wcscpy(Key, L"##?#"); + wcscat(Key, devInfo->instanceId); + + for(Index = 4; Index < Length; Index++) + { + if (Key[Index] == L'\\') + { + Key[Index] = L'#'; + } + } + + wcscat(Key, L"#"); + + Offset = wcslen(Key); + pSetupStringFromGuid(InterfaceGuid, Key + Offset, Length - Offset); + + return Key; +} + + static BOOL InstallOneInterface( IN LPGUID InterfaceGuid, IN LPCWSTR ReferenceString, IN LPCWSTR InterfaceSection, - IN UINT InterfaceFlags) + IN UINT InterfaceFlags, + IN HINF hInf, + IN HDEVINFO DeviceInfoSet, + IN struct DeviceInfo *devInfo) { + BOOL ret; + HKEY hKey, hRefKey; + LPWSTR Path; + SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; + PLIST_ENTRY InterfaceListEntry; + struct DeviceInterface *DevItf = NULL; + if (InterfaceFlags != 0) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - FIXME("Need to InstallOneInterface(%s %s %s %u)\n", debugstr_guid(InterfaceGuid), - debugstr_w(ReferenceString), debugstr_w(InterfaceSection), InterfaceFlags); - return TRUE; + TRACE("Need to InstallOneInterface(%s %s %s %u) hInf %p DeviceInfoSet %p devInfo %p instanceId %s\n", debugstr_guid(InterfaceGuid), + debugstr_w(ReferenceString), debugstr_w(InterfaceSection), InterfaceFlags, hInf, DeviceInfoSet, devInfo, debugstr_w(devInfo->instanceId)); + + + Path = CreateSymbolicLink(InterfaceGuid, ReferenceString, devInfo); + if (!Path) + return FALSE; + + CreateDeviceInterface(devInfo, Path, InterfaceGuid, &DevItf); + HeapFree(GetProcessHeap(), 0, Path); + if (!DevItf) + { + return FALSE; + } + + InsertTailList(&devInfo->InterfaceListHead, &DevItf->ListEntry); + + memcpy(&DeviceInterfaceData.InterfaceClassGuid, &DevItf->InterfaceClassGuid, sizeof(GUID)); + DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + DeviceInterfaceData.Flags = DevItf->Flags; + DeviceInterfaceData.Reserved = (ULONG_PTR)DevItf; + + hKey = SetupDiCreateDeviceInterfaceRegKeyW(DeviceInfoSet, &DeviceInterfaceData, 0, KEY_ALL_ACCESS, NULL, 0); + HeapFree(GetProcessHeap(), 0, DevItf); + if (hKey == INVALID_HANDLE_VALUE) + { + return FALSE; + } + + if (ReferenceString) + { + Path = HeapAlloc(GetProcessHeap(), 0, (wcslen(ReferenceString) + 2) * sizeof(WCHAR)); + if (!Path) + { + RegCloseKey(hKey); + return FALSE; + } + + wcscpy(Path, L"#"); + wcscat(Path, ReferenceString); + + if (RegCreateKeyExW(hKey, Path, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hRefKey, NULL) != ERROR_SUCCESS) + { + ERR("failed to create key %s %lx\n", debugstr_w(Path), GetLastError()); + HeapFree(GetProcessHeap(), 0, Path); + return FALSE; + } + + RegCloseKey(hKey); + hKey = hRefKey; + HeapFree(GetProcessHeap(), 0, Path); + } + + return SetupInstallFromInfSectionW(NULL, /* FIXME */ hInf, InterfaceSection, SPINST_REGISTRY, hKey, NULL, 0, NULL, NULL, NULL, NULL); } /*********************************************************************** @@ -335,7 +431,8 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { - struct DriverInfoElement *SelectedDriver; + struct DeviceInfo *devInfo; + struct DriverInfoElement *SelectedDriver = NULL; SP_DEVINSTALL_PARAMS_W InstallParams; WCHAR SectionName[MAX_PATH]; DWORD SectionNameLength = 0; @@ -347,6 +444,8 @@ GUID InterfaceGuid; BOOL Result; + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); Result = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); if (!Result) @@ -402,11 +501,15 @@ ret = GetStringField(&ContextInterface, 3, &InterfaceSection); if (!ret) - goto cleanup; + { + /* ReferenceString is optional */ + InterfaceSection = ReferenceString; + ReferenceString = NULL; + } ret = SetupGetIntField( &ContextInterface, - 4, /* Field index */ + (ReferenceString ? 4 : 3), /* Field index */ &InterfaceFlags); if (!ret) { @@ -421,11 +524,12 @@ } /* Install Interface */ - ret = InstallOneInterface(&InterfaceGuid, ReferenceString, InterfaceSection, InterfaceFlags); + ret = InstallOneInterface(&InterfaceGuid, ReferenceString, InterfaceSection, InterfaceFlags, SelectedDriver->InfFileDetails->hInf, DeviceInfoSet, devInfo); cleanup: MyFree(InterfaceGuidString); - MyFree(ReferenceString); + if (ReferenceString) + MyFree(ReferenceString); MyFree(InterfaceSection); InterfaceGuidString = ReferenceString = InterfaceSection = NULL; Result = SetupFindNextMatchLineW(&ContextInterface, AddInterface, &ContextInterface); Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Fri Dec 18 05:37:15 2009 @@ -334,6 +334,10 @@ IN HMODULE ModulePointer, IN PVOID FunctionPointer); +DWORD +WINAPI +pSetupStringFromGuid(LPGUID lpGUID, PWSTR pString, DWORD dwStringLen); + DWORD WINAPI CaptureAndConvertAnsiArg(LPCSTR pSrc, LPWSTR *pDst); VOID WINAPI MyFree(LPVOID lpMem);

1 0

[tkreuzer] 44643: Add service table definitions. They are only used for arm atm, because we have them asm.h, too and include that file on x86. Patch by Alex, fixed by me.
by tkreuzer＠svn.reactos.org 18 Dec '09

18 Dec '09

Author: tkreuzer Date: Fri Dec 18 01:11:11 2009 New Revision: 44643 URL: http://svn.reactos.org/svn/reactos?rev=44643&view=rev Log: Add service table definitions. They are only used for arm atm, because we have them asm.h, too and include that file on x86. Patch by Alex, fixed by me. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Fri Dec 18 01:11:11 2009 @@ -151,6 +151,70 @@ /* One of the Reserved Wait Blocks, this one is for the Thread's Timer */ #define TIMER_WAIT_BLOCK 0x3L +#ifdef _M_ARM // FIXME: remove this once our headers are cleaned up +// +// A system call ID is formatted as such: +// .________________________________________________________________. +// | 14 | 13 | 12 | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | +// |--------------|-------------------------------------------------| +// | TABLE NUMBER | TABLE OFFSET | +// \----------------------------------------------------------------/ +// +// +// The table number is then used as an index into the service descriptor table. +#define TABLE_NUMBER_BITS 3 +#define TABLE_OFFSET_BITS 12 + +// +// There are 2 tables (kernel and shadow, used by Win32K) +// +#define NUMBER_SERVICE_TABLES 2 +#define NTOS_SERVICE_INDEX 0 +#define WIN32K_SERVICE_INDEX 1 + +// +// NB. From assembly code, the table number must be computed as an offset into +// the service descriptor table. +// +// Each entry into the table is 16 bytes long on 32-bit architectures, and +// 32 bytes long on 64-bit architectures. +// +// Thus, Table Number 1 is offset 16 (0x10) on x86, and offset 32 (0x20) on +// x64. +// +#ifdef _WIN64 +#define BITS_PER_ENTRY 5 // (1 << 5) = 32 bytes +#else +#define BITS_PER_ENTRY 4 // (1 << 4) = 16 bytes +#endif + +// +// We want the table number, but leave some extra bits to we can have the offset +// into the descriptor table. +// +#define SERVICE_TABLE_SHIFT (12 - BITS_PER_ENTRY) + +// +// Now the table number (as an offset) is corrupted with part of the table offset +// This mask will remove the extra unwanted bits, and give us the offset into the +// descriptor table proper. +// +#define SERVICE_TABLE_MASK (((1 << TABLE_NUMBER_BITS) - 1) << BITS_PER_ENTRY) + +// +// To get the table offset (ie: the service call number), just keep the 12 bits +// +#define SERVICE_NUMBER_MASK ((1 << TABLE_OFFSET_BITS) - 1) + +// +// We'll often need to check if this is a graphics call. This is done by comparing +// the table number offset with the known Win32K table number offset. +// This is usually index 1, so table number offset 0x10 (x86) or 0x20 (x64) +// +#define SERVICE_TABLE_TEST (WIN32K_SERVICE_INDEX << BITS_PER_ENTRY) + +#endif + /* INTERNAL KERNEL FUNCTIONS ************************************************/ VOID

1 0

[dreimer] 44642: Fix a redefinition error on ARM Build. By teh omnipotent Alex
by dreimer＠svn.reactos.org 17 Dec '09

17 Dec '09

Author: dreimer Date: Fri Dec 18 00:07:19 2009 New Revision: 44642 URL: http://svn.reactos.org/svn/reactos?rev=44642&view=rev Log: Fix a redefinition error on ARM Build. By teh omnipotent Alex Modified: trunk/reactos/include/crt/sec_api/time_s.h Modified: trunk/reactos/include/crt/sec_api/time_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/time_s… ============================================================================== --- trunk/reactos/include/crt/sec_api/time_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/time_s.h [iso-8859-1] Fri Dec 18 00:07:19 2009 @@ -41,7 +41,7 @@ #ifdef _USE_32BIT_TIME_T __CRT_INLINE errno_t __cdecl _wctime_s(wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime32_s(_Buffer,_SizeInWords,_Time); } #else -__CRT_INLINE errno_t __cdecl _wctime_s(wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer,_SizeInWords,_Time); } +// __CRT_INLINE errno_t __cdecl _wctime_s(wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer,_SizeInWords,_Time); } #endif #endif #endif

1 0

[tkreuzer] 44641: Add the missing KeContextSwitches to the PRCB.
by tkreuzer＠svn.reactos.org 17 Dec '09

17 Dec '09

Author: tkreuzer Date: Thu Dec 17 23:38:54 2009 New Revision: 44641 URL: http://svn.reactos.org/svn/reactos?rev=44641&view=rev Log: Add the missing KeContextSwitches to the PRCB. Modified: trunk/reactos/include/ndk/arm/ketypes.h Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Thu Dec 17 23:38:54 2009 @@ -352,6 +352,7 @@ LARGE_INTEGER IoReadTransferCount; LARGE_INTEGER IoWriteTransferCount; LARGE_INTEGER IoOtherTransferCount; + ULONG KeContextSwitches; PP_LOOKASIDE_LIST PPLookasideList[16]; PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; PP_LOOKASIDE_LIST PPPagedLookasideList[32];

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