January 2017 - Wine-Commits

Michael Stefaniuc : transl: Add support to parse MENUEX resources.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: tools Branch: master Commit: 5e3de6104cd9457679c56833eb03a8fb8baf6e8d URL: http://source.winehq.org/git/tools.git/?a=commit;h=5e3de6104cd9457679c56833… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 10:12:58 2017 +0100 transl: Add support to parse MENUEX resources. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/lib_res.php | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/transl/lib_res.php b/transl/lib_res.php index caa87b4..317c411 100644 --- a/transl/lib_res.php +++ b/transl/lib_res.php @@ -270,6 +270,7 @@ function load_resource(&$resources, $type, $id, $langid, &$res) switch ($type) { case 4: /* RT_MENU */ + case 260: /* MENUEX */ $res = new MenuResource($resdata[0], $resdata[1]); return TRUE; case 5: /* RT_DIALOG */ @@ -611,6 +612,32 @@ class MenuResource extends Resource while (!($item["resinfo"] & $CONSTS["MF_END"])); } + function parse_menuex(&$data, $level) + { + global $CONSTS; + do + { + $item = array(); + $item["level"] = $level; + $item["type"] = get_dword($data); + $item["state"] = get_dword($data); + $item["id"] = get_dword($data); + $len = strlen($data); + $item["resinfo"] = get_word($data); + $item["text"] = get_string_nul($data); + if (($len - strlen($data)) & 3) /* DWORD padding */ + $data = substr($data, 2); + + $this->items[] = $item; + if ($item["resinfo"] & 0x01) + { + $dummy = get_dword($data); /* HelpId */ + $this->parse_menuex($data, $level + 1); + } + } + while (!($item["resinfo"] & $CONSTS["MF_END"])); + } + function MenuResource($header, $data) { $this->Resource($header); @@ -622,8 +649,10 @@ class MenuResource extends Resource if ($version == 0) $this->parse_menu($data, 0); + else if ($version == 1) + $this->parse_menuex($data, 0); else - die("Unsupported version $version"); + die("Unsupported version $version\n"); // echo urlencode($data); if (strlen($data) > 0)

1 0

Michael Stefaniuc : transl: Add some '\n' to die() strings.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: tools Branch: master Commit: 066dbb8c79bc2ad994a2564f90ef25e0075ffd40 URL: http://source.winehq.org/git/tools.git/?a=commit;h=066dbb8c79bc2ad994a2564f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 10:13:54 2017 +0100 transl: Add some '\n' to die() strings. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/lib_res.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/transl/lib_res.php b/transl/lib_res.php index 317c411..fe64354 100644 --- a/transl/lib_res.php +++ b/transl/lib_res.php @@ -17,7 +17,7 @@ $CONSTS["BS_MULTILINE"] = 0x2000; function get_byte(&$data) { if (strlen($data) < 1) - die("not enough data"); + die("not enough data\n"); $cx = unpack("Cc", $data); $data = substr($data, 1); return $cx["c"]; @@ -26,7 +26,7 @@ function get_byte(&$data) function get_word(&$data) { if (strlen($data) < 2) - die("not enough data"); + die("not enough data\n"); $cx = unpack("vc", $data); $data = substr($data, 2); return $cx["c"]; @@ -35,7 +35,7 @@ function get_word(&$data) function get_dword(&$data) { if (strlen($data) < 4) - die("not enough data"); + die("not enough data\n"); $cx = unpack("Vc", $data); $data = substr($data, 4); return $cx["c"]; @@ -48,7 +48,7 @@ function get_stringorid_asascii($data, &$pos) if ((ord($data[$pos]) == 0xff) && (ord($data[$pos + 1]) == 0xff)) { if ($len < 4) - die("not enough data"); + die("not enough data\n"); $pos += 4; return (ord($data[$pos - 2]) + (ord($data[$pos - 1]) << 8)); } @@ -65,7 +65,7 @@ function get_stringorid_asascii($data, &$pos) $pos = $i + 2; if ($pos >= $len) - die("not enough data"); + die("not enough data\n"); return $ret; } @@ -78,7 +78,7 @@ function get_stringorid($data, &$pos, $magic = 0xffff) if ((ord($data[$pos]) == $magic >> 8) && (ord($data[$pos + 1]) == ($magic & 0xff))) { if ($len < 4) - die("not enough data"); + die("not enough data\n"); $pos += 4; return (ord($data[$pos - 2]) + (ord($data[$pos - 1]) << 8)); } @@ -92,7 +92,7 @@ function get_stringorid($data, &$pos, $magic = 0xffff) $pos = $i + 2; if ($pos >= $len) - die("not enough data"); + die("not enough data\n"); return $ret; } @@ -284,7 +284,7 @@ function load_resource(&$resources, $type, $id, $langid, &$res) $res = new MessageTable($resdata[0], $resdata[1], $id); return TRUE; default: - die("Unhandled resource type $type"); + die("Unhandled resource type $type\n"); } } @@ -296,7 +296,7 @@ class ResFile { $this->file = fopen("$path", "rb"); if ($this->file == NULL) - die("Couldn't open resource file"); + die("Couldn't open resource file\n"); } function enumResources($callback, $lparam = 0) @@ -311,7 +311,7 @@ class ResFile if ($len == 0) break; if ($len < 8) - die("Couldn't read header"); + die("Couldn't read header\n"); $header = unpack("VresSize/VheaderSize", $data); assert($header["headerSize"] > 8); @@ -319,7 +319,7 @@ class ResFile $len = $header["headerSize"] - 8; $data = fread($this->file, $len); if (strlen($data) < $len) - die("Couldn't read header"); + die("Couldn't read header\n"); $strpos = 0; $header["type"] = get_stringorid_asascii($data, $strpos); @@ -351,7 +351,7 @@ class ResFile if ($len == 0) break; if ($len < 8) - die("Couldn't read header"); + die("Couldn't read header\n"); $header = unpack("Va/Vb", $data); $resSize = $header["a"]; @@ -906,7 +906,7 @@ class DialogResource extends Resource $data = substr($data, $pos); $cbExtra = get_word($data); if ($cbExtra > strlen($data)) - die("Not enough data to skip cbExtra"); + die("Not enough data to skip cbExtra\n"); $data = substr($data, $cbExtra); $this->items[] = $item; }

