July 2018 - Wine-commits - list.winehq.org

Hugh McMaster : regedit: Don't check if heap_xalloc() succeeded in the caller.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 1291c6ded4d49c3ed44f19352c506ea7fd53580c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1291c6ded4d49c3ed44f1935… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:45 2018 +0000 regedit: Don't check if heap_xalloc() succeeded in the caller. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 3e5b9dd..00dcbec 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -157,14 +157,9 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); pData = heap_xalloc(cbData); - if (pData) - { - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); - lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - heap_free(pData); - } - else - lRet = ERROR_OUTOFMEMORY; + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); + lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); + heap_free(pData); if (lRet == ERROR_SUCCESS) EndDialog(hwndDlg, 1);

1 0

Hugh McMaster : regedit: Free allocated memory after calling GetValueName( ).
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: a7a08e2927ec5b99b2f97fe2acffca4cdf0ef8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a08e2927ec5b99b2f97fe2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:46 2018 +0000 regedit: Free allocated memory after calling GetValueName(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 5 +++-- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index ed0c5bb..4d828c0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -853,10 +853,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_MODIFY: case ID_EDIT_MODIFY_BIN: { - LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); - WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + WCHAR *valueName = GetValueName(g_pChildWnd->hListWnd); + WCHAR *keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); ModifyValue(hWnd, hKeyRoot, keyPath, valueName); heap_free(keyPath); + heap_free(valueName); break; } case ID_EDIT_FIND: diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index f42f9c2..7584828 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -63,7 +63,7 @@ LPWSTR GetItemText(HWND hwndLV, UINT item) return NULL; } -LPCWSTR GetValueName(HWND hwndLV) +WCHAR *GetValueName(HWND hwndLV) { INT item; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index edcc901..ae03440 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -150,7 +150,7 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); HWND StartValueRename(HWND hwndLV); LPWSTR GetItemText(HWND hwndLV, UINT item); -LPCWSTR GetValueName(HWND hwndLV); +WCHAR *GetValueName(HWND hwndLV); BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); BOOL IsDefaultValue(HWND hwndLV, int i);

1 0

Hugh McMaster : regedit: Always display DWORD values in hexadecimal when initializing the editor dialog.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 32f487bdb2483f96864411f948d35c8f0eaa8bdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f487bdb2483f96864411f9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:48 2018 +0000 regedit: Always display DWORD values in hexadecimal when initializing the editor dialog. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 00dcbec..63cb869 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -106,7 +106,8 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L case WM_INITDIALOG: SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); - CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, isDecimal ? IDC_DWORD_DEC : IDC_DWORD_HEX); + CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, IDC_DWORD_HEX); + isDecimal = FALSE; return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -280,9 +281,8 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } } else if ( type == REG_DWORD ) { - const WCHAR u[] = {'%','u',0}; - const WCHAR x[] = {'%','x',0}; - wsprintfW(stringValueData, isDecimal ? u : x, *((DWORD*)stringValueData)); + static const WCHAR x[] = {'%','x',0}; + wsprintfW(stringValueData, x, *((DWORD*)stringValueData)); if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData);

1 0

Hugh McMaster : regedit: Replace Hungarian notation used with struct edit_params members.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: a131cff7a88e85575b71c15fbb31aa5c861cc839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a131cff7a88e85575b71c15f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:49 2018 +0000 regedit: Replace Hungarian notation used with struct edit_params members. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 63cb869..de96ded 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -38,10 +38,10 @@ static BOOL isDecimal; struct edit_params { - HKEY hKey; - LPCWSTR lpszValueName; - void *pData; - LONG cbData; + HKEY hkey; + const WCHAR *value_name; + void *data; + DWORD size; }; static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_list va_args) @@ -136,31 +136,31 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { struct edit_params *params; - LPBYTE pData; - LONG cbData; + BYTE *data; + LONG size; LONG lRet; switch(uMsg) { case WM_INITDIALOG: params = (struct edit_params *)lParam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - if (params->lpszValueName) - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->lpszValueName); + if (params->value_name) + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->value_name); else SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->size, (LPARAM)params->data); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); - cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); - pData = heap_xalloc(cbData); + size = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); + data = heap_xalloc(size); - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); - lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - heap_free(pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); + lRet = RegSetValueExW(params->hkey, params->value_name, 0, REG_BINARY, data, size); + heap_free(data); if (lRet == ERROR_SUCCESS) EndDialog(hwndDlg, 1); @@ -349,10 +349,10 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { struct edit_params params; - params.hKey = hKey; - params.lpszValueName = valueName; - params.pData = stringValueData; - params.cbData = len; + params.hkey = hKey; + params.value_name = valueName; + params.data = stringValueData; + params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); }

1 0

Hugh McMaster : regedit: Do not overwrite a hex data type with REG_BINARY when modifying a value.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 6b620e6d615df5041918b0037fe7fd988c7b20d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b620e6d615df5041918b003… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:50 2018 +0000 regedit: Do not overwrite a hex data type with REG_BINARY when modifying a value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index de96ded..a3cf17b 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -40,6 +40,7 @@ struct edit_params { HKEY hkey; const WCHAR *value_name; + DWORD type; void *data; DWORD size; }; @@ -159,7 +160,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara data = heap_xalloc(size); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); - lRet = RegSetValueExW(params->hkey, params->value_name, 0, REG_BINARY, data, size); + lRet = RegSetValueExW(params->hkey, params->value_name, 0, params->type, data, size); heap_free(data); if (lRet == ERROR_SUCCESS) @@ -351,6 +352,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) params.hkey = hKey; params.value_name = valueName; + params.type = type; params.data = stringValueData; params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd,

