wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Józef Kucia : d3d11/tests: Add more tests for accessing unbound resources.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 42edcbca2528eb5ef763d0db59d3c42572082bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42edcbca2528eb5ef763d0db5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:52 2016 +0200 d3d11/tests: Add more tests for accessing unbound resources. 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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4d676be..a959c0b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4246,6 +4246,8 @@ static void test_texture(void) {&ps_ld, &bc3_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc4_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_ld, &bc5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, {&ps_ld_uint8, &uint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &bc1_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, @@ -4259,6 +4261,8 @@ static void test_texture(void) {&ps_sample, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, {&ps_sample, &a8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, + {&ps_sample, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_b, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 8.0f, level_1_colors}, @@ -4269,6 +4273,10 @@ static void test_texture(void) {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 2.0f, 9.0f, level_2_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 1.0f, 9.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 9.0f, rgba_level_0}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_b, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, zero_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, @@ -4295,6 +4303,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 0.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 1.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 2.0f, 2.0f, 2.0f, 9.0f, level_2_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_l, NULL, POINT, 2.0f, 2.0f, MIP_MAX, 1.0f, zero_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, -9.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, red_colors}, @@ -4308,7 +4320,11 @@ static void test_texture(void) {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.1f, blue_colors}, {&ps_sample_2d_array, &array_2d_texture, POINT, 0.0f, 0.0f, MIP_MAX, 9.0f, blue_colors}, {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, 0.0f, 2.0f, zero_colors}, {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, zero_colors}, + {&ps_sample_2d_array, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, zero_colors}, #undef POINT #undef POINT_LINEAR #undef MIP_MAX

1 0

Józef Kucia : wined3d: Add wined3d creation flag for selecting unbound resource color.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: e47a735f762ebe1545bb366c7e9e2b90db7c7f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47a735f762ebe1545bb366c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:51 2016 +0200 wined3d: Add wined3d creation flag for selecting unbound resource color. 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/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw_private.h | 3 ++- dlls/wined3d/device.c | 18 +++++++++++------- include/wine/wined3d.h | 1 + 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 3f42c5e..18753cd 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -431,7 +431,8 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING - | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER; + | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index f6d32b0..8f5f143 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -664,7 +664,7 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_SRGB_READ_WRITE_CONTROL; + | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 26bc242..b3b171a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -60,7 +60,8 @@ struct FvfToDecl #define DDRAW_STRIDE_ALIGNMENT 8 #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ - | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER) + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR) enum ddraw_device_state { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 967a831..5bac3d0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -682,19 +682,23 @@ out: /* Context activation is done by the caller. */ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; unsigned int i, j, count; + DWORD color; + + if (d3d_info->wined3d_creation_flags & WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR) + color = 0x000000ff; + else + color = 0x00000000; + /* Under DirectX you can sample even if no texture is bound, whereas * OpenGL will only allow that when a valid texture is bound. * We emulate this by creating dummy textures and binding them * to each texture stage when the currently set D3D texture is NULL. */ - count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); for (i = 0; i < count; ++i) { - static const DWORD d3d10_color = 0x00000000; - static const DWORD color = 0x000000ff; - /* Make appropriate texture active */ context_active_texture(context, gl_info, i); @@ -732,7 +736,8 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, device->dummy_texture_3d[i]); checkGLcall("glBindTexture"); - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA8, 1, 1, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color)); + GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA8, 1, 1, 1, 0, + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color)); checkGLcall("glTexImage3D"); } @@ -763,7 +768,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("glBindTexture"); GL_EXTCALL(glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 1, 0, - GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &d3d10_color)); + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color)); checkGLcall("glTexImage3D"); } } @@ -820,7 +825,6 @@ static void create_default_sampler(struct wined3d_device *device) * sampler object is used to emulate the direct resource access when there is no sampler state * to use. */ - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { GL_EXTCALL(glGenSamplers(1, &device->default_sampler)); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8429bea..e31f9ca 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1237,6 +1237,7 @@ enum wined3d_display_rotation #define WINED3D_PIXEL_CENTER_INTEGER 0x00000080 #define WINED3D_LEGACY_FFP_LIGHTING 0x00000100 #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 +#define WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR 0x00000400 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Andrey Gusev : include: Fix a typo in IDirect3D9Ex method.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 7372e704d031a0953434b9c4f7d59baa102acbad URL: http://source.winehq.org/git/wine.git/?a=commit;h=7372e704d031a0953434b9c4f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 22 22:42:28 2016 +0300 include: Fix a typo in IDirect3D9Ex method. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d9.h b/include/d3d9.h index 24d2968..7ad7138 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -290,7 +290,7 @@ DECLARE_INTERFACE_(IDirect3D9Ex,IDirect3D9) UINT mode_idx, D3DDISPLAYMODEEX *mode) PURE; STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT Adapter, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation); STDMETHOD(CreateDeviceEx)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) PURE; - STDMETHOD(GetAdapterLUID)(THIS_ UINT Adatper, LUID *pLUID) PURE; + STDMETHOD(GetAdapterLUID)(THIS_ UINT adapter, LUID *luid) PURE; }; #undef INTERFACE

1 0

Thomas Faber : qmgr: Fully initialize URL_COMPONENTSW structure before calling WinHttpCrackUrl.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: d0b72cee0dee7548731bb2b9ba4f6f39a3fdede8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b72cee0dee7548731bb2b9b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun May 22 21:13:55 2016 +0200 qmgr: Fully initialize URL_COMPONENTSW structure before calling WinHttpCrackUrl. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 302f407..cdea329 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -522,6 +522,8 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) uc.nPort = 0; uc.lpszUrlPath = NULL; uc.dwUrlPathLength = ~0u; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) {

1 0

Andrey Gusev : secur32/tests: Fix a typo in ok() messages.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: fd040fc9d9a84343c061755fcc313c5d994ec8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd040fc9d9a84343c061755fc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 22 23:05:13 2016 +0300 secur32/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 154d86b..4147ac7 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -327,7 +327,7 @@ static SECURITY_STATUS setupClient(SspiData *sspi_data, SEC_CHAR *provider) trace("AcquireCredentialsHandle() returned %s\n", getSecError(ret)); } - ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + ok(ret == SEC_E_OK, "AcquireCredentialsHandle() returned %s\n", getSecError(ret)); return ret; @@ -355,7 +355,7 @@ static SECURITY_STATUS setupServer(SspiData *sspi_data, SEC_CHAR *provider) trace("AcquireCredentialsHandle() returned %s\n", getSecError(ret)); } - ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + ok(ret == SEC_E_OK, "AcquireCredentialsHandle() returned %s\n", getSecError(ret)); return ret; @@ -1211,21 +1211,21 @@ static BOOL testAcquireCredentialsHandle(void) ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, NULL, &id, NULL, NULL, &cred, &ttl); - ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + ok(ret == SEC_E_OK, "AcquireCredentialsHandle() returned %s\n", getSecError(ret)); pFreeCredentialsHandle(&cred); id.DomainLength = 0; ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, NULL, &id, NULL, NULL, &cred, &ttl); - ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + ok(ret == SEC_E_OK, "AcquireCredentialsHandle() returned %s\n", getSecError(ret)); pFreeCredentialsHandle(&cred); id.Domain = NULL; ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, NULL, &id, NULL, NULL, &cred, &ttl); - ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + ok(ret == SEC_E_OK, "AcquireCredentialsHandle() returned %s\n", getSecError(ret)); pFreeCredentialsHandle(&cred); @@ -1235,7 +1235,7 @@ static BOOL testAcquireCredentialsHandle(void) id.User = NULL; ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, NULL, &id, NULL, NULL, &cred, &ttl); - ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + ok(ret == SEC_E_OK, "AcquireCredentialsHandle() returned %s\n", getSecError(ret)); pFreeCredentialsHandle(&cred); @@ -1245,7 +1245,7 @@ static BOOL testAcquireCredentialsHandle(void) id.PasswordLength = 0; ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, NULL, &id, NULL, NULL, &cred, &ttl); - ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + ok(ret == SEC_E_OK, "AcquireCredentialsHandle() returned %s\n", getSecError(ret)); pFreeCredentialsHandle(&cred); return TRUE; @@ -1289,7 +1289,7 @@ static void test_cred_multiple_use(void) ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, NULL, &id, NULL, NULL, &cred, &ttl); - ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + ok(ret == SEC_E_OK, "AcquireCredentialsHandle() returned %s\n", getSecError(ret)); buffer_desc.ulVersion = SECBUFFER_VERSION; @@ -1337,7 +1337,7 @@ static void test_null_auth_data(void) status = pAcquireCredentialsHandleA(NULL, (SEC_CHAR *)"NTLM", SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &ttl); - ok(status == SEC_E_OK, "AcquireCredentialsHande() failed %s\n", getSecError(status)); + ok(status == SEC_E_OK, "AcquireCredentialsHandle() failed %s\n", getSecError(status)); buffers[0].cbBuffer = info->cbMaxToken; buffers[0].BufferType = SECBUFFER_TOKEN;

