wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

Józef Kucia : d3d11: Implement d3d11_device_CreateBuffer().
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: b500ae04b48db0ffe20bfefa121f69c6e675ead5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b500ae04b48db0ffe20bfefa1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 6 16:45:48 2015 +0200 d3d11: Implement d3d11_device_CreateBuffer(). --- dlls/d3d11/buffer.c | 26 ++++++++++++++++++++++++-- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 28 +++++++++++++--------------- 3 files changed, 39 insertions(+), 19 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index fba2b06..0245b52 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -376,8 +376,8 @@ static const struct wined3d_parent_ops d3d10_buffer_wined3d_parent_ops = d3d10_buffer_wined3d_object_released, }; -HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, - const D3D11_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) +static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, + const D3D11_BUFFER_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) { struct wined3d_buffer_desc wined3d_desc; HRESULT hr; @@ -414,3 +414,25 @@ HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, return S_OK; } + +HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d_buffer **buffer) +{ + struct d3d_buffer *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_buffer_init(object, device, desc, data))) + { + WARN("Failed to initialize buffer, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created buffer %p.\n", object); + *buffer = object; + + return S_OK; +} diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index eaf89af..49e40ea 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -145,8 +145,8 @@ struct d3d_buffer ID3D11Device *device; }; -HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, - const D3D11_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; +HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d_buffer **buffer) DECLSPEC_HIDDEN; struct d3d_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilView */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6194815..97a3404 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -59,9 +59,18 @@ static ULONG STDMETHODCALLTYPE d3d11_device_Release(ID3D11Device *iface) static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBuffer(ID3D11Device *iface, const D3D11_BUFFER_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Buffer **buffer) { - FIXME("iface %p, desc %p, data %p, buffer %p stub!\n", iface, desc, data, buffer); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_buffer *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, data %p, buffer %p.\n", iface, desc, data, buffer); + + if (FAILED(hr = d3d_buffer_create(device, desc, data, &object))) + return hr; + + *buffer = &object->ID3D11Buffer_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device *iface, @@ -1985,7 +1994,7 @@ static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Buffer **buffer) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); D3D11_BUFFER_DESC d3d11_desc; struct d3d_buffer *object; HRESULT hr; @@ -1999,22 +2008,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); d3d11_desc.StructureByteStride = 0; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - hr = d3d_buffer_init(object, This, &d3d11_desc, data); - if (FAILED(hr)) - { - WARN("Failed to initialize buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_buffer_create(device, &d3d11_desc, (const D3D11_SUBRESOURCE_DATA *)data, &object))) return hr; - } *buffer = &object->ID3D10Buffer_iface; - TRACE("Created ID3D10Buffer %p\n", object); - return S_OK; }

1 0

Józef Kucia : d3d11: Implement d3d10_buffer_GetDesc() .
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 4444917f1a769a8c16d33c9bd81e39e17ab23017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4444917f1a769a8c16d33c9bd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 6 16:45:47 2015 +0200 d3d11: Implement d3d10_buffer_GetDesc(). --- dlls/d3d11/buffer.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 02dfd9a..fba2b06 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -322,7 +322,16 @@ static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + const D3D11_BUFFER_DESC *d3d11_desc = &buffer->desc; + + TRACE("iface %p, desc %p.\n", iface, desc); + + desc->ByteWidth = d3d11_desc->ByteWidth; + desc->Usage = d3d10_usage_from_d3d11_usage(d3d11_desc->Usage); + desc->BindFlags = d3d10_bind_flags_from_d3d11_bind_flags(d3d11_desc->BindFlags); + desc->CPUAccessFlags = d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(d3d11_desc->CPUAccessFlags); + desc->MiscFlags = d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(d3d11_desc->MiscFlags); } static const struct ID3D10BufferVtbl d3d10_buffer_vtbl =

1 0

