September 2017 - Wine-Commits

Alexandre Julliard : kernel32/tests: Retrieve the page size only once.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 9b85cebf051762e25089c2ebf4cb0d889c4b1dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b85cebf051762e25089c2ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 11:18:48 2017 +0200 kernel32/tests: Retrieve the page size only once. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 9b99464..4d9335e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -36,6 +36,7 @@ #define MAPPING_SIZE 0x100000 static HINSTANCE hkernel32, hntdll; +static SYSTEM_INFO si; static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); @@ -3184,14 +3185,10 @@ static void test_VirtualProtect(void) char *base, *ptr; DWORD ret, old_prot, rw_prot, exec_prot, i, j; MEMORY_BASIC_INFORMATION info; - SYSTEM_INFO si; void *addr; SIZE_T size; NTSTATUS status; - GetSystemInfo(&si); - trace("system page size %#x\n", si.dwPageSize); - SetLastError(0xdeadbeef); base = VirtualAlloc(0, si.dwPageSize, MEM_RESERVE | MEM_COMMIT, PAGE_NOACCESS); ok(base != NULL, "VirtualAlloc failed %d\n", GetLastError()); @@ -3381,10 +3378,6 @@ static void test_VirtualAlloc_protection(void) char *base, *ptr; DWORD ret, i; MEMORY_BASIC_INFORMATION info; - SYSTEM_INFO si; - - GetSystemInfo(&si); - trace("system page size %#x\n", si.dwPageSize); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { @@ -3475,15 +3468,11 @@ static void test_CreateFileMapping_protection(void) char *base, *ptr; DWORD ret, i, alloc_prot, prot, old_prot; MEMORY_BASIC_INFORMATION info; - SYSTEM_INFO si; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; HANDLE hfile, hmap; BOOL page_exec_supported = TRUE; - GetSystemInfo(&si); - trace("system page size %#x\n", si.dwPageSize); - GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "map", 0, file_name); @@ -3857,15 +3846,11 @@ static void test_mapping(void) }; void *base, *nt_base, *ptr; DWORD i, j, k, ret, old_prot, prev_prot; - SYSTEM_INFO si; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; HANDLE hfile, hmap; MEMORY_BASIC_INFORMATION info, nt_info; - GetSystemInfo(&si); - trace("system page size %#x\n", si.dwPageSize); - GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "map", 0, file_name); @@ -4201,6 +4186,9 @@ START_TEST(virtual) pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" ); pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" ); + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + test_shared_memory(FALSE); test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); test_shared_memory_ro(FALSE, FILE_MAP_COPY);

1 0

Fabian Maurer : mfidl.idl: Add interfaces IMFClockStateSink, IMFGetService.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 5e1882fe1bbfeab69aa3e0bf7e90740566f0a0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1882fe1bbfeab69aa3e0bf7… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 11 00:40:10 2017 +0200 mfidl.idl: Add interfaces IMFClockStateSink, IMFGetService. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index b0fadba..7e37396 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -212,6 +212,44 @@ interface IMFStreamDescriptor : IMFAttributes HRESULT GetMediaTypeHandler([out] IMFMediaTypeHandler **handler); } +[ + object, + uuid(f6696e82-74f7-4f3d-a178-8a5e09c3659f) +] +interface IMFClockStateSink : IUnknown +{ + HRESULT OnClockStart( + [in] MFTIME hnsSystemTime, + [in] LONGLONG llClockStartOffset + ); + HRESULT OnClockStop( + [in] MFTIME hnssSystemTime + ); + HRESULT OnClockPause( + [in] MFTIME hnsSystemTime + ); + HRESULT OnClockRestart( + [in] MFTIME hnsSystemTime + ); + HRESULT OnClockSetRate( + [in] MFTIME hnsSystemTime, + [in] float flRate + ); +} + +[ + object, + uuid(fa993888-4383-415a-a930-dd472a8cf6f7) +] +interface IMFGetService : IUnknown +{ + HRESULT GetService( + [in] REFGUID guidService, + [in] REFIID riid, + [out, iid_is(riid)] LPVOID *ppvObject + ); +} + cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);")

1 0

Nikolay Sivov : qcap: Remove redundant filter state check.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 87d1de6c625c079a32b401d6d3fa19092fe1d967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d1de6c625c079a32b401d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:54:04 2017 +0300 qcap: Remove redundant filter state check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 55fcde5..27aee47 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -149,9 +149,7 @@ static HRESULT WINAPI SmartTeeFilter_Stop(IBaseFilter *iface) SmartTeeFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)\n", This); EnterCriticalSection(&This->filter.csFilter); - if(This->filter.state != State_Stopped) { - This->filter.state = State_Stopped; - } + This->filter.state = State_Stopped; LeaveCriticalSection(&This->filter.csFilter); return S_OK; }

1 0

