November 2013 - Wine-commits

André Hentschel : user32/tests: Fix GetSystemMetrics test on Win8.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 2209fdbdd24380c09ea9be5e23834fce20aa843c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2209fdbdd24380c09ea9be5e2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 12 00:10:22 2013 +0100 user32/tests: Fix GetSystemMetrics test on Win8. --- dlls/user32/tests/sysparams.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fb4c711..33c7a1c 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2786,10 +2786,12 @@ static void test_GetSystemMetrics( void) screen.cx = GetSystemMetrics( SM_CXSCREEN ); screen.cy = GetSystemMetrics( SM_CYSCREEN ); } - ok_gsm_2( SM_CXMAXTRACK, screen.cx + 4 + 2 * GetSystemMetrics(SM_CXFRAME), - screen.cx - 4 + 2 * GetSystemMetrics(SM_CXFRAME)); /* Vista */ - ok_gsm_2( SM_CYMAXTRACK, screen.cy + 4 + 2 * GetSystemMetrics(SM_CYFRAME), - screen.cy - 4 + 2 * GetSystemMetrics(SM_CYFRAME)); /* Vista */ + ok_gsm_3( SM_CXMAXTRACK, screen.cx + 4 + 2 * GetSystemMetrics(SM_CXFRAME), + screen.cx - 4 + 2 * GetSystemMetrics(SM_CXFRAME), /* Vista */ + screen.cx + 2 * GetSystemMetrics(SM_CXFRAME)); /* Win8 */ + ok_gsm_3( SM_CYMAXTRACK, screen.cy + 4 + 2 * GetSystemMetrics(SM_CYFRAME), + screen.cy - 4 + 2 * GetSystemMetrics(SM_CYFRAME), /* Vista */ + screen.cy + 2 * GetSystemMetrics(SM_CYFRAME)); /* Win8 */ /* the next two cannot really be tested as they depend on (application) * toolbars */ /* SM_CXMAXIMIZED */

1 0

Frédéric Delanoy : dbghelp: Use BOOL type where appropriate.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 1d65efe50b7ac88a060defb301b4a5c10587b055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d65efe50b7ac88a060defb30… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 01:16:36 2013 +0100 dbghelp: Use BOOL type where appropriate. --- dlls/dbghelp/cpu_arm.c | 4 ++-- dlls/dbghelp/cpu_arm64.c | 4 ++-- dlls/dbghelp/cpu_i386.c | 8 ++++---- dlls/dbghelp/cpu_ppc.c | 4 ++-- dlls/dbghelp/cpu_x86_64.c | 4 ++-- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/msc.c | 18 +++++++++--------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 740db0f..bd2c677 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static unsigned arm_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL arm_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { addr->Mode = AddrModeFlat; addr->Segment = 0; /* don't need segment */ diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index c816fe3..d80e608 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static unsigned arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { addr->Mode = AddrModeFlat; addr->Segment = 0; /* don't need segment */ diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index c912a0a..87f833f 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -48,8 +48,8 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD s return -1; } -static unsigned i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr, - unsigned seg, unsigned long offset) +static BOOL i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr, + unsigned seg, unsigned long offset) { addr->Mode = AddrModeFlat; addr->Segment = seg; @@ -73,8 +73,8 @@ static unsigned i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* a } #endif -static unsigned i386_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL i386_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { #ifdef __i386__ switch (ca) diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index 56571c5..3b2a843 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -28,8 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static unsigned ppc_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL ppc_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { switch (ca) { diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 29f4c6f..e0ffb11 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -91,8 +91,8 @@ typedef struct _UNWIND_INFO #define GetExceptionDataPtr(info) \ ((PVOID)((PULONG)GetLanguageSpecificData(info) + 1) -static unsigned x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) +static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) { addr->Mode = AddrModeFlat; switch (ca) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9390fab..74cba88 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -520,7 +520,7 @@ struct cpu DWORD frame_regno; /* address manipulation */ - unsigned (*get_addr)(HANDLE hThread, const CONTEXT* ctx, + BOOL (*get_addr)(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr, ADDRESS64* addr); /* stack manipulation */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 38d4a58..15769e8 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -56,7 +56,7 @@ static int match_ext(const WCHAR* ptr, size_t len) for (e = ext; *e; e++) { l = strlenW(*e); - if (l >= len) return FALSE; + if (l >= len) return 0; if (strncmpiW(&ptr[len - l], *e, l)) continue; return l; } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 4978acf..1e195f3 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -651,9 +651,9 @@ static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp, return &symt_new_array(ctp->module, 0, -arr_len, elem, index)->symt; } -static int codeview_add_type_enum_field_list(struct module* module, - struct symt_enum* symt, - const union codeview_reftype* ref_type) +static BOOL codeview_add_type_enum_field_list(struct module* module, + struct symt_enum* symt, + const union codeview_reftype* ref_type) { const unsigned char* ptr = ref_type->fieldlist.list; const unsigned char* last = (const BYTE*)ref_type + ref_type->generic.len + 2; @@ -1327,12 +1327,12 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, default: FIXME("Unsupported type-id leaf %x\n", type->generic.id); dump(type, 2 + type->generic.len); - return FALSE; + return NULL; } return codeview_add_type(curr_type, symt) ? symt : NULL; } -static int codeview_parse_type_table(struct codeview_type_parse* ctp) +static BOOL codeview_parse_type_table(struct codeview_type_parse* ctp) { unsigned int curr_type = FIRST_DEFINABLE_TYPE; const union codeview_type* type; @@ -1557,8 +1557,8 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, } } -static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root, - int offset, int size, BOOL do_globals) +static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root, + int offset, int size, BOOL do_globals) { struct symt_function* curr_func = NULL; int i, length; @@ -2004,8 +2004,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root return TRUE; } -static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYTE* root, - int offset, int size) +static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYTE* root, + int offset, int size) { int i, length;

