Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 28882: different implementation of ENUMFONTDATA structure
by tkreuzer＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: tkreuzer Date: Wed Sep 5 23:27:16 2007 New Revision: 28882 URL: http://svn.reactos.org/svn/reactos?rev=28882&view=rev Log: different implementation of ENUMFONTDATA structure Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed Sep 5 23:27:16 2007 @@ -120,36 +120,33 @@ TMDIFF Diff; } TMW_INTERNAL, *PTMW_INTERNAL; -typedef struct _DESIGNVECTORINT { - DWORD dvReserved; - DWORD dvNumAxes; - LONG dvValues[0]; -} DESIGNVECTORINT, *PDESIGNVECTORINT; - -typedef struct _ENUMFONTDATAINT +typedef struct { - DWORD dwReserved; - DWORD dwReserved1; - ENUMTEXTMETRICW etmTm; -} ENUMFONTDATAINT, *PENUMFONTDATAINT; - -typedef struct _ENUMFONTDATAW -{ - DWORD dwSize; // Full size of this structure. - ULONG ulOffsetTM; // Offset to enfdi in this structure. - DWORD dwFontType; // If sign set scale enum. - ENUMLOGFONTEXW elfex; + ULONG cbSize; + DWORD dwFontType; + ENUMLOGFONTEXW elfex; /* - * Yuam 14.5: + * Yuan 14.5: * DESIGNVECTOR is a variable-size data structure that specifies the number of * axes and a value for each axis. * So it maybe smaller than MM_MAX_NUMAXES. */ - DESIGNVECTORINT DesignVectori; - ENUMFONTDATAINT enfdi; + DESIGNVECTOR dv; +} ENUMFONTDATAINTW, *PENUMFONTDATAINTW; + +/* Warning: this structure is of variable size! + * It is only to access the cbSize and efdi member. + * The rest of the structure has to be parsed. */ +typedef struct _ENUMFONTDATAW +{ + ULONG cbSize; + ENUMFONTDATAINTW efdi; +/* The following 2 members do not have a constant offset! */ +/* DWORD dwFlags; + ENUMTEXTMETRICW etm; */ } ENUMFONTDATAW, *PENUMFONTDATAW; - - + + /* Number Representation */ typedef struct _EFLOAT_S {

1 0

[cwittich] 28881: -allocate the buffer for the NamedPipeReader on Linux too -use linux path as default in txtmode.cfg
by cwittich＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: cwittich Date: Wed Sep 5 21:02:30 2007 New Revision: 28881 URL: http://svn.reactos.org/svn/reactos?rev=28881&view=rev Log: -allocate the buffer for the NamedPipeReader on Linux too -use linux path as default in txtmode.cfg Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Wed Sep 5 21:02:30 2007 @@ -90,6 +90,8 @@ else { cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; + m_BufferLength = 100; + m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength); return true; } #endif Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Wed Sep 5 21:02:30 2007 @@ -10,8 +10,8 @@ ; ; This variable sets the path to the emulator ; -ROS_EMU_PATH=E:\reactos\qemu\qemu.exe -;ROS_EMU_PATH=/usr/bin/qemu +;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe +ROS_EMU_PATH=/usr/bin/qemu ; ROS_HDD_IMAGE ;

1 0

[cwittich] 28880: fix some bugs in the linux version (not working yet)
by cwittich＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: cwittich Date: Wed Sep 5 20:52:45 2007 New Revision: 28880 URL: http://svn.reactos.org/svn/reactos?rev=28880&view=rev Log: fix some bugs in the linux version (not working yet) Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Wed Sep 5 20:52:45 2007 @@ -126,7 +126,7 @@ void OsSupport::delayExecution(long value) { - sleep( (clock_t)value * CLOCKS_PER_SEC ); + sleep( value ); } Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Sep 5 20:52:45 2007 @@ -717,7 +717,7 @@ return false; } char buffer[128]; - if (!fread(buffer, sizeof(buffer), 1, file)) + if (!fread(buffer, 1, sizeof(buffer), file)) { cerr << "Error: pid file w/o pid!!! " << endl; cleanup();

1 0

