Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[hbelusca] 70917: [AUTOCHK][CHKDSK] - Whitespace fixes; - Remove useless comments. [FORMAT] - Whitespace (tabs -> spaces) and indentation fixes. [VFATLIB] - Change of name of variable.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 4 17:09:34 2016 New Revision: 70917 URL: http://svn.reactos.org/svn/reactos?rev=70917&view=rev Log: [AUTOCHK][CHKDSK] - Whitespace fixes; - Remove useless comments. [FORMAT] - Whitespace (tabs -> spaces) and indentation fixes. [VFATLIB] - Change of name of variable. Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/base/system/chkdsk/chkdsk.c trunk/reactos/base/system/format/format.c trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Fri Mar 4 17:09:34 2016 @@ -297,7 +297,7 @@ /* Get the file system */ Status = GetFileSystem(DrivePath, FileSystem, - sizeof(FileSystem) / sizeof(FileSystem[0])); + ARRAYSIZE(FileSystem)); if (!NT_SUCCESS(Status)) { DPRINT1("GetFileSystem() failed with status 0x%08lx\n", Status); @@ -334,7 +334,7 @@ NtDrivePath[wcslen(NtDrivePath)-1] = 0; RtlInitUnicodeString(&DrivePathU, NtDrivePath); - DPRINT("AUTOCHK: Checking %wZ\n", &DrivePathU); + DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); Status = ChkdskFunc(&DrivePathU, TRUE, // FixErrors TRUE, // Verbose Modified: trunk/reactos/base/system/chkdsk/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/chkdsk/chkdsk.… ============================================================================== --- trunk/reactos/base/system/chkdsk/chkdsk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/chkdsk/chkdsk.c [iso-8859-1] Fri Mar 4 17:09:34 2016 @@ -29,13 +29,13 @@ // -------------------------------------------------------------------- // // 1999 February (Emanuele Aliberti) -// Adapted for ReactOS and lcc-win32. +// Adapted for ReactOS and lcc-win32. // // 1999 April (Emanuele Aliberti) -// Adapted for ReactOS and egcs. +// Adapted for ReactOS and egcs. // // 2008 July (Aleksey Bragin) -// Cleanup, use ReactOS's fmifs.h +// Cleanup, use ReactOS's fmifs.h // //====================================================================== @@ -70,10 +70,10 @@ #ifndef FMIFS_IMPORT_DLL // -// FMIFS function -// -// PCHKDSK Chkdsk; -#endif /* ndef FMIFS_IMPORT_DLL */ +// Functions in FMIFS.DLL +// +PCHKDSK Chkdsk; +#endif //---------------------------------------------------------------------- @@ -144,10 +144,7 @@ // //---------------------------------------------------------------------- static int -ParseCommandLine( - int argc, - WCHAR *argv[] - ) +ParseCommandLine(int argc, WCHAR *argv[]) { int i; BOOLEAN gotFix = FALSE; @@ -231,8 +228,7 @@ ChkdskCallback( CALLBACKCOMMAND Command, DWORD Modifier, - PVOID Argument - ) + PVOID Argument) { PDWORD percent; PBOOLEAN status; @@ -329,8 +325,6 @@ // // Loads FMIFS.DLL and locates the entry point(s) we are going to use // -// 19990216 EA Used wide functions -// //---------------------------------------------------------------------- static BOOLEAN LoadFMIFSEntryPoints(VOID) @@ -340,7 +334,6 @@ return FALSE; Chkdsk = (PCHKDSK)GetProcAddress(hFmifs, "Chkdsk"); - if (!Chkdsk) { FreeLibrary(hFmifs); @@ -349,7 +342,7 @@ return TRUE; } -#endif /* ndef FMIFS_IMPORT_DLL */ +#endif //---------------------------------------------------------------------- @@ -374,10 +367,10 @@ DWORD serialNumber; DWORD flags, maxComponent; - wprintf(L"\n\ -Chkdskx v1.0.1 by Mark Russinovich\n\ -Systems Internals - http://www.sysinternals.com/\n\ -ReactOS adaptation 1999 by Emanuele Aliberti\n\n"); + wprintf(L"\n" + L"Chkdskx v1.0.1 by Mark Russinovich\n" + L"Systems Internals - http://www.sysinternals.com\n" + L"ReactOS adaptation 1999 by Emanuele Aliberti\n\n"); #ifndef FMIFS_IMPORT_DLL // @@ -388,7 +381,7 @@ wprintf(L"Could not located FMIFS entry points.\n\n"); return -1; } -#endif /* ndef FMIFS_IMPORT_DLL */ +#endif // // Parse command line Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Fri Mar 4 17:09:34 2016 @@ -60,19 +60,19 @@ #define FMIFS_IMPORT_DLL // Globals -BOOL Error = FALSE; +BOOL Error = FALSE; // switches -BOOL QuickFormat = FALSE; -DWORD ClusterSize = 0; -BOOL CompressDrive = FALSE; -BOOL GotALabel = FALSE; -PWCHAR Label = L""; -PWCHAR Drive = NULL; -PWCHAR FileSystem = L"FAT"; - -WCHAR RootDirectory[MAX_PATH]; -WCHAR LabelString[12]; +BOOL QuickFormat = FALSE; +DWORD ClusterSize = 0; +BOOL CompressDrive = FALSE; +BOOL GotALabel = FALSE; +PWCHAR Label = L""; +PWCHAR Drive = NULL; +PWCHAR FileSystem = L"FAT"; + +WCHAR RootDirectory[MAX_PATH]; +WCHAR LabelString[12]; #ifndef FMIFS_IMPORT_DLL // @@ -88,22 +88,22 @@ // Size array // typedef struct { - WCHAR SizeString[16]; - DWORD ClusterSize; + WCHAR SizeString[16]; + DWORD ClusterSize; } SIZEDEFINITION, *PSIZEDEFINITION; SIZEDEFINITION LegalSizes[] = { - { L"512", 512 }, - { L"1024", 1024 }, - { L"2048", 2048 }, - { L"4096", 4096 }, - { L"8192", 8192 }, - { L"16K", 16384 }, - { L"32K", 32768 }, - { L"64K", 65536 }, - { L"128K", 65536 * 2 }, - { L"256K", 65536 * 4 }, - { L"", 0 }, + { L"512", 512 }, + { L"1024", 1024 }, + { L"2048", 2048 }, + { L"4096", 4096 }, + { L"8192", 8192 }, + { L"16K", 16384 }, + { L"32K", 32768 }, + { L"64K", 65536 }, + { L"128K", 65536 * 2 }, + { L"256K", 65536 * 4 }, + { L"", 0 }, }; @@ -147,17 +147,17 @@ // Takes the win32 error code and prints the text version. // //---------------------------------------------------------------------- -static VOID PrintWin32Error( LPWSTR Message, DWORD ErrorCode ) -{ - LPWSTR lpMsgBuf; - - FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, ErrorCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPWSTR)&lpMsgBuf, 0, NULL ); - - PrintString(L"%s: %s\n", Message, lpMsgBuf ); - LocalFree( lpMsgBuf ); +static VOID PrintWin32Error(LPWSTR Message, DWORD ErrorCode) +{ + LPWSTR lpMsgBuf; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMsgBuf, 0, NULL); + + PrintString(L"%s: %s\n", Message, lpMsgBuf); + LocalFree(lpMsgBuf); } @@ -168,73 +168,77 @@ // Get the switches. // //---------------------------------------------------------------------- -static int ParseCommandLine( int argc, WCHAR *argv[] ) -{ - int i, j; - BOOLEAN gotFormat = FALSE; - BOOLEAN gotQuick = FALSE; - BOOLEAN gotSize = FALSE; - BOOLEAN gotLabel = FALSE; - BOOLEAN gotCompressed = FALSE; - - - for( i = 1; i < argc; i++ ) { - - switch( argv[i][0] ) { - - case L'-': - case L'/': - - if( !_wcsnicmp( &argv[i][1], L"FS:", 3 )) { - - if( gotFormat) return -1; - FileSystem = &argv[i][4]; - gotFormat = TRUE; - - - } else if( !_wcsnicmp( &argv[i][1], L"A:", 2 )) { - - if( gotSize ) return -1; - j = 0; - while( LegalSizes[j].ClusterSize && - wcsicmp( LegalSizes[j].SizeString, &argv[i][3] )) j++; - - if( !LegalSizes[j].ClusterSize ) return i; - ClusterSize = LegalSizes[j].ClusterSize; - gotSize = TRUE; - - } else if( ! _wcsnicmp( &argv[i][1], L"V:", 2 )) { - - if( gotLabel ) return -1; - Label = &argv[i][3]; - gotLabel = TRUE; - GotALabel = TRUE; - - } else if( !wcsicmp( &argv[i][1], L"Q" )) { - - if( gotQuick ) return -1; - QuickFormat = TRUE; - gotQuick = TRUE; - - } else if( !wcsicmp( &argv[i][1], L"C" )) { - - if( gotCompressed ) return -1; - CompressDrive = TRUE; - gotCompressed = TRUE; - - } else return i; - break; - - default: - - if( Drive ) return i; - if( argv[i][1] != L':' ) return i; - - Drive = argv[i]; - break; - } - } - return 0; +static int ParseCommandLine(int argc, WCHAR *argv[]) +{ + int i, j; + BOOLEAN gotFormat = FALSE; + BOOLEAN gotQuick = FALSE; + BOOLEAN gotSize = FALSE; + BOOLEAN gotLabel = FALSE; + BOOLEAN gotCompressed = FALSE; + + for (i = 1; i < argc; i++) + { + switch (argv[i][0]) + { + case L'-': case L'/': + + if (!_wcsnicmp(&argv[i][1], L"FS:", 3)) + { + if (gotFormat) return -1; + FileSystem = &argv[i][4]; + gotFormat = TRUE; + } + else if (!_wcsnicmp(&argv[i][1], L"A:", 2)) + { + if (gotSize) return -1; + j = 0; + while (LegalSizes[j].ClusterSize && + wcsicmp(LegalSizes[j].SizeString, &argv[i][3])) + { + j++; + } + + if (!LegalSizes[j].ClusterSize) return i; + ClusterSize = LegalSizes[j].ClusterSize; + gotSize = TRUE; + } + else if (!_wcsnicmp(&argv[i][1], L"V:", 2)) + { + if (gotLabel) return -1; + Label = &argv[i][3]; + gotLabel = TRUE; + GotALabel = TRUE; + } + else if (!wcsicmp(&argv[i][1], L"Q")) + { + if (gotQuick) return -1; + QuickFormat = TRUE; + gotQuick = TRUE; + } + else if (!wcsicmp(&argv[i][1], L"C")) + { + if (gotCompressed) return -1; + CompressDrive = TRUE; + gotCompressed = TRUE; + } + else + { + return i; + } + break; + + default: + { + if (Drive) return i; + if (argv[i][1] != L':') return i; + + Drive = argv[i]; + break; + } + } + } + return 0; } //---------------------------------------------------------------------- @@ -246,56 +250,57 @@ // //---------------------------------------------------------------------- BOOLEAN WINAPI -FormatExCallback ( - CALLBACKCOMMAND Command, - ULONG Modifier, - PVOID Argument) -{ - PDWORD percent; - PTEXTOUTPUT output; - PBOOLEAN status; - - // - // We get other types of commands, but we don't have to pay attention to them - // - switch( Command ) { - - case PROGRESS: - percent = (PDWORD) Argument; - PrintResourceString(STRING_COMPLETE, *percent); - break; - - case OUTPUT: - output = (PTEXTOUTPUT) Argument; - wprintf(L"%S", output->Output); - break; - - case DONE: - status = (PBOOLEAN) Argument; - if( *status == FALSE ) { - - PrintResourceString(STRING_FORMAT_FAIL); - Error = TRUE; - } - break; - case DONEWITHSTRUCTURE: - case UNKNOWN2: - case UNKNOWN3: - case UNKNOWN4: - case UNKNOWN5: - case INSUFFICIENTRIGHTS: - case FSNOTSUPPORTED: - case VOLUMEINUSE: - case UNKNOWN9: - case UNKNOWNA: - case UNKNOWNC: - case UNKNOWND: - case STRUCTUREPROGRESS: - case CLUSTERSIZETOOSMALL: - PrintResourceString(STRING_NO_SUPPORT); - return FALSE; - } - return TRUE; +FormatExCallback( + CALLBACKCOMMAND Command, + ULONG Modifier, + PVOID Argument) +{ + PDWORD percent; + PTEXTOUTPUT output; + PBOOLEAN status; + + // + // We get other types of commands, but we don't have to pay attention to them + // + switch (Command) + { + case PROGRESS: + percent = (PDWORD)Argument; + PrintResourceString(STRING_COMPLETE, *percent); + break; + + case OUTPUT: + output = (PTEXTOUTPUT)Argument; + wprintf(L"%S", output->Output); + break; + + case DONE: + status = (PBOOLEAN)Argument; + if (*status == FALSE) + { + PrintResourceString(STRING_FORMAT_FAIL); + Error = TRUE; + } + break; + + case DONEWITHSTRUCTURE: + case UNKNOWN2: + case UNKNOWN3: + case UNKNOWN4: + case UNKNOWN5: + case INSUFFICIENTRIGHTS: + case FSNOTSUPPORTED: + case VOLUMEINUSE: + case UNKNOWN9: + case UNKNOWNA: + case UNKNOWNC: + case UNKNOWND: + case STRUCTUREPROGRESS: + case CLUSTERSIZETOOSMALL: + PrintResourceString(STRING_NO_SUPPORT); + return FALSE; + } + return TRUE; } #ifndef FMIFS_IMPORT_DLL @@ -308,30 +313,32 @@ //---------------------------------------------------------------------- static BOOLEAN LoadFMIFSEntryPoints(VOID) { - HMODULE hFmifs = LoadLibraryW( L"fmifs.dll" ); - if (hFmifs == NULL) { - return FALSE; - } + HMODULE hFmifs = LoadLibraryW( L"fmifs.dll"); + if (hFmifs == NULL) + return FALSE; FormatEx = (PFORMATEX)GetProcAddress(hFmifs, "FormatEx"); - if (!FormatEx) { - FreeLibrary(hFmifs); - return FALSE; - } + if (!FormatEx) + { + FreeLibrary(hFmifs); + return FALSE; + } EnableVolumeCompression = (PENABLEVOLUMECOMPRESSION)GetProcAddress(hFmifs, "EnableVolumeCompression"); - if (!EnableVolumeCompression) { - FreeLibrary(hFmifs); - return FALSE; - } + if (!EnableVolumeCompression) + { + FreeLibrary(hFmifs); + return FALSE; + } QueryAvailableFileSystemFormat = (PQUERYAVAILABLEFILESYSTEMFORMAT)GetProcAddress(hFmifs, "QueryAvailableFileSystemFormat"); - if (!QueryAvailableFileSystemFormat) { - FreeLibrary(hFmifs); - return FALSE; - } - - return TRUE; + if (!QueryAvailableFileSystemFormat) + { + FreeLibrary(hFmifs); + return FALSE; + } + + return TRUE; } #endif @@ -343,36 +350,36 @@ // Tell the user how to use the program // //---------------------------------------------------------------------- -static VOID Usage( LPWSTR ProgramName ) -{ - WCHAR szMsg[RC_STRING_MAX_SIZE]; - WCHAR szFormats[MAX_PATH]; - WCHAR szFormatW[MAX_PATH]; - DWORD Index = 0; - BYTE dummy; - BOOLEAN latestVersion; +static VOID Usage(LPWSTR ProgramName) +{ + WCHAR szMsg[RC_STRING_MAX_SIZE]; + WCHAR szFormats[MAX_PATH]; + WCHAR szFormatW[MAX_PATH]; + DWORD Index = 0; + BYTE dummy; + BOOLEAN latestVersion; LoadStringW(GetModuleHandle(NULL), STRING_HELP, szMsg, ARRAYSIZE(szMsg)); #ifndef FMIFS_IMPORT_DLL - if (!LoadFMIFSEntryPoints()) - { + if (!LoadFMIFSEntryPoints()) + { PrintString(szMsg, ProgramName, L""); - return; - } + return; + } #endif - szFormats[0] = 0; - while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) - { - if (!latestVersion) - continue; - if (szFormats[0]) - wcscat(szFormats, L", "); - - wcscat(szFormats, szFormatW); - } - PrintString(szMsg, ProgramName, szFormats); + szFormats[0] = 0; + while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) + { + if (!latestVersion) + continue; + if (szFormats[0]) + wcscat(szFormats, L", "); + + wcscat(szFormats, szFormatW); + } + PrintString(szMsg, ProgramName, szFormats); } @@ -390,274 +397,276 @@ //---------------------------------------------------------------------- int wmain(int argc, WCHAR *argv[]) { - int badArg; - DWORD media = FMIFS_HARDDISK; - DWORD driveType; - WCHAR fileSystem[1024]; - WCHAR volumeName[1024]; - WCHAR input[1024]; - DWORD serialNumber; - DWORD flags, maxComponent; - ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; - WCHAR szMsg[RC_STRING_MAX_SIZE]; - - wprintf(L"\n" + int badArg; + DWORD media = FMIFS_HARDDISK; + DWORD driveType; + WCHAR fileSystem[1024]; + WCHAR volumeName[1024]; + WCHAR input[1024]; + DWORD serialNumber; + DWORD flags, maxComponent; + ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + + wprintf(L"\n" L"Formatx v1.0 by Mark Russinovich\n" L"Systems Internals - http://www.sysinternals.com\n" L"ReactOS adaptation 1999 by Emanuele Aliberti\n\n"); #ifndef FMIFS_IMPORT_DLL - // - // Get function pointers - // - if( !LoadFMIFSEntryPoints()) { - PrintResourceString(STRING_FMIFS_FAIL); - return -1; - } + // + // Get function pointers + // + if (!LoadFMIFSEntryPoints()) + { + PrintResourceString(STRING_FMIFS_FAIL); + return -1; + } #endif - // - // Parse command line - // - if( (badArg = ParseCommandLine( argc, argv ))) { - - PrintResourceString(STRING_UNKNOW_ARG, argv[badArg]); - - Usage(argv[0]); - return -1; - } - - // - // Get the drive's format - // - if( !Drive ) { - - PrintResourceString(STRING_DRIVE_PARM); - Usage( argv[0] ); - return -1; - - } else { - - wcscpy( RootDirectory, Drive ); - } - RootDirectory[2] = L'\\'; - RootDirectory[3] = L'\0'; - - // - // See if the drive is removable or not - // - driveType = GetDriveTypeW( RootDirectory ); - switch (driveType) - { - case DRIVE_UNKNOWN : - LoadStringW(GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - - case DRIVE_REMOTE: - case DRIVE_CDROM: - PrintResourceString(STRING_NO_SUPPORT); - return -1; - - case DRIVE_NO_ROOT_DIR: - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - - case DRIVE_REMOVABLE: - PrintResourceString(STRING_INSERT_DISK, RootDirectory[0]); - fgetws( input, ARRAYSIZE(input), stdin ); - media = FMIFS_FLOPPY; - break; - - case DRIVE_FIXED: - case DRIVE_RAMDISK: - media = FMIFS_HARDDISK; - break; - } - - // Reject attempts to format the system drive - { - WCHAR path[MAX_PATH + 1]; - UINT rc; - rc = GetWindowsDirectoryW(path, MAX_PATH); - if (rc == 0 || rc > MAX_PATH) - // todo: Report "Unable to query system directory" - return -1; - if (towlower(path[0]) == towlower(Drive[0])) - { - // todo: report "Cannot format system drive" - PrintResourceString(STRING_NO_SUPPORT); - return -1; - } - } - - // - // Determine the drive's file system format - // - if( !GetVolumeInformationW( RootDirectory, - volumeName, ARRAYSIZE(volumeName), - &serialNumber, &maxComponent, &flags, - fileSystem, ARRAYSIZE(fileSystem))) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - - if( !GetDiskFreeSpaceExW( RootDirectory, - &freeBytesAvailableToCaller, - &totalNumberOfBytes, - &totalNumberOfFreeBytes )) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - PrintResourceString(STRING_FILESYSTEM, fileSystem); - - // - // Make sure they want to do this - // - if( driveType == DRIVE_FIXED ) { - - if( volumeName[0] ) { - - while(1 ) { - - PrintResourceString(STRING_LABEL_NAME_EDIT, RootDirectory[0]); - fgetws( input, ARRAYSIZE(input), stdin ); - input[ wcslen( input ) - 1] = 0; - - if( !wcsicmp( input, volumeName )) { - - break; - } - PrintResourceString(STRING_ERROR_LABEL); - } - } - - PrintResourceString(STRING_YN_FORMAT, RootDirectory[0]); - - LoadStringW(GetModuleHandle(NULL), STRING_YES_NO_FAQ, szMsg, ARRAYSIZE(szMsg)); - - while( 1 ) { - fgetws( input, ARRAYSIZE(input), stdin ); - if(_wcsnicmp(&input[0],&szMsg[0],1) == 0) break; - if(_wcsnicmp(&input[0],&szMsg[1],1) == 0) { - wprintf(L"\n"); - return 0; - } - } - } - - // - // Tell the user we're doing a long format if appropriate - // - if( !QuickFormat ) { - - LoadStringW(GetModuleHandle(NULL), STRING_VERIFYING, szMsg, ARRAYSIZE(szMsg)); - - if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - - PrintString(L"%s %luM\n",szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); - - } else { - - PrintString(L"%s %.1fM\n",szMsg, - ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); - } - } else { - - LoadStringW(GetModuleHandle(NULL), STRING_FAST_FMT, szMsg, ARRAYSIZE(szMsg)); - if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - - PrintString(L"%s %luM\n",szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); - - } else { - - PrintString(L"%s %.2fM\n",szMsg, - ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); - } - PrintResourceString(STRING_CREATE_FSYS); - } - - // - // Format away! - // - FormatEx( RootDirectory, media, FileSystem, Label, QuickFormat, - ClusterSize, FormatExCallback ); - if( Error ) return -1; - PrintResourceString(STRING_FMT_COMPLETE); - - // - // Enable compression if desired - // - if( CompressDrive ) { - - if( !EnableVolumeCompression( RootDirectory, TRUE )) { - - PrintResourceString(STRING_VOL_COMPRESS); - } - } - - // - // Get the label if we don't have it - // - if( !GotALabel ) { - - PrintResourceString(STRING_ENTER_LABEL); - fgetws( input, ARRAYSIZE(LabelString), stdin ); - - input[ wcslen(input)-1] = 0; - if( !SetVolumeLabelW( RootDirectory, input )) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_LABEL, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error(szMsg, GetLastError()); - return -1; - } - } - - if( !GetVolumeInformationW( RootDirectory, - volumeName, ARRAYSIZE(volumeName), - &serialNumber, &maxComponent, &flags, - fileSystem, ARRAYSIZE(fileSystem))) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - - // - // Print out some stuff including the formatted size - // - if( !GetDiskFreeSpaceExW( RootDirectory, - &freeBytesAvailableToCaller, - &totalNumberOfBytes, - &totalNumberOfFreeBytes )) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error(szMsg, GetLastError()); - return -1; - } - - PrintResourceString(STRING_FREE_SPACE, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart ); - - // - // Get the drive's serial number - // - if( !GetVolumeInformationW( RootDirectory, - volumeName, ARRAYSIZE(volumeName), - &serialNumber, &maxComponent, &flags, - fileSystem, ARRAYSIZE(fileSystem))) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - PrintResourceString(STRING_SERIAL_NUMBER, - (unsigned int)(serialNumber >> 16), - (unsigned int)(serialNumber & 0xFFFF)); - - return 0; -} + // + // Parse command line + // + badArg = ParseCommandLine(argc, argv); + if (badArg) + { + PrintResourceString(STRING_UNKNOW_ARG, argv[badArg]); + Usage(argv[0]); + return -1; + } + + // + // Get the drive's format + // + if (!Drive) + { + PrintResourceString(STRING_DRIVE_PARM); + Usage(argv[0]); + return -1; + } + else + { + wcscpy(RootDirectory, Drive); + } + RootDirectory[2] = L'\\'; + RootDirectory[3] = L'\0'; + + // + // See if the drive is removable or not + // + driveType = GetDriveTypeW(RootDirectory); + switch (driveType) + { + case DRIVE_UNKNOWN : + LoadStringW(GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + + case DRIVE_REMOTE: + case DRIVE_CDROM: + PrintResourceString(STRING_NO_SUPPORT); + return -1; + + case DRIVE_NO_ROOT_DIR: + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + + case DRIVE_REMOVABLE: + PrintResourceString(STRING_INSERT_DISK, RootDirectory[0]); + fgetws(input, ARRAYSIZE(input), stdin); + media = FMIFS_FLOPPY; + break; + + case DRIVE_FIXED: + case DRIVE_RAMDISK: + media = FMIFS_HARDDISK; + break; + } + + // Reject attempts to format the system drive + { + WCHAR path[MAX_PATH + 1]; + UINT rc; + rc = GetWindowsDirectoryW(path, MAX_PATH); + if (rc == 0 || rc > MAX_PATH) + // todo: Report "Unable to query system directory" + return -1; + if (towlower(path[0]) == towlower(Drive[0])) + { + // todo: report "Cannot format system drive" + PrintResourceString(STRING_NO_SUPPORT); + return -1; + } + } + + // + // Determine the drive's file system format + // + if (!GetVolumeInformationW(RootDirectory, + volumeName, ARRAYSIZE(volumeName), + &serialNumber, &maxComponent, &flags, + fileSystem, ARRAYSIZE(fileSystem))) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + + if (!GetDiskFreeSpaceExW(RootDirectory, + &freeBytesAvailableToCaller, + &totalNumberOfBytes, + &totalNumberOfFreeBytes)) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + PrintResourceString(STRING_FILESYSTEM, fileSystem); + + // + // Make sure they want to do this + // + if (driveType == DRIVE_FIXED) + { + if (volumeName[0]) + { + while (TRUE) + { + PrintResourceString(STRING_LABEL_NAME_EDIT, RootDirectory[0]); + fgetws(input, ARRAYSIZE(input), stdin); + input[wcslen(input) - 1] = 0; + + if (!wcsicmp(input, volumeName)) + break; + + PrintResourceString(STRING_ERROR_LABEL); + } + } + + PrintResourceString(STRING_YN_FORMAT, RootDirectory[0]); + + LoadStringW(GetModuleHandle(NULL), STRING_YES_NO_FAQ, szMsg, ARRAYSIZE(szMsg)); + while (TRUE) + { + fgetws(input, ARRAYSIZE(input), stdin); + if (_wcsnicmp(&input[0], &szMsg[0], 1) == 0) break; + if (_wcsnicmp(&input[0], &szMsg[1], 1) == 0) + { + wprintf(L"\n"); + return 0; + } + } + } + + // + // Tell the user we're doing a long format if appropriate + // + if (!QuickFormat) + { + LoadStringW(GetModuleHandle(NULL), STRING_VERIFYING, szMsg, ARRAYSIZE(szMsg)); + if (totalNumberOfBytes.QuadPart > 1024*1024*10) + { + PrintString(L"%s %luM\n", szMsg, (DWORD)(totalNumberOfBytes.QuadPart/(1024*1024))); + } + else + { + PrintString(L"%s %.1fM\n", szMsg, + ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); + } + } + else + { + LoadStringW(GetModuleHandle(NULL), STRING_FAST_FMT, szMsg, ARRAYSIZE(szMsg)); + if (totalNumberOfBytes.QuadPart > 1024*1024*10) + { + PrintString(L"%s %luM\n", szMsg, (DWORD)(totalNumberOfBytes.QuadPart/(1024*1024))); + } + else + { + PrintString(L"%s %.2fM\n", szMsg, + ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); + } + PrintResourceString(STRING_CREATE_FSYS); + } + + // + // Format away! + // + FormatEx(RootDirectory, media, FileSystem, Label, QuickFormat, + ClusterSize, FormatExCallback); + if (Error) return -1; + PrintResourceString(STRING_FMT_COMPLETE); + + // + // Enable compression if desired + // + if (CompressDrive) + { + if (!EnableVolumeCompression(RootDirectory, TRUE)) + PrintResourceString(STRING_VOL_COMPRESS); + } + + // + // Get the label if we don't have it + // + if (!GotALabel) + { + PrintResourceString(STRING_ENTER_LABEL); + fgetws(input, ARRAYSIZE(LabelString), stdin); + + input[wcslen(input) - 1] = 0; + if (!SetVolumeLabelW(RootDirectory, input)) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_LABEL, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + } + + if (!GetVolumeInformationW(RootDirectory, + volumeName, ARRAYSIZE(volumeName), + &serialNumber, &maxComponent, &flags, + fileSystem, ARRAYSIZE(fileSystem))) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + + // + // Print out some stuff including the formatted size + // + if (!GetDiskFreeSpaceExW(RootDirectory, + &freeBytesAvailableToCaller, + &totalNumberOfBytes, + &totalNumberOfFreeBytes)) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + + PrintResourceString(STRING_FREE_SPACE, totalNumberOfBytes.QuadPart, + totalNumberOfFreeBytes.QuadPart); + + // + // Get the drive's serial number + // + if (!GetVolumeInformationW(RootDirectory, + volumeName, ARRAYSIZE(volumeName), + &serialNumber, &maxComponent, &flags, + fileSystem, ARRAYSIZE(fileSystem))) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + PrintResourceString(STRING_SERIAL_NUMBER, + (unsigned int)(serialNumber >> 16), + (unsigned int)(serialNumber & 0xFFFF)); + + return 0; +} + +/* EOF */ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Fri Mar 4 17:09:34 2016 @@ -362,11 +362,11 @@ VOID VfatPrint(PCHAR Format, ...) { - va_list valist; - - va_start(valist, Format); - VfatPrintV(Format, valist); - va_end(valist); + va_list args; + + va_start(args, Format); + VfatPrintV(Format, args); + va_end(args); }

