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

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR9 filter.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 57df3a452c26c26ae9312631dbad051d86f6fcfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=57df3a452c26c26ae9312631… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:51 2019 -0500 quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR9 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index cbaf081..6df3470 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -386,6 +386,70 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + static const WCHAR inW[] = {'I','n',0}; + + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr9(0); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + IBaseFilter_EnumPins(filter, &enum_pins); + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, inW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + IEnumPins_Reset(enum_pins); + + sink_id[9] = '0'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '2'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + } + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -404,6 +468,7 @@ START_TEST(vmr9) test_filter_config(); test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for querying VMR9 pin information.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 43f549fdcdfadab50425d05d08347f741a1c50c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f549fdcdfadab50425d05d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:52 2019 -0500 quartz/tests: Add tests for querying VMR9 pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 6df3470..f8e6f21 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -450,6 +450,68 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr9(0); + PIN_DIRECTION dir; + ULONG count, ref; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IPin_QueryPinInfo(pin, &info); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + sink_id[9] = '1'; + + IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IPin_QueryPinInfo(pin, &info); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + } + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -469,6 +531,7 @@ START_TEST(vmr9) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Gabriel Ivăncescu : comctl32/button: Implement themed split buttons.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 6fbb64fe6751ca2beb8fe832b57751cf6fb8e08d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fbb64fe6751ca2beb8fe832… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:30 2019 +0300 comctl32/button: Implement themed split buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20123 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 47933c0..1f29fb2 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -170,6 +170,7 @@ typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void SB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = { @@ -185,8 +186,8 @@ static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = CB_ThemedPaint, /* BS_AUTORADIOBUTTON */ NULL, /* BS_PUSHBOX */ NULL, /* BS_OWNERDRAW */ - NULL, /* BS_SPLITBUTTON */ - NULL, /* BS_DEFSPLITBUTTON */ + SB_ThemedPaint, /* BS_SPLITBUTTON */ + SB_ThemedPaint, /* BS_DEFSPLITBUTTON */ NULL, /* BS_COMMANDLINK */ NULL, /* BS_DEFCOMMANDLINK */ }; @@ -2526,6 +2527,114 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (hPrevFont) SelectObject(hDC, hPrevFont); } +static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) +{ + HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL; + RECT rc, content_rect, push_rect, dropdown_rect; + NMCUSTOMDRAW nmcd; + LRESULT cdrf; + HWND parent; + + GetClientRect(infoPtr->hwnd, &rc); + init_custom_draw(&nmcd, infoPtr, hDC, &rc); + + parent = GetParent(infoPtr->hwnd); + if (!parent) parent = infoPtr->hwnd; + + /* Send erase notifications */ + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + + /* The zone outside the content is ignored for the dropdown (draws over) */ + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &rc, &content_rect); + get_split_button_rects(infoPtr, &rc, &push_rect, &dropdown_rect); + + if (infoPtr->split_style & BCSS_NOSPLIT) + { + push_rect = rc; + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, NULL); + } + else + { + RECT r = { dropdown_rect.left, content_rect.top, dropdown_rect.right, content_rect.bottom }; + UINT edge = (infoPtr->split_style & BCSS_ALIGNLEFT) ? BF_RIGHT : BF_LEFT; + const RECT *clip = NULL; + + /* If only the dropdown is pressed, we need to draw it separately */ + if (state != PBS_PRESSED && (infoPtr->state & BST_DROPDOWNPUSHED)) + { + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, PBS_PRESSED, &rc, &dropdown_rect); + clip = &push_rect; + } + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, clip); + + /* Draw the separator */ + DrawThemeEdge(theme, hDC, BP_PUSHBUTTON, state, &r, EDGE_ETCHED, edge, NULL); + + /* The content rect should be the content area of the push button */ + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &content_rect); + } + + if (cdrf & CDRF_NOTIFYPOSTERASE) + { + nmcd.dwDrawStage = CDDS_POSTERASE; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + + /* Send paint notifications */ + nmcd.dwDrawStage = CDDS_PREPAINT; + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + + if (!(cdrf & CDRF_DOERASE)) + { + COLORREF old_color, color; + INT old_bk_mode; + WCHAR *text; + + if ((text = get_button_text(infoPtr))) + { + DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &content_rect); + heap_free(text); + } + + GetThemeColor(theme, BP_PUSHBUTTON, state, TMT_TEXTCOLOR, &color); + old_bk_mode = SetBkMode(hDC, TRANSPARENT); + old_color = SetTextColor(hDC, color); + + draw_split_button_dropdown_glyph(infoPtr, hDC, &dropdown_rect); + + SetTextColor(hDC, old_color); + SetBkMode(hDC, old_bk_mode); + } + + if (cdrf & CDRF_NOTIFYPOSTPAINT) + { + nmcd.dwDrawStage = CDDS_POSTPAINT; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + + if (focused) + { + MARGINS margins; + + GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); + + push_rect.left += margins.cxLeftWidth; + push_rect.top += margins.cyTopHeight; + push_rect.right -= margins.cxRightWidth; + push_rect.bottom -= margins.cyBottomHeight; + DrawFocusRect(hDC, &push_rect); + } + +cleanup: + if (old_font) SelectObject(hDC, old_font); +} + void BUTTON_Register(void) { WNDCLASSW wndClass;

1 0

Isira Seneviratne : kernel32/winerror: Correct capitalization of "Windows" in ERROR_OLD_WIN_VERSION string.
by Alexandre Julliard April 4, 2019

April 4, 2019

1 0

Gijs Vermeulen : mssign32: Add SignerSignEx stub.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ec814c107470e6dd63cf33ed2c87bd5fefaeeaa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec814c107470e6dd63cf33ed… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Apr 4 02:55:42 2019 +0200 mssign32: Add SignerSignEx stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46903 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/mssign32.spec | 2 +- dlls/mssign32/mssign32_main.c | 12 ++++ dlls/mssign32/mssign32_private.h | 124 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 1 deletion(-) diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec index 07d7a99..c7b3cef 100644 --- a/dlls/mssign32/mssign32.spec +++ b/dlls/mssign32/mssign32.spec @@ -24,7 +24,7 @@ @ stub SignerCreateTimeStampRequest @ stub SignerFreeSignerContext @ stub SignerSign -@ stub SignerSignEx +@ stdcall SignerSignEx(long ptr ptr ptr ptr wstr ptr ptr ptr) @ stub SignerTimeStamp @ stub SignerTimeStampEx @ stub SpcGetCertFromKey diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index e35488b..2a5365e 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -28,6 +28,8 @@ #include "wine/debug.h" +#include "mssign32_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(mssign); BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) @@ -72,3 +74,13 @@ void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD d FIXME("%08lx %s %d %s stub\n", hProv, debugstr_w(pwszCapiProvider), dwProviderType, debugstr_w(pwszTmpContainer)); } + +HRESULT WINAPI SignerSignEx(DWORD flags, SIGNER_SUBJECT_INFO *subject_info, SIGNER_CERT *signer_cert, + SIGNER_SIGNATURE_INFO *signature_info, SIGNER_PROVIDER_INFO *provider_info, + const WCHAR *http_time_stamp, CRYPT_ATTRIBUTES *request, void *sip_data, + SIGNER_CONTEXT **signer_context) +{ + FIXME("%x %p %p %p %p %s %p %p %p stub\n", flags, subject_info, signer_cert, signature_info, provider_info, + wine_dbgstr_w(http_time_stamp), request, sip_data, signer_cert); + return E_NOTIMPL; +} diff --git a/dlls/mssign32/mssign32_private.h b/dlls/mssign32/mssign32_private.h new file mode 100644 index 0000000..a4e5d36 --- /dev/null +++ b/dlls/mssign32/mssign32_private.h @@ -0,0 +1,124 @@ +/* + * Copyright 2019 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" + +#define SPC_EXC_PE_PAGE_HASHES_FLAG 0x10 +#define SPC_INC_PE_IMPORT_ADDR_TABLE_FLAG 0x20 +#define SPC_INC_PE_DEBUG_INFO_FLAG 0x40 +#define SPC_INC_PE_RESOURCES_FLAG 0x80 +#define SPC_INC_PE_PAGE_HASHES_FLAG 0x100 + +#define SIGNER_CERT_SPC_FILE 1 +#define SIGNER_CERT_STORE 2 +#define SIGNER_CERT_SPC_CHAIN 3 + +#define SIGNER_CERT_POLICY_STORE 0x1 +#define SIGNER_CERT_POLICY_CHAIN 0x2 +#define SIGNER_CERT_POLICY_CHAIN_NO_ROOT 0x8 + +#define SIGNER_NO_ATTR 0 +#define SIGNER_AUTHCODE_ATTR 1 + +typedef struct _SIGNER_CONTEXT { + DWORD cbSize; + DWORD cbBlob; + BYTE *pbBlob; +} SIGNER_CONTEXT, *PSIGNER_CONTEXT; + +typedef struct _SIGNER_FILE_INFO { + DWORD cbSize; + const WCHAR *pwszFileName; + HANDLE hFile; +} SIGNER_FILE_INFO, *PSIGNER_FILE_INFO; + +typedef struct _SIGNER_BLOB_INFO { + DWORD cbSize; + GUID *pGuidSubject; + DWORD cbBlob; + BYTE *pbBlob; + const WCHAR *pwszDisplayName; +} SIGNER_BLOB_INFO, *PSIGNER_BLOB_INFO; + +typedef struct _SIGNER_SUBJECT_INFO { + DWORD cbSize; + DWORD *pdwIndex; + DWORD dwSubjectChoice; + union { + SIGNER_FILE_INFO *pSignerFileInfo; + SIGNER_BLOB_INFO *pSignerBlobInfo; + }; +} SIGNER_SUBJECT_INFO, *PSIGNER_SUBJECT_INFO; + +typedef struct _SIGNER_CERT_STORE_INFO { + DWORD cbSize; + const CERT_CONTEXT *pSigningCert; + DWORD dwCertPolicy; + HCERTSTORE hCertStore; +} SIGNER_CERT_STORE_INFO, *PSIGNER_CERT_STORE_INFO; + +typedef struct _SIGNER_SPC_CHAIN_INFO { + DWORD cbSize; + const WCHAR *pwszSpcFile; + DWORD dwCertPolicy; + HCERTSTORE hCertStore; +} SIGNER_SPC_CHAIN_INFO, *PSIGNER_SPC_CHAIN_INFO; + +typedef struct _SIGNER_CERT { + DWORD cbSize; + DWORD dwCertChoice; + union { + const WCHAR *pwszSpcFile; + SIGNER_CERT_STORE_INFO *pCertStoreInfo; + SIGNER_SPC_CHAIN_INFO *pSpcChainInfo; + }; + HWND hwnd; +} SIGNER_CERT, *PSIGNER_CERT; + +typedef struct _SIGNER_ATTR_AUTHCODE { + DWORD cbSize; + BOOL fCommercial; + BOOL fIndividual; + const WCHAR *pwszName; + const WCHAR *pwszInfo; +} SIGNER_ATTR_AUTHCODE, *PSIGNER_ATTR_AUTHCODE; + +typedef struct _SIGNER_SIGNATURE_INFO { + DWORD cbSize; + ALG_ID algidHash; + DWORD dwAttrChoice; + union { + SIGNER_ATTR_AUTHCODE *pAttrAuthcode; + }; + CRYPT_ATTRIBUTES *psAuthenticated; + CRYPT_ATTRIBUTES *psUnauthenticated; +} SIGNER_SIGNATURE_INFO, *PSIGNER_SIGNATURE_INFO; + +typedef struct _SIGNER_PROVIDER_INFO { + DWORD cbSize; + const WCHAR *pwszProviderName; + DWORD dwProviderType; + DWORD dwKeySpec; + DWORD dwPvkChoice; + union { + WCHAR *pwszPvkFileName; + WCHAR *pwszKeyContainer; + }; +} SIGNER_PROVIDER_INFO, *PSIGNER_PROVIDER_INFO;

1 0

Alexandre Julliard : configure: Add --with-mingw option and print a notice when not found.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: a3cf86a18446e9d7df4e045b83d3aa3d9193512a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3cf86a18446e9d7df4e045b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 11:13:17 2019 +0200 configure: Add --with-mingw option and print a notice when not found. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 27 ++++++++++++++++++++++++--- configure.ac | 11 +++++++++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/configure b/configure index e1d666c..c7ce13c 100755 --- a/configure +++ b/configure @@ -853,6 +853,7 @@ with_hal with_jpeg with_krb5 with_ldap +with_mingw with_mpg123 with_netapi with_openal @@ -2522,6 +2523,7 @@ Optional Packages: --without-jpeg do not use JPEG --without-krb5 do not use krb5 (Kerberos) --without-ldap do not use LDAP + --without-mingw do not use the MinGW cross-compiler --without-mpg123 do not use the mpg123 library --without-netapi do not use the Samba NetAPI library --without-openal do not use OpenAL @@ -3945,6 +3947,12 @@ if test "${with_ldap+set}" = set; then : fi +# Check whether --with-mingw was given. +if test "${with_mingw+set}" = set; then : + withval=$with_mingw; +fi + + # Check whether --with-mpg123 was given. if test "${with_mpg123+set}" = set; then : withval=$with_mpg123; @@ -5504,6 +5512,7 @@ case $host in ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} + with_mingw=${with_mingw:-no} CFLAGS="$CFLAGS -D_WIN32" ;; esac @@ -9592,9 +9601,10 @@ test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDL CROSSTARGET="" -if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" +if test "x$with_mingw" != xno then - case "$host_cpu" in + case "x$with_mingw" in + x|xyes) case "$host_cpu" in aarch64*) ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; arm*) @@ -9651,7 +9661,9 @@ fi test -n "$CROSSCC" && break done test -n "$CROSSCC" || CROSSCC="false" - + ;; + *) CROSSCC=$with_mingw ;; + esac if test "$CROSSCC" != "false" then ac_save_CC="$CC" @@ -9692,6 +9704,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi +if test "x$CROSSTARGET" = "x"; then : + case "x$with_mingw" in + x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;; + xno) ;; + *) as_fn_error $? "MinGW compiler not found, cross-compiling PE files won't be supported. +This is an error since --with-mingw was requested." "$LINENO" 5 ;; +esac + +fi if test "$ac_cv_header_pthread_h" = "yes" diff --git a/configure.ac b/configure.ac index 4fa77dc..233fabd 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,7 @@ AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)])) AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) +AC_ARG_WITH(mingw, AS_HELP_STRING([--without-mingw],[do not use the MinGW cross-compiler])) AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library])) AC_ARG_WITH(netapi, AS_HELP_STRING([--without-netapi],[do not use the Samba NetAPI library])) AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -140,6 +141,7 @@ case $host in ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} + with_mingw=${with_mingw:-no} CFLAGS="$CFLAGS -D_WIN32" ;; esac @@ -991,9 +993,12 @@ test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDL dnl Check for cross compiler to build test programs AC_SUBST(CROSSTARGET,"") -if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" +if test "x$with_mingw" != xno then - WINE_CHECK_MINGW_PROG(CROSSCC,false) + case "x$with_mingw" in + x|xyes) WINE_CHECK_MINGW_PROG(CROSSCC,false) ;; + *) CROSSCC=$with_mingw ;; + esac if test "$CROSSCC" != "false" then ac_save_CC="$CC" @@ -1016,6 +1021,8 @@ then AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-$CFLAGS}) fi fi +WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], + [MinGW compiler not found, cross-compiling PE files won't be supported.]) dnl **** Check for pthread ****

1 0

Alexandre Julliard : configure: Remove some obsolete checks.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 8d20ad28c327fbfa60b7353d0c6808fa30c5759b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d20ad28c327fbfa60b7353d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:50:48 2019 +0200 configure: Remove some obsolete checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 90 +++-------------------------------------------------- configure.ac | 39 ++--------------------- include/config.h.in | 48 ---------------------------- 3 files changed, 7 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d20ad28c327fbfa60b7…

1 0

Alexandre Julliard : configure: Also build msvcrt for Windows.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 5646582e5bf3e93206de575d231c1eaa3f7c3389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5646582e5bf3e93206de575d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 11:01:39 2019 +0200 configure: Also build msvcrt for Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - 2 files changed, 2 deletions(-) diff --git a/configure b/configure index 200f612..e1d666c 100755 --- a/configure +++ b/configure @@ -8151,7 +8151,6 @@ fi DLLEXT="" enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} - enable_msvcrt=${enable_msvcrt:-no} enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} diff --git a/configure.ac b/configure.ac index b1839a4..4fa77dc 100644 --- a/configure.ac +++ b/configure.ac @@ -720,7 +720,6 @@ case $host_os in dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} - enable_msvcrt=${enable_msvcrt:-no} enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no}