[hpoussin] 28879: Fix ReactOS temporary directory name
by hpoussin＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: hpoussin Date: Wed Sep 5 20:33:41 2007 New Revision: 28879 URL: http://svn.reactos.org/svn/reactos?rev=28879&view=rev Log: Fix ReactOS temporary directory name Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Sep 5 20:33:41 2007 @@ -27,7 +27,7 @@ #define CLEAN_FILE(f) clean_files.push_back ( f ); -static string ros_temp = "$(TEMPORARY)"; +static string ros_temp = "$(TEMPORARY_)"; MingwBackend* MingwModuleHandler::backend = NULL; FILE*

1 0

[gedmurphy] 28878: fix description spelling
by gedmurphy＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: gedmurphy Date: Wed Sep 5 18:47:15 2007 New Revision: 28878 URL: http://svn.reactos.org/svn/reactos?rev=28878&view=rev Log: fix description spelling Modified: trunk/reactos/media/inf/display.inf Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/display.inf (original) +++ trunk/reactos/media/inf/display.inf Wed Sep 5 18:47:15 2007 @@ -69,4 +69,4 @@ DisplayClassName = "Display Adapters" StdMfg = "(Standard display adapters)" -VGA.DeviceDesc = "VGA-compatible graphic card" +VGA.DeviceDesc = "VGA-compatible graphics card"

1 0

[ekohl] 28877: - Forgot to enable the GeoId code. - Fixed another hardcoded Unicode string. - More indentation fixes. - No code changes.
by ekohl＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: ekohl Date: Wed Sep 5 18:42:24 2007 New Revision: 28877 URL: http://svn.reactos.org/svn/reactos?rev=28877&view=rev Log: - Forgot to enable the GeoId code. - Fixed another hardcoded Unicode string. - More indentation fixes. - No code changes. Modified: trunk/reactos/dll/cpl/intl/generalp.c Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Wed Sep 5 18:42:24 2007 @@ -41,7 +41,7 @@ HWND hList; HWND hLocaleList, hGeoList; -BOOL CALLBACK +static BOOL CALLBACK LocalesEnumProc(LPTSTR lpLocale) { LCID lcid; @@ -54,14 +54,14 @@ GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); index = SendMessage(hList, - CB_ADDSTRING, - 0, - (LPARAM)lang); + CB_ADDSTRING, + 0, + (LPARAM)lang); SendMessage(hList, - CB_SETITEMDATA, - index, - (LPARAM)lcid); + CB_SETITEMDATA, + index, + (LPARAM)lcid); return TRUE; } @@ -112,16 +112,17 @@ hList = hwnd; EnumSystemLocales(LocalesEnumProc, LCID_SUPPORTED); - // Select current locale - GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); // or should it be System and not user? + /* Select current locale */ + /* or should it be System and not user? */ + GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); SendMessage(hList, - CB_SELECTSTRING, - -1, - (LPARAM)langSel); -} - -// Sets new locale + CB_SELECTSTRING, + -1, + (LPARAM)langSel); +} + +/* Sets new locale */ VOID SetNewLocale(LCID lcid) { @@ -176,7 +177,7 @@ return; } - wsprintf(value, L"%04X", (DWORD)lcid); + wsprintf(value, _T("%04X"), (DWORD)lcid); valuesize = (_tcslen(value) + 1) * sizeof(TCHAR); RegSetValueEx(localeKey, _T("Locale"), 0, REG_SZ, (BYTE *)value, valuesize); @@ -213,7 +214,6 @@ } /* Location enumerate procedure */ -#if 0 BOOL CALLBACK LocationsEnumProc(GEOID gId) @@ -234,14 +234,12 @@ return TRUE; } -#endif /* Enumerate all system locations identifiers */ static VOID CreateLocationsList(HWND hWnd) { -#if 0 GEOID userGeoID; TCHAR loc[MAX_STR_SIZE]; @@ -258,10 +256,9 @@ LANG_SYSTEM_DEFAULT); SendMessage(hGeoList, - CB_SELECTSTRING, - (WPARAM) -1, - (LPARAM)loc); -#endif + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)loc); } DWORD @@ -269,101 +266,105 @@ { LRESULT lCount, lIndex, lResult; - lCount = SendMessage(hList, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); - if (lCount == CB_ERR) - { - return 0; - } - - for (lIndex = 0; lIndex < lCount; lIndex++) - { - lResult = SendMessage(hList, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); - if (lResult == CB_ERR) - { - continue; - } - - if (lResult == (LCID)UnattendLCID) - { - SendMessage(hList, CB_SETCURSEL, (WPARAM)lIndex, (LPARAM)0); - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - return 1; - } - } - return 0; + lCount = SendMessage(hList, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + if (lCount == CB_ERR) + { + return 0; + } + + for (lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = SendMessage(hList, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult == CB_ERR) + { + continue; + } + + if (lResult == (LCID)UnattendLCID) + { + SendMessage(hList, CB_SETCURSEL, (WPARAM)lIndex, (LPARAM)0); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + return 1; + } + } + + return 0; } /* Property page dialog callback */ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); - UpdateLocaleSample(hwndDlg, LOCALE_USER_DEFAULT); - CreateLocationsList(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO)); - if (IsUnattendedSetupEnabled) - { - if (VerifyUnattendLCID(hwndDlg)) - { - SetNewLocale(UnattendLCID); - PostQuitMessage(0); - } - return TRUE; - } - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_LANGUAGELIST: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - case IDC_SETUP_BUTTON: - SetupApplet(hwndDlg, uMsg, wParam, lParam); - break; - } - break; - - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - if (lpnm->code == (UINT)PSN_APPLY) - { - // Apply changes - LCID NewLcid; - int iCurSel; - - // Acquire new value - iCurSel = SendMessage(hList, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - break; - - NewLcid = SendMessage(hList, - CB_GETITEMDATA, - iCurSel, - 0); - - if (NewLcid == (LCID)CB_ERR) - break; - - // Actually set new locale - SetNewLocale(NewLcid); - } - } - break; - } - return FALSE; + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); + UpdateLocaleSample(hwndDlg, LOCALE_USER_DEFAULT); + CreateLocationsList(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO)); + if (IsUnattendedSetupEnabled) + { + if (VerifyUnattendLCID(hwndDlg)) + { + SetNewLocale(UnattendLCID); + PostQuitMessage(0); + } + return TRUE; + } + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_LANGUAGELIST: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_SETUP_BUTTON: + SetupApplet(hwndDlg, uMsg, wParam, lParam); + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + if (lpnm->code == (UINT)PSN_APPLY) + { + /* Apply changes */ + LCID NewLcid; + INT iCurSel; + + /* Acquire new value */ + iCurSel = SendMessage(hList, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendMessage(hList, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + /* Set new locale */ + SetNewLocale(NewLcid); + } + } + break; + } + + return FALSE; }