1 0

Frédéric Delanoy : mmdevapi: Use BOOL type where appropriate.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: e50dfb69ee151cc68aeaee8c583cb8d0394f220a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50dfb69ee151cc68aeaee8c5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 01:16:37 2013 +0100 mmdevapi: Use BOOL type where appropriate. --- dlls/mmdevapi/devenum.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 6bb0d3f..e2a7cc5 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1066,8 +1066,8 @@ static void notify_clients(EDataFlow flow, ERole role, const WCHAR *id) notify_clients(flow, eMultimedia, id); } -static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, - const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) +static BOOL notify_if_changed(EDataFlow flow, ERole role, HKEY key, + const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) { WCHAR new_val[64], *id; DWORD size; @@ -1082,7 +1082,7 @@ static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ ERR("GetId failed: %08x\n", hr); - return 0; + return FALSE; } }else id = NULL; @@ -1091,23 +1091,23 @@ static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, old_val[0] = 0; CoTaskMemFree(id); - return 1; + return TRUE; } /* system default -> system default, noop */ - return 0; + return FALSE; } if(!lstrcmpW(old_val, new_val)){ /* set by user -> same value */ - return 0; + return FALSE; } if(new_val[0] != 0){ /* set by user -> different value */ notify_clients(flow, role, new_val); memcpy(old_val, new_val, sizeof(new_val)); - return 1; + return TRUE; } /* set by user -> system default */ @@ -1115,7 +1115,7 @@ static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ ERR("GetId failed: %08x\n", hr); - return 0; + return FALSE; } }else id = NULL; @@ -1124,7 +1124,7 @@ static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, old_val[0] = 0; CoTaskMemFree(id); - return 1; + return TRUE; } static DWORD WINAPI notif_thread_proc(void *user)

1 0

Andrey Gusev : Add uk templates folder
by Jeremy Newman 12 Nov '13

12 Nov '13

Module: website Branch: master Commit: 35ba3e0399655763f8c4c2f207d808331cb6d485 URL: http://source.winehq.org/git/website.git/?a=commit;h=35ba3e0399655763f8c4c2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 11 21:20:54 2013 +0200 Add uk templates folder --- templates/uk/.gitignore | 2 + templates/uk/announce.template | 7 + templates/uk/download.template | 190 ++++++++++++++++++++ templates/uk/download/debian.template | 22 +++ templates/uk/download/ubuntu.template | 57 ++++++ templates/uk/global/404.template | 16 ++ templates/uk/global/fatal_error.template | 25 +++ templates/uk/global/google_analytics.template | 10 + templates/uk/global/lang_row.template | 3 + templates/uk/global/themes/winehq/content.template | 74 ++++++++ .../uk/global/themes/winehq/content_nobox.template | 76 ++++++++ .../uk/global/themes/winehq/content_print.template | 18 ++ templates/uk/home.template | 90 +++++++++ templates/uk/interview.template | 8 + templates/uk/lang.template | 12 ++ templates/uk/news.template | 16 ++ templates/uk/search.template | 26 +++ 17 files changed, 652 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=35ba3e0399655763f8…

