June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : mouse.drv: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: c1a01fd399725f69979edcdffbba80be95fda191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a01fd399725f69979edcdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:02 2019 +0200 mouse.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mouse.drv16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in index 7fe1386..ce1ea19 100644 --- a/dlls/mouse.drv16/Makefile.in +++ b/dlls/mouse.drv16/Makefile.in @@ -1,7 +1,7 @@ MODULE = mouse.drv16 IMPORTS = user32 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = mouse.c

1 0

Alexandre Julliard : mmdevapi: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: eae787f9134340d27e8a41c45fbb6dddf2b41e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae787f9134340d27e8a41c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:27:51 2019 +0200 mmdevapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/Makefile.in | 2 ++ dlls/mmdevapi/audiovolume.c | 2 -- dlls/mmdevapi/devenum.c | 7 ++----- dlls/mmdevapi/main.c | 7 +------ dlls/mmdevapi/mmdevapi.h | 4 ---- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 530f767..5f44f7b 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,6 +1,8 @@ MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ audiovolume.c \ devenum.c \ diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 76f9f4e..24d210a 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -26,7 +25,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "ole2.h" #include "mmdeviceapi.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 685ec27..82e1bb9 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define NONAMELESSUNION @@ -28,7 +26,6 @@ #include "winreg.h" #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "initguid.h" #include "ole2.h" @@ -448,7 +445,7 @@ static HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (strlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + DWORD size_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); WCHAR *name = HeapAlloc(GetProcessHeap(), 0, size_bytes); memcpy(name, pv.u.pwszVal, size_bytes); MMDevice_Create(name, &guid, curflow, @@ -1431,7 +1428,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR RegCloseKey(propkey); buffer[38] = 0; CLSIDFromString(buffer, &key->fmtid); - key->pid = atoiW(&buffer[39]); + key->pid = wcstol(&buffer[39], NULL, 10); return S_OK; } diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 8886975..7680b45 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -17,16 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/library.h" #include "ole2.h" #include "olectl.h" @@ -44,7 +40,6 @@ #include "mmdevapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); @@ -139,7 +134,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) TRACE("Loading driver list %s\n", wine_dbgstr_w(driver_list)); for(next = p = driver_list; next; p = next + 1){ - next = strchrW(p, ','); + next = wcschr(p, ','); if(next) *next = '\0'; diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index b85c757..bc9788e 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -16,10 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : mmdevldr.vxd: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 4f91b614562a66be8cda78c026da2a6e17a4e4ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f91b614562a66be8cda78c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:28:21 2019 +0200 mmdevldr.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevldr.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mmdevldr.vxd/Makefile.in b/dlls/mmdevldr.vxd/Makefile.in index 096ae7c..3885733 100644 --- a/dlls/mmdevldr.vxd/Makefile.in +++ b/dlls/mmdevldr.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = mmdevldr.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mmdevldr.c

1 0

