Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[pschweitzer] 74921: [UDFS] Misc coverity fixes. CID 1412011, 1321904, 1322008, 1322151, 1321905 CORE-4375

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jun 5 13:00:58 2017 New Revision: 74921 URL: http://svn.reactos.org/svn/reactos?rev=74921&view=rev Log: [UDFS] Misc coverity fixes. CID 1412011, 1321904, 1322008, 1322151, 1321905 CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp trunk/reactos/drivers/filesystems/udfs/namesup.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -1242,7 +1242,7 @@ UDF_FCB_DELETE_PARENT); } else { AdPrint((" CLEAR stream DeleteOnClose\n")); - FileInfo->Fcb->FCBFlags &= !(UDF_FCB_DELETE_ON_CLOSE | + FileInfo->Fcb->FCBFlags &= ~(UDF_FCB_DELETE_ON_CLOSE | UDF_FCB_DELETE_PARENT); } } Modified: trunk/reactos/drivers/filesystems/udfs/namesup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/namesup.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/namesup.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -241,7 +241,7 @@ if((*Buffer) != DOS_QM) return FALSE; } - if(*DosOpen) + if(DosOpen) *DosOpen = TRUE; return TRUE; } else @@ -253,7 +253,7 @@ return FALSE; if(Buffer[2] != DOS_STAR) return FALSE; - if(*DosOpen) + if(DosOpen) *DosOpen = TRUE; return TRUE; } else { Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -612,6 +612,7 @@ if(DirNdx->FileEntryLoc.logicalBlockNum == (ULONG)-1) { DirPrint((" err: FileEntryLoc=-1\n")); DbgFreePool(buff); + UDFDirIndexFree(hDirNdx); return STATUS_FILE_CORRUPT_ERROR; } DirNdx->FileCharacteristics = (FileInfo->FileIdent) ? Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -2640,6 +2640,7 @@ InitSz = Vcb->LBlockSize - FileInfo->Dloc->FileEntryLen; Allocs = (int8*)MyAllocatePool__(NonPagedPool, InitSz); if(!Allocs) { + *AllocData = NULL; AdPrint(("BuildAllocDesc: cant alloc %x bytes for Allocs\n", InitSz)); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -391,7 +391,7 @@ LVID_iUse = UDFGetLVIDiUse(Vcb); if((LVID_iUse->minUDFReadRev == Vcb->minUDFReadRev) && - (LVID_iUse->minUDFReadRev == Vcb->minUDFReadRev) && + (LVID_iUse->minUDFWriteRev == Vcb->minUDFWriteRev) && (LVID_iUse->maxUDFWriteRev == Vcb->maxUDFWriteRev) && (LVID_iUse->numFiles == Vcb->numFiles) && (LVID_iUse->numDirs == Vcb->numDirs))

7 years, 3 months