1 0

[ekohl] 28876: - Replace the hardcoded calls to Unicode-Functions. Use the module configuration to build a Unicode version instead. - Cleaned up a lot of coding-style and indentation issues. - No code changes.
by ekohl＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: ekohl Date: Wed Sep 5 18:24:45 2007 New Revision: 28876 URL: http://svn.reactos.org/svn/reactos?rev=28876&view=rev Log: - Replace the hardcoded calls to Unicode-Functions. Use the module configuration to build a Unicode version instead. - Cleaned up a lot of coding-style and indentation issues. - No code changes. Modified: trunk/reactos/dll/cpl/intl/advanced.c trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/inplocale.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/intl/languages.c trunk/reactos/dll/cpl/intl/misc.c trunk/reactos/dll/cpl/intl/numbers.c trunk/reactos/dll/cpl/intl/setupreg.c trunk/reactos/dll/cpl/intl/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… Modified: trunk/reactos/dll/cpl/intl/inplocale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/inplocale.c?r… Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=28… Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… Modified: trunk/reactos/dll/cpl/intl/languages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/languages.c?r… Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… Modified: trunk/reactos/dll/cpl/intl/setupreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/setupreg.c?re… Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=28…

1 0

[cfinck] 28875: Delete the old 0.3.3 branch
by cfinck＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: cfinck Date: Wed Sep 5 16:46:30 2007 New Revision: 28875 URL: http://svn.reactos.org/svn/reactos?rev=28875&view=rev Log: Delete the old 0.3.3 branch Removed: branches/ros-branch-0_3_3/

