March 2018 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in texture2d_create_dc().
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 2eb4d15b13f15b2b0ff0900aec13b5c74e22867a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb4d15b13f15b2b0ff0900a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 5 11:24:32 2018 +0330 wined3d: Explicitly calculate the sub-resource level in texture2d_create_dc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1ffc2a6..8e8a4dc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1211,12 +1211,12 @@ static void texture2d_create_dc(void *object) { struct wined3d_surface *surface = object; struct wined3d_context *context = NULL; + unsigned int sub_resource_idx, level; const struct wined3d_format *format; unsigned int row_pitch, slice_pitch; struct wined3d_texture *texture; struct wined3d_bo_address data; D3DKMT_CREATEDCFROMMEMORY desc; - unsigned int sub_resource_idx; struct wined3d_device *device; NTSTATUS status; @@ -1224,6 +1224,7 @@ static void texture2d_create_dc(void *object) texture = surface->container; sub_resource_idx = surface_get_sub_resource_idx(surface); + level = sub_resource_idx % texture->level_count; device = texture->resource.device; format = texture->resource.format; @@ -1238,7 +1239,7 @@ static void texture2d_create_dc(void *object) wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); - wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); desc.pMemory = context_map_bo_address(context, &data, texture->sub_resources[sub_resource_idx].size, @@ -1248,8 +1249,8 @@ static void texture2d_create_dc(void *object) context_release(context); desc.Format = format->ddi_format; - desc.Width = wined3d_texture_get_level_width(texture, surface->texture_level); - desc.Height = wined3d_texture_get_level_height(texture, surface->texture_level); + desc.Width = wined3d_texture_get_level_width(texture, level); + desc.Height = wined3d_texture_get_level_height(texture, level); desc.Pitch = row_pitch; desc.hDeviceDc = CreateCompatibleDC(NULL); desc.pColorTable = NULL;

1 0

Zebediah Figura : quartz/tests: Clean up test_legacy_filter_registration() .
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 574b2871de36ae7535c3cc33672ad16a9e1a8ed6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=574b2871de36ae7535c3cc33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 4 23:11:05 2018 -0600 quartz/tests: Clean up test_legacy_filter_registration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 175 ++++++++++++++------------------------- 1 file changed, 61 insertions(+), 114 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index f044a31..99e77b5 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -48,24 +48,12 @@ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat); ok(SUCCEEDED(hr), "IMoniker_BindToStorage failed with %x\n", hr); - if (FAILED(hr) || !pPropBagCat) - { - VariantClear(&var); - IMoniker_Release(pMoniker); - continue; - } hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, &var, NULL); ok(SUCCEEDED(hr), "IPropertyBag_Read failed with %x\n", hr); - if (SUCCEEDED(hr)) - { - CHAR val1[512], val2[512]; - - WideCharToMultiByte(CP_ACP, 0, V_BSTR(&var), -1, val1, sizeof(val1), 0, 0); - WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0); - if (!lstrcmpA(val1, val2)) found = TRUE; - } + if (!lstrcmpW(V_BSTR(&var), wszFilterName)) + found = TRUE; IPropertyBag_Release(pPropBagCat); IMoniker_Release(pMoniker); @@ -214,125 +202,84 @@ static void test_fm2_enummatchingfilters(void) static void test_legacy_filter_registration(void) { - IFilterMapper2 *pMapper2 = NULL; - IFilterMapper *pMapper = NULL; + static const WCHAR testfilterW[] = {'T','e','s','t','f','i','l','t','e','r',0}; + static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; + static const WCHAR pinW[] = {'P','i','n','1',0}; + IEnumRegFilters *enum_reg; + IEnumMoniker *enum_mon; + IFilterMapper2 *mapper2; + IFilterMapper *mapper; + REGFILTER *regfilter; + WCHAR clsidstring[40]; + WCHAR key_name[50]; + ULONG count; + CLSID clsid; + LRESULT ret; HRESULT hr; - static const WCHAR wszFilterName[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 0 }; - static const CHAR szFilterName[] = "Testfilter"; - static const WCHAR wszPinName[] = {'P', 'i', 'n', '1', 0 }; - CLSID clsidFilter; - CHAR szRegKey[MAX_PATH]; - static const CHAR szClsid[] = "CLSID"; - WCHAR wszGuidstring[MAX_PATH]; - CHAR szGuidstring[MAX_PATH]; - LONG lRet; - HKEY hKey = NULL; - IEnumMoniker *pEnum = NULL; BOOL found; - IEnumRegFilters *pRegEnum = NULL; + HKEY hkey; + + /* Register* functions need a filter class key to write pin and pin media + * type data to. Create a bogus class key for it. */ + CoCreateGuid(&clsid); + StringFromGUID2(&clsid, clsidstring, sizeof(clsidstring)); + lstrcpyW(key_name, clsidW); + lstrcatW(key_name, clsidstring); + ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, key_name, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not authorized to register filters\n"); + return; + } /* Test if legacy filter registration scheme works (filter is added to HKCR\Filter). IFilterMapper_RegisterFilter * registers in this way. Filters so registered must then be accessible through both IFilterMapper_EnumMatchingFilters * and IFilterMapper2_EnumMatchingFilters. */ - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, - &IID_IFilterMapper2, (LPVOID*)&pMapper2); + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (void **)&mapper2); ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); - if (FAILED(hr)) goto out; - hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (void **)&pMapper); + hr = IFilterMapper2_QueryInterface(mapper2, &IID_IFilterMapper, (void **)&mapper); ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %x\n", hr); - if (FAILED(hr)) goto out; - /* Register a test filter. */ - hr = CoCreateGuid(&clsidFilter); - ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); + /* Set default value - this is interpreted as "friendly name" later. */ + RegSetValueExW(hkey, NULL, 0, REG_SZ, (BYTE *)testfilterW, sizeof(testfilterW)); + RegCloseKey(hkey); - lRet = StringFromGUID2(&clsidFilter, wszGuidstring, MAX_PATH); - ok(lRet > 0, "StringFromGUID2 failed\n"); - if (!lRet) goto out; - WideCharToMultiByte(CP_ACP, 0, wszGuidstring, -1, szGuidstring, MAX_PATH, 0, 0); + hr = IFilterMapper_RegisterFilter(mapper, clsid, testfilterW, MERIT_UNLIKELY); + ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); - lstrcpyA(szRegKey, szClsid); - lstrcatA(szRegKey, "\\"); - lstrcatA(szRegKey, szGuidstring); + hr = IFilterMapper_RegisterPin(mapper, clsid, pinW, TRUE, FALSE, FALSE, FALSE, GUID_NULL, NULL); + ok(hr == S_OK, "RegisterPin failed: %#x\n", hr); - /* Register---- functions need a filter class key to write pin and pin media type data to. Create a bogus - * class key for it. */ - lRet = RegCreateKeyExA(HKEY_CLASSES_ROOT, szRegKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - if (lRet == ERROR_ACCESS_DENIED) - skip("Not authorized to register filters\n"); - else - { - ok(lRet == ERROR_SUCCESS, "RegCreateKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + hr = IFilterMapper_RegisterPinType(mapper, clsid, pinW, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "RegisterPinType failed: %#x\n", hr); - /* Set default value - this is interpreted as "friendly name" later. */ - lRet = RegSetValueExA(hKey, NULL, 0, REG_SZ, (LPBYTE)szFilterName, lstrlenA(szFilterName) + 1); - ok(lRet == ERROR_SUCCESS, "RegSetValueExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + hr = IFilterMapper2_EnumMatchingFilters(mapper2, &enum_mon, 0, TRUE, MERIT_UNLIKELY, TRUE, + 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed: %x\n", hr); + ok(enum_find_filter(testfilterW, enum_mon), "IFilterMapper2 didn't find filter\n"); + IEnumMoniker_Release(enum_mon); - if (hKey) RegCloseKey(hKey); - hKey = NULL; - - hr = IFilterMapper_RegisterFilter(pMapper, clsidFilter, wszFilterName, MERIT_UNLIKELY); - ok(hr == S_OK, "IFilterMapper_RegisterFilter failed with %x\n", hr); - - hr = IFilterMapper_RegisterPin(pMapper, clsidFilter, wszPinName, TRUE, FALSE, FALSE, FALSE, GUID_NULL, NULL); - ok(hr == S_OK, "IFilterMapper_RegisterPin failed with %x\n", hr); - - hr = IFilterMapper_RegisterPinType(pMapper, clsidFilter, wszPinName, GUID_NULL, GUID_NULL); - ok(hr == S_OK, "IFilterMapper_RegisterPinType failed with %x\n", hr); - - hr = IFilterMapper2_EnumMatchingFilters(pMapper2, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, - 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); - ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); - if (SUCCEEDED(hr) && pEnum) - { - found = enum_find_filter(wszFilterName, pEnum); - ok(found, "IFilterMapper2_EnumMatchingFilters failed to return the test filter\n"); - } - - if (pEnum) IEnumMoniker_Release(pEnum); - pEnum = NULL; - - found = FALSE; - hr = IFilterMapper_EnumMatchingFilters(pMapper, &pRegEnum, MERIT_UNLIKELY, TRUE, GUID_NULL, GUID_NULL, - FALSE, FALSE, GUID_NULL, GUID_NULL); - ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed with %x\n", hr); - if (SUCCEEDED(hr) && pRegEnum) - { - ULONG cFetched; - REGFILTER *prgf; - - while(!found && IEnumRegFilters_Next(pRegEnum, 1, &prgf, &cFetched) == S_OK) - { - CHAR val[512]; - - WideCharToMultiByte(CP_ACP, 0, prgf->Name, -1, val, sizeof(val), 0, 0); - if (!lstrcmpA(val, szFilterName)) found = TRUE; - - CoTaskMemFree(prgf); - } - - IEnumRegFilters_Release(pRegEnum); - } - ok(found, "IFilterMapper_EnumMatchingFilters failed to return the test filter\n"); - - hr = IFilterMapper_UnregisterFilter(pMapper, clsidFilter); - ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); - - lRet = RegOpenKeyExA(HKEY_CLASSES_ROOT, szClsid, 0, KEY_WRITE | DELETE, &hKey); - ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); - - lRet = RegDeleteKeyA(hKey, szGuidstring); - ok(lRet == ERROR_SUCCESS, "RegDeleteKeyA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + found = FALSE; + hr = IFilterMapper_EnumMatchingFilters(mapper, &enum_reg, MERIT_UNLIKELY, TRUE, GUID_NULL, GUID_NULL, + FALSE, FALSE, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed with %x\n", hr); + while(!found && IEnumRegFilters_Next(enum_reg, 1, &regfilter, &count) == S_OK) + { + if (!lstrcmpW(regfilter->Name, testfilterW) && IsEqualGUID(&clsid, &regfilter->Clsid)) + found = TRUE; } + IEnumRegFilters_Release(enum_reg); + ok(found, "IFilterMapper didn't find filter\n"); - if (hKey) RegCloseKey(hKey); - hKey = NULL; + hr = IFilterMapper_UnregisterFilter(mapper, clsid); + ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); - out: + ret = RegDeleteKeyW(HKEY_CLASSES_ROOT, key_name); + ok(!ret, "RegDeleteKeyA failed: %lu\n", ret); - if (pMapper) IFilterMapper_Release(pMapper); - if (pMapper2) IFilterMapper2_Release(pMapper2); + IFilterMapper_Release(mapper); + IFilterMapper2_Release(mapper2); } static ULONG getRefcount(IUnknown *iface)

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptPlace().
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 9be6ff403dedfafc32cc387466745f5414068e88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be6ff403dedfafc32cc3874… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 5 11:24:36 2018 +0330 usp10: Use heap_calloc() in ScriptPlace(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 103b345..411d19f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3501,8 +3501,8 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, if (!psva) return E_INVALIDARG; if (!pGoffset) return E_FAIL; - glyphProps = heap_alloc(sizeof(SCRIPT_GLYPHPROP)*cGlyphs); - if (!glyphProps) return E_OUTOFMEMORY; + if (!(glyphProps = heap_calloc(cGlyphs, sizeof(*glyphProps)))) + return E_OUTOFMEMORY; for (i = 0; i < cGlyphs; i++) glyphProps[i].sva = psva[i];

1 0

Alistair Leslie-Hughes : kernel32: Add QueryUmsThreadInformation stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 8af9344519351ba29cdb1edef16cb60f15070834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af9344519351ba29cdb1ede… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:07 2018 +0000 kernel32: Add QueryUmsThreadInformation stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 +++++++++++ include/winbase.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23bd0b4..e358075 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1175,7 +1175,7 @@ @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation -# @ stub -arch=x86_64 QueryUmsThreadInformation +@ stdcall -arch=x86_64 QueryUmsThreadInformation(ptr long ptr long ptr) @ stdcall QueryUnbiasedInterruptTime(ptr) @ stub QueryWin31IniFilesMappedToRegistry @ stdcall QueueUserAPC(ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1730083..b26fb93 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4332,6 +4332,17 @@ BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST list, HANDLE *event) return FALSE; } +/*********************************************************************** + * QueryUmsThreadInformation (KERNEL32.@) + */ +BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, + void *buf, ULONG length, ULONG *ret_length) +{ + FIXME( "%p,%08x,%p,%08x,%p: stub\n", ctx, class, buf, length, ret_length ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index a752d69..cff15b0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2488,6 +2488,7 @@ WINBASEAPI BOOL WINAPI QueryMemoryResourceNotification(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryThreadCycleTime(HANDLE,PULONG64); +WINBASEAPI BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT,UMS_THREAD_INFO_CLASS,PVOID,ULONG,PULONG); WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR); WINBASEAPI BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); WINBASEAPI void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR *);

1 0

Alistair Leslie-Hughes : kernel32: Add DeleteUmsCompletionList stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: d4819eea0ed23de8c928cd9cf3654e52cefb5476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4819eea0ed23de8c928cd9c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:57 2018 +0000 kernel32: Add DeleteUmsCompletionList stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6c4804c..7a2a6ab 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -373,7 +373,7 @@ @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) -# @ stub -arch=x86_64 DeleteUmsCompletionList +@ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) # @ stub -arch=x86_64 DeleteUmsThreadContext @ stdcall DeleteVolumeMountPointA(str) @ stdcall DeleteVolumeMountPointW(wstr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4075cbf..f5069f4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4252,6 +4252,16 @@ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *li return; } +/*********************************************************************** + * DeleteUmsCompletionList (KERNEL32.@) + */ +BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST list) +{ + FIXME( "%p: stub\n", list ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index d891b04..69d97c9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1911,6 +1911,7 @@ WINBASEAPI void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ WINBASEAPI BOOL WINAPI DeleteTimerQueue(HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueEx(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueTimer(HANDLE,HANDLE,HANDLE); +WINBASEAPI BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR); #define DeleteVolumeMountPoint WINELIB_NAME_AW(DeleteVolumeMountPoint)

1 0

Alistair Leslie-Hughes : kernel32: Add CreateUmsThreadContext stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: d3f7b119ffa19719d0288d6ad27cec3baa5eae9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f7b119ffa19719d0288d6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:55 2018 +0000 kernel32: Add CreateUmsThreadContext stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7f5f439..6c4804c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -341,7 +341,7 @@ @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) @ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) -# @ stub -arch=x86_64 CreateUmsThreadContext +@ stdcall -arch=x86_64 CreateUmsThreadContext(ptr) @ stub CreateVirtualBuffer @ stdcall CreateWaitableTimerA(ptr long str) @ stdcall CreateWaitableTimerExA(ptr str long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8596be4..4075cbf 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4235,6 +4235,16 @@ BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST *list) } /*********************************************************************** + * CreateUmsThreadContext (KERNEL32.@) + */ +BOOL WINAPI CreateUmsThreadContext(PUMS_CONTEXT *ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** * DeleteProcThreadAttributeList (KERNEL32.@) */ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *list) diff --git a/include/winbase.h b/include/winbase.h index f94f4c7..d891b04 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1877,6 +1877,7 @@ WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD WINBASEAPI HANDLE WINAPI CreateTimerQueue(void); WINBASEAPI BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG); WINBASEAPI BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST*); +WINBASEAPI BOOL WINAPI CreateUmsThreadContext(PUMS_CONTEXT*); WINBASEAPI HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateWaitableTimer WINELIB_NAME_AW(CreateWaitableTimer)

1 0

Alistair Leslie-Hughes : kernel32: Add CreateUmsCompletionList stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: e7bd802caa87f1e22041c14b0466654a99a128de URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7bd802caa87f1e22041c14b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:54 2018 +0000 kernel32: Add CreateUmsCompletionList stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ee11c42..7f5f439 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -340,7 +340,7 @@ @ stdcall CreateTimerQueue () @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) -# @ stub -arch=x86_64 CreateUmsCompletionList +@ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) # @ stub -arch=x86_64 CreateUmsThreadContext @ stub CreateVirtualBuffer @ stdcall CreateWaitableTimerA(ptr long str) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b883087..8596be4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4225,6 +4225,16 @@ BOOL WINAPI UpdateProcThreadAttribute(struct _PROC_THREAD_ATTRIBUTE_LIST *list, } /*********************************************************************** + * CreateUmsCompletionList (KERNEL32.@) + */ +BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST *list) +{ + FIXME( "%p: stub\n", list ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** * DeleteProcThreadAttributeList (KERNEL32.@) */ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *list) diff --git a/include/winbase.h b/include/winbase.h index aefedfd..f94f4c7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1876,6 +1876,7 @@ WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateTimerQueue(void); WINBASEAPI BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG); +WINBASEAPI BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST*); WINBASEAPI HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateWaitableTimer WINELIB_NAME_AW(CreateWaitableTimer)