[ashaposhnikov] 74920: [RAPPS] * Added constants in resource.h for stringtables * Removed "Installed apps" from the TreeView * Added intallation status to the RichEdit using existing check * Change...

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sun Jun 4 21:36:14 2017 New Revision: 74920 URL: http://svn.reactos.org/svn/reactos?rev=74920&view=rev Log: [RAPPS] * Added constants in resource.h for stringtables * Removed "Installed apps" from the TreeView * Added intallation status to the RichEdit using existing check * Changed IsInstalledApplication signature to accept access righta This is needed for the 64 bit systems. Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -17,6 +17,12 @@ InsertRichEditText(b, d); \ } \ +#define ADD_TEXT_NEWL(a, b) \ + LoadStringW(hInst, a, szText, _countof(szText)); \ + InsertRichEditText(L"\n", 0); \ + InsertRichEditText(szText, b); \ + InsertRichEditText(L"\n", 0); + #define GET_STRING1(a, b) \ if (!ParserGetString(a, b, _countof(b), FindFileData.cFileName)) \ continue; @@ -25,6 +31,16 @@ if (!ParserGetString(a, b, _countof(b), FindFileData.cFileName)) \ b[0] = '\0'; +//App is "installed" if the RegName is in the registry +#define APP_INSTALL_CHECK_K(Info, key) \ + (*Info->szRegName && (IsInstalledApplicationEx(Info->szRegName, FALSE, key) \ + || IsInstalledApplicationEx(Info->szRegName, TRUE, key))) + +//Check both registry keys in 64bit system +//TODO: check system type beforehand to avoid double checks? +#define APP_INSTALL_CHECK(Info) \ + (APP_INSTALL_CHECK_K(Info, KEY_WOW64_32KEY) || APP_INSTALL_CHECK_K(Info, KEY_WOW64_64KEY)) + LIST_ENTRY CachedEntriesHead = { &CachedEntriesHead, &CachedEntriesHead }; PLIST_ENTRY pCachedEntry = &CachedEntriesHead; @@ -37,8 +53,13 @@ if (!Info) return FALSE; NewRichEditText(Info->szName, CFE_BOLD); - - InsertRichEditText(L"\n", 0); + if (APP_INSTALL_CHECK(Info)) + { + ADD_TEXT_NEWL(IDS_STATUS_INSTALLED, CFE_ITALIC); + } else + { + ADD_TEXT_NEWL(IDS_STATUS_NOTINSTALLED, CFE_ITALIC); + } ADD_TEXT(IDS_AINFO_VERSION, Info->szVersion, CFE_BOLD, 0); ADD_TEXT(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -90,7 +90,6 @@ return m_hWnd; } -public: virtual VOID OnLink(ENLINK *Link) { } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -372,33 +372,28 @@ VOID InitCategoriesList(VOID) { - HTREEITEM hRootItem1, hRootItem2; - - hRootItem1 = AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); - AddCategory(hRootItem1, IDS_APPLICATIONS, IDI_APPS); - AddCategory(hRootItem1, IDS_UPDATES, IDI_APPUPD); - - hRootItem2 = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); - AddCategory(hRootItem2, IDS_CAT_AUDIO, IDI_CAT_AUDIO); - AddCategory(hRootItem2, IDS_CAT_VIDEO, IDI_CAT_VIDEO); - AddCategory(hRootItem2, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); - AddCategory(hRootItem2, IDS_CAT_GAMES, IDI_CAT_GAMES); - AddCategory(hRootItem2, IDS_CAT_INTERNET, IDI_CAT_INTERNET); - AddCategory(hRootItem2, IDS_CAT_OFFICE, IDI_CAT_OFFICE); - AddCategory(hRootItem2, IDS_CAT_DEVEL, IDI_CAT_DEVEL); - AddCategory(hRootItem2, IDS_CAT_EDU, IDI_CAT_EDU); - AddCategory(hRootItem2, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); - AddCategory(hRootItem2, IDS_CAT_FINANCE, IDI_CAT_FINANCE); - AddCategory(hRootItem2, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); - AddCategory(hRootItem2, IDS_CAT_TOOLS, IDI_CAT_TOOLS); - AddCategory(hRootItem2, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); - AddCategory(hRootItem2, IDS_CAT_LIBS, IDI_CAT_LIBS); - AddCategory(hRootItem2, IDS_CAT_OTHER, IDI_CAT_OTHER); + HTREEITEM hRootItem; + + hRootItem = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); + AddCategory(hRootItem, IDS_CAT_AUDIO, IDI_CAT_AUDIO); + AddCategory(hRootItem, IDS_CAT_VIDEO, IDI_CAT_VIDEO); + AddCategory(hRootItem, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); + AddCategory(hRootItem, IDS_CAT_GAMES, IDI_CAT_GAMES); + AddCategory(hRootItem, IDS_CAT_INTERNET, IDI_CAT_INTERNET); + AddCategory(hRootItem, IDS_CAT_OFFICE, IDI_CAT_OFFICE); + AddCategory(hRootItem, IDS_CAT_DEVEL, IDI_CAT_DEVEL); + AddCategory(hRootItem, IDS_CAT_EDU, IDI_CAT_EDU); + AddCategory(hRootItem, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); + AddCategory(hRootItem, IDS_CAT_FINANCE, IDI_CAT_FINANCE); + AddCategory(hRootItem, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); + AddCategory(hRootItem, IDS_CAT_TOOLS, IDI_CAT_TOOLS); + AddCategory(hRootItem, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); + AddCategory(hRootItem, IDS_CAT_LIBS, IDI_CAT_LIBS); + AddCategory(hRootItem, IDS_CAT_OTHER, IDI_CAT_OTHER); m_TreeView->SetImageList(hImageTreeView, TVSIL_NORMAL); - m_TreeView->Expand(hRootItem2, TVE_EXPAND); - m_TreeView->Expand(hRootItem1, TVE_EXPAND); - m_TreeView->SelectItem(hRootItem1); + m_TreeView->Expand(hRootItem, TVE_EXPAND); + m_TreeView->SelectItem(hRootItem); } BOOL CreateStatusBar() @@ -1138,17 +1133,10 @@ return TRUE; } - /* Only add a ListView entry if... - - no RegName was supplied (so we cannot determine whether the application is installed or not) or - - a RegName was supplied and the application is not installed - */ - if (!*Info->szRegName || (!IsInstalledApplication(Info->szRegName, FALSE) && !IsInstalledApplication(Info->szRegName, TRUE))) - { - Index = ListViewAddItem(Info->Category, 0, Info->szName, (LPARAM) Info); - - ListView_SetItemText(hListView, Index, 1, Info->szVersion); - ListView_SetItemText(hListView, Index, 2, Info->szDesc); - } + Index = ListViewAddItem(Info->Category, 0, Info->szName, (LPARAM) Info); + + ListView_SetItemText(hListView, Index, 1, Info->szVersion); + ListView_SetItemText(hListView, Index, 2, Info->szDesc); return TRUE; } @@ -1183,14 +1171,15 @@ ImageList_AddIcon(hImageListView, hIcon); DestroyIcon(hIcon); - + /* if (IS_INSTALLED_ENUM(EnumType)) { - /* Enum installed applications and updates */ + / Enum installed applications and updates EnumInstalledApplications(EnumType, TRUE, s_EnumInstalledAppProc); EnumInstalledApplications(EnumType, FALSE, s_EnumInstalledAppProc); } - else if (IS_AVAILABLE_ENUM(EnumType)) + + else */if (IS_AVAILABLE_ENUM(EnumType)) { /* Enum available applications */ EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -28,9 +28,8 @@ return FALSE; } - -BOOL -IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey) +BOOL +IsInstalledApplicationEx(LPWSTR lpRegName, BOOL IsUserKey, REGSAM keyWow) { DWORD dwSize = MAX_PATH, dwType; WCHAR szName[MAX_PATH]; @@ -38,8 +37,8 @@ HKEY hKey, hSubKey; INT ItemIndex = 0; - if (RegOpenKeyW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", + if (RegOpenKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, keyWow | KEY_ENUMERATE_SUB_KEYS, &hKey) != ERROR_SUCCESS) { return FALSE; @@ -47,8 +46,9 @@ while (RegEnumKeyExW(hKey, ItemIndex, szName, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(hKey, szName, 0, keyWow | KEY_READ, &hSubKey) == ERROR_SUCCESS) { + dwType = REG_SZ; dwSize = sizeof(szDisplayName); if (RegQueryValueExW(hSubKey, @@ -63,15 +63,13 @@ RegCloseKey(hSubKey); RegCloseKey(hKey); return TRUE; - } + } } } - RegCloseKey(hSubKey); dwSize = MAX_PATH; ItemIndex++; } - RegCloseKey(hKey); return FALSE; } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -142,7 +142,7 @@ BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR lpString); BOOL ShowInstalledAppInfo(INT Index); BOOL UninstallApplication(INT Index, BOOL bModify); -BOOL IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey); +BOOL IsInstalledApplicationEx(LPWSTR lpRegName, BOOL IsUserKey, REGSAM keyWow); VOID RemoveAppFromRegistry(INT Index); /* winmain.c */ Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -111,7 +111,7 @@ #define IDS_TOOLTIP_SETTINGS 203 #define IDS_TOOLTIP_REFRESH 204 #define IDS_TOOLTIP_EXIT 205 -#define IDS_TOOLTIP_UPDATE_DB 206 +#define IDS_TOOLTIP_UPDATE_DB 206 /* Columns info */ #define IDS_APP_NAME 250 @@ -162,6 +162,15 @@ #define IDS_CAT_TOOLS 713 #define IDS_CAT_VIDEO 714 +/* App installation status */ +#define IDS_STATUS_INSTALLED 800 +#define IDS_STATUS_NOTINSTALLED 801 +#define IDS_STATUS_DOWNLOADED 802 +#define IDS_STATUS_UPDATE_AVAILABLE 803 +#define IDS_STATUS_DOWNLOADING 804 +#define IDS_STATUS_INSTALLING 805 + + /* Accelerators */ #define HOTKEYS 715

7 years, 3 months

