September 2017 - Wine-Commits

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_SetOpacity().
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: aa7d5a84146b260b4a3a0c672133e9bae0fdb260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7d5a84146b260b4a3a0c672… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:36 2017 +0200 d2d1: Implement d2d_linear_gradient_brush_SetOpacity(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index cc1a020..b5f7418 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -384,7 +384,11 @@ static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetFactory(ID2D1LinearGr static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetOpacity(ID2D1LinearGradientBrush *iface, float opacity) { - FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; } static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetTransform(ID2D1LinearGradientBrush *iface,

1 0

Alexandre Julliard : ntdll: No longer store the mapping handle with the view.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 5fa8713ddc86ac4202f75dcadd0822a5d1017b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa8713ddc86ac4202f75dcad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 15:03:38 2017 +0200 ntdll: No longer store the mapping handle with the view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 6 ------ dlls/ntdll/virtual.c | 31 +++++++++++-------------------- include/wine/server_protocol.h | 4 +--- server/mapping.c | 15 ++------------- server/protocol.def | 1 - server/request.h | 5 ++--- server/trace.c | 1 - 7 files changed, 16 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fa8713ddc86ac4202f75…

1 0

Nikolay Sivov : gdi32: Remove runtime check for FT_Set_Charmap().
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 2bd5f6e0577311ec642acad11cb31b891006f689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd5f6e0577311ec642acad11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 10:13:46 2017 +0100 gdi32: Remove runtime check for FT_Set_Charmap(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 81 +++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 13edef6..83ca6e2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -159,7 +159,6 @@ MAKE_FUNCPTR(FT_Outline_Get_CBox); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); MAKE_FUNCPTR(FT_Render_Glyph); -MAKE_FUNCPTR(FT_Select_Charmap); MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); MAKE_FUNCPTR(FT_Vector_Length); @@ -4139,7 +4138,6 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) LOAD_FUNCPTR(FT_Render_Glyph) - LOAD_FUNCPTR(FT_Select_Charmap) LOAD_FUNCPTR(FT_Set_Charmap) LOAD_FUNCPTR(FT_Set_Pixel_Sizes) LOAD_FUNCPTR(FT_Vector_Length) @@ -5059,56 +5057,51 @@ static BOOL create_child_font_list(GdiFont *font) static BOOL select_charmap(FT_Face ft_face, FT_Encoding encoding) { FT_Error ft_err = FT_Err_Invalid_CharMap_Handle; + FT_CharMap cmap0, cmap1, cmap2, cmap3, cmap_def; + FT_Int i; - if (pFT_Set_Charmap) - { - FT_Int i; - FT_CharMap cmap0, cmap1, cmap2, cmap3, cmap_def; - - cmap0 = cmap1 = cmap2 = cmap3 = cmap_def = NULL; + cmap0 = cmap1 = cmap2 = cmap3 = cmap_def = NULL; - for (i = 0; i < ft_face->num_charmaps; i++) + for (i = 0; i < ft_face->num_charmaps; i++) + { + if (ft_face->charmaps[i]->encoding == encoding) { - if (ft_face->charmaps[i]->encoding == encoding) - { - TRACE("found cmap with platform_id %u, encoding_id %u\n", - ft_face->charmaps[i]->platform_id, ft_face->charmaps[i]->encoding_id); + TRACE("found cmap with platform_id %u, encoding_id %u\n", + ft_face->charmaps[i]->platform_id, ft_face->charmaps[i]->encoding_id); - switch (ft_face->charmaps[i]->platform_id) - { - default: - cmap_def = ft_face->charmaps[i]; - break; - case 0: /* Apple Unicode */ - cmap0 = ft_face->charmaps[i]; - break; - case 1: /* Macintosh */ - cmap1 = ft_face->charmaps[i]; - break; - case 2: /* ISO */ - cmap2 = ft_face->charmaps[i]; - break; - case 3: /* Microsoft */ - cmap3 = ft_face->charmaps[i]; - break; - } + switch (ft_face->charmaps[i]->platform_id) + { + default: + cmap_def = ft_face->charmaps[i]; + break; + case 0: /* Apple Unicode */ + cmap0 = ft_face->charmaps[i]; + break; + case 1: /* Macintosh */ + cmap1 = ft_face->charmaps[i]; + break; + case 2: /* ISO */ + cmap2 = ft_face->charmaps[i]; + break; + case 3: /* Microsoft */ + cmap3 = ft_face->charmaps[i]; + break; } - - if (cmap3) /* prefer Microsoft cmap table */ - ft_err = pFT_Set_Charmap(ft_face, cmap3); - else if (cmap1) - ft_err = pFT_Set_Charmap(ft_face, cmap1); - else if (cmap2) - ft_err = pFT_Set_Charmap(ft_face, cmap2); - else if (cmap0) - ft_err = pFT_Set_Charmap(ft_face, cmap0); - else if (cmap_def) - ft_err = pFT_Set_Charmap(ft_face, cmap_def); } - return ft_err == FT_Err_Ok; + + if (cmap3) /* prefer Microsoft cmap table */ + ft_err = pFT_Set_Charmap(ft_face, cmap3); + else if (cmap1) + ft_err = pFT_Set_Charmap(ft_face, cmap1); + else if (cmap2) + ft_err = pFT_Set_Charmap(ft_face, cmap2); + else if (cmap0) + ft_err = pFT_Set_Charmap(ft_face, cmap0); + else if (cmap_def) + ft_err = pFT_Set_Charmap(ft_face, cmap_def); } - return pFT_Select_Charmap(ft_face, encoding) == FT_Err_Ok; + return ft_err == FT_Err_Ok; }

1 0

Vincent Povirk : shell32: Set shelllink path when setting pidl.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 3615db9a005517a32ccbfcf3f296d298135c9ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3615db9a005517a32ccbfcf3f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 25 15:35:21 2017 -0500 shell32: Set shelllink path when setting pidl. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 13 +++++++++++++ dlls/shell32/tests/shelllink.c | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 81d76d9..ba33477 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1680,6 +1680,7 @@ static HRESULT WINAPI IShellLinkW_fnGetIDList(IShellLinkW * iface, LPITEMIDLIST static HRESULT WINAPI IShellLinkW_fnSetIDList(IShellLinkW * iface, LPCITEMIDLIST pidl) { IShellLinkImpl *This = impl_from_IShellLinkW(iface); + WCHAR path[MAX_PATH]; TRACE("(%p)->(pidl=%p)\n",This, pidl); @@ -1689,6 +1690,18 @@ static HRESULT WINAPI IShellLinkW_fnSetIDList(IShellLinkW * iface, LPCITEMIDLIST if( !This->pPidl ) return E_FAIL; + HeapFree( GetProcessHeap(), 0, This->sPath ); + This->sPath = NULL; + + if ( SHGetPathFromIDListW( pidl, path ) ) + { + This->sPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(path)+1)*sizeof(WCHAR)); + if (!This->sPath) + return E_OUTOFMEMORY; + + lstrcpyW(This->sPath, path); + } + This->bDirty = TRUE; return S_OK; diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index ba73e94..7326516 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -239,7 +239,6 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r == S_OK, "GetPath failed (0x%08x)\n", r); - todo_wine ok(lstrcmpiA(buffer, mypath)==0, "GetPath returned '%s'\n", buffer); }

1 0

Vincent Povirk : shell32: IShellLink::GetPath returns S_FALSE if there' s no path.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 94378704f821c13a8a4452fe0ec5daf74c5d022a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94378704f821c13a8a4452fe0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 25 15:35:20 2017 -0500 shell32: IShellLink::GetPath returns S_FALSE if there's no path. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 12 +++++++++--- dlls/shell32/tests/shelllink.c | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 3ac6364..81d76d9 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1254,6 +1254,7 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA *iface, LPSTR pszFile, I WIN32_FIND_DATAA *pfd, DWORD fFlags) { IShellLinkImpl *This = impl_from_IShellLinkA(iface); + HRESULT res = S_OK; TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath)); @@ -1263,13 +1264,15 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA *iface, LPSTR pszFile, I if (cchMaxPath) pszFile[0] = 0; - if (This->sPath) + if (This->sPath && This->sPath[0]) WideCharToMultiByte( CP_ACP, 0, This->sPath, -1, pszFile, cchMaxPath, NULL, NULL); + else + res = S_FALSE; if (pfd) FIXME("(%p): WIN32_FIND_DATA is not yet filled.\n", This); - return S_OK; + return res; } static HRESULT WINAPI IShellLinkA_fnGetIDList(IShellLinkA *iface, LPITEMIDLIST *ppidl) @@ -1639,6 +1642,7 @@ static ULONG WINAPI IShellLinkW_fnRelease(IShellLinkW * iface) static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile,INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags) { IShellLinkImpl *This = impl_from_IShellLinkW(iface); + HRESULT res = S_OK; TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath)); @@ -1650,10 +1654,12 @@ static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile, pszFile[0] = 0; if (This->sPath) lstrcpynW( pszFile, This->sPath, cchMaxPath ); + else + res = S_FALSE; if (pfd) FIXME("(%p): WIN32_FIND_DATA is not yet filled.\n", This); - return S_OK; + return res; } static HRESULT WINAPI IShellLinkW_fnGetIDList(IShellLinkW * iface, LPITEMIDLIST * ppidl) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index ad254c8..ba73e94 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -156,7 +156,7 @@ static void test_get_set(void) /* Test Getting / Setting the path */ strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); - todo_wine ok(r == S_FALSE || broken(r == S_OK) /* NT4/W2K */, "GetPath failed (0x%08x)\n", r); + ok(r == S_FALSE || broken(r == S_OK) /* NT4/W2K */, "GetPath failed (0x%08x)\n", r); ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, @@ -177,7 +177,7 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); - todo_wine ok(r == S_FALSE, "GetPath failed (0x%08x)\n", r); + ok(r == S_FALSE, "GetPath failed (0x%08x)\n", r); ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); /* Win98 returns S_FALSE, but WinXP returns S_OK */

