January 2017 - Wine-Commits

Francois Gouget : usp10: A spelling fix in a comment.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: c705eca8cb10a47e713c69153f18f15e4889d08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c705eca8cb10a47e713c69153… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:43 2017 +0100 usp10: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3ee412a..1c8d064 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2155,7 +2155,7 @@ static inline int unicode_lex(WCHAR c) switch( type ) { case 0x0d07: /* Unknown */ - case 0x0e07: /* Unknwon */ + case 0x0e07: /* Unknown */ default: return lex_Generic; case 0x0001: case 0x0002:

1 0

Francois Gouget : mshtml/tests: Some spelling fixes in comments.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 7effdeebdae46c202c53635275391ba24121bea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7effdeebdae46c202c5363527… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:42:45 2017 +0100 mshtml/tests: Some spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 60e1bf8..8e8a662 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6539,7 +6539,7 @@ static void test_body_funs(IHTMLBodyElement *body) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); - /* Restore Originial */ + /* Restore Original */ hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); @@ -7194,7 +7194,7 @@ static void test_tr_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); - /* Restore Originial */ + /* Restore Original */ hres = IHTMLTableRow_put_bgColor(row, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); @@ -7265,7 +7265,7 @@ static void test_td_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); - /* Restore Originial */ + /* Restore Original */ hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); @@ -7510,7 +7510,7 @@ static void test_table_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); - /* Restore Originial */ + /* Restore Original */ hres = IHTMLTable_put_bgColor(table, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg);

1 0

Francois Gouget : explorerframe: A spelling fix in a comment.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 039691952e5c2dd9307ade4526100a1cbd26d86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=039691952e5c2dd9307ade452… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:45:01 2017 +0100 explorerframe: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 95b0a99..9ed392b 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -498,7 +498,7 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) INameSpaceTreeControl2_AddRef(&This->INameSpaceTreeControl2_iface); - /* Subclass the treeview to get the keybord events. */ + /* Subclass the treeview to get the keyboard events. */ This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)tv_wndproc); if(This->tv_oldwndproc)

1 0

Nikolay Sivov : comctl32/tests: Call appropriate default procedure for parent window (Valgrind).
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: dabad0e98fb79e4da9fbd063a3278255ecdb1242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabad0e98fb79e4da9fbd063a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 10:03:13 2017 +0300 comctl32/tests: Call appropriate default procedure for parent window (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5e69414..6d21b05 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -555,7 +555,10 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP } defwndproc_counter++; - ret = DefWindowProcA(hwnd, message, wParam, lParam); + if (IsWindowUnicode(hwnd)) + ret = DefWindowProcW(hwnd, message, wParam, lParam); + else + ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; return ret;

1 0

Francois Gouget : xmllite: A spelling fix in a comment.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: dcf146991babfaa6f852c4c6eaf51ac5c10af850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf146991babfaa6f852c4c6e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:56 2017 +0100 xmllite: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 460eeab..de61d13 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2466,7 +2466,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) if (!is_reader_pending(reader)) reader_clear_attrs(reader); - /* When moving from EndElement or empty element, pop its own namespace defitions */ + /* When moving from EndElement or empty element, pop its own namespace definitions */ if (nodetype == XmlNodeType_Element && reader->is_empty_element) reader_pop_ns_nodes(reader, &reader->empty_element); else if (nodetype == XmlNodeType_EndElement)

1 0

