wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Vincent Povirk : gdi32: Check for truncated EMF files.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 8d2676fd14f130f9e8f06744743423168bf8d18d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d2676fd14f130f9e8f06744… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 12:46:19 2018 -0500 gdi32: Check for truncated EMF files. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 25 +++++++++++++++++++------ dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 37edc23..ffe21f0 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -246,11 +246,16 @@ static inline BOOL is_dib_monochrome( const BITMAPINFO* info ) /**************************************************************************** * EMF_Create_HENHMETAFILE */ -HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) +HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) { HENHMETAFILE hmf; ENHMETAFILEOBJ *metaObj; + if (filesize < sizeof(*emh)) + { + WARN("File too small for emf header\n"); + return 0; + } if (emh->iType != EMR_HEADER) { SetLastError(ERROR_INVALID_DATA); @@ -263,6 +268,11 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) emh->iType, emh->dSignature); return 0; } + if (filesize < emh->nBytes) + { + WARN("File truncated (got %u bytes, header says %u)\n", emh->nBytes, filesize); + return 0; + } if (!(metaObj = HeapAlloc( GetProcessHeap(), 0, sizeof(*metaObj) ))) return 0; @@ -318,14 +328,17 @@ static HENHMETAFILE EMF_GetEnhMetaFile( HANDLE hFile ) ENHMETAHEADER *emh; HANDLE hMapping; HENHMETAFILE hemf; + DWORD filesize; + + filesize = GetFileSize( hFile, NULL ); hMapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY, 0, 0, NULL ); - emh = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 ); + emh = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, filesize ); CloseHandle( hMapping ); if (!emh) return 0; - hemf = EMF_Create_HENHMETAFILE( emh, TRUE ); + hemf = EMF_Create_HENHMETAFILE( emh, filesize, TRUE ); if (!hemf) UnmapViewOfFile( emh ); return hemf; @@ -468,7 +481,7 @@ HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT bufsize, const BYTE *buf) ENHMETAHEADER *emh = HeapAlloc( GetProcessHeap(), 0, bufsize ); HENHMETAFILE hmf; memmove(emh, buf, bufsize); - hmf = EMF_Create_HENHMETAFILE( emh, FALSE ); + hmf = EMF_Create_HENHMETAFILE( emh, bufsize, FALSE ); if (!hmf) HeapFree( GetProcessHeap(), 0, emh ); return hmf; @@ -2562,7 +2575,7 @@ HENHMETAFILE WINAPI CopyEnhMetaFileA( if (!file) { emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); - hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + hmfDst = EMF_Create_HENHMETAFILE( emrDst, emrSrc->nBytes, FALSE ); if (!hmfDst) HeapFree( GetProcessHeap(), 0, emrDst ); } else { @@ -2604,7 +2617,7 @@ HENHMETAFILE WINAPI CopyEnhMetaFileW( if (!file) { emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); - hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + hmfDst = EMF_Create_HENHMETAFILE( emrDst, emrSrc->nBytes, FALSE ); if (!hmfDst) HeapFree( GetProcessHeap(), 0, emrDst ); } else { diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 35803bc..8ff0e6c 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -529,7 +529,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ CloseHandle( physDev->hFile ); } - hmf = EMF_Create_HENHMETAFILE( physDev->emh, (physDev->hFile != 0) ); + hmf = EMF_Create_HENHMETAFILE( physDev->emh, physDev->emh->nBytes, (physDev->hFile != 0) ); physDev->emh = NULL; /* So it won't be deleted */ free_dc_ptr( dc ); return hmf; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c5e4231..5b09b84 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -268,7 +268,7 @@ extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HI extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */ -extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; +extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Zebediah Figura : msi: Avoid leaking custom action data.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: f4bcd95fa78172a3a07c5f065adf4287fe69af02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4bcd95fa78172a3a07c5f06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 8 19:54:29 2018 -0500 msi: Avoid leaking custom action data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 956b3e9..07916ac 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -609,6 +609,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) info = find_action_by_guid(guid); ret = GetBinaryTypeW(info->source, &arch); + release_custom_action_data(info); if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR));

1 0