[pschweitzer] 74919: [UDFS] Complete the implementation of UDFGetNetworkInformation() so that it sets all the fields. This fixes displaying file size in explorer. CORE-4375 CORE-13366

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 4 19:17:10 2017 New Revision: 74919 URL: http://svn.reactos.org/svn/reactos?rev=74919&view=rev Log: [UDFS] Complete the implementation of UDFGetNetworkInformation() so that it sets all the fields. This fixes displaying file size in explorer. CORE-4375 CORE-13366 Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] Sun Jun 4 19:17:10 2017 @@ -697,6 +697,7 @@ PtrBuffer->CreationTime = Fcb->NTRequiredFCB->CreationTime; PtrBuffer->LastAccessTime = Fcb->NTRequiredFCB->LastAccessTime; PtrBuffer->LastWriteTime = Fcb->NTRequiredFCB->LastWriteTime; + PtrBuffer->ChangeTime = Fcb->NTRequiredFCB->ChangeTime; FileInfo = Fcb->FileInfo; @@ -711,6 +712,13 @@ #ifdef UDF_DBG if(!FileInfo->Dloc->DirIndex) AdPrint(("*****!!!!! Directory has no DirIndex !!!!!*****\n")); #endif + } else { + if(Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize.LowPart == 0xffffffff) { + Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize.QuadPart = + UDFSysGetAllocSize(Fcb->Vcb, UDFGetFileSize(FileInfo)); + } + PtrBuffer->AllocationSize = Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize; + PtrBuffer->EndOfFile = Fcb->NTRequiredFCB->CommonFCBHeader.FileSize; } // Similarly, fill in attributes indicating a hidden file, system // file, compressed file, temporary file, etc. if the FSD supports

7 years, 3 months

