November 2015 - Wine-Commits

Józef Kucia : d3d10core/tests: Avoid multiple readbacks of backbuffer texture.
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: c9ea266c011bb4568b31ac4f8573b519843cb2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ea266c011bb4568b31ac4f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 02:03:33 2015 +0100 d3d10core/tests: Avoid multiple readbacks of backbuffer texture. 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/d3d10core/tests/device.c | 79 +++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index d6b6bfb..bec3763 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -85,33 +85,68 @@ static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) return TRUE; } -static DWORD get_texture_color(ID3D10Texture2D *src_texture, unsigned int x, unsigned int y) +struct texture_readback { + ID3D10Texture2D *texture; D3D10_MAPPED_TEXTURE2D mapped_texture; +}; + +static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readback *rb) +{ D3D10_TEXTURE2D_DESC texture_desc; - ID3D10Texture2D *dst_texture; ID3D10Device *device; - DWORD color; HRESULT hr; - ID3D10Texture2D_GetDevice(src_texture, &device); + memset(rb, 0, sizeof(*rb)); + + ID3D10Texture2D_GetDevice(texture, &device); - ID3D10Texture2D_GetDesc(src_texture, &texture_desc); + ID3D10Texture2D_GetDesc(texture, &texture_desc); texture_desc.Usage = D3D10_USAGE_STAGING; texture_desc.BindFlags = 0; texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &dst_texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + if (FAILED(hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rb->texture))) + { + trace("Failed to create texture, hr %#x.\n", hr); + ID3D10Device_Release(device); + return; + } - ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); - hr = ID3D10Texture2D_Map(dst_texture, 0, D3D10_MAP_READ, 0, &mapped_texture); - ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); - color = *(DWORD *)(((BYTE *)mapped_texture.pData) + mapped_texture.RowPitch * y + x * 4); - ID3D10Texture2D_Unmap(dst_texture, 0); + ID3D10Device_CopyResource(device, (ID3D10Resource *)rb->texture, (ID3D10Resource *)texture); + if (FAILED(hr = ID3D10Texture2D_Map(rb->texture, 0, D3D10_MAP_READ, 0, &rb->mapped_texture))) + { + trace("Failed to map texture, hr %#x.\n", hr); + ID3D10Texture2D_Release(rb->texture); + rb->texture = NULL; + } - ID3D10Texture2D_Release(dst_texture); ID3D10Device_Release(device); +} + +static DWORD get_readback_color(struct texture_readback *rb, unsigned int x, unsigned int y) +{ + return rb->texture + ? ((DWORD *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(DWORD) + x] : 0xdeadbeef; +} + +static void release_texture_readback(struct texture_readback *rb) +{ + if (!rb->texture) + return; + + ID3D10Texture2D_Unmap(rb->texture, 0); + ID3D10Texture2D_Release(rb->texture); +} + +static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigned int y) +{ + struct texture_readback rb; + DWORD color; + + get_texture_readback(texture, &rb); + color = get_readback_color(&rb, x, y); + release_texture_readback(&rb); return color; } @@ -3179,6 +3214,7 @@ static void test_texture(void) D3D10_BUFFER_DESC buffer_desc; ID3D10Texture2D *backbuffer; unsigned int stride, offset; + struct texture_readback rb; IDXGISwapChain *swapchain; ID3D10Texture2D *texture; ID3D10VertexShader *vs; @@ -3355,16 +3391,18 @@ static void test_texture(void) ID3D10Device_Draw(device, 4, 0); + get_texture_readback(backbuffer, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { - color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); ok(compare_color(color, bitmap_data[j + i * 4], 1), "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } + release_texture_readback(&rb); ID3D10PixelShader_Release(ps); ID3D10VertexShader_Release(vs); @@ -4047,6 +4085,7 @@ static void test_update_subresource(void) D3D10_BUFFER_DESC buffer_desc; ID3D10Texture2D *backbuffer; unsigned int stride, offset; + struct texture_readback rb; IDXGISwapChain *swapchain; ID3D10Texture2D *texture; ID3D10VertexShader *vs; @@ -4227,15 +4266,17 @@ static void test_update_subresource(void) ID3D10Device_ClearRenderTargetView(device, backbuffer_rtv, red); ID3D10Device_Draw(device, 4, 0); + get_texture_readback(backbuffer, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { - color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); ok(compare_color(color, 0x00000000, 0), "Got unexpected color 0x%08x at (%u, %u).\n", color, j, i); } } + release_texture_readback(&rb); set_box(&box, 1, 1, 0, 3, 3, 1); ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, @@ -4253,30 +4294,34 @@ static void test_update_subresource(void) ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, bitmap_data, sizeof(*bitmap_data), 0); ID3D10Device_Draw(device, 4, 0); + get_texture_readback(backbuffer, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { - color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); ok(compare_color(color, expected_colors[j + i * 4], 1), "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } + release_texture_readback(&rb); ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, NULL, bitmap_data, 4 * sizeof(*bitmap_data), 0); ID3D10Device_Draw(device, 4, 0); + get_texture_readback(backbuffer, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) { - color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); ok(compare_color(color, bitmap_data[j + i * 4], 1), "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } + release_texture_readback(&rb); ID3D10PixelShader_Release(ps); ID3D10VertexShader_Release(vs);

1 0

Austin English : bthprops.cpl: Comment out CPLApplet from spec file.
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: 35f9ee3d97ef81397f4e15b0d7ae48fe443023bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f9ee3d97ef81397f4e15b0d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 11 13:51:18 2015 -0600 bthprops.cpl: Comment out CPLApplet from spec file. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index bb7a6ff..7a9de48 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -60,6 +60,6 @@ @ stub BthpEnableAllServices @ stub BthpFindPnpInfo @ stub BthpMapStatusToErr -@ stub CPlApplet +#@ stub CPlApplet @ stub DllCanUnloadNow @ stub DllGetClassObject

1 0

Nikolay Sivov : dwrite: Remove a couple of dead assignments (Clang).
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: c4b894db63fca9c64a0361e46b307e30caac8aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b894db63fca9c64a0361e46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 23:55:04 2015 +0300 dwrite: Remove a couple of dead assignments (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f7ca0cf..723a762 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1198,9 +1198,11 @@ static void apply_cluster_spacing(FLOAT leading_spacing, FLOAT trailing_spacing, advance += trailing_spacing; modified_advances[end-1] += trailing_spacing; } - if (advance < min_advance_width) { + + advance = min_advance_width - advance; + if (advance > 0.0f) { /* additional spacing is only applied to leading and trailing glyph */ - FLOAT half = (min_advance_width - advance) / 2.0; + FLOAT half = advance / 2.0f; if (!reduced) { origin -= half; @@ -1213,13 +1215,11 @@ static void apply_cluster_spacing(FLOAT leading_spacing, FLOAT trailing_spacing, modified_advances[end-1] += half; } else if (leading_spacing < 0.0) { - origin -= min_advance_width - advance; - modified_advances[start] += min_advance_width - advance; + origin -= advance; + modified_advances[start] += advance; } else - modified_advances[end-1] += min_advance_width - advance; - - advance = min_advance_width; + modified_advances[end-1] += advance; } /* now apply positive spacing adjustments */ @@ -1317,7 +1317,6 @@ static HRESULT WINAPI dwritetextanalyzer1_ApplyCharacterSpacing(IDWriteTextAnaly return S_OK; } - start = 0; for (start = 0; start < len;) { UINT32 length = get_cluster_length(clustermap, start, len);

1 0

Sebastian Lackner : server: Only send WM_WINE_CLIPCURSOR for forced clip resets.
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: 55c4a108d7e695bb09f5b909fca45784737e188f URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c4a108d7e695bb09f5b909f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 11 05:30:50 2015 +0100 server: Only send WM_WINE_CLIPCURSOR for forced clip resets. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index 13ca2b2..5136f43 100644 --- a/server/queue.c +++ b/server/queue.c @@ -374,7 +374,7 @@ static void get_message_defaults( struct msg_queue *queue, int *x, int *y, unsig } /* set the cursor clip rectangle */ -static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect ) +static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int send_clip_msg ) { rectangle_t top_rect; int x, y; @@ -392,7 +392,7 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect } else desktop->cursor.clip = top_rect; - if (desktop->cursor.clip_msg) + if (desktop->cursor.clip_msg && send_clip_msg) post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 ); /* warp the mouse to be inside the clip rect */ @@ -405,7 +405,7 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect static void set_foreground_input( struct desktop *desktop, struct thread_input *input ) { if (desktop->foreground_input == input) return; - set_clip_rectangle( desktop, NULL ); + set_clip_rectangle( desktop, NULL, 1 ); desktop->foreground_input = input; } @@ -3091,7 +3091,7 @@ DECL_HANDLER(set_cursor) if (req->clip_msg && get_top_window_owner(desktop) == current->process) desktop->cursor.clip_msg = req->clip_msg; - set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip ); + set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip, 0 ); } reply->new_x = input->desktop->cursor.x;

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_GSGetSamplers().
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: aca6aa7ebf6468e039f17f695761221905ee54a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca6aa7ebf6468e039f17f695… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:40:50 2015 +0100 d3d11: Implement d3d11_immediate_context_GSGetSamplers(). 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/device.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 174754d..fda0ed7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1184,8 +1184,29 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler_impl; + struct wined3d_sampler *wined3d_sampler; + + if (!(wined3d_sampler = wined3d_device_get_gs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + samplers[i] = &sampler_impl->ID3D11SamplerState_iface; + ID3D11SamplerState_AddRef(samplers[i]); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11DeviceContext *iface,

1 0

Jacek Caban : ntdll: Added KeyCachedInformation key info class implementation.
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: 5eb30353747303699ceb1ae99b6c33d6879721ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb30353747303699ceb1ae99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 14:17:09 2015 +0100 ntdll: Added KeyCachedInformation key info class implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 26 +++++++++++++++++++---- dlls/ntdll/tests/reg.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 19 ++++++++++++++++- server/registry.c | 6 +++++- 4 files changed, 101 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 0701426..be95a2a 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -257,10 +257,11 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i switch(info_class) { - case KeyBasicInformation: data_ptr = ((KEY_BASIC_INFORMATION *)info)->Name; break; - case KeyFullInformation: data_ptr = ((KEY_FULL_INFORMATION *)info)->Class; break; - case KeyNodeInformation: data_ptr = ((KEY_NODE_INFORMATION *)info)->Name; break; - case KeyNameInformation: data_ptr = ((KEY_NAME_INFORMATION *)info)->Name; break; + case KeyBasicInformation: data_ptr = ((KEY_BASIC_INFORMATION *)info)->Name; break; + case KeyFullInformation: data_ptr = ((KEY_FULL_INFORMATION *)info)->Class; break; + case KeyNodeInformation: data_ptr = ((KEY_NODE_INFORMATION *)info)->Name; break; + case KeyNameInformation: data_ptr = ((KEY_NAME_INFORMATION *)info)->Name; break; + case KeyCachedInformation: data_ptr = ((KEY_CACHED_INFORMATION *)info)+1; break; default: FIXME( "Information class %d not implemented\n", info_class ); return STATUS_INVALID_PARAMETER; @@ -332,6 +333,23 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i memcpy( info, &keyinfo, min( length, fixed_size ) ); } break; + case KeyCachedInformation: + { + KEY_CACHED_INFORMATION keyinfo; + fixed_size = sizeof(keyinfo); + keyinfo.LastWriteTime.QuadPart = reply->modif; + keyinfo.TitleIndex = 0; + keyinfo.SubKeys = reply->subkeys; + keyinfo.MaxNameLen = reply->max_subkey; + keyinfo.Values = reply->values; + keyinfo.MaxValueNameLen = reply->max_value; + keyinfo.MaxValueDataLen = reply->max_data; + keyinfo.NameLength = reply->namelen; + memcpy( info, &keyinfo, min( length, fixed_size ) ); + } + break; + default: + break; } *result_len = fixed_size + reply->total; if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 149910a..dfec007 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1466,12 +1466,14 @@ static void test_long_value_name(void) static void test_NtQueryKey(void) { - HANDLE key; + HANDLE key, subkey, subkey2; NTSTATUS status; OBJECT_ATTRIBUTES attr; ULONG length, len; KEY_NAME_INFORMATION *info = NULL; + KEY_CACHED_INFORMATION cached_info; UNICODE_STRING str; + DWORD dw; InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&key, KEY_READ, &attr); @@ -1506,6 +1508,59 @@ static void test_NtQueryKey(void) wine_dbgstr_wn(winetestpath.Buffer, winetestpath.Length/sizeof(WCHAR))); HeapFree(GetProcessHeap(), 0, info); + + attr.RootDirectory = key; + attr.ObjectName = &str; + pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); + status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); + ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + + status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len); + ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); + + if (status == STATUS_SUCCESS) + { + ok(len == sizeof(cached_info), "got unexpected length %d\n", len); + ok(cached_info.SubKeys == 0, "cached_info.SubKeys = %u\n", cached_info.SubKeys); + ok(cached_info.MaxNameLen == 0, "cached_info.MaxNameLen = %u\n", cached_info.MaxNameLen); + ok(cached_info.Values == 0, "cached_info.Values = %u\n", cached_info.Values); + ok(cached_info.MaxValueNameLen == 0, "cached_info.MaxValueNameLen = %u\n", cached_info.MaxValueNameLen); + ok(cached_info.MaxValueDataLen == 0, "cached_info.MaxValueDataLen = %u\n", cached_info.MaxValueDataLen); + ok(cached_info.NameLength == 22, "cached_info.NameLength = %u\n", cached_info.NameLength); + } + + attr.RootDirectory = subkey; + attr.ObjectName = &str; + pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey2"); + status = pNtCreateKey(&subkey2, GENERIC_ALL, &attr, 0, 0, 0, 0); + ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + + pRtlCreateUnicodeStringFromAsciiz(&str, "val"); + dw = 64; + status = pNtSetValueKey( subkey, &str, 0, REG_DWORD, &dw, sizeof(dw) ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); + + status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len); + ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); + + if (status == STATUS_SUCCESS) + { + ok(len == sizeof(cached_info), "got unexpected length %d\n", len); + ok(cached_info.SubKeys == 1, "cached_info.SubKeys = %u\n", cached_info.SubKeys); + ok(cached_info.MaxNameLen == 24, "cached_info.MaxNameLen = %u\n", cached_info.MaxNameLen); + ok(cached_info.Values == 1, "cached_info.Values = %u\n", cached_info.Values); + ok(cached_info.MaxValueNameLen == 6, "cached_info.MaxValueNameLen = %u\n", cached_info.MaxValueNameLen); + ok(cached_info.MaxValueDataLen == 4, "cached_info.MaxValueDataLen = %u\n", cached_info.MaxValueDataLen); + ok(cached_info.NameLength == 22, "cached_info.NameLength = %u\n", cached_info.NameLength); + } + + status = pNtDeleteKey(subkey2); + ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); + status = pNtDeleteKey(subkey); + ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); + + pNtClose(subkey2); + pNtClose(subkey); pNtClose(key); } diff --git a/include/winternl.h b/include/winternl.h index 1746601..ecd5791 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -696,7 +696,12 @@ typedef enum _KEY_INFORMATION_CLASS { KeyBasicInformation, KeyNodeInformation, KeyFullInformation, - KeyNameInformation + KeyNameInformation, + KeyCachedInformation, + KeyFlagsInformation, + KeyVirtualizationInformation, + KeyHandleTagsInformation, + MaxKeyInfoClass } KEY_INFORMATION_CLASS; typedef enum _KEY_VALUE_INFORMATION_CLASS { @@ -1024,6 +1029,18 @@ typedef struct _KEY_NAME_INFORMATION { WCHAR Name[1]; } KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION; +typedef struct _KEY_CACHED_INFORMATION +{ + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG SubKeys; + ULONG MaxNameLen; + ULONG Values; + ULONG MaxValueNameLen; + ULONG MaxValueDataLen; + ULONG NameLength; +} KEY_CACHED_INFORMATION, *PKEY_CACHED_INFORMATION; + typedef struct _KEY_VALUE_ENTRY { PUNICODE_STRING ValueName; diff --git a/server/registry.c b/server/registry.c index 94777b3..dad86e7 100644 --- a/server/registry.c +++ b/server/registry.c @@ -906,6 +906,7 @@ static void enum_key( const struct key *key, int index, int info_class, reply->max_data = 0; break; case KeyFullInformation: + case KeyCachedInformation: for (i = 0; i <= key->last_subkey; i++) { if (key->subkeys[i]->namelen > max_subkey) max_subkey = key->subkeys[i]->namelen; @@ -920,7 +921,10 @@ static void enum_key( const struct key *key, int index, int info_class, reply->max_class = max_class; reply->max_value = max_value; reply->max_data = max_data; - namelen = 0; /* only return the class */ + reply->namelen = namelen; + if (info_class == KeyCachedInformation) + classlen = 0; /* don't return any data, only its size */ + namelen = 0; /* don't return name */ break; default: set_error( STATUS_INVALID_PARAMETER );

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLGetPrivateProfileStringW/ SQLGetPrivateProfileString.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 94667def7b679adb2530af4a58baab6b5663c97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=94667def7b679adb2530af4a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 08:43:06 2015 +1100 odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 181 ++++++++++++++++++++++++++++++++---- dlls/odbccp32/tests/misc.c | 225 ++++++++++++++++++++++++++++++++++++++++++++- include/odbcinst.h | 4 +- 3 files changed, 390 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94667def7b679adb2530a…

