wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Mark Jansen : imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 3eca7c1f8e4c34f35c3f25dc107d15c4a3e86cce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eca7c1f8e4c34f35c3f25dc… Author: Mark Jansen <learn0more(a)gmail.com> Date: Sat Mar 23 02:20:53 2019 +0100 imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/image.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index c0a26c3..4bc7a90 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -33,6 +33,10 @@ 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 @@ -425,6 +429,88 @@ static void test_bind_image_ex(void) 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 || !pGetImageUnusedHeaderBytes) + { + win_skip("ImageLoad functions are 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) + { + todo_wine ok(!strcmp(img->ModuleName, temp_file), + "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file); + todo_wine 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) + { + todo_wine ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), + "FileHeader doesn't point to IMAGE_NT_HEADERS32\n"); + } + todo_wine 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); + } + todo_wine 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); + todo_wine 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); + } + + DeleteFileA(temp_file); +} + START_TEST(image) { hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -437,9 +523,13 @@ 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); }

1 0

Vincent Povirk : appwiz.cpl: Search /opt/wine for addons.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 2f6896b14d2b1905a25b1ef55bcdc792f9fa02ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f6896b14d2b1905a25b1ef5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 21 10:14:39 2019 -0500 appwiz.cpl: Search /opt/wine for addons. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 225f915..b070307 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -330,6 +330,8 @@ static enum install_res install_from_default_dir(void) ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share")) ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); + if (ret == INSTALL_NEXT) + ret = install_from_unix_file("/opt/wine/", addon->subdir_name, addon->file_name); return ret; } @@ -794,6 +796,7 @@ BOOL install_addon(addon_t addon_type) * - $datadir/$addon_subdir/ * - $INSTALL_DATADIR/wine/$addon_subdir/ * - /usr/share/wine/$addon_subdir/ + * - /opt/wine/$addon_subdir/ * - download from URL stored in $url_config_key value of HKCU/Software/Wine/$config_key key */ if (install_from_registered_dir() == INSTALL_NEXT

1 0

Detlef Riekenberg : hid/tests: Do not fail when the device is busy.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 4640081494533f790c16d3a916a9fa09cb7edaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4640081494533f790c16d3a9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 21 15:19:49 2019 +0100 hid/tests: Do not fail when the device is busy. Some devices do not allow shared access (mouse, sound device). Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ff17229..4651ced 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -79,6 +79,12 @@ static void run_for_each_device(device_test *test) trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath)); continue; } + if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION) + { + trace("Device is busy: %s.\n", wine_dbgstr_w(data->DevicePath)); + continue; + } + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", wine_dbgstr_w(data->DevicePath), GetLastError());

1 0

Detlef Riekenberg : hid/tests: Do not access uninitialized memory.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: f5f34fe018f2d2d0c0663027bddb4a073f5308d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f34fe018f2d2d0c0663027… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 21 15:19:48 2019 +0100 hid/tests: Do not access uninitialized memory. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index f20677f..ff17229 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -82,7 +82,8 @@ static void run_for_each_device(device_test *test) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", wine_dbgstr_w(data->DevicePath), GetLastError()); - test(file); + if (file != INVALID_HANDLE_VALUE) + test(file); CloseHandle(file); }

1 0

Gabriel Ivăncescu : include/commctrl: Add style definitions for split buttons.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: e5bde584112e57c319c8471fa58259f31bcf00be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5bde584112e57c319c8471f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 25 14:20:59 2019 +0200 include/commctrl: Add style definitions for split buttons. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 9b86bdb..4706946 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1096,6 +1096,16 @@ typedef struct tagNMBCHOTITEM #define BS_COMMANDLINK 0x0000000E #define BS_DEFCOMMANDLINK 0x0000000F +#define BCSIF_GLYPH 0x00000001 +#define BCSIF_IMAGE 0x00000002 +#define BCSIF_STYLE 0x00000004 +#define BCSIF_SIZE 0x00000008 + +#define BCSS_NOSPLIT 0x00000001 +#define BCSS_STRETCH 0x00000002 +#define BCSS_ALIGNLEFT 0x00000004 +#define BCSS_IMAGE 0x00000008 + /* Button macros */ #define Button_SetNote(button, note) \ (BOOL)SNDMSG(button, BCM_SETNOTE, 0, (LPARAM)(note))

1 0

Jacek Caban : mshtml: Move IHTMLCSSStyleDeclaration2 implementation to CSSStyle object.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: f4cceb1fb041fdccd236e52ac195cdfc260d0157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4cceb1fb041fdccd236e52a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:15:10 2019 +0100 mshtml: Move IHTMLCSSStyleDeclaration2 implementation to CSSStyle object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 494 ++++++++++++++++++++++++------------------------ dlls/mshtml/htmlstyle.h | 2 +- 2 files changed, 248 insertions(+), 248 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4cceb1fb041fdccd236…

1 0