8 years, 9 months

[akhaldi] 70911: [PSAPI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 4 09:44:49 2016 New Revision: 70911 URL: http://svn.reactos.org/svn/reactos?rev=70911&view=rev Log: [PSAPI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/psapi/psapi_main.c Modified: trunk/rostests/winetests/psapi/psapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_mai… ============================================================================== --- trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] Fri Mar 4 09:44:49 2016 @@ -254,7 +254,7 @@ /* compare with values from SYSTEM_PROCESS_INFORMATION */ size = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_LENGTH_MISMATCH, got %08x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); ok(size > 0, "incorrect length %d\n", size); while (status == STATUS_INFO_LENGTH_MISMATCH) {

8 years, 9 months

[akhaldi] 70912: [RASAPI32] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 4 09:46:02 2016 New Revision: 70912 URL: http://svn.reactos.org/svn/reactos?rev=70912&view=rev Log: [RASAPI32] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c trunk/reactos/dll/win32/rasapi32/rasapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi.… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] Fri Mar 4 09:46:02 2016 @@ -498,6 +498,18 @@ return 0; } +DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) +{ + FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); + return 0; +} + +DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *phonebook, const WCHAR *entry, BYTE *authdata, DWORD size) +{ + FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); + return 0; +} + DWORD WINAPI RasSetEntryDialParamsA(LPCSTR lpszPhonebook, LPRASDIALPARAMSA lprasdialparams, BOOL fRemovePassword) { @@ -531,3 +543,9 @@ dwcbDeviceConfig); return 0; } + +DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *statistics) +{ + FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); + return 0; +} Modified: trunk/reactos/dll/win32/rasapi32/rasapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi3… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi32.spec [iso-8859-1] Fri Mar 4 09:46:02 2016 @@ -45,9 +45,9 @@ @ stdcall RasGetErrorStringW(long ptr long) @ stub RasGetErrorStringWow @ stub RasGetHport +@ stdcall RasGetLinkStatistics(ptr long ptr) @ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) @ stdcall RasGetProjectionInfoW(ptr ptr ptr ptr) -@ stub RasGetLinkStatistics @ stub RasGetSubEntryHandleA @ stub RasGetSubEntryHandleW @ stub RasGetSubEntryPropertiesA @@ -65,6 +65,8 @@ @ stdcall RasSetAutodialParamW(long ptr long) @ stub RasSetCredentialsA @ stub RasSetCredentialsW +@ stdcall RasSetCustomAuthDataA(str str ptr long) +@ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) @ stdcall RasSetEntryDialParamsA(str ptr long) @ stdcall RasSetEntryDialParamsW(wstr ptr long) @ stdcall RasSetEntryPropertiesA(str str ptr long ptr long) 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] Fri Mar 4 09:46:02 2016 @@ -159,7 +159,7 @@ reactos/dll/win32/qmgr # Synced to WineStaging-1.9.4 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.55 reactos/dll/win32/query # Synced to WineStaging-1.7.55 -reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/resutils # Synced to WineStaging-1.7.55 reactos/dll/win32/riched20 # Synced to WineStaging-1.7.55 reactos/dll/win32/riched32 # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70913: [PSDK] Update richedit.h. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 4 10:18:29 2016 New Revision: 70913 URL: http://svn.reactos.org/svn/reactos?rev=70913&view=rev Log: [PSDK] Update richedit.h. CORE-10912 Modified: trunk/reactos/include/psdk/richedit.h Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/richedit.h [iso-8859-1] Fri Mar 4 10:18:29 2016 @@ -692,7 +692,7 @@ typedef struct _repastespecial { DWORD dwAspect; - DWORD dwParam; + DWORD_PTR dwParam; } REPASTESPECIAL; typedef struct _punctuation { @@ -1068,8 +1068,8 @@ #define ST_DEFAULT 0x00000000 #define ST_KEEPUNDO 0x00000001 #define ST_SELECTION 0x00000002 - #define ST_NEWCHARS 0x00000004 +#define ST_UNICODE 0x00000008 #ifdef __cplusplus }

8 years, 9 months

[rnaumann] 70914: [APPWIZ] Stubplement ConfigStartMenu Patch by Jared Smudde. CORE-10788

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Mar 4 15:43:31 2016 New Revision: 70914 URL: http://svn.reactos.org/svn/reactos?rev=70914&view=rev Log: [APPWIZ] Stubplement ConfigStartMenu Patch by Jared Smudde. CORE-10788 Added: trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c (with props) Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/appwiz.spec trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc trunk/reactos/dll/cpl/appwiz/resource.h Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/CMakeLists.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -10,6 +10,7 @@ addons.c appwiz.c createlink.c + removestartmenuitems.c appwiz.h) file(GLOB appwiz_rc_deps resources/*.*) Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.h [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -43,6 +43,10 @@ LONG CALLBACK NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2); +/* removestartmenuitems.c */ +LONG CALLBACK +ConfigStartMenu(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2); + void ShowLastWin32Error(HWND hWndOwner); typedef enum { Modified: trunk/reactos/dll/cpl/appwiz/appwiz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.spec… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -1,4 +1,5 @@ @ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall ConfigStartMenu(ptr long ptr ptr) @ stdcall NewLinkHere(ptr long ptr ptr) NewLinkHereA @ stdcall NewLinkHereA(ptr long ptr ptr) @ stdcall NewLinkHereW(ptr long ptr ptr) Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ ""ÐÑÐ°Ð¹"" Ð·Ð° ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÐµÐ¿ÑÐ°ÑÐºÐ°.", -1, 120, 50, 170, 10 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -46,6 +46,18 @@ LTEXT "KliknutÃm na DokonÄit vytvoÅÃte zÃ¡stupce.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko InstalÃ¡tor" Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Klicken Sie auf Fertig stellen, um die VerknÃ¼pfung zu erstellen.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installation" Modified: trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Î Î±ÏÎ®ÏÏÎµ 'Î¤ÎÎ»Î¿Ï' Î³Î¹Î± Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÏÎµ ÏÎ· ÏÏÎ½ÏÏÎ¼ÎµÏÏÎ·.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Click Finish to create the shortcut.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -47,6 +47,18 @@ LTEXT "Haga clic en Finalizar para crear el acceso directo.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalador de Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Cliquez sur Terminer pour crÃ©er le raccourci.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation du package Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/he-IL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -42,6 +42,18 @@ LTEXT "×××¥ ×¢× ×¡××× ××× ×××¦××¨ ××ª ×§××¦××¨ ×××¨×.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Premere Fine per creare il collegamento.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Trykk pÃ¥ fullfÃ¸rt for Ã¥ opprette snarveien.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -50,6 +50,18 @@ LTEXT "NaciÅnij ZakoÅcz by utworzyÄ skrÃ³t.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalator Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -43,6 +43,18 @@ LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -47,6 +47,18 @@ LTEXT "ApÄsaÈi âSfÃ¢rÈitâ pentru a crea scurtÄtura.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalare Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"" Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÑÐ»ÑÐºÐ°.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÑÐ¸Ðº Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -45,6 +45,18 @@ LTEXT "Kliknite na tlaÄidlo DokonÄiÅ¥ pre vytvorenie odkazu.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sq-AL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -45,6 +45,18 @@ LTEXT "Kliko Finish per te krijuar njÃ« shortcut.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instaluesi Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/tr-TR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -43,6 +43,18 @@ LTEXT "KÄ±sayolu oluÅturmak iÃ§in ""Bitir""e tÄ±klayÄ±nÄ±z.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Kurucusu" Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -49,6 +49,18 @@ LTEXT "Ð©Ð¾Ð± ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÑÐ»Ð¸Ðº, Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ¾ÑÐ¾Ð²Ð¾"".", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -48,6 +48,18 @@ LTEXT "ç¹å»âå®æâåå»ºå¿«æ·æ¹å¼", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko å®è£å" Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-TW.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -48,6 +48,18 @@ LTEXT "é»é¸âå®æâåµå»ºå¿«æ·æ¹å¼", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko å®è£å" Added: trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/removestart… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c (added) +++ trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -0,0 +1,46 @@ +/* + * PROJECT: ReactOS Software Control Panel + * FILE: dll/cpl/appwiz/removestartmenuitems.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMERS: Jared Smudde (computerwhiz02(a)hotmail.com) + */ + +#include "appwiz.h" + +INT_PTR CALLBACK RemoveStartMenuItemsProc(HWND hwndCPl, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndCPl, IDOK); + break; + case IDCANCEL: + EndDialog(hwndCPl, IDCANCEL); + break; + } + break; + default: + return FALSE; + } + return TRUE; +} + +LONG CALLBACK +ShowRemoveStartMenuItems(HWND hwndCPl, LPWSTR szPath) +{ + DialogBox(hApplet, MAKEINTRESOURCEW(IDD_CONFIG_STARTMENU), hwndCPl, RemoveStartMenuItemsProc); + return TRUE; +} + +LONG +CALLBACK +ConfigStartMenu(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + return ShowRemoveStartMenuItems(hwndCPl, (LPWSTR) lParam1); +} Propchange: trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -16,6 +16,7 @@ /* Dialogs */ #define IDD_SHORTCUT_LOCATION 203 #define IDD_SHORTCUT_FINISH 204 +#define IDD_CONFIG_STARTMENU 400 /* Bitmaps */ #define IDB_WATERMARK 5001 @@ -35,6 +36,8 @@ #define IDC_SHORTCUT_LOCATION 107 #define IDC_SHORTCUT_BROWSE 108 #define IDC_SHORTCUT_NAME 109 +#define IDC_STARTMENU_TREE 110 +#define IDC_REMOVE_ENTRIES 111 #define ID_DWL_GECKO_DIALOG 1200 #define ID_DWL_PROGRESS 1201

8 years, 9 months

[akhaldi] 70909: [OPENGL32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 4 09:41:45 2016 New Revision: 70909 URL: http://svn.reactos.org/svn/reactos?rev=70909&view=rev Log: [OPENGL32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/opengl32/opengl.c Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Fri Mar 4 09:41:45 2016 @@ -21,38 +21,19 @@ #include <windows.h> #include <wingdi.h> #include "wine/test.h" - -void WINAPI glClearColor(float red, float green, float blue, float alpha); -void WINAPI glClear(unsigned int mask); -#define GL_COLOR 0x1800 -typedef unsigned int GLenum; -typedef int GLint; -void WINAPI glCopyPixels(int x, int y, int width, int height, GLenum type); -void WINAPI glFinish(void); -#define GL_NO_ERROR 0x0 -#define GL_INVALID_OPERATION 0x502 -GLenum WINAPI glGetError(void); -#define GL_COLOR_BUFFER_BIT 0x00004000 -const unsigned char * WINAPI glGetString(unsigned int); -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 - -#define GL_VIEWPORT 0x0ba2 -void WINAPI glGetIntegerv(GLenum pname, GLint *params); +#include "wine/wgl.h" #define MAX_FORMATS 256 typedef void* HPBUFFERARB; /* WGL_ARB_create_context */ static HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); -/* GetLastError */ -#define ERROR_INVALID_VERSION_ARB 0x2095 + #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_FLAGS_ARB 0x2094 + /* Flags for WGL_CONTEXT_FLAGS_ARB */ #define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 #define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 @@ -90,6 +71,11 @@ static BOOL (WINAPI *pwglSwapIntervalEXT)(int interval); static int (WINAPI *pwglGetSwapIntervalEXT)(void); +/* GL_ARB_debug_output */ +static void (WINAPI *pglDebugMessageCallbackARB)(void *, void *); +static void (WINAPI *pglDebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); +static void (WINAPI *pglDebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const char *); + static const char* wgl_extensions = NULL; static void init_functions(void) @@ -121,6 +107,11 @@ /* WGL_EXT_swap_control */ GET_PROC(wglSwapIntervalEXT) GET_PROC(wglGetSwapIntervalEXT) + + /* GL_ARB_debug_output */ + GET_PROC(glDebugMessageCallbackARB) + GET_PROC(glDebugMessageControlARB) + GET_PROC(glDebugMessageInsertARB) #undef GET_PROC } @@ -249,6 +240,39 @@ pwglReleasePbufferDCARB(pbuffer, hdc); } else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); +} + +static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, + GLsizei length, const GLchar *message, const void *userParam) +{ + DWORD *count = (DWORD *)userParam; + (*count)++; +} + +static void test_debug_message_callback(void) +{ + static const char testmsg[] = "Hello World"; + DWORD count; + + if (!pglDebugMessageCallbackARB) + { + skip("glDebugMessageCallbackARB not supported\n"); + return; + } + + glEnable(GL_DEBUG_OUTPUT); + glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); + + pglDebugMessageCallbackARB(gl_debug_message_callback, &count); + pglDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_TRUE); + + count = 0; + pglDebugMessageInsertARB(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_OTHER, 0x42424242, + GL_DEBUG_SEVERITY_LOW, sizeof(testmsg), testmsg); + ok(count == 1, "expected count == 1, got %u\n", count); + + glDisable(GL_DEBUG_OUTPUT_SYNCHRONOUS); + glDisable(GL_DEBUG_OUTPUT); } static void test_setpixelformat(HDC winhdc) @@ -1703,6 +1727,7 @@ return; } + test_debug_message_callback(); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc);

8 years, 9 months

[akhaldi] 70910: [QMGR] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 4 09:44:01 2016 New Revision: 70910 URL: http://svn.reactos.org/svn/reactos?rev=70910&view=rev Log: [QMGR] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/qmgr/file.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/qmgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/file.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] Fri Mar 4 09:44:01 2016 @@ -469,7 +469,7 @@ { static const WCHAR prefix[] = {'B','I','T', 0}; WCHAR tmpDir[MAX_PATH], tmpName[MAX_PATH]; - WCHAR host[MAX_PATH], path[MAX_PATH]; + WCHAR host[MAX_PATH]; URL_COMPONENTSW uc; BOOL ret; @@ -511,10 +511,8 @@ uc.lpszHostName = host; uc.dwHostNameLength = sizeof(host)/sizeof(host[0]); uc.nPort = 0; - uc.lpszUrlPath = path; - uc.dwUrlPathLength = sizeof(path)/sizeof(path[0]); - uc.lpszExtraInfo = NULL; - uc.dwExtraInfoLength = 0; + uc.lpszUrlPath = NULL; + uc.dwUrlPathLength = ~0u; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) { 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] Fri Mar 4 09:44:01 2016 @@ -156,7 +156,7 @@ reactos/dll/win32/printui # Synced to WineStaging-1.7.55 reactos/dll/win32/propsys # Synced to WineStaging-1.7.55 reactos/dll/win32/pstorec # Synced to WineStaging-1.7.55 -reactos/dll/win32/qmgr # Synced to WineStaging-1.7.55 +reactos/dll/win32/qmgr # Synced to WineStaging-1.9.4 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.55 reactos/dll/win32/query # Synced to WineStaging-1.7.55 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70907: [PDH] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 4 09:38:25 2016 New Revision: 70907 URL: http://svn.reactos.org/svn/reactos?rev=70907&view=rev Log: [PDH] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/pdh/pdh.spec trunk/reactos/dll/win32/pdh/pdh_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pdh/pdh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] Fri Mar 4 09:38:25 2016 @@ -5,8 +5,8 @@ @ stdcall PdhAddCounterW(ptr wstr long ptr) @ stdcall PdhAddEnglishCounterA(ptr str long ptr) @ stdcall PdhAddEnglishCounterW(ptr wstr long ptr) -@ stub PdhBindInputDataSourceA -@ stub PdhBindInputDataSourceW +@ stdcall PdhBindInputDataSourceA(ptr str) +@ stdcall PdhBindInputDataSourceW(ptr wstr) @ stub PdhBrowseCountersA @ stub PdhBrowseCountersHA @ stub PdhBrowseCountersHW @@ -62,8 +62,8 @@ @ stub PdhGetFormattedCounterArrayW @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr) @ stub PdhGetLogFileSize -@ stub PdhGetLogFileTypeA -@ stub PdhGetLogFileTypeW +@ stdcall PdhGetLogFileTypeA(str ptr) +@ stdcall PdhGetLogFileTypeW(wstr ptr) @ stub PdhGetLogSetGUID @ stub PdhGetRawCounterArrayA @ stub PdhGetRawCounterArrayW Modified: trunk/reactos/dll/win32/pdh/pdh_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Fri Mar 4 09:38:25 2016 @@ -1271,3 +1271,39 @@ FIXME("%u\n", source); return ERROR_SUCCESS; } + +/*********************************************************************** + * PdhGetLogFileTypeA (PDH.@) + */ +PDH_STATUS WINAPI PdhGetLogFileTypeA(const char *log, DWORD *type) +{ + FIXME("%s, %p: stub\n", debugstr_a(log), type); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhGetLogFileTypeW (PDH.@) + */ +PDH_STATUS WINAPI PdhGetLogFileTypeW(const WCHAR *log, DWORD *type) +{ + FIXME("%s, %p: stub\n", debugstr_w(log), type); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhBindInputDataSourceA (PDH.@) + */ +PDH_STATUS WINAPI PdhBindInputDataSourceA(PDH_HLOG *source, const char *filenamelist) +{ + FIXME("%p %s: stub\n", source, debugstr_a(filenamelist)); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhBindInputDataSourceW (PDH.@) + */ +PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *source, const WCHAR *filenamelist) +{ + FIXME("%p %s: stub\n", source, debugstr_w(filenamelist)); + return PDH_NOT_IMPLEMENTED; +} 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] Fri Mar 4 09:38:25 2016 @@ -150,7 +150,7 @@ reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.55 reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.55 reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/pdh # Synced to WineStaging-1.7.55 +reactos/dll/win32/pdh # Synced to WineStaging-1.9.4 reactos/dll/win32/pidgen # Synced to WineStaging-1.7.55 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70908: [ODBCCP32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 4 09:39:35 2016 New Revision: 70908 URL: http://svn.reactos.org/svn/reactos?rev=70908&view=rev Log: [ODBCCP32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/odbccp32/misc.c Modified: trunk/rostests/winetests/odbccp32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/misc.c… ============================================================================== --- trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] Fri Mar 4 09:39:35 2016 @@ -112,6 +112,11 @@ /* Length OK */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + if(!bool_ret && error_code == ODBC_ERROR_WRITING_SYSINFO_FAILED) + { + win_skip("not enough privileges\n"); + return; + } ok(bool_ret, "SQLInstallDriverManager unexpectedly failed: %d\n", error_code); if (bool_ret)

8 years, 9 months

[akhaldi] 70904: [OLEAUT32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 4 09:33:46 2016 New Revision: 70904 URL: http://svn.reactos.org/svn/reactos?rev=70904&view=rev Log: [OLEAUT32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/oleaut32/olepicture.c trunk/rostests/winetests/oleaut32/safearray.c trunk/rostests/winetests/oleaut32/test_reg.idl trunk/rostests/winetests/oleaut32/tmarshal.c trunk/rostests/winetests/oleaut32/tmarshal.idl trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/usrmarshal.c trunk/rostests/winetests/oleaut32/varformat.c trunk/rostests/winetests/oleaut32/vartype.c Modified: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… ============================================================================== --- trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -1056,7 +1056,9 @@ DWORD *mem; IPersistStream *src_stream; IStream *dst_stream; + LARGE_INTEGER offset; HRESULT hr; + LONG size; desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_BITMAP; @@ -1077,6 +1079,27 @@ hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == 66, "expected 66, got %d\n", size); + mem = GlobalLock(hmem); +todo_wine + ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); + GlobalUnlock(hmem); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine + ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr); @@ -1109,7 +1132,9 @@ DWORD *mem; IPersistStream *src_stream; IStream *dst_stream; + LARGE_INTEGER offset; HRESULT hr; + LONG size; desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_ICON; @@ -1129,6 +1154,27 @@ hmem = GlobalAlloc(GMEM_ZEROINIT, 8192); hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == 766, "expected 766, got %d\n", size); + mem = GlobalLock(hmem); +todo_wine + ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); + GlobalUnlock(hmem); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine + ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr); @@ -1164,6 +1210,7 @@ IStream *dst_stream, *stream; LARGE_INTEGER offset; HRESULT hr; + LONG size; memset(&pic, 0, sizeof(pic)); desc.cbSizeofstruct = sizeof(desc); @@ -1173,7 +1220,7 @@ type = -1; hr = IPicture_get_Type(pic, &type); - ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); handle = (OLE_HANDLE)0xdeadbeef; @@ -1184,6 +1231,18 @@ hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr); Modified: trunk/rostests/winetests/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/safear… ============================================================================== --- trunk/rostests/winetests/oleaut32/safearray.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/safearray.c [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -1969,40 +1969,99 @@ static void test_SafeArrayDestroyData (void) { - SAFEARRAYBOUND sab; + SAFEARRAYBOUND sab[2]; SAFEARRAY *sa; HRESULT hres; int value = 0xdeadbeef; LONG index[1]; void *temp_pvData; - - sab.lLbound = 0; - sab.cElements = 10; - sa = SafeArrayCreate(VT_INT, 1, &sab); + USHORT features; + + sab[0].lLbound = 0; + sab[0].cElements = 10; + sa = SafeArrayCreate(VT_INT, 1, sab); ok(sa != NULL, "Create() failed.\n"); - if (!sa) - return; + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + index[0] = 1; SafeArrayPutElement (sa, index, &value); /* SafeArrayDestroyData shouldn't free pvData if FADF_STATIC is set. */ - sa->fFeatures |= FADF_STATIC; + features = (sa->fFeatures |= FADF_STATIC); temp_pvData = sa->pvData; hres = SafeArrayDestroyData(sa); ok(hres == S_OK, "SADData FADF_STATIC failed, error code %x.\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); ok(sa->pvData == temp_pvData, "SADData FADF_STATIC: pvData=%p, expected %p (fFeatures = %d).\n", sa->pvData, temp_pvData, sa->fFeatures); SafeArrayGetElement (sa, index, &value); ok(value == 0, "Data not cleared after SADData\n"); /* Clear FADF_STATIC, now really destroy the data. */ - sa->fFeatures ^= FADF_STATIC; + features = (sa->fFeatures ^= FADF_STATIC); hres = SafeArrayDestroyData(sa); ok(hres == S_OK, "SADData !FADF_STATIC failed, error code %x.\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); ok(sa->pvData == NULL, "SADData !FADF_STATIC: pvData=%p, expected NULL.\n", sa->pvData); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "SAD failed, error code %x.\n", hres); + + /* two dimensions */ + sab[0].lLbound = 0; + sab[0].cElements = 10; + sab[1].lLbound = 0; + sab[1].cElements = 10; + + sa = SafeArrayCreate(VT_INT, 2, sab); + ok(sa != NULL, "Create() failed.\n"); + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + + features = sa->fFeatures; + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); + + SafeArrayDestroy(sa); + + /* try to destroy data from descriptor */ + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyDescriptor(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = SafeArrayAllocDescriptor(2, &sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyDescriptor(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* vector case */ + sa = SafeArrayCreateVector(VT_I4, 0, 10); + ok(sa != NULL, "got %p\n", sa); + ok(sa->fFeatures == (FADF_CREATEVECTOR|FADF_HAVEVARTYPE), "got 0x%x\n", sa->fFeatures); + + ok(sa->pvData != NULL, "got %p\n", sa->pvData); + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); +todo_wine + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + ok(sa->pvData != NULL, "got %p\n", sa->pvData); + /* There seems to be a bug on windows, especially visible on 64bit systems, + probably double-free of similar issue. */ + sa->pvData = NULL; + SafeArrayDestroy(sa); } static void test_safearray_layout(void) Modified: trunk/rostests/winetests/oleaut32/test_reg.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/test_r… ============================================================================== --- trunk/rostests/winetests/oleaut32/test_reg.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/test_reg.idl [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -141,6 +141,8 @@ LONG testprop([in] LONG *i); [propputref, id(2)] LONG testprop2([in] IUnknown *i); + [id(3)] + HRESULT testfunc([in] int i, [out, retval] int *p); } /* uuid is same as for test_struct2 in test_tlb.idl, fields are different */ Modified: trunk/rostests/winetests/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… ============================================================================== --- trunk/rostests/winetests/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/tmarshal.c [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -919,11 +919,10 @@ } static HRESULT WINAPI Widget_Coclass( - IWidget *iface, - ApplicationObject2 *p) -{ - trace("Coclass(%p)\n", p); - ok(p == (ApplicationObject2 *)iface, "expected p == %p, got %p\n", iface, p); + IWidget *iface, ApplicationObject2 *param) +{ + trace("Coclass(%p)\n", param); + ok(param == (ApplicationObject2 *)iface, "expected param == %p, got %p\n", iface, param); return S_OK; } @@ -1515,7 +1514,7 @@ ok(V_VT(&varresult) == VT_DISPATCH, "V_VT(&varresult) was %d instead of VT_DISPATCH\n", V_VT(&varresult)); ok(V_DISPATCH(&varresult) != NULL, "expected V_DISPATCH(&varresult) != NULL\n"); - /* call CoClass with VT_DISPATCH type */ + /* call Coclass with VT_DISPATCH type */ vararg[0] = varresult; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; Modified: trunk/rostests/winetests/oleaut32/tmarshal.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… ============================================================================== --- trunk/rostests/winetests/oleaut32/tmarshal.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/tmarshal.idl [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -187,7 +187,7 @@ HRESULT VarArg_Ref_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) *params, [out, retval] VARIANT *result); [id(DISPID_TM_COCLASS)] - HRESULT Coclass([in] ApplicationObject2 *p); + HRESULT Coclass([in] ApplicationObject2 *param); } [ Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -39,6 +39,7 @@ //#include "ocidl.h" //#include "shlwapi.h" #include <tmarshal.h> +#include <olectl.h> #include <test_reg.h> #include <test_tlb.h> @@ -158,6 +159,12 @@ return 6; } +static HRESULT WINAPI invoketest_testfunc(IInvokeTest *iface, int i, int *p) +{ + *p = i+1; + return S_OK; +} + static const IInvokeTestVtbl invoketestvtbl = { invoketest_QueryInterface, invoketest_AddRef, @@ -168,7 +175,8 @@ invoketest_Invoke, invoketest_get_test, invoketest_putref_testprop, - invoketest_putref_testprop2 + invoketest_putref_testprop2, + invoketest_testfunc }; static IInvokeTest invoketest = { &invoketestvtbl }; @@ -204,7 +212,8 @@ hRes = ITypeLib_GetTypeInfo(iface, 1, &iti1); ok(hRes == S_OK, "ITypeLib_GetTypeInfo failed on index = 1\n"); - ok(ref_count=ITypeLib_Release(iface) > 0, "ITypeLib destroyed while ITypeInfo has back pointer\n"); + ref_count = ITypeLib_Release(iface); + ok(ref_count > 0, "ITypeLib destroyed while ITypeInfo has back pointer\n"); if(!ref_count) return; @@ -669,6 +678,33 @@ CloseHandle( file ); } +static void test_invoke_func(ITypeInfo *typeinfo) +{ + DISPID named_args[3] = { DISPID_THIS }; + VARIANT args[3], res; + DISPPARAMS dp = {args, named_args, 1, 0}; + UINT i; + HRESULT hres; + + V_VT(args) = VT_INT; + V_INT(args) = 3; + V_VT(&res) = VT_ERROR; + hres = ITypeInfo_Invoke(typeinfo, &invoketest, 3, DISPATCH_METHOD, &dp, &res, NULL, &i); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 4, "got %d\n", V_I4(&res)); + + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&invoketest; + V_VT(args+1) = VT_INT; + V_INT(args+1) = 3; + V_VT(&res) = VT_ERROR; + dp.cNamedArgs = 1; + dp.cArgs = 2; + hres = ITypeInfo_Invoke(typeinfo, &invoketest, 3, DISPATCH_METHOD, &dp, &res, NULL, &i); + ok(hres == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hres); +} + static const char *create_test_typelib(int res_no) { static char filename[MAX_PATH]; @@ -960,6 +996,8 @@ V_I4(&res) = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 2, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x, %d\n", hr, i); + + test_invoke_func(pTypeInfo); ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); @@ -1621,7 +1659,6 @@ static OLECHAR dualW[] = {'d','u','a','l',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; - static const WCHAR defaultQW[] = {'d','e','f','a','u','l','t','?',0}; static OLECHAR func1W[] = {'f','u','n','c','1',0}; static OLECHAR func2W[] = {'f','u','n','c','2',0}; static OLECHAR prop1W[] = {'P','r','o','p','1',0}; @@ -1633,6 +1670,7 @@ static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; static OLECHAR *propname[] = {prop1W, param1W}; + static const GUID tlcustguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x69}}; static const GUID custguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x70}}; static const GUID bogusguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x71}}; static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; @@ -1644,6 +1682,7 @@ ICreateTypeInfo *createti; ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; + ITypeLib2 *tl2; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; ITypeInfo *tinfos[2]; ITypeInfo2 *ti2; @@ -1666,6 +1705,8 @@ TYPEKIND kind; DESCKIND desckind; BINDPTR bindptr; + char nameA[16]; + WCHAR nameW[16]; switch(sys){ case SYS_WIN32: @@ -1760,6 +1801,23 @@ SysFreeString(name); SysFreeString(helpfile); + V_VT(&cust_data) = VT_I4; + V_I4(&cust_data) = 1; + hres = ICreateTypeLib2_SetCustData(createtl, &tlcustguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeLib_QueryInterface(tl, &IID_ITypeLib2, (void**)&tl2); + ok(hres == S_OK, "no ITypeLib2 interface (%x)\n", hres); + + V_VT(&cust_data) = VT_EMPTY; + V_I4(&cust_data) = 0; + hres = ITypeLib2_GetCustData(tl2, &tlcustguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + ok(V_VT(&cust_data) == VT_I4, "V_VT(&cust_data) = %d\n", V_VT(&cust_data)); + ok(V_I4(&cust_data) == 1, "V_I4(&cust_data) = %d\n", V_I4(&cust_data)); + + ITypeLib2_Release(tl2); + /* invalid parameters */ hres = ICreateTypeLib2_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); ok(hres == E_INVALIDARG, "got %08x\n", hres); @@ -2162,6 +2220,9 @@ ok(hres == S_OK, "got %08x\n", hres); SysFreeString(V_BSTR(&paramdescex.varDefaultValue)); + WideCharToMultiByte(CP_ACP, 0, defaultW, -1, nameA, sizeof(nameA), NULL, NULL); + MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, sizeof(nameW)/sizeof(nameW[0])); + hres = ITypeInfo2_GetFuncDesc(ti2, 3, &pfuncdesc); ok(hres == S_OK, "got %08x\n", hres); @@ -2187,7 +2248,7 @@ U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -2199,7 +2260,7 @@ U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -2821,6 +2882,16 @@ SysFreeString(name); SysFreeString(helpfile); + hres = ITypeLib_QueryInterface(tl, &IID_ITypeLib2, (void**)&tl2); + ok(hres == S_OK, "no ITypeLib2 interface (%x)\n", hres); + V_VT(&cust_data) = VT_EMPTY; + V_I4(&cust_data) = 0; + hres = ITypeLib2_GetCustData(tl2, &tlcustguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + ok(V_VT(&cust_data) == VT_I4, "V_VT(&cust_data) = %d\n", V_VT(&cust_data)); + ok(V_I4(&cust_data) == 1, "V_I4(&cust_data) = %d\n", V_I4(&cust_data)); + ITypeLib2_Release(tl2); + hres = ITypeLib_GetTypeInfo(tl, 0, &ti); ok(hres == S_OK, "got %08x\n", hres); @@ -2985,7 +3056,7 @@ U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -2997,7 +3068,7 @@ U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -5591,6 +5662,11 @@ ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr); SysFreeString(path); + path = NULL; + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 0xffff, 0xffff, LOCALE_NEUTRAL, &path); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(path); + /* manifest version is 2.0, actual is 1.0 */ hr = LoadRegTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr); @@ -5635,6 +5711,20 @@ hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); + + hr = LoadRegTypeLib(&LIBID_TestTypelib, 0xffff, 0xffff, LOCALE_NEUTRAL, &tl); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeLib_GetLibAttr(tl, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(attr->lcid == 0, "got %x\n", attr->lcid); + ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); + ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); + ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); + + ITypeLib_ReleaseTLibAttr(tl, attr); + ITypeLib_Release(tl); DeleteFileA("test_actctx_tlb.tlb"); DeleteFileA("test_actctx_tlb2.tlb"); Modified: trunk/rostests/winetests/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/usrmar… ============================================================================== --- trunk/rostests/winetests/oleaut32/usrmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/usrmarshal.c [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -282,6 +282,7 @@ ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); + ok(!lpsa2, "lpsa2 was not set to 0 by LPSAFEARRAY_UserFree\n"); HeapFree(GetProcessHeap(), 0, buffer); lpsa->cLocks = 0; hr = SafeArrayDestroy(lpsa); @@ -771,10 +772,10 @@ double d; void *mem; DWORD *wirev; - BSTR b; + BSTR b, b2; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t',0}; SAFEARRAYBOUND sab; - LPSAFEARRAY lpsa; + LPSAFEARRAY lpsa, lpsa2, lpsa_copy; DECIMAL dec, dec2; HeapUnknown *heap_unknown; DWORD expected; @@ -1241,15 +1242,21 @@ ok(*wirev, "wv[6] %08x\n", *wirev); /* win2k: this is b. winxp: this is (char*)b + 1 */ wirev++; check_bstr(wirev, b); - VariantInit(&v2); - stubMsg.Buffer = buffer; - next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); - ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + b2 = SysAllocString(str); + b2[0] = 0; + V_VT(&v2) = VT_BSTR | VT_BYREF; + V_BSTRREF(&v2) = &b2; + mem = b2; + VariantInit(&v2); + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + ok(mem == b2, "BSTR should be reused\n"); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(SysStringByteLen(*V_BSTRREF(&v)) == SysStringByteLen(*V_BSTRREF(&v2)), "bstr string lens differ\n"); ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); - VARIANT_UserFree(&umcb.Flags, &v2); + SysFreeString(b2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b); @@ -1341,6 +1348,59 @@ } VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); + + /*** ARRAY BYREF ***/ + VariantInit(&v); + V_VT(&v) = VT_UI4 | VT_ARRAY | VT_BYREF; + V_ARRAYREF(&v) = &lpsa; + lpsa->fFeatures |= FADF_STATIC; + + rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v); + expected = 152; + ok(stubMsg.BufferLength == expected || stubMsg.BufferLength == expected + 16, /* win64 */ + "size %u instead of %u\n", stubMsg.BufferLength, expected); + buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer); + stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength; + next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); + ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); + wirev = (DWORD*)buffer; + + wirev = check_variant_header(wirev, &v, expected); + ok(*wirev == 4, "wv[5] %08x\n", *wirev); + wirev++; + ok(*wirev, "wv[6] %08x\n", *wirev); /* win2k: this is lpsa. winxp: this is (char*)lpsa + 1 */ + wirev++; + check_safearray(wirev, lpsa); + lpsa_copy = lpsa2 = SafeArrayCreate(VT_I8, 1, &sab); + /* set FADF_STATIC feature to make sure lpsa2->pvData pointer changes if new data buffer is allocated */ + lpsa2->fFeatures |= FADF_STATIC; + mem = lpsa2->pvData; + V_VT(&v2) = VT_UI4 | VT_ARRAY | VT_BYREF; + V_ARRAYREF(&v2) = &lpsa2; + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); + ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); + ok(mem == lpsa2->pvData, "safearray data should be reused\n"); + ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); + SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); + SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); + ok(bound == bound2, "array lbounds differ\n"); + SafeArrayGetUBound(*V_ARRAYREF(&v), 1, &bound); + SafeArrayGetUBound(*V_ARRAYREF(&v2), 1, &bound2); + ok(bound == bound2, "array ubounds differ\n"); + if (pSafeArrayGetVartype) + { + pSafeArrayGetVartype(*V_ARRAYREF(&v), &vt); + pSafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); + } + lpsa2->fFeatures &= ~FADF_STATIC; + hr = SafeArrayDestroy(*V_ARRAYREF(&v2)); + ok(hr == S_OK, "got 0x%08x\n", hr); + HeapFree(GetProcessHeap(), 0, oldbuffer); + lpsa->fFeatures &= ~FADF_STATIC; hr = SafeArrayDestroy(lpsa); ok(hr == S_OK, "got 0x%08x\n", hr); Modified: trunk/rostests/winetests/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/varfor… ============================================================================== --- trunk/rostests/winetests/oleaut32/varformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/varformat.c [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -562,6 +562,88 @@ } } +static void test_VarFormatFromTokens(void) +{ + static WCHAR number_fmt[] = {'#','#','#',',','#','#','0','.','0','0',0}; + static const WCHAR number[] = {'6',',','9','0',0}; + static const WCHAR number_us[] = {'6','9','0','.','0','0',0}; + + static WCHAR date_fmt[] = {'d','d','-','m','m',0}; + static const WCHAR date[] = {'1','2','-','1','1',0}; + static const WCHAR date_us[] = {'1','1','-','1','2',0}; + + static WCHAR string_fmt[] = {'@',0}; + static const WCHAR string_de[] = {'1',',','5',0}; + static const WCHAR string_us[] = {'1','.','5',0}; + + BYTE buff[256]; + LCID lcid; + VARIANT var; + BSTR bstr; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(number); + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + hres = VarTokenizeFormatString(number_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, number_us), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); + hres = VarTokenizeFormatString(number_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, number), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + VariantClear(&var); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(date); + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + hres = VarTokenizeFormatString(date_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, date_us), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); + hres = VarTokenizeFormatString(date_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, date), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + VariantClear(&var); + + V_VT(&var) = VT_R4; + V_R4(&var) = 1.5; + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + hres = VarTokenizeFormatString(string_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, string_us), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); + hres = VarTokenizeFormatString(string_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, string_de), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); +} + START_TEST(varformat) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -571,4 +653,5 @@ test_VarFormatNumber(); test_VarFormat(); test_VarWeekdayName(); + test_VarFormatFromTokens(); } Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] Fri Mar 4 09:33:46 2016 @@ -5403,9 +5403,12 @@ if (str) { LPINTERNAL_BSTR bstr = Get(str); + DWORD_PTR p = (DWORD_PTR)str; + int align = sizeof(void *); ok (bstr->dwLen == 8, "Expected 8, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szTest), "String different\n"); + ok ((p & ~(align-1)) == p, "Not aligned to %d\n", align); SysFreeString(str); } } @@ -5449,7 +5452,9 @@ { const OLECHAR szTest[10] = { 'T','e','s','t','\0' }; const CHAR szTestA[6] = { 'T','e','s','t','\0','?' }; + char *buf; BSTR str; + int i; if (sizeof(void *) == 4) /* not limited to 0x80000000 on Win64 */ { @@ -5492,6 +5497,7 @@ ok (bstr->dwLen == 3, "Expected 3, got %d\n", bstr->dwLen); ok (!lstrcmpA((LPCSTR)bstr->szString, szTestTruncA), "String different\n"); + ok (!bstr->szString[2], "String not terminated\n"); SysFreeString(str); } @@ -5505,6 +5511,32 @@ ok (!lstrcmpW(bstr->szString, szTest), "String different\n"); SysFreeString(str); } + + /* Make sure terminating null is aligned properly */ + buf = HeapAlloc(GetProcessHeap(), 0, 1025); + ok (buf != NULL, "Expected non-NULL\n"); + for (i = 0; i < 1024; i++) + { + LPINTERNAL_BSTR bstr; + + str = SysAllocStringByteLen(NULL, i); + ok (str != NULL, "Expected non-NULL\n"); + bstr = Get(str); + ok (bstr->dwLen == i, "Expected %d, got %d\n", i, bstr->dwLen); + ok (!bstr->szString[(i+sizeof(WCHAR)-1)/sizeof(WCHAR)], "String not terminated\n"); + SysFreeString(str); + + memset(buf, 0xaa, 1025); + str = SysAllocStringByteLen(buf, i); + ok (str != NULL, "Expected non-NULL\n"); + bstr = Get(str); + ok (bstr->dwLen == i, "Expected %d, got %d\n", i, bstr->dwLen); + buf[i] = 0; + ok (!lstrcmpA((LPCSTR)bstr->szString, buf), "String different\n"); + ok (!bstr->szString[(i+sizeof(WCHAR)-1)/sizeof(WCHAR)], "String not terminated\n"); + SysFreeString(str); + } + HeapFree(GetProcessHeap(), 0, buf); } static void test_SysReAllocString(void) @@ -6342,9 +6374,15 @@ ok(str == str2, "str != str2\n"); SysFreeString(str2); - /* Fill the bucket with cached entries. */ + /* Fill the bucket with cached entries. + We roll our own, to show that the cache doesn't use + the bstr length field to determine bucket allocation. */ for(i=0; i < sizeof(strs)/sizeof(*strs); i++) - strs[i] = SysAllocStringLen(NULL, 24); + { + DWORD_PTR *ptr = CoTaskMemAlloc(64); + ptr[0] = 0; + strs[i] = (BSTR)(ptr + 1); + } for(i=0; i < sizeof(strs)/sizeof(*strs); i++) SysFreeString(strs[i]);

8 years, 9 months

← Newer
1
...
15
16
17
18
19
20
21
...
27
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 March 2016