Józef Kucia : d3d11: Implement d3d11_buffer_GetDesc() .
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 378bec23ef06707f65d131d7eda1aab0fab0902c URL: http://source.winehq.org/git/wine.git/?a=commit;h=378bec23ef06707f65d131d7e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 6 16:45:46 2015 +0200 d3d11: Implement d3d11_buffer_GetDesc(). --- dlls/d3d11/buffer.c | 14 +++++++++++--- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 10 +++++++++- dlls/d3d11/utils.c | 7 ------- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index d2e3156..02dfd9a 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -163,7 +163,11 @@ static UINT STDMETHODCALLTYPE d3d11_buffer_GetEvictionPriority(ID3D11Buffer *ifa static void STDMETHODCALLTYPE d3d11_buffer_GetDesc(ID3D11Buffer *iface, D3D11_BUFFER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = buffer->desc; } static const struct ID3D11BufferVtbl d3d11_buffer_vtbl = @@ -364,7 +368,7 @@ static const struct wined3d_parent_ops d3d10_buffer_wined3d_parent_ops = }; HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, - const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) + const D3D11_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) { struct wined3d_buffer_desc wined3d_desc; HRESULT hr; @@ -374,13 +378,17 @@ HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, buffer->refcount = 1; wined3d_mutex_lock(); wined3d_private_store_init(&buffer->private_store); + buffer->desc = *desc; wined3d_desc.byte_width = desc->ByteWidth; - wined3d_desc.usage = wined3d_usage_from_d3d10core(0, desc->Usage); + wined3d_desc.usage = wined3d_usage_from_d3d11(0, desc->Usage); wined3d_desc.bind_flags = desc->BindFlags; wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; wined3d_desc.misc_flags = desc->MiscFlags; + if (desc->StructureByteStride) + FIXME("Ignoring structure byte stride %u.\n", desc->StructureByteStride); + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, (const struct wined3d_sub_resource_data *)data, buffer, &d3d10_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 2f56a5a..eaf89af 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -63,7 +63,6 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; -DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; @@ -142,11 +141,12 @@ struct d3d_buffer struct wined3d_private_store private_store; struct wined3d_buffer *wined3d_buffer; + D3D11_BUFFER_DESC desc; ID3D11Device *device; }; HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, - const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; + const D3D11_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; struct d3d_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilView */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index dee3c57..6194815 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1986,16 +1986,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Buffer **buffer) { struct d3d_device *This = impl_from_ID3D10Device(iface); + D3D11_BUFFER_DESC d3d11_desc; struct d3d_buffer *object; HRESULT hr; TRACE("iface %p, desc %p, data %p, buffer %p.\n", iface, desc, data, buffer); + d3d11_desc.ByteWidth = desc->ByteWidth; + d3d11_desc.Usage = d3d11_usage_from_d3d10_usage(desc->Usage); + d3d11_desc.BindFlags = d3d11_bind_flags_from_d3d10_bind_flags(desc->BindFlags); + d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); + d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); + d3d11_desc.StructureByteStride = 0; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; - hr = d3d_buffer_init(object, This, desc, data); + hr = d3d_buffer_init(object, This, &d3d11_desc, data); if (FAILED(hr)) { WARN("Failed to initialize buffer, hr %#x.\n", hr); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 8e89c32..3d1da1f 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -367,13 +367,6 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) return wined3d_usage; } -DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) -{ - UINT d3d11_bind_flags = d3d11_bind_flags_from_d3d10_bind_flags(bind_flags); - enum D3D11_USAGE d3d11_usage = d3d11_usage_from_d3d10_usage(usage); - return wined3d_usage_from_d3d11(d3d11_bind_flags, d3d11_usage); -} - enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) { switch (usage)

1 0