[hbelusca] 74918: [i8042prt]: Yet another hack for Dell trackpad, but this time, we inaugurate the Inspiron series with a Dell Inspiron 6000 hack!! x^( Something's fishy in our driver... Tested and...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 4 18:24:05 2017 New Revision: 74918 URL: http://svn.reactos.org/svn/reactos?rev=74918&view=rev Log: [i8042prt]: Yet another hack for Dell trackpad, but this time, we inaugurate the Inspiron series with a Dell Inspiron 6000 hack!! x^( Something's fishy in our driver... Tested and confirmed working by Jared Smudde. CORE-6901 Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Sun Jun 4 18:24:05 2017 @@ -59,6 +59,7 @@ // { {{BOARD_VENDOR, "ASUSTeK Computer Inc."}, {BOARD_NAME, "G1S"}, {BOARD_VERSION, "1.0"}}, FL_NOLOOP }, { {{SYS_VENDOR, "Microsoft Corporation"}, {SYS_PRODUCT, "Virtual Machine"}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Inspiron 6000 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D430 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D530 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531 "}}, FL_INITHACK },

7 years, 3 months

[hbelusca] 74917: [PSDK]: Remove a couple of redundant #defines that are already defined in this regstr.h file.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 4 18:19:55 2017 New Revision: 74917 URL: http://svn.reactos.org/svn/reactos?rev=74917&view=rev Log: [PSDK]: Remove a couple of redundant #defines that are already defined in this regstr.h file. Modified: trunk/reactos/sdk/include/psdk/regstr.h Modified: trunk/reactos/sdk/include/psdk/regstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/regstr.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/regstr.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/regstr.h [iso-8859-1] Sun Jun 4 18:19:55 2017 @@ -756,9 +756,7 @@ #define REGSTR_VAL_SYSTEMBUSNUMBER TEXT("SystemBusNumber") #define REGSTR_VAL_BUSDATATYPE TEXT("BusDataType") #define REGSTR_VAL_INTERFACETYPE TEXT("InterfaceType") -#define REGSTR_VAL_SERVICE TEXT("Service") #define REGSTR_VAL_DETECTSIGNATURE TEXT("DetectSignature") -#define REGSTR_VAL_CLASSGUID TEXT("ClassGUID") #define REGSTR_VAL_INSTANCEIDENTIFIER TEXT("InstanceIdentifier") #define REGSTR_VAL_DUPLICATEOF TEXT("DuplicateOf") #define REGSTR_VAL_STATUSFLAGS TEXT("StatusFlags") @@ -770,10 +768,6 @@ #define REGSTR_VAL_DEVICE_INSTANCE TEXT("DeviceInstance") #define REGSTR_VAL_SYMBOLIC_LINK TEXT("SymbolicLink") #define REGSTR_VAL_DEFAULT TEXT("Default") -#define REGSTR_VAL_LOWERFILTERS TEXT("LowerFilters") -#define REGSTR_VAL_UPPERFILTERS TEXT("UpperFilters") -#define REGSTR_VAL_LOCATION_INFORMATION TEXT("LocationInformation") -#define REGSTR_VAL_UI_NUMBER TEXT("UINumber") #define REGSTR_VAL_UI_NUMBER_DESC_FORMAT TEXT("UINumberDescFormat") #define REGSTR_VAL_CAPABILITIES TEXT("Capabilities") #define REGSTR_VAL_DEVICE_TYPE TEXT("DeviceType")

7 years, 3 months

[hbelusca] 74916: [SETUPAPI]: Fix a 9-year old bug in the SETUP_CreateClassKey() logic, introduced in r31860, that set a wrong Class name value if the corresponding registry key already existed. Th...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 4 18:16:24 2017 New Revision: 74916 URL: http://svn.reactos.org/svn/reactos?rev=74916&view=rev Log: [SETUPAPI]: Fix a 9-year old bug in the SETUP_CreateClassKey() logic, introduced in r31860, that set a wrong Class name value if the corresponding registry key already existed. The bug was unveiled by my commit r74761. [SETUPAPI_APITEST]: When selecting another test_class_guid and test_class_name couple via SetupDiClassNameFromGuidA(), check whether this function actually succeeds. Also, improve some error output. Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/rostests/apitests/setupapi/devclass.c 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] Sun Jun 4 18:16:24 2017 @@ -3599,58 +3599,72 @@ HKEY SETUP_CreateClassKey(HINF hInf) { - static const WCHAR slash[] = { '\\',0 }; WCHAR FullBuffer[MAX_PATH]; WCHAR Buffer[MAX_PATH]; DWORD RequiredSize; HKEY hClassKey; - + DWORD Disposition; + + /* Obtain the Class GUID for this class */ if (!SetupGetLineTextW(NULL, hInf, Version, REGSTR_VAL_CLASSGUID, Buffer, - MAX_PATH, + sizeof(Buffer) / sizeof(WCHAR), &RequiredSize)) { return INVALID_HANDLE_VALUE; } + /* Build the corresponding registry key name */ lstrcpyW(FullBuffer, REGSTR_PATH_CLASS_NT); - lstrcatW(FullBuffer, slash); + lstrcatW(FullBuffer, BackSlash); lstrcatW(FullBuffer, Buffer); + /* Obtain the Class name for this class */ + if (!SetupGetLineTextW(NULL, + hInf, + Version, + REGSTR_VAL_CLASS, + Buffer, + sizeof(Buffer) / sizeof(WCHAR), + &RequiredSize)) + { + return INVALID_HANDLE_VALUE; + } + + /* Try to open or create the registry key */ + TRACE("Opening class key %s\n", debugstr_w(FullBuffer)); +#if 0 // I keep this for reference... if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, FullBuffer, 0, KEY_SET_VALUE, &hClassKey)) { - if (!SetupGetLineTextW(NULL, - hInf, - Version, - REGSTR_VAL_CLASS, - Buffer, - MAX_PATH, - &RequiredSize)) - { - return INVALID_HANDLE_VALUE; - } - - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, - FullBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_SET_VALUE, - NULL, - &hClassKey, - NULL)) - { - return INVALID_HANDLE_VALUE; - } - } - + /* Use RegCreateKeyExW */ + } +#endif + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, + FullBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, + NULL, + &hClassKey, + &Disposition)) + { + ERR("RegCreateKeyExW(%s) failed\n", debugstr_w(FullBuffer)); + return INVALID_HANDLE_VALUE; + } + if (Disposition == REG_CREATED_NEW_KEY) + TRACE("The class key %s was successfully created\n", debugstr_w(FullBuffer)); + else + TRACE("The class key %s was successfully opened\n", debugstr_w(FullBuffer)); + + TRACE( "setting value %s to %s\n", debugstr_w(REGSTR_VAL_CLASS), debugstr_w(Buffer) ); if (RegSetValueExW(hClassKey, REGSTR_VAL_CLASS, 0, Modified: trunk/rostests/apitests/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/devclas… ============================================================================== --- trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] Sun Jun 4 18:16:24 2017 @@ -89,9 +89,10 @@ if ( size > 0 ) { - /* That's better to use the first class found, as we know for sure that it exists */ - memcpy(&test_class_guid, &guid_list[0], sizeof( GUID ) ); - SetupDiClassNameFromGuidA( &test_class_guid, test_class_name, sizeof( test_class_name ), NULL ); + /* That's better to use the first class found, as we know for sure that it exists */ + memcpy(&test_class_guid, &guid_list[0], sizeof( GUID ) ); + ok( SetupDiClassNameFromGuidA( &test_class_guid, test_class_name, sizeof( test_class_name ), NULL ), + "Error reported %lx\n", GetLastError() ); } HeapFree( GetProcessHeap(), 0, guid_list ); } @@ -131,13 +132,13 @@ "Error reported %lx\n", GetLastError() ); ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + "Expected %s, got %s for class %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ), test_class_name ); SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size + 1, &size ), "Error reported %lx\n", GetLastError() ); ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + "Expected %s, got %s for class %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ), test_class_name ); HeapFree( GetProcessHeap(), 0, guid_list ); } @@ -162,7 +163,7 @@ "Fail expected\n" ); ok_lasterr( ERROR_INSUFFICIENT_BUFFER ); ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); - ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu\n", MAX_CLASS_NAME_LEN, required_size ); + ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu for GUID %s\n", MAX_CLASS_NAME_LEN, required_size, debugstr_guid( &test_class_guid ) ); class_name = HeapAlloc( GetProcessHeap(), 0, required_size ); if ( !class_name )

7 years, 3 months

[ssawant] 74915: [QCKLNCH] -Added .rgs script and other files to facilitate component registration.

by ssawant＠svn.reactos.org

Author: ssawant Date: Sun Jun 4 17:33:06 2017 New Revision: 74915 URL: http://svn.reactos.org/svn/reactos?rev=74915&view=rev Log: [QCKLNCH] -Added .rgs script and other files to facilitate component registration. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs (with props) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -16,6 +16,7 @@ add_library(qcklnch SHARED qcklnch.cpp + qcklnch.rc CQuickLaunchBand.cpp ${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -13,6 +13,20 @@ // {260CB95D-4544-44F6-A079-575BAA60B72F} static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; +//RegComCat function +HRESULT RegisterComCat() +{ + ICatRegister *pcr; + HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_ICatRegister, (void**)&pcr); + if (SUCCEEDED(hr)) + { + CATID catid = CATID_DeskBand; + hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); + pcr->Release(); + } + return hr; +} + //CQuickLaunchBand CQuickLaunchBand::CQuickLaunchBand() : @@ -59,9 +73,9 @@ IN REFIID riid, OUT VOID **ppvSite) { - /*TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); - - if (m_Site != NULL) + TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); + + /* if (m_Site != NULL) { return m_Site->QueryInterface(riid, ppvSite); } @@ -117,8 +131,7 @@ IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) { - //TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); - + TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); return E_FAIL; } @@ -127,14 +140,14 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetClient( IN IUnknown *punkClient) { - /*TRACE("IDeskBar::SetClient(0x%p)\n", punkClient);*/ + TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClient( OUT IUnknown **ppunkClient) { - /*TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient);*/ + TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); return E_NOTIMPL; } @@ -155,7 +168,7 @@ { TRACE("CQuickLaunchBand::GetClassID(0x%p)\n", pClassID); /* We're going to return the (internal!) CLSID of the task band interface */ - //*pClassID = CLSID_ITaskBand; + *pClassID = CLSID_QuickLaunchBand; return S_OK; } @@ -168,7 +181,7 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Load( IN IStream *pStm) { - //TRACE("CQuickLaunchBand::Load called\n"); + TRACE("CQuickLaunchBand::Load called\n"); /* Nothing to do */ return S_OK; } @@ -200,7 +213,7 @@ IN LPARAM lParam, OUT LRESULT *plrResult) { - //TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); + TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); return E_NOTIMPL; } @@ -252,18 +265,3 @@ return E_NOTIMPL; } - - - - - -/*****************************************************************************/ - - /* HRESULT STDMETHODCALLTYPE Initialize(IN OUT ITrayWindow *tray, HWND hWndStartButton) - { - m_Tray = tray; - m_BandID = (DWORD) -1; - m_hWndStartButton = hWndStartButton; - return S_OK; - } -*/ Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -8,6 +8,8 @@ #pragma once extern const GUID CLSID_QuickLaunchBand; + +HRESULT RegisterComCat(); class CQuickLaunchBand : public CComCoClass<CQuickLaunchBand, &CLSID_QuickLaunchBand>, @@ -147,7 +149,8 @@ ); //***************************************************************************************************** - + + DECLARE_REGISTRY_RESOURCEID(1001) DECLARE_NOT_AGGREGATABLE(CQuickLaunchBand) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -13,7 +13,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); BEGIN_OBJECT_MAP(ObjectMap) - //OBJECT_ENTRY(CLSID_QuickLaunchBand, CQuickLaunchBand) + OBJECT_ENTRY(CLSID_QuickLaunchBand, CQuickLaunchBand) END_OBJECT_MAP() HINSTANCE g_hInstance; @@ -45,7 +45,12 @@ STDAPI DllRegisterServer(void) { - return g_Module.DllRegisterServer(FALSE); + HRESULT hr = g_Module.DllRegisterServer(FALSE); + + if (FAILED(hr)) + return hr; + else + return RegisterComCat(); } STDAPI Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -0,0 +1,10 @@ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1001 REGISTRY "rgs/qcklnch.rgs" + +#include <reactos/manifest_dll.rc> + Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {260CB95D-4544-44F6-A079-575BAA60B72F} = s 'QuickLaunchBand' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 3 months

[pschweitzer] 74914: [UDFS] Fix broken implementation of UDFGetFullNameInformation(). Always return full name length so that caller can allocate a big-enough buffer for later call. CORE-4375

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 4 16:59:25 2017 New Revision: 74914 URL: http://svn.reactos.org/svn/reactos?rev=74914&view=rev Log: [UDFS] Fix broken implementation of UDFGetFullNameInformation(). Always return full name length so that caller can allocate a big-enough buffer for later call. CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] Sun Jun 4 16:59:25 2017 @@ -831,20 +831,22 @@ IN OUT PLONG PtrReturnedLength ) { + ULONG BytesToCopy; NTSTATUS RC = STATUS_SUCCESS; AdPrint(("UDFGetFullNameInformation\n")); PtrBuffer->FileNameLength = FileObject->FileName.Length; + BytesToCopy = FileObject->FileName.Length; if (PtrBuffer->FileNameLength + sizeof( ULONG ) > (ULONG)(*PtrReturnedLength)) { - PtrBuffer->FileNameLength = *PtrReturnedLength - sizeof( ULONG ); + BytesToCopy = *PtrReturnedLength - sizeof( ULONG ); RC = STATUS_BUFFER_OVERFLOW; } - RtlCopyMemory( PtrBuffer->FileName, FileObject->FileName.Buffer, PtrBuffer->FileNameLength ); + RtlCopyMemory( PtrBuffer->FileName, FileObject->FileName.Buffer, BytesToCopy ); // Reduce the available bytes by the amount stored into this buffer. *PtrReturnedLength -= sizeof( ULONG ) + PtrBuffer->FileNameLength;

7 years, 3 months

[ekohl] 74913: [NETAPI32] - Implement NetFileClose, NetFileEnum and NetFileGetInfo. These functions call their counterparts in the server service. - Get rid of share.c as it is no longer needed.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 4 15:46:29 2017 New Revision: 74913 URL: http://svn.reactos.org/svn/reactos?rev=74913&view=rev Log: [NETAPI32] - Implement NetFileClose, NetFileEnum and NetFileGetInfo. These functions call their counterparts in the server service. - Get rid of share.c as it is no longer needed. Removed: trunk/reactos/dll/win32/netapi32/share.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/srvsvc.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sun Jun 4 15:46:29 2017 @@ -26,7 +26,6 @@ netapi32.c netbios.c schedule.c - share.c srvsvc.c user.c wksta.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sun Jun 4 15:46:29 2017 @@ -144,9 +144,9 @@ @ stub NetErrorLogClear @ stub NetErrorLogRead @ stub NetErrorLogWrite -@ stub NetFileClose +@ stdcall NetFileClose(wstr long) @ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) -@ stub NetFileGetInfo +@ stdcall NetFileGetInfo(wstr long long ptr) @ stdcall NetGetAnyDCName(wstr wstr ptr) @ stdcall NetGetDCName(wstr wstr ptr) @ stub NetGetDisplayInformationIndex Removed: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/share.c (removed) @@ -1,33 +0,0 @@ -/* Copyright 2006 Paul Vriens - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "netapi32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(share); - -/************************************************************ - * NetFileEnum (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetFileEnum( - LPWSTR ServerName, LPWSTR BasePath, LPWSTR UserName, - DWORD Level, LPBYTE* BufPtr, DWORD PrefMaxLen, - LPDWORD EntriesRead, LPDWORD TotalEntries, PDWORD_PTR ResumeHandle) -{ - FIXME("(%s, %s, %s, %u): stub\n", debugstr_w(ServerName), debugstr_w(BasePath), - debugstr_w(UserName), Level); - return ERROR_NOT_SUPPORTED; -} Modified: trunk/reactos/dll/win32/netapi32/srvsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/srvsvc.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] Sun Jun 4 15:46:29 2017 @@ -72,14 +72,148 @@ NET_API_STATUS WINAPI +NetFileClose( + _In_ LMSTR servername, + _In_ DWORD fileid) +{ + NET_API_STATUS status; + + TRACE("NetFileClose(%s %lu)\n", + debugstr_w(servername), fileid); + + RpcTryExcept + { + status = NetrFileClose(servername, + fileid); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetFileEnum( + _In_ LMSTR servername, + _In_ LMSTR basepath, + _In_ LMSTR username, + _In_ DWORD level, + _Out_ LPBYTE *bufptr, + _In_ DWORD prefmaxlen, + _Out_ LPDWORD entriesread, + _Out_ LPDWORD totalentries, + _Inout_ PDWORD_PTR resume_handle) +{ + FILE_ENUM_STRUCT EnumStruct; + FILE_INFO_2_CONTAINER Level2Container = {0, NULL}; + FILE_INFO_3_CONTAINER Level3Container = {0, NULL}; + NET_API_STATUS status; + + TRACE("NetFileEnum(%s %s %s %lu %p %lu %p %p %p)\n", + debugstr_w(servername), debugstr_w(basepath), debugstr_w(username), + level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + + if (level != 2 && level != 3) + return ERROR_INVALID_LEVEL; + + EnumStruct.Level = level; + switch (level) + { + case 2: + EnumStruct.FileInfo.Level2 = &Level2Container; + break; + + case 3: + EnumStruct.FileInfo.Level3 = &Level3Container; + break; + } + + RpcTryExcept + { + status = NetrFileEnum(servername, + basepath, + username, + &EnumStruct, + prefmaxlen, + totalentries, + (PDWORD)resume_handle); + + switch (level) + { + case 2: + if (EnumStruct.FileInfo.Level2->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.FileInfo.Level2->Buffer; + *entriesread = EnumStruct.FileInfo.Level2->EntriesRead; + } + break; + + case 3: + if (EnumStruct.FileInfo.Level3->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.FileInfo.Level3->Buffer; + *entriesread = EnumStruct.FileInfo.Level3->EntriesRead; + } + break; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetFileGetInfo( + _In_ LMSTR servername, + _In_ DWORD fileid, + _In_ DWORD level, + _Out_ LPBYTE *bufptr) +{ + NET_API_STATUS status; + + TRACE("NetFileGetInfo(%s %lu %lu %p)\n", + debugstr_w(servername), fileid, level, bufptr); + + *bufptr = NULL; + + RpcTryExcept + { + status = NetrFileGetInfo(servername, + fileid, + level, + (LPFILE_INFO)bufptr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI NetRemoteTOD( _In_ LPCWSTR UncServerName, _Out_ LPBYTE *BufferPtr) { NET_API_STATUS status; - TRACE("NetRemoteTOD(%s, %p)\n", debugstr_w(UncServerName), - BufferPtr); + TRACE("NetRemoteTOD(%s %p)\n", + debugstr_w(UncServerName), BufferPtr); *BufferPtr = NULL; @@ -147,7 +281,7 @@ SESSION_INFO_502_CONTAINER Level502Container = {0, NULL}; NET_API_STATUS status; - FIXME("NetSessionEnum(%s %s %s %lu %p %lu %p %p %p)\n", + TRACE("NetSessionEnum(%s %s %s %lu %p %lu %p %p %p)\n", debugstr_w(servername), debugstr_w(UncClientName), debugstr_w(username), level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); @@ -264,7 +398,7 @@ DWORD dwTotalEntries; NET_API_STATUS status; - FIXME("NetSessionGetInfo(%s %s %s %lu %p)\n", + TRACE("NetSessionGetInfo(%s %s %s %lu %p)\n", debugstr_w(servername), debugstr_w(UncClientName), debugstr_w(username), level, bufptr);

7 years, 3 months

[akhaldi] 74912: [README.WINE] Mark some modules as synced with Wine Staging 2.9. CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 4 15:19:05 2017 New Revision: 74912 URL: http://svn.reactos.org/svn/reactos?rev=74912&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 2.9. CORE-13362 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jun 4 15:19:05 2017 @@ -15,235 +15,235 @@ The following build tools are shared with Wine. -reactos/sdk/tools/unicode # Synced to WineStaging-1.9.16 +reactos/sdk/tools/unicode # Synced to WineStaging-2.9 reactos/sdk/tools/widl # Synced to WineStaging-2.9 -reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 +reactos/sdk/tools/wpp # Synced to WineStaging-2.9 The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/amstream # Synced to WineStaging-2.9 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/d3drm # Synced to WineStaging-2.9 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-2.9 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-2.9 reactos/dll/directx/wine/dinput # Synced to WineStaging-2.9 -reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-2.9 reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9 -reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dplay # Synced to WineStaging-2.9 reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.9 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 -reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-2.9 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-2.9 +reactos/dll/directx/wine/qedit # Synced to WineStaging-2.9 reactos/dll/directx/wine/quartz # Synced to WineStaging-2.9 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 -reactos/dll/win32/activeds # Synced to WineStaging-1.9.11 -reactos/dll/win32/actxprxy # Synced to WineStaging-1.9.11 +reactos/dll/win32/activeds # Synced to WineStaging-2.9 +reactos/dll/win32/actxprxy # Synced to WineStaging-2.9 reactos/dll/win32/advpack # Synced to WineStaging-2.9 -reactos/dll/win32/atl # Synced to WineStaging-2.2 -reactos/dll/win32/atl80 # Synced to WineStaging-1.9.11 -reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11 +reactos/dll/win32/atl # Synced to WineStaging-2.9 +reactos/dll/win32/atl80 # Synced to WineStaging-2.9 +reactos/dll/win32/atl100 # Synced to WineStaging-2.9 reactos/dll/win32/avifil32 # Synced to WineStaging-2.9 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-2.2 -reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 +reactos/dll/win32/cabinet # Synced to WineStaging-2.9 +reactos/dll/win32/clusapi # Synced to WineStaging-2.9 +reactos/dll/win32/comcat # Synced to WineStaging-2.9 reactos/dll/win32/comctl32 # Synced to WineStaging-2.9 reactos/dll/win32/comdlg32 # Synced to WineStaging-2.9 -reactos/dll/win32/compstui # Synced to WineStaging-2.2 +reactos/dll/win32/compstui # Synced to WineStaging-2.9 reactos/dll/win32/credui # Synced to WineStaging-2.9 reactos/dll/win32/crypt32 # Synced to WineStaging-2.9 -reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 -reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 +reactos/dll/win32/cryptdlg # Synced to WineStaging-2.9 +reactos/dll/win32/cryptdll # Synced to WineStaging-2.9 reactos/dll/win32/cryptnet # Synced to WineStaging-2.9 -reactos/dll/win32/cryptui # Synced to WineStaging-1.9.16 +reactos/dll/win32/cryptui # Synced to WineStaging-2.9 reactos/dll/win32/dbghelp # Synced to WineStaging-2.9 -reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 -reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 -reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 +reactos/dll/win32/dciman32 # Synced to WineStaging-2.9 +reactos/dll/win32/faultrep # Synced to WineStaging-2.9 +reactos/dll/win32/fontsub # Synced to WineStaging-2.9 +reactos/dll/win32/fusion # Synced to WineStaging-2.9 reactos/dll/win32/gdiplus # Synced to WineStaging-2.9 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.9 reactos/dll/win32/hlink # Synced to WineStaging-2.9 -reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 +reactos/dll/win32/hnetcfg # Synced to WineStaging-2.9 reactos/dll/win32/httpapi # Synced to WineStaging-2.9 -reactos/dll/win32/iccvid # Synced to WineStaging-2.2 +reactos/dll/win32/iccvid # Synced to WineStaging-2.9 reactos/dll/win32/ieframe # Synced to WineStaging-2.9 -reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.2 -reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 +reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.9 +reactos/dll/win32/imagehlp # Synced to WineStaging-2.9 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-2.9 -reactos/dll/win32/inetmib1 # Synced to WineStaging-1.9.11 -reactos/dll/win32/initpki # Synced to WineStaging-1.9.11 -reactos/dll/win32/inseng # Synced to WineStaging-2.2 +reactos/dll/win32/inetmib1 # Synced to WineStaging-2.9 +reactos/dll/win32/initpki # Synced to WineStaging-2.9 +reactos/dll/win32/inseng # Synced to WineStaging-2.9 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 -reactos/dll/win32/itss # Synced to WineStaging-2.2 +reactos/dll/win32/itircl # Synced to WineStaging-2.9 +reactos/dll/win32/itss # Synced to WineStaging-2.9 reactos/dll/win32/jscript # Synced to WineStaging-2.9 -reactos/dll/win32/jsproxy # Synced to WineStaging-2.2 -reactos/dll/win32/loadperf # Synced to WineStaging-2.2 -reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mapi32 # Synced to WineStaging-2.2 +reactos/dll/win32/jsproxy # Synced to WineStaging-2.9 +reactos/dll/win32/loadperf # Synced to WineStaging-2.9 +reactos/dll/win32/lz32 # Synced to WineStaging-2.9 +reactos/dll/win32/mapi32 # Synced to WineStaging-2.9 reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 -reactos/dll/win32/mcicda # Synced to WineStaging-1.9.16 -reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.2 -reactos/dll/win32/mciseq # Synced to WineStaging-1.9.11 -reactos/dll/win32/mciwave # Synced to WineStaging-1.9.11 -reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/mlang # Synced to WineStaging-1.9.16 +reactos/dll/win32/mcicda # Synced to WineStaging-2.9 +reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9 +reactos/dll/win32/mciseq # Synced to WineStaging-2.9 +reactos/dll/win32/mciwave # Synced to WineStaging-2.9 +reactos/dll/win32/mgmtapi # Synced to WineStaging-2.9 +reactos/dll/win32/mlang # Synced to WineStaging-2.9 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.23 -reactos/dll/win32/mpr # Synced to WineStaging-2.2 -reactos/dll/win32/mprapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/msacm32 # Synced to WineStaging-2.2 -reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.11 -reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.9.11 -reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mpr # Synced to WineStaging-2.9 +reactos/dll/win32/mprapi # Synced to WineStaging-2.9 +reactos/dll/win32/msacm32 # Synced to WineStaging-2.9 +reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9 +reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9 +reactos/dll/win32/mscat32 # Synced to WineStaging-2.9 reactos/dll/win32/mscms # Synced to WineStaging-2.9 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-2.2 -reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11 -reactos/dll/win32/msg711.acm # Synced to WineStaging-2.2 -reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11 +reactos/dll/win32/msctf # Synced to WineStaging-2.9 +reactos/dll/win32/msftedit # Synced to WineStaging-2.9 +reactos/dll/win32/msg711.acm # Synced to WineStaging-2.9 +reactos/dll/win32/msgsm32.acm # Synced to WineStaging-2.9 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-2.9 -reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msimtf # Synced to WineStaging-1.9.23 -reactos/dll/win32/msisip # Synced to WineStaging-1.9.11 -reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.9.11 -reactos/dll/win32/msnet32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mspatcha # Synced to WineStaging-1.9.11 -reactos/dll/win32/msrle32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mssign32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mssip32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mstask # Synced to WineStaging-1.9.11 +reactos/dll/win32/msimg32 # Synced to WineStaging-2.9 +reactos/dll/win32/msimtf # Synced to WineStaging-2.9 +reactos/dll/win32/msisip # Synced to WineStaging-2.9 +reactos/dll/win32/msisys.ocx # Synced to WineStaging-2.9 +reactos/dll/win32/msnet32 # Synced to WineStaging-2.9 +reactos/dll/win32/mspatcha # Synced to WineStaging-2.9 +reactos/dll/win32/msrle32 # Synced to WineStaging-2.9 +reactos/dll/win32/mssign32 # Synced to WineStaging-2.9 +reactos/dll/win32/mssip32 # Synced to WineStaging-2.9 +reactos/dll/win32/mstask # Synced to WineStaging-2.9 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to WineStaging-2.2 -reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msxml # Synced to WineStaging-1.9.11 -reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.11 +reactos/dll/win32/msvfw32 # Synced to WineStaging-2.9 +reactos/dll/win32/msvidc32 # Synced to WineStaging-2.9 +reactos/dll/win32/msxml # Synced to WineStaging-2.9 +reactos/dll/win32/msxml2 # Synced to WineStaging-2.9 reactos/dll/win32/msxml3 # Synced to WineStaging-2.9 -reactos/dll/win32/msxml4 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msxml6 # Synced to WineStaging-1.9.11 -reactos/dll/win32/nddeapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/msxml4 # Synced to WineStaging-2.9 +reactos/dll/win32/msxml6 # Synced to WineStaging-2.9 +reactos/dll/win32/nddeapi # Synced to WineStaging-2.9 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/npptools # Synced to WineStaging-1.9.11 -reactos/dll/win32/ntdsapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/objsel # Synced to WineStaging-1.9.11 +reactos/dll/win32/npptools # Synced to WineStaging-2.9 +reactos/dll/win32/ntdsapi # Synced to WineStaging-2.9 +reactos/dll/win32/objsel # Synced to WineStaging-2.9 reactos/dll/win32/odbc32 # Synced to WineStaging-2.9. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-2.9 reactos/dll/win32/ole32 # Synced to WineStaging-2.9 -reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11 +reactos/dll/win32/oleacc # Synced to WineStaging-2.9 reactos/dll/win32/oleaut32 # Synced to WineStaging-2.9 -reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/olecli32 # Synced to WineStaging-2.9 reactos/dll/win32/oledlg # Synced to WineStaging-2.9 -reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/olesvr32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/olethk32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/olepro32 # Synced to WineStaging-2.9 +reactos/dll/win32/olesvr32 # Synced to WineStaging-2.9 +reactos/dll/win32/olethk32 # Synced to WineStaging-2.9 reactos/dll/win32/pdh # Synced to WineStaging-2.9 -reactos/dll/win32/pidgen # Synced to WineStaging-1.9.11 +reactos/dll/win32/pidgen # Synced to WineStaging-2.9 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to WineStaging-1.9.11 +reactos/dll/win32/printui # Synced to WineStaging-2.9 reactos/dll/win32/propsys # Synced to WineStaging-2.9 reactos/dll/win32/pstorec # Synced to WineStaging-2.2 -reactos/dll/win32/qmgr # Synced to WineStaging-1.9.23 -reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.11 -reactos/dll/win32/query # Synced to WineStaging-1.9.11 -reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/resutils # Synced to WineStaging-1.9.11 +reactos/dll/win32/qmgr # Synced to WineStaging-2.9 +reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9 +reactos/dll/win32/query # Synced to WineStaging-2.9 +reactos/dll/win32/rasapi32 # Synced to WineStaging-2.9 +reactos/dll/win32/resutils # Synced to WineStaging-2.9 reactos/dll/win32/riched20 # Synced to WineStaging-2.9 -reactos/dll/win32/riched32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/riched32 # Synced to WineStaging-2.9 reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.9 -reactos/dll/win32/rsabase # Synced to WineStaging-1.9.11 +reactos/dll/win32/rsabase # Synced to WineStaging-2.9 reactos/dll/win32/rsaenh # Synced to WineStaging-2.9 -reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11 -reactos/dll/win32/schannel # Synced to WineStaging-1.9.11 +reactos/dll/win32/sccbase # Synced to WineStaging-2.9 +reactos/dll/win32/schannel # Synced to WineStaging-2.9 reactos/dll/win32/scrrun # Synced to WineStaging-2.9 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/sensapi # Synced to WineStaging-2.9 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to WineStaging-1.9.11 -reactos/dll/win32/shdocvw # Synced to WineStaging-2.2 +reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 +reactos/dll/win32/shdocvw # Synced to WineStaging-2.9 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to WineStaging-1.9.11 +reactos/dll/win32/shfolder # Synced to WineStaging-2.9 reactos/dll/win32/shlwapi # Synced to WineStaging-2.9 -reactos/dll/win32/slbcsp # Synced to WineStaging-1.9.11 -reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/softpub # Synced to WineStaging-1.9.11 -reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.11 -reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11 -reactos/dll/win32/sti # Synced to WineStaging-1.9.23 -reactos/dll/win32/sxs # Synced to WineStaging-1.9.11 -reactos/dll/win32/t2embed # Synced to WineStaging-1.9.23 -reactos/dll/win32/tapi32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/traffic # Synced to WineStaging-1.9.11 -reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/url # Synced to WineStaging-1.9.11 +reactos/dll/win32/slbcsp # Synced to WineStaging-2.9 +reactos/dll/win32/snmpapi # Synced to WineStaging-2.9 +reactos/dll/win32/softpub # Synced to WineStaging-2.9 +reactos/dll/win32/stdole2.tlb # Synced to WineStaging-2.9 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-2.9 +reactos/dll/win32/sti # Synced to WineStaging-2.9 +reactos/dll/win32/sxs # Synced to WineStaging-2.9 +reactos/dll/win32/t2embed # Synced to WineStaging-2.9 +reactos/dll/win32/tapi32 # Synced to WineStaging-2.9 +reactos/dll/win32/traffic # Synced to WineStaging-2.9 +reactos/dll/win32/twain_32 # Synced to WineStaging-2.9 +reactos/dll/win32/updspapi # Synced to WineStaging-2.9 +reactos/dll/win32/url # Synced to WineStaging-2.9 reactos/dll/win32/urlmon # Synced to WineStaging-2.9 reactos/dll/win32/usp10 # Synced to WineStaging-2.9 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-2.9 reactos/dll/win32/version # Synced to WineStaging-2.9 -reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/vssapi # Synced to WineStaging-2.9 reactos/dll/win32/wbemdisp # Synced to WineStaging-2.9 reactos/dll/win32/wbemprox # Synced to WineStaging-2.9 reactos/dll/win32/windowscodecs # Synced to WineStaging-2.9 -reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 -reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.2 -reactos/dll/win32/wing32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/windowscodecsext # Synced to WineStaging-2.9 +reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.9 +reactos/dll/win32/wing32 # Synced to WineStaging-2.9 reactos/dll/win32/winhttp # Synced to WineStaging-2.9 reactos/dll/win32/wininet # Synced to WineStaging-2.9 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/winscard # Synced to WineStaging-2.2 +reactos/dll/win32/winscard # Synced to WineStaging-2.9 reactos/dll/win32/wintrust # Synced to WineStaging-2.9 -reactos/dll/win32/wldap32 # Synced to WineStaging-2.2 -reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 +reactos/dll/win32/wldap32 # Synced to WineStaging-2.9 +reactos/dll/win32/wmi # Synced to WineStaging-2.9 reactos/dll/win32/wmiutils # Synced to WineStaging-2.9 -reactos/dll/win32/wmvcore # Synced to WineStaging-2.2 +reactos/dll/win32/wmvcore # Synced to WineStaging-2.9 reactos/dll/win32/wshom.ocx # Synced to WineStaging-2.9 -reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/wuapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.9.11 -reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.9.11 -reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.2 -reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.11 +reactos/dll/win32/wtsapi32 # Synced to WineStaging-2.9 +reactos/dll/win32/wuapi # Synced to WineStaging-2.9 +reactos/dll/win32/xinput1_1 # Synced to WineStaging-2.9 +reactos/dll/win32/xinput1_2 # Synced to WineStaging-2.9 +reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.9 +reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-2.9 reactos/dll/win32/xmllite # Synced to WineStaging-2.9 -reactos/dll/cpl/inetcpl # Synced to WineStaging-1.9.11 - -reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-1.9.11 (known there as /dll/win32/localui) +reactos/dll/cpl/inetcpl # Synced to WineStaging-2.9 + +reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-2.9 (known there as /dll/win32/localui) ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.9.11 -reactos/base/applications/cmdutils/reg # Synced to WineStaging-2.2 -reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-1.9.14 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.2 -reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.16 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/reg # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9 reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources. -reactos/base/applications/extrac32 # Synced to WineStaging-1.9.11 +reactos/base/applications/extrac32 # Synced to WineStaging-2.9 reactos/base/applications/iexplore # Synced to WineStaging-2.9 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.16 reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 -reactos/base/applications/write # Synced to WineStaging-1.9.16 +reactos/base/applications/write # Synced to WineStaging-2.9 reactos/base/services/rpcss # Synced to WineStaging-1.9.16 -reactos/base/system/expand # Synced to WineStaging-1.9.11 -reactos/base/system/msiexec # Synced to WineStaging-1.9.11 +reactos/base/system/expand # Synced to WineStaging-2.9 +reactos/base/system/msiexec # Synced to WineStaging-2.9 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

7 years, 3 months

← Newer
1
...
31
32
33
34
35
36
37
...
53
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 June 2017