1 0

Andrey Gusev : Add uk news folder
by Jeremy Newman 12 Nov '13

12 Nov '13

Module: website Branch: master Commit: 4b071ff3965e49bc30f92b4a6943416aba0749bf URL: http://source.winehq.org/git/website.git/?a=commit;h=4b071ff3965e49bc30f92b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 11 21:21:59 2013 +0200 Add uk news folder --- news/uk/2013110801.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/uk/2013110801.xml b/news/uk/2013110801.xml new file mode 100644 index 0000000..a775ab9 --- /dev/null +++ b/news/uk/2013110801.xml @@ -0,0 +1,15 @@ +<news> +<date>8 листопада, 2013</date> +<title>Випущено Wine 1.7.6</title> +<body> + Розробницький реліз Wine 1.7.6 наразі доступний. + <a href="{$root}/announce/1.7.6">Що нового</a> в цьому релізі: +<ul> + <li>Переписано алгоритм BiDi для повної підтримки Unicode 6.3.</li> + <li>Підтримка Video Mixing Renderer 7-ої версії.</li> + <li>Покращена обробка вікна в драйвері Mac.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.6.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Zhenbo Li : shell32/tests: Add tests for SHFileOperationA.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 7c1602464a9d8fb65663ff92de84b4888a1ac479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1602464a9d8fb65663ff92d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Nov 11 23:52:31 2013 +0800 shell32/tests: Add tests for SHFileOperationA. --- dlls/shell32/tests/shlfileop.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a62292b..bb15054 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -646,6 +646,19 @@ static void test_delete(void) else skip("Test would show a dialog box\n"); + /* delete an existent file and a nonexistent file */ + shfo.pFrom = "test1.txt\0nonexistent.txt\0test2.txt\0"; + shfo.wFunc = FO_DELETE; + ret = SHFileOperationA(&shfo); + todo_wine + ok(ret == 1026 || + ret == ERROR_FILE_NOT_FOUND || /* Vista */ + broken(ret == ERROR_SUCCESS), /* NT4 */ + "Expected 1026 or ERROR_FILE_NOT_FOUND, got %d\n", ret); + todo_wine + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + /* try the FOF_NORECURSION flag, continues deleting subdirs */ init_shfo_tests(); shfo.pFrom = "testdir2\0";

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement:: scroll attribute implementation.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: ea24a5b1f42bf7cc90ea042370eb1628dec35b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea24a5b1f42bf7cc90ea04237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 11 14:36:43 2013 +0100 mshtml: Added IHTMLBodyElement::scroll attribute implementation. --- dlls/mshtml/htmlbody.c | 57 +++++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/htmlstyle.c | 47 +++++++++++++++++++++++++++++++++++--- dlls/mshtml/htmlstyle.h | 3 ++ dlls/mshtml/tests/dom.c | 30 ++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index bb5ee34..2b98cf4 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -30,6 +30,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "htmlstyle.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -602,18 +603,66 @@ static HRESULT WINAPI HTMLBodyElement_get_onunload(IHTMLBodyElement *iface, VARI return E_NOTIMPL; } +static const WCHAR autoW[] = {'a','u','t','o',0}; +static const WCHAR hiddenW[] = {'h','i','d','d','e','n',0}; +static const WCHAR scrollW[] = {'s','c','r','o','l','l',0}; +static const WCHAR visibleW[] = {'v','i','s','i','b','l','e',0}; +static const WCHAR yesW[] = {'y','e','s',0}; +static const WCHAR noW[] = {'n','o',0}; + static HRESULT WINAPI HTMLBodyElement_put_scroll(IHTMLBodyElement *iface, BSTR v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + static const WCHAR *val; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + /* Emulate with CSS visibility attribute */ + if(!strcmpW(v, yesW)) { + val = scrollW; + }else if(!strcmpW(v, autoW)) { + val = visibleW; + }else if(!strcmpW(v, noW)) { + val = hiddenW; + }else { + WARN("Invalid argument %s\n", debugstr_w(v)); + return E_INVALIDARG; + } + + return set_elem_style(&This->textcont.element, STYLEID_OVERFLOW, val); } static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR *p) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + const WCHAR *ret; + BSTR overflow; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + /* Emulate with CSS visibility attribute */ + hres = get_elem_style(&This->textcont.element, STYLEID_OVERFLOW, &overflow); + if(FAILED(hres)) + return hres; + + if(!overflow || !*overflow) { + *p = NULL; + return S_OK; + }else if(!strcmpW(overflow, visibleW) || !strcmpW(overflow, autoW)) { + ret = autoW; + }else if(!strcmpW(overflow, scrollW)) { + ret = yesW; + }else if(!strcmpW(overflow, hiddenW)) { + ret = noW; + }else { + TRACE("Defaulting %s to NULL", debugstr_w(overflow)); + *p = NULL; + return S_OK; + } + + *p = SysAllocString(ret); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLBodyElement_put_onselect(IHTMLBodyElement *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5f4fc67..c85e4db 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -3115,11 +3115,9 @@ static dispex_static_data_t HTMLStyle_dispex = { HTMLStyle_iface_tids }; -HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) +static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration **ret) { nsIDOMElementCSSInlineStyle *nselemstyle; - nsIDOMCSSStyleDeclaration *nsstyle; - HTMLStyle *style; nsresult nsres; if(!elem->nselem) { @@ -3131,13 +3129,26 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) (void**)&nselemstyle); assert(nsres == NS_OK); - nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, &nsstyle); + nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, ret); nsIDOMElementCSSInlineStyle_Release(nselemstyle); if(NS_FAILED(nsres)) { ERR("GetStyle failed: %08x\n", nsres); return E_FAIL; } + return S_OK; +} + +HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) +{ + nsIDOMCSSStyleDeclaration *nsstyle; + HTMLStyle *style; + HRESULT hres; + + hres = get_style_from_elem(elem, &nsstyle); + if(FAILED(hres)) + return hres; + style = heap_alloc_zero(sizeof(HTMLStyle)); if(!style) { nsIDOMCSSStyleDeclaration_Release(nsstyle); @@ -3158,3 +3169,31 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) *ret = style; return S_OK; } + +HRESULT get_elem_style(HTMLElement *elem, styleid_t styleid, BSTR *ret) +{ + nsIDOMCSSStyleDeclaration *style; + HRESULT hres; + + hres = get_style_from_elem(elem, &style); + if(FAILED(hres)) + return hres; + + hres = get_nsstyle_attr(style, styleid, ret, 0); + nsIDOMCSSStyleDeclaration_Release(style); + return hres; +} + +HRESULT set_elem_style(HTMLElement *elem, styleid_t styleid, const WCHAR *val) +{ + nsIDOMCSSStyleDeclaration *style; + HRESULT hres; + + hres = get_style_from_elem(elem, &style); + if(FAILED(hres)) + return hres; + + hres = set_nsstyle_attr(style, styleid, val, 0); + nsIDOMCSSStyleDeclaration_Release(style); + return hres; +} diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 382a226..9294015 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -120,6 +120,9 @@ HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,LPCWSTR,DWORD) DEC HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) DECLSPEC_HIDDEN; HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) DECLSPEC_HIDDEN; +HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN; +HRESULT set_elem_style(HTMLElement*,styleid_t,const WCHAR*) DECLSPEC_HIDDEN; + #define ATTR_FIX_PX 0x0001 #define ATTR_FIX_URL 0x0002 #define ATTR_STR_TO_INT 0x0004 diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f1155d8..e43c754 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5171,6 +5171,31 @@ static void test_default_body(IHTMLBodyElement *body) VariantClear(&v); } +#define test_body_scroll(a,b) _test_body_scroll(__LINE__,a,b) +static void _test_body_scroll(unsigned line, IHTMLBodyElement *body, const char *ex) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLBodyElement_get_scroll(body, &str); + ok_(__FILE__,line)(hres == S_OK, "get_scroll failed: %08x\n", hres); + ok_(__FILE__,line)(ex ? !strcmp_wa(str, ex) : !str, "scroll = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + +#define set_body_scroll(a,b) _set_body_scroll(__LINE__,a,b) +static void _set_body_scroll(unsigned line, IHTMLBodyElement *body, const char *val) +{ + BSTR str = a2bstr(val); + HRESULT hres; + + hres = IHTMLBodyElement_put_scroll(body, str); + ok_(__FILE__,line)(hres == S_OK, "put_scroll failed: %08x\n", hres); + SysFreeString(str); + + _test_body_scroll(line, body, val); +} + static void test_body_funs(IHTMLBodyElement *body) { VARIANT vbg, vDefaultbg; @@ -5197,6 +5222,11 @@ static void test_body_funs(IHTMLBodyElement *body) hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); + + test_body_scroll(body, NULL); + set_body_scroll(body, "yes"); + set_body_scroll(body, "no"); + set_body_scroll(body, "auto"); } static void test_history(IHTMLWindow2 *window)