Nikolay Sivov : shell32/tests: Test valid special folder IDs with NameSpace() method.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: dba1a78a2013d845e5cf6f9abefefe450005cde0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba1a78a2013d845e5cf6f9ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 16:49:51 2017 +0300 shell32/tests: Test valid special folder IDs with NameSpace() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 61 +++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3f2d902..0c71125 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -58,6 +58,48 @@ static void init_function_pointers(void) static void test_namespace(void) { + static const ShellSpecialFolderConstants special_folders[] = + { + ssfDESKTOP, + ssfPROGRAMS, + ssfCONTROLS, + ssfPRINTERS, + ssfPERSONAL, + ssfFAVORITES, + ssfSTARTUP, + ssfRECENT, + ssfSENDTO, + ssfBITBUCKET, + ssfSTARTMENU, + ssfDESKTOPDIRECTORY, + ssfDRIVES, + ssfNETWORK, + ssfNETHOOD, + ssfFONTS, + ssfTEMPLATES, + ssfCOMMONSTARTMENU, + ssfCOMMONPROGRAMS, + ssfCOMMONSTARTUP, + ssfCOMMONDESKTOPDIR, + ssfAPPDATA, + ssfPRINTHOOD, + ssfLOCALAPPDATA, + ssfALTSTARTUP, + ssfCOMMONALTSTARTUP, + ssfCOMMONFAVORITES, + ssfINTERNETCACHE, + ssfCOOKIES, + ssfHISTORY, + ssfCOMMONAPPDATA, + ssfWINDOWS, + ssfSYSTEM, + ssfPROGRAMFILES, + ssfMYPICTURES, + ssfPROFILE, + ssfSYSTEMx86, + ssfPROGRAMFILESx86, + }; + static const WCHAR backslashW[] = {'\\',0}; static const WCHAR clsidW[] = { ':',':','{','6','4','5','F','F','0','4','0','-','5','0','8','1','-', @@ -73,7 +115,7 @@ static void test_namespace(void) FolderItem *item; VARIANT var; BSTR title, item_path; - int len; + int len, i; r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (LPVOID*)&sd); @@ -92,6 +134,21 @@ static void test_namespace(void) ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(folder == NULL, "expected NULL, got %p\n", folder); + /* test valid folder ids */ + for (i = 0; i < sizeof(special_folders)/sizeof(special_folders[0]); i++) + { + V_VT(&var) = VT_I4; + V_I4(&var) = special_folders[i]; + folder = (void*)0xdeadbeef; + r = IShellDispatch_NameSpace(sd, var, &folder); + if (special_folders[i] == ssfALTSTARTUP || special_folders[i] == ssfCOMMONALTSTARTUP) + ok(r == S_OK || broken(r == S_FALSE) /* winxp */, "Failed to get folder for index %#x, got %08x\n", special_folders[i], r); + else + ok(r == S_OK, "Failed to get folder for index %#x, got %08x\n", special_folders[i], r); + if (folder) + Folder_Release(folder); + } + V_VT(&var) = VT_I4; V_I4(&var) = -1; folder = (void*)0xdeadbeef; @@ -99,6 +156,8 @@ static void test_namespace(void) todo_wine { ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(folder == NULL, "got %p\n", folder); + if (r == S_OK) + Folder_Release(folder); } V_VT(&var) = VT_I4; V_I4(&var) = ssfPROGRAMFILES;

1 0

Francois Gouget : jscript: Make scope_push() static.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 493659e09704602784c48a35f62ac511aea181be URL: http://source.winehq.org/git/wine.git/?a=commit;h=493659e09704602784c48a35f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:46:59 2017 +0100 jscript: Make scope_push() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f958204..90e6f8f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -390,7 +390,7 @@ static inline void clear_ret(call_frame_t *frame) jsval_release(steal_ret(frame)); } -HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) +static HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) { scope_chain_t *new_scope; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3ac8169..f5b484b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -197,7 +197,6 @@ typedef struct _scope_chain_t { struct _scope_chain_t *next; } scope_chain_t; -HRESULT scope_push(scope_chain_t*,jsdisp_t*,IDispatch*,scope_chain_t**) DECLSPEC_HIDDEN; void scope_release(scope_chain_t*) DECLSPEC_HIDDEN; static inline scope_chain_t *scope_addref(scope_chain_t *scope)

1 0

Francois Gouget : dinput: Spelling and case fixes in comments.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 49d42619fec5a2555c475e27bce94e8fe7ab2faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d42619fec5a2555c475e27b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:46:18 2017 +0100 dinput: Spelling and case fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index d3fede5..0fd16ed 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -633,9 +633,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( This->effect.u.periodic.magnitude = (tsp->dwMagnitude / 10) * 32; This->effect.u.periodic.offset = (tsp->lOffset / 10) * 32; - /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on linux */ + /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on Linux */ This->effect.u.periodic.phase = (tsp->dwPhase / 36) * 65; - /* dinput uses microseconds, linux uses miliseconds */ + /* dinput uses microseconds, Linux uses milliseconds */ if (tsp->dwPeriod <= 1000) This->effect.u.periodic.period = 1; else

1 0

Francois Gouget : msi/tests: A spelling fix in a variable name.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: f0a5b139804bc1baf40fbf84a18c9751a0941598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a5b139804bc1baf40fbf84a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:42:53 2017 +0100 msi/tests: A spelling fix in a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 748d25f..10ef84a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8294,7 +8294,7 @@ static void test_emptypackage(void) static void test_MsiGetProductProperty(void) { static const WCHAR prodcode_propW[] = {'P','r','o','d','u','c','t','C','o','d','e',0}; - static const WCHAR nonexistantW[] = {'I','D','o','n','t','E','x','i','s','t',0}; + static const WCHAR nonexistentW[] = {'I','D','o','n','t','E','x','i','s','t',0}; static const WCHAR newpropW[] = {'N','e','w','P','r','o','p','e','r','t','y',0}; static const WCHAR appleW[] = {'a','p','p','l','e',0}; static const WCHAR emptyW[] = {0}; @@ -8571,7 +8571,7 @@ static void test_MsiGetProductProperty(void) size = MAX_PATH; lstrcpyW(valW, appleW); - r = MsiGetProductPropertyW(hprod, nonexistantW, valW, &size); + r = MsiGetProductPropertyW(hprod, nonexistentW, valW, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpW(valW, emptyW), "Expected \"\", got %s\n", wine_dbgstr_w(valW)); ok(size == 0, "Expected 0, got %d\n", size);

1 0

Francois Gouget : msi: Make reg_get_{multi}sz() static.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 167de4270585f8110fe2c9ca789bfac7f417eb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=167de4270585f8110fe2c9ca7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:40:10 2017 +0100 msi: Make reg_get_{multi}sz() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ce29c26..1687a28 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3350,7 +3350,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCSTR szProduct, LPCSTR szFeature ) return MsiUseFeatureExA(szProduct, szFeature, 0, 0); } -WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) +static WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) { WCHAR *ret; DWORD len, type; @@ -3359,7 +3359,7 @@ WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) return ret; } -WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) +static WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) { WCHAR *ret; DWORD len, type;

1 0