1 0

Alexandre Julliard : makefiles: Treat all directories the same way in configure.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 3aecaf1da776b77c39a385d4a1d062476b178400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aecaf1da776b77c39a385d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 23:02:30 2018 +0100 makefiles: Treat all directories the same way in configure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 116 +-- configure | 2291 ++++++++++++++++++++++++-------------------------- configure.ac | 2186 +++++++++++++++++++++++------------------------ tools/make_makefiles | 62 +- 4 files changed, 2240 insertions(+), 2415 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3aecaf1da776b77c39a3…

1 0

Alexandre Julliard : makefiles: Generate the tools dependencies from makedep.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 431b6459989569a032ee50fe71b101c6aeacce5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=431b6459989569a032ee50fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 22:27:23 2018 +0100 makefiles: Generate the tools dependencies from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 13 +++---------- aclocal.m4 | 9 +-------- configure | 13 ++++--------- configure.ac | 4 +++- tools/makedep.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index 791bb84..6b65fdf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -74,7 +74,6 @@ CROSSTARGET = @CROSSTARGET@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) -WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) PACKAGE_VERSION = @PACKAGE_VERSION@ SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@srcdir\@,$(srcdir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' @@ -128,18 +127,12 @@ install-manpages:: manpages # Dependencies between directories # dependencies needed to build any dll or program -__tooldeps__: libs/port libs/wpp +__tooldeps__: libs/wpp __builddeps__: __tooldeps__ libs/wine include po -.PHONY: depend dummy __tooldeps__ install install-lib install-dev +.PHONY: depend dummy install install-lib install-dev dummy: -loader: libs/port libs/wine tools -server: libs/port libs/wine tools include -fonts: tools/sfnt2fon -include: tools tools/widl -libs/wine tools: libs/port -tools/sfnt2fon tools/wmc tools/wrc: tools -tools/widl tools/wmc tools/wrc: libs/wpp +server: include libs/port libs/wine libs/wpp: include/config.h # Misc rules diff --git a/aclocal.m4 b/aclocal.m4 index 15ad1fe..c0bdd55 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -286,15 +286,8 @@ wine_fn_config_test () wine_fn_config_tool () { ac_dir=$[1] - AS_VAR_IF([enable_tools],[no],[wine_fn_append_file DISABLED_SUBDIRS $ac_dir; return]) - + AS_VAR_IF([enable_tools],[no],[return]) wine_fn_all_rules - - wine_fn_append_rule "__tooldeps__: $ac_dir" - wine_fn_append_rule "$ac_dir: libs/port" - case $ac_dir in - tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; - esac } wine_fn_config_symlink () diff --git a/configure b/configure index 3dd1b6b..be00e57 100755 --- a/configure +++ b/configure @@ -7805,16 +7805,9 @@ wine_fn_config_tool () { ac_dir=$1 if test "x$enable_tools" = xno; then : - wine_fn_append_file DISABLED_SUBDIRS $ac_dir; return + return fi - wine_fn_all_rules - - wine_fn_append_rule "__tooldeps__: $ac_dir" - wine_fn_append_rule "$ac_dir: libs/port" - case $ac_dir in - tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; - esac } wine_fn_config_symlink () @@ -19348,7 +19341,9 @@ if test "x$enable_tools" != xno then wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext" +Makefile: tools/makedep$ac_exeext +fonts: tools/sfnt2fon +include: tools tools/widl" else wine_fn_append_rule "\$(MAKEDEP): @echo \"You need to run make in $TOOLSDIR first\" && false" diff --git a/configure.ac b/configure.ac index 5d09075..819a921 100644 --- a/configure.ac +++ b/configure.ac @@ -3954,7 +3954,9 @@ then WINE_APPEND_RULE( [tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext]) +Makefile: tools/makedep$ac_exeext +fonts: tools/sfnt2fon +include: tools tools/widl]) else WINE_APPEND_RULE( [\$(MAKEDEP): diff --git a/tools/makedep.c b/tools/makedep.c index 658d47f..57adf0b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3409,6 +3409,7 @@ static void output_subdirs( struct makefile *make ) struct strarray testclean_files = empty_strarray; struct strarray distclean_files = empty_strarray; struct strarray tools_deps = empty_strarray; + struct strarray tooldeps_deps = empty_strarray; struct strarray winetest_deps = empty_strarray; struct strarray crosstest_deps = empty_strarray; unsigned int i, j; @@ -3509,6 +3510,30 @@ static void output_subdirs( struct makefile *make ) strarray_add( &builddeps_deps, target ); } } + else + { + if (!strcmp( submake->base_dir, "tools" ) || !strncmp( submake->base_dir, "tools/", 6 )) + { + strarray_add( &tooldeps_deps, submake->base_dir ); + for (j = 0; j < submake->programs.count; j++) + output( "%s/%s%s: %s\n", submake->base_dir, + submake->programs.str[j], tools_ext, submake->base_dir ); + } + if (submake->programs.count || submake->sharedlib) + { + struct strarray libs = get_expanded_make_var_array( submake, "EXTRALIBS" ); + for (j = 0; j < submake->programs.count; j++) + strarray_addall( &libs, get_expanded_file_local_var( submake, + submake->programs.str[j], "LDFLAGS" )); + output( "%s: libs/port", submake->base_dir ); + for (j = 0; j < libs.count; j++) + { + if (!strcmp( libs.str[j], "-lwpp" )) output_filename( "libs/wpp" ); + if (!strcmp( libs.str[j], "-lwine" )) output_filename( "libs/wine" ); + } + output( "\n" ); + } + } if (submake->install_rules[INSTALL_LIB].count) { @@ -3532,6 +3557,13 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output_filenames( makefile_deps ); output( ":\n" ); + if (tooldeps_deps.count) + { + output( "__tooldeps__:" ); + output_filenames( tooldeps_deps ); + output( "\n" ); + strarray_add( &make->phony_targets, "__tooldeps__" ); + } if (winetest_deps.count) { output( "programs/winetest:" );

1 0

Alistair Leslie-Hughes : kernel32: Add DequeueUmsCompletionListItems stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: 70c8126ffcab325f17083a140158c181a26580cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c8126ffcab325f17083a14… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:59 2018 +0000 kernel32: Add DequeueUmsCompletionListItems stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c780e3a..86edcfd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -377,7 +377,7 @@ @ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr) @ stdcall DeleteVolumeMountPointA(str) @ stdcall DeleteVolumeMountPointW(wstr) -# @ stub -arch=x86_64 DequeueUmsCompletionListItems +@ stdcall -arch=x86_64 DequeueUmsCompletionListItems(ptr long ptr) @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) @ stdcall DisableThreadLibraryCalls(long) @ stdcall DisconnectNamedPipe(long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index dffc60d..63de750 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4272,6 +4272,16 @@ BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT ctx) return FALSE; } +/*********************************************************************** + * DequeueUmsCompletionListItems (KERNEL32.@) + */ +BOOL WINAPI DequeueUmsCompletionListItems(void *list, DWORD timeout, PUMS_CONTEXT *ctx) +{ + FIXME( "%p,%08x,%p: stub\n", list, timeout, ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index f39d659..7d0eaa6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1916,6 +1916,7 @@ WINBASEAPI BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR); #define DeleteVolumeMountPoint WINELIB_NAME_AW(DeleteVolumeMountPoint) +WINBASEAPI BOOL WINAPI DequeueUmsCompletionListItems(void *, DWORD, PUMS_CONTEXT *); WINADVAPI BOOL WINAPI DeregisterEventSource(HANDLE); WINADVAPI BOOL WINAPI DestroyPrivateObjectSecurity(PSECURITY_DESCRIPTOR*); WINBASEAPI BOOL WINAPI DeviceIoControl(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPOVERLAPPED);

1 0