1 0

Nikolay Sivov : shell32: Return as soon as requested CLSID is located ( Coverity).
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 5cf95396503d49f0249c473c1ed51e51213124c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf95396503d49f0249c473c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 14:01:37 2015 +0300 shell32: Return as soon as requested CLSID is located (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellole.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 637a101..f034951 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -59,7 +59,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc /* this table contains all CLSIDs of shell32 objects */ static const struct { - REFIID riid; + REFIID clsid; LPFNCREATEINSTANCE lpfnCI; } InterfaceTable[] = { @@ -204,8 +204,8 @@ end: */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - HRESULT hres = E_OUTOFMEMORY; IClassFactory * pcf = NULL; + HRESULT hres; int i; TRACE("CLSID:%s,IID:%s\n",shdebugstr_guid(rclsid),shdebugstr_guid(iid)); @@ -214,10 +214,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) *ppv = NULL; /* search our internal interface table */ - for(i=0;InterfaceTable[i].riid;i++) { - if(IsEqualIID(InterfaceTable[i].riid, rclsid)) { + for(i=0;InterfaceTable[i].clsid;i++) { + if(IsEqualIID(InterfaceTable[i].clsid, rclsid)) { TRACE("index[%u]\n", i); pcf = IDefClF_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL); + break; } }

1 0

Hans Leidekker : webservices: Add support for retrieving the output buffer.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 349641575ca7b0db510911e40ab9d705c8632377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349641575ca7b0db510911e40… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:01 2015 +0100 webservices: Add support for retrieving the output buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 10 +++++----- dlls/webservices/writer.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 26b8c78..9f0ae2b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -120,13 +120,13 @@ static void test_WsCreateWriter(void) ok( hr == S_OK, "got %08x\n", hr ); ok( max_size == 65536, "got %u\n", max_size ); - buffers.bufferCount = 0xdeadbeef; - buffers.buffers = (WS_BYTES *)0xdeadbeef; + bytes.length = 0xdeadbeef; + bytes.bytes = (BYTE *)0xdeadbeef; size = sizeof(buffers); - hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &buffers, size, NULL ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !buffers.bufferCount, "got %u\n", buffers.bufferCount ); - todo_wine ok( buffers.buffers != NULL, "got %p\n", buffers.buffers ); + ok( !bytes.length, "got %u\n", bytes.length ); + ok( bytes.bytes != NULL, "got %p\n", bytes.bytes ); max_size = 0xdeadbeef; size = sizeof(max_size); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e8b5fad..b56c718 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -293,7 +293,20 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT if (error) FIXME( "ignoring error parameter\n" ); if (!writer->output_type) return WS_E_INVALID_OPERATION; - return get_writer_prop( writer, id, buf, size ); + + switch (id) + { + case WS_XML_WRITER_PROPERTY_BYTES: + { + WS_BYTES *bytes = buf; + if (size != sizeof(*bytes)) return E_INVALIDARG; + bytes->bytes = writer->output_buf->ptr; + bytes->length = writer->output_buf->size; + return S_OK; + } + default: + return get_writer_prop( writer, id, buf, size ); + } } static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf )

1 0

Alexandre Julliard : makedep: Always open Makefile.in files from the source directory.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 6f8e5d4e10130de3a3d5e61aa9dc643dfa69cc61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8e5d4e10130de3a3d5e61aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 12:05:12 2015 +0900 makedep: Always open Makefile.in files from the source directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f20a967..f51cd2f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1556,16 +1556,14 @@ static FILE *open_input_makefile( const struct makefile *make ) FILE *ret; if (make->base_dir) + { input_file_name = base_dir_path( make, input_makefile_name ); - else - input_file_name = output_makefile_name; /* always use output name for main Makefile */ + if (strendswith( input_makefile_name, ".in" )) input_file_name = root_dir_path( input_file_name ); + } + else input_file_name = output_makefile_name; /* always use output name for main Makefile */ input_line = 0; - if (!(ret = fopen( input_file_name, "r" ))) - { - input_file_name = root_dir_path( input_file_name ); - if (!(ret = fopen( input_file_name, "r" ))) fatal_perror( "open" ); - } + if (!(ret = fopen( input_file_name, "r" ))) fatal_perror( "open" ); return ret; }

1 0