Alexandre Julliard : mlang: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: ea992bfd90e32b6b415824af2c9b0244b2d2fd4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea992bfd90e32b6b415824af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:26:51 2019 +0200 mlang: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/Makefile.in | 2 ++ dlls/mlang/mlang.c | 16 +++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in index abee2a2..82d2e56 100644 --- a/dlls/mlang/Makefile.in +++ b/dlls/mlang/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = mlang IMPORTS = uuid ole32 gdi32 advapi32 DELAYIMPORTS = oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mlang.c diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f12df29..1b1aed3 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -38,7 +37,6 @@ #include "mlang.h" #include "mimeole.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" @@ -1283,12 +1281,12 @@ static HRESULT lcid_from_rfc1766(IEnumRfc1766 *iface, LCID *lcid, LPCWSTR rfc176 while (IEnumRfc1766_Next(iface, 1, &info, &num) == S_OK) { - if (!strcmpiW(info.wszRfc1766, rfc1766)) + if (!wcsicmp(info.wszRfc1766, rfc1766)) { *lcid = info.lcid; return S_OK; } - if (strlenW(rfc1766) == 2 && !memcmp(info.wszRfc1766, rfc1766, 2 * sizeof(WCHAR))) + if (lstrlenW(rfc1766) == 2 && !memcmp(info.wszRfc1766, rfc1766, 2 * sizeof(WCHAR))) { *lcid = PRIMARYLANGID(info.lcid); return S_OK; @@ -2426,7 +2424,7 @@ static BOOL CALLBACK enum_locales_proc(LPWSTR locale) info = &data->info[data->total]; - info->lcid = strtolW(locale, &end, 16); + info->lcid = wcstol(locale, &end, 16); if (*end) /* invalid number */ return FALSE; @@ -2764,14 +2762,14 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( { pCharsetInfo->uiCodePage = mlang_data[i].family_codepage; pCharsetInfo->uiInternetEncoding = mlang_data[i].mime_cp_info[n].cp; - strcpyW(pCharsetInfo->wszCharset, csetW); + lstrcpyW(pCharsetInfo->wszCharset, csetW); return S_OK; } if (mlang_data[i].mime_cp_info[n].alias && !lstrcmpiW(Charset, mlang_data[i].mime_cp_info[n].alias)) { pCharsetInfo->uiCodePage = mlang_data[i].family_codepage; pCharsetInfo->uiInternetEncoding = mlang_data[i].mime_cp_info[n].cp; - strcpyW(pCharsetInfo->wszCharset, mlang_data[i].mime_cp_info[n].alias); + lstrcpyW(pCharsetInfo->wszCharset, mlang_data[i].mime_cp_info[n].alias); return S_OK; } } @@ -2793,7 +2791,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( { pCharsetInfo->uiCodePage = mlang_data[i].family_codepage; pCharsetInfo->uiInternetEncoding = mlang_data[i].mime_cp_info[n].cp; - strcpyW(pCharsetInfo->wszCharset, csetW); + lstrcpyW(pCharsetInfo->wszCharset, csetW); return S_OK; } } @@ -3951,7 +3949,7 @@ static BOOL register_codepages(void) { for (info = family->mime_cp_info; info < family->mime_cp_info + family->number_of_cp; info++) { - sprintfW(buf, formatW, info->cp); + swprintf(buf, ARRAY_SIZE(buf), formatW, info->cp); status = RegCreateKeyW(db_key, buf, &key); if (status != ERROR_SUCCESS) continue;

1 0

Alexandre Julliard : mfplay: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 85f96e49671c6ccbb4f1f0c0fff7c86a5c76b26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f96e49671c6ccbb4f1f0c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:25:58 2019 +0200 mfplay: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 1ecf743..401c0c7 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,4 +1,6 @@ MODULE = mfplay.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ player.c

1 0