1 0

Alexandre Julliard : winedump: Avoid using mmap().
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 82c44208b42583e0d1b3a34742da3d2d4c35b175 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c44208b42583e0d1b3a347… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:49:04 2019 +0200 winedump: Avoid using mmap(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/dump.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f608075..85bc681 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -34,9 +34,6 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #include <fcntl.h> #include "windef.h" @@ -260,13 +257,8 @@ BOOL dump_analysis(const char *name, file_dumper fn, enum FileSig wanted_sig) if (fstat(fd, &s) < 0) fatal("Can't get size"); dump_total_len = s.st_size; -#ifdef HAVE_MMAP - if ((dump_base = mmap(NULL, dump_total_len, PROT_READ, MAP_PRIVATE, fd, 0)) == (void *)-1) -#endif - { - if (!(dump_base = malloc( dump_total_len ))) fatal( "Out of memory" ); - if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); - } + if (!(dump_base = malloc( dump_total_len ))) fatal( "Out of memory" ); + if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); printf("Contents of %s: %ld bytes\n\n", name, dump_total_len); @@ -286,12 +278,7 @@ BOOL dump_analysis(const char *name, file_dumper fn, enum FileSig wanted_sig) } if (ret) printf("Done dumping %s\n", name); -#ifdef HAVE_MMAP - if (munmap(dump_base, dump_total_len) == -1) -#endif - { - free( dump_base ); - } + free( dump_base ); close(fd); return ret;

1 0

Gijs Vermeulen : mssign32: Implement SignerFreeSignerContext.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: e71bb692f3ea33fee32c6d68946098a5e1d89444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e71bb692f3ea33fee32c6d68… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Apr 4 02:55:43 2019 +0200 mssign32: Implement SignerFreeSignerContext. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46903 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/mssign32.spec | 2 +- dlls/mssign32/mssign32_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec index c7b3cef..f25e23e 100644 --- a/dlls/mssign32/mssign32.spec +++ b/dlls/mssign32/mssign32.spec @@ -22,7 +22,7 @@ @ stub SignerAddTimeStampResponse @ stub SignerAddTimeStampResponseEx @ stub SignerCreateTimeStampRequest -@ stub SignerFreeSignerContext +@ stdcall SignerFreeSignerContext(ptr) @ stub SignerSign @ stdcall SignerSignEx(long ptr ptr ptr ptr wstr ptr ptr ptr) @ stub SignerTimeStamp diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 2a5365e..8b0720e 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -27,6 +27,7 @@ #include "wincrypt.h" #include "wine/debug.h" +#include "wine/heap.h" #include "mssign32_private.h" @@ -84,3 +85,9 @@ HRESULT WINAPI SignerSignEx(DWORD flags, SIGNER_SUBJECT_INFO *subject_info, SIGN wine_dbgstr_w(http_time_stamp), request, sip_data, signer_cert); return E_NOTIMPL; } + +HRESULT WINAPI SignerFreeSignerContext(SIGNER_CONTEXT *signer_context) +{ + heap_free(signer_context); + return S_OK; +}

1 0

Alexandre Julliard : ntdll: Define IsBadStringPtr to handle exceptions in debug traces.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: bb83b68832553ed74f47c07a90ace0ed68d4e04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb83b68832553ed74f47c07a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 09:39:14 2019 +0200 ntdll: Define IsBadStringPtr to handle exceptions in debug traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/debug.h | 6 ------ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 59177b7..8286c9d 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -346,3 +346,47 @@ void __wine_spec_unimplemented_stub( const char *module, const char *function ) record.ExceptionInformation[1] = (ULONG_PTR)function; for (;;) RtlRaiseException( &record ); } + + +/************************************************************* + * IsBadStringPtrA + * + * IsBadStringPtrA replacement for ntdll, to catch exception in debug traces. + */ +BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) +{ + if (!str) return TRUE; + __TRY + { + volatile const char *p = str; + while (p != str + max) if (!*p++) break; + } + __EXCEPT_PAGE_FAULT + { + return TRUE; + } + __ENDTRY + return FALSE; +} + + +/************************************************************* + * IsBadStringPtrW + * + * IsBadStringPtrW replacement for ntdll, to catch exception in debug traces. + */ +BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) +{ + if (!str) return TRUE; + __TRY + { + volatile const WCHAR *p = str; + while (p != str + max) if (!*p++) break; + } + __EXCEPT_PAGE_FAULT + { + return TRUE; + } + __ENDTRY + return FALSE; +} diff --git a/include/wine/debug.h b/include/wine/debug.h index c7eb185..bb72827 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -24,9 +24,7 @@ #include <stdarg.h> #include <stdio.h> #include <windef.h> -#ifndef _NTSYSTEM_ #include <winbase.h> -#endif #ifndef GUID_DEFINED #include <guiddef.h> #endif @@ -227,9 +225,7 @@ static inline const char *wine_dbgstr_an( const char *str, int n ) if (!str) return "(null)"; if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); -#ifndef _NTSYSTEM_ if (IsBadStringPtrA( str, n )) return "(invalid)"; -#endif if (n == -1) for (n = 0; str[n]; n++) ; *dst++ = '"'; while (n-- > 0 && dst <= buffer + sizeof(buffer) - 9) @@ -271,9 +267,7 @@ static inline const char *wine_dbgstr_wn( const WCHAR *str, int n ) if (!str) return "(null)"; if (!((ULONG_PTR)str >> 16)) return wine_dbg_sprintf( "#%04x", LOWORD(str) ); -#ifndef _NTSYSTEM_ if (IsBadStringPtrW( str, n )) return "(invalid)"; -#endif if (n == -1) for (n = 0; str[n]; n++) ; *dst++ = 'L'; *dst++ = '"';

