Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 63052: [ADVPACK_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 11:59:11 2014 New Revision: 63052 URL: http://svn.reactos.org/svn/reactos?rev=63052&view=rev Log: [ADVPACK_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/advpack/CMakeLists.txt trunk/rostests/winetests/advpack/advpack.c trunk/rostests/winetests/advpack/files.c trunk/rostests/winetests/advpack/install.c Modified: trunk/rostests/winetests/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/CMakeLi… ============================================================================== --- trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] Wed Apr 30 11:59:11 2014 @@ -8,7 +8,7 @@ testlist.c) add_executable(advpack_winetest ${SOURCE}) -target_link_libraries(advpack_winetest wine) +target_link_libraries(advpack_winetest) set_module_type(advpack_winetest win32cui) -add_importlibs(advpack_winetest advpack cabinet advapi32 msvcrt kernel32 ntdll) +add_importlibs(advpack_winetest advpack cabinet advapi32 msvcrt kernel32) add_cd_file(TARGET advpack_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… ============================================================================== --- trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] Wed Apr 30 11:59:11 2014 @@ -38,15 +38,15 @@ /* defines for the SetPerUserSecValues tests */ #define GUID_KEY "SOFTWARE\\Microsoft\\Active Setup\\Installed Components\\guid" -#define REG_VAL_EXISTS(key, value) !RegQueryValueEx(key, value, NULL, NULL, NULL, NULL) -#define OPEN_GUID_KEY() !RegOpenKey(HKEY_LOCAL_MACHINE, GUID_KEY, &guid) +#define REG_VAL_EXISTS(key, value) !RegQueryValueExA(key, value, NULL, NULL, NULL, NULL) +#define OPEN_GUID_KEY() !RegOpenKeyA(HKEY_LOCAL_MACHINE, GUID_KEY, &guid) static HMODULE hAdvPack; static HRESULT (WINAPI *pCloseINFEngine)(HINF); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); static HRESULT (WINAPI *pGetVersionFromFile)(LPCSTR,LPDWORD,LPDWORD,BOOL); static HRESULT (WINAPI *pOpenINFEngine)(PCSTR,PCSTR,DWORD,HINF*,PVOID); -static HRESULT (WINAPI *pSetPerUserSecValues)(PPERUSERSECTION pPerUser); +static HRESULT (WINAPI *pSetPerUserSecValues)(PPERUSERSECTIONA pPerUser); static HRESULT (WINAPI *pTranslateInfString)(LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD,LPDWORD,LPVOID); static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD,PDWORD,PVOID); @@ -153,45 +153,45 @@ ok (hr == E_FAIL, "DelNode called with empty pathname should return E_FAIL\n"); /* Test deletion of a file. */ - hn = CreateFile("DelNodeTestFile1", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestFile1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hr = pDelNode(lstrcat(currDir, "\\DelNodeTestFile1"), 0); + hr = pDelNode(lstrcatA(currDir, "\\DelNodeTestFile1"), 0); ok (hr == S_OK, "DelNode failed deleting a single file\n"); currDir[currDirLen] = '\0'; /* Test deletion of an empty directory. */ CreateDirectoryA("DelNodeTestDir", NULL); - hr = pDelNode(lstrcat(currDir, "\\DelNodeTestDir"), 0); + hr = pDelNode(lstrcatA(currDir, "\\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting an empty directory\n"); currDir[currDirLen] = '\0'; /* Test deletion of a directory containing one file. */ CreateDirectoryA("DelNodeTestDir", NULL); - hn = CreateFile("DelNodeTestDir\\DelNodeTestFile1", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestDir\\DelNodeTestFile1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hr = pDelNode(lstrcat(currDir, "\\DelNodeTestDir"), 0); + hr = pDelNode(lstrcatA(currDir, "\\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting a directory containing one file\n"); currDir[currDirLen] = '\0'; /* Test deletion of a directory containing multiple files. */ CreateDirectoryA("DelNodeTestDir", NULL); - hn = CreateFile("DelNodeTestDir\\DelNodeTestFile1", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestDir\\DelNodeTestFile1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hn = CreateFile("DelNodeTestDir\\DelNodeTestFile2", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestDir\\DelNodeTestFile2", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hn = CreateFile("DelNodeTestDir\\DelNodeTestFile3", GENERIC_WRITE, 0, NULL, + hn = CreateFileA("DelNodeTestDir\\DelNodeTestFile3", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(hn != INVALID_HANDLE_VALUE); CloseHandle(hn); - hr = pDelNode(lstrcat(currDir, "\\DelNodeTestDir"), 0); + hr = pDelNode(lstrcatA(currDir, "\\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting a directory containing multiple files\n"); currDir[currDirLen] = '\0'; } @@ -211,8 +211,8 @@ char data[1024]; char *ptr = data; DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(inf_file, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(inf_file, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); append_str(&ptr, "[Version]\n"); append_str(&ptr, "Signature=\"$Chicago$\"\n"); @@ -325,8 +325,8 @@ ok(dwSize == 25, "Expected size 25, got %d\n", dwSize); } - DeleteFile("c:\\a.inf"); - DeleteFile(inf_file); + DeleteFileA("c:\\a.inf"); + DeleteFileA(inf_file); } static void translateinfstringex_test(void) @@ -450,7 +450,7 @@ hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result1", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + ok(!lstrcmpiA(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); @@ -461,14 +461,14 @@ hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result2", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + ok(!lstrcmpiA(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); { char drive[MAX_PATH]; - lstrcpy(drive, PROG_FILES_ROOT); + lstrcpyA(drive, PROG_FILES_ROOT); drive[3] = 0x00; /* Just keep the system drive plus '\' */ memset(buffer, 'a', APP_PATH_LEN); @@ -477,7 +477,7 @@ hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result3", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpi(buffer, drive), + ok(!lstrcmpiA(buffer, drive), "Expected %s, got %s\n", drive, buffer); ok(size == strlen(drive)+1, "Expected size %d, got %d\n", lstrlenA(drive)+1, size); @@ -494,7 +494,7 @@ char data[1024]; char *ptr = data; DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(inf_file, GENERIC_WRITE, 0, NULL, + HANDLE hf = CreateFileA(inf_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); append_str(&ptr, "[Version]\n"); @@ -535,7 +535,7 @@ hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result2", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + ok(!lstrcmpiA(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); @@ -552,10 +552,10 @@ DWORD size = MAX_PATH; char check[MAX_PATH]; - if (RegQueryValueEx(hkey, name, NULL, NULL, (LPBYTE)check, &size)) + if (RegQueryValueExA(hkey, name, NULL, NULL, (LPBYTE)check, &size)) return FALSE; - return !lstrcmp(check, value); + return !lstrcmpA(check, value); } static BOOL check_reg_dword(HKEY hkey, LPCSTR name, DWORD value) @@ -563,7 +563,7 @@ DWORD size = sizeof(DWORD); DWORD check; - if (RegQueryValueEx(hkey, name, NULL, NULL, (LPBYTE)&check, &size)) + if (RegQueryValueExA(hkey, name, NULL, NULL, (LPBYTE)&check, &size)) return FALSE; return (check == value); @@ -571,15 +571,15 @@ static void setperusersecvalues_test(void) { - PERUSERSECTION peruser; + PERUSERSECTIONA peruser; HRESULT hr; HKEY guid; - lstrcpy(peruser.szDispName, "displayname"); - lstrcpy(peruser.szLocale, "locale"); - lstrcpy(peruser.szStub, "stub"); - lstrcpy(peruser.szVersion, "1,1,1,1"); - lstrcpy(peruser.szCompID, "compid"); + lstrcpyA(peruser.szDispName, "displayname"); + lstrcpyA(peruser.szLocale, "locale"); + lstrcpyA(peruser.szStub, "stub"); + lstrcpyA(peruser.szVersion, "1,1,1,1"); + lstrcpyA(peruser.szCompID, "compid"); peruser.dwIsInstalled = 1; peruser.bRollback = FALSE; @@ -600,7 +600,7 @@ ok(!OPEN_GUID_KEY(), "Expected guid key to not exist\n"); /* set initial values */ - lstrcpy(peruser.szGUID, "guid"); + lstrcpyA(peruser.szGUID, "guid"); hr = pSetPerUserSecValues(&peruser); if (hr == E_FAIL) { @@ -622,7 +622,7 @@ ok(!REG_VAL_EXISTS(guid, "RealStubPath"), "Expected RealStubPath to not exist\n"); /* raise the version, but bRollback is FALSE, so vals not saved */ - lstrcpy(peruser.szVersion, "2,1,1,1"); + lstrcpyA(peruser.szVersion, "2,1,1,1"); hr = pSetPerUserSecValues(&peruser); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); @@ -639,7 +639,7 @@ /* raise the version again, bRollback is TRUE so vals are saved */ peruser.bRollback = TRUE; - lstrcpy(peruser.szVersion, "3,1,1,1"); + lstrcpyA(peruser.szVersion, "3,1,1,1"); hr = pSetPerUserSecValues(&peruser); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); @@ -659,7 +659,7 @@ "Expected real stub\n"); } - RegDeleteKey(HKEY_LOCAL_MACHINE, GUID_KEY); + RegDeleteKeyA(HKEY_LOCAL_MACHINE, GUID_KEY); } START_TEST(advpack) @@ -670,8 +670,8 @@ /* Make sure we create the temporary file in a directory * were we have enough rights */ - GetTempPath(MAX_PATH, inf_file); - lstrcat(inf_file,"test.inf"); + GetTempPathA(MAX_PATH, inf_file); + lstrcatA(inf_file,"test.inf"); get_progfiles_dir(); Modified: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c… ============================================================================== --- trunk/rostests/winetests/advpack/files.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/files.c [iso-8859-1] Wed Apr 30 11:59:11 2014 @@ -142,7 +142,7 @@ /* create the INF file */ res = pAddDelBackupEntry("one\0two\0three\0", "c:\\", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); - if (GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES) { ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); ok(DeleteFileA(path), "Expected path to exist\n"); @@ -317,8 +317,8 @@ DWORD attrs; BOOL res; - handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); @@ -328,7 +328,7 @@ FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); - attrs = GetFileAttributes(pszName); + attrs = GetFileAttributesA(pszName); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); return (INT_PTR)handle; @@ -502,7 +502,7 @@ HMODULE hmod; char destFolder[MAX_PATH]; - hmod = LoadLibrary("setupapi.dll"); + hmod = LoadLibraryA("setupapi.dll"); if (!hmod) { skip("setupapi.dll not present\n"); @@ -558,7 +558,7 @@ init_function_pointers(); GetCurrentDirectoryA(MAX_PATH, prev_path); - GetTempPath(MAX_PATH, temp_path); + GetTempPathA(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path); lstrcpyA(CURR_DIR, temp_path); Modified: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install… ============================================================================== --- trunk/rostests/winetests/advpack/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/install.c [iso-8859-1] Wed Apr 30 11:59:11 2014 @@ -65,8 +65,8 @@ static void create_inf_file(LPCSTR filename) { DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); static const char data[] = "[Version]\n" @@ -131,10 +131,10 @@ create_inf_file("one\\test.inf"); /* try a full path to the INF, with working dir provided */ - lstrcpy(path, CURR_DIR); - lstrcat(path, "\\one\\test.inf"); - lstrcpy(dir, CURR_DIR); - lstrcat(dir, "\\one"); + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\one\\test.inf"); + lstrcpyA(dir, CURR_DIR); + lstrcatA(dir, "\\one"); hr = pRunSetupCommand(NULL, path, "DefaultInstall", dir, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", hr); @@ -212,9 +212,9 @@ create_inf_file("one\\test.inf"); /* try a full path to the INF */ - lstrcpy(cmdline, CURR_DIR); - lstrcat(cmdline, "\\"); - lstrcat(cmdline, "one\\test.inf,DefaultInstall,,4"); + lstrcpyA(cmdline, CURR_DIR); + lstrcatA(cmdline, "\\"); + lstrcatA(cmdline, "one\\test.inf,DefaultInstall,,4"); hr = pLaunchINFSection(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr); @@ -238,16 +238,16 @@ create_inf_file("test.inf"); /* try an invalid CAB filename with an absolute INF name */ - lstrcpy(cmdline, CURR_DIR); - lstrcat(cmdline, "\\"); - lstrcat(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + lstrcpyA(cmdline, CURR_DIR); + lstrcatA(cmdline, "\\"); + lstrcatA(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr); /* try quoting the parameters */ - lstrcpy(cmdline, "\""); - lstrcat(cmdline, CURR_DIR); - lstrcat(cmdline, "\\test.inf\",\"DefaultInstall\",\"c:,imacab.cab\",\"4\""); + lstrcpyA(cmdline, "\""); + lstrcatA(cmdline, CURR_DIR); + lstrcatA(cmdline, "\\test.inf\",\"DefaultInstall\",\"c:,imacab.cab\",\"4\""); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr); @@ -257,7 +257,7 @@ if (winetest_interactive) { /* try an invalid CAB filename with a relative INF name */ - lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + lstrcpyA(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); } @@ -280,7 +280,7 @@ } GetCurrentDirectoryA(MAX_PATH, prev_path); - GetTempPath(MAX_PATH, temp_path); + GetTempPathA(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path); lstrcpyA(CURR_DIR, temp_path);

1 0

[akhaldi] 63051: [DPLAY][MSDMO][WPP] * Mark as up to date. CORE-8080
by akhaldi＠svn.reactos.org 30 Apr '14

30 Apr '14

Author: akhaldi Date: Wed Apr 30 11:57:36 2014 New Revision: 63051 URL: http://svn.reactos.org/svn/reactos?rev=63051&view=rev Log: [DPLAY][MSDMO][WPP] * Mark as up to date. CORE-8080 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 30 11:57:36 2014 @@ -23,7 +23,7 @@ reactos/tools/unicode # Synced to Wine-1.7.17 reactos/tools/widl # Synced to Wine-1.7.17 -reactos/tools/wpp # Synced to Wine-1.7.1 +reactos/tools/wpp # Synced to Wine-1.7.17 The following libraries are shared with Wine. @@ -38,12 +38,12 @@ reactos/dll/directx/wine/dinput # Synced to Wine-1.7.17 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.17 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.17 -reactos/dll/directx/wine/dplay # Synced to Wine-1.7.1 +reactos/dll/directx/wine/dplay # Synced to Wine-1.7.17 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.17 reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26 reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.17 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.17 -reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.1 +reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.17 reactos/dll/directx/wine/qedit # Synced to Wine-1.7.17 reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.17

1 0

[fireball] 63050: [MSGINA] - Report errors in StartupWindowThread as they are critical (the caller will wait infinitely).
by fireball＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: fireball Date: Tue Apr 29 22:19:57 2014 New Revision: 63050 URL: http://svn.reactos.org/svn/reactos?rev=63050&view=rev Log: [MSGINA] - Report errors in StartupWindowThread as they are critical (the caller will wait infinitely). Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Tue Apr 29 22:19:57 2014 @@ -73,12 +73,14 @@ FALSE, DUPLICATE_SAME_ACCESS)) { + ERR("Duplicating handle failed!\n"); HeapFree(GetProcessHeap(), 0, lpParam); return FALSE; } if(!SetThreadDesktop(hDesk)) { + ERR("Setting thread desktop failed!\n"); HeapFree(GetProcessHeap(), 0, lpParam); return FALSE; }

1 0

[pschweitzer] 63049: [FASTFAT] Fix the most stupid bug ever in ReactOS history (at least!). Dear Pierre, you pretend you're modifying the FileObject->FileName field, but, as you were told in the ea...
by pschweitzer＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: pschweitzer Date: Tue Apr 29 20:50:51 2014 New Revision: 63049 URL: http://svn.reactos.org/svn/reactos?rev=63049&view=rev Log: [FASTFAT] Fix the most stupid bug ever in ReactOS history (at least!). Dear Pierre, you pretend you're modifying the FileObject->FileName field, but, as you were told in the early when you learnt C, you're at that point in your code dealing with a local copy of the unicode string. So, if modifying the Buffer field is fine, because it's a pointer to memory zone, containing the wchar string, modifying the Length field is totally pointless because it won't magically modify the unicode string in the file object, and will just be forgotten as long the function will be unstacked. So REALLY modify the file object. VfatSetRenameInformation receives less garbage information now... Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Tue Apr 29 20:50:51 2014 @@ -596,8 +596,8 @@ /* Update FO just to keep file name */ /* Skip first slash */ ++idx; - PathNameU.Length = FileNameLen; - RtlMoveMemory(&PathNameU.Buffer[0], &PathNameU.Buffer[idx], PathNameU.Length); + FileObject->FileName.Length = FileNameLen; + RtlMoveMemory(&PathNameU.Buffer[0], &PathNameU.Buffer[idx], FileObject->FileName.Length); } else {

1 0

[cwittich] 63048: [rtl/actctx] reduce diff to wine (not a full sync)
by cwittich＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: cwittich Date: Tue Apr 29 19:37:02 2014 New Revision: 63048 URL: http://svn.reactos.org/svn/reactos?rev=63048&view=rev Log: [rtl/actctx] reduce diff to wine (not a full sync) Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=63048… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Tue Apr 29 19:37:02 2014 @@ -190,6 +190,9 @@ unsigned int allocated_dependencies; }; +static const WCHAR asmv1W[] = {'a','s','m','v','1',':',0}; +static const WCHAR asmv2W[] = {'a','s','m','v','2',':',0}; + typedef struct _ACTIVATION_CONTEXT_WRAPPED { PVOID MagicMarker; @@ -286,6 +289,7 @@ static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; static const WCHAR version_formatW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; +static const WCHAR wildcardW[] = {'*',0}; static ACTIVATION_CONTEXT_WRAPPED system_actctx = { ACTCTX_MAGIC_MARKER, { 1 } }; static ACTIVATION_CONTEXT *process_actctx = &system_actctx.ActivationContext; @@ -311,6 +315,48 @@ return strW; } +static inline BOOL xmlstr_cmp(const xmlstr_t* xmlstr, const WCHAR *str) +{ + return !strncmpW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len]; +} + +static inline BOOL xmlstr_cmpi(const xmlstr_t* xmlstr, const WCHAR *str) +{ + return !strncmpiW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len]; +} + +static inline BOOL xmlstr_cmp_end(const xmlstr_t* xmlstr, const WCHAR *str) +{ + return (xmlstr->len && xmlstr->ptr[0] == '/' && + !strncmpW(xmlstr->ptr + 1, str, xmlstr->len - 1) && !str[xmlstr->len - 1]); +} + +static inline BOOL xml_elem_cmp(const xmlstr_t *elem, const WCHAR *str, const WCHAR *namespace) +{ + UINT len = strlenW( namespace ); + + if (!strncmpW(elem->ptr, str, elem->len) && !str[elem->len]) return TRUE; + return (elem->len > len && !strncmpW(elem->ptr, namespace, len) && + !strncmpW(elem->ptr + len, str, elem->len - len) && !str[elem->len - len]); +} + +static inline BOOL xml_elem_cmp_end(const xmlstr_t *elem, const WCHAR *str, const WCHAR *namespace) +{ + if (elem->len && elem->ptr[0] == '/') + { + xmlstr_t elem_end; + elem_end.ptr = elem->ptr + 1; + elem_end.len = elem->len - 1; + return xml_elem_cmp( &elem_end, str, namespace ); + } + return FALSE; +} + +static inline BOOL isxmlspace( WCHAR ch ) +{ + return (ch == ' ' || ch == '\r' || ch == '\n' || ch == '\t'); +} + static UNICODE_STRING xmlstr2unicode(const xmlstr_t *xmlstr) { UNICODE_STRING res; @@ -319,27 +365,6 @@ res.Length = res.MaximumLength = (USHORT)xmlstr->len * sizeof(WCHAR); return res; -} - -static inline BOOL xmlstr_cmp(const xmlstr_t* xmlstr, const WCHAR *str) -{ - return !strncmpW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len]; -} - -static inline BOOL xmlstr_cmpi(const xmlstr_t* xmlstr, const WCHAR *str) -{ - return !strncmpiW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len]; -} - -static inline BOOL xmlstr_cmp_end(const xmlstr_t* xmlstr, const WCHAR *str) -{ - return (xmlstr->len && xmlstr->ptr[0] == '/' && - !strncmpW(xmlstr->ptr + 1, str, xmlstr->len - 1) && !str[xmlstr->len - 1]); -} - -static inline BOOL isxmlspace( WCHAR ch ) -{ - return (ch == ' ' || ch == '\r' || ch == '\n' || ch == '\t'); } static struct assembly *add_assembly(ACTIVATION_CONTEXT *actctx, enum assembly_type at) @@ -485,7 +510,6 @@ if (id1->language && id2->language && strcmpiW( id1->language, id2->language )) { - static const WCHAR wildcardW[] = {'*',0}; if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language )) return FALSE; } @@ -605,17 +629,21 @@ {',','p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e','=',0}; static const WCHAR public_keyW[] = {',','p','u','b','l','i','c','K','e','y','T','o','k','e','n','=',0}; + static const WCHAR typeW2[] = + {',','t','y','p','e','=',0}; + static const WCHAR versionW2[] = + {',','v','e','r','s','i','o','n','=',0}; WCHAR version[64], *ret; SIZE_T size = 0; sprintfW( version, version_formatW, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision ); - if (ai->name) size += strlenW(ai->name); + if (ai->name) size += strlenW(ai->name) * sizeof(WCHAR); if (ai->arch) size += strlenW(archW) + strlenW(ai->arch) + 2; if (ai->public_key) size += strlenW(public_keyW) + strlenW(ai->public_key) + 2; - if (ai->type) size += 1 + strlenW(typeW) + 1 + strlenW(ai->type) + 2; - size += 1+ strlenW(versionW) + 1 + strlenW(version) + 2; + if (ai->type) size += strlenW(typeW2) + strlenW(ai->type) + 2; + size += strlenW(versionW2) + strlenW(version) + 2; if (!(ret = RtlAllocateHeap( RtlGetProcessHeap(), 0, (size + 1) * sizeof(WCHAR) ))) return NULL; @@ -624,8 +652,8 @@ else *ret = 0; append_string( ret, archW, ai->arch ); append_string( ret, public_keyW, ai->public_key ); - append_string( ret, typeW, ai->type ); - append_string( ret, versionW, version ); + append_string( ret, typeW2, ai->type ); + append_string( ret, versionW2, version ); return ret; } static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) @@ -722,13 +750,23 @@ ptr = xmlbuf->ptr; while (ptr < xmlbuf->end && *ptr != '=' && *ptr != '>' && !isxmlspace(*ptr)) ptr++; + if (ptr == xmlbuf->end) return FALSE; + + name->ptr = xmlbuf->ptr; + name->len = ptr-xmlbuf->ptr; + xmlbuf->ptr = ptr; + + /* skip spaces before '=' */ + while (ptr < xmlbuf->end && *ptr != '=' && isxmlspace(*ptr)) ptr++; if (ptr == xmlbuf->end || *ptr != '=') return FALSE; - name->ptr = xmlbuf->ptr; - name->len = (ULONG)(ptr - xmlbuf->ptr); - xmlbuf->ptr = ptr; - + /* skip '=' itself */ ptr++; + if (ptr == xmlbuf->end) return FALSE; + + /* skip spaces after '=' */ + while (ptr < xmlbuf->end && *ptr != '"' && *ptr != '\'' && isxmlspace(*ptr)) ptr++; + if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return FALSE; value->ptr = ++ptr; @@ -741,7 +779,7 @@ return FALSE; } - value->len = (ULONG)(ptr - value->ptr); + value->len = ptr - value->ptr; xmlbuf->ptr = ptr + 1; if (xmlbuf->ptr == xmlbuf->end) return FALSE; @@ -783,7 +821,7 @@ ptr++; elem->ptr = xmlbuf->ptr; - elem->len = (ULONG)(ptr - xmlbuf->ptr); + elem->len = ptr - xmlbuf->ptr; xmlbuf->ptr = ptr; return xmlbuf->ptr != xmlbuf->end; } @@ -811,7 +849,7 @@ if (!ptr) return FALSE; content->ptr = xmlbuf->ptr; - content->len = (ULONG)(ptr - xmlbuf->ptr); + content->len = ptr - xmlbuf->ptr; xmlbuf->ptr = ptr; return TRUE; @@ -851,12 +889,12 @@ return FALSE; } -static BOOL parse_expect_elem(xmlbuf_t* xmlbuf, const WCHAR* name) +static BOOL parse_expect_elem(xmlbuf_t* xmlbuf, const WCHAR* name, const WCHAR *namespace) { xmlstr_t elem; UNICODE_STRING elemU; if (!next_xml_elem(xmlbuf, &elem)) return FALSE; - if (xmlstr_cmp(&elem, name)) return TRUE; + if (xml_elem_cmp(&elem, name, namespace)) return TRUE; elemU = xmlstr2unicode(&elem); DPRINT1( "unexpected element %wZ\n", &elemU ); return FALSE; @@ -884,12 +922,12 @@ return parse_expect_no_attr(xmlbuf, &end) && !end; } -static BOOL parse_expect_end_elem(xmlbuf_t *xmlbuf, const WCHAR *name) +static BOOL parse_expect_end_elem(xmlbuf_t *xmlbuf, const WCHAR *name, const WCHAR *namespace) { xmlstr_t elem; UNICODE_STRING elemU; if (!next_xml_elem(xmlbuf, &elem)) return FALSE; - if (!xmlstr_cmp_end(&elem, name)) + if (!xml_elem_cmp_end(&elem, name, namespace)) { elemU = xmlstr2unicode(&elem); DPRINT1( "unexpected element %wZ\n", &elemU ); @@ -949,9 +987,9 @@ } else if (xmlstr_cmp(&attr_name, languageW)) { - if (!(ai->language = xmlstrdupW(&attr_value))) return FALSE; DPRINT1("Unsupported yet language attribute (%S)\n", ai->language); + if (!(ai->language = xmlstrdupW(&attr_value))) return FALSE; } else { @@ -962,13 +1000,13 @@ } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, assemblyIdentityW); + return parse_expect_end_elem(xmlbuf, assemblyIdentityW, asmv1W); } static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) { xmlstr_t elem, attr_name, attr_value; - BOOL ret, end = FALSE, error; + BOOL ret = TRUE, end = FALSE, error; struct entity* entity; UNICODE_STRING attr_valueU, attr_nameU; @@ -1037,7 +1075,7 @@ } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, comInterfaceProxyStubW); + return parse_expect_end_elem(xmlbuf, comInterfaceProxyStubW, asmv1W); } static BOOL parse_typelib_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) @@ -1073,13 +1111,13 @@ } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, typelibW); + return parse_expect_end_elem(xmlbuf, typelibW, asmv1W); } static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) { - xmlstr_t elem, content; - BOOL end = FALSE, ret = TRUE; + xmlstr_t elem, content; + BOOL end = FALSE, ret = TRUE; struct entity* entity; UNICODE_STRING elemU; @@ -1137,7 +1175,7 @@ } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, bindingRedirectW); + return parse_expect_end_elem(xmlbuf, bindingRedirectW, asmv1W); } static BOOL parse_description_elem(xmlbuf_t* xmlbuf) @@ -1201,7 +1239,7 @@ } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, comInterfaceExternalProxyStubW); + return parse_expect_end_elem(xmlbuf, comInterfaceExternalProxyStubW, asmv1W); } static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) @@ -1233,7 +1271,7 @@ } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, clrClassW); + return parse_expect_end_elem(xmlbuf, clrClassW, asmv1W); } static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) @@ -1265,7 +1303,7 @@ } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, clrSurrogateW); + return parse_expect_end_elem(xmlbuf, clrSurrogateW, asmv1W); } static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, BOOL optional) @@ -1279,7 +1317,7 @@ memset(&ai, 0, sizeof(ai)); ai.optional = optional; - if (!parse_expect_elem(xmlbuf, assemblyIdentityW) || + if (!parse_expect_elem(xmlbuf, assemblyIdentityW, asmv1W) || !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) return FALSE; @@ -1357,7 +1395,7 @@ BOOL end = FALSE; if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; - return end || parse_expect_end_elem(xmlbuf, noInheritW); + return end || parse_expect_end_elem(xmlbuf, noInheritW, asmv1W); } static BOOL parse_noinheritable_elem(xmlbuf_t* xmlbuf) @@ -1365,7 +1403,7 @@ BOOL end = FALSE; if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; - return end || parse_expect_end_elem(xmlbuf, noInheritableW); + return end || parse_expect_end_elem(xmlbuf, noInheritableW, asmv1W); } static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) @@ -2089,6 +2127,7 @@ NTSTATUS status; UNICODE_STRING nameW; HANDLE file; + DWORD len; DPRINT( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", ai->name, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision, ai->arch ); @@ -2097,9 +2136,12 @@ /* FIXME: add support for language specific lookup */ + len = max(RtlGetFullPathName_U(acl->actctx->assemblies->manifest.info, 0, NULL, NULL) / sizeof(WCHAR), + strlenW(acl->actctx->appdir.info)); + nameW.Buffer = NULL; if (!(buffer = RtlAllocateHeap( RtlGetProcessHeap(), 0, - (strlenW(acl->actctx->appdir.info) + 2 * strlenW(ai->name) + 2) * sizeof(WCHAR) + sizeof(dotManifestW) ))) + (len + 2 * strlenW(ai->name) + 2) * sizeof(WCHAR) + sizeof(dotManifestW) ))) return STATUS_NO_MEMORY; if (!(directory = build_assembly_dir( ai ))) @@ -2108,16 +2150,25 @@ return STATUS_NO_MEMORY; } - /* lookup in appdir\name.dll - * appdir\name.manifest - * appdir\name\name.dll - * appdir\name\name.manifest + /* Lookup in <dir>\name.dll + * <dir>\name.manifest + * <dir>\name\name.dll + * <dir>\name\name.manifest + * + * First 'appdir' is used as <dir>, if that failed + * it tries application manifest file path. */ strcpyW( buffer, acl->actctx->appdir.info ); p = buffer + strlenW(buffer); - for (i = 0; i < 2; i++) - { - *p++ = '\\'; + for (i = 0; i < 4; i++) + { + if (i == 2) + { + struct assembly *assembly = acl->actctx->assemblies; + if (!RtlGetFullPathName_U(assembly->manifest.info, len * sizeof(WCHAR), buffer, &p)) break; + } + else *p++ = '\\'; + strcpyW( p, ai->name ); p += strlenW(p); @@ -2308,6 +2359,28 @@ return STATUS_SUCCESS; } +static NTSTATUS find_guid(ACTIVATION_CONTEXT* actctx, ULONG section_kind, + const GUID *guid, DWORD flags, PACTCTX_SECTION_KEYED_DATA data) +{ + NTSTATUS status; + + switch (section_kind) + { + default: + DPRINT("Unknown section_kind %x\n", section_kind); + return STATUS_SXS_SECTION_NOT_FOUND; + } + + if (status != STATUS_SUCCESS) return status; + + if (flags & FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) + { + actctx_addref(actctx); + data->hActCtx = actctx; + } + return STATUS_SUCCESS; +} + /* initialize the activation context for the current process */ void actctx_init(void) { @@ -2384,7 +2457,10 @@ } nameW.Buffer = NULL; - if (pActCtx->lpSource) + + /* open file only if it's going to be used */ + if (pActCtx->lpSource && !((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && + (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID))) { if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &nameW, NULL, NULL)) { @@ -2789,7 +2865,6 @@ { afdi->lpAssemblyDirectoryName = ptr; memcpy(ptr, assembly->directory, ad_len * sizeof(WCHAR)); - ptr += ad_len; } else afdi->lpAssemblyDirectoryName = NULL; RtlFreeHeap( RtlGetProcessHeap(), 0, assembly_id ); @@ -2923,12 +2998,37 @@ return status; } -NTSTATUS -NTAPI -RtlFindActivationContextSectionGuid(ULONG flags, const GUID *guid, ULONG section_kind, UNICODE_STRING *section_name, PVOID ptr) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *extguid, ULONG section_kind, + const GUID *guid, void *ptr ) +{ + ACTCTX_SECTION_KEYED_DATA *data = ptr; + NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; + + if (extguid) + { + DPRINT1("expected extguid == NULL\n"); + return STATUS_INVALID_PARAMETER; + } + + if (flags & ~FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) + { + DPRINT1("unknown flags %08x\n", flags); + return STATUS_INVALID_PARAMETER; + } + + if (!data || data->cbSize < FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || !guid) + return STATUS_INVALID_PARAMETER; + + if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) + { + ACTIVATION_CONTEXT *actctx = check_actctx(NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame->ActivationContext); + if (actctx) status = find_guid( actctx, section_kind, guid, flags, data ); + } + + if (status != STATUS_SUCCESS) + status = find_guid( process_actctx, section_kind, guid, flags, data ); + + return status; } /* Stubs */

1 0

[khornicek] 63047: [KERNEL32_WINETEST] - fix msvc build (?)
by khornicek＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: khornicek Date: Tue Apr 29 19:15:28 2014 New Revision: 63047 URL: http://svn.reactos.org/svn/reactos?rev=63047&view=rev Log: [KERNEL32_WINETEST] - fix msvc build (?) Modified: trunk/rostests/winetests/kernel32/actctx.c Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… ============================================================================== --- trunk/rostests/winetests/kernel32/actctx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/actctx.c [iso-8859-1] Tue Apr 29 19:15:28 2014 @@ -1662,9 +1662,6 @@ static void test_typelib_section(void) { - skip("test_typelib_section\n"); - return; - static const WCHAR helpW[] = {'h','e','l','p'}; ACTCTX_SECTION_KEYED_DATA data, data2; struct guidsection_header *section; @@ -1672,6 +1669,9 @@ ULONG_PTR cookie; HANDLE handle; BOOL ret; + + skip("test_typelib_section\n"); + return; /* use two dependent manifests, 4 'files' total */ create_manifest_file("testdep1.manifest", manifest_wndcls1, -1, NULL, NULL);

1 0

[cwittich] 63046: [kernel32_winetest] skip test_typelib_section
by cwittich＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: cwittich Date: Tue Apr 29 18:30:54 2014 New Revision: 63046 URL: http://svn.reactos.org/svn/reactos?rev=63046&view=rev Log: [kernel32_winetest] skip test_typelib_section Modified: trunk/rostests/winetests/kernel32/actctx.c Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… ============================================================================== --- trunk/rostests/winetests/kernel32/actctx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/actctx.c [iso-8859-1] Tue Apr 29 18:30:54 2014 @@ -1662,6 +1662,9 @@ static void test_typelib_section(void) { + skip("test_typelib_section\n"); + return; + static const WCHAR helpW[] = {'h','e','l','p'}; ACTCTX_SECTION_KEYED_DATA data, data2; struct guidsection_header *section;

1 0

[pschweitzer] 63045: [FASTFAT] Properly handle files at root. CORE-8125 #resolve
by pschweitzer＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: pschweitzer Date: Tue Apr 29 18:25:02 2014 New Revision: 63045 URL: http://svn.reactos.org/svn/reactos?rev=63045&view=rev Log: [FASTFAT] Properly handle files at root. CORE-8125 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Tue Apr 29 18:25:02 2014 @@ -584,7 +584,7 @@ --idx; } - if (idx > 0) + if (idx > 0 || PathNameU.Buffer[0] == L'\\') { /* We don't want to include / in the name */ FileNameLen = PathNameU.Length - ((idx + 1) * sizeof(WCHAR));

1 0

[dquintana] 63044: [RSHELL] [SHELL32] * Move the IID_NULL_PPV_ARG macro to the shobj_undoc header, next to the (also ros-specific) IID_PPV_ARG macro, so that it can be used elsewhere. [SHELL32] * M...
by dquintana＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: dquintana Date: Tue Apr 29 11:14:29 2014 New Revision: 63044 URL: http://svn.reactos.org/svn/reactos?rev=63044&view=rev Log: [RSHELL] [SHELL32] * Move the IID_NULL_PPV_ARG macro to the shobj_undoc header, next to the (also ros-specific) IID_PPV_ARG macro, so that it can be used elsewhere. [SHELL32] * Make use of IID_NULL_PPV_ARG in all the calls to GetUIObjectOf, and fix one instance of mismatched riid/pointer. CORE-7330 Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/dll/win32/shell32/folders.cpp branches/shell-experiments/dll/win32/shell32/iconcache.cpp branches/shell-experiments/dll/win32/shell32/pidl.cpp branches/shell-experiments/dll/win32/shell32/shell32_main.cpp branches/shell-experiments/dll/win32/shell32/shelllink.cpp branches/shell-experiments/dll/win32/shell32/shlexec.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp branches/shell-experiments/include/psdk/shlobj_undoc.h Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -1358,8 +1358,6 @@ CComPtr<IContextMenu> contextMenu = NULL; LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(dwData); -#define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) - hr = m_shellFolder->GetUIObjectOf(GetToolbar(), 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &contextMenu)); if (FAILED_UNEXPECTEDLY(hr)) { Modified: branches/shell-experiments/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -235,7 +235,7 @@ hr = SHGetDesktopFolder(&psfDesktop); if (SUCCEEDED(hr)) - hr = psfDesktop->BindToObject(pSimplePidl, NULL, IID_IShellFolder2, (void**) &psfRecycleBin); + hr = psfDesktop->BindToObject(pSimplePidl, NULL, IID_PPV_ARG(IShellFolder2, &psfRecycleBin)); if (SUCCEEDED(hr)) hr = psfRecycleBin->EnumObjects(NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &EnumIDList); @@ -379,7 +379,7 @@ if (SUCCEEDED(SHGetDesktopFolder(&dsf))) { - HRESULT hr = dsf->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*)&pidl, IID_IShellLinkW, NULL, (LPVOID *)&psl); + HRESULT hr = dsf->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*) &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl)); if (SUCCEEDED(hr)) { Modified: branches/shell-experiments/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/iconcache.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -745,7 +745,7 @@ TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); - if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_IExtractIconW, 0, (void **)&ei))) + if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei)))) { if (SUCCEEDED(ei->GetIconLocation(uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) { Modified: branches/shell-experiments/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -686,8 +686,7 @@ CComPtr<IDataObject> pDataObj; HRESULT hr; - hr = lpsf->GetUIObjectOf(0, 1, &pidlSimple, - IID_IDataObject, 0, (LPVOID*)&pDataObj); + hr = lpsf->GetUIObjectOf(0, 1, &pidlSimple, IID_NULL_PPV_ARG(IDataObject, &pDataObj)); if (SUCCEEDED(hr)) { STGMEDIUM medium; Modified: branches/shell-experiments/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -566,7 +566,7 @@ /* get the iconlocation */ if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION )) { - UINT uDummy,uFlags; + UINT uFlags; if (flags & SHGFI_USEFILEATTRIBUTES) { @@ -602,8 +602,7 @@ else { hr = psfParent->GetUIObjectOf(0, 1, - (LPCITEMIDLIST*)&pidlLast, IID_IExtractIconW, - &uDummy, (LPVOID*)&pei); + (LPCITEMIDLIST*)&pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei)); if (SUCCEEDED(hr)) { hr = pei->GetIconLocation(uGilFlags, Modified: branches/shell-experiments/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shelllink.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -1140,7 +1140,7 @@ { CComPtr<IExtractIconA> pei; - hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconA, NULL, (LPVOID*)&pei); + hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconA, &pei)); if (SUCCEEDED(hr)) hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, NULL); @@ -1410,7 +1410,7 @@ { CComPtr<IExtractIconW> pei; - hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconW, NULL, (LPVOID*)&pei); + hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei)); if (SUCCEEDED(hr)) hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, &wFlags); @@ -2179,7 +2179,7 @@ if (SUCCEEDED(hr)) { - hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IDropTarget, NULL, (LPVOID*)&mDropTarget); + hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IDropTarget, &mDropTarget)); if (SUCCEEDED(hr)) hr = mDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect); Modified: branches/shell-experiments/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlexec.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -1228,8 +1228,7 @@ if (FAILED(r)) goto end; - shf->GetUIObjectOf(NULL, 1, &pidllast, - IID_IDataObject, NULL, (LPVOID*) &dataobj); + shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IDataObject, &dataobj)); end: if (pidl != sei->lpIDList) Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -1708,7 +1708,7 @@ DWORD dwAttributes = SFGAO_CANLINK; DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE; - if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_IDataObject, 0, (LPVOID *)&pda))) + if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_NULL_PPV_ARG(IDataObject, &pda)))) { IDropSource * pds = (IDropSource *)this; /* own DropSource interface */ @@ -2678,8 +2678,7 @@ SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); /* ... and bind m_pCurDropTarget to the IDropTarget interface of an UIObject of this object */ - hr = m_pSFParent->GetUIObjectOf(m_hWndList, 1, - (LPCITEMIDLIST*)&lvItem.lParam, IID_IDropTarget, NULL, (LPVOID*)&m_pCurDropTarget); + hr = m_pSFParent->GetUIObjectOf(m_hWndList, 1, (LPCITEMIDLIST*)&lvItem.lParam, IID_NULL_PPV_ARG(IDropTarget, &m_pCurDropTarget)); } /* If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state. */ Modified: branches/shell-experiments/include/psdk/shlobj_undoc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… ============================================================================== --- branches/shell-experiments/include/psdk/shlobj_undoc.h [iso-8859-1] (original) +++ branches/shell-experiments/include/psdk/shlobj_undoc.h [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -27,9 +27,11 @@ #endif /* defined(__cplusplus) */ #ifdef __cplusplus -#define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) +# define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) +# define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) #else -#define IID_PPV_ARG(Itype, ppType) IID_##Itype, (void**)(ppType) +# define IID_PPV_ARG(Itype, ppType) IID_##Itype, (void**)(ppType) +# define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, (void**)(ppType) #endif /*****************************************************************************

1 0

[tfaber] 63043: [FIND] - Fix missing explicit -A.... by using -W functions instead. Spotted by Christoph and Timo.
by tfaber＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: tfaber Date: Tue Apr 29 08:51:17 2014 New Revision: 63043 URL: http://svn.reactos.org/svn/reactos?rev=63043&view=rev Log: [FIND] - Fix missing explicit -A.... by using -W functions instead. Spotted by Christoph and Timo. Modified: trunk/reactos/base/applications/cmdutils/find/find.c Modified: trunk/reactos/base/applications/cmdutils/find/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/find/find.c [iso-8859-1] Tue Apr 29 08:51:17 2014 @@ -125,11 +125,12 @@ void usage (void) { - char szUsage[4096]; - - LoadStringA (GetModuleHandle (NULL), IDS_USAGE, szUsage, sizeof(szUsage) / sizeof(szUsage[0])); - CharToOemA (szUsage, szUsage); - fputs (szUsage, stdout); + WCHAR wszUsage[4096]; + char oemUsage[4096]; + + LoadStringW (GetModuleHandleW (NULL), IDS_USAGE, wszUsage, sizeof(wszUsage) / sizeof(wszUsage[0])); + CharToOemW (wszUsage, oemUsage); + fputs (oemUsage, stdout); } @@ -139,7 +140,8 @@ { char *opt, *needle = NULL; int ret = 0; - char szMessage[4096]; + WCHAR wszMessage[4096]; + char oemMessage[4096]; int invert_search = 0; /* flag to invert the search */ int count_lines = 0; /* flag to whether/not count lines */ @@ -216,9 +218,9 @@ { /* We were not able to find a file. Display a message and set the exit status. */ - LoadStringA (GetModuleHandle (NULL), IDS_NO_SUCH_FILE, szMessage, sizeof(szMessage) / sizeof(szMessage[0])); - CharToOemA (szMessage, szMessage); - fprintf (stderr, szMessage, *argv); + LoadStringW (GetModuleHandleW (NULL), IDS_NO_SUCH_FILE, wszMessage, sizeof(wszMessage) / sizeof(wszMessage[0])); + CharToOemW (wszMessage, oemMessage); + fprintf (stderr, oemMessage, *argv); } else { @@ -235,9 +237,9 @@ } else { - LoadString (GetModuleHandle (NULL), IDS_CANNOT_OPEN, szMessage, sizeof(szMessage) / sizeof(szMessage[0])); - CharToOemA (szMessage, szMessage); - fprintf (stderr, szMessage, + LoadStringW (GetModuleHandleW (NULL), IDS_CANNOT_OPEN, wszMessage, sizeof(wszMessage) / sizeof(wszMessage[0])); + CharToOemW (wszMessage, oemMessage); + fprintf (stderr, oemMessage, finddata.name); } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs