April 2019 - Wine-Commits - list.winehq.org

Detlef Riekenberg : qcap/tests: Avoid a crash in a test.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: b1a62796759e5b916c90a16c05e6ca949e956277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a62796759e5b916c90a16c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 16 19:16:45 2019 +0200 qcap/tests: Avoid a crash in a test. VfW is not supported on 64-Bit Windows Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index a250139..c460991 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1771,9 +1771,9 @@ static void test_COM_vfwcapture(void) /* COM aggregation */ hr = CoCreateInstance(&CLSID_VfwCapture, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); - if (hr == REGDB_E_CLASSNOTREG) + if ((hr == REGDB_E_CLASSNOTREG) || (hr == CLASS_E_CLASSNOTAVAILABLE)) { - win_skip("CLSID_VfwCapture not registered\n"); + win_skip("CLSID_VfwCapture not supported (0x%x)\n", hr); return; } ok(hr == S_OK, "VfwCapture create failed: %08x\n", hr);

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name in Tatar locale.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 3c45bfc7da6a1ff5bea1cfe5372c5eeacf6e0edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c45bfc7da6a1ff5bea1cfe5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 10:59:16 2019 +0200 kernel/nls: Fix country name in Tatar locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/ttt.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls index 43b6fe5..86236d9 100644 --- a/dlls/kernel32/nls/ttt.nls +++ b/dlls/kernel32/nls/ttt.nls @@ -102,7 +102,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SENGLANGUAGE "Tatar" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "RUR" - LOCALE_SISO3166CTRYNAME "TA" + LOCALE_SISO3166CTRYNAME "RU" LOCALE_SISO639LANGNAME "tt" LOCALE_SLANGUAGE "Tatar" LOCALE_SLIST ";" @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SMONTHNAME12 "Декабрь" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "tt-TA" + LOCALE_SNAME "tt-RU" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Татарстан" LOCALE_SNATIVECURRNAME "рубль"

1 0

Gabriel Ivăncescu : comctl32/tests: Test for BCM_GETIDEALSIZE on command links with notes.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 475f219738d351fd99d591d07fa3a5675438081b URL: https://source.winehq.org/git/wine.git/?a=commit;h=475f219738d351fd99d591d0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:14:03 2019 +0300 comctl32/tests: Test for BCM_GETIDEALSIZE on command links with notes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index c31603f..e7789dc 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1890,6 +1890,12 @@ static void test_bcm_get_ideal_size(void) { static const char *button_text2 = "WWWW\nWWWW"; static const char *button_text = "WWWW"; + static const WCHAR button_note_short[] = { 'W',0 }; + static const WCHAR button_note_long[] = { 'W','W','W','W','W','W','W','W','W','W','W','W','W','W','W','W',0 }; + static const WCHAR button_note_wordy[] = { 'T','h','i','s',' ','i','s',' ','a',' ','l','o','n','g',' ','n','o','t','e',' ','f','o','r',' ','t','h','e',' ','b','u','t','t','o','n',',',' ', + 'w','i','t','h',' ','m','a','n','y',' ','w','o','r','d','s',',',' ','w','h','i','c','h',' ','s','h','o','u','l','d',' ','b','e',' ', + 'o','v','e','r','a','l','l',' ','l','o','n','g','e','r',' ','t','h','a','n',' ','t','h','e',' ','t','e','x','t',' ','(','g','i','v','e','n',' ', + 't','h','e',' ','s','m','a','l','l','e','r',' ','f','o','n','t',')',' ','a','n','d',' ','t','h','u','s',' ','w','r','a','p','.',0 }; static const DWORD imagelist_aligns[] = {BUTTON_IMAGELIST_ALIGN_LEFT, BUTTON_IMAGELIST_ALIGN_RIGHT, BUTTON_IMAGELIST_ALIGN_TOP, BUTTON_IMAGELIST_ALIGN_BOTTOM, BUTTON_IMAGELIST_ALIGN_CENTER}; @@ -2213,6 +2219,57 @@ static void test_bcm_get_ideal_size(void) } } + /* Command Link with note */ + hwnd = CreateWindowA(WC_BUTTONA, "a", style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expected hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp); + ret = SendMessageA(hwnd, BCM_SETNOTE, 0, (LPARAM)button_note_short); + ok(ret == TRUE, "Expected BCM_SETNOTE to return true\n"); + size.cx = 13; + size.cy = 0; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx == 13 && size.cy > 0, "Expected ideal cx %d == %d and ideal cy %d > %d\n", size.cx, 13, size.cy, 0); + height = size.cy; + size.cx = 32767; + size.cy = 7; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx < 32767, "Expected ideal cx to have been adjusted\n"); + ok(size.cx > image_width && size.cy == height, "Expected ideal cx %d > %d and ideal cy %d == %d\n", size.cx, image_width, size.cy, height); + + /* Try longer note without word breaks, shouldn't extend height because no word splitting */ + ret = SendMessageA(hwnd, BCM_SETNOTE, 0, (LPARAM)button_note_long); + ok(ret == TRUE, "Expected BCM_SETNOTE to return true\n"); + k = size.cx; + size.cy = 0; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx == k && size.cy == height, "Expected ideal cx %d == %d and ideal cy %d == %d\n", size.cx, k, size.cy, height); + + /* Now let it extend the width */ + size.cx = 32767; + size.cy = 0; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx > k && size.cy == height, "Expected ideal cx %d > %d and ideal cy %d == %d\n", size.cx, k, size.cy, height); + + /* Use a very long note with words and the same width, should extend the height due to word wrap */ + ret = SendMessageA(hwnd, BCM_SETNOTE, 0, (LPARAM)button_note_wordy); + ok(ret == TRUE, "Expected BCM_SETNOTE to return true\n"); + k = size.cx; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx <= k && size.cy > height, "Expected ideal cx %d <= %d and ideal cy %d > %d\n", size.cx, k, size.cy, height); + + /* Now try the wordy note with a width smaller than the image itself, which prevents wrapping */ + size.cx = 13; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx == 13 && size.cy == height, "Expected ideal cx %d == %d and ideal cy %d == %d\n", size.cx, 13, size.cy, height); + DestroyWindow(hwnd); + + pImageList_Destroy(himl); DeleteObject(hbmp); DeleteObject(hmask);

1 0

Marko Friedemann : wintrust: Use enhanced crypto provider in VerifyImageHash.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: b2e72dd09da88e2a4562eb668727c381ea91d91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e72dd09da88e2a4562eb66… Author: Marko Friedemann <marko(a)friedemann.email> Date: Thu Apr 18 15:10:46 2019 +0200 wintrust: Use enhanced crypto provider in VerifyImageHash. Softpub VerifyImageHash uses the default crypto provider and fails for certificates using SHA256 et al. with NTE_BAD_ALGID (80090008) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47034 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 1273a58..475f55a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -328,7 +328,7 @@ static DWORD SOFTPUB_VerifyImageHash(CRYPT_PROVIDER_DATA *data, HANDLE file) if (!prov) { - if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContextW(&prov, NULL, MS_ENH_RSA_AES_PROV_W, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) return GetLastError(); release_prov = TRUE; }

1 0

Gabriel Ivăncescu : comctl32/button: Implement BCM_GETIDEALSIZE for command links.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: b15859d871c50fff812c117ebc5d6eaa2e06fb5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b15859d871c50fff812c117e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:14:02 2019 +0300 comctl32/button: Implement BCM_GETIDEALSIZE for command links. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 137 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/tests/button.c | 10 ++-- 2 files changed, 139 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 37212fb..0a8bdf1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -200,6 +200,7 @@ static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL CL_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { PB_GetIdealSize, /* BS_PUSHBUTTON */ @@ -216,9 +217,8 @@ static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { GB_GetIdealSize, /* BS_OWNERDRAW */ SB_GetIdealSize, /* BS_SPLITBUTTON */ SB_GetIdealSize, /* BS_DEFSPLITBUTTON */ - /* GetIdealSize() for following types are unimplemented, use BS_PUSHBUTTON's for now */ - PB_GetIdealSize, /* BS_COMMANDLINK */ - PB_GetIdealSize /* BS_DEFCOMMANDLINK */ + CL_GetIdealSize, /* BS_COMMANDLINK */ + CL_GetIdealSize /* BS_DEFCOMMANDLINK */ }; /* Fixed margin for command links, regardless of DPI (based on tests done on Windows) */ @@ -1363,6 +1363,137 @@ static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) return TRUE; } +static BOOL CL_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + HTHEME theme = GetWindowTheme(infoPtr->hwnd); + HDC hdc = GetDC(infoPtr->hwnd); + LONG w, text_w = 0, text_h = 0; + UINT flags = DT_TOP | DT_LEFT; + HFONT font, old_font = NULL; + RECT text_bound = { 0 }; + SIZE img_size; + RECT margin; + WCHAR *text; + + /* Get the image size */ + if (infoPtr->u.image || infoPtr->imagelist.himl) + img_size = BUTTON_GetImageSize(infoPtr); + else + { + if (theme) + GetThemePartSize(theme, NULL, BP_COMMANDLINKGLYPH, CMDLS_NORMAL, NULL, TS_DRAW, &img_size); + else + img_size.cx = img_size.cy = command_link_defglyph_size; + } + + /* Get the content margins */ + if (theme) + { + RECT r = { 0, 0, 0xffff, 0xffff }; + GetThemeBackgroundContentRect(theme, hdc, BP_COMMANDLINK, CMDLS_NORMAL, &r, &margin); + margin.left -= r.left; + margin.top -= r.top; + margin.right = r.right - margin.right; + margin.bottom = r.bottom - margin.bottom; + } + else + { + margin.left = margin.right = command_link_margin; + margin.top = margin.bottom = command_link_margin; + } + + /* Account for the border margins and the margin between image and text */ + w = margin.left + margin.right + (img_size.cx ? (img_size.cx + command_link_margin) : 0); + + /* If a rectangle with a specific width was requested, bound the text to it */ + if (size->cx > w) + { + text_bound.right = size->cx - w; + flags |= DT_WORDBREAK; + } + + if (theme) + { + if (infoPtr->font) old_font = SelectObject(hdc, infoPtr->font); + + /* Find the text's rect */ + if ((text = get_button_text(infoPtr))) + { + RECT r; + GetThemeTextExtent(theme, hdc, BP_COMMANDLINK, CMDLS_NORMAL, + text, -1, flags, &text_bound, &r); + heap_free(text); + text_w = r.right - r.left; + text_h = r.bottom - r.top; + } + + /* Find the note's rect */ + if (infoPtr->note) + { + DTTOPTS opts; + + opts.dwSize = sizeof(opts); + opts.dwFlags = DTT_FONTPROP | DTT_CALCRECT; + opts.iFontPropId = TMT_BODYFONT; + DrawThemeTextEx(theme, hdc, BP_COMMANDLINK, CMDLS_NORMAL, + infoPtr->note, infoPtr->note_length, + flags | DT_NOPREFIX | DT_CALCRECT, &text_bound, &opts); + text_w = max(text_w, text_bound.right - text_bound.left); + text_h += text_bound.bottom - text_bound.top; + } + } + else + { + NONCLIENTMETRICSW ncm; + + ncm.cbSize = sizeof(ncm); + if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) + { + LONG note_weight = ncm.lfMessageFont.lfWeight; + + /* Find the text's rect */ + ncm.lfMessageFont.lfWeight = FW_BOLD; + if ((font = CreateFontIndirectW(&ncm.lfMessageFont))) + { + if ((text = get_button_text(infoPtr))) + { + RECT r = text_bound; + old_font = SelectObject(hdc, font); + DrawTextW(hdc, text, -1, &r, flags | DT_CALCRECT); + heap_free(text); + + text_w = r.right - r.left; + text_h = r.bottom - r.top; + } + DeleteObject(font); + } + + /* Find the note's rect */ + ncm.lfMessageFont.lfWeight = note_weight; + if (infoPtr->note && (font = CreateFontIndirectW(&ncm.lfMessageFont))) + { + HFONT tmp = SelectObject(hdc, font); + if (!old_font) old_font = tmp; + + DrawTextW(hdc, infoPtr->note, infoPtr->note_length, &text_bound, + flags | DT_NOPREFIX | DT_CALCRECT); + DeleteObject(font); + + text_w = max(text_w, text_bound.right - text_bound.left); + text_h += text_bound.bottom - text_bound.top + 2; + } + } + } + w += text_w; + + size->cx = min(size->cx, w); + size->cy = max(text_h, img_size.cy) + margin.top + margin.bottom; + + if (old_font) SelectObject(hdc, old_font); + ReleaseDC(infoPtr->hwnd, hdc); + return TRUE; +} + /********************************************************************** * BUTTON_CalcLayoutRects * diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index e0c4736..c31603f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2162,8 +2162,8 @@ static void test_bcm_get_ideal_size(void) if (type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK) { - todo_wine ok((size.cx == 0 && size.cy > 0), "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", - style, size.cx, 0, size.cy, 0); + ok((size.cx == 0 && size.cy > 0), "Style 0x%08x expect ideal cx %d == %d and ideal cy %d > %d\n", + style, size.cx, 0, size.cy, 0); } else { @@ -2199,9 +2199,9 @@ static void test_bcm_get_ideal_size(void) } else if (type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK) { - todo_wine ok((size.cx == 0 && size.cy > 0), - "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, 0, - size.cy, 0); + ok((size.cx == 0 && size.cy > 0), + "Style 0x%08x expect ideal cx %d == %d and ideal cy %d > %d\n", style, size.cx, 0, + size.cy, 0); } else {

1 0

Alexandre Julliard : winedump: Also check for builtin dll signature.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 209d2976f261bf9444d9ce9af722baef0b159842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=209d2976f261bf9444d9ce9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 19:48:04 2019 +0200 winedump: Also check for builtin dll signature. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index bbfd296..d33e8ef 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -98,16 +98,20 @@ static const IMAGE_NT_HEADERS32 *get_nt_header( void ) return PRD(dos->e_lfanew, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER)); } -static BOOL is_fake_dll( void ) +static void print_fake_dll( void ) { + static const char builtin_signature[] = "Wine builtin DLL"; static const char fakedll_signature[] = "Wine placeholder DLL"; const IMAGE_DOS_HEADER *dos; - dos = PRD(0, sizeof(*dos) + sizeof(fakedll_signature)); - - if (dos && dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && - !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; - return FALSE; + dos = PRD(0, sizeof(*dos) + 32); + if (dos && dos->e_lfanew >= sizeof(*dos) + 32) + { + if (!memcmp( dos + 1, builtin_signature, sizeof(builtin_signature) )) + printf( "*** This is a Wine builtin DLL ***\n\n" ); + else if (!memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) + printf( "*** This is a Wine fake DLL ***\n\n" ); + } } static const void *get_dir_and_size(unsigned int idx, unsigned int *size) @@ -1948,7 +1952,7 @@ void pe_dump(void) int all = (globals.dumpsect != NULL) && strcmp(globals.dumpsect, "ALL") == 0; PE_nt_headers = get_nt_header(); - if (is_fake_dll()) printf( "*** This is a Wine fake DLL ***\n\n" ); + print_fake_dll(); if (globals.do_dumpheader) {

1 0

Alexandre Julliard : server: Add flag for builtin dlls in the image information.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 546fa12755dd0d1d9618214fb02ef9fa5fa6c943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=546fa12755dd0d1d9618214f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 11:34:25 2019 +0200 server: Add flag for builtin dlls in the image information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- include/wine/server_protocol.h | 1 + server/mapping.c | 7 +++++-- server/protocol.def | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index fb6ede6..78973a8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3203,7 +3203,7 @@ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMA info->DllCharacteristics = pe_info->dll_charact; info->Machine = pe_info->machine; info->ImageContainsCode = pe_info->contains_code; - info->u.ImageFlags = pe_info->image_flags & ~IMAGE_FLAGS_WineFakeDll; + info->u.ImageFlags = pe_info->image_flags & ~(IMAGE_FLAGS_WineBuiltin|IMAGE_FLAGS_WineFakeDll); info->LoaderFlags = pe_info->loader_flags; info->ImageFileSize = pe_info->file_size; info->CheckSum = pe_info->checksum; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c3d1bb6..9e26aa4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -720,6 +720,7 @@ typedef struct #define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 +#define IMAGE_FLAGS_WineBuiltin 0x40 #define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device diff --git a/server/mapping.c b/server/mapping.c index ddc8be8..3480724 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -558,6 +558,7 @@ static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int /* retrieve the mapping parameters for an executable (PE) image */ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_size, int unix_fd ) { + static const char builtin_signature[] = "Wine builtin DLL"; static const char fakedll_signature[] = "Wine placeholder DLL"; IMAGE_COR20_HEADER clr; @@ -565,7 +566,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s struct { IMAGE_DOS_HEADER dos; - char buffer[sizeof(fakedll_signature)]; + char buffer[32]; } mz; struct { @@ -702,7 +703,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.gp = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; - if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) + if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; + else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; /* load the section headers */ diff --git a/server/protocol.def b/server/protocol.def index 888e22f..79e9802 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -736,6 +736,7 @@ typedef struct #define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 +#define IMAGE_FLAGS_WineBuiltin 0x40 #define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device

1 0

Nikolay Sivov : mfreadwrite: Handle failure path in GetNativeMediaType().
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 56bb5967118584012ae0d97c156c52e65586671c URL: https://source.winehq.org/git/wine.git/?a=commit;h=56bb5967118584012ae0d97c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 10:52:28 2019 +0300 mfreadwrite: Handle failure path in GetNativeMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 8145e5b..e27fe82 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -613,10 +613,12 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, &src_type); IMFMediaTypeHandler_Release(handler); - if (SUCCEEDED(hr = MFCreateMediaType(type))) - hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)*type); - - IMFMediaType_Release(src_type); + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = MFCreateMediaType(type))) + hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)*type); + IMFMediaType_Release(src_type); + } return hr; }

1 0

Nikolay Sivov : dbgeng: Implement GetModuleByOffset().
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 9fb20dda0f87c50a209fe22b06d0d0987febfe79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb20dda0f87c50a209fe22b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 09:42:29 2019 +0300 dbgeng: Implement GetModuleByOffset(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 25 +++++++++++++++++++++++-- dlls/dbgeng/tests/dbgeng.c | 22 +++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index b5650d8..1acfe0b 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -1053,9 +1053,30 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbol static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG start_index, ULONG *index, ULONG64 *base) { - FIXME("%p, %s, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base); + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + static struct target_process *target; + const struct module_info *info; - return E_NOTIMPL; + TRACE("%p, %s, %u, %p, %p.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + while ((info = debug_target_get_module_info(target, start_index))) + { + if (offset >= info->params.Base && offset < info->params.Base + info->params.Size) + { + if (index) + *index = start_index; + if (base) + *base = info->params.Base; + return S_OK; + } + + start_index++; + } + + return E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols3 *iface, ULONG index, ULONG64 base, diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 2002beb..2a2dd3ad 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -322,8 +322,8 @@ todo_wine static void test_module_information(void) { static const char *event_name = "dbgeng_test_event"; + unsigned int loaded, unloaded, index; DEBUG_MODULE_PARAMETERS params[2]; - unsigned int loaded, unloaded; PROCESS_INFORMATION info; IDebugSymbols *symbols; IDebugControl *control; @@ -372,7 +372,27 @@ static void test_module_information(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!base, "Unexpected module base.\n"); + hr = symbols->lpVtbl->GetModuleByOffset(symbols, 0, 0, &index, &base); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, 0, &index, &base); + ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, 0, NULL, NULL); + ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleByOffset(symbols, base + 1, 0, NULL, NULL); + ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, loaded, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + /* Parameters. */ + base = 0; + hr = symbols->lpVtbl->GetModuleByIndex(symbols, 0, &base); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!base, "Unexpected module base.\n"); + hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, 0, params); ok(hr == S_OK, "Failed to get module parameters, hr %#x.\n", hr); ok(params[0].Base == base, "Unexpected module base.\n");

1 0

Zebediah Figura : amstream/tests: Add some tests for querying pin information.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: c5584f5ff1900782b1991a374ab6dc5dfbf4a141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5584f5ff1900782b1991a37… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 21 15:22:44 2019 -0500 amstream/tests: Add some tests for querying pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 52fafd2..148e6bd 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -797,6 +797,55 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStreamFilter *filter; + IMediaStream *stream; + PIN_DIRECTION dir; + ULONG ref, count; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + + /* FIXME: This call should not be necessary. */ + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == (IBaseFilter *)filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, primary_video_sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, primary_video_sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + IMediaStreamFilter_Release(filter); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_IDirectDrawStreamSample(void) { DDSURFACEDESC desc = { sizeof(desc) }; @@ -1171,6 +1220,7 @@ START_TEST(amstream) test_media_streams(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_IDirectDrawStreamSample(); file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL);

1 0