1 0

Andrey Gusev : shell32: Fix a typo in TRACE format in SHPathPrepareForWriteW.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 7f64817e5ed3a982bc57ddb603e96de8ab327715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f64817e5ed3a982bc57ddb60… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 22 16:57:58 2016 +0300 shell32: Fix a typo in TRACE format in SHPathPrepareForWriteW. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 6f20181..3c18066 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1744,7 +1744,7 @@ HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path WCHAR* last_slash; WCHAR* temppath=NULL; - TRACE("%p %p %s 0x%80x\n", hwnd, modless, debugstr_w(path), flags); + TRACE("%p %p %s 0x%08x\n", hwnd, modless, debugstr_w(path), flags); if (flags & ~(SHPPFW_DIRCREATE|SHPPFW_ASKDIRCREATE|SHPPFW_IGNOREFILENAME)) FIXME("unimplemented flags 0x%08x\n", flags);

1 0

Nikolay Sivov : crypt32: No need to init entry fields when it' s about to be added to a list.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 4ec1ca5a0ff3b3c6adbd458b166a865132e5b984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec1ca5a0ff3b3c6adbd458b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 22 21:45:51 2016 +0300 crypt32: No need to init entry fields when it's about to be added to a list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/collectionstore.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index bfb83d1..f565745 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -524,7 +524,6 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, entry->store = sibling; entry->dwUpdateFlags = dwUpdateFlags; entry->dwPriority = dwPriority; - list_init(&entry->entry); TRACE("%p: adding %p, priority %d\n", collection, entry, dwPriority); EnterCriticalSection(&collection->cs); if (dwPriority)