1 0

Vincent Povirk : shell32: Support SFGAO_LINK in unix shell namespace.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: a796bcaa7fe22a6ce777ad3573121dc75cf37f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a796bcaa7fe22a6ce777ad357… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 25 15:35:19 2017 -0500 shell32: Support SFGAO_LINK in unix shell namespace. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 709e822..e74e4db 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1140,7 +1140,7 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci UINT i; *attrs = SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANLINK | SFGAO_CANRENAME | SFGAO_CANDELETE | - SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSTEM; + SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSTEM | SFGAO_LINK; lstrcpyA(szAbsolutePath, This->m_pszPath); pszRelativePath = szAbsolutePath + lstrlenA(szAbsolutePath); for (i=0; i<cidl; i++) { @@ -1158,6 +1158,13 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci SFGAO_STORAGEANCESTOR | SFGAO_STORAGE; else *attrs |= SFGAO_STREAM; + if ((*attrs & SFGAO_LINK)) + { + char ext[MAX_PATH]; + + if (!_ILGetExtension(apidl[i], ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) + *attrs &= ~SFGAO_LINK; + } } }

1 0

Vincent Povirk : shell32: Add support for find data in IShellLink:GetPath.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 8a46b9e5d198c7cf46508d9ab78f804861ee48e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a46b9e5d198c7cf46508d9ab… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 25 15:35:23 2017 -0500 shell32: Add support for find data in IShellLink:GetPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 66 ++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shelllink.c | 33 +++++++++++++++++++++ 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index ba33477..40fab4d 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1270,7 +1270,39 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA *iface, LPSTR pszFile, I else res = S_FALSE; - if (pfd) FIXME("(%p): WIN32_FIND_DATA is not yet filled.\n", This); + if (pfd) + { + memset(pfd, 0, sizeof(*pfd)); + + if (res == S_OK) + { + char path[MAX_PATH]; + WIN32_FILE_ATTRIBUTE_DATA fad; + + WideCharToMultiByte(CP_ACP, 0, This->sPath, -1, path, MAX_PATH, NULL, NULL); + + if (GetFileAttributesExW(This->sPath, GetFileExInfoStandard, &fad)) + { + pfd->dwFileAttributes = fad.dwFileAttributes; + pfd->ftCreationTime = fad.ftCreationTime; + pfd->ftLastAccessTime = fad.ftLastAccessTime; + pfd->ftLastWriteTime = fad.ftLastWriteTime; + pfd->nFileSizeHigh = fad.nFileSizeHigh; + pfd->nFileSizeLow = fad.nFileSizeLow; + } + + lstrcpyA(pfd->cFileName, PathFindFileNameA(path)); + + if (GetShortPathNameA(path, path, MAX_PATH)) + { + lstrcpyA(pfd->cAlternateFileName, PathFindFileNameA(path)); + } + } + + TRACE("attr 0x%08x size 0x%08x%08x name %s shortname %s\n", pfd->dwFileAttributes, + pfd->nFileSizeHigh, pfd->nFileSizeLow, wine_dbgstr_a(pfd->cFileName), + wine_dbgstr_a(pfd->cAlternateFileName)); + } return res; } @@ -1657,7 +1689,37 @@ static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile, else res = S_FALSE; - if (pfd) FIXME("(%p): WIN32_FIND_DATA is not yet filled.\n", This); + if (pfd) + { + memset(pfd, 0, sizeof(*pfd)); + + if (res == S_OK) + { + WCHAR path[MAX_PATH]; + WIN32_FILE_ATTRIBUTE_DATA fad; + + if (GetFileAttributesExW(This->sPath, GetFileExInfoStandard, &fad)) + { + pfd->dwFileAttributes = fad.dwFileAttributes; + pfd->ftCreationTime = fad.ftCreationTime; + pfd->ftLastAccessTime = fad.ftLastAccessTime; + pfd->ftLastWriteTime = fad.ftLastWriteTime; + pfd->nFileSizeHigh = fad.nFileSizeHigh; + pfd->nFileSizeLow = fad.nFileSizeLow; + } + + lstrcpyW(pfd->cFileName, PathFindFileNameW(This->sPath)); + + if (GetShortPathNameW(This->sPath, path, MAX_PATH)) + { + lstrcpyW(pfd->cAlternateFileName, PathFindFileNameW(path)); + } + } + + TRACE("attr 0x%08x size 0x%08x%08x name %s shortname %s\n", pfd->dwFileAttributes, + pfd->nFileSizeHigh, pfd->nFileSizeLow, wine_dbgstr_w(pfd->cFileName), + wine_dbgstr_w(pfd->cAlternateFileName)); + } return res; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 461d92b..6f12fb2 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -105,6 +105,7 @@ static void test_get_set(void) IShellLinkW *slW = NULL; char mypath[MAX_PATH]; char buffer[INFOTIPSIZE]; + WIN32_FIND_DATAA finddata; LPITEMIDLIST pidl, tmp_pidl; const char * str; int i; @@ -160,6 +161,14 @@ static void test_get_set(void) ok(r == S_FALSE || broken(r == S_OK) /* NT4/W2K */, "GetPath failed (0x%08x)\n", r); ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); + strcpy(buffer,"garbage"); + memset(&finddata, 0xaa, sizeof(finddata)); + r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), &finddata, SLGP_RAWPATH); + ok(r == S_FALSE || broken(r == S_OK) /* NT4/W2K */, "GetPath failed (0x%08x)\n", r); + ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); + ok(finddata.dwFileAttributes == 0, "unexpected attributes %x\n", finddata.dwFileAttributes); + ok(finddata.cFileName[0] == 0, "unexpected filename '%s'\n", finddata.cFileName); + CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&slW); if (!slW /* Win9x */ || !pGetLongPathNameA /* NT4 */) @@ -191,6 +200,14 @@ static void test_get_set(void) ok(r == S_OK, "GetPath failed (0x%08x)\n", r); ok(lstrcmpiA(buffer,str)==0, "GetPath returned '%s'\n", buffer); + strcpy(buffer,"garbage"); + memset(&finddata, 0xaa, sizeof(finddata)); + r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), &finddata, SLGP_RAWPATH); + ok(r == S_OK, "GetPath failed (0x%08x)\n", r); + ok(lstrcmpiA(buffer,str)==0, "GetPath returned '%s'\n", buffer); + ok(finddata.dwFileAttributes == 0, "unexpected attributes %x\n", finddata.dwFileAttributes); + ok(lstrcmpiA(finddata.cFileName, "file") == 0, "unexpected filename '%s'\n", finddata.cFileName); + /* Get some real path to play with */ GetWindowsDirectoryA( mypath, sizeof(mypath)-12 ); strcat(mypath, "\\regedit.exe"); @@ -241,6 +258,14 @@ static void test_get_set(void) r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r == S_OK, "GetPath failed (0x%08x)\n", r); ok(lstrcmpiA(buffer, mypath)==0, "GetPath returned '%s'\n", buffer); + + strcpy(buffer,"garbage"); + memset(&finddata, 0xaa, sizeof(finddata)); + r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), &finddata, SLGP_RAWPATH); + ok(r == S_OK, "GetPath failed (0x%08x)\n", r); + ok(lstrcmpiA(buffer, mypath)==0, "GetPath returned '%s'\n", buffer); + ok(finddata.dwFileAttributes != 0, "unexpected attributes %x\n", finddata.dwFileAttributes); + ok(lstrcmpiA(finddata.cFileName, "regedit.exe") == 0, "unexpected filename '%s'\n", finddata.cFileName); } if (pSHGetFolderLocation) @@ -258,6 +283,14 @@ static void test_get_set(void) ok(r == S_FALSE, "GetPath failed (0x%08x)\n", r); ok(buffer[0] == 0, "GetPath returned '%s'\n", buffer); + strcpy(buffer,"garbage"); + memset(&finddata, 0xaa, sizeof(finddata)); + r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), &finddata, SLGP_RAWPATH); + ok(r == S_FALSE, "GetPath failed (0x%08x)\n", r); + ok(buffer[0] == 0, "GetPath returned '%s'\n", buffer); + ok(finddata.dwFileAttributes == 0, "unexpected attributes %x\n", finddata.dwFileAttributes); + ok(finddata.cFileName[0] == 0, "unexpected filename '%s'\n", finddata.cFileName); + pILFree(pidl_controls); }