Alexandre Julliard : mfplat: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 7844b363d9f3692ac241ac88773351775a0da40b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7844b363d9f3692ac241ac88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:25:47 2019 +0200 mfplat: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 2 ++ dlls/mfplat/main.c | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index eb9b26f..f3484fa 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -2,6 +2,8 @@ MODULE = mfplat.dll IMPORTLIB = mfplat IMPORTS = advapi32 ole32 mfuuid propsys +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ main.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4082f9e..c0866f7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -33,7 +33,6 @@ #include "propsys.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "mfplat_private.h" @@ -127,7 +126,7 @@ static const BYTE guid_conv_table[256] = static WCHAR* GUIDToString(WCHAR *str, REFGUID guid) { - sprintfW(str, szGUIDFmt, guid->Data1, guid->Data2, + swprintf(str, 39, szGUIDFmt, 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]); @@ -216,14 +215,14 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 UINT8 *blob; GUIDToString(buffer, clsid); - sprintfW(str, reg_format, transform_keyW, buffer); + swprintf(str, ARRAY_SIZE(str), reg_format, transform_keyW, buffer); if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) hr = HRESULT_FROM_WIN32(ret); if (SUCCEEDED(hr)) { - size = (strlenW(name) + 1) * sizeof(WCHAR); + size = (lstrlenW(name) + 1) * sizeof(WCHAR); if ((ret = RegSetValueExW(hclsid, NULL, 0, REG_SZ, (BYTE *)name, size))) hr = HRESULT_FROM_WIN32(ret); } @@ -280,7 +279,7 @@ static HRESULT register_category(CLSID *clsid, GUID *category) GUIDToString(guid1, category); GUIDToString(guid2, clsid); - sprintfW(str, reg_format, categories_keyW, guid1, guid2); + swprintf(str, ARRAY_SIZE(str), reg_format, categories_keyW, guid1, guid2); if (RegCreateKeyW(HKEY_CLASSES_ROOT, str, &htmp1)) return E_FAIL; @@ -1342,7 +1341,7 @@ HRESULT attributes_GetStringLength(struct attributes *attributes, REFGUID key, U if (attribute) { if (attribute->value.vt == MF_ATTRIBUTE_STRING) - *length = strlenW(attribute->value.u.pwszVal); + *length = lstrlenW(attribute->value.u.pwszVal); else hr = MF_E_INVALIDTYPE; } @@ -1367,7 +1366,7 @@ HRESULT attributes_GetString(struct attributes *attributes, REFGUID key, WCHAR * { if (attribute->value.vt == MF_ATTRIBUTE_STRING) { - int len = strlenW(attribute->value.u.pwszVal); + int len = lstrlenW(attribute->value.u.pwszVal); if (length) *length = len; @@ -2252,7 +2251,7 @@ HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, U data = value.u.puuid; break; case MF_ATTRIBUTE_STRING: - item.u.subheader.size = (strlenW(value.u.pwszVal) + 1) * sizeof(WCHAR); + item.u.subheader.size = (lstrlenW(value.u.pwszVal) + 1) * sizeof(WCHAR); data = value.u.pwszVal; break; case MF_ATTRIBUTE_BLOB: @@ -5037,7 +5036,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA } /* Extension */ - url_ext = url ? strrchrW(url, '.') : NULL; + url_ext = url ? wcsrchr(url, '.') : NULL; if (!url_ext && !mimeW) { @@ -5126,7 +5125,7 @@ static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSch /* RFC 3986: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) */ while (*ptr) { - WCHAR ch = tolowerW(*ptr); + WCHAR ch = towlower(*ptr); if (*ptr == '*' && ptr == url) { @@ -7162,7 +7161,7 @@ static WCHAR *heap_strdupW(const WCHAR *str) { unsigned int size; - size = (strlenW(str) + 1) * sizeof(WCHAR); + size = (lstrlenW(str) + 1) * sizeof(WCHAR); ret = heap_alloc(size); if (ret) memcpy(ret, str, size);

1 0

Alexandre Julliard : mpr: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 1e117a5682e829cb5b92eedb2d562757cf9076aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e117a5682e829cb5b92eedb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:30 2019 +0200 mpr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/Makefile.in | 2 ++ dlls/mpr/nps.c | 3 --- dlls/mpr/wnet.c | 51 +++++++++++++++++++++++++-------------------------- 3 files changed, 27 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e117a5682e829cb5b92…

1 0

Alexandre Julliard : midimap: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: d86b02958d70557f489b49a53335a389f8c3a0b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86b02958d70557f489b49a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:26:30 2019 +0200 midimap: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/Makefile.in | 2 ++ dlls/midimap/midimap.c | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in index c0e66f4..d36c408 100644 --- a/dlls/midimap/Makefile.in +++ b/dlls/midimap/Makefile.in @@ -1,5 +1,7 @@ MODULE = midimap.dll IMPORTS = winmm user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ midimap.c diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 540dac3..d15e3d7 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "mmddk.h" #include "winreg.h" -#include "wine/unicode.h" #include "wine/debug.h" /* @@ -113,7 +112,7 @@ static BOOL MIDIMAP_FindPort(const WCHAR* name, unsigned* dev) for (*dev = 0; *dev < numMidiOutPorts; (*dev)++) { TRACE("%s\n", wine_dbgstr_w(midiOutPorts[*dev].name)); - if (strcmpW(midiOutPorts[*dev].name, name) == 0) + if (lstrcmpW(midiOutPorts[*dev].name, name) == 0) return TRUE; } /* try the form #nnn */ @@ -568,14 +567,14 @@ static LRESULT MIDIMAP_drvOpen(void) { if (midiOutGetDevCapsW(dev, &moc, sizeof(moc)) == 0L) { - strcpyW(midiOutPorts[dev].name, moc.szPname); + lstrcpyW(midiOutPorts[dev].name, moc.szPname); midiOutPorts[dev].loaded = 0; midiOutPorts[dev].hMidi = 0; midiOutPorts[dev].uDevID = dev; midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; - if (strncmpW(midiOutPorts[dev].name, throughportW, strlenW(throughportW)) != 0) + if (wcsncmp(midiOutPorts[dev].name, throughportW, lstrlenW(throughportW)) != 0) found_valid_port = TRUE; } else