Piotr Caban : kernel32: Fix CreateProcess behavior when batch script command contains '"' characters.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 77fa0502fa220c5578fff93f7e53a92f50817089 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fa0502fa220c5578fff93f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 4 22:39:49 2018 +0200 kernel32: Fix CreateProcess behavior when batch script command contains '"' characters. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 47f1cfb..df3426b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2211,7 +2211,8 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L { static const WCHAR comspecW[] = {'C','O','M','S','P','E','C',0}; - static const WCHAR slashcW[] = {' ','/','c',' ',0}; + static const WCHAR slashscW[] = {' ','/','s','/','c',' ',0}; + static const WCHAR quotW[] = {'"',0}; WCHAR comspec[MAX_PATH]; WCHAR *newcmdline; BOOL ret; @@ -2219,12 +2220,14 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L if (!GetEnvironmentVariableW( comspecW, comspec, sizeof(comspec)/sizeof(WCHAR) )) return FALSE; if (!(newcmdline = HeapAlloc( GetProcessHeap(), 0, - (strlenW(comspec) + 4 + strlenW(cmd_line) + 1) * sizeof(WCHAR)))) + (strlenW(comspec) + 7 + strlenW(cmd_line) + 2) * sizeof(WCHAR)))) return FALSE; strcpyW( newcmdline, comspec ); - strcatW( newcmdline, slashcW ); + strcatW( newcmdline, slashscW ); + strcatW( newcmdline, quotW ); strcatW( newcmdline, cmd_line ); + strcatW( newcmdline, quotW ); ret = CreateProcessW( comspec, newcmdline, psa, tsa, inherit, flags, env, cur_dir, startup, info ); HeapFree( GetProcessHeap(), 0, newcmdline );

1 0

Nikolay Sivov : comctl32/toolbar: Handle resource strings returned for tooltip text.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: c74a72c46e078bbc91bd1c4b23832f748dfc843d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74a72c46e078bbc91bd1c4b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 9 08:25:30 2018 +0300 comctl32/toolbar: Handle resource strings returned for tooltip text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e1cb7b7..6a51ad7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6248,6 +6248,9 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm TRACE("TTN_GETDISPINFOW - got string %s\n", debugstr_w(lpnmtdi->lpszText)); + if (IS_INTRESOURCE(lpnmtdi->lpszText)) + return ret; + if (lpnmtdi->lpszText && *lpnmtdi->lpszText) return ret; } @@ -6265,6 +6268,16 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm TRACE("TTN_GETDISPINFOA - got string %s\n", debugstr_a(nmtdi.lpszText)); + lpnmtdi->hinst = nmtdi.hinst; + lpnmtdi->uFlags = nmtdi.uFlags; + lpnmtdi->lParam = nmtdi.lParam; + + if (IS_INTRESOURCE(nmtdi.lpszText)) + { + lpnmtdi->lpszText = (WCHAR *)nmtdi.lpszText; + return ret; + } + if (!nmtdi.lpszText || !*nmtdi.lpszText) return ret;

1 0