1 0

Nikolay Sivov : rpcss: No need to initialize entry list pointers.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 42a6fc28c808ddc8921dba306f2444c2a3d0fa24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a6fc28c808ddc8921dba306… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 22 21:44:49 2016 +0300 rpcss: No need to initialize entry list pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/epmp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index 1acefa2..656fa9c 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -113,7 +113,6 @@ void __cdecl ept_insert(handle_t h, *status = EPT_S_CANT_PERFORM_OP; break; } - list_init(&entry->entry); memcpy(entry->annotation, entries[i].annotation, sizeof(entries[i].annotation)); rpc_status = TowerExplode(entries[i].tower, &entry->iface, &entry->syntax, &entry->protseq, &entry->endpoint,

1 0

Nikolay Sivov : rpcss: Fix a leak when TowerExplode() fails on endpoint insertion (Coverity).
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 5b406f896399a7783d1297c2ac4fe1c4c8f7f9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b406f896399a7783d1297c2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 22 21:44:48 2016 +0300 rpcss: Fix a leak when TowerExplode() fails on endpoint insertion (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/epmp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index 3243192..1acefa2 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -122,6 +122,7 @@ void __cdecl ept_insert(handle_t h, { WINE_WARN("TowerExplode failed %u\n", rpc_status); *status = rpc_status; + HeapFree(GetProcessHeap(), 0, entry); break; /* FIXME: more cleanup? */ }

1 0

Nikolay Sivov : rpcss: Fix potential leaks when removing endpoint ( Coverity).
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: a87c510e9a7ff3fd748920525425b7e317a0bbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a87c510e9a7ff3fd748920525… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 22 21:44:47 2016 +0300 rpcss: Fix potential leaks when removing endpoint (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/epmp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index 2eb6039..3243192 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -165,6 +165,11 @@ void __cdecl ept_delete(handle_t h, if (rpc_status != RPC_S_OK) break; entry = find_ept_entry(&iface, &syntax, protseq, endpoint, address, &entries[i].object); + + I_RpcFree(protseq); + I_RpcFree(endpoint); + I_RpcFree(address); + if (entry) delete_registered_ept_entry(entry); else @@ -172,9 +177,6 @@ void __cdecl ept_delete(handle_t h, *status = EPT_S_NOT_REGISTERED; break; } - I_RpcFree(protseq); - I_RpcFree(endpoint); - I_RpcFree(address); } LeaveCriticalSection(&csEpm);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016