1 0

Alistair Leslie-Hughes : winecrt0: Correct compile error with older gcc.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ab7d86552d19d3ecb0b6f060653fa5af498aa3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab7d86552d19d3ecb0b6f060… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 3 22:51:27 2019 +0000 winecrt0: Correct compile error with older gcc. Using gcc version 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index d7c170c..69a3ea7 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -24,6 +24,7 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h"

1 0

Alexandre Julliard : winebuild: Avoid using mmap().
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 015f31fd5d11839cf5e8739514af075b11041d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=015f31fd5d11839cf5e87395… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:48:57 2019 +0200 winebuild: Avoid using mmap(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index a1cc9aa..d4f8845 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -33,9 +33,6 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #include "build.h" @@ -540,18 +537,13 @@ void init_input_buffer( const char *file ) { int fd; struct stat st; + unsigned char *buffer; if ((fd = open( file, O_RDONLY | O_BINARY )) == -1) fatal_perror( "Cannot open %s", file ); if ((fstat( fd, &st ) == -1)) fatal_perror( "Cannot stat %s", file ); if (!st.st_size) fatal_error( "%s is an empty file\n", file ); -#ifdef HAVE_MMAP - if ((input_buffer = mmap( NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0 )) == (void*)-1) -#endif - { - unsigned char *buffer = xmalloc( st.st_size ); - if (read( fd, buffer, st.st_size ) != st.st_size) fatal_error( "Cannot read %s\n", file ); - input_buffer = buffer; - } + input_buffer = buffer = xmalloc( st.st_size ); + if (read( fd, buffer, st.st_size ) != st.st_size) fatal_error( "Cannot read %s\n", file ); close( fd ); input_buffer_filename = xstrdup( file ); input_buffer_size = st.st_size;

1 0

Alexandre Julliard : libport: Add stubs for libwine functions that don' t make sense on Windows.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 69da21f1203851c5ce3936a2cd35e175588d2353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69da21f1203851c5ce3936a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:01:31 2019 +0200 libport: Add stubs for libwine functions that don't make sense on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/port/stubs.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 18cbf79..a2e96d1 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -103,6 +103,7 @@ C_SRCS = \ statvfs.c \ string.c \ strnlen.c \ + stubs.c \ symlink.c \ usleep.c \ utf8.c \ diff --git a/libs/port/stubs.c b/libs/port/stubs.c new file mode 100644 index 0000000..4d10535 --- /dev/null +++ b/libs/port/stubs.c @@ -0,0 +1,81 @@ +/* + * Win32 libwine stubs + * + * Copyright 2019 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef _WIN32 + +#include "config.h" + +#include <stdlib.h> +#include "windef.h" + +int __wine_main_argc = 0; +char **__wine_main_argv = NULL; +WCHAR **__wine_main_wargv = NULL; + +const char *wine_get_config_dir(void) +{ + const char *ret = getenv( "WINEPREFIX" ); + if (!ret) ret = getenv( "USERPROFILE" ); + return ret; +} + +const char *wine_get_data_dir(void) +{ + return NULL; +} + +const char *wine_get_build_dir(void) +{ + return NULL; +} + +const char *wine_get_user_name(void) +{ + return getenv( "USERNAME" ); +} + +const char *wine_dll_enum_load_path( unsigned int index ) +{ + return NULL; +} + +void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ) +{ + if (error) + { + static const char msg[] = "no dlopen support on Windows"; + size_t len = min( errorsize, sizeof(msg) ); + memcpy( error, msg, len ); + error[len - 1] = 0; + } + return NULL; +} + +void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize ) +{ + return NULL; +} + +int wine_dlclose( void *handle, char *error, size_t errorsize ) +{ + return 0; +} + +#endif /* _WIN32 */

1 0

Alexandre Julliard : libwine: Remove some conditional code that was only needed for Windows.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 44dc9d7383ccbf0500428681ec20dea3499cd398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44dc9d7383ccbf0500428681… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:49:15 2019 +0200 libwine: Remove some conditional code that was only needed for Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 13 +------------ libs/wine/ldt.c | 2 +- libs/wine/loader.c | 39 --------------------------------------- libs/wine/mmap.c | 10 ---------- 4 files changed, 2 insertions(+), 62 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index b1f526c..3c9110b 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -246,11 +246,9 @@ static void init_server_dir( dev_t dev, ino_t ino ) #ifdef __ANDROID__ /* there's no /tmp dir on Android */ root = build_path( config_dir, ".wineserver" ); -#elif defined(HAVE_GETUID) +#else root = xmalloc( sizeof(server_root_prefix) + 12 ); sprintf( root, "%s-%u", server_root_prefix, getuid() ); -#else - root = xstrdup( server_root_prefix ); #endif server_dir = xmalloc( strlen(root) + sizeof(server_dir_prefix) + 2*sizeof(dev) + 2*sizeof(ino) + 2 ); @@ -285,8 +283,6 @@ static void init_paths(void) const char *home = getenv( "HOME" ); const char *user = NULL; const char *prefix = getenv( "WINEPREFIX" ); - -#ifdef HAVE_GETPWUID char uid_str[32]; struct passwd *pwd = getpwuid( getuid() ); @@ -300,10 +296,6 @@ static void init_paths(void) sprintf( uid_str, "%lu", (unsigned long)getuid() ); user = uid_str; } -#else /* HAVE_GETPWUID */ - if (!(user = getenv( "USER" ))) - fatal_error( "cannot determine your user name, set the USER environment variable\n" ); -#endif /* HAVE_GETPWUID */ user_name = xstrdup( user ); /* build config_dir */ @@ -335,10 +327,7 @@ static void init_paths(void) } } if (!S_ISDIR(st.st_mode)) fatal_error( "%s is not a directory\n", config_dir ); -#ifdef HAVE_GETUID if (st.st_uid != getuid()) fatal_error( "%s is not owned by you\n", config_dir ); -#endif - init_server_dir( st.st_dev, st.st_ino ); } diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 4ecd48a..d3ff821 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -33,7 +33,7 @@ #include "winbase.h" #include "wine/library.h" -#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) +#ifdef __i386__ #ifdef __linux__ diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 8f40ea0..649aa22 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -382,7 +382,6 @@ static void fixup_resources( IMAGE_RESOURCE_DIRECTORY *dir, BYTE *root, int delt /* map a builtin dll in memory and fixup RVAs */ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) { -#ifdef HAVE_MMAP IMAGE_DATA_DIRECTORY *dir; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; @@ -504,9 +503,6 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) fixup_exports( exports, addr, delta ); } return addr; -#else /* HAVE_MMAP */ - return NULL; -#endif /* HAVE_MMAP */ } @@ -673,7 +669,6 @@ int wine_dll_get_owner( const char *name, char *buffer, int size, int *exists ) */ static void set_max_limit( int limit ) { -#ifdef HAVE_SETRLIMIT struct rlimit rlimit; if (!getrlimit( limit, &rlimit )) @@ -692,7 +687,6 @@ static void set_max_limit( int limit ) #endif } } -#endif } @@ -1017,7 +1011,6 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) */ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ) { -#ifdef HAVE_DLOPEN void *ret; const char *s; @@ -1068,16 +1061,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize } dlerror(); return ret; -#else - if (error) - { - static const char msg[] = "dlopen interface not detected by configure"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; - } - return NULL; -#endif } /*********************************************************************** @@ -1085,7 +1068,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize */ void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize ) { -#ifdef HAVE_DLOPEN void *ret; const char *s; dlerror(); dlerror(); @@ -1104,16 +1086,6 @@ void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsiz } dlerror(); return ret; -#else - if (error) - { - static const char msg[] = "dlopen interface not detected by configure"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; - } - return NULL; -#endif } /*********************************************************************** @@ -1121,7 +1093,6 @@ void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsiz */ int wine_dlclose( void *handle, char *error, size_t errorsize ) { -#ifdef HAVE_DLOPEN int ret; const char *s; dlerror(); dlerror(); @@ -1140,14 +1111,4 @@ int wine_dlclose( void *handle, char *error, size_t errorsize ) } dlerror(); return ret; -#else - if (error) - { - static const char msg[] = "dlopen interface not detected by configure"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; - } - return 1; -#endif } diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index caa227f..f2b5adc 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -45,8 +45,6 @@ #include "wine/library.h" #include "wine/list.h" -#ifdef HAVE_MMAP - struct reserved_area { struct list entry; @@ -684,11 +682,3 @@ int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, voi } return ret; } - -#else /* HAVE_MMAP */ - -void mmap_init(void) -{ -} - -#endif

1 0

Alexandre Julliard : makefiles: Don't use libwine for Windows builds.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: f689c723a208971e4e35ea4b5bbf7c48da8ec632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f689c723a208971e4e35ea4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:02:12 2019 +0200 makefiles: Don't use libwine for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - configure | 18 ++-------- configure.ac | 7 ---- libs/wine/Makefile.in | 1 - libs/wine/wine.def | 94 --------------------------------------------------- tools/makedep.c | 25 ++------------ 6 files changed, 5 insertions(+), 141 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4990b04..061103a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,7 +80,6 @@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ WINELOADER_LDFLAGS = @WINELOADER_LDFLAGS@ WINEPRELOADER_LDFLAGS = @WINEPRELOADER_LDFLAGS@ LIBWINE_SHAREDLIB = @LIBWINE_SHAREDLIB@ -LIBWINE_IMPORTLIB = @LIBWINE_IMPORTLIB@ LIBWINE_LDFLAGS = @LIBWINE_LDFLAGS@ LIBWINE_DEPENDS = @LIBWINE_DEPENDS@ DISABLED_SUBDIRS = @DISABLED_SUBDIRS@ diff --git a/configure b/configure index 6f9013c..9a264fa 100755 --- a/configure +++ b/configure @@ -704,8 +704,11 @@ PTHREAD_LIBS CROSSCFLAGS CROSSCC CROSSTARGET +LIBWINE_DEPENDS PRELINK WINELOADER_DEPENDS +LIBWINE_LDFLAGS +LIBWINE_SHAREDLIB METAL_LIBS CARBON_LIBS QUICKTIME_LIBS @@ -724,10 +727,6 @@ OBJCPP ac_ct_OBJC OBJCFLAGS OBJC -LIBWINE_DEPENDS -LIBWINE_LDFLAGS -LIBWINE_IMPORTLIB -LIBWINE_SHAREDLIB DLLTOOL WINELOADER_PROGRAMS CONFIGURE_TARGETS @@ -8161,17 +8160,6 @@ fi enable_server=${enable_server:-no} with_x=${with_x:-no} with_pthread=${with_pthread:-no} - - LIBWINE_SHAREDLIB="libwine.dll" - - LIBWINE_IMPORTLIB="libwine.a" - - LIBWINE_LDFLAGS="-shared \$(srcdir)/wine.def" - - LIBWINE_DEPENDS="wine.def" - - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.dll" - TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.a" ;; darwin*|macosx*) diff --git a/configure.ac b/configure.ac index 6c72566..eaee17e 100644 --- a/configure.ac +++ b/configure.ac @@ -731,13 +731,6 @@ case $host_os in dnl Disable dependencies that are not useful on Windows with_x=${with_x:-no} with_pthread=${with_pthread:-no} - - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.dll") - AC_SUBST(LIBWINE_IMPORTLIB,"libwine.a") - AC_SUBST(LIBWINE_LDFLAGS,"-shared \$(srcdir)/wine.def") - AC_SUBST(LIBWINE_DEPENDS,"wine.def") - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.dll" - TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.a" ;; darwin*|macosx*) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 6525a53..789d09a 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -19,7 +19,6 @@ config_EXTRADEFS = \ -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" SHAREDLIB = $(LIBWINE_SHAREDLIB) -IMPORTLIB = $(LIBWINE_IMPORTLIB) libwine_LDFLAGS = $(LIBWINE_LDFLAGS) libwine_DEPS = $(LIBWINE_DEPENDS) diff --git a/libs/wine/wine.def b/libs/wine/wine.def deleted file mode 100644 index 3c88f8a..0000000 --- a/libs/wine/wine.def +++ /dev/null @@ -1,94 +0,0 @@ -LIBRARY libwine.dll - -EXPORTS - __wine_dbg_get_channel_flags PRIVATE - __wine_dbg_set_channel_flags - __wine_dbg_set_functions - __wine_dll_register - __wine_main_argc - __wine_main_argv - __wine_main_environ - __wine_main_wargv - atoiW - atolW - get_char_typeW - isalnumW - isalphaW - iscntrlW - isdigitW - isgraphW - islowerW - isprintW - ispunctW - isspaceW - isupperW - isxdigitW - memchrW - memicmpW - memrchrW - snprintfW - sprintfW - strcatW - strchrW - strcmpW - strcmpiW - strcpyW - strcspnW - strlenW - strlwrW - strncmpW - strncmpiW - strpbrkW - strrchrW - strspnW - strstrW - strtolW - strtoulW - struprW - tolowerW - toupperW - vsnprintfW - vsprintfW - wine_call_on_stack - wine_casemap_lower - wine_casemap_upper - wine_compare_string - wine_cp_enum_table - wine_cp_get_table - wine_cp_mbstowcs - wine_cp_wcstombs - wine_cpsymbol_mbstowcs - wine_cpsymbol_wcstombs - wine_dbg_log - wine_dbg_printf - wine_dbg_sprintf - wine_dbgstr_an - wine_dbgstr_wn - wine_dlclose - wine_dll_enum_load_path - wine_dll_get_owner - wine_dll_load - wine_dll_load_main_exe - wine_dll_set_callback - wine_dll_unload - wine_dlopen - wine_dlsym - wine_exec_wine_binary - wine_fold_string - wine_get_build_dir - wine_get_build_id - wine_get_config_dir - wine_get_data_dir - wine_get_server_dir - wine_get_sortkey - wine_get_user_name - wine_get_version - wine_init - wine_init_argv0_path - wine_is_dbcs_leadbyte - wine_pthread_get_functions - wine_pthread_set_functions - wine_switch_to_stack - wine_utf8_mbstowcs - wine_utf8_wcstombs - wine_wctype_table diff --git a/tools/makedep.c b/tools/makedep.c index 532ef52..2b916af 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3095,7 +3095,6 @@ static void output_module( struct makefile *make ) } else { - strarray_add( &all_libs, "-lwine" ); strarray_add( &make->all_targets, make->module ); add_install_rule( make, make->module, make->module, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); @@ -3246,22 +3245,6 @@ static void output_shared_lib( struct makefile *make ) /******************************************************************* - * output_import_lib - */ -static void output_import_lib( struct makefile *make ) -{ - char *def_file = replace_extension( make->importlib, ".a", ".def" ); - - /* stand-alone import lib (for libwine) */ - if (!strncmp( def_file, "lib", 3 )) def_file += 3; - output( "%s: %s\n", obj_dir_path( make, make->importlib ), src_dir_path( make, def_file )); - output( "\t%s -l $@ -d %s\n", dlltool, src_dir_path( make, def_file )); - add_install_rule( make, make->importlib, make->importlib, strmake( "d$(libdir)/%s", make->importlib )); - strarray_add( &make->all_targets, make->importlib ); -} - - -/******************************************************************* * output_test_module */ static void output_test_module( struct makefile *make ) @@ -3713,12 +3696,8 @@ static void output_sources( struct makefile *make ) if (make->staticlib) output_static_lib( make ); else if (make->module) output_module( make ); else if (make->testdll) output_test_module( make ); - else - { - if (make->importlib) output_import_lib( make ); - if (make->sharedlib) output_shared_lib( make ); - if (make->programs.count) output_programs( make ); - } + else if (make->sharedlib) output_shared_lib( make ); + else if (make->programs.count) output_programs( make ); for (i = 0; i < make->scripts.count; i++) add_install_rule( make, make->scripts.str[i], make->scripts.str[i],

1 0

Józef Kucia : vkd3d-shader: Drop support for dummy samplers.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 5842898cc7144974342d87ab670c3eaaf1cca6ad URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5842898cc7144974342d87a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:28 2019 +0200 vkd3d-shader: Drop support for dummy samplers. This shouldn't be needed by any Vulkan driver anymore. 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-shader/spirv.c | 55 ++++++++--------------------------------------- 1 file changed, 9 insertions(+), 46 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6cacf7c..e036c71 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4602,32 +4602,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } -static uint32_t vkd3d_dxbc_compiler_get_dummy_sampler_id(struct vkd3d_dxbc_compiler *compiler) -{ - const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; - const SpvStorageClass storage_class = SpvStorageClassUniformConstant; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, var_id; - - if (compiler->dummy_sampler_id) - return compiler->dummy_sampler_id; - - type_id = vkd3d_spirv_get_op_type_sampler(builder); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); - var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, - ptr_type_id, storage_class, 0); - - vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationDescriptorSet, shader_interface->dummy_sampler.set); - vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationBinding, shader_interface->dummy_sampler.binding); - - vkd3d_spirv_build_op_name(builder, var_id, "dummy_sampler"); - - compiler->dummy_sampler_id = var_id; - return compiler->dummy_sampler_id; -} - static const struct vkd3d_spirv_resource_type *vkd3d_dxbc_compiler_enable_resource_type( struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_resource_type resource_type, bool is_uav) { @@ -6746,11 +6720,9 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil if (sampled) { assert(image->image_id); + assert(sampler_reg); - if (sampler_reg) - sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); - else - sampler_var_id = vkd3d_dxbc_compiler_get_dummy_sampler_id(compiler); + sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); @@ -6781,7 +6753,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t image_id, type_id, coordinate_id, val_id; + uint32_t type_id, coordinate_id, val_id; SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; @@ -6791,9 +6763,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, multisample = instruction->handler_idx == VKD3DSIH_LD2DMS; - /* OpImageFetch must be used with a sampled image. */ - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_SAMPLED); - image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_NONE); type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; @@ -6818,7 +6788,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, } assert(image_operand_count <= ARRAY_SIZE(image_operands)); val_id = vkd3d_spirv_build_op_image_fetch(builder, type_id, - image_id, coordinate_id, operands_mask, image_operands, image_operand_count); + image.image_id, coordinate_id, operands_mask, image_operands, image_operand_count); vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, dst, val_id, image.sampled_type, src[1].swizzle); @@ -7041,10 +7011,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_raw_structured_addressing( static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t coordinate_id, type_id, val_id, image_id, texel_type_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t coordinate_id, type_id, val_id, texel_type_id; const struct vkd3d_shader_src_param *resource; uint32_t base_coordinate_id, component_idx; uint32_t constituents[VKD3D_VEC4_SIZE]; @@ -7055,18 +7025,11 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc resource = &src[instruction->src_count - 1]; if (resource->reg.type == VKD3DSPR_RESOURCE) - { - /* OpImageFetch must be used with a sampled image. */ op = SpvOpImageFetch; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_SAMPLED); - image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); - } else - { op = SpvOpImageRead; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); - image_id = image.image_id; - } + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, @@ -7085,7 +7048,7 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, - op, texel_type_id, image_id, coordinate_id); + op, texel_type_id, image.image_id, coordinate_id); constituents[j++] = vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, 0); }

1 0

Zhiyi Zhang : vkd3d: Improve UMA memory detection.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 32a15c089a2e619127ca0f6f4130e06d72912ab5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=32a15c089a2e619127ca0f6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 3 21:50:27 2019 +0800 vkd3d: Improve UMA memory detection. Some vulkan implementation report 2 memory types with the same VkMemoryPropertyFlags for a device. So check property flags to determine if UMA and CacheCoherentUMA are actually supported by the device. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a754077..8563b43 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2098,6 +2098,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { struct d3d12_device *device = impl_from_ID3D12Device(iface); + unsigned int i; TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n", iface, feature, feature_data, feature_data_size); @@ -2138,18 +2139,16 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * FIXME("Assuming device does not support tile based rendering.\n"); data->TileBasedRenderer = FALSE; - if (device->memory_properties.memoryTypeCount == 1) - { - TRACE("Assuming cache coherent UMA.\n"); - data->UMA = TRUE; - data->CacheCoherentUMA = TRUE; - } - else + data->UMA = TRUE; + data->CacheCoherentUMA = TRUE; + for (i = 0; i < device->memory_properties.memoryTypeCount; ++i) { - FIXME("Assuming NUMA.\n"); - data->UMA = FALSE; - data->CacheCoherentUMA = FALSE; + if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) + data->UMA = FALSE; + if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + data->CacheCoherentUMA = FALSE; } + TRACE("UMA: %#x CacheCoherentUMA: %#x.\n", data->UMA, data->CacheCoherentUMA); return S_OK; }

1 0

Józef Kucia : vkd3d: Add support for VK_EXT_depth_clip_enable.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: a95c9f8ad8bd6cc3e3aba23792a18028749639d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a95c9f8ad8bd6cc3e3aba23… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:31 2019 +0200 vkd3d: Add support for VK_EXT_depth_clip_enable. 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> --- configure.ac | 2 +- libs/vkd3d/device.c | 22 ++++++++++++++++++++++ libs/vkd3d/state.c | 47 +++++++++++++++++++++++++++++++++++----------- libs/vkd3d/vkd3d_private.h | 4 +++- tests/d3d12.c | 2 +- tests/d3d12_crosstest.h | 11 +++++++++++ 6 files changed, 74 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a95c9f8ad8bd6cc3e3a…

1 0

Józef Kucia : vkd3d: Simplify d3d12_command_list_update_descriptor_table().
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 32aa45a86db962cd4bd7dbf780c8a8db6086b492 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=32aa45a86db962cd4bd7dbf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:30 2019 +0200 vkd3d: Simplify d3d12_command_list_update_descriptor_table(). 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 | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 936e965..b9deffe 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2057,7 +2057,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des } static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) + VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; @@ -2072,19 +2072,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_table = root_signature_get_descriptor_table(root_signature, index); - descriptor_count = 0; - for (i = 0; i < descriptor_table->range_count; ++i) - descriptor_count += descriptor_table->ranges[i].descriptor_count; - - if (!descriptor_count) - return; - - if (!(descriptor = d3d12_desc_from_gpu_handle(base_descriptor))) - { - WARN("Descriptor table %u is not set.\n", index); - return; - } - + descriptor = base_descriptor; descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2094,7 +2082,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) { - descriptor = d3d12_desc_from_gpu_handle(base_descriptor) + range->offset; + descriptor = base_descriptor + range->offset; } for (j = 0; j < range->descriptor_count; ++j, ++descriptor) @@ -2296,6 +2284,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_root_signature *rs = bindings->root_signature; + struct d3d12_desc *base_descriptor; unsigned int i; if (!rs || !rs->pool_size_count || !rs->vk_set_layout) @@ -2307,7 +2296,12 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) { if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - d3d12_command_list_update_descriptor_table(list, bind_point, i, bindings->descriptor_tables[i]); + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor); + else + WARN("Descriptor table %u is not set.\n", i); + } } bindings->descriptor_table_dirty_mask = 0;