Daniel Lehman : shell32: Convert / to \ when parsing file list.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: da8a801a582a32b6577c3ac8a58d713c058fdc9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da8a801a582a32b6577c3ac8… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue May 8 20:50:20 2018 -0700 shell32: Convert / to \ when parsing file list. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 3 +++ dlls/shell32/tests/shlfileop.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 5d93334..4507b72 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1005,6 +1005,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) { LPCWSTR ptr = szFiles; WCHAR szCurFile[MAX_PATH]; + WCHAR *p; DWORD i = 0; if (!szFiles) @@ -1039,6 +1040,8 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) flList->feFiles[i].bFromRelative = FALSE; } + for (p = szCurFile; *p; p++) if (*p == '/') *p = '\\'; + /* parse wildcard files if they are in the filename */ if (StrPBrkW(szCurFile, wWildcardChars)) { diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 6a220fa..8fb4dcf 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1869,6 +1869,28 @@ static void test_copy(void) ok(retval != ERROR_SUCCESS, "Unexpected ERROR_SUCCESS\n"); ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* test with / */ + CreateDirectoryA("dir", NULL); + CreateDirectoryA("dir\\subdir", NULL); + createTestFile("dir\\subdir\\aa.txt"); + shfo.pFrom = "dir/subdir/aa.txt\0"; + shfo.pTo = "dir\\destdir/aa.txt\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperationA(&shfo); + if (dir_exists("dir\\destdir")) + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("dir\\destdir\\aa.txt"), "Expected file to exist\n"); + ok(RemoveDirectoryA("dir\\destdir"), "Expected dir to exist\n"); + } + else + { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* WinXp, Win2k */); + } + ok(DeleteFileA("dir\\subdir\\aa.txt"), "Expected file to exist\n"); + ok(RemoveDirectoryA("dir\\subdir"), "Expected dir to exist\n"); + ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); } /* tests the FO_MOVE action */ @@ -1921,6 +1943,30 @@ static void test_move(void) clean_after_shfo_tests(); init_shfo_tests(); + /* same tests above, but with / */ + set_curr_dir_path(from, "testdir2/*.*\0"); + set_curr_dir_path(to, "test4.txt\0"); + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS || + broken(retval == ERROR_FILE_NOT_FOUND), /* WinXp, Win2k3 */ + "Expected ERROR_SUCCESS, got %d\n", retval); + if (retval == ERROR_SUCCESS) + { + ok(!shfo.fAnyOperationsAborted, "fAnyOperationsAborted %d\n", shfo.fAnyOperationsAborted); + + ok(dir_exists("testdir2"), "dir should not be moved\n"); + ok(!file_exists("testdir2\\one.txt"), "file should be moved\n"); + ok(!dir_exists("testdir2\\nested"), "dir should be moved\n"); + ok(!file_exists("testdir2\\nested\\two.txt"), "file should be moved\n"); + + ok(file_exists("test4.txt\\one.txt"), "file should exist\n"); + ok(dir_exists("test4.txt\\nested"), "dir should exist\n"); + ok(file_exists("test4.txt\\nested\\two.txt"), "file should exist\n"); + } + + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.hwnd = NULL; shfo.wFunc = FO_MOVE; shfo.pFrom = from;

1 0

Zebediah Figura : msdmo: Only return valid GUIDs in IEnumDMO_Next().
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 351c8621b764bfcd52b70e16cf1c1978ccfe9eb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=351c8621b764bfcd52b70e16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 8 18:55:02 2018 -0500 msdmo: Only return valid GUIDs in IEnumDMO_Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 1944a0a..2161d40 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -117,6 +117,16 @@ static LPWSTR GUIDToString(LPWSTR lpwstr, REFGUID lpcguid) return lpwstr; } +static HRESULT string_to_guid(const WCHAR *string, GUID *guid) +{ + WCHAR buffer[39]; + buffer[0] = '{'; + strcpyW(buffer + 1, string); + buffer[37] = '}'; + buffer[38] = 0; + return CLSIDFromString(buffer, guid); +} + static BOOL IsMediaTypeEqual(const DMO_PARTIAL_MEDIATYPE* mt1, const DMO_PARTIAL_MEDIATYPE* mt2) { @@ -514,6 +524,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( UINT count = 0; HRESULT hres = S_OK; LONG ret; + GUID guid; IEnumDMOImpl *This = impl_from_IEnumDMO(iface); @@ -537,6 +548,9 @@ static HRESULT WINAPI IEnumDMO_fnNext( break; } + if (string_to_guid(szNextKey, &guid) != S_OK) + continue; + TRACE("found %s\n", debugstr_w(szNextKey)); if (!(This->dwFlags & DMO_ENUMF_INCLUDE_KEYED))

1 0

Zebediah Figura : msdmo: Make formatting consistent with the rest of the file.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 386c27084a326431323a1c453b3be39bd5381ed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=386c27084a326431323a1c45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 8 18:55:01 2018 -0500 msdmo: Make formatting consistent with the rest of the file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 255849d3d..1944a0a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -571,7 +571,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( continue; } - pInTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + pInTypes = (DMO_PARTIAL_MEDIATYPE *)szValue; TRACE("read %d intypes for %s:\n", cInTypes, debugstr_w(szKey)); for (i = 0; i < cInTypes; i++) { @@ -584,10 +584,10 @@ static HRESULT WINAPI IEnumDMO_fnNext( for (j = 0; j < cInTypes; j++) { if (IsMediaTypeEqual(&pInTypes[j], &This->pInTypes[i])) - break; + break; } - if (j >= cInTypes) + if (j >= cInTypes) break; } @@ -608,13 +608,13 @@ static HRESULT WINAPI IEnumDMO_fnNext( sizeof(szValue)/sizeof(DMO_PARTIAL_MEDIATYPE), (DMO_PARTIAL_MEDIATYPE*)szValue); - if (FAILED(hres)) + if (FAILED(hres)) { RegCloseKey(hkey); continue; } - pOutTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + pOutTypes = (DMO_PARTIAL_MEDIATYPE *)szValue; TRACE("read %d outtypes for %s:\n", cOutTypes, debugstr_w(szKey)); for (i = 0; i < cOutTypes; i++) { @@ -627,10 +627,10 @@ static HRESULT WINAPI IEnumDMO_fnNext( for (j = 0; j < cOutTypes; j++) { if (IsMediaTypeEqual(&pOutTypes[j], &This->pOutTypes[i])) - break; + break; } - if (j >= cOutTypes) + if (j >= cOutTypes) break; } @@ -641,22 +641,22 @@ static HRESULT WINAPI IEnumDMO_fnNext( } } - /* Media object wasn't filtered so add it to return list */ + /* Media object wasn't filtered so add it to return list */ Names[count] = NULL; - len = MAX_PATH * sizeof(WCHAR); + len = MAX_PATH * sizeof(WCHAR); ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len); if (ERROR_SUCCESS == ret) - { + { Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); - if (Names[count]) + if (Names[count]) strcpyW(Names[count], szValue); - } + } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]); TRACE("found match %s %s\n", debugstr_w(szValue), debugstr_w(szNextKey)); RegCloseKey(hkey); - count++; + count++; } if (pcItemsFetched) *pcItemsFetched = count;