1 0

Alexandre Julliard : mgmtapi: Build with msvcrt.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 1eafc6dbe5fb08551f149daa78b34b70eb215ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eafc6dbe5fb08551f149daa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:26:18 2019 +0200 mgmtapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mgmtapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mgmtapi/Makefile.in b/dlls/mgmtapi/Makefile.in index 2af1626..0093f74 100644 --- a/dlls/mgmtapi/Makefile.in +++ b/dlls/mgmtapi/Makefile.in @@ -1,3 +1,5 @@ MODULE = mgmtapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = mgmtapi.c

1 0

Józef Kucia : vkd3d: Factor out vkd3d_create_thread() .
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: vkd3d Branch: master Commit: bc5e8a9cc2fd19aab45a7127b9f23114e65dbc4e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bc5e8a9cc2fd19aab45a712… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:37 2019 +0200 vkd3d: Factor out vkd3d_create_thread(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 25 ++++++------------------- libs/vkd3d/device.c | 27 ++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 16 ++++++++++------ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 97cc7de..0c2fd3e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -410,6 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, struct d3d12_device *device) { + HRESULT hr; int rc; TRACE("worker %p.\n", worker); @@ -437,28 +438,14 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, return hresult_from_errno(rc); } - if (device->create_thread) - { - if (!(worker->u.handle = device->create_thread(vkd3d_fence_worker_main, worker))) - { - ERR("Failed to create fence worker thread.\n"); - pthread_mutex_destroy(&worker->mutex); - pthread_cond_destroy(&worker->cond); - return E_FAIL; - } - - return S_OK; - } - - if ((rc = pthread_create(&worker->u.thread, NULL, vkd3d_fence_worker_main, worker))) + if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, + vkd3d_fence_worker_main, worker, &worker->thread))) { - ERR("Failed to create fence worker thread, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); - return hresult_from_errno(rc); } - return S_OK; + return hr; } HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, @@ -482,7 +469,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if (device->join_thread) { - if (FAILED(hr = device->join_thread(worker->u.handle))) + if (FAILED(hr = device->join_thread(worker->thread.handle))) { ERR("Failed to join fence worker thread, hr %#x.\n", hr); return hr; @@ -490,7 +477,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, } else { - if ((rc = pthread_join(worker->u.thread, NULL))) + if ((rc = pthread_join(worker->thread.pthread, NULL))) { ERR("Failed to join fence worker thread, error %d.\n", rc); return hresult_from_errno(rc); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4df2462..e88d3c2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3112,7 +3112,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_instance_incref(device->vkd3d_instance = instance); device->vk_info = instance->vk_info; device->signal_event = instance->signal_event; - device->create_thread = instance->create_thread; device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; @@ -3198,6 +3197,32 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, device->removed_reason = reason; } +HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) +{ + HRESULT hr = S_OK; + int rc; + + if (instance->create_thread) + { + if (!(thread->handle = instance->create_thread(thread_main, data))) + { + ERR("Failed to create thread.\n"); + hr = E_FAIL; + } + } + else + { + if ((rc = pthread_create(&thread->pthread, NULL, thread_main, data))) + { + ERR("Failed to create thread, error %d.\n", rc); + hr = hresult_from_errno(rc); + } + } + + return hr; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9191ae2..2fbf692 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -141,13 +141,18 @@ struct vkd3d_instance LONG refcount; }; +union vkd3d_thread_handle +{ + pthread_t pthread; + void *handle; +}; + +HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; + struct vkd3d_fence_worker { - union - { - pthread_t thread; - void *handle; - } u; + union vkd3d_thread_handle thread; pthread_mutex_t mutex; pthread_cond_t cond; bool should_exit; @@ -1014,7 +1019,6 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - PFN_vkd3d_create_thread create_thread; PFN_vkd3d_join_thread join_thread; IUnknown *parent;

1 0