wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: c15e80edd2673e0934974167e505388eee07d443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15e80edd2673e0934974167e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 26 18:53:03 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/po/fi.po b/po/fi.po index 9892c37..52fd675 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11529,6 +11529,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Käyttö:\n" +" REG [toiminto] [parametrit]\n" +"\n" +"Tuetut toiminnot:\n" +" ADD, DELETE, QUERY\n" +"\n" +"Tietystä toiminnosta saa apua komennolla\n" +" REG [toiminto] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11632,24 +11641,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Haku on valmis. Osumia: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: Avaimen nimi ei kelpaa\n" +msgstr "reg: Syntaksi ei kelpaa. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "uninstaller: Virheellinen valitsin [%1]\n" +msgstr "reg: Valitsin [%1] ei kelpaa. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Komennolla \"REG /?\" saat apua.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Komennolla \"REG %1 /?\" saat apua.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Andrey Gusev : user32: Fix a typo in comment.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: a0c651cd7cf83c9fac6b8776de2d54a731fc4b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c651cd7cf83c9fac6b8776d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:11:57 2016 +0300 user32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/uitools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index efaf356..9a0fff9 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -718,7 +718,7 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) /************************************************************************ - * UITOOLS_DFC_ButtonChcek + * UITOOLS_DFC_ButtonCheck * * Draw a check/3state button coming from DrawFrameControl() *

1 0

Andrey Gusev : msi/tests: Fix a typo in comment.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 8260eabb86eda24125979969629c87229ce21488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8260eabb86eda241259799696… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:07:53 2016 +0300 msi/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7dd878a..9c1fcba 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8068,7 +8068,7 @@ static void test_dbmerge(void) r = run_query(href, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* column sting types don't match exactly */ + /* column string types don't match exactly */ r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Andrey Gusev : mshtml/tests: Fix a typo in comment.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 8d560597424138a6542bf0c21a6681e4b66e6c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d560597424138a6542bf0c21… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 17:44:05 2016 +0300 mshtml/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 3da1a70..7053a09 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1792,7 +1792,7 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); SysFreeString(sDefault); - /* backgoundColor */ + /* backgroundColor */ hres = IHTMLStyle_get_backgroundColor(style, &v); ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v));

1 0

Alistair Leslie-Hughes : d3dx10_43: Add D3DX10GetImageInfoFromMemory stub.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 62ede82a72a4268f8a30b910d45566fac8ceb25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ede82a72a4268f8a30b910d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 11:03:11 2016 +0000 d3dx10_43: Add D3DX10GetImageInfoFromMemory stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 10 ++++++++++ include/d3dx10tex.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 7bfd9f3..492a588 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -51,7 +51,7 @@ @ stdcall D3DX10GetFeatureLevel1(ptr ptr) @ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) -@ stub D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) +@ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr) @ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr) @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 1654544..71d6ae8 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -35,6 +35,7 @@ #include "d3d10_1.h" #include "d3dx10core.h" +#include "d3dx10tex.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -193,3 +194,12 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1); } + +HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *img_info, HRESULT *hresult) +{ + FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n", + src_data, src_data_size, pump, img_info, hresult); + + return E_NOTIMPL; +} diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index aa89ab4..d44edf2 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -87,6 +87,8 @@ extern "C" { HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); #ifdef __cplusplus }

1 0