1 0

Zebediah Figura : msdmo: Fix pointer checking in IEnumDMO_Next().
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: e2e3f70ed73e6c11598be38eaea55ea6ea4cd28f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e3f70ed73e6c11598be38e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 8 18:55:00 2018 -0500 msdmo: Fix pointer checking in IEnumDMO_Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 9 ++++++--- dlls/msdmo/tests/msdmo.c | 9 ++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 43b0438..255849d3d 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -519,9 +519,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( TRACE("(%p)->(%d %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched); - if (!pCLSID || !Names || !pcItemsFetched) + if (!pCLSID || !Names) return E_POINTER; + if (!pcItemsFetched && cItemsToFetch > 1) + return E_INVALIDARG; + while (count < cItemsToFetch) { This->index++; @@ -656,8 +659,8 @@ static HRESULT WINAPI IEnumDMO_fnNext( count++; } - *pcItemsFetched = count; - if (*pcItemsFetched < cItemsToFetch) + if (pcItemsFetched) *pcItemsFetched = count; + if (count < cItemsToFetch) hres = S_FALSE; TRACE("<-- %i found\n",count); diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 8cc35d1..7617123 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -92,14 +92,21 @@ static void test_DMOEnum(void) HRESULT hr; CLSID clsid; WCHAR *name; + DWORD count; hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); ok(hr == S_OK, "DMOEnum() failed with %#x\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - todo_wine ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + hr = IEnumDMO_Next(enum_dmo, 2, &clsid, &name, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 2, &clsid, &name, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + IEnumDMO_Release(enum_dmo); }

1 0

Zebediah Figura : msdmo: Return a valid enumerator even if the category doesn't exist.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 216e1f25a44380bcede2f3ecc7d1a8ace5a21c62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216e1f25a44380bcede2f3ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 8 18:54:59 2018 -0500 msdmo: Return a valid enumerator even if the category doesn't exist. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 8 +++----- dlls/msdmo/tests/Makefile.in | 2 +- dlls/msdmo/tests/msdmo.c | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index ead8864..43b0438 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -390,7 +390,6 @@ static HRESULT IEnumDMO_Constructor( { IEnumDMOImpl* lpedmo; HRESULT hr; - LONG ret; *obj = NULL; @@ -405,6 +404,7 @@ static HRESULT IEnumDMO_Constructor( lpedmo->dwFlags = dwFlags; lpedmo->cInTypes = cInTypes; lpedmo->cOutTypes = cOutTypes; + lpedmo->hkey = NULL; hr = dup_partial_mediatype(pInTypes, cInTypes, &lpedmo->pInTypes); if (FAILED(hr)) @@ -417,8 +417,7 @@ static HRESULT IEnumDMO_Constructor( /* If not filtering by category enum from media objects root */ if (IsEqualGUID(guidCategory, &GUID_NULL)) { - if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey))) - hr = HRESULT_FROM_WIN32(ret); + RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey); } else { @@ -426,8 +425,7 @@ static HRESULT IEnumDMO_Constructor( WCHAR szKey[MAX_PATH]; wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory)); - if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) - hr = HRESULT_FROM_WIN32(ret); + RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey); } lerr: diff --git a/dlls/msdmo/tests/Makefile.in b/dlls/msdmo/tests/Makefile.in index 105baba..22a8e35 100644 --- a/dlls/msdmo/tests/Makefile.in +++ b/dlls/msdmo/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msdmo.dll -IMPORTS = msdmo +IMPORTS = advapi32 dmoguids msdmo uuid C_SRCS = \ msdmo.c diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 00ab656..8cc35d1 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "initguid.h" +#include <stdio.h> +#define COBJMACROS #include "dmo.h" #include "wine/test.h" @@ -27,8 +28,19 @@ static const GUID GUID_unknowndmo = {0x14d99047,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x static const GUID GUID_unknowncategory = {0x14d99048,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; static const GUID GUID_wmp1 = {0x13a7995e,0x7d8f,0x45b4,{0x9c,0x77,0x81,0x92,0x65,0x22,0x57,0x63}}; +static const char *guid_to_string(const GUID *guid) +{ + static char buffer[50]; + sprintf(buffer, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buffer; +} + static void test_DMOUnregister(void) { + static char buffer[200]; static const WCHAR testdmoW[] = {'t','e','s','t','d','m','o',0}; HRESULT hr; @@ -53,6 +65,10 @@ static void test_DMOUnregister(void) hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); ok(hr == S_FALSE, "got 0x%08x\n", hr); + + /* clean up category since Windows doesn't */ + sprintf(buffer, "DirectShow\\MediaObjects\\Categories\\%s", guid_to_string(&GUID_unknowncategory)); + RegDeleteKeyA(HKEY_CLASSES_ROOT, buffer); } static void test_DMOGetName(void) @@ -70,8 +86,26 @@ static void test_DMOGetName(void) ok(name[0] == 'a', "got %x\n", name[0]); } +static void test_DMOEnum(void) +{ + IEnumDMO *enum_dmo; + HRESULT hr; + CLSID clsid; + WCHAR *name; + + hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); + ok(hr == S_OK, "DMOEnum() failed with %#x\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + todo_wine + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + + IEnumDMO_Release(enum_dmo); +} + START_TEST(msdmo) { test_DMOUnregister(); test_DMOGetName(); + test_DMOEnum(); }