Nikolay Sivov : comctl32/tooltips: Calm down trace messages.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 62daeec1e20090fd2c2e227cc657e5b35f929ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62daeec1e20090fd2c2e227cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:40:05 2017 +0300 comctl32/tooltips: Calm down trace messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tooltips.c | 63 +++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 030e775..bbf1693 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -403,7 +403,7 @@ static void TOOLTIPS_GetDispInfoA(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too } } else { - ERR("recursive text callback!\n"); + ERR("recursive text callback\n"); buffer[0] = '\0'; } @@ -459,7 +459,7 @@ static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too } } else { - ERR("recursive text callback!\n"); + ERR("recursive text callback\n"); buffer[0] = '\0'; } @@ -594,7 +594,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { if (infoPtr->nTrackTool == -1) { - TRACE("invalid tracking tool (-1)!\n"); + TRACE("invalid tracking tool %d\n", infoPtr->nTrackTool); return; } nTool = infoPtr->nTrackTool; @@ -603,13 +603,13 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { if (infoPtr->nTool == -1) { - TRACE("invalid tool (-1)!\n"); - return; + TRACE("invalid tool %d\n", infoPtr->nTool); + return; } nTool = infoPtr->nTool; } - TRACE("Show tooltip pre %d! (%p)\n", nTool, infoPtr->hwndSelf); + TRACE("Show tooltip pre %d, %p\n", nTool, infoPtr->hwndSelf); current = infoPtr->nCurrentTool; if (!track_activate) @@ -625,7 +625,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) toolPtr = &infoPtr->tools[nTool]; - TRACE("Show tooltip %d!\n", nTool); + TRACE("Show tooltip %d\n", nTool); hdr.hwndFrom = infoPtr->hwndSelf; hdr.idFrom = toolPtr->uId; @@ -835,9 +835,9 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) if (!track_activate) { SetTimer (infoPtr->hwndSelf, ID_TIMERPOP, infoPtr->nAutoPopTime, 0); - TRACE("timer 2 started!\n"); + TRACE("timer 2 started\n"); SetTimer (infoPtr->hwndSelf, ID_TIMERLEAVE, infoPtr->nReshowTime, 0); - TRACE("timer 3 started!\n"); + TRACE("timer 3 started\n"); } } @@ -848,7 +848,7 @@ TOOLTIPS_Hide (TOOLTIPS_INFO *infoPtr) TTTOOL_INFO *toolPtr; NMHDR hdr; - TRACE("Hide tooltip %d! (%p)\n", infoPtr->nCurrentTool, infoPtr->hwndSelf); + TRACE("Hide tooltip %d, %p.\n", infoPtr->nCurrentTool, infoPtr->hwndSelf); if (infoPtr->nCurrentTool == -1) return; @@ -1039,8 +1039,7 @@ TOOLTIPS_Activate (TOOLTIPS_INFO *infoPtr, BOOL activate) { infoPtr->bActive = activate; - if (infoPtr->bActive) - TRACE("activate!\n"); + TRACE("activate %d\n", activate); if (!(infoPtr->bActive) && (infoPtr->nCurrentTool != -1)) TOOLTIPS_Hide (infoPtr); @@ -1057,9 +1056,8 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) if (!ti) return FALSE; - TRACE("add tool (%p) %p %ld%s!\n", - infoPtr->hwndSelf, ti->hwnd, ti->uId, - (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); + TRACE("add tool (%p) %p %ld%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId, + (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) return FALSE; @@ -1095,18 +1093,18 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) } else if (ti->lpszText) { if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { - TRACE("add CALLBACK!\n"); + TRACE("add CALLBACK\n"); toolPtr->lpszText = LPSTR_TEXTCALLBACKW; } else if (isW) { INT len = lstrlenW (ti->lpszText); - TRACE("add text %s!\n", debugstr_w(ti->lpszText)); + TRACE("add text %s\n", debugstr_w(ti->lpszText)); toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); strcpyW (toolPtr->lpszText, ti->lpszText); } else { INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0); - TRACE("add text \"%s\"!\n", (LPSTR)ti->lpszText); + TRACE("add text \"%s\"\n", debugstr_a((char *)ti->lpszText)); toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, toolPtr->lpszText, len); } @@ -1126,7 +1124,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) SetWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1, (DWORD_PTR)infoPtr->hwndSelf); } - TRACE("subclassing installed!\n"); + TRACE("subclassing installed\n"); } nResult = SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, @@ -1138,7 +1136,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->bNotifyUnicode = TRUE; TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); } else { - TRACE (" -- WM_NOTIFYFORMAT returns: error!\n"); + TRACE (" -- WM_NOTIFYFORMAT returns: %d\n", nResult); } return TRUE; @@ -1423,7 +1421,7 @@ TOOLTIPS_HitTestT (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit, if (nTool == -1) return FALSE; - TRACE("tool %d!\n", nTool); + TRACE("tool %d\n", nTool); /* copy tool data */ if (lptthit->ti.cbSize >= TTTOOLINFOW_V1_SIZE) @@ -1470,7 +1468,7 @@ TOOLTIPS_RelayEvent (TOOLTIPS_INFO *infoPtr, LPMSG lpMsg) INT nOldTool; if (!lpMsg) { - ERR("lpMsg == NULL!\n"); + ERR("lpMsg == NULL\n"); return 0; } @@ -1501,14 +1499,14 @@ TOOLTIPS_RelayEvent (TOOLTIPS_INFO *infoPtr, LPMSG lpMsg) } else if (nOldTool == -1) { /* Moved from outside */ if(infoPtr->bActive) { SetTimer(infoPtr->hwndSelf, ID_TIMERSHOW, infoPtr->nInitialTime, 0); - TRACE("timer 1 started!\n"); + TRACE("timer 1 started\n"); } } else { /* Moved from one to another */ TOOLTIPS_Hide (infoPtr); KillTimer(infoPtr->hwndSelf, ID_TIMERLEAVE); if(infoPtr->bActive) { SetTimer (infoPtr->hwndSelf, ID_TIMERSHOW, infoPtr->nReshowTime, 0); - TRACE("timer 1 started!\n"); + TRACE("timer 1 started\n"); } } } else if(infoPtr->nCurrentTool != -1) { /* restart autopop */ @@ -1518,7 +1516,7 @@ TOOLTIPS_RelayEvent (TOOLTIPS_INFO *infoPtr, LPMSG lpMsg) } else if(infoPtr->nTool != -1 && infoPtr->bActive) { /* previous show attempt didn't result in tooltip so try again */ SetTimer(infoPtr->hwndSelf, ID_TIMERSHOW, infoPtr->nInitialTime, 0); - TRACE("timer 1 started!\n"); + TRACE("timer 1 started\n"); } break; } @@ -1674,7 +1672,7 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->hinst = ti->hinst; if (IS_INTRESOURCE(ti->lpszText)) { - TRACE("set string id %x!\n", LOWORD(ti->lpszText)); + TRACE("set string id %x\n", LOWORD(ti->lpszText)); toolPtr->lpszText = ti->lpszText; } else { @@ -1733,7 +1731,7 @@ TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, const TTTOO /* activate */ infoPtr->nTrackTool = TOOLTIPS_GetToolFromInfoT (infoPtr, (const TTTOOLINFOW*)ti); if (infoPtr->nTrackTool != -1) { - TRACE("activated!\n"); + TRACE("activated\n"); infoPtr->bTrackActive = TRUE; TOOLTIPS_TrackShow (infoPtr); } @@ -1745,7 +1743,7 @@ TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, const TTTOO infoPtr->bTrackActive = FALSE; infoPtr->nTrackTool = -1; - TRACE("deactivated!\n"); + TRACE("deactivated\n"); } return 0; @@ -1968,7 +1966,7 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if ((nTool > -1) && (nTool < infoPtr->uNumTools)) { if (infoPtr->tools[nTool].uFlags & TTF_TRANSPARENT) { - TRACE("-- in transparent mode!\n"); + TRACE("-- in transparent mode\n"); return HTTRANSPARENT; } } @@ -2015,9 +2013,8 @@ TOOLTIPS_SetFont (TOOLTIPS_INFO *infoPtr, HFONT hFont, BOOL redraw) lf.lfWeight = FW_BOLD; infoPtr->hTitleFont = CreateFontIndirectW(&lf); - if (redraw && infoPtr->nCurrentTool != -1) { - FIXME("full redraw needed!\n"); - } + if (redraw && infoPtr->nCurrentTool != -1) + FIXME("full redraw needed\n"); return 0; } @@ -2066,7 +2063,7 @@ TOOLTIPS_Timer (TOOLTIPS_INFO *infoPtr, INT iTimer) { INT nOldTool; - TRACE("timer %d (%p) expired!\n", iTimer, infoPtr->hwndSelf); + TRACE("timer %d (%p) expired\n", iTimer, infoPtr->hwndSelf); switch (iTimer) { case ID_TIMERSHOW:

1 0

Michael Müller : wined3d: Add conservative depth output information to GLSL pixel shaders.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 76783293cf5b91e38e16eb21cc6c13141c648873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76783293cf5b91e38e16eb21c… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Sep 10 14:25:40 2017 +0200 wined3d: Add conservative depth output information to GLSL pixel shaders. 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 | 2 ++ dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/shader.c | 13 +++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 27 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0cd784c..3da751e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -115,6 +115,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, {"GL_ARB_compute_shader", ARB_COMPUTE_SHADER }, + {"GL_ARB_conservative_depth", ARB_CONSERVATIVE_DEPTH }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, @@ -3874,6 +3875,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, + {ARB_CONSERVATIVE_DEPTH, MAKEDWORD_VERSION(4, 2)}, {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADER_ATOMIC_COUNTERS, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index efcd383..39d2276 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7244,6 +7244,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_glsl_add_version_declaration(buffer, gl_info); shader_glsl_enable_extensions(buffer, gl_info); + if (gl_info->supported[ARB_CONSERVATIVE_DEPTH]) + shader_addline(buffer, "#extension GL_ARB_conservative_depth : enable\n"); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); if (shader_glsl_use_explicit_attrib_location(gl_info)) @@ -7262,6 +7264,14 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context /* Base Declarations */ shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + if (gl_info->supported[ARB_CONSERVATIVE_DEPTH]) + { + if (shader->u.ps.depth_output == WINED3DSPR_DEPTHOUTGE) + shader_addline(buffer, "layout (depth_greater) out float gl_FragDepth;\n"); + else if (shader->u.ps.depth_output == WINED3DSPR_DEPTHOUTLE) + shader_addline(buffer, "layout (depth_less) out float gl_FragDepth;\n"); + } + /* Declare uniforms for NP2 texcoord fixup: * This is NOT done inside the loop that declares the texture samplers * since the NP2 fixup code is currently only used for the GeforceFX diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 70c6de9..02880b0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1148,6 +1148,19 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); } + else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT) + { + if (ins.declaration.dst.reg.type == WINED3DSPR_DEPTHOUT + || ins.declaration.dst.reg.type == WINED3DSPR_DEPTHOUTGE + || ins.declaration.dst.reg.type == WINED3DSPR_DEPTHOUTLE) + { + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + shader->u.ps.depth_output = ins.declaration.dst.reg.type; + else + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT) { if (shader_version.type == WINED3D_SHADER_TYPE_HULL) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8b25220..2a51a7e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -49,6 +49,7 @@ enum wined3d_gl_extension ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT, ARB_COMPUTE_SHADER, + ARB_CONSERVATIVE_DEPTH, ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f23dfec..4fca08d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3907,6 +3907,7 @@ struct wined3d_pixel_shader DWORD color0_reg; BOOL force_early_depth_stencil; + enum wined3d_shader_register_type depth_output; }; struct wined3d_compute_shader

1 0

Michael Müller : wined3d: Recognize conservative depth output registers.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: c95e0ef092e24bada6b7de0a9369011ac7176546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95e0ef092e24bada6b7de0a9… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Sep 10 14:25:39 2017 +0200 wined3d: Recognize conservative depth output registers. 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/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/shader_sm4.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7290fc7..efcd383 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2904,6 +2904,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_DEPTHOUT: + case WINED3DSPR_DEPTHOUTGE: + case WINED3DSPR_DEPTHOUTLE: sprintf(register_name, "gl_FragDepth"); break; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8ed2cb9..70c6de9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2143,6 +2143,14 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "oDepth"); break; + case WINED3DSPR_DEPTHOUTGE: + shader_addline(buffer, "oDepthGE"); + break; + + case WINED3DSPR_DEPTHOUTLE: + shader_addline(buffer, "oDepthLE"); + break; + case WINED3DSPR_ATTROUT: shader_addline(buffer, "oD"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 123ecbc..e3d74e2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -333,6 +333,8 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_COVERAGE = 0x23, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, WINED3D_SM5_RT_GS_INSTANCE_ID = 0x25, + WINED3D_SM5_RT_DEPTHOUT_GREATER_EQUAL = 0x26, + WINED3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, }; enum wined3d_sm4_output_primitive_type @@ -1148,6 +1150,8 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_COVERAGE */ WINED3DSPR_COVERAGE, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, /* WINED3D_SM5_RT_GS_INSTANCE_ID */ WINED3DSPR_GSINSTID, + /* WINED3D_SM5_RT_DEPTHOUT_GREATER_EQUAL */ WINED3DSPR_DEPTHOUTGE, + /* WINED3D_SM5_RT_DEPTHOUT_LESS_EQUAL */ WINED3DSPR_DEPTHOUTLE, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04f2955..f23dfec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -490,6 +490,8 @@ enum wined3d_shader_register_type WINED3DSPR_COVERAGE, WINED3DSPR_SAMPLEMASK, WINED3DSPR_GSINSTID, + WINED3DSPR_DEPTHOUTGE, + WINED3DSPR_DEPTHOUTLE, }; enum wined3d_data_type @@ -3995,6 +3997,8 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) return FALSE; case WINED3DSPR_DEPTHOUT: /* oDepth */ + case WINED3DSPR_DEPTHOUTGE: + case WINED3DSPR_DEPTHOUTLE: case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */

1 0

Matteo Bruni : d3d8/tests: Trace the current test in test_signed_formats() .
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 210ce803a0cee28098cf29adf8d83df925d7962e URL: http://source.winehq.org/git/wine.git/?a=commit;h=210ce803a0cee28098cf29adf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 8 18:44:10 2017 +0200 d3d8/tests: Trace the current test in test_signed_formats(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 5ff96d4..588a629 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6442,8 +6442,8 @@ static void test_signed_formats(void) color = getPixelColor(device, 80 + 160 * x, 60 + 120 * y); ok(color_match(color, expected_color, 1) || broken(r200_broken), - "Expected color 0x%08x, got 0x%08x, format %s, location %ux%u.\n", - expected_color, color, formats[i].name, x, y); + "Expected color 0x%08x, got 0x%08x, format %s, test %u, location %ux%u.\n", + expected_color, color, formats[i].name, j, x, y); } } hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); @@ -6472,8 +6472,8 @@ static void test_signed_formats(void) color = getPixelColor(device, 80 + 160 * x, 60 + 120 * y); ok(color_match(color, expected_color, formats[i].slop) || broken(color_match(color, expected_color, formats[i].slop_broken)), - "Expected color 0x%08x, got 0x%08x, format %s, location %ux%u.\n", - expected_color, color, formats[i].name, x, y); + "Expected color 0x%08x, got 0x%08x, format %s, test %u, location %ux%u.\n", + expected_color, color, formats[i].name, j, x, y); } } hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Alexandre Julliard : kernel32/tests: Also run mapping tests against an executable image.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: d6b523e69f7650bac94ba825cb335945cacb7186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6b523e69f7650bac94ba825c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 15:48:54 2017 +0200 kernel32/tests: Also run mapping tests against an executable image. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 72 +++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a1c67d8..46b019c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3772,16 +3772,11 @@ static void *map_view_of_file(HANDLE handle, DWORD access) addr = NULL; status = pNtMapViewOfSection(handle, GetCurrentProcess(), &addr, 0, 0, &offset, &count, 1 /* ViewShare */, 0, protect); - if (status) - { - /* for simplicity */ - SetLastError(ERROR_ACCESS_DENIED); - addr = NULL; - } + if ((int)status < 0) addr = NULL; return addr; } -static void test_mapping( HANDLE hfile ) +static void test_mapping( HANDLE hfile, DWORD sec_flags ) { static const DWORD page_prot[] = { @@ -3827,16 +3822,16 @@ static void test_mapping( HANDLE hfile ) { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE | FILE_MAP_COPY, PAGE_EXECUTE_READWRITE } /* 0x2f */ }; void *base, *nt_base, *ptr; - DWORD i, j, k, ret, old_prot, prev_prot; + DWORD i, j, k, ret, old_prot, prev_prot, alloc_prot; HANDLE hmap; MEMORY_BASIC_INFORMATION info, nt_info; BOOL anon_mapping = (hfile == INVALID_HANDLE_VALUE); - trace( "testing %s mapping\n", anon_mapping ? "anonymous" : "file" ); + trace( "testing %s mapping flags %08x\n", anon_mapping ? "anonymous" : "file", sec_flags ); for (i = 0; i < sizeof(page_prot)/sizeof(page_prot[0]); i++) { SetLastError(0xdeadbeef); - hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | SEC_COMMIT, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | sec_flags, 0, si.dwPageSize, NULL); if (page_prot[i] == PAGE_NOACCESS) { @@ -3847,7 +3842,10 @@ static void test_mapping( HANDLE hfile ) /* A trick to create a not accessible mapping */ SetLastError(0xdeadbeef); - hmap = CreateFileMappingW(hfile, NULL, PAGE_READWRITE | SEC_COMMIT, 0, si.dwPageSize, NULL); + if (sec_flags & SEC_IMAGE) + hmap = CreateFileMappingW(hfile, NULL, PAGE_WRITECOPY | sec_flags, 0, si.dwPageSize, NULL); + else + hmap = CreateFileMappingW(hfile, NULL, PAGE_READWRITE | sec_flags, 0, si.dwPageSize, NULL); ok(hmap != 0, "CreateFileMapping(PAGE_READWRITE) error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = DuplicateHandle(GetCurrentProcess(), hmap, GetCurrentProcess(), &hmap2, 0, FALSE, 0); @@ -3867,6 +3865,10 @@ static void test_mapping( HANDLE hfile ) { trace("%d: CreateFileMapping(%04x) failed: %d\n", i, page_prot[i], GetLastError()); + if ((sec_flags & SEC_IMAGE) && + (page_prot[i] == PAGE_READWRITE || page_prot[i] == PAGE_EXECUTE_READWRITE)) + continue; /* SEC_IMAGE doesn't support write access */ + /* NT4 and win2k don't support EXEC on file mappings */ if (page_prot[i] == PAGE_EXECUTE_READ || page_prot[i] == PAGE_EXECUTE_READWRITE) { @@ -3940,15 +3942,25 @@ static void test_mapping( HANDLE hfile ) ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); ok(info.BaseAddress == base, "%d: (%04x) got %p, expected %p\n", j, view[j].access, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: (%04x) got %#lx != expected %#x\n", j, view[j].access, info.RegionSize, si.dwPageSize); - ok(info.Protect == view[j].prot || - broken(view[j].prot == PAGE_EXECUTE_READ && info.Protect == PAGE_READONLY) || /* win2k */ - broken(view[j].prot == PAGE_EXECUTE_READWRITE && info.Protect == PAGE_READWRITE) || /* win2k */ - broken(view[j].prot == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ - "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); + if (sec_flags & SEC_IMAGE) + ok(info.Protect == PAGE_READONLY, + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); + else + ok(info.Protect == view[j].prot || + broken(view[j].prot == PAGE_EXECUTE_READ && info.Protect == PAGE_READONLY) || /* win2k */ + broken(view[j].prot == PAGE_EXECUTE_READWRITE && info.Protect == PAGE_READWRITE) || /* win2k */ + broken(view[j].prot == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); ok(info.AllocationBase == base, "%d: (%04x) got %p, expected %p\n", j, view[j].access, info.AllocationBase, base); - ok(info.AllocationProtect == info.Protect, "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.AllocationProtect, info.Protect); + if (sec_flags & SEC_IMAGE) + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: (%04x) got %#x, expected %#x\n", + j, view[j].access, info.AllocationProtect, info.Protect); + else + ok(info.AllocationProtect == info.Protect, "%d: (%04x) got %#x, expected %#x\n", + j, view[j].access, info.AllocationProtect, info.Protect); ok(info.State == MEM_COMMIT, "%d: (%04x) got %#x, expected MEM_COMMIT\n", j, view[j].access, info.State); - ok(info.Type == MEM_MAPPED, "%d: (%04x) got %#x, expected MEM_MAPPED\n", j, view[j].access, info.Type); + ok(info.Type == (sec_flags & SEC_IMAGE) ? SEC_IMAGE : MEM_MAPPED, + "%d: (%04x) got %#x, expected MEM_MAPPED\n", j, view[j].access, info.Type); if (nt_base && base) { @@ -3964,14 +3976,16 @@ static void test_mapping( HANDLE hfile ) } prev_prot = info.Protect; + alloc_prot = info.AllocationProtect; for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) { /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ + DWORD actual_prot = (sec_flags & SEC_IMAGE) ? map_prot_no_write(page_prot[k]) : page_prot[k]; SetLastError(0xdeadbeef); old_prot = 0xdeadbeef; ret = VirtualProtect(base, si.dwPageSize, page_prot[k], &old_prot); - if (is_compatible_protection(view[j].prot, page_prot[k])) + if (is_compatible_protection(alloc_prot, actual_prot)) { /* win2k and XP don't support EXEC on file mappings */ if (!ret && page_prot[k] == PAGE_EXECUTE) @@ -3983,6 +3997,7 @@ static void test_mapping( HANDLE hfile ) /* NT4 and win2k don't support EXEC on file mappings */ if (!ret && (page_prot[k] == PAGE_EXECUTE_READ || page_prot[k] == PAGE_EXECUTE_READWRITE)) { + todo_wine ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); continue; } @@ -4002,11 +4017,11 @@ static void test_mapping( HANDLE hfile ) ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); - prev_prot = page_prot[k]; + prev_prot = actual_prot; ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); - ok(info.Protect == page_prot[k], + ok(info.Protect == actual_prot, "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", page_prot[i], view[j].prot, page_prot[k], info.Protect ); } @@ -4082,13 +4097,24 @@ static void test_mappings(void) SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); SetEndOfFile(hfile); - test_mapping( hfile ); + test_mapping( hfile, SEC_COMMIT ); CloseHandle( hfile ); DeleteFileA( file_name ); + /* SEC_IMAGE mapping */ + GetSystemDirectoryA( file_name, MAX_PATH ); + strcat( file_name, "\\kernel32.dll" ); + + hfile = CreateFileA( file_name, GENERIC_READ|GENERIC_EXECUTE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + + test_mapping( hfile, SEC_IMAGE ); + + CloseHandle( hfile ); + /* now anonymous mappings */ - test_mapping( INVALID_HANDLE_VALUE ); + test_mapping( INVALID_HANDLE_VALUE, SEC_COMMIT ); } static void test_shared_memory(BOOL is_child)