1 0

Józef Kucia : include: Introduce VKD3D_NO_TRACE_MESSAGES and VKD3D_NO_DEBUG_MESSAGES.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 0abbf5ed763ed5dcec75900b93737baa97e69c87 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0abbf5ed763ed5dcec75900… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:32 2019 +0200 include: Introduce VKD3D_NO_TRACE_MESSAGES and VKD3D_NO_DEBUG_MESSAGES. 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> --- include/private/vkd3d_debug.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 42e5903..5d798ef 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -23,6 +23,15 @@ #include <stdarg.h> +#ifdef VKD3D_NO_TRACE_MESSAGES +#define TRACE(args...) +#endif + +#ifdef VKD3D_NO_DEBUG_MESSAGES +#define WARN(args...) +#define FIXME(args...) +#endif + enum vkd3d_dbg_level { VKD3D_DBG_LEVEL_NONE, @@ -50,9 +59,18 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define VKD3D_DBG_PRINTF(args...) \ vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, args); } while (0) +#ifndef TRACE #define TRACE VKD3D_DBG_LOG(TRACE) +#endif + +#ifndef WARN #define WARN VKD3D_DBG_LOG(WARN) +#endif + +#ifndef FIXME #define FIXME VKD3D_DBG_LOG(FIXME) +#endif + #define ERR VKD3D_DBG_LOG(ERR) #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE)