1 0

[cfinck] 28874: Merge in 28862 and 28817 (Device Manager icon stuff)
by cfinck＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: cfinck Date: Wed Sep 5 16:44:07 2007 New Revision: 28874 URL: http://svn.reactos.org/svn/reactos?rev=28874&view=rev Log: Merge in 28862 and 28817 (Device Manager icon stuff) Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/devclass.c branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/devinst.c branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/20.ico branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/23.ico branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/9.ico branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/Icon_Licence/Tango.txt branches/ros-branch-0_3_3-new/reactos/media/inf/keyboard.inf Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/devclass.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/devclass.c Wed Sep 5 16:44:07 2007 @@ -1449,7 +1449,7 @@ /* Prepare a HIMAGELIST */ InitCommonControls(); - ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR, 100, 10); + ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 100, 10); if (!ClassImageListData->ImageList) goto cleanup; @@ -1459,14 +1459,25 @@ * and put their index in the image list in the IconIndexes array */ for (i = 0; i < list->NumberOfGuids; i++) { + INT miniIconIndex; + ret = SetupDiLoadClassIcon( &list->Guids[i], - &hIcon, - NULL); + NULL, + &miniIconIndex); if (ret) - list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + { + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + if (hIcon) + { + list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + DestroyIcon(hIcon); + } + else + list->IconIndexes[i] = -1; + } else - list->IconIndexes[i] = -1; /* Special value to tell that icon is unavailable */ + list->IconIndexes[i] = -1; /* Special value to indicate that the icon is unavailable */ } ret = TRUE; @@ -1612,7 +1623,8 @@ TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(DllName)); if (LargeIcon) { - if (1 != ExtractIconEx(DllName, iconIndex, LargeIcon, NULL, 1)) + *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + if (!*LargeIcon) { SetLastError(ERROR_INVALID_INDEX); goto cleanup; Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/devinst.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/devinst.c Wed Sep 5 16:44:07 2007 @@ -2710,7 +2710,7 @@ { struct DeviceInfoSet *list; HKEY hEnumKey, hKey = NULL; - DWORD rc; + DWORD rc, dwSize; BOOL ret = FALSE; TRACE("%p %s %p %lx %p\n", @@ -2738,7 +2738,7 @@ struct DeviceInfoElement *deviceInfo = NULL; /* Search if device already exists in DeviceInfoSet. * If yes, return the existing element - * If no, create a new element using informations in registry + * If no, create a new element using information in registry */ PLIST_ENTRY ItemList = list->ListHead.Flink; while (ItemList != &list->ListHead) @@ -2757,6 +2757,9 @@ } else { + GUID ClassGUID; + WCHAR szClassGuid[MAX_GUID_STRING_LEN]; + /* Open supposed registry key */ rc = RegOpenKeyExW( list->HKLM, @@ -2784,11 +2787,25 @@ goto cleanup; } - /* FIXME: try to get ClassGUID from registry, instead of - * sending GUID_NULL to CreateDeviceInfoElement - */ - if (!CreateDeviceInfoElement(list, DeviceInstanceId, &GUID_NULL, &deviceInfo)) + ClassGUID = GUID_NULL; + dwSize = MAX_GUID_STRING_LEN * sizeof(WCHAR); + + if (RegQueryValueExW(hKey, + REGSTR_VAL_CLASSGUID, + NULL, + NULL, + (LPBYTE)szClassGuid, + &dwSize) == ERROR_SUCCESS) + { + szClassGuid[MAX_GUID_STRING_LEN - 2] = UNICODE_NULL; + + /* Convert a string to a ClassGuid */ + UuidFromStringW(&szClassGuid[1], &ClassGUID); + } + + if (!CreateDeviceInfoElement(list, DeviceInstanceId, &ClassGUID, &deviceInfo)) goto cleanup; + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); ret = TRUE; Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/20.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/23.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/9.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/Icon_Licence/Tango.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/Icon_Licence/Tango.txt (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/setupapi/res/icons/Icon_Licence/Tango.txt Wed Sep 5 16:44:07 2007 @@ -13,115 +13,35 @@ 9.ico 10.ico 11.ico -12.ico -13.ico -14.ico -15.ico -16.ico -17.ico 18.ico 19.ico -20.ico 21.ico 22.ico 23.ico 24.ico 25.ico 28.ico -29.ico -30.ico -32.ico -33.ico -35.ico -36.ico -37.ico -38.ico -39.ico +40.ico 41.ico -44.ico -45.ico -46.ico -47.ico -48.ico +42.ico +43.ico +50.ico +51.ico +52.ico +53.ico 54.ico -137.ico -138.ico -151.ico -152.ico -153.ico -154.ico -155.ico -156.ico -157.ico -160.ico +105.ico +159.ico 161.ico -172.ico -173.ico -191.ico -192.ico -210.ico -220.ico -221.ico -222.ico -224.ico -225.ico -226.ico -228.ico -233.ico -235.ico -236.ico -237.ico -238.ico -240.ico -245.ico -246.ico -248.ico -249.ico -250.ico -252.ico -254.ico -255.ico -263.ico -265.ico -268.ico -269.ico -270.ico -271.ico -277.ico -279.ico -289.ico -290.ico -291.ico -292.ico -293.ico -294.ico -295.ico -296.ico -297.ico -298.ico -299.ico -302.ico -304.ico -305.ico -309.ico -315.ico -317.ico -318.ico -319.ico -322.ico -323.ico -324.ico -325.ico -326.ico -327.ico -328.ico -329.ico -330.ico -1001.ico -1004.ico -8240.ico -16710.ico -16715.ico -16717.ico -16718.ico -16721.ico +500.ico +501.ico +502.ico +5012.ico + +The following icons are the property of the VMware, Inc and are +released under Creative Commons Attribution-ShareAlike 2.5 License. +(http://www.chipx86.com/blog/?p=206) +Please see COPYING for details + +20.ico +23.ico Modified: branches/ros-branch-0_3_3-new/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/me… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/media/inf/keyboard.inf (original) +++ branches/ros-branch-0_3_3-new/reactos/media/inf/keyboard.inf Wed Sep 5 16:44:07 2007 @@ -19,7 +19,7 @@ [KeyboardClass.NT.AddReg] HKR, , , 0, %KeyboardClassName% -HKR, , Icon, 0, "-2" +HKR, , Icon, 0, "-3" HKR, , Installer32, 0, "syssetup.dll,KeyboardClassInstaller" HKR, , NoInstallClass, 0, 1 HKR, , UpperFilters, 0x00010000, "kbdclass"