Hans Leidekker : advapi32/tests: Perform a case-insensitive match on domain names.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: ca32deb0d231d38cf1df874976cfc013c9def3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca32deb0d231d38cf1df87497… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 7 11:36:31 2015 +0200 advapi32/tests: Perform a case-insensitive match on domain names. --- dlls/advapi32/tests/security.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c48ffc9..ae9dd92 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2249,7 +2249,7 @@ static void test_LookupAccountName(void) ok(ret, "Failed to lookup account name\n"); ok(sid_size == GetLengthSid(psid), "Expected %d, got %d\n", GetLengthSid(psid), sid_size); ok(!lstrcmpA(account, user_name), "Expected %s, got %s\n", user_name, account); - ok(!lstrcmpA(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); + ok(!lstrcmpiA(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlenA(domain), domain_size); ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use); @@ -2267,7 +2267,7 @@ static void test_LookupAccountName(void) ok(ret, "Failed to lookup account name\n"); ok(sid_size != 0, "sid_size was zero\n"); ok(!lstrcmpA(account, "Everyone"), "Expected Everyone, got %s\n", account); - ok(!lstrcmpA(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); + ok(!lstrcmpiA(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == 0, "Expected 0, got %d\n", domain_size); ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlenA(domain), domain_size); ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeWellKnownGroup (%d), got %d\n", SidTypeWellKnownGroup, sid_use); @@ -2332,9 +2332,8 @@ static void test_LookupAccountName(void) get_sid_info(psid, &account, &sid_dom); ok(ret, "Failed to lookup account name\n"); /* Using a fixed string will not work on different locales */ - ok(!lstrcmpA(account, domain), - "Got %s for account and %s for domain, these should be the same\n", - account, domain); + ok(!lstrcmpiA(account, domain), + "Got %s for account and %s for domain, these should be the same\n", account, domain); ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); HeapFree(GetProcessHeap(), 0, psid);

1 0

Hans Leidekker : advapi32/tests: Avoid test failures when running as an unprivileged user.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: b368cd1b713f5ee17186bc4589863c636f71ac37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b368cd1b713f5ee17186bc458… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 7 11:36:04 2015 +0200 advapi32/tests: Avoid test failures when running as an unprivileged user. --- dlls/advapi32/tests/security.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 46db49c..c48ffc9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5886,6 +5886,12 @@ static void test_system_security_access(void) /* ACCESS_SYSTEM_SECURITY requires special privilege */ res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); todo_wine ok( res == ERROR_PRIVILEGE_NOT_HELD, "got %d\n", res ); + if (res == ERROR_ACCESS_DENIED) + { + skip( "unprivileged user\n" ); + CloseHandle( token ); + return; + } priv.PrivilegeCount = 1; priv.Privileges[0].Luid = luid; @@ -5897,6 +5903,13 @@ static void test_system_security_access(void) res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); ok( !res, "got %d\n", res ); + if (res == ERROR_PRIVILEGE_NOT_HELD) + { + win_skip( "privilege not held\n" ); + HeapFree( GetProcessHeap(), 0, priv_prev ); + CloseHandle( token ); + return; + } /* restore privileges */ ret = AdjustTokenPrivileges( token, FALSE, priv_prev, 0, NULL, NULL );

1 0