Paul Gofman : d3dx9: Add is_param_type_sampler() helper function.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: dca016d7dce0c7e5323281b975d195cdfb5ac40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca016d7dce0c7e5323281b97… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 23 13:40:55 2016 +0300 d3dx9: Add is_param_type_sampler() helper function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 7 +++++++ dlls/d3dx9_36/effect.c | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index a0e62f1..9938d83 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -108,6 +108,13 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) +{ + return type == D3DXPT_SAMPLER + || type == D3DXPT_SAMPLER1D || type == D3DXPT_SAMPLER2D + || type == D3DXPT_SAMPLER3D || type == D3DXPT_SAMPLERCUBE; +} + struct d3dx_parameter; enum pres_reg_tables diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index da7de54..7d5e612 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1326,9 +1326,7 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, } /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER - || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D - || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { TRACE("Sampler: returning E_FAIL\n"); return E_FAIL; @@ -1391,9 +1389,7 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, } /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER - || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D - || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { TRACE("Sampler: returning E_FAIL\n"); return E_FAIL; @@ -2743,9 +2739,7 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct ret = D3D_OK; for (i = 0; i < parameters_count; ++i) { - if (params[i] && params[i]->class == D3DXPC_OBJECT && (params[i]->type == D3DXPT_SAMPLER - || params[i]->type == D3DXPT_SAMPLER1D || params[i]->type == D3DXPT_SAMPLER2D - || params[i]->type == D3DXPT_SAMPLER3D || params[i]->type == D3DXPT_SAMPLERCUBE)) + if (params[i] && params[i]->class == D3DXPC_OBJECT && is_param_type_sampler(params[i]->type)) { struct d3dx_sampler *sampler;

1 0

Paul Gofman : d3dx9: Add d3ds_dotswiz opcode to preshader.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 4786f53ef89121be5fb479313559f39e6aa5866b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4786f53ef89121be5fb479313… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 20 20:43:56 2016 +0300 d3dx9: Add d3ds_dotswiz opcode to preshader. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 29 ++++++++++++++++++++++------- dlls/d3dx9_36/tests/effect.c | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index a16c065..78f3bdb 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -44,6 +44,8 @@ enum pres_ops PRESHADER_OP_COS, PRESHADER_OP_RSQ, PRESHADER_OP_EXP, + PRESHADER_OP_DOTSWIZ6, + PRESHADER_OP_DOTSWIZ8, }; typedef double (*pres_op_func)(double *args, int n); @@ -61,6 +63,17 @@ static double pres_dot(double *args, int n) sum += args[i] * args[i + n]; return sum; } + +static double pres_dotswiz6(double *args, int n) +{ + return pres_dot(args, 3); +} + +static double pres_dotswiz8(double *args, int n) +{ + return pres_dot(args, 4); +} + static double pres_neg(double *args, int n) {return -args[0];} static double pres_rcp(double *args, int n) {return 1.0 / args[0];} static double pres_lt(double *args, int n) {return args[0] < args[1] ? 1.0 : 0.0;} @@ -97,7 +110,7 @@ static double pres_exp(double *args, int n) {return pow(2.0, args[0]);} struct op_info { unsigned int opcode; - char mnem[8]; + char mnem[16]; unsigned int input_count; BOOL func_all_comps; pres_op_func func; @@ -122,6 +135,8 @@ static const struct op_info pres_op_info[] = {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ + {0x70e, "d3ds_dotswiz", 8, 0, pres_dotswiz8}, /* PRESHADER_OP_DOTSWIZ8 */ }; enum pres_value_type @@ -178,7 +193,7 @@ struct d3dx_pres_operand unsigned int offset; }; -#define MAX_INPUTS_COUNT 3 +#define MAX_INPUTS_COUNT 8 struct d3dx_pres_ins { @@ -410,18 +425,18 @@ static unsigned int *parse_pres_ins(unsigned int *ptr, unsigned int count, struc input_count = *ptr++; count -= 2; for (i = 0; i < ARRAY_SIZE(pres_op_info); ++i) - if (ins_code == pres_op_info[i].opcode) + if (ins_code == pres_op_info[i].opcode && input_count == pres_op_info[i].input_count) break; if (i == ARRAY_SIZE(pres_op_info)) { - FIXME("Unknown opcode %#x, raw %#x.\n", ins_code, ins_raw); + FIXME("Unknown opcode %#x, input_count %u, raw %#x.\n", ins_code, input_count, ins_raw); return NULL; } ins->op = i; - if (input_count > ARRAY_SIZE(ins->inputs) || input_count != pres_op_info[i].input_count) + if (input_count > ARRAY_SIZE(ins->inputs)) { - FIXME("Actual input args %u, expected %u, instruction %s.\n", input_count, - pres_op_info[i].input_count, pres_op_info[i].mnem); + FIXME("Actual input args count %u exceeds inputs array size, instruction %s.\n", input_count, + pres_op_info[i].mnem); return NULL; } for (i = 0; i < input_count; ++i) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c31b584..5963725 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3872,7 +3872,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) {"den mul",{FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, {"dot", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, {"prec", {FALSE, FALSE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}}, - {"dotswiz", { TRUE, TRUE, TRUE, FALSE}, {0xc00ccccd, 0xc0d33334, 0xc10ccccd, 0}}, + {"dotswiz", {FALSE, FALSE, FALSE, FALSE}, {0xc00ccccd, 0xc0d33334, 0xc10ccccd, 0}}, {"reladdr", { TRUE, TRUE, TRUE, TRUE}, {0xc00ccccd, 0x40000000, 0x41a00000, 0x41500000}}, }; #define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2:: onunload property implementation.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 7d2bba46479866d5e532e5188370027fdd9807b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2bba46479866d5e532e5188… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 16:16:09 2016 +0200 mshtml: Added IHTMLWindow2::onunload property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 7 ++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 43e742f..0477e91 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -141,6 +141,9 @@ static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t',' static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; static const WCHAR onsubmitW[] = {'o','n','s','u','b','m','i','t',0}; +static const WCHAR unloadW[] = {'u','n','l','o','a','d',0}; +static const WCHAR onunloadW[] = {'o','n','u','n','l','o','a','d',0}; + static const WCHAR HTMLEventsW[] = {'H','T','M','L','E','v','e','n','t','s',0}; static const WCHAR KeyboardEventW[] = {'K','e','y','b','o','a','r','d','E','v','e','n','t',0}; static const WCHAR MouseEventW[] = {'M','o','u','s','e','E','v','e','n','t',0}; @@ -239,7 +242,9 @@ static const event_info_t event_info[] = { {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS} + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS}, + {unloadW, onunloadW, EVENTT_HTML, DISPID_EVMETH_ONUNLOAD, + EVENT_FIXME} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f723ef6..cc16fd8 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -49,6 +49,7 @@ typedef enum { EVENTID_SCROLL, EVENTID_SELECTSTART, EVENTID_SUBMIT, + EVENTID_UNLOAD, EVENTID_LAST } eventid_t; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5f46c2a..2e33c0b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1128,15 +1128,19 @@ static HRESULT WINAPI HTMLWindow2_get_onbeforeunload(IHTMLWindow2 *iface, VARIAN static HRESULT WINAPI HTMLWindow2_put_onunload(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_UNLOAD, &v); } static HRESULT WINAPI HTMLWindow2_get_onunload(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_UNLOAD, p); } static HRESULT WINAPI HTMLWindow2_put_onhelp(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Improved FIXMEs about unimplemented events.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 8abd37637af36c6f969de1f5a6244f279a72decf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abd37637af36c6f969de1f5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 16:15:55 2016 +0200 mshtml: Improved FIXMEs about unimplemented events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7abd727..67c8460 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3732,7 +3732,7 @@ static HRESULT WINAPI HTMLElement4_put_onmousewheel(IHTMLElement4 *iface, VARIAN { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEWHEEL, &v); } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 27b6c39..43e742f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -173,6 +173,7 @@ typedef struct { #define EVENT_BIND_TO_BODY 0x0008 #define EVENT_CANCELABLE 0x0010 #define EVENT_HASDEFAULTHANDLERS 0x0020 +#define EVENT_FIXME 0x0040 static const event_info_t event_info[] = { {abortW, onabortW, EVENTT_NONE, DISPID_EVMETH_ONABORT, @@ -226,7 +227,7 @@ static const event_info_t event_info[] = { {mouseupW, onmouseupW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEUP, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mousewheelW, onmousewheelW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, - 0}, + EVENT_FIXME}, {pasteW, onpasteW, EVENTT_NONE, DISPID_EVMETH_ONPASTE, EVENT_CANCELABLE}, {readystatechangeW, onreadystatechangeW, EVENTT_NONE, DISPID_EVMETH_ONREADYSTATECHANGE, @@ -1416,6 +1417,9 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, { event_target_t *data; + if(event_info[eid].flags & EVENT_FIXME) + FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); + remove_event_handler(event_target, eid); if(!disp) return S_OK; @@ -1518,6 +1522,9 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI return S_OK; } + if(event_info[eid].flags & EVENT_FIXME) + FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); + data = get_event_target_data(event_target, TRUE); if(!data) return E_OUTOFMEMORY;

1 0

Alistair Leslie-Hughes : secur32/tests: Add AcquireCredentialsHandleW tests.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: ee7bc087fd802cb5fc7a8a2703a0d4c4ba72e617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7bc087fd802cb5fc7a8a270… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 26 10:45:35 2016 +0000 secur32/tests: Add AcquireCredentialsHandleW tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 119 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 100 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 4147ac7..3b661c1 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -42,6 +42,8 @@ static SECURITY_STATUS (SEC_ENTRY * pFreeContextBuffer)(PVOID pv); static SECURITY_STATUS (SEC_ENTRY * pQuerySecurityPackageInfoA)(SEC_CHAR*, PSecPkgInfoA*); static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleA)(SEC_CHAR*, SEC_CHAR*, ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp); +static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleW)(SEC_CHAR*, SEC_WCHAR*, + ULONG, PLUID, void*, SEC_GET_KEY_FN, void*, CredHandle*, TimeStamp*); static SECURITY_STATUS (SEC_ENTRY * pInitializeSecurityContextA)(PCredHandle, PCtxtHandle, SEC_CHAR*, ULONG, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, PSecBufferDesc, PULONG, PTimeStamp); @@ -149,6 +151,11 @@ static BYTE crypt_message_server2[] = {0xc8, 0xf2, 0x39, 0x7f, 0x0c, 0xaf, 0xf5, 0x5d, 0xef, 0x0c, 0x8b, 0x5f, 0x82}; +static char test_user[] = "testuser", + workgroup[] = "WORKGROUP", + test_pass[] = "testpass", + sec_pkg_name[] = "NTLM"; + static void InitFunctionPtrs(void) { secdll = LoadLibraryA("secur32.dll"); @@ -160,6 +167,7 @@ static void InitFunctionPtrs(void) pFreeContextBuffer = (PVOID)GetProcAddress(secdll, "FreeContextBuffer"); pQuerySecurityPackageInfoA = (PVOID)GetProcAddress(secdll, "QuerySecurityPackageInfoA"); pAcquireCredentialsHandleA = (PVOID)GetProcAddress(secdll, "AcquireCredentialsHandleA"); + pAcquireCredentialsHandleW = (void*)GetProcAddress(secdll, "AcquireCredentialsHandleW"); pInitializeSecurityContextA = (PVOID)GetProcAddress(secdll, "InitializeSecurityContextA"); pCompleteAuthToken = (PVOID)GetProcAddress(secdll, "CompleteAuthToken"); pAcceptSecurityContext = (PVOID)GetProcAddress(secdll, "AcceptSecurityContext"); @@ -568,10 +576,6 @@ static void testInitializeSecurityContextFlags(void) PSecPkgInfoA pkg_info = NULL; SspiData client; SEC_WINNT_AUTH_IDENTITY_A id; - static char sec_pkg_name[] = "NTLM", - test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass"; ULONG req_attr, ctxt_attr; TimeStamp ttl; PBYTE packet; @@ -793,10 +797,6 @@ static void testAuth(ULONG data_rep, BOOL fake) SspiData client, server; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; - static char sec_pkg_name[] = "NTLM", - test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass"; if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) { @@ -930,9 +930,6 @@ static void testSignSeal(void) SecBuffer data[2], fake_data[2], complex_data[4]; ULONG qop = 0xdeadbeef; SecPkgContext_Sizes ctxt_sizes; - static char test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass"; complex_data[1].pvBuffer = complex_data[3].pvBuffer = NULL; @@ -1186,10 +1183,6 @@ static BOOL testAcquireCredentialsHandle(void) { CredHandle cred; TimeStamp ttl; - static char test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass", - sec_pkg_name[] = "NTLM"; SECURITY_STATUS ret; SEC_WINNT_AUTH_IDENTITY_A id; PSecPkgInfoA pkg_info = NULL; @@ -1251,12 +1244,98 @@ static BOOL testAcquireCredentialsHandle(void) return TRUE; } +static void testAcquireCredentialsHandleW(void) +{ + CredHandle cred; + TimeStamp ttl; + static WCHAR sec_pkg_nameW[] = {'N','T','L','M',0 }; + static WCHAR test_userW[] = {'t','e','s','t','u','s','e','r',0 }; + static WCHAR workgroupW[] = {'W','O','R','K','G','R','O','U','P',0}; + static WCHAR test_passW[] = {'t','e','s','t','p','a','s','s',0}; + SECURITY_STATUS ret; + SEC_WINNT_AUTH_IDENTITY_A idA; + SEC_WINNT_AUTH_IDENTITY_W id; + PSecPkgInfoA pkg_info = NULL; + + if(!pAcquireCredentialsHandleW) + { + win_skip("AcquireCredentialsHandleW not available\n"); + return; + } + + if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) + { + ok(0, "NTLM package not installed, skipping test\n"); + return; + } + pFreeContextBuffer(pkg_info); + + id.User = test_userW; + id.UserLength = lstrlenW(test_userW); + id.Domain = workgroupW; + id.DomainLength = lstrlenW(workgroupW); + id.Password = test_passW; + id.PasswordLength = lstrlenW(test_passW); + id.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.DomainLength = 0; + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.Domain = NULL; + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.Domain = workgroupW; + id.DomainLength = lstrlenW(workgroupW); + id.UserLength = 0; + id.User = NULL; + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.User = test_userW; + id.UserLength = lstrlenW(test_userW); + id.Password = test_passW; /* NULL string causes a crash. */ + id.PasswordLength = 0; + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + /* Test using the ASCII structure. */ + idA.User = (unsigned char*) test_user; + idA.UserLength = strlen(test_user); + idA.Domain = (unsigned char *) workgroup; + idA.DomainLength = strlen(workgroup); + idA.Password = (unsigned char*) test_pass; + idA.PasswordLength = strlen(test_pass); + idA.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; + + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &idA, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); +} + static void test_cred_multiple_use(void) { - static char test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass", - sec_pkg_name[] = "NTLM"; SECURITY_STATUS ret; SEC_WINNT_AUTH_IDENTITY_A id; PSecPkgInfoA pkg_info = NULL; @@ -1373,6 +1452,8 @@ START_TEST(ntlm) pAcquireCredentialsHandleA && pInitializeSecurityContextA && pCompleteAuthToken && pQuerySecurityPackageInfoA) { + testAcquireCredentialsHandleW(); + if(!testAcquireCredentialsHandle()) goto cleanup; testInitializeSecurityContextFlags();

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
55
Older →

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 May 2016