1 0

Piotr Caban : msi: Fix condition evaluation when comparing literal and integer.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 7837ae20cdeabab661da7bb5dae24f5ffefe17ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=7837ae20cdeabab661da7bb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 13 13:12:51 2018 +0200 msi: Fix condition evaluation when comparing literal and integer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45445 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/tests/package.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index ce06199..a8c9734 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -218,7 +218,7 @@ boolean_factor: } else if ($1.type == VALUE_LITERAL || $3.type == VALUE_LITERAL) { - $$ = FALSE; + $$ = ($2 == COND_NE || $2 == COND_INE ); } else if ($1.type == VALUE_SYMBOL) /* symbol operator integer */ { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ace9b35..d6d90ce 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2097,6 +2097,10 @@ static void test_condition(void) ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "&nofeature<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "\"\"<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiEvaluateConditionA(hpkg, "$nocomponent=\"\"");

1 0

Józef Kucia : wined3d: Separate feature level checks from shader model checks.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: a622fbf9f332b624842df6a0377009c342667293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a622fbf9f332b624842df6a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:22 2018 +0200 wined3d: Separate feature level checks from shader model checks. 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> --- dlls/wined3d/directx.c | 21 ++++++++++++++------- dlls/wined3d/glsl_shader.c | 4 ---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ecc4ed..e422005 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1844,13 +1844,20 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } -static enum wined3d_feature_level feature_level_from_caps(const struct shader_caps *shader_caps, - const struct fragment_caps *fragment_caps) +static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, + const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { - if (shader_caps->vs_version >= 5) - return WINED3D_FEATURE_LEVEL_11; - if (shader_caps->vs_version == 4) - return WINED3D_FEATURE_LEVEL_10; + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + if (shader_caps->vs_version >= 5 + && gl_info->supported[ARB_DRAW_INDIRECT] + && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) + return WINED3D_FEATURE_LEVEL_11; + + if (shader_caps->vs_version == 4) + return WINED3D_FEATURE_LEVEL_10; + } + if (shader_caps->vs_version == 3) return WINED3D_FEATURE_LEVEL_9_SM3; if (shader_caps->vs_version == 2) @@ -4306,7 +4313,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; d3d_info->shader_color_key = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY; d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->feature_level = feature_level_from_caps(&shader_caps, &fragment_caps); + d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e922c8..0c73aba 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11242,8 +11242,6 @@ static void shader_glsl_init_context_state(struct wined3d_context *context) static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *gl_info) { BOOL shader_model_4 = gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) - && gl_info->supported[WINED3D_GL_VERSION_3_2] - && gl_info->supported[ARB_SAMPLER_OBJECTS] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_TEXTURE_SWIZZLE]; @@ -11251,14 +11249,12 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_CULL_DISTANCE] && gl_info->supported[ARB_DERIVATIVE_CONTROL] - && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] && gl_info->supported[ARB_TESSELLATION_SHADER] - && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) return 5;

1 0

Józef Kucia : wined3d: Take into account all shader stages when determining feature level.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: d97ca4b86f408b584a82e8500fe6333336301e14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97ca4b86f408b584a82e850… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:23 2018 +0200 wined3d: Take into account all shader stages when determining feature level. 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> --- dlls/wined3d/directx.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e422005..bb8d5af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1847,22 +1847,29 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { + unsigned int shader_model; + + shader_model = min(shader_caps->vs_version, shader_caps->ps_version); + shader_model = min(shader_model, max(shader_caps->gs_version, 3)); + shader_model = min(shader_model, max(shader_caps->hs_version, 4)); + shader_model = min(shader_model, max(shader_caps->ds_version, 4)); + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) { - if (shader_caps->vs_version >= 5 + if (shader_model >= 5 && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) return WINED3D_FEATURE_LEVEL_11; - if (shader_caps->vs_version == 4) + if (shader_model == 4) return WINED3D_FEATURE_LEVEL_10; } - if (shader_caps->vs_version == 3) + if (shader_model == 3) return WINED3D_FEATURE_LEVEL_9_SM3; - if (shader_caps->vs_version == 2) + if (shader_model == 2) return WINED3D_FEATURE_LEVEL_9_SM2; - if (shader_caps->vs_version == 1) + if (shader_model == 1) return WINED3D_FEATURE_LEVEL_8; if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3)

1 0

Józef Kucia : d3d11/tests: Add more tests for multisample resolve.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 73b782c9877b84f7ff07c61415040de0dbca0ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b782c9877b84f7ff07c614… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:24 2018 +0200 d3d11/tests: Add more tests for multisample resolve. 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> --- dlls/d3d11/tests/d3d11.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index be7c907..5e324b1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27036,6 +27036,47 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, &color, 0xffbf7f40, TRUE}, + + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, }; if (!init_test_context(&test_context, NULL))

1 0

Michael Stefaniuc : dmusic: Sync up the dmobject.[ch] files.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 7028142771f43b41858e6fd6bb1c7738ae6bcf4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7028142771f43b41858e6fd6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:43 2018 +0200 dmusic: Sync up the dmobject.[ch] files. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 53 ++++++++++++ dlls/dmcompos/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmcompos/dmobject.h | 53 ++++++++++++ dlls/dmloader/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmloader/dmobject.h | 53 ++++++++++++ dlls/dmscript/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmscript/dmobject.h | 53 ++++++++++++ dlls/dmstyle/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmstyle/dmobject.h | 53 ++++++++++++ dlls/dmusic/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmusic/dmobject.h | 53 ++++++++++++ dlls/dswave/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dswave/dmobject.h | 53 ++++++++++++ 14 files changed, 1855 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7028142771f43b41858e…

1 0