1 0

Sebastian Lackner : winex11: Implement additional XEMBED events.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: df6dc091e6524581549d65c04c61f5ccd22dfe48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6dc091e6524581549d65c04… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 26 18:34:32 2013 +0200 winex11: Implement additional XEMBED events. --- dlls/winex11.drv/event.c | 145 ++++++++++++++++++++++++++++++--------------- dlls/winex11.drv/window.c | 2 +- 2 files changed, 98 insertions(+), 49 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 4218949..64188bc 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -748,34 +748,22 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev ) else SetForegroundWindow( hwnd ); } - /********************************************************************** - * X11DRV_FocusOut - * - * Note: only top-level windows get FocusOut events. + * focus_out */ -static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) -{ - XFocusChangeEvent *event = &xev->xfocus; + static void focus_out( Display *display , HWND hwnd ) + { HWND hwnd_tmp; Window focus_win; int revert; XIC xic; - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); - - if (event->detail == NotifyPointer) - { - if (!hwnd && event->window == x11drv_thread_data()->clip_window) reset_clipping_window(); - return; - } - if (!hwnd) return; if (ximInComposeMode) return; x11drv_thread_data()->last_focus = hwnd; if ((xic = X11DRV_get_ic( hwnd ))) XUnsetICFocus( xic ); - if (root_window != DefaultRootWindow(event->display)) + if (root_window != DefaultRootWindow(display)) { if (hwnd == GetDesktopWindow()) reset_clipping_window(); return; @@ -786,10 +774,10 @@ static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) /* don't reset the foreground window, if the window which is getting the focus is a Wine window */ - XGetInputFocus( event->display, &focus_win, &revert ); + XGetInputFocus( display, &focus_win, &revert ); if (focus_win) { - if (XFindContext( event->display, focus_win, winContext, (char **)&hwnd_tmp ) != 0) + if (XFindContext( display, focus_win, winContext, (char **)&hwnd_tmp ) != 0) focus_win = 0; } @@ -805,6 +793,26 @@ static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) SetForegroundWindow( GetDesktopWindow() ); } } + } + +/********************************************************************** + * X11DRV_FocusOut + * + * Note: only top-level windows get FocusOut events. + */ +static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) +{ + XFocusChangeEvent *event = &xev->xfocus; + + TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + + if (event->detail == NotifyPointer) + { + if (!hwnd && event->window == x11drv_thread_data()->clip_window) reset_clipping_window(); + return; + } + if (!hwnd) return; + focus_out( event->display, hwnd ); } @@ -940,6 +948,37 @@ static BOOL is_net_wm_state_maximized( Display *display, struct x11drv_win_data return (ret == 2); } +/*********************************************************************** + * reparent_notify + */ +static void reparent_notify( Display *display, HWND hwnd, Window xparent, int x, int y ) +{ + HWND parent, old_parent; + DWORD style; + + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (xparent == root_window) + { + parent = GetDesktopWindow(); + style = (style & ~WS_CHILD) | WS_POPUP; + } + else + { + if (!(parent = create_foreign_window( display, xparent ))) return; + style = (style & ~WS_POPUP) | WS_CHILD; + } + + ShowWindow( hwnd, SW_HIDE ); + old_parent = SetParent( hwnd, parent ); + SetWindowLongW( hwnd, GWL_STYLE, style ); + SetWindowPos( hwnd, HWND_TOP, x, y, 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOCOPYBITS | + ((style & WS_VISIBLE) ? SWP_SHOWWINDOW : 0) ); + + /* make old parent destroy itself if it no longer has children */ + if (old_parent != GetDesktopWindow()) PostMessageW( old_parent, WM_CLOSE, 0, 0 ); +} + /*********************************************************************** * X11DRV_ReparentNotify @@ -948,8 +987,6 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) { XReparentEvent *event = &xev->xreparent; struct x11drv_win_data *data; - HWND parent, old_parent; - DWORD style; if (!(data = get_win_data( hwnd ))) return; @@ -975,27 +1012,7 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) TRACE( "%p/%lx reparented to %lx\n", hwnd, data->whole_window, event->parent ); release_win_data( data ); - style = GetWindowLongW( hwnd, GWL_STYLE ); - if (event->parent == root_window) - { - parent = GetDesktopWindow(); - style = (style & ~WS_CHILD) | WS_POPUP; - } - else - { - if (!(parent = create_foreign_window( event->display, event->parent ))) return; - style = (style & ~WS_POPUP) | WS_CHILD; - } - - ShowWindow( hwnd, SW_HIDE ); - old_parent = SetParent( hwnd, parent ); - SetWindowLongW( hwnd, GWL_STYLE, style ); - SetWindowPos( hwnd, HWND_TOP, event->x, event->y, 0, 0, - SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOCOPYBITS | - ((style & WS_VISIBLE) ? SWP_SHOWWINDOW : 0) ); - - /* make old parent destroy itself if it no longer has children */ - if (old_parent != GetDesktopWindow()) PostMessageW( old_parent, WM_CLOSE, 0, 0 ); + reparent_notify( event->display, hwnd, event->parent, event->x, event->y ); } @@ -1594,22 +1611,54 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) */ static void handle_xembed_protocol( HWND hwnd, XClientMessageEvent *event ) { - struct x11drv_win_data *data = get_win_data( hwnd ); - - if (!data) return; - switch (event->data.l[1]) { case XEMBED_EMBEDDED_NOTIFY: - TRACE( "win %p/%lx XEMBED_EMBEDDED_NOTIFY owner %lx\n", hwnd, event->window, event->data.l[3] ); - data->embedder = event->data.l[3]; + { + struct x11drv_win_data *data = get_win_data( hwnd ); + if (!data) break; + + TRACE( "win %p/%lx XEMBED_EMBEDDED_NOTIFY owner %lx\n", hwnd, event->window, event->data.l[3] ); + data->embedder = event->data.l[3]; + + /* window has been marked as embedded before (e.g. systray) */ + if (data->embedded) + { + release_win_data( data ); + break; + } + + make_window_embedded( data ); + release_win_data( data ); + reparent_notify( event->display, hwnd, event->data.l[3], 0, 0 ); + } + break; + + case XEMBED_WINDOW_DEACTIVATE: + TRACE( "win %p/%lx XEMBED_WINDOW_DEACTIVATE message\n", hwnd, event->window ); + focus_out( event->display, GetAncestor( hwnd, GA_ROOT ) ); + break; + + case XEMBED_FOCUS_OUT: + TRACE( "win %p/%lx XEMBED_FOCUS_OUT message\n", hwnd, event->window ); + focus_out( event->display, GetAncestor( hwnd, GA_ROOT ) ); break; + + case XEMBED_MODALITY_ON: + TRACE( "win %p/%lx XEMBED_MODALITY_ON message\n", hwnd, event->window ); + EnableWindow( hwnd, FALSE ); + break; + + case XEMBED_MODALITY_OFF: + TRACE( "win %p/%lx XEMBED_MODALITY_OFF message\n", hwnd, event->window ); + EnableWindow( hwnd, TRUE ); + break; + default: TRACE( "win %p/%lx XEMBED message %lu(%lu)\n", hwnd, event->window, event->data.l[1], event->data.l[2] ); break; } - release_win_data( data ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a76e80d..e78f226 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1137,7 +1137,7 @@ void make_window_embedded( struct x11drv_win_data *data ) data->embedded = TRUE; data->managed = TRUE; sync_window_style( data ); - set_xembed_flags( data, data->mapped ? XEMBED_MAPPED : 0 ); + set_xembed_flags( data, (data->mapped || data->embedder) ? XEMBED_MAPPED : 0 ); }

1 0

Michael Müller : quartz: Improve stubs for AMCertifiedOutputProtection.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 1b5026424b767d699c8c9f1ac743ddb357d16ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5026424b767d699c8c9f1ac… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Nov 10 20:44:10 2013 +0100 quartz: Improve stubs for AMCertifiedOutputProtection. --- dlls/quartz/vmr9.c | 8 ++++---- include/vfwmsgs.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index cd1e139..dc6b4fc 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1120,7 +1120,7 @@ static HRESULT WINAPI AMCertifiedOutputProtection_KeyExchange(IAMCertifiedOutput struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); FIXME("(%p/%p)->(%p, %p, %p) stub\n", iface, This, pRandom, VarLenCertGH, pdwLengthCertGH); - return E_NOTIMPL; + return VFW_E_NO_COPP_HW; } static HRESULT WINAPI AMCertifiedOutputProtection_SessionSequenceStart(IAMCertifiedOutputProtection *iface, @@ -1129,7 +1129,7 @@ static HRESULT WINAPI AMCertifiedOutputProtection_SessionSequenceStart(IAMCertif struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pSig); - return E_NOTIMPL; + return VFW_E_NO_COPP_HW; } static HRESULT WINAPI AMCertifiedOutputProtection_ProtectionCommand(IAMCertifiedOutputProtection *iface, @@ -1138,7 +1138,7 @@ static HRESULT WINAPI AMCertifiedOutputProtection_ProtectionCommand(IAMCertified struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, cmd); - return E_NOTIMPL; + return VFW_E_NO_COPP_HW; } static HRESULT WINAPI AMCertifiedOutputProtection_ProtectionStatus(IAMCertifiedOutputProtection *iface, @@ -1148,7 +1148,7 @@ static HRESULT WINAPI AMCertifiedOutputProtection_ProtectionStatus(IAMCertifiedO struct quartz_vmr *This = impl_from_IAMCertifiedOutputProtection(iface); FIXME("(%p/%p)->(%p, %p) stub\n", iface, This, pStatusInput, pStatusOutput); - return E_NOTIMPL; + return VFW_E_NO_COPP_HW; } static const IAMCertifiedOutputProtectionVtbl IAMCertifiedOutputProtection_Vtbl = diff --git a/include/vfwmsgs.h b/include/vfwmsgs.h index 16b25c3..660ee40 100644 --- a/include/vfwmsgs.h +++ b/include/vfwmsgs.h @@ -156,6 +156,7 @@ #define VFW_E_VMR_NO_AP_SUPPLIED ((HRESULT)0x80040297) #define VFW_E_VMR_NO_DEINTERLACE_HW ((HRESULT)0x80040298) #define VFW_E_DVD_VMR9_INCOMPATIBLEDEC ((HRESULT)0x8004029A) +#define VFW_E_NO_COPP_HW ((HRESULT)0x8004029B) #define VFW_E_BAD_KEY ((HRESULT)0x800403F2) #ifndef E_PROP_ID_UNSUPPORTED

1 0

Alexandre Julliard : comctl32/tests: Fix a test that fails on Windows.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 4242c437a26326a033e3a99cc1f211f6a8c4c945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4242c437a26326a033e3a99cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 11 20:48:51 2013 +0100 comctl32/tests: Fix a test that fails on Windows. --- dlls/comctl32/tests/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index c894dd1..d5f97b3 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -420,7 +420,7 @@ static void test_gettext(void) toolinfoW.lParam = 0xdeadbeef; GetClientRect(hwnd, &toolinfoW.rect); r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); - ok(r, "Adding the tool to the tooltip failed\n"); + todo_wine ok(!r, "Adding the tool to the tooltip failed\n"); if (0) /* crashes on NT4 */ {

1 0