Hans Leidekker : msi/tests: Avoid test failures when running as an unprivileged user.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: fca92ae67cb1339fed9785a0e915bfdec8becb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca92ae67cb1339fed9785a0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 7 11:35:32 2015 +0200 msi/tests: Avoid test failures when running as an unprivileged user. --- dlls/msi/tests/install.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1aefa9f..86ad561 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3159,6 +3159,11 @@ static void test_samesequence(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_FAILURE) + { + win_skip("unprivileged user?\n"); + goto error; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { @@ -3167,6 +3172,8 @@ static void test_samesequence(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } + +error: delete_cab_files(); DeleteFileA(msifile); } @@ -3181,6 +3188,12 @@ static void test_uiLevelFlags(void) MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_FAILURE) + { + win_skip("unprivileged user?\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { @@ -3189,6 +3202,8 @@ static void test_uiLevelFlags(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } + +error: delete_cab_files(); DeleteFileA(msifile); }

1 0

Thomas Faber : user32: Use float literals for float operation.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 8a718259d37c0db1fe0b4710e0b21c1886174617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a718259d37c0db1fe0b4710e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Sep 7 10:14:02 2015 +0200 user32: Use float literals for float operation. --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 67adefb..084bbff 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -631,7 +631,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta prev = current_line->net_length - 1; w = current_line->net_length; d = (float)current_line->width/(float)fw; - if (d > 1.2) d -= 0.2; + if (d > 1.2f) d -= 0.2f; next = prev/d; if (next >= prev) next = prev-1; do {

1 0

Marcus Meissner : netprofm: fix memleak in error exit (Coverity).
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: faa14ba1b1c4d389725af4beefaec88da81c1418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa14ba1b1c4d389725af4bee… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Sep 7 09:07:56 2015 +0200 netprofm: fix memleak in error exit (Coverity). --- dlls/netprofm/list.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 197ef68..33b2fa6 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1681,7 +1681,11 @@ static void init_networks( struct list_manager *mgr ) if (ret != ERROR_BUFFER_OVERFLOW) return; if (!(buf = heap_alloc( size ))) return; - if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) return; + if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) + { + heap_free( buf ); + return; + } memset( &id, 0, sizeof(id) ); for (aa = buf; aa; aa = aa->Next)

1 0

Gerald Pfeifer : d3dcompiler_43: Replace 14 instances of 1 << 31 by 1u << 31 to avoid shift shift overflow.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: d04324f0fa449947743e8f00bee0267ba988f93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04324f0fa449947743e8f00b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 6 21:05:23 2015 +0200 d3dcompiler_43: Replace 14 instances of 1 << 31 by 1u << 31 to avoid shift shift overflow. --- dlls/d3dcompiler_43/bytecodewriter.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index aa3b80d..a3e6f63 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -602,7 +602,7 @@ static void write_declarations(struct bc_writer *This, put_dword(buffer, instr_dcl); /* Write the usage and index */ - token = (1 << 31); /* Bit 31 of non-instruction opcodes is 1 */ + token = (1u << 31); /* Bit 31 of non-instruction opcodes is 1 */ token |= (decls[i].usage << D3DSP_DCL_USAGE_SHIFT) & D3DSP_DCL_USAGE_MASK; token |= (decls[i].usage_idx << D3DSP_DCL_USAGEINDEX_SHIFT) & D3DSP_DCL_USAGEINDEX_MASK; put_dword(buffer, token); @@ -618,7 +618,7 @@ static void write_declarations(struct bc_writer *This, static void write_const(struct constant **consts, int num, DWORD opcode, DWORD reg_type, struct bytecode_buffer *buffer, BOOL len) { int i; DWORD instr_def = opcode; - const DWORD reg = (1<<31) | d3dsp_register( reg_type, 0 ) | D3DSP_WRITEMASK_ALL; + const DWORD reg = (1u << 31) | d3dsp_register( reg_type, 0 ) | D3DSP_WRITEMASK_ALL; if(len) { if(opcode == D3DSIO_DEFB) @@ -889,7 +889,7 @@ static DWORD map_vs_output(struct bc_writer *This, DWORD regnum, DWORD mask, DWO static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_wmask; if(reg->rel_reg) { @@ -963,7 +963,7 @@ static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, static void vs_1_x_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_swizzle; DWORD component; @@ -1074,7 +1074,7 @@ static DWORD map_ps_input(struct bc_writer *This, static void ps_1_0123_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); This->state = E_INVALIDARG; @@ -1120,7 +1120,7 @@ static void ps_1_0123_srcreg(struct bc_writer *This, const struct shader_reg *re static void ps_1_0123_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported for destination registers\n"); @@ -1382,7 +1382,7 @@ static const struct bytecode_backend ps_1_0123_backend = { static void ps_1_4_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); This->state = E_INVALIDARG; @@ -1421,7 +1421,7 @@ static void ps_1_4_srcreg(struct bc_writer *This, const struct shader_reg *reg, static void ps_1_4_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported for destination registers\n"); @@ -1568,7 +1568,7 @@ static void vs_2_header(struct bc_writer *This, static void vs_2_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_swizzle; DWORD component; DWORD d3d9reg; @@ -1803,12 +1803,12 @@ static void write_samplers(const struct bwriter_shader *shader, struct bytecode_ DWORD i; DWORD instr_dcl = D3DSIO_DCL | (2 << D3DSI_INSTLENGTH_SHIFT); DWORD token; - const DWORD reg = (1<<31) | d3dsp_register( D3DSPR_SAMPLER, 0 ) | D3DSP_WRITEMASK_ALL; + const DWORD reg = (1u << 31) | d3dsp_register( D3DSPR_SAMPLER, 0 ) | D3DSP_WRITEMASK_ALL; for(i = 0; i < shader->num_samplers; i++) { /* Write the DCL instruction */ put_dword(buffer, instr_dcl); - token = (1<<31); + token = (1u << 31); /* Already shifted */ token |= (d3d9_sampler(shader->samplers[i].type)) & D3DSP_TEXTURETYPE_MASK; put_dword(buffer, token); @@ -1835,7 +1835,7 @@ static void ps_2_header(struct bc_writer *This, const struct bwriter_shader *sha static void ps_2_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); @@ -1890,7 +1890,7 @@ static void ps_2_0_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { @@ -2063,7 +2063,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha static void sm_3_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; d3d9reg = d3d9_register(reg->type); @@ -2102,7 +2102,7 @@ static void sm_3_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) {

1 0

Dmitry Timoshkov : oleaut32: Don' t assume that SAFEARRAY is the last parameter in an varargs method.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 755feaca394d647191028bda8b1584b9eb145a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755feaca394d647191028bda8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 7 12:30:24 2015 +0800 oleaut32: Don't assume that SAFEARRAY is the last parameter in an varargs method. --- dlls/oleaut32/tests/tmarshal.c | 1 - dlls/oleaut32/typelib.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2d6e5f2..f18aecc 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1550,7 +1550,6 @@ static void test_typelibmarshal(void) dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine ok_ole_success(hr, IDispatch_Invoke); SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 29bab33..f4bba71 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7078,7 +7078,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } V_VT(&rgvarg[i]) = rgvt[i]; } - else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0 && i == func_desc->cParams-1) + else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0) { SAFEARRAY *a; SAFEARRAYBOUND bound;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
32
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 September 2015