January 2017 - Wine-Commits

Anton Romanov : user32: Add OCR_RDR* cursors.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: cb4545eccdc4b15d0d3bd45dea57b2df4830c5d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4545eccdc4b15d0d3bd45de… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sat Jan 28 00:08:42 2017 -0800 user32: Add OCR_RDR* cursors. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resources/ocr_rdr2dim.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdreast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrhorz.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnorth.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnortheast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnorthwest.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsouth.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsoutheast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsouthwest.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrvert.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrwest.cur | Bin 0 -> 326 bytes dlls/user32/user32.rc | 34 +++++++++++++++++++++++++++++ 12 files changed, 34 insertions(+) diff --git a/dlls/user32/resources/ocr_rdr2dim.cur b/dlls/user32/resources/ocr_rdr2dim.cur new file mode 100644 index 0000000..0685c97 Binary files /dev/null and b/dlls/user32/resources/ocr_rdr2dim.cur differ diff --git a/dlls/user32/resources/ocr_rdreast.cur b/dlls/user32/resources/ocr_rdreast.cur new file mode 100644 index 0000000..20a548c Binary files /dev/null and b/dlls/user32/resources/ocr_rdreast.cur differ diff --git a/dlls/user32/resources/ocr_rdrhorz.cur b/dlls/user32/resources/ocr_rdrhorz.cur new file mode 100644 index 0000000..31cffb4 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrhorz.cur differ diff --git a/dlls/user32/resources/ocr_rdrnorth.cur b/dlls/user32/resources/ocr_rdrnorth.cur new file mode 100644 index 0000000..db00a53 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnorth.cur differ diff --git a/dlls/user32/resources/ocr_rdrnortheast.cur b/dlls/user32/resources/ocr_rdrnortheast.cur new file mode 100644 index 0000000..9d31be5 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnortheast.cur differ diff --git a/dlls/user32/resources/ocr_rdrnorthwest.cur b/dlls/user32/resources/ocr_rdrnorthwest.cur new file mode 100644 index 0000000..ab38893 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnorthwest.cur differ diff --git a/dlls/user32/resources/ocr_rdrsouth.cur b/dlls/user32/resources/ocr_rdrsouth.cur new file mode 100644 index 0000000..96909c2 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsouth.cur differ diff --git a/dlls/user32/resources/ocr_rdrsoutheast.cur b/dlls/user32/resources/ocr_rdrsoutheast.cur new file mode 100644 index 0000000..53dbfe3 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsoutheast.cur differ diff --git a/dlls/user32/resources/ocr_rdrsouthwest.cur b/dlls/user32/resources/ocr_rdrsouthwest.cur new file mode 100644 index 0000000..eb2a204 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsouthwest.cur differ diff --git a/dlls/user32/resources/ocr_rdrvert.cur b/dlls/user32/resources/ocr_rdrvert.cur new file mode 100644 index 0000000..019cf77 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrvert.cur differ diff --git a/dlls/user32/resources/ocr_rdrwest.cur b/dlls/user32/resources/ocr_rdrwest.cur new file mode 100644 index 0000000..d6bbe89 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrwest.cur differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 28a6c74..01fe13a 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -266,6 +266,40 @@ OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur /* @makedep: resources/ocr_pen.cur */ OCR_PEN CURSOR resources/ocr_pen.cur +/* @makedep: resources/ocr_rdrvert.cur */ +OCR_RDRVERT CURSOR resources/ocr_rdrvert.cur + +/* @makedep: resources/ocr_rdrhorz.cur */ +/* FIXME: OCR_DRAGOBJECT already uses same resource number even though cursor image + * is entirely different */ +/*OCR_RDRHORZ CURSOR resources/ocr_rdrhorz.cur*/ + +/* @makedep: resources/ocr_rdr2dim.cur */ +OCR_RDR2DIM CURSOR resources/ocr_rdr2dim.cur + +/* @makedep: resources/ocr_rdrnorth.cur */ +OCR_RDRNORTH CURSOR resources/ocr_rdrnorth.cur + +/* @makedep: resources/ocr_rdrsouth.cur */ +OCR_RDRSOUTH CURSOR resources/ocr_rdrsouth.cur + +/* @makedep: resources/ocr_rdrwest.cur */ +OCR_RDRWEST CURSOR resources/ocr_rdrwest.cur + +/* @makedep: resources/ocr_rdreast.cur */ +OCR_RDREAST CURSOR resources/ocr_rdreast.cur + +/* @makedep: resources/ocr_rdrnorthwest.cur */ +OCR_RDRNORTHWEST CURSOR resources/ocr_rdrnorthwest.cur + +/* @makedep: resources/ocr_rdrnortheast.cur */ +OCR_RDRNORTHEAST CURSOR resources/ocr_rdrnortheast.cur + +/* @makedep: resources/ocr_rdrsouthwest.cur */ +OCR_RDRSOUTHWEST CURSOR resources/ocr_rdrsouthwest.cur + +/* @makedep: resources/ocr_rdrsoutheast.cur */ +OCR_RDRSOUTHEAST CURSOR resources/ocr_rdrsoutheast.cur /****************************************************************/ /* Icons */

