May 2017 - Wine-commits - list.winehq.org

Jacek Caban : rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcServerProtseq objects.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 6b53b79e18a8345ef53d4217cb56afe9891a7574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b53b79e18a8345ef53d4217c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 13:52:24 2017 +0200 rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcServerProtseq objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 4 ---- dlls/rpcrt4/rpc_transport.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 901801e..dcfac70 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -947,14 +947,10 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->MaxCalls = MaxCalls; (*ps)->Protseq = RPCRT4_strdupA(Protseq); (*ps)->ops = ops; - (*ps)->MaxCalls = 0; list_init(&(*ps)->listeners); list_init(&(*ps)->connections); InitializeCriticalSection(&(*ps)->cs); (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); - (*ps)->is_listening = FALSE; - (*ps)->mgr_mutex = NULL; - (*ps)->server_ready_event = NULL; list_add_head(&protseqs, &(*ps)->entry); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e6e9aaa..e2fbbfd 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -642,7 +642,7 @@ typedef struct _RpcServerProtseq_np static RpcServerProtseq *rpcrt4_protseq_np_alloc(void) { - RpcServerProtseq_np *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); + RpcServerProtseq_np *ps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ps)); if (ps) ps->mgr_event = CreateEventW(NULL, FALSE, FALSE, NULL); return &ps->common; @@ -1507,7 +1507,7 @@ typedef struct _RpcServerProtseq_sock static RpcServerProtseq *rpcrt4_protseq_sock_alloc(void) { - RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); + RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ps)); if (ps) { static BOOL wsa_inited;

1 0

Henri Verbeet : wined3d: Just fail if looking up the guessed GPU info fails in wined3d_adapter_init_gl_caps ().
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 01092d645f03858278d66035bad58d96fc26cc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01092d645f03858278d66035b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 24 11:22:08 2017 +0200 wined3d: Just fail if looking up the guessed GPU info fails in wined3d_adapter_init_gl_caps(). This should never happen. Note that the previous code would return a GPU with 64 TiB of VRAM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4115453..53f8232 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(winediag); -#define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) #define DEFAULT_REFRESH_RATE 0 /* The driver names reflect the lowest GPU supported @@ -4339,8 +4338,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, if (!(gpu_description = query_gpu_description(gl_info, &vram_bytes))) { - static const struct gpu_description default_gpu_description = - {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_128, "Direct3D HAL", DRIVER_UNKNOWN, WINE_DEFAULT_VIDMEM}; enum wined3d_pci_vendor vendor; enum wined3d_pci_device device; @@ -4354,7 +4351,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, if (!(gpu_description = get_gpu_description(vendor, device))) { ERR("Card %04x:%04x not found in driver DB.\n", vendor, device); - gpu_description = &default_gpu_description; + return FALSE; } } fixup_extensions(gl_info, caps_gl_ctx, gl_renderer_str, gl_vendor,

1 0

Henri Verbeet : wined3d: Add a conversion function for WINED3DFMT_X8D24_UNORM.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 2ed609f15da7c7f8bde54f6d4d895c72f96dd950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed609f15da7c7f8bde54f6d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 24 11:22:09 2017 +0200 wined3d: Add a conversion function for WINED3DFMT_X8D24_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 78ada57..2bdc9e2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -828,6 +828,26 @@ static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT src_row_p } } +static void convert_x8_d24_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) +{ + unsigned int x, y, z; + + for (z = 0; z < depth; ++z) + { + for (y = 0; y < height; ++y) + { + const DWORD *source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + DWORD *dest = (DWORD *)(dst + z * dst_slice_pitch + y * dst_row_pitch); + + for (x = 0; x < width; ++x) + { + dest[x] = source[x] << 8 | source[x] >> 16; + } + } + } +} + static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD color) { /* FIXME: Is this really how color keys are supposed to work? I think it @@ -1571,14 +1591,14 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, NULL}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, convert_x8_d24_unorm}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, NULL}, + ARB_DEPTH_TEXTURE, convert_x8_d24_unorm}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW,

1 0

Henri Verbeet : wined3d: Only warn about unsupported input streams in fixed_get_input().
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: fb75e0863ab8e9ee9f623187e3816d058c66b20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb75e0863ab8e9ee9f623187e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 24 11:22:10 2017 +0200 wined3d: Only warn about unsupported input streams in fixed_get_input(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6d09c22..cfeae83 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3232,8 +3232,8 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) *regnum = WINED3D_FFP_TEXCOORD0 + usage_idx; else { - FIXME("Unsupported input stream [usage=%s, usage_idx=%u].\n", debug_d3ddeclusage(usage), usage_idx); - *regnum = ~0U; + WARN("Unsupported input stream [usage=%s, usage_idx=%u].\n", debug_d3ddeclusage(usage), usage_idx); + *regnum = ~0u; return FALSE; }

1 0

Henri Verbeet : wined3d: Only warn about 0 blend factors in gl_blend_factor().
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: af767551fe1dcd7f8fbfc03dfe907eb3bc3e771d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af767551fe1dcd7f8fbfc03df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 24 11:22:11 2017 +0200 wined3d: Only warn about 0 blend factors in gl_blend_factor(). Some applications reset state by setting all render states to 0. That's questionable on behalf of the application, but not an issue as far as wined3d is concerned. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ad063fe..dd19fa3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -428,7 +428,10 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo case WINED3D_BLEND_INVSRC1ALPHA: return GL_ONE_MINUS_SRC1_ALPHA; default: - FIXME("Unhandled blend factor %#x.\n", factor); + if (!factor) + WARN("Unhandled blend factor %#x.\n", factor); + else + FIXME("Unhandled blend factor %#x.\n", factor); return GL_NONE; } }

1 0

Henri Verbeet : wined3d: Only warn about 0 blend ops in gl_blend_op().
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 6e4e3d8117ac7b6398021b44ebbafaf01423bc7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4e3d8117ac7b6398021b44e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 24 11:22:12 2017 +0200 wined3d: Only warn about 0 blend ops in gl_blend_op(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index dd19fa3..df5a3b1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -348,7 +348,10 @@ static GLenum gl_blend_op(const struct wined3d_gl_info *gl_info, enum wined3d_bl case WINED3D_BLEND_OP_MAX: return gl_info->supported[EXT_BLEND_MINMAX] ? GL_MAX : GL_FUNC_ADD; default: - FIXME("Unhandled blend op %#x.\n", op); + if (!op) + WARN("Unhandled blend op %#x.\n", op); + else + FIXME("Unhandled blend op %#x.\n", op); return GL_FUNC_ADD; } }

1 0

Hugh McMaster : regedit: Remove duplicate HINSTANCE declaration from main.h.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 0c9de25955e27d2a2ff87699c0bcaaaf33134568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9de25955e27d2a2ff87699c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 24 08:21:10 2017 +0000 regedit: Remove duplicate HINSTANCE declaration from main.h. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index b900ee1..fffd8d0 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -45,8 +45,6 @@ #define HEM_SETDATA (WM_USER+0) #define HEM_GETDATA (WM_USER+1) -extern HINSTANCE hInst; - /******************************************************************************/ enum OPTION_FLAGS {

1 0

Nikolay Sivov : shell32/tests: Remove null check after dereference ( Coverity).
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 4270c08cd759bea653c2772ccc0bd1bd8b19f4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4270c08cd759bea653c2772cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 24 12:21:27 2017 +0300 shell32/tests: Remove null check after dereference (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlview.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index fa6dab4..7685506 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1447,11 +1447,8 @@ static void test_SHCreateShellFolderViewEx(void) ok(unk == (IUnknown *)psv, "got %p\n", unk); IUnknown_Release(unk); - if (psv) - { - refCount = IShellView_Release(psv); - ok(refCount == 0, "refCount = %u\n", refCount); - } + refCount = IShellView_Release(psv); + ok(refCount == 0, "refCount = %u\n", refCount); if (0) {

1 0

Rosanne DiMesio : Fix comment header in Comments Management
by Jeremy Newman 24 May '17

24 May '17

Module: appdb Branch: master Commit: f32ec85e61edb2640d38733325170f8a9d58428e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f32ec85e61edb2640d387333… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed May 24 13:17:22 2017 -0500 Fix comment header in Comments Management The application name wasn't displaying at all and all comments were labeled "has maintainer" regardless of maintainership status. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/comment.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/comment.php b/include/comment.php index c2c425d..3fb8b94 100644 --- a/include/comment.php +++ b/include/comment.php @@ -249,14 +249,15 @@ class Comment { private function output_comment($bShowAppName = false, $bShowForm = true) { // by line - $sBy = " by ".forum_lookup_user($this->oOwner->iUserId)." on ".$this->sDateCreated."\n"; + $sBy = " by ".forum_lookup_user($this->oOwner->iUserId)." on ".$this->sDateCreated." \n"; + if ($bShowAppName) { $oVersion = new version($this->iVersionId); - $sBy .= " Application: ".version::fullNameLink($this->iVersionId). - " (".$oVersion->bHasMaintainer ? 'has maintainer' : 'no maintainers'.")\n"; - } - + $sBy .= "Application: ".version::fullNameLink($this->iVersionId); + $sBy .= ($oVersion->bHasMaintainer ? ' (has maintainer)' : ' (no maintainers)'); + } + $sFooter = ""; if ($bShowForm) {

1 0

Sven Hesse : d3d11/tests: Add tests for SM5 instructions gather4_c/ gather4_po_c.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 6bfbbb6bcf90b44a4be1792dad688b6477f3deaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bfbbb6bcf90b44a4be1792da… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Mon May 22 19:15:03 2017 +0200 d3d11/tests: Add tests for SM5 instructions gather4_c/gather4_po_c. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bfbbb6bcf90b44a4be17…

1 0