1 0

Józef Kucia : vkd3d: Drop support for dummy sampler.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 41274e6285f8d126eb3f40c5fd4a93a2353e8ca4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41274e6285f8d126eb3f40c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:29 2019 +0200 vkd3d: Drop support for dummy sampler. 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> --- include/vkd3d_shader.h | 6 ------ libs/vkd3d-shader/spirv.c | 1 - libs/vkd3d/device.c | 21 --------------------- libs/vkd3d/state.c | 32 -------------------------------- libs/vkd3d/vkd3d_private.h | 4 ---- 5 files changed, 64 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ed4c0a0..15a0b22 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -144,12 +144,6 @@ struct vkd3d_shader_interface_info const struct vkd3d_shader_combined_resource_sampler *combined_samplers; unsigned int combined_sampler_count; - /* A sampler used by OpImageFetches generated for SM4 ld instructions. - * - * In Vulkan OpImageFetch must be used with a sampled image. - */ - struct vkd3d_shader_descriptor_binding dummy_sampler; - const struct vkd3d_shader_uav_counter_binding *uav_counters; unsigned int uav_counter_count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e036c71..b013416 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2004,7 +2004,6 @@ struct vkd3d_dxbc_compiler uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; - uint32_t dummy_sampler_id; uint32_t binding_idx; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8563b43..78f339f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1634,18 +1634,6 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, return hr; } -static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) -{ - D3D12_STATIC_SAMPLER_DESC sampler_desc; - - memset(&sampler_desc, 0, sizeof(sampler_desc)); - sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; - sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler); -} - static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1855,7 +1843,6 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); - VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); @@ -3003,17 +2990,10 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->removed_reason = S_OK; device->vk_device = VK_NULL_HANDLE; - device->vk_dummy_sampler = VK_NULL_HANDLE; if (FAILED(hr = vkd3d_create_vk_device(device, create_info))) goto out_free_instance; - if (FAILED(hr = d3d12_device_create_dummy_sampler(device))) - { - ERR("Failed to create dummy sampler, hr %#x.\n", hr); - goto out_free_vk_resources; - } - if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; @@ -3041,7 +3021,6 @@ out_free_pipeline_cache: d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: vk_procs = &device->vk_procs; - VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); out_free_instance: vkd3d_instance_decref(device->vkd3d_instance); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index aa9f62b..c7ae63b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -775,24 +775,6 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign return S_OK; } -static HRESULT d3d12_root_signature_init_dummy_sampler(struct d3d12_root_signature *root_signature, - struct d3d12_device *device, struct vkd3d_descriptor_set_context *context) -{ - VkDescriptorSetLayoutBinding *binding = context->current_binding; - - root_signature->dummy_sampler.set = context->set_index; - root_signature->dummy_sampler.binding = context->descriptor_binding++; - - binding->binding = root_signature->dummy_sampler.binding; - binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; - binding->descriptorCount = 1; - binding->stageFlags = VK_SHADER_STAGE_ALL; - binding->pImmutableSamplers = &device->vk_dummy_sampler; - - ++context->current_binding; - return S_OK; -} - static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signature *root_signature, struct d3d12_device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context) @@ -883,7 +865,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa VkDescriptorSetLayoutBinding *binding_desc; struct d3d12_root_signature_info info; VkDescriptorSetLayout set_layouts[2]; - bool needs_dummy_sampler; HRESULT hr; memset(&context, 0, sizeof(context)); @@ -924,14 +905,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->static_sampler_count = desc->NumStaticSamplers; root_signature->root_descriptor_count = info.root_descriptor_count; - /* An additional sampler is created for SpvOpImageFetch. */ - needs_dummy_sampler = info.srv_count || info.buffer_srv_count; - if (needs_dummy_sampler) - { - ++info.sampler_count; - ++info.descriptor_count; - } - hr = E_OUTOFMEMORY; root_signature->parameter_count = desc->NumParameters; if (!(root_signature->parameters = vkd3d_calloc(root_signature->parameter_count, @@ -978,9 +951,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; if (FAILED(hr = d3d12_root_signature_init_static_samplers(root_signature, device, desc, &context))) goto fail; - if (needs_dummy_sampler && FAILED(hr = d3d12_root_signature_init_dummy_sampler(root_signature, - device, &context))) - goto fail; root_signature->main_set = context.set_index; if (context.descriptor_binding) @@ -1421,7 +1391,6 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; - shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -2148,7 +2117,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; - shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c071b41..24d26d9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -584,7 +584,6 @@ struct d3d12_root_signature unsigned int descriptor_count; struct vkd3d_shader_resource_binding *descriptor_mapping; - struct vkd3d_shader_descriptor_binding dummy_sampler; unsigned int root_constant_count; struct vkd3d_shader_push_constant_buffer *root_constants; @@ -912,9 +911,6 @@ struct d3d12_device pthread_mutex_t pipeline_cache_mutex; VkPipelineCache vk_pipeline_cache; - /* A sampler used for SpvOpImageFetch. */ - VkSampler vk_dummy_sampler; - VkPhysicalDeviceMemoryProperties memory_properties; D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options;

1 0

Julian Rüger : German translation for release 4.5.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: website Branch: master Commit: 5f521dcb7654a37db97844066fc5ffd1b89a28ae URL: https://source.winehq.org/git/website.git/?a=commit;h=5f521dcb7654a37db9784… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Apr 3 15:41:38 2019 +0200 German translation for release 4.5. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019032901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2019032901.xml b/news/de/2019032901.xml new file mode 100644 index 0000000..0594750 --- /dev/null +++ b/news/de/2019032901.xml @@ -0,0 +1,17 @@ +<news> +<date>29. März 2019</date> +<title>Wine 4.5 freigegeben</title> +<body> + Die Entwicklungsversion 4.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Vulkan 1.1.</li> + <li>Bessere Unterstützung von Kernelobjekten in Gerätetreibern.</li> + <li>Weitere Media-Foundation-APIs implementiert.</li> + <li>Unterstützung von SVG-Elementen in MSHTML.</li> + <li>Korrekturen für Konvertierungsprobleme zwischen Groß-/Kleinschreibung in Türkischer Umgebung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.4.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: website Branch: master Commit: 54d154b1aad2b1f60cac1a35f503dc5ea56c343a URL: https://source.winehq.org/git/website.git/?a=commit;h=54d154b1aad2b1f60cac1… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Apr 3 15:37:59 2019 +0200 German translation for release 4.4. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019031501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019031501.xml b/news/de/2019031501.xml new file mode 100644 index 0000000..dc4b40b --- /dev/null +++ b/news/de/2019031501.xml @@ -0,0 +1,15 @@ +<news> +<date>15. März 2019</date> +<title>Wine 4.4 freigegeben</title> +<body> + Die Entwicklungsversion 4.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neues MSIDB-Werkzeug um MSI-Datenbanken zu bearbeiten.</li> + <li>Unterstützung selbstgezeichneter Schaltflächen in Common-Controls.</li> + <li>Deutlich mehr implementierte Media-Foundation-APIs.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Zebediah Figura : d3d9: Forbid creating a stateblock while recording.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: dd0bed46a56867ed5a03ee2a6ea06d35d925cecf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd0bed46a56867ed5a03ee2a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:48 2019 -0500 d3d9: Forbid creating a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++++++++ dlls/d3d9/tests/device.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4a41443..bad9211 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2313,6 +2313,15 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to create a stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_unlock(); + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 40ccdc4..e7366b1 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10602,7 +10602,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -10621,7 +10621,7 @@ static void test_begin_end_state_block(void) IDirect3DStateBlock9_Release(stateblock); IDirect3DStateBlock9_Release(stateblock2); refcount = IDirect3DDevice9_Release(device); - todo_wine ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0