1 0

Aric Stewart : hidclass.sys: BSize will never be negative.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: b46e15568c90a6123ed9e55d441204422d9fb608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46e15568c90a6123ed9e55d4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 09:00:29 2017 -0600 hidclass.sys: BSize will never be negative. Found by Bruno Jesus and cppcheck. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 8064e34..ee13055 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -410,7 +410,7 @@ static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *feature_index, struct feature *feature) { - if (bSize <= 0) + if (bSize == 0) { return; }

1 0

André Hentschel : shell32: Remove dead assignments ( clang).
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 1c98bc14c95ccd6bbf25be08c3d4ffdae1685e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c98bc14c95ccd6bbf25be08c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:03 2017 +0100 shell32: Remove dead assignments (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 6aa3eec..474a1bc 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1720,7 +1720,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = lstrlenW(buf) + 1; wszApplicationName = buf; sei_tmp.lpFile = wszApplicationName; } @@ -1734,7 +1733,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len + 1); HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = len + 1; wszApplicationName = buf; sei_tmp.lpFile = wszApplicationName;

1 0

Alistair Leslie-Hughes : maintainers: Add DirectPlay section.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 22da9a5f6ea12196ed365404f0ec8c08ab2b3ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22da9a5f6ea12196ed365404f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 30 07:05:50 2017 +0000 maintainers: Add DirectPlay section. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index e5224ff..b362489 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -91,6 +91,12 @@ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/ +DirectPlay +M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> +F: dlls/dplayx/ +F: dlls/dpnet/ +F: dlls/dpwsockx/ + DirectShow P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/amstream/

1 0

André Hentschel : loadperf: Fix some spec file entries.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: d6e1600a16f241adfd673956c3f61c0fe02ec235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e1600a16f241adfd673956c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:10:57 2017 +0100 loadperf: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/loadperf/loadperf.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/loadperf/loadperf.spec b/dlls/loadperf/loadperf.spec index 06e7891..58647ca 100644 --- a/dlls/loadperf/loadperf.spec +++ b/dlls/loadperf/loadperf.spec @@ -1,6 +1,6 @@ @ stub BackupPerfRegistryToFileW -@ stdcall InstallPerfDllA(str str ptr) -@ stdcall InstallPerfDllW(wstr wstr ptr) +@ stdcall InstallPerfDllA(str str long) +@ stdcall InstallPerfDllW(wstr wstr long) @ stub LoadMofFromInstalledServiceA @ stub LoadMofFromInstalledServiceW @ stdcall LoadPerfCounterTextStringsA(str long)

1 0