1 0

Marcus Meissner : shell32/tests: Fixed CharLowerBuffA size.
by Alexandre Julliard Jan. 16, 2017

Jan. 16, 2017

Module: wine Branch: master Commit: c3e6ecde36692d03dc360200c7a7044a02c4a392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e6ecde36692d03dc360200c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 13 23:42:51 2017 +0100 shell32/tests: Fixed CharLowerBuffA size. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index b789db4..fdf2b14 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1276,7 +1276,7 @@ todo_wine { index = 5000; strcpy(pathA, "user32.dll"); hicon = ExtractAssociatedIconA(NULL, pathA, &index); - CharLowerBuffA(pathA, -1); + CharLowerBuffA(pathA, strlen(pathA)); todo_wine { ok(hicon != NULL, "Got icon %p\n", hicon); ok(!!strstr(pathA, "shell32.dll"), "Unexpected path %s\n", pathA); @@ -1288,7 +1288,7 @@ todo_wine { index = 0xcaca; strcpy(pathA, "dummy.exe"); hicon = ExtractAssociatedIconA(NULL, pathA, &index); - CharLowerBuffA(pathA, -1); + CharLowerBuffA(pathA, strlen(pathA)); todo_wine { ok(hicon != NULL, "Got icon %p\n", hicon); ok(!!strstr(pathA, "shell32.dll"), "Unexpected path %s\n", pathA);

1 0

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

Jan. 16, 2017

Module: wine Branch: master Commit: 9ae26670e3746cd741f209718483318201322d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae26670e3746cd741f209718… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 15 15:17:37 2017 +0100 regedit: Remove dead assignment (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index ed3ea9f..43c581b 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -475,7 +475,7 @@ static BOOL CopyKeyName(HWND hWnd, LPCWSTR keyName) LPVOID pLoc = GlobalLock(hClipData); lstrcpyW(pLoc, keyName); GlobalUnlock(hClipData); - hClipData = SetClipboardData(CF_UNICODETEXT, hClipData); + SetClipboardData(CF_UNICODETEXT, hClipData); } else { /* error emptying clipboard*/

1 0

Michael Müller : wined3d: Do not set DDCAPS_ALIGNBOUNDARYSRC caps for ddraw.
by Alexandre Julliard Jan. 16, 2017

Jan. 16, 2017

Module: wine Branch: master Commit: 5fd9344362d43d13ee3131fa5619f25d57dd5f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd9344362d43d13ee3131fa5… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jan 16 15:07:15 2017 +0100 wined3d: Do not set DDCAPS_ALIGNBOUNDARYSRC caps for ddraw. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3783d49..22e0fee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5806,8 +5806,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDCAPS_CANCLIP | WINEDDCAPS_CANCLIPSTRETCHED | WINEDDCAPS_COLORKEY | - WINEDDCAPS_COLORKEYHWASSIST | - WINEDDCAPS_ALIGNBOUNDARYSRC; + WINEDDCAPS_COLORKEYHWASSIST; /* Fill the ddraw caps structure */ caps->ddraw_caps.caps = WINEDDCAPS_GDI |

1 0

Michael Müller : dsound: Respect return value of callback in DirectSoundEnumerateA/W.
by Alexandre Julliard Jan. 16, 2017

Jan. 16, 2017

Module: wine Branch: master Commit: c8e0f5855294b7456a278e37ad18de2c7c4adbc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e0f5855294b7456a278e37a… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jan 16 14:55:46 2017 +0100 dsound: Respect return value of callback in DirectSoundEnumerateA/W. Fixes a regression introduced in c8c6cc97bcaab5441ea200041bb7cc99c4ba01fb. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 112ce78..796fe1e 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -510,7 +510,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, } if(device != defdev){ - send_device(device, &guids[n], cb, user); + keep_going = send_device(device, &guids[n], cb, user); ++n; }

1 0

Sebastian Lackner : include: Avoid duplicate definition of REFERENCE_TIME.
by Alexandre Julliard Jan. 16, 2017

Jan. 16, 2017

Module: wine Branch: master Commit: d7951abc72254eacaa8cbbeb8ff43c7b011f25e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7951abc72254eacaa8cbbeb8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jan 16 15:00:12 2017 +0100 include: Avoid duplicate definition of REFERENCE_TIME. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dmdls.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dmdls.h b/include/dmdls.h index b40ef88..ea7dcf0 100644 --- a/include/dmdls.h +++ b/include/dmdls.h @@ -30,7 +30,10 @@ typedef LONG PCENT; typedef LONG PERCENT; typedef LONG TCENT; +#ifndef REFERENCE_TIME_DEFINED +#define REFERENCE_TIME_DEFINED typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME; +#endif /***************************************************************************** * FOURCC definition

1 0

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

Jan. 16, 2017

Module: wine Branch: master Commit: fa54b5d37679ff69d6356a2c23947d927fed1a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa54b5d37679ff69d6356a2c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 15 15:17:27 2017 +0100 oleview: Remove dead assignments (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/oleview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 350f6ad..f1713b8 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -159,7 +159,7 @@ static void CopyClsid(HTREEITEM item) lstrcpyW(pLoc, ((ITEM_INFO *)tvi.lParam)->clsid); GlobalUnlock(hClipData); - hClipData = SetClipboardData(CF_UNICODETEXT, hClipData); + SetClipboardData(CF_UNICODETEXT, hClipData); CloseClipboard(); } } @@ -184,7 +184,7 @@ static void CopyHTMLTag(HTREEITEM item) ((ITEM_INFO *)tvi.lParam)->clsid[clsidLen] = '}'; GlobalUnlock(hClipData); - hClipData = SetClipboardData(CF_UNICODETEXT, hClipData); + SetClipboardData(CF_UNICODETEXT, hClipData); CloseClipboard(); } }

1 0

André Hentschel : winebrowser: Fix allocation count ( Coverity).
by Alexandre Julliard Jan. 16, 2017

Jan. 16, 2017

Module: wine Branch: master Commit: 1c1c99ff23d16b07ea394c999eb530c0c072aa9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1c99ff23d16b07ea394c999… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 15 15:17:43 2017 +0100 winebrowser: Fix allocation count (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 4ec1d14..304ac14 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -82,7 +82,7 @@ static int launch_app( const WCHAR *candidates, const WCHAR *argv1 ) { WCHAR **args = CommandLineToArgvW( candidates, &count ); - if (!(argv_new = HeapAlloc( GetProcessHeap(), 0, (count + 1) * sizeof(*argv_new) ))) break; + if (!(argv_new = HeapAlloc( GetProcessHeap(), 0, (count + 2) * sizeof(*argv_new) ))) break; for (i = 0; i < count; i++) argv_new[i] = strdup_unixcp( args[i] ); argv_new[count] = cmdline; argv_new[count + 1] = NULL;

1 0

Huw Davies : secur32/tests: Fix test failures on Windows 10.
by Alexandre Julliard Jan. 16, 2017

Jan. 16, 2017

Module: wine Branch: master Commit: 7a0c8434258e3231a0f70012b04aaf5c3656c3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0c8434258e3231a0f70012b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 16 15:11:16 2017 +0000 secur32/tests: Fix test failures on Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index ead0e8c..a858488 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -819,7 +819,8 @@ todo_wine status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); - ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(status == SEC_E_INCOMPLETE_MESSAGE || status == SEC_E_INVALID_TOKEN, + "Got unexpected status %#x.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); @@ -827,7 +828,8 @@ todo_wine status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); - ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(status == SEC_E_INCOMPLETE_MESSAGE || status == SEC_E_INVALID_TOKEN, + "Got unexpected status %#x.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n");

1 0