Jacek Caban : mshtml: Move IHTMLCSSStyleDeclaration implementation to CSSStyle.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 12ec83f75b479299c39afc1cd95b33a27b4e10c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ec83f75b479299c39afc1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:50 2019 +0100 mshtml: Move IHTMLCSSStyleDeclaration implementation to CSSStyle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 1239 ++++++++++++++++++++++++----------------------- dlls/mshtml/htmlstyle.h | 15 +- 2 files changed, 637 insertions(+), 617 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12ec83f75b479299c39a…

1 0

Jacek Caban : mshtml: Move backgroundPosition[XY] properties implementation to IHTMLCSSStyleDeclaration.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 844547026671ebe2bc7aa862f94f60dd01bc559d URL: https://source.winehq.org/git/wine.git/?a=commit;h=844547026671ebe2bc7aa862… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:36 2019 +0100 mshtml: Move backgroundPosition[XY] properties implementation to IHTMLCSSStyleDeclaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 328 ++++++++++++++++++++++++------------------------ 1 file changed, 164 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=844547026671ebe2bc7a…

1 0

Jacek Caban : mshtml: Move style zoom property implementation to IHTMLCSSStyleDeclaration.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 15db389d4b0b8829132d42954515dfa50e3e6d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15db389d4b0b8829132d4295… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:25 2019 +0100 mshtml: Move style zoom property implementation to IHTMLCSSStyleDeclaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 60 ++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7d807eb..d4dfa7f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4193,46 +4193,22 @@ static HRESULT WINAPI HTMLStyle3_get_layoutFlow(IHTMLStyle3 *iface, BSTR *p) return E_NOTIMPL; } -static const WCHAR zoomW[] = {'z','o','o','m',0}; - static HRESULT WINAPI HTMLStyle3_put_zoom(IHTMLStyle3 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle3(iface); - VARIANT *var; - HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - /* zoom property is IE CSS extension that is mostly used as a hack to workaround IE bugs. - * The value is set to 1 then. We can safely ignore setting zoom to 1. */ - if(V_VT(&v) != VT_I4 || V_I4(&v) != 1) - WARN("stub for %s\n", debugstr_variant(&v)); - - hres = dispex_get_dprop_ref(&This->css_style.dispex, zoomW, TRUE, &var); - if(FAILED(hres)) - return hres; - - return VariantChangeType(var, &v, 0, VT_BSTR); + return IHTMLCSSStyleDeclaration_put_zoom(&This->IHTMLCSSStyleDeclaration_iface, v); } static HRESULT WINAPI HTMLStyle3_get_zoom(IHTMLStyle3 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle3(iface); - VARIANT *var; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = dispex_get_dprop_ref(&This->css_style.dispex, zoomW, FALSE, &var); - if(hres == DISP_E_UNKNOWNNAME) { - V_VT(p) = VT_BSTR; - V_BSTR(p) = NULL; - return S_OK; - } - if(FAILED(hres)) - return hres; - - return VariantCopy(p, var); + return IHTMLCSSStyleDeclaration_get_zoom(&This->IHTMLCSSStyleDeclaration_iface, p); } static HRESULT WINAPI HTMLStyle3_put_wordWrap(IHTMLStyle3 *iface, BSTR v) @@ -6674,18 +6650,46 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_layoutFlow(IHTMLCSSStyleDeclar return E_NOTIMPL; } +static const WCHAR zoomW[] = {'z','o','o','m',0}; + static HRESULT WINAPI HTMLCSSStyleDeclaration_put_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); + VARIANT *var; + HRESULT hres; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return IHTMLStyle3_put_zoom(&This->IHTMLStyle3_iface, v); + + /* zoom property is IE CSS extension that is mostly used as a hack to workaround IE bugs. + * The value is set to 1 then. We can safely ignore setting zoom to 1. */ + if(V_VT(&v) != VT_I4 || V_I4(&v) != 1) + WARN("stub for %s\n", debugstr_variant(&v)); + + hres = dispex_get_dprop_ref(&This->css_style.dispex, zoomW, TRUE, &var); + if(FAILED(hres)) + return hres; + + return VariantChangeType(var, &v, 0, VT_BSTR); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); + VARIANT *var; + HRESULT hres; + TRACE("(%p)->(%p)\n", This, p); - return IHTMLStyle3_get_zoom(&This->IHTMLStyle3_iface, p); + + hres = dispex_get_dprop_ref(&This->css_style.dispex, zoomW, FALSE, &var); + if(hres == DISP_E_UNKNOWNNAME) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = NULL; + return S_OK; + } + if(FAILED(hres)) + return hres; + + return VariantCopy(p, var); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_wordWrap(IHTMLCSSStyleDeclaration *iface, BSTR v)

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to get_style_property_var.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 153f666b64487044768d425f8e78a1ef281246b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=153f666b64487044768d425f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:13 2019 +0100 mshtml: Pass style as CSSStyle to get_style_property_var. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 146 ++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=153f666b64487044768d…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019