Nikolay Sivov : regedit: Always show treeview selection.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 7dea6fef61a51af0be16444e9d95f63bea807728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dea6fef61a51af0be16444e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 28 16:37:51 2017 +0300 regedit: Always show treeview selection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 07e9b41..9d9fa6d 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -696,7 +696,8 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, TreeView, - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | + TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, ULongToHandle(id), hInst, NULL); SendMessageW(hwndTV, TVM_SETUNICODEFORMAT, TRUE, 0);

1 0

Bruno Jesus : shlwapi/tests: Test NULL handle duplication in SHMapHandle() .
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 57b83e1459316ff3e04809f2f8655e458a14322e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b83e1459316ff3e04809f2f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 21:42:28 2017 -0200 shlwapi/tests: Test NULL handle duplication in SHMapHandle(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index ad3048b..004c75d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -568,6 +568,12 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); /* test SHMapHandle */ + SetLastError(0xdeadbeef); + hmem2 = pSHMapHandle(NULL, procid, GetCurrentProcessId(), 0, 0); + ok(hmem2 == NULL, "expected NULL, got new handle\n"); +todo_wine + ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); + hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); /* It seems like Windows Vista/2008 uses a different internal implementation

1 0

André Hentschel : cmd: Remove dead assignments (clang ).
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: c9903aedcbdbba4424344f4a7d9bd7e8efe61d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9903aedcbdbba4424344f4a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:04 2017 +0100 cmd: Remove dead assignments (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f3dbe3a..7301f54 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4109,7 +4109,7 @@ void WCMD_setshow_env (WCHAR *s) { if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ WINE_TRACE("set /p: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), wine_dbgstr_w(string)); - status = SetEnvironmentVariableW(s, string); + SetEnvironmentVariableW(s, string); } /* See if /A supplied, and if so calculate the results of all the expressions */ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 87f5387..1aa3c1c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2527,8 +2527,6 @@ int wmain (int argc, WCHAR *argvW[]) /* Otherwise we now need to look in the path to see if we can find it */ } else { - p = thisArg + strlenW(thisArg); - /* Does file exist with this name? */ if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string));

1 0

Zebediah Figura : storage.dll16: Fix bad type in IStorage16_fnOpenStorage.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 289d032e766fca240e02e967224f823a4a4c6fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289d032e766fca240e02e9672… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 28 15:48:34 2017 -0600 storage.dll16: Fix bad type in IStorage16_fnOpenStorage. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index dcaff5c..74aa7f9 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1848,7 +1848,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg) { IStorage16Impl *This = impl_from_IStorage16(iface); - IStream16Impl* lpstg; + IStorage16Impl *lpstg; WCHAR name[33]; int newpps; @@ -1869,12 +1869,12 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, name, sizeof(name)/sizeof(WCHAR)); newpps = STORAGE_look_for_named_pps(&lpstg->str,This->stde.pps_dir,name); if (newpps==-1) { - IStream16_fnRelease(&lpstg->IStream16_iface); + IStorage16_fnRelease(&lpstg->IStorage16_iface); return E_FAIL; } if (1!=STORAGE_get_pps_entry(&lpstg->str,newpps,&(lpstg->stde))) { - IStream16_fnRelease(&lpstg->IStream16_iface); + IStorage16_fnRelease(&lpstg->IStorage16_iface); return E_FAIL; } lpstg->ppsent = newpps;

1 0

André Hentschel : server: Remove dead assignment ( clang).
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 6b85b31b00b06cb810d6dc333160221fbe1940e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b85b31b00b06cb810d6dc333… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:07 2017 +0100 server: Remove dead assignment (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/token.c b/server/token.c index ca12813..8c5e836 100644 --- a/server/token.c +++ b/server/token.c @@ -1080,8 +1080,7 @@ DECL_HANDLER(adjust_token_privileges) if (req->disable_all) token_disable_privileges( token ); else - modified_priv_count = token_adjust_privileges( token, privs, - priv_count, modified_privs, modified_priv_count ); + token_adjust_privileges( token, privs, priv_count, modified_privs, modified_priv_count ); release_object( token ); }

1 0