1 0

Alexandre Julliard : kernel32/tests: Also run mapping tests against an anonymous mapping.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: c88a858ecae783a8efe8422aa1341e55061615b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88a858ecae783a8efe8422aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 11:50:11 2017 +0200 kernel32/tests: Also run mapping tests against an anonymous mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 92 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 054d335..a1c67d8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3725,6 +3725,16 @@ static DWORD map_prot_to_access(DWORD prot) } } +static DWORD map_prot_no_write(DWORD prot) +{ + switch (prot) + { + case PAGE_READWRITE: return PAGE_WRITECOPY; + case PAGE_EXECUTE_READWRITE: return PAGE_EXECUTE_WRITECOPY; + default: return prot; + } +} + static DWORD file_access_to_prot( DWORD access ) { BOOL exec = access & FILE_MAP_EXECUTE; @@ -3771,7 +3781,7 @@ static void *map_view_of_file(HANDLE handle, DWORD access) return addr; } -static void test_mapping(void) +static void test_mapping( HANDLE hfile ) { static const DWORD page_prot[] = { @@ -3818,20 +3828,11 @@ static void test_mapping(void) }; void *base, *nt_base, *ptr; DWORD i, j, k, ret, old_prot, prev_prot; - char temp_path[MAX_PATH]; - char file_name[MAX_PATH]; - HANDLE hfile, hmap; + HANDLE hmap; MEMORY_BASIC_INFORMATION info, nt_info; + BOOL anon_mapping = (hfile == INVALID_HANDLE_VALUE); - GetTempPathA(MAX_PATH, temp_path); - GetTempFileNameA(temp_path, "map", 0, file_name); - - SetLastError(0xdeadbeef); - hfile = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); - SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); - SetEndOfFile(hfile); - + trace( "testing %s mapping\n", anon_mapping ? "anonymous" : "file" ); for (i = 0; i < sizeof(page_prot)/sizeof(page_prot[0]); i++) { SetLastError(0xdeadbeef); @@ -4021,10 +4022,43 @@ static void test_mapping(void) /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ SetLastError(0xdeadbeef); ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); - ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); - /* FIXME: remove once Wine is fixed */ - todo_wine_if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) + if (anon_mapping) + { + if (is_compatible_protection(view[j].prot, page_prot[k])) + { + todo_wine_if (!ptr) + ok(ptr != NULL, "VirtualAlloc error %u, map %#x, view %#x, requested prot %#x\n", + GetLastError(), page_prot[i], view[j].prot, page_prot[k]); + } + else + { + /* versions <= Vista accept all protections without checking */ + todo_wine_if (ptr) + ok(!ptr || broken(ptr != NULL), + "VirtualAlloc should fail, map %#x, view %#x, requested prot %#x\n", + page_prot[i], view[j].prot, page_prot[k]); + if (!ptr) ok( GetLastError() == ERROR_INVALID_PARAMETER, + "wrong error %u\n", GetLastError()); + } + if (ptr) + { + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + ok(info.Protect == page_prot[k] || + /* if the mapping doesn't have write access, + * broken versions silently switch to WRITECOPY */ + broken( info.Protect == map_prot_no_write(page_prot[k]) ), + "VirtualAlloc wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", + page_prot[i], view[j].prot, page_prot[k], info.Protect ); + } + } + else + { + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); + /* FIXME: remove once Wine is fixed */ + todo_wine_if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } } UnmapViewOfFile(base); @@ -4032,9 +4066,29 @@ static void test_mapping(void) CloseHandle(hmap); } +} - CloseHandle(hfile); - DeleteFileA(file_name); +static void test_mappings(void) +{ + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + HANDLE hfile; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "map", 0, file_name); + + hfile = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); + SetEndOfFile(hfile); + + test_mapping( hfile ); + + CloseHandle( hfile ); + DeleteFileA( file_name ); + + /* now anonymous mappings */ + test_mapping( INVALID_HANDLE_VALUE ); } static void test_shared_memory(BOOL is_child) @@ -4189,7 +4243,7 @@ START_TEST(virtual) test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); test_shared_memory_ro(FALSE, FILE_MAP_COPY); test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); - test_mapping(); + test_mappings(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection(); test_VirtualProtect();

1 0

Alexandre Julliard : kernel32/tests: Fix mapping protection tests to succeed on recent Windows versions.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 1caf95d1ad24ac290e2ea20643e77b4b21246ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1caf95d1ad24ac290e2ea2064… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 11:33:18 2017 +0200 kernel32/tests: Fix mapping protection tests to succeed on recent Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 126 ++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 65 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4d9335e..054d335 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3674,51 +3674,35 @@ static void test_CreateFileMapping_protection(void) #define ACCESS_READ 0x01 #define ACCESS_WRITE 0x02 #define ACCESS_EXECUTE 0x04 -#define ACCESS_WRITECOPY 0x08 static DWORD page_prot_to_access(DWORD prot) { switch (prot) { + case PAGE_READONLY: + case PAGE_WRITECOPY: + return ACCESS_READ; case PAGE_READWRITE: return ACCESS_READ | ACCESS_WRITE; - case PAGE_EXECUTE: case PAGE_EXECUTE_READ: + case PAGE_EXECUTE_WRITECOPY: return ACCESS_READ | ACCESS_EXECUTE; - case PAGE_EXECUTE_READWRITE: - return ACCESS_READ | ACCESS_WRITE | ACCESS_WRITECOPY | ACCESS_EXECUTE; - - case PAGE_EXECUTE_WRITECOPY: - return ACCESS_READ | ACCESS_WRITECOPY | ACCESS_EXECUTE; - - case PAGE_READONLY: - return ACCESS_READ; - - case PAGE_WRITECOPY: - return ACCESS_READ; - + return ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE; default: return 0; } } -static BOOL is_compatible_protection(DWORD map_prot, DWORD view_prot, DWORD prot) +static BOOL is_compatible_protection(DWORD view_prot, DWORD prot) { - DWORD map_access, view_access, prot_access; + DWORD view_access, prot_access; - map_access = page_prot_to_access(map_prot); view_access = page_prot_to_access(view_prot); prot_access = page_prot_to_access(prot); - if (view_access == prot_access) return TRUE; - if (!view_access) return FALSE; - - if ((view_access & prot_access) != prot_access) return FALSE; - if ((map_access & prot_access) == prot_access) return TRUE; - - return FALSE; + return ((view_access & prot_access) == prot_access); } static DWORD map_prot_to_access(DWORD prot) @@ -3726,10 +3710,12 @@ static DWORD map_prot_to_access(DWORD prot) switch (prot) { case PAGE_READWRITE: + return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_QUERY; case PAGE_EXECUTE_READWRITE: return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT | SECTION_QUERY; case PAGE_READONLY: case PAGE_WRITECOPY: + return SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_QUERY; case PAGE_EXECUTE: case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: @@ -3739,11 +3725,23 @@ static DWORD map_prot_to_access(DWORD prot) } } +static DWORD file_access_to_prot( DWORD access ) +{ + BOOL exec = access & FILE_MAP_EXECUTE; + access &= ~FILE_MAP_EXECUTE; + + if (access == FILE_MAP_COPY) return exec ? PAGE_EXECUTE_WRITECOPY : PAGE_WRITECOPY; + if (access & FILE_MAP_WRITE) return exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; + if (access & FILE_MAP_READ) return exec ? PAGE_EXECUTE_READ : PAGE_READONLY; + return PAGE_NOACCESS; +} + static BOOL is_compatible_access(DWORD map_prot, DWORD view_prot) { DWORD access = map_prot_to_access(map_prot); - if (!view_prot) view_prot = SECTION_MAP_READ; - return (view_prot & access) == view_prot; + DWORD view_access = map_prot_to_access( file_access_to_prot( view_prot )); + if (!view_access) view_access = SECTION_MAP_READ; + return (view_access & access) == view_access; } static void *map_view_of_file(HANDLE handle, DWORD access) @@ -3752,7 +3750,6 @@ static void *map_view_of_file(HANDLE handle, DWORD access) LARGE_INTEGER offset; SIZE_T count; ULONG protect; - BOOL exec; void *addr; if (!pNtMapViewOfSection) return NULL; @@ -3761,32 +3758,7 @@ static void *map_view_of_file(HANDLE handle, DWORD access) offset.u.LowPart = 0; offset.u.HighPart = 0; - exec = access & FILE_MAP_EXECUTE; - access &= ~FILE_MAP_EXECUTE; - - if (access == FILE_MAP_COPY) - { - if (exec) - protect = PAGE_EXECUTE_WRITECOPY; - else - protect = PAGE_WRITECOPY; - } - else if (access & FILE_MAP_WRITE) - { - if (exec) - protect = PAGE_EXECUTE_READWRITE; - else - protect = PAGE_READWRITE; - } - else if (access & FILE_MAP_READ) - { - if (exec) - protect = PAGE_EXECUTE_READ; - else - protect = PAGE_READONLY; - } - else protect = PAGE_NOACCESS; - + protect = file_access_to_prot( access ); addr = NULL; status = pNtMapViewOfSection(handle, GetCurrentProcess(), &addr, 0, 0, &offset, &count, 1 /* ViewShare */, 0, protect); @@ -3804,7 +3776,7 @@ static void test_mapping(void) static const DWORD page_prot[] = { PAGE_NOACCESS, PAGE_READONLY, PAGE_READWRITE, PAGE_WRITECOPY, - PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY + PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY }; static const struct { @@ -3882,6 +3854,13 @@ static void test_mapping(void) CloseHandle(hmap); hmap = hmap2; } + if (page_prot[i] == PAGE_EXECUTE) + { + ok(!hmap, "CreateFileMapping(PAGE_NOACCESS) should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + continue; + } if (!hmap) { @@ -3924,8 +3903,25 @@ static void test_mapping(void) if (!is_compatible_access(page_prot[i], view[j].access)) { - ok(!base, "%d: MapViewOfFile(%04x/%04x) should fail\n", j, page_prot[i], view[j].access); - ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError()); + /* FILE_MAP_EXECUTE | FILE_MAP_COPY broken on XP */ + if (base != NULL && view[j].access == (FILE_MAP_EXECUTE | FILE_MAP_COPY)) + { + todo_wine + ok( broken(base != NULL), "%d: MapViewOfFile(%04x/%04x) should fail\n", + j, page_prot[i], view[j].access); + UnmapViewOfFile( base ); + } + else todo_wine_if ((page_prot[i] == PAGE_READONLY && + is_compatible_access( PAGE_EXECUTE_READ, view[j].access )) || + (page_prot[i] == PAGE_READWRITE && + is_compatible_access( PAGE_EXECUTE_READWRITE, view[j].access )) || + (page_prot[i] == PAGE_WRITECOPY && + is_compatible_access( PAGE_EXECUTE_WRITECOPY, view[j].access ))) + { + ok(!base, "%d: MapViewOfFile(%04x/%04x) should fail\n", + j, page_prot[i], view[j].access); + ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError()); + } continue; } @@ -3974,11 +3970,12 @@ static void test_mapping(void) SetLastError(0xdeadbeef); old_prot = 0xdeadbeef; ret = VirtualProtect(base, si.dwPageSize, page_prot[k], &old_prot); - if (is_compatible_protection(page_prot[i], view[j].prot, page_prot[k])) + if (is_compatible_protection(view[j].prot, page_prot[k])) { /* win2k and XP don't support EXEC on file mappings */ if (!ret && page_prot[k] == PAGE_EXECUTE) { + todo_wine ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); continue; } @@ -3991,6 +3988,7 @@ static void test_mapping(void) /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ if (!ret && page_prot[k] == PAGE_EXECUTE_WRITECOPY) { + todo_wine ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY\n"); continue; } @@ -4004,17 +4002,15 @@ static void test_mapping(void) ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); prev_prot = page_prot[k]; + + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + ok(info.Protect == page_prot[k], + "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", + page_prot[i], view[j].prot, page_prot[k], info.Protect ); } else { - /* NT4 doesn't fail on incompatible map and view */ - if (ret) - { - ok(broken(ret), "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); - skip("Incompatible map and view are not properly handled on this platform\n"); - break; /* NT4 won't pass remaining tests */ - } - ok(!ret, "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); }

1 0