1 0

[hpoussin] 28873: Synchronize with Wine WIDL 0.9.44 (and a few patches by Dan Hipschman found on wine-patches ML)
by hpoussin＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: hpoussin Date: Wed Sep 5 15:15:09 2007 New Revision: 28873 URL: http://svn.reactos.org/svn/reactos?rev=28873&view=rev Log: Synchronize with Wine WIDL 0.9.44 (and a few patches by Dan Hipschman found on wine-patches ML) Added: trunk/reactos/tools/widl_new/0.9.44.1 - Handle LPSTR in typelibs.diff (with props) trunk/reactos/tools/widl_new/0.9.44.2 - Handle the size_is attribute on pointers.diff (with props) trunk/reactos/tools/widl_new/0.9.44.3 - Constify some data.diff (with props) trunk/reactos/tools/widl_new/0.9.44.4 - Fix top-level and callback conformances.diff (with props) trunk/reactos/tools/widl_new/0.9.44.5 - Implement NDR for struct field alignment.diff (with props) trunk/reactos/tools/widl_new/0.9.44.6 - Allow size_is on strings.diff (with props) trunk/reactos/tools/widl_new/0.9.44.7 - ReactOS hack.diff (with props) trunk/reactos/tools/widl_new/parser.yy.c - copied, changed from r28872, trunk/reactos/tools/widl_new/lex.yy.c Removed: trunk/reactos/tools/widl_new/lex.yy.c Modified: trunk/reactos/tools/widl_new/ChangeLog trunk/reactos/tools/widl_new/Makefile.in trunk/reactos/tools/widl_new/client.c trunk/reactos/tools/widl_new/hash.c trunk/reactos/tools/widl_new/header.c trunk/reactos/tools/widl_new/header.h trunk/reactos/tools/widl_new/parser.h trunk/reactos/tools/widl_new/parser.l trunk/reactos/tools/widl_new/parser.tab.c trunk/reactos/tools/widl_new/parser.tab.h trunk/reactos/tools/widl_new/parser.y trunk/reactos/tools/widl_new/proxy.c trunk/reactos/tools/widl_new/server.c trunk/reactos/tools/widl_new/typegen.c trunk/reactos/tools/widl_new/typegen.h trunk/reactos/tools/widl_new/typelib.c trunk/reactos/tools/widl_new/typelib.h trunk/reactos/tools/widl_new/typelib_struct.h trunk/reactos/tools/widl_new/utils.c trunk/reactos/tools/widl_new/utils.h trunk/reactos/tools/widl_new/widl.c trunk/reactos/tools/widl_new/widl.h trunk/reactos/tools/widl_new/widl.mak trunk/reactos/tools/widl_new/widl.man.in trunk/reactos/tools/widl_new/widltypes.h trunk/reactos/tools/widl_new/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/tools/widl_new/0.9.44.1 - Handle LPSTR in typelibs.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/0.9.44.1%20… Added: trunk/reactos/tools/widl_new/0.9.44.2 - Handle the size_is attribute on pointers.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/0.9.44.2%20… Added: trunk/reactos/tools/widl_new/0.9.44.3 - Constify some data.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/0.9.44.3%20… Added: trunk/reactos/tools/widl_new/0.9.44.4 - Fix top-level and callback conformances.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/0.9.44.4%20… Added: trunk/reactos/tools/widl_new/0.9.44.5 - Implement NDR for struct field alignment.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/0.9.44.5%20… Added: trunk/reactos/tools/widl_new/0.9.44.6 - Allow size_is on strings.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/0.9.44.6%20… Added: trunk/reactos/tools/widl_new/0.9.44.7 - ReactOS hack.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/0.9.44.7%20… Modified: trunk/reactos/tools/widl_new/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/ChangeLog?r… Modified: trunk/reactos/tools/widl_new/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/Makefile.in… Modified: trunk/reactos/tools/widl_new/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/client.c?re… Modified: trunk/reactos/tools/widl_new/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/hash.c?rev=… Modified: trunk/reactos/tools/widl_new/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/header.c?re… Modified: trunk/reactos/tools/widl_new/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/header.h?re… Removed: trunk/reactos/tools/widl_new/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/lex.yy.c?re… Modified: trunk/reactos/tools/widl_new/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/parser.h?re… Modified: trunk/reactos/tools/widl_new/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/parser.l?re… Modified: trunk/reactos/tools/widl_new/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/parser.tab.… Modified: trunk/reactos/tools/widl_new/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/parser.tab.… Modified: trunk/reactos/tools/widl_new/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/parser.y?re… Copied: trunk/reactos/tools/widl_new/parser.yy.c (from r28872, trunk/reactos/tools/widl_new/lex.yy.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/parser.yy.c… Modified: trunk/reactos/tools/widl_new/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/proxy.c?rev… Modified: trunk/reactos/tools/widl_new/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/server.c?re… Modified: trunk/reactos/tools/widl_new/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/typegen.c?r… Modified: trunk/reactos/tools/widl_new/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/typegen.h?r… Modified: trunk/reactos/tools/widl_new/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/typelib.c?r… Modified: trunk/reactos/tools/widl_new/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/typelib.h?r… Modified: trunk/reactos/tools/widl_new/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/typelib_str… Modified: trunk/reactos/tools/widl_new/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/utils.c?rev… Modified: trunk/reactos/tools/widl_new/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/utils.h?rev… Modified: trunk/reactos/tools/widl_new/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widl.c?rev=… Modified: trunk/reactos/tools/widl_new/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widl.h?rev=… Modified: trunk/reactos/tools/widl_new/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widl.mak?re… Modified: trunk/reactos/tools/widl_new/widl.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widl.man.in… Modified: trunk/reactos/tools/widl_new/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widltypes.h… Modified: trunk/reactos/tools/widl_new/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/write_msft.…

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