1 0

Vincent Povirk : shell32/tests: Setting a PIDL with no path resets the path.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: aa37e696cb7868382d94c14b8f4dd53ef39b94fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa37e696cb7868382d94c14b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 25 15:35:22 2017 -0500 shell32/tests: Setting a PIDL with no path resets the path. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 7326516..461d92b 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -39,6 +39,7 @@ static void (WINAPI *pILFree)(LPITEMIDLIST); static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); +static HRESULT (WINAPI *pSHGetFolderLocation)(HWND,INT,HANDLE,DWORD,PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *); static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); @@ -242,6 +243,24 @@ static void test_get_set(void) ok(lstrcmpiA(buffer, mypath)==0, "GetPath returned '%s'\n", buffer); } + if (pSHGetFolderLocation) + { + LPITEMIDLIST pidl_controls; + + r = pSHGetFolderLocation(NULL, CSIDL_CONTROLS, NULL, 0, &pidl_controls); + ok(r == S_OK, "SHGetFolderLocation failed (0x%08x)\n", r); + + r = IShellLinkA_SetIDList(sl, pidl_controls); + ok(r == S_OK, "SetIDList failed (0x%08x)\n", r); + + strcpy(buffer,"garbage"); + r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); + ok(r == S_FALSE, "GetPath failed (0x%08x)\n", r); + ok(buffer[0] == 0, "GetPath returned '%s'\n", buffer); + + pILFree(pidl_controls); + } + /* test path with quotes (IShellLinkA_SetPath returns S_FALSE on W2K and below and S_OK on XP and above */ r = IShellLinkA_SetPath(sl, "\"c:\\nonexistent\\file\""); ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); @@ -1407,6 +1426,7 @@ START_TEST(shelllink) pILFree = (void *)GetProcAddress(hmod, (LPSTR)155); pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28); + pSHGetFolderLocation = (void *)GetProcAddress(hmod, "SHGetFolderLocation"); pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); pSHGetStockIconInfo = (void *)GetProcAddress(hmod, "SHGetStockIconInfo"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA");

1 0

Andrew Eikum : wineandroid: Don't use deprecated SLDataFormat_PCM struct.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: f5fe252cd165a7966f04651142d39686ff138005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5fe252cd165a7966f0465114… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 25 13:14:21 2017 -0500 wineandroid: Don't use deprecated SLDataFormat_PCM struct. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index d661fb5..275b652 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -647,7 +647,7 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLDataFormat_PCM *pcm) +static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLAndroidDataFormat_PCM_EX *pcm) { /* only support non-float PCM */ if(fmt->wFormatTag != WAVE_FORMAT_PCM && @@ -660,20 +660,26 @@ static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLDataFo if(fmt->nSamplesPerSec < 8000 || fmt->nSamplesPerSec > 48000) return AUDCLNT_E_UNSUPPORTED_FORMAT; - pcm->formatType = SL_DATAFORMAT_PCM; + pcm->formatType = SL_ANDROID_DATAFORMAT_PCM_EX; pcm->numChannels = fmt->nChannels; - pcm->samplesPerSec = fmt->nSamplesPerSec * 1000; /* no typo, actually in milli-Hz */ + pcm->sampleRate = fmt->nSamplesPerSec * 1000; /* sampleRate is in milli-Hz */ pcm->bitsPerSample = fmt->wBitsPerSample; pcm->containerSize = fmt->wBitsPerSample; /* only up to stereo */ if(pcm->numChannels == 1) - pcm->channelMask = SL_SPEAKER_FRONT_LEFT; + pcm->channelMask = SL_SPEAKER_FRONT_CENTER; else if(This->dataflow == eRender && pcm->numChannels == 2) pcm->channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT; else return AUDCLNT_E_UNSUPPORTED_FORMAT; + pcm->endianness = SL_BYTEORDER_LITTLEENDIAN; + if(pcm->bitsPerSample == 8) + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_UNSIGNED_INT; + else + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT; + return S_OK; } @@ -686,7 +692,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, int i; HRESULT hr; SLresult sr; - SLDataFormat_PCM pcm; + SLAndroidDataFormat_PCM_EX pcm; SLDataLocator_AndroidSimpleBufferQueue loc_bq; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, @@ -1056,7 +1062,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient(iface); - SLDataFormat_PCM pcm; + SLAndroidDataFormat_PCM_EX pcm; HRESULT hr; TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx);

1 0

Fabian Maurer : shell32/tests: Fix typo.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 4ef3ffd69da9374876f08cdcb0e61ebba0f2bd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef3ffd69da9374876f08cdcb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 25 20:34:12 2017 +0200 shell32/tests: Fix typo. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 21cb6bb..7b5afa0 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1032,7 +1032,7 @@ todo_wine { ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); if (hr == S_FALSE) /* winxp and earlier */ { win_skip("SWC_DESKTOP is not supported, some tests will be skipped.\n"); - /* older versions allowed to regiser SWC_DESKTOP and access it with FindWindowSW */ + /* older versions allowed to register SWC_DESKTOP and access it with FindWindowSW */ ok(disp == NULL, "got %p\n", disp); ok(ret == 0, "got %d\n", ret); }

1 0