Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [INETCOMM_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0749f1d71d1ab4e2ef51f… commit 0749f1d71d1ab4e2ef51fbc97f201062bc159359 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:40:54 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:40:54 2018 +0100 [INETCOMM_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/inetcomm/mimeole.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/inetcomm/mimeole.c b/modules/rostests/winetests/inetcomm/mimeole.c index 2216bc3eca..4eea605eef 100644 --- a/modules/rostests/winetests/inetcomm/mimeole.c +++ b/modules/rostests/winetests/inetcomm/mimeole.c @@ -1416,6 +1416,7 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) HRESULT hres; HANDLE file; DWORD size; + BOOL ret; p = file_name + GetCurrentDirectoryA(sizeof(file_name), file_name); *p++ = '\\'; @@ -1454,7 +1455,8 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) CHECK_CALLED(ReportResult); IInternetProtocol_Release(protocol); - ok(DeleteFileA("winetest.mht"), "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA("winetest.mht"); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); } static const struct {

6 years, 11 months

01/01: [INETCOMM] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88221e598ae6563fbe7ed… commit 88221e598ae6563fbe7ed70bb98fa8bf30263d4f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:39:56 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:39:56 2018 +0100 [INETCOMM] Sync with Wine 3.0. CORE-14225 --- dll/win32/inetcomm/smtptransport.c | 8 +------- media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dll/win32/inetcomm/smtptransport.c b/dll/win32/inetcomm/smtptransport.c index 3a0051fcfe..b3b60f3f88 100644 --- a/dll/win32/inetcomm/smtptransport.c +++ b/dll/win32/inetcomm/smtptransport.c @@ -44,13 +44,7 @@ static HRESULT SMTPTransport_ParseResponse(SMTPTransport *This, char *pszRespons pResponse->rIxpResult.pszResponse = pszResponse; pResponse->rIxpResult.dwSocketError = 0; pResponse->rIxpResult.uiServerError = strtol(pszResponse, &pszResponse, 10); - if (*pszResponse == '-') - { - pResponse->fDone = FALSE; - pszResponse++; - } - else - pResponse->fDone = TRUE; + pResponse->fDone = (*pszResponse != '-'); switch (pResponse->rIxpResult.uiServerError) { diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 83a7f59101..15d8e3f5d3 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -78,7 +78,7 @@ reactos/dll/win32/ieframe # Synced to Wine-3.0 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 reactos/dll/win32/imagehlp # Synced to Wine-3.0 reactos/dll/win32/imm32 # Synced to Wine-2.22 -reactos/dll/win32/inetcomm # Synced to WineStaging-2.16 +reactos/dll/win32/inetcomm # Synced to Wine-3.0 reactos/dll/win32/inetmib1 # Synced to WineStaging-2.9 reactos/dll/win32/initpki # Synced to WineStaging-2.9 reactos/dll/win32/inseng # Synced to WineStaging-2.9

6 years, 11 months

01/01: [IMAGEHLP_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b7a0e1bc9a1c9d778e7c… commit 7b7a0e1bc9a1c9d778e7c1f2bd18ace6c02e266a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:38:42 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:38:42 2018 +0100 [IMAGEHLP_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/imagehlp/image.c | 123 ++---------- modules/rostests/winetests/imagehlp/integrity.c | 252 +----------------------- 2 files changed, 18 insertions(+), 357 deletions(-) diff --git a/modules/rostests/winetests/imagehlp/image.c b/modules/rostests/winetests/imagehlp/image.c index 0d6521b45b..f16ba5e146 100644 --- a/modules/rostests/winetests/imagehlp/image.c +++ b/modules/rostests/winetests/imagehlp/image.c @@ -33,10 +33,6 @@ static HMODULE hImageHlp; static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); static BOOL (WINAPI *pBindImageEx)(DWORD Flags, const char *ImageName, const char *DllPath, const char *SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine); -static DWORD (WINAPI* pGetImageUnusedHeaderBytes)(PLOADED_IMAGE, LPDWORD); -static PLOADED_IMAGE (WINAPI* pImageLoad)(PCSTR, PCSTR); -static BOOL (WINAPI* pImageUnload)(PLOADED_IMAGE); - /* minimal PE file image */ #define VA_START 0x400000 @@ -60,7 +56,11 @@ struct Imports { } ibn; char dllname[0x10]; }; +#ifdef __REACTOS__ #define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks)) +#else +#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0])) +#endif static struct _PeImage { IMAGE_DOS_HEADER dos_header; @@ -223,8 +223,12 @@ static const struct expected_blob b1[] = { {FILE_IDATA-FILE_TEXT, &bin.text_section}, {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk), &bin.idata_section.descriptors[0].u.OriginalFirstThunk}, +#ifdef __REACTOS__ {FIELD_OFFSET(struct Imports, thunks)- (FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR, Name)), +#else + {FIELD_OFFSET(struct Imports, thunks)-FIELD_OFFSET(struct Imports, descriptors[0].Name), +#endif &bin.idata_section.descriptors[0].Name}, {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn), &bin.idata_section.ibn} @@ -392,10 +396,10 @@ static void test_bind_image_ex(void) SetLastError(0xdeadbeef); ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, "nonexistent.dll", 0, 0, testing_status_routine); - ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || - (GetLastError() == ERROR_INVALID_PARAMETER)), - "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", - GetLastError()); + todo_wine ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); file = create_temp_file(temp_file); if (file == INVALID_HANDLE_VALUE) @@ -417,103 +421,14 @@ static void test_bind_image_ex(void) testing_status_routine); ok(ret, "BindImageEx failed: %d\n", GetLastError()); - ok(status_routine_called[BindImportModule] == 1, - "StatusRoutine was called %d times\n", status_routine_called[BindImportModule]); + todo_wine ok(status_routine_called[BindImportModule] == 1, + "StatusRoutine was called %d times\n", status_routine_called[BindImportModule]); - ok((status_routine_called[BindImportProcedure] == 1) + todo_wine ok((status_routine_called[BindImportProcedure] == 1) #if defined(_WIN64) - || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */ + || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */ #endif - , "StatusRoutine was called %d times\n", status_routine_called[BindImportProcedure]); - - DeleteFileA(temp_file); -} - -static void test_image_load(void) -{ - char temp_file[MAX_PATH]; - PLOADED_IMAGE img; - DWORD ret, count; - HANDLE file; - - if (!pImageLoad || !pImageUnload) - { - win_skip("ImageLoad or ImageUnload function is not available\n"); - return; - } - if (!pGetImageUnusedHeaderBytes) - { - win_skip("GetImageUnusedHeaderBytes function is not available\n"); - return; - } - - file = create_temp_file(temp_file); - if (file == INVALID_HANDLE_VALUE) - { - skip("couldn't create temp file\n"); - return; - } - - WriteFile(file, &bin, sizeof(bin), &count, NULL); - CloseHandle(file); - - img = pImageLoad(temp_file, NULL); - ok(img != NULL, "ImageLoad unexpectedly failed\n"); - - if (img) - { - ok(!strcmp(img->ModuleName, temp_file), - "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file); - ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); - if (img->MappedAddress) - { - ok(!memcmp(img->MappedAddress, &bin.dos_header, sizeof(bin.dos_header)), - "MappedAddress doesn't point to IMAGE_DOS_HEADER\n"); - } - ok(img->FileHeader != NULL, "FileHeader != NULL\n"); - if (img->FileHeader) - { - ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), - "FileHeader doesn't point to IMAGE_NT_HEADERS32\n"); - } - ok(img->NumberOfSections == 3, - "unexpected NumberOfSections, got %d instead of 3\n", img->NumberOfSections); - if (img->NumberOfSections >= 3) - { - ok(!strcmp((const char *)img->Sections[0].Name, ".text"), - "unexpected name for section 0, expected .text, got %s\n", - (const char *)img->Sections[0].Name); - ok(!strcmp((const char *)img->Sections[1].Name, ".bss"), - "unexpected name for section 1, expected .bss, got %s\n", - (const char *)img->Sections[1].Name); - ok(!strcmp((const char *)img->Sections[2].Name, ".idata"), - "unexpected name for section 2, expected .idata, got %s\n", - (const char *)img->Sections[2].Name); - } - ok(img->Characteristics == 0x102, - "unexpected Characteristics, got 0x%x instead of 0x102\n", img->Characteristics); - ok(img->fSystemImage == 0, - "unexpected fSystemImage, got %d instead of 0\n", img->fSystemImage); - ok(img->fDOSImage == 0, - "unexpected fDOSImage, got %d instead of 0\n", img->fDOSImage); - todo_wine - ok(img->fReadOnly == 1 || broken(!img->fReadOnly) /* <= WinXP */, - "unexpected fReadOnly, got %d instead of 1\n", img->fReadOnly); - todo_wine - ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, - "unexpected Version, got %d instead of 1\n", img->Version); - ok(img->SizeOfImage == 0x600, - "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage); - - count = 0xdeadbeef; - ret = pGetImageUnusedHeaderBytes(img, &count); - todo_wine - ok(ret == 448, "GetImageUnusedHeaderBytes returned %u instead of 448\n", ret); - todo_wine - ok(count == 64, "unexpected size for unused header bytes, got %u instead of 64\n", count); - - pImageUnload(img); - } + , "StatusRoutine was called %d times\n", status_routine_called[BindImportProcedure]); DeleteFileA(temp_file); } @@ -530,13 +445,9 @@ START_TEST(image) pImageGetDigestStream = (void *) GetProcAddress(hImageHlp, "ImageGetDigestStream"); pBindImageEx = (void *) GetProcAddress(hImageHlp, "BindImageEx"); - pGetImageUnusedHeaderBytes = (void *) GetProcAddress(hImageHlp, "GetImageUnusedHeaderBytes"); - pImageLoad = (void *) GetProcAddress(hImageHlp, "ImageLoad"); - pImageUnload = (void *) GetProcAddress(hImageHlp, "ImageUnload"); test_get_digest_stream(); test_bind_image_ex(); - test_image_load(); FreeLibrary(hImageHlp); } diff --git a/modules/rostests/winetests/imagehlp/integrity.c b/modules/rostests/winetests/imagehlp/integrity.c index 913c396aa1..3fa359f316 100644 --- a/modules/rostests/winetests/imagehlp/integrity.c +++ b/modules/rostests/winetests/imagehlp/integrity.c @@ -26,9 +26,8 @@ #include "winerror.h" #include "winnt.h" #include "imagehlp.h" -#include "psapi.h" -static HMODULE hImageHlp, hPsapi; +static HMODULE hImageHlp; static char test_dll_path[MAX_PATH]; static BOOL (WINAPI *pImageAddCertificate)(HANDLE, LPWIN_CERTIFICATE, PDWORD); @@ -36,9 +35,6 @@ static BOOL (WINAPI *pImageEnumerateCertificates)(HANDLE, WORD, PDWORD, PDWORD, static BOOL (WINAPI *pImageGetCertificateData)(HANDLE, DWORD, LPWIN_CERTIFICATE, PDWORD); static BOOL (WINAPI *pImageGetCertificateHeader)(HANDLE, DWORD, LPWIN_CERTIFICATE); static BOOL (WINAPI *pImageRemoveCertificate)(HANDLE, DWORD); -static PIMAGE_NT_HEADERS (WINAPI *pCheckSumMappedFile)(PVOID, DWORD, PDWORD, PDWORD); - -static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD cb); static const char test_cert_data[] = {0x30,0x82,0x02,0xE1,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02 @@ -94,27 +90,6 @@ static const char test_cert_data[] = static const char test_cert_data_2[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02,0x03}; -static char test_pe_executable[] = -{ - 0x4d,0x5a,0x90,0x00,0x03,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0xff,0xff,0x00, - 0x00,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x80,0x00,0x00,0x00,0x0e,0x1f,0xba,0x0e,0x00,0xb4,0x09,0xcd,0x21,0xb8,0x01, - 0x4c,0xcd,0x21,0x54,0x68,0x69,0x73,0x20,0x70,0x72,0x6f,0x67,0x72,0x61,0x6d, - 0x20,0x63,0x61,0x6e,0x6e,0x6f,0x74,0x20,0x62,0x65,0x20,0x72,0x75,0x6e,0x20, - 0x69,0x6e,0x20,0x44,0x4f,0x53,0x20,0x6d,0x6f,0x64,0x65,0x2e,0x0d,0x0d,0x0a, - 0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x45,0x00,0x00,0x4c,0x01,0x0f, - 0x00,0xfd,0x38,0xc9,0x55,0x00,0x24,0x01,0x00,0xea,0x04,0x00,0x00,0xe0,0x00, - 0x07,0x01,0x0b,0x01,0x02,0x18,0x00,0x1a,0x00,0x00,0x00,0x2c,0x00,0x00,0x00, - 0x06,0x00,0x00,0xe0,0x14,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x30,0x00,0x00, - 0x00,0x00,0x40,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00,0x04,0x00,0x00, - 0x00,0x01,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0, - 0x01,0x00,0x00,0x04,0x00,0x00,/* checksum */ 0x11,0xEF,0xCD,0xAB,0x03,0x00, - 0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x10,0x00,0x00, - 0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00 -}; - static BOOL copy_dll_file(void) { char sys_dir[MAX_PATH+15]; @@ -264,223 +239,6 @@ static void test_remove_certificate(int index) CloseHandle(hFile); } -static DWORD _get_checksum_offset(PVOID base, PIMAGE_NT_HEADERS *nt_header, DWORD *checksum) -{ - IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)base; - PIMAGE_NT_HEADERS32 Header32; - PIMAGE_NT_HEADERS64 Header64; - - if (dos->e_magic != IMAGE_DOS_SIGNATURE) - return 0; - - Header32 = (IMAGE_NT_HEADERS32 *)((char *)dos + dos->e_lfanew); - if (Header32->Signature != IMAGE_NT_SIGNATURE) - return 0; - - *nt_header = (PIMAGE_NT_HEADERS)Header32; - - if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) - { - *checksum = Header32->OptionalHeader.CheckSum; - return (char *)&Header32->OptionalHeader.CheckSum - (char *)base; - } - else if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - { - Header64 = (IMAGE_NT_HEADERS64 *)Header32; - *checksum = Header64->OptionalHeader.CheckSum; - return (char *)&Header64->OptionalHeader.CheckSum - (char *)base; - } - - return 0; -} - -static void test_pe_checksum(void) -{ - DWORD checksum_orig, checksum_new, checksum_off, checksum_correct; - PIMAGE_NT_HEADERS nt_header; - PIMAGE_NT_HEADERS ret; - HMODULE quartz_data; - char* quartz_base; - MODULEINFO modinfo; - char buffer[20]; - BOOL ret_bool; - - if (!pCheckSumMappedFile) - { - win_skip("CheckSumMappedFile not supported, skipping tests\n"); - return; - } - - SetLastError(0xdeadbeef); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(NULL, 0, &checksum_orig, &checksum_new); - ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); - ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0, "Expected 0, got %x\n", checksum_new); - - SetLastError(0xdeadbeef); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile((void *)0xdeadbeef, 0, &checksum_orig, &checksum_new); - ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); - ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0, "Expected 0, got %x\n", checksum_new); - - if (0) - { - /* crashes on Windows */ - checksum_orig = checksum_new = 0xdeadbeef; - pCheckSumMappedFile(0, 0x1000, &checksum_orig, &checksum_new); - pCheckSumMappedFile((void *)0xdeadbeef, 0x1000, NULL, NULL); - } - - /* basic checksum tests */ - memset(buffer, 0x11, sizeof(buffer)); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(buffer, sizeof(buffer), &checksum_orig, &checksum_new); - ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0xaabe, "Expected 0xaabe, got %x\n", checksum_new); - - memset(buffer, 0x22, sizeof(buffer)); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(buffer, sizeof(buffer), &checksum_orig, &checksum_new); - ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0x5569, "Expected 0x5569, got %x\n", checksum_new); - - memset(buffer, 0x22, sizeof(buffer)); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(buffer, 10, &checksum_orig, &checksum_new); - ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0xaab4, "Expected 0xaab4, got %x\n", checksum_new); - - memset(buffer, 0x22, sizeof(buffer)); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(buffer, 11, &checksum_orig, &checksum_new); - ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0xaad7, "Expected 0xaad7, got %x\n", checksum_new); - - /* test checksum of PE module */ - memset(buffer, 0x22, sizeof(buffer)); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(test_pe_executable, sizeof(test_pe_executable), - &checksum_orig, &checksum_new); - ok((char *)ret == test_pe_executable + 0x80, "Expected %p, got %p\n", test_pe_executable + 0x80, ret); - ok(checksum_orig == 0xabcdef11, "Expected 0xabcdef11, got %x\n", checksum_orig); - ok(checksum_new == 0xaa4, "Expected 0xaa4, got %x\n", checksum_new); - - if (!pGetModuleInformation) - { - win_skip("GetModuleInformation not supported, skipping tests\n"); - return; - } - - ret_bool = pGetModuleInformation(GetCurrentProcess(), GetModuleHandleA(NULL), - &modinfo, sizeof(modinfo)); - ok(ret_bool, "GetModuleInformation failed, error: %x\n", GetLastError()); - - if (0) - { - /* crashes on Windows */ - pCheckSumMappedFile(modinfo.lpBaseOfDll, modinfo.SizeOfImage, NULL, NULL); - } - - SetLastError(0xdeadbeef); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, modinfo.SizeOfImage, &checksum_orig, &checksum_new); - ok(ret != NULL, "Expected CheckSumMappedFile to succeed\n"); - ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); - ok(checksum_orig != 0xdeadbeef, "Expected orig checksum != 0xdeadbeef\n"); - ok(checksum_new != 0xdeadbeef, "Expected new checksum != 0xdeadbeef\n"); - - SetLastError(0xdeadbeef); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile((char *)modinfo.lpBaseOfDll + 100, modinfo.SizeOfImage - 100, - &checksum_orig, &checksum_new); - ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); - ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); - ok(checksum_orig == 0, "Expected 0xdeadbeef, got %x\n", checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_off = _get_checksum_offset(modinfo.lpBaseOfDll, &nt_header, &checksum_correct); - ok(checksum_off != 0, "Failed to get checksum offset\n"); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, checksum_off, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, (char *)nt_header - (char *)modinfo.lpBaseOfDll, - &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, sizeof(IMAGE_DOS_HEADER), - &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, 0, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - todo_wine ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile((char *)modinfo.lpBaseOfDll + 1, 0, - &checksum_orig, &checksum_new); - ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0, "Expected 0, got %x\n", checksum_new); - - quartz_data = LoadLibraryExA("quartz.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); - if (!quartz_data) - { - skip("Failed to load quartz as datafile, skipping tests\n"); - return; - } - - quartz_base = (char *)((DWORD_PTR)quartz_data & ~1); - checksum_off = _get_checksum_offset(quartz_base, &nt_header, &checksum_correct); - ok(checksum_off != 0, "Failed to get checksum offset\n"); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(quartz_base, checksum_off, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(quartz_base, (char *)nt_header - quartz_base, - &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(quartz_base, sizeof(IMAGE_DOS_HEADER), &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(quartz_base, 0, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - todo_wine ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - FreeLibrary(quartz_data); -} - START_TEST(integrity) { DWORD file_size, file_size_orig, first, second; @@ -515,11 +273,6 @@ START_TEST(integrity) pImageGetCertificateData = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateData"); pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateHeader"); pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp, "ImageRemoveCertificate"); - pCheckSumMappedFile = (void *) GetProcAddress(hImageHlp, "CheckSumMappedFile"); - - hPsapi = LoadLibraryA("psapi.dll"); - if (hPsapi) - pGetModuleInformation = (void *) GetProcAddress(hPsapi, "GetModuleInformation"); first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); test_get_certificate(test_cert_data, first); @@ -546,9 +299,6 @@ START_TEST(integrity) file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); - test_pe_checksum(); - - if (hPsapi) FreeLibrary(hPsapi); FreeLibrary(hImageHlp); DeleteFileA(test_dll_path); }

6 years, 11 months

01/01: [IMAGEHLP] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc87cf0bc339281d0d346… commit fc87cf0bc339281d0d346ecdbb25bfe8be1e612f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:37:52 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:37:52 2018 +0100 [IMAGEHLP] Sync with Wine 3.0. CORE-14225 --- dll/win32/imagehlp/access.c | 85 ++++++++---------- dll/win32/imagehlp/modify.c | 214 ++++++++++---------------------------------- media/doc/README.WINE | 2 +- 3 files changed, 86 insertions(+), 215 deletions(-) diff --git a/dll/win32/imagehlp/access.c b/dll/win32/imagehlp/access.c index b386ce323d..367efac5d5 100644 --- a/dll/win32/imagehlp/access.c +++ b/dll/win32/imagehlp/access.c @@ -25,7 +25,8 @@ /*********************************************************************** * Data */ -LIST_ENTRY image_list = { &image_list, &image_list }; + +static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; @@ -60,69 +61,57 @@ DWORD WINAPI GetImageUnusedHeaderBytes( /*********************************************************************** * ImageLoad (IMAGEHLP.@) */ -PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path) +PLOADED_IMAGE WINAPI ImageLoad(PCSTR DllName, PCSTR DllPath) { - LOADED_IMAGE *image; - - TRACE("(%s, %s)\n", dll_name, dll_path); - - image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image)); - if (!image) return NULL; - - if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE)) - { - HeapFree(IMAGEHLP_hHeap, 0, image); - return NULL; - } - - image->Links.Flink = image_list.Flink; - image->Links.Blink = &image_list; - image_list.Flink->Blink = &image->Links; - image_list.Flink = &image->Links; - - return image; + PLOADED_IMAGE pLoadedImage; + + FIXME("(%s, %s): stub\n", DllName, DllPath); + + pLoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)); + if (pLoadedImage) + pLoadedImage->FileHeader = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(IMAGE_NT_HEADERS)); + + return pLoadedImage; } /*********************************************************************** * ImageUnload (IMAGEHLP.@) */ -BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) +BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) { - LIST_ENTRY *entry, *mark; - PLOADED_IMAGE image; - - FIXME("(%p)\n", loaded_image); + LIST_ENTRY *pCurrent, *pFind; - if (!loaded_image) + TRACE("(%p)\n", pLoadedImage); + + if(!IMAGEHLP_pFirstLoadedImage || !pLoadedImage) { - /* No image loaded or null pointer */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + /* No image loaded or null pointer */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - /* FIXME: do we really need to check this? */ - mark = &image_list; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) + pFind=&pLoadedImage->Links; + pCurrent=&IMAGEHLP_pFirstLoadedImage->Links; + while((pCurrent != pFind) && + (pCurrent != NULL)) + pCurrent = pCurrent->Flink; + if(!pCurrent) { - image = CONTAINING_RECORD(entry, LOADED_IMAGE, Links); - if (image == loaded_image) - break; + /* Not found */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - if (entry == mark) - { - /* Not found */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if(pCurrent->Blink) + pCurrent->Blink->Flink = pCurrent->Flink; + else + IMAGEHLP_pFirstLoadedImage = pCurrent->Flink?CONTAINING_RECORD( + pCurrent->Flink, LOADED_IMAGE, Links):NULL; - entry->Blink->Flink = entry->Flink; - entry->Flink->Blink = entry->Blink; + if(pCurrent->Flink) + pCurrent->Flink->Blink = pCurrent->Blink; - UnMapAndLoad(loaded_image); - HeapFree(IMAGEHLP_hHeap, 0, loaded_image); - - return TRUE; + return FALSE; } /*********************************************************************** diff --git a/dll/win32/imagehlp/modify.c b/dll/win32/imagehlp/modify.c index 4ec92ebc98..6adabb6771 100644 --- a/dll/win32/imagehlp/modify.c +++ b/dll/win32/imagehlp/modify.c @@ -25,11 +25,9 @@ static WORD CalcCheckSum(DWORD StartValue, LPVOID BaseAddress, DWORD WordCount); + /*********************************************************************** * BindImage (IMAGEHLP.@) - * - * NOTES - * See BindImageEx */ BOOL WINAPI BindImage( PCSTR ImageName, PCSTR DllPath, PCSTR SymbolPath) @@ -39,138 +37,42 @@ BOOL WINAPI BindImage( /*********************************************************************** * BindImageEx (IMAGEHLP.@) - * - * Compute the virtual address of each function imported by a PE image - * - * PARAMS - * - * Flags [in] Bind options - * ImageName [in] File name of the image to be bound - * DllPath [in] Root of the fallback search path in case the ImageName file cannot be opened - * SymbolPath [in] Symbol file root search path - * StatusRoutine [in] Pointer to a status routine which will be called during the binding process - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * Binding is not implemented yet, so far this function only enumerates - * all imported dlls/functions and returns TRUE. */ BOOL WINAPI BindImageEx( DWORD Flags, PCSTR ImageName, PCSTR DllPath, PCSTR SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine) { - LOADED_IMAGE loaded_image; - const IMAGE_IMPORT_DESCRIPTOR *import_desc; - ULONG size; - - FIXME("(%d, %s, %s, %s, %p): semi-stub\n", - Flags, debugstr_a(ImageName), debugstr_a(DllPath), - debugstr_a(SymbolPath), StatusRoutine - ); - - if (!(MapAndLoad(ImageName, DllPath, &loaded_image, TRUE, TRUE))) return FALSE; - - if (!(import_desc = RtlImageDirectoryEntryToData((HMODULE)loaded_image.MappedAddress, FALSE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size))) - { - UnMapAndLoad(&loaded_image); - return TRUE; /* No imported modules means nothing to bind, so we're done. */ - } - - /* FIXME: Does native imagehlp support both 32-bit and 64-bit PE executables? */ -#ifdef _WIN64 - if (loaded_image.FileHeader->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) -#else - if (loaded_image.FileHeader->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) -#endif - { - FIXME("Wrong architecture in PE header, unable to enumerate imports\n"); - UnMapAndLoad(&loaded_image); - return TRUE; - } - - for (; import_desc->Name && import_desc->FirstThunk; ++import_desc) - { - IMAGE_THUNK_DATA *thunk; - char dll_fullname[MAX_PATH]; - const char *dll_name; - - if (!(dll_name = ImageRvaToVa(loaded_image.FileHeader, loaded_image.MappedAddress, - import_desc->Name, 0))) - { - UnMapAndLoad(&loaded_image); - SetLastError(ERROR_INVALID_ACCESS); /* FIXME */ - return FALSE; - } - - if (StatusRoutine) - StatusRoutine(BindImportModule, ImageName, dll_name, 0, 0); - - if (!SearchPathA(DllPath, dll_name, 0, sizeof(dll_fullname), dll_fullname, 0)) - { - UnMapAndLoad(&loaded_image); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - - if (!(thunk = ImageRvaToVa(loaded_image.FileHeader, loaded_image.MappedAddress, - import_desc->OriginalFirstThunk ? import_desc->OriginalFirstThunk : - import_desc->FirstThunk, 0))) - { - ERR("Can't grab thunk data of %s, going to next imported DLL\n", dll_name); - continue; - } - - for (; thunk->u1.Ordinal; ++thunk) - { - /* Ignoring ordinal imports for now */ - if(!IMAGE_SNAP_BY_ORDINAL(thunk->u1.Ordinal)) - { - IMAGE_IMPORT_BY_NAME *iibn; - - if (!(iibn = ImageRvaToVa(loaded_image.FileHeader, loaded_image.MappedAddress, - thunk->u1.AddressOfData, 0))) - { - ERR("Can't grab import by name info, skipping to next ordinal\n"); - continue; - } - - if (StatusRoutine) - StatusRoutine(BindImportProcedure, ImageName, dll_fullname, 0, (ULONG_PTR)iibn->Name); - } - } - } - - UnMapAndLoad(&loaded_image); - return TRUE; + FIXME("(%d, %s, %s, %s, %p): stub\n", + Flags, debugstr_a(ImageName), debugstr_a(DllPath), + debugstr_a(SymbolPath), StatusRoutine + ); + return TRUE; } /*********************************************************************** * CheckSum (internal) */ -static WORD CalcCheckSum(DWORD StartValue, LPVOID BaseAddress, DWORD ByteCount) +static WORD CalcCheckSum( + DWORD StartValue, LPVOID BaseAddress, DWORD WordCount) { - LPWORD Ptr; - DWORD Sum, i; - - Sum = StartValue; - Ptr = (LPWORD)BaseAddress; - for (i = ByteCount; i > 1; i -= 2) - { - Sum += *Ptr; - if (HIWORD(Sum) != 0) - Sum = LOWORD(Sum) + HIWORD(Sum); - Ptr++; - } - - if (i == 1) - Sum += *(BYTE *)Ptr; - - return (WORD)(LOWORD(Sum) + HIWORD(Sum)); + LPWORD Ptr; + DWORD Sum; + DWORD i; + + Sum = StartValue; + Ptr = (LPWORD)BaseAddress; + for (i = 0; i < WordCount; i++) + { + Sum += *Ptr; + if (HIWORD(Sum) != 0) + { + Sum = LOWORD(Sum) + HIWORD(Sum); + } + Ptr++; + } + + return (WORD)(LOWORD(Sum) + HIWORD(Sum)); } @@ -184,57 +86,37 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *) BaseAddress; PIMAGE_NT_HEADERS32 Header32; PIMAGE_NT_HEADERS64 Header64; - PIMAGE_NT_HEADERS ret = NULL; DWORD *ChecksumFile; DWORD CalcSum; - DWORD HdrSum = 0; + DWORD HdrSum; TRACE("(%p, %d, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum ); - CalcSum = (DWORD)CalcCheckSum(0, BaseAddress, FileLength); + CalcSum = (DWORD)CalcCheckSum(0, + BaseAddress, + (FileLength + 1) / sizeof(WORD)); - __TRY - { - if (dos->e_magic != IMAGE_DOS_SIGNATURE) -#ifdef __REACTOS__ - _SEH2_LEAVE; -#else - break; -#endif - - Header32 = (IMAGE_NT_HEADERS32 *)((char *)dos + dos->e_lfanew); - if (Header32->Signature != IMAGE_NT_SIGNATURE) -#ifdef __REACTOS__ - _SEH2_LEAVE; -#else - break; -#endif - - ret = (PIMAGE_NT_HEADERS)Header32; - - if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) - ChecksumFile = &Header32->OptionalHeader.CheckSum; - else if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - { - Header64 = (IMAGE_NT_HEADERS64 *)Header32; - ChecksumFile = &Header64->OptionalHeader.CheckSum; - } - else -#ifdef __REACTOS__ - _SEH2_LEAVE; -#else - break; -#endif - - HdrSum = *ChecksumFile; - } - __EXCEPT_PAGE_FAULT + if (dos->e_magic != IMAGE_DOS_SIGNATURE) + return NULL; + + Header32 = (IMAGE_NT_HEADERS32 *)((char *)dos + dos->e_lfanew); + + if (Header32->Signature != IMAGE_NT_SIGNATURE) + return NULL; + + if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + ChecksumFile = &Header32->OptionalHeader.CheckSum; + else if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { - /* nothing */ + Header64 = (IMAGE_NT_HEADERS64 *)Header32; + ChecksumFile = &Header64->OptionalHeader.CheckSum; } - __ENDTRY + else + return NULL; + + HdrSum = *ChecksumFile; /* Subtract image checksum from calculated checksum. */ /* fix low word of checksum */ @@ -261,9 +143,9 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( CalcSum += FileLength; *CheckSum = CalcSum; - *HeaderSum = HdrSum; + *HeaderSum = *ChecksumFile; - return ret; + return (PIMAGE_NT_HEADERS) Header32; } /*********************************************************************** diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0d0cc1caa1..83a7f59101 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -76,7 +76,7 @@ reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/iccvid # Synced to Wine-3.0 reactos/dll/win32/ieframe # Synced to Wine-3.0 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 -reactos/dll/win32/imagehlp # Synced to WineStaging-2.9 +reactos/dll/win32/imagehlp # Synced to Wine-3.0 reactos/dll/win32/imm32 # Synced to Wine-2.22 reactos/dll/win32/inetcomm # Synced to WineStaging-2.16 reactos/dll/win32/inetmib1 # Synced to WineStaging-2.9

6 years, 11 months

01/01: [IEFRAME] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4b0f2155f08575915b7f… commit c4b0f2155f08575915b7f74520c31b6d354c7206 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:36:36 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:36:36 2018 +0100 [IEFRAME] Sync with Wine 3.0. CORE-14225 --- dll/win32/ieframe/ieframe.h | 5 +- dll/win32/ieframe/ieframe.rgs | 7 ++ dll/win32/ieframe/ieframe_main.c | 33 +++----- dll/win32/ieframe/iexplore.c | 166 +++++++++++++++++++++++++++++++++------ dll/win32/ieframe/view.c | 2 +- media/doc/README.WINE | 2 +- 6 files changed, 165 insertions(+), 50 deletions(-) diff --git a/dll/win32/ieframe/ieframe.h b/dll/win32/ieframe/ieframe.h index e4c9d934f1..bab08f4f6e 100644 --- a/dll/win32/ieframe/ieframe.h +++ b/dll/win32/ieframe/ieframe.h @@ -329,13 +329,16 @@ TID_LIST } tid_t; HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; -HRESULT register_class_object(BOOL) DECLSPEC_HIDDEN; HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI InternetExplorer_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI InternetExplorerManager_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; + +extern IClassFactory InternetExplorerFactory DECLSPEC_HIDDEN; +extern IClassFactory InternetExplorerManagerFactory DECLSPEC_HIDDEN; extern LONG module_ref DECLSPEC_HIDDEN; extern HINSTANCE ieframe_instance DECLSPEC_HIDDEN; diff --git a/dll/win32/ieframe/ieframe.rgs b/dll/win32/ieframe/ieframe.rgs index f99e6b6352..0b48600321 100644 --- a/dll/win32/ieframe/ieframe.rgs +++ b/dll/win32/ieframe/ieframe.rgs @@ -42,6 +42,13 @@ HKCR Control } } + NoRemove Interface + { + '{acc84351-04ff-44f9-b23f-655ed168c6d5}' + { + ProxyStubClsid32 = s '{a4a1a128-768f-41e0-bf75-e4fddd701cba}' + } + } 'InternetShortcut' { val 'EditFlags' = s '2' diff --git a/dll/win32/ieframe/ieframe_main.c b/dll/win32/ieframe/ieframe_main.c index a83d7a93cb..f1fddab0b7 100644 --- a/dll/win32/ieframe/ieframe_main.c +++ b/dll/win32/ieframe/ieframe_main.c @@ -232,32 +232,17 @@ static const IClassFactoryVtbl InternetExplorerFactoryVtbl = { ClassFactory_LockServer }; -static IClassFactory InternetExplorerFactory = { &InternetExplorerFactoryVtbl }; +IClassFactory InternetExplorerFactory = { &InternetExplorerFactoryVtbl }; -HRESULT register_class_object(BOOL do_reg) -{ - HRESULT hres; - - static DWORD cookie; - - if(do_reg) { - hres = CoRegisterClassObject(&CLSID_InternetExplorer, - (IUnknown*)&InternetExplorerFactory, CLSCTX_SERVER, - REGCLS_MULTIPLEUSE|REGCLS_SUSPENDED, &cookie); - if (FAILED(hres)) { - ERR("failed to register object %08x\n", hres); - return hres; - } - - hres = CoResumeClassObjects(); - if(SUCCEEDED(hres)) - return hres; - - ERR("failed to resume object %08x\n", hres); - } +static const IClassFactoryVtbl InternetExplorerManagerFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + InternetExplorerManager_Create, + ClassFactory_LockServer +}; - return CoRevokeClassObject(cookie); -} +IClassFactory InternetExplorerManagerFactory = { &InternetExplorerManagerFactoryVtbl }; /*********************************************************************** * DllCanUnloadNow (ieframe.@) diff --git a/dll/win32/ieframe/iexplore.c b/dll/win32/ieframe/iexplore.c index a13ba0152f..1e93ea945c 100644 --- a/dll/win32/ieframe/iexplore.c +++ b/dll/win32/ieframe/iexplore.c @@ -24,6 +24,9 @@ #include <mshtmcid.h> #include <ddeml.h> +#include <initguid.h> +#include <ieautomation.h> + #define IDI_APPICON 1 #define WM_UPDATEADDRBAR (WM_APP+1) @@ -832,13 +835,99 @@ HRESULT WINAPI InternetExplorer_Create(IClassFactory *iface, IUnknown *pOuter, R return S_OK; } +/****************************************************************** + * IInternetExplorerManager implementation + */ +struct InternetExplorerManager { + IInternetExplorerManager IInternetExplorerManager_iface; + LONG ref; +}; + +static inline InternetExplorerManager *impl_from_IInternetExplorerManager(IInternetExplorerManager *iface) +{ + return CONTAINING_RECORD(iface, InternetExplorerManager, IInternetExplorerManager_iface); +} + +static HRESULT WINAPI InternetExplorerManager_QueryInterface(IInternetExplorerManager *iface, REFIID riid, void **out) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IInternetExplorerManager) || IsEqualGUID(riid, &IID_IUnknown)) + { + IInternetExplorerManager_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI InternetExplorerManager_AddRef(IInternetExplorerManager *iface) +{ + InternetExplorerManager *This = impl_from_IInternetExplorerManager(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) increasing refcount to %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI InternetExplorerManager_Release(IInternetExplorerManager *iface) +{ + InternetExplorerManager *This = impl_from_IInternetExplorerManager(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) decreasing refcount to %u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI InternetExplorerManager_CreateObject(IInternetExplorerManager *iface, DWORD config, LPCWSTR url, REFIID riid, void **ppv) +{ + FIXME("(%p)->(0x%x, %s, %s, %p) stub!\n", iface, config, debugstr_w(url), debugstr_guid(riid), ppv); + + return E_NOTIMPL; +} + +static const IInternetExplorerManagerVtbl InternetExplorerManager_vtbl = +{ + InternetExplorerManager_QueryInterface, + InternetExplorerManager_AddRef, + InternetExplorerManager_Release, + InternetExplorerManager_CreateObject, +}; + +HRESULT WINAPI InternetExplorerManager_Create(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppv) +{ + InternetExplorerManager *ret; + HRESULT hr; + + TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); + + if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) + return E_OUTOFMEMORY; + + ret->IInternetExplorerManager_iface.lpVtbl = &InternetExplorerManager_vtbl; + ret->ref = 1; + + hr = IInternetExplorerManager_QueryInterface(&ret->IInternetExplorerManager_iface, riid, ppv); + IInternetExplorerManager_Release(&ret->IInternetExplorerManager_iface); + + return hr; +} + void released_obj(void) { if(!InterlockedDecrement(&obj_cnt)) PostQuitMessage(0); } -static BOOL create_ie_window(const WCHAR *cmdline) +static BOOL create_ie_window(BOOL nohome, const WCHAR *cmdline) { InternetExplorer *ie; HRESULT hres; @@ -851,33 +940,27 @@ static BOOL create_ie_window(const WCHAR *cmdline) IWebBrowser2_put_MenuBar(&ie->IWebBrowser2_iface, VARIANT_TRUE); if(!*cmdline) { - IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); + if (nohome) + ie->nohome = TRUE; + else + IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); }else { VARIANT var_url; int cmdlen; - static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e'}; - - while(*cmdline == ' ' || *cmdline == '\t') - cmdline++; cmdlen = strlenW(cmdline); if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { cmdline++; cmdlen -= 2; } - if(cmdlen == sizeof(nohomeW)/sizeof(*nohomeW) && !memcmp(cmdline, nohomeW, sizeof(nohomeW))) { - ie->nohome = TRUE; - }else { - V_VT(&var_url) = VT_BSTR; + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); - V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); + /* navigate to the first page */ + IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); - /* navigate to the first page */ - IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); - - SysFreeString(V_BSTR(&var_url)); - } + SysFreeString(V_BSTR(&var_url)); } IWebBrowser2_Release(&ie->IWebBrowser2_iface); @@ -1035,23 +1118,60 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) { MSG msg; HRESULT hres; + BOOL embedding = FALSE, nohome = FALSE, manager = FALSE; + DWORD reg_cookie; static const WCHAR embeddingW[] = {'-','e','m','b','e','d','d','i','n','g',0}; + static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; + static const WCHAR startmanagerW[] = {'-','s','t','a','r','t','m','a','n','a','g','e','r',0}; TRACE("%s %d\n", debugstr_w(cmdline), nShowWindow); CoInitialize(NULL); - hres = register_class_object(TRUE); - if(FAILED(hres)) { + init_dde(); + + while (*cmdline) + { + int length = 0; + + while (*cmdline == ' ' || *cmdline == '\t') cmdline++; + if (!*cmdline) break; + + while (cmdline[length] && cmdline[length] != ' ' && cmdline[length] != '\t') length++; + + if (!strncmpiW(cmdline, embeddingW, length)) + embedding = TRUE; + else if (!strncmpiW(cmdline, nohomeW, length)) + nohome = TRUE; + else if (!strncmpiW(cmdline, startmanagerW, length)) + manager = TRUE; + else + break; + + cmdline += length; + } + + if (manager) + hres = CoRegisterClassObject(&CLSID_InternetExplorerManager, + (IUnknown*)&InternetExplorerManagerFactory, CLSCTX_SERVER, + REGCLS_SINGLEUSE, &reg_cookie); + else + hres = CoRegisterClassObject(&CLSID_InternetExplorer, + (IUnknown*)&InternetExplorerFactory, CLSCTX_SERVER, + REGCLS_MULTIPLEUSE, &reg_cookie); + + if (FAILED(hres)) + { + ERR("failed to register CLSID_InternetExplorer%s: %08x\n", manager ? "Manager" : "", hres); CoUninitialize(); ExitProcess(1); } - init_dde(); - - if(strcmpiW(cmdline, embeddingW)) { - if(!create_ie_window(cmdline)) { + if (!embedding) + { + if(!create_ie_window(nohome, cmdline)) + { CoUninitialize(); ExitProcess(1); } @@ -1064,7 +1184,7 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) DispatchMessageW(&msg); } - register_class_object(FALSE); + CoRevokeClassObject(reg_cookie); release_dde(); CoUninitialize(); diff --git a/dll/win32/ieframe/view.c b/dll/win32/ieframe/view.c index 5536d42970..021dd1bc77 100644 --- a/dll/win32/ieframe/view.c +++ b/dll/win32/ieframe/view.c @@ -56,7 +56,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue); - return S_OK; + return E_NOTIMPL; } static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect, diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6e7bc5cdb1..0d0cc1caa1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -74,7 +74,7 @@ reactos/dll/win32/hlink # Synced to Wine-3.0 reactos/dll/win32/hnetcfg # Synced to Wine-3.0 reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/iccvid # Synced to Wine-3.0 -reactos/dll/win32/ieframe # Synced to WineStaging-2.9 +reactos/dll/win32/ieframe # Synced to Wine-3.0 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 reactos/dll/win32/imagehlp # Synced to WineStaging-2.9 reactos/dll/win32/imm32 # Synced to Wine-2.22

6 years, 11 months

01/01: [PSDK] Import ieautomation.idl from Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e399d3ec3ec8282c8dd42… commit e399d3ec3ec8282c8dd425649602084baa969588 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:35:51 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:35:51 2018 +0100 [PSDK] Import ieautomation.idl from Wine 3.0. CORE-14225 --- sdk/include/psdk/CMakeLists.txt | 1 + sdk/include/psdk/ieautomation.idl | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/sdk/include/psdk/CMakeLists.txt b/sdk/include/psdk/CMakeLists.txt index 2f63a08e30..884734a1cd 100644 --- a/sdk/include/psdk/CMakeLists.txt +++ b/sdk/include/psdk/CMakeLists.txt @@ -54,6 +54,7 @@ list(APPEND SOURCE httprequest.idl iads.idl icftypes.idl + ieautomation.idl imnact.idl imnxport.idl indexsrv.idl diff --git a/sdk/include/psdk/ieautomation.idl b/sdk/include/psdk/ieautomation.idl new file mode 100644 index 0000000000..6eb41f4e1c --- /dev/null +++ b/sdk/include/psdk/ieautomation.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2017 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "ocidl.idl"; + +typedef +[ + uuid(44ec9b57-dcab-4cde-b373-ee94962950e3) +] +enum INTERNETEXPLORERCONFIGURATION { + INTERNETEXPLORERCONFIGURATION_HOST = 0x00000001, + INTERNETEXPLORERCONFIGURATION_WEB_DRIVER = 0x00000002, + INTERNETEXPLORERCONFIGURATION_WEB_DRIVER_EDGE = 0x00000004, +} INTERNETEXPLORERCONFIGURATION; + +[ + object, + uuid(acc84351-04ff-44f9-b23f-655ed168c6d5), + pointer_default(unique) +] +interface IInternetExplorerManager : IUnknown +{ + HRESULT CreateObject([in] DWORD config, [in, unique, string] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); +} + +[ + uuid(df4fcc34-067a-4e0a-8352-4a1a5095346e) +] +coclass InternetExplorerManager +{ + [default] interface IInternetExplorerManager; +}

6 years, 11 months

01/01: [ICCVID] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d848f99bf9ec1887e0a2c… commit d848f99bf9ec1887e0a2c713e258587f4bbb6a04 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:32:44 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:32:44 2018 +0100 [ICCVID] Sync with Wine 3.0. CORE-14225 --- dll/win32/iccvid/iccvid.c | 10 +++------- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dll/win32/iccvid/iccvid.c b/dll/win32/iccvid/iccvid.c index 96cabe43e0..f588b47c55 100644 --- a/dll/win32/iccvid/iccvid.c +++ b/dll/win32/iccvid/iccvid.c @@ -95,10 +95,6 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } -static inline int get_stride(int width, int depth) -{ - return ((depth * width + 31) >> 3) & ~3; -} /* ------------------------------------------------------------------------ */ static unsigned char *in_buffer, uiclip[1024], *uiclp = NULL; @@ -467,7 +463,7 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, break; } - frm_stride = get_stride(out_width, bpp * 8); + frm_stride = out_width * bpp; frm_ptr = output; if(frame.length != size) @@ -852,9 +848,9 @@ static LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info, LPBITMAPINFO in, L if( out ) { memcpy( out, in, size ); - out->bmiHeader.biBitCount = 24; out->bmiHeader.biCompression = BI_RGB; - out->bmiHeader.biSizeImage = get_stride(in->bmiHeader.biWidth, 24) * in->bmiHeader.biHeight; + out->bmiHeader.biSizeImage = in->bmiHeader.biHeight + * in->bmiHeader.biWidth *4; return ICERR_OK; } return size; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 7dfd056e88..6e7bc5cdb1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -73,7 +73,7 @@ reactos/dll/win32/hhctrl.ocx # Synced to Wine-3.0 reactos/dll/win32/hlink # Synced to Wine-3.0 reactos/dll/win32/hnetcfg # Synced to Wine-3.0 reactos/dll/win32/httpapi # Synced to WineStaging-2.9 -reactos/dll/win32/iccvid # Synced to WineStaging-2.9 +reactos/dll/win32/iccvid # Synced to Wine-3.0 reactos/dll/win32/ieframe # Synced to WineStaging-2.9 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 reactos/dll/win32/imagehlp # Synced to WineStaging-2.9

6 years, 11 months

01/01: [HNETCFG_WINETEST] Import from Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7998a3f086378e0c27196… commit 7998a3f086378e0c27196574afb550fc678ec150 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:31:47 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:31:47 2018 +0100 [HNETCFG_WINETEST] Import from Wine 3.0. CORE-14225 --- modules/rostests/winetests/CMakeLists.txt | 1 + modules/rostests/winetests/hnetcfg/CMakeLists.txt | 7 ++ modules/rostests/winetests/hnetcfg/policy.c | 127 ++++++++++++++++++++++ modules/rostests/winetests/hnetcfg/testlist.c | 12 ++ 4 files changed, 147 insertions(+) diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index 52d1114c73..01ab53e093 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -31,6 +31,7 @@ add_subdirectory(fusion) add_subdirectory(gdi32) add_subdirectory(gdiplus) add_subdirectory(hlink) +add_subdirectory(hnetcfg) add_subdirectory(imagehlp) add_subdirectory(imm32) add_subdirectory(inetcomm) diff --git a/modules/rostests/winetests/hnetcfg/CMakeLists.txt b/modules/rostests/winetests/hnetcfg/CMakeLists.txt new file mode 100644 index 0000000000..396c20e2b8 --- /dev/null +++ b/modules/rostests/winetests/hnetcfg/CMakeLists.txt @@ -0,0 +1,7 @@ + +add_definitions(-DUSE_WINE_TODOS) +add_executable(hnetcfg_winetest policy.c testlist.c) +target_link_libraries(hnetcfg_winetest uuid) +set_module_type(hnetcfg_winetest win32cui) +add_importlibs(hnetcfg_winetest ole32 msvcrt kernel32) +add_rostests_file(TARGET hnetcfg_winetest) diff --git a/modules/rostests/winetests/hnetcfg/policy.c b/modules/rostests/winetests/hnetcfg/policy.c new file mode 100644 index 0000000000..7b5bef008c --- /dev/null +++ b/modules/rostests/winetests/hnetcfg/policy.c @@ -0,0 +1,127 @@ +/* + * Copyright 2016 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "oleauto.h" +#include "olectl.h" +#include "dispex.h" + +#include "wine/test.h" + +#include "netfw.h" + +static void test_policy2_rules(INetFwPolicy2 *policy2) +{ + HRESULT hr; + INetFwRules *rules, *rules2; + INetFwServiceRestriction *restriction; + + hr = INetFwPolicy2_QueryInterface(policy2, &IID_INetFwRules, (void**)&rules); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = INetFwPolicy2_get_Rules(policy2, &rules); + ok(hr == S_OK, "got %08x\n", hr); + + hr = INetFwPolicy2_get_Rules(policy2, &rules2); + ok(hr == S_OK, "got %08x\n", hr); + ok(rules == rules2, "Different pointers\n"); + + hr = INetFwPolicy2_get_ServiceRestriction(policy2, &restriction); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + INetFwRules *rules3; + + hr = INetFwServiceRestriction_get_Rules(restriction, &rules3); + ok(hr == S_OK, "got %08x\n", hr); + ok(rules != rules3, "same pointers\n"); + + if(rules3) + INetFwRules_Release(rules3); + INetFwServiceRestriction_Release(restriction); + } + + INetFwRules_Release(rules); + INetFwRules_Release(rules2); +} + +static void test_interfaces(void) +{ + INetFwMgr *manager; + INetFwPolicy *policy; + INetFwPolicy2 *policy2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwMgr, (void**)&manager); + ok(hr == S_OK, "NetFwMgr create failed: %08x\n", hr); + + hr = INetFwMgr_QueryInterface(manager, &IID_INetFwPolicy, (void**)&policy); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = INetFwMgr_QueryInterface(manager, &IID_INetFwPolicy2, (void**)&policy2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = INetFwMgr_get_LocalPolicy(manager, &policy); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetFwPolicy_QueryInterface(policy, &IID_INetFwPolicy2, (void**)&policy2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + INetFwPolicy_Release(policy); + + hr = CoCreateInstance(&CLSID_NetFwPolicy2, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwPolicy2, (void**)&policy2); + if(hr == S_OK) + { + test_policy2_rules(policy2); + + INetFwPolicy2_Release(policy2); + } + else + win_skip("NetFwPolicy2 object is not supported: %08x\n", hr); + + INetFwMgr_Release(manager); +} + +START_TEST(policy) +{ + INetFwMgr *manager; + HRESULT hr; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwMgr, (void**)&manager); + if(FAILED(hr)) + { + win_skip("NetFwMgr object is not supported: %08x\n", hr); + CoUninitialize(); + return; + } + + INetFwMgr_Release(manager); + + test_interfaces(); + + + CoUninitialize(); +} diff --git a/modules/rostests/winetests/hnetcfg/testlist.c b/modules/rostests/winetests/hnetcfg/testlist.c new file mode 100644 index 0000000000..4b5b1f1d43 --- /dev/null +++ b/modules/rostests/winetests/hnetcfg/testlist.c @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_policy(void); + +const struct test winetest_testlist[] = +{ + { "policy", func_policy }, + { 0, 0 } +};

6 years, 11 months

01/01: [HNETCFG] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=221fc8fd301c79023c96e… commit 221fc8fd301c79023c96e7f63e56f8e767804956 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:30:10 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:30:10 2018 +0100 [HNETCFG] Sync with Wine 3.0. CORE-14225 --- dll/win32/hnetcfg/apps.c | 26 +--- dll/win32/hnetcfg/hnetcfg_private.h | 1 + dll/win32/hnetcfg/policy.c | 245 +++++++++++++++++++++++++++++++++++- media/doc/README.WINE | 2 +- 4 files changed, 247 insertions(+), 27 deletions(-) diff --git a/dll/win32/hnetcfg/apps.c b/dll/win32/hnetcfg/apps.c index dca2622226..51463e0b27 100644 --- a/dll/win32/hnetcfg/apps.c +++ b/dll/win32/hnetcfg/apps.c @@ -25,7 +25,6 @@ typedef struct fw_app { INetFwAuthorizedApplication INetFwAuthorizedApplication_iface; LONG refs; - BSTR filename; } fw_app; static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface ) @@ -48,7 +47,6 @@ static ULONG WINAPI fw_app_Release( if (!refs) { TRACE("destroying %p\n", fw_app); - if (fw_app->filename) SysFreeString( fw_app->filename ); HeapFree( GetProcessHeap(), 0, fw_app ); } return refs; @@ -241,18 +239,7 @@ static HRESULT WINAPI fw_app_get_ProcessImageFileName( fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %p\n", This, imageFileName); - - if (!imageFileName) - return E_INVALIDARG; - - if (!This->filename) - { - *imageFileName = NULL; - return S_OK; - } - - *imageFileName = SysAllocString( This->filename ); - return *imageFileName ? S_OK : E_OUTOFMEMORY; + return E_NOTIMPL; } static HRESULT WINAPI fw_app_put_ProcessImageFileName( @@ -262,15 +249,7 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName( fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %s\n", This, debugstr_w(imageFileName)); - - if (!imageFileName) - { - This->filename = NULL; - return S_OK; - } - - This->filename = SysAllocString( imageFileName ); - return This->filename ? S_OK : E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI fw_app_get_IpVersion( @@ -393,7 +372,6 @@ HRESULT NetFwAuthorizedApplication_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl; fa->refs = 1; - fa->filename = NULL; *ppObj = &fa->INetFwAuthorizedApplication_iface; diff --git a/dll/win32/hnetcfg/hnetcfg_private.h b/dll/win32/hnetcfg/hnetcfg_private.h index 94751a18b6..a901d0d972 100644 --- a/dll/win32/hnetcfg/hnetcfg_private.h +++ b/dll/win32/hnetcfg/hnetcfg_private.h @@ -47,6 +47,7 @@ enum type_id INetFwPolicy_tid, INetFwPolicy2_tid, INetFwProfile_tid, + INetFwRules_tid, last_tid }; diff --git a/dll/win32/hnetcfg/policy.c b/dll/win32/hnetcfg/policy.c index f41800dd3e..a6ea0b10c5 100644 --- a/dll/win32/hnetcfg/policy.c +++ b/dll/win32/hnetcfg/policy.c @@ -32,6 +32,7 @@ static inline fw_policy *impl_from_INetFwPolicy( INetFwPolicy *iface ) typedef struct fw_policy2 { INetFwPolicy2 INetFwPolicy2_iface; + INetFwRules *fw_policy2_rules; LONG refs; } fw_policy2; @@ -40,6 +41,224 @@ static inline fw_policy2 *impl_from_INetFwPolicy2( INetFwPolicy2 *iface ) return CONTAINING_RECORD(iface, fw_policy2, INetFwPolicy2_iface); } +typedef struct fw_rules +{ + INetFwRules INetFwRules_iface; + LONG refs; +} fw_rules; + +static inline fw_rules *impl_from_INetFwRules( INetFwRules *iface ) +{ + return CONTAINING_RECORD(iface, fw_rules, INetFwRules_iface); +} + +static HRESULT WINAPI netfw_rules_QueryInterface( + INetFwRules *iface, + REFIID riid, + void **object) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), object ); + + if ( IsEqualGUID( riid, &IID_INetFwRules ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *object = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwRules_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI netfw_rules_AddRef( + INetFwRules *iface ) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + return InterlockedIncrement( &This->refs ); +} + +static ULONG WINAPI netfw_rules_Release( + INetFwRules *iface ) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + LONG refs = InterlockedDecrement( &This->refs ); + if (!refs) + { + TRACE("destroying %p\n", This); + HeapFree( GetProcessHeap(), 0, This ); + } + return refs; +} + +static HRESULT WINAPI netfw_rules_GetTypeInfoCount( + INetFwRules *iface, + UINT *pctinfo ) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI netfw_rules_GetTypeInfo( + INetFwRules *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwRules_tid, ppTInfo ); +} + +static HRESULT WINAPI netfw_rules_GetIDsOfNames( + INetFwRules *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwRules_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI netfw_rules_Invoke( + INetFwRules *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo( INetFwRules_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwRules_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI netfw_rules_get_Count( + INetFwRules *iface, + LONG *count) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %p\n", This, count); + + if (count) + *count = 0; + + return S_OK; +} + +static HRESULT WINAPI netfw_rules_Add( + INetFwRules *iface, + INetFwRule *rule) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %p\n", This, rule); + return E_NOTIMPL; +} + +static HRESULT WINAPI netfw_rules_Remove( + INetFwRules *iface, + BSTR name) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %s\n", This, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI netfw_rules_Item( + INetFwRules *iface, + BSTR name, + INetFwRule **rule) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %s, %p\n", This, debugstr_w(name), rule); + return E_NOTIMPL; +} + +static HRESULT WINAPI netfw_rules_get__NewEnum( + INetFwRules *iface, + IUnknown **newEnum) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %p\n", This, newEnum); + return E_NOTIMPL; +} + +static const struct INetFwRulesVtbl fw_rules_vtbl = +{ + netfw_rules_QueryInterface, + netfw_rules_AddRef, + netfw_rules_Release, + netfw_rules_GetTypeInfoCount, + netfw_rules_GetTypeInfo, + netfw_rules_GetIDsOfNames, + netfw_rules_Invoke, + netfw_rules_get_Count, + netfw_rules_Add, + netfw_rules_Remove, + netfw_rules_Item, + netfw_rules_get__NewEnum +}; + +static HRESULT create_INetFwRules(INetFwRules **object) +{ + fw_rules *rules; + + TRACE("(%p)\n", object); + + rules = HeapAlloc( GetProcessHeap(), 0, sizeof(*rules) ); + if (!rules) return E_OUTOFMEMORY; + + rules->INetFwRules_iface.lpVtbl = &fw_rules_vtbl; + rules->refs = 1; + + *object = &rules->INetFwRules_iface; + + TRACE("returning iface %p\n", *object); + return S_OK; +} + static ULONG WINAPI fw_policy_AddRef( INetFwPolicy *iface ) { @@ -222,6 +441,11 @@ static HRESULT WINAPI fwpolicy2_QueryInterface(INetFwPolicy2 *iface, REFIID riid { *out = iface; } + else if( IsEqualGUID( riid, &IID_INetFwRules ) ) + { + TRACE("INetFwRules not supported\n"); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -243,6 +467,7 @@ static ULONG WINAPI fwpolicy2_Release(INetFwPolicy2 *iface) LONG refs = InterlockedDecrement( &fw_policy->refs ); if (!refs) { + INetFwRules_Release(fw_policy->fw_policy2_rules); TRACE("destroying %p\n", fw_policy); HeapFree( GetProcessHeap(), 0, fw_policy ); } @@ -395,8 +620,18 @@ static HRESULT WINAPI fwpolicy2_get_Rules(INetFwPolicy2 *iface, INetFwRules **ru { fw_policy2 *This = impl_from_INetFwPolicy2( iface ); - FIXME("%p %p\n", This, rules); - return E_NOTIMPL; + TRACE("%p %p\n", This, rules); + + if(!rules) + return E_POINTER; + + if(rules) + { + *rules = This->fw_policy2_rules; + INetFwRules_AddRef(This->fw_policy2_rules); + } + + return S_OK; } static HRESULT WINAPI fwpolicy2_get_ServiceRestriction(INetFwPolicy2 *iface, INetFwServiceRestriction **ServiceRestriction) @@ -526,6 +761,12 @@ HRESULT NetFwPolicy2_create( IUnknown *outer, void **obj ) *obj = &fp->INetFwPolicy2_iface; + if (FAILED(create_INetFwRules(&fp->fw_policy2_rules))) + { + HeapFree( GetProcessHeap(), 0, fp ); + return E_OUTOFMEMORY; + } + TRACE("returning iface %p\n", *obj); return S_OK; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index e67bc01b74..7dfd056e88 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -71,7 +71,7 @@ reactos/dll/win32/fusion # Synced to Wine-3.0 reactos/dll/win32/gdiplus # Synced to Wine-3.0 reactos/dll/win32/hhctrl.ocx # Synced to Wine-3.0 reactos/dll/win32/hlink # Synced to Wine-3.0 -reactos/dll/win32/hnetcfg # Synced to WineStaging-2.9 +reactos/dll/win32/hnetcfg # Synced to Wine-3.0 reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/iccvid # Synced to WineStaging-2.9 reactos/dll/win32/ieframe # Synced to WineStaging-2.9

6 years, 11 months

01/01: [HLINK_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3fa3f6079bb3c55f3953… commit c3fa3f6079bb3c55f3953f2fb36bbcd36eb15726 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:24:20 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:24:20 2018 +0100 [HLINK_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/hlink/browse_ctx.c | 70 ++++++++++++++ modules/rostests/winetests/hlink/hlink.c | 126 ++++++++++++++++++++++---- 2 files changed, 180 insertions(+), 16 deletions(-) diff --git a/modules/rostests/winetests/hlink/browse_ctx.c b/modules/rostests/winetests/hlink/browse_ctx.c index 40d132b4c8..319352500c 100644 --- a/modules/rostests/winetests/hlink/browse_ctx.c +++ b/modules/rostests/winetests/hlink/browse_ctx.c @@ -131,12 +131,82 @@ static void test_BrowseWindowInfo(void) IHlinkBrowseContext_Release(bc); } +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + return 1; +} + +static IUnknownVtbl UnknownVtbl = { + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release, +}; + +static IUnknown Unknown = { &UnknownVtbl }; + +static void test_GetObject(void) +{ + IHlinkBrowseContext *bc; + IMoniker *dummy; + IBindCtx *bindctx; + IUnknown *unk; + WCHAR one[] = {'1',0}; + WCHAR five[] = {'5',0}; + DWORD cookie; + HRESULT hres; + + hres = CreateBindCtx(0, &bindctx); + ok(hres == S_OK, "CreateBindCtx() failed: 0x%08x\n", hres); + + hres = CreateItemMoniker(one, five, &dummy); + ok(hres == S_OK, "CreateItemMoniker() failed: 0x%08x\n", hres); + + hres = HlinkCreateBrowseContext(NULL, &IID_IHlinkBrowseContext, (void **)&bc); + ok(hres == S_OK, "HlinkCreateBrowseContext() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_Register(bc, 0, &Unknown, dummy, &cookie); + ok(hres == S_OK, "Register() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == S_OK, "GetObject() failed: 0x%08x\n", hres); + ok(unk == &Unknown, "wrong object returned\n"); + + hres = IHlinkBrowseContext_Revoke(bc, cookie); + ok(hres == S_OK, "Revoke() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); + + IHlinkBrowseContext_Release(bc); +} + START_TEST(browse_ctx) { CoInitialize(NULL); test_SetInitialHlink(); test_BrowseWindowInfo(); + test_GetObject(); CoUninitialize(); } diff --git a/modules/rostests/winetests/hlink/hlink.c b/modules/rostests/winetests/hlink/hlink.c index 50f61d57f7..e40807cc8a 100644 --- a/modules/rostests/winetests/hlink/hlink.c +++ b/modules/rostests/winetests/hlink/hlink.c @@ -67,9 +67,13 @@ DEFINE_EXPECT(GetClassID); DEFINE_EXPECT(Save); DEFINE_EXPECT(HBC_QueryInterface_IHlinkHistory); +DEFINE_EXPECT(HBC_QueryInterface_IMarshal); +DEFINE_EXPECT(HBC_QueryInterface_IdentityUnmarshal); +DEFINE_EXPECT(HBC_QueryInterface_IUnknown); DEFINE_EXPECT(HBC_GetObject); DEFINE_EXPECT(HBC_UpdateHlink); +DEFINE_EXPECT(HT_QueryInterface_IHlinkTarget); DEFINE_EXPECT(HT_SetBrowseContext); DEFINE_EXPECT(HT_GetBrowseContext); DEFINE_EXPECT(HT_Navigate); @@ -77,8 +81,16 @@ DEFINE_EXPECT(HT_GetFriendlyName); DEFINE_EXPECT(HLF_UpdateHlink); +DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); +static const WCHAR winehq_urlW[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; +static const WCHAR winehq_404W[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','f','a','k','e','u','r','l',0}; + static void test_HlinkIsShortcut(void) { UINT i; @@ -627,9 +639,6 @@ static void test_HlinkParseDisplayName(void) IBindCtx *bctx; HRESULT hres; - static const WCHAR winehq_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR invalid_urlW[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; static const WCHAR clsid_nameW[] = {'c','l','s','i','d',':', '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8', @@ -829,12 +838,17 @@ static HRESULT WINAPI HlinkBrowseContext_QueryInterface( { *ppv = NULL; - if(IsEqualGUID(&IID_IHlinkHistory, riid)) { + if (IsEqualGUID(&IID_IHlinkHistory, riid)) CHECK_EXPECT(HBC_QueryInterface_IHlinkHistory); - return E_NOINTERFACE; - } + else if (IsEqualGUID(&IID_IMarshal, riid)) + CHECK_EXPECT2(HBC_QueryInterface_IMarshal); + else if (IsEqualGUID(&CLSID_IdentityUnmarshal, riid)) + CHECK_EXPECT(HBC_QueryInterface_IdentityUnmarshal); + else if (IsEqualGUID(&IID_IUnknown, riid)) + CHECK_EXPECT(HBC_QueryInterface_IUnknown); + else + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); - ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -855,16 +869,29 @@ static HRESULT WINAPI HlinkBrowseContext_Register(IHlinkBrowseContext *iface, return E_NOTIMPL; } +static IUnknown *HBC_object; + static IMoniker Moniker; static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, IMoniker *pimk, BOOL fBindIfRootRegistered, IUnknown **ppiunk) { + IBindCtx *bctx; + WCHAR *name; + HRESULT hr; + CHECK_EXPECT(HBC_GetObject); - ok(pimk == &Moniker, "pimk != &Moniker\n"); + CreateBindCtx(0, &bctx); + hr = IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); + ok(!lstrcmpW(winehq_urlW, name) || !lstrcmpW(winehq_404W, name), "got unexpected url\n"); + CoTaskMemFree(name); + IBindCtx_Release(bctx); + ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); - *ppiunk = NULL; - return S_FALSE; + + *ppiunk = HBC_object; + return HBC_object ? S_OK : S_FALSE; } static HRESULT WINAPI HlinkBrowseContext_Revoke(IHlinkBrowseContext *iface, DWORD dwRegister) @@ -974,6 +1001,7 @@ static IHlinkBrowseContext HlinkBrowseContext = { &HlinkBrowseContextVtbl }; static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IHlinkTarget, riid)) { + CHECK_EXPECT(HT_QueryInterface_IHlinkTarget); *ppv = iface; return S_OK; } @@ -1205,10 +1233,6 @@ static HRESULT WINAPI Moniker_RelativePathTo(IMoniker *iface, IMoniker *pmkOther static HRESULT WINAPI Moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { - static const WCHAR winehq_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; - CHECK_EXPECT2(GetDisplayName); ok(pbc != NULL, "pbc == NULL\n"); @@ -2171,6 +2195,8 @@ static void test_Hlink_Navigate(void) ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); _bctx = pbc; + HBC_object = NULL; + SET_EXPECT(Reduce); SET_EXPECT(Enum); SET_EXPECT(IsSystemMoniker); @@ -2188,6 +2214,7 @@ static void test_Hlink_Navigate(void) SET_EXPECT(HBC_GetObject); SET_EXPECT(Reduce); SET_EXPECT(BindToObject); + SET_EXPECT(HT_QueryInterface_IHlinkTarget); SET_EXPECT(HT_GetBrowseContext); SET_EXPECT(HT_SetBrowseContext); SET_EXPECT(HBC_QueryInterface_IHlinkHistory); @@ -2196,16 +2223,83 @@ static void test_Hlink_Navigate(void) hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); ok(hres == S_OK, "Navigate failed: %08x\n", hres); CHECK_CALLED(IsSystemMoniker); - todo_wine CHECK_CALLED(GetDisplayName); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(HBC_GetObject); todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); + CHECK_CALLED(HT_QueryInterface_IHlinkTarget); todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); todo_wine CHECK_CALLED(HT_GetFriendlyName); + /* Test with valid return from HlinkBrowseContext::GetObject */ + HBC_object = (IUnknown *)&HlinkTarget; + + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + SET_EXPECT(HBC_GetObject); + SET_EXPECT(HT_QueryInterface_IHlinkTarget); + SET_EXPECT(HT_Navigate); + SET_EXPECT(HT_GetFriendlyName); + hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); + ok(hres == S_OK, "Navigate failed: %08x\n", hres); + CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HT_QueryInterface_IHlinkTarget); + CHECK_CALLED(HT_Navigate); + todo_wine CHECK_CALLED(HT_GetFriendlyName); + + HBC_object = NULL; + +if (0) { /* these currently open a browser window on wine */ + /* Test from string */ + SET_EXPECT(HBC_GetObject); + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); + todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); + CHECK_CALLED(HBC_GetObject); + + /* MSDN claims browse context and bind context can't be null, but they can */ + SET_EXPECT(HBC_GetObject); + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, &HlinkBrowseContext); + todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); + CHECK_CALLED(HBC_GetObject); +} + + /* these open a browser window, so mark them interactive only */ + if (winetest_interactive) + { + /* both parameters null */ + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + hres = IHlink_Navigate(hlink, 0, NULL, NULL, NULL); + ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); + + /* same, from string */ + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + + /* try basic test with valid URL */ + SET_EXPECT(HBC_GetObject); + SET_EXPECT(HBC_QueryInterface_IHlinkHistory); + SET_EXPECT(HBC_QueryInterface_IMarshal); + SET_EXPECT(HBC_QueryInterface_IdentityUnmarshal); + SET_EXPECT(HBC_QueryInterface_IUnknown); + hres = HlinkNavigateToStringReference(winehq_urlW, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); + ok(hres == S_OK, "Expected S_OK, got %08x\n", hres); + CHECK_CALLED(HBC_GetObject); + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); + todo_wine CHECK_CALLED(HBC_QueryInterface_IMarshal); + todo_wine CHECK_CALLED(HBC_QueryInterface_IdentityUnmarshal); + todo_wine CHECK_CALLED(HBC_QueryInterface_IUnknown); + } + else + skip("interactive IHlink_Navigate tests\n"); + IHlink_Release(hlink); IBindCtx_Release(pbc); _bctx = NULL;

6 years, 11 months

← Newer
1
...
22
23
24
25
26
27
28
...
38
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 January 2018