1 0

Francois Gouget : testbot: Detect and kill stuck task scripts.
by Alexandre Julliard 09 May '18

09 May '18

Module: tools Branch: master Commit: 3ce81c0c6cf9e9829608441ab943da0503492d1d URL: https://source.winehq.org/git/tools.git/?a=commit;h=3ce81c0c6cf9e9829608441… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 9 02:45:31 2018 +0200 testbot: Detect and kill stuck task scripts. The tasks themselves have a timeout which the corresponding scripts enforce. However the scripts themselves may get stuck, typically due to network problems. When that happens they can end up blocking the whole TestBot. So make sure the TestBot engine itself can detect stuck scripts and take corrective action. Note that the detection is not very timely but will happen at the latest in the SafetyNet() function. This means there will be at most a 10 minutes delay. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 7 ++++++- testbot/bin/WineRunBuild.pl | 1 + testbot/bin/WineRunReconfig.pl | 1 + testbot/bin/WineRunTask.pl | 1 + testbot/ddl/update32.sql | 5 +++++ testbot/ddl/winetestbot.sql | 25 +++++++++++++------------ testbot/doc/winetestbot-schema.dia | 23 +++++++++++++++++++++++ testbot/lib/WineTestBot/Config.pm | 17 ++++++++++------- testbot/lib/WineTestBot/Engine/Scheduler.pm | 16 +++++++++++++++- testbot/lib/WineTestBot/Tasks.pm | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 11 ++++++++--- testbot/web/admin/VMDetails.pl | 3 ++- 12 files changed, 90 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=3ce81c0c6cf9e982960…

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
72
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 2018