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

Józef Kucia : tests: Introduce queue_{signal, wait}() helpers.
by Alexandre Julliard 06 May '19

06 May '19

Module: vkd3d Branch: master Commit: 890a77559f94d9582b665574aeee921ffd14ff82 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=890a77559f94d9582b66557… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:41 2019 +0200 tests: Introduce queue_{signal,wait}() helpers. 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> --- tests/d3d12.c | 117 ++++++++++++++++------------------------------- tests/d3d12_test_utils.h | 18 ++++++++ 2 files changed, 57 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=890a77559f94d9582b6…

1 0

Józef Kucia : vkd3d: Allow 0 vertex stride.
by Alexandre Julliard 06 May '19

06 May '19

Module: vkd3d Branch: master Commit: 8a23ff13760ac05a5a0c4df14b3246ab5f93cfa8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8a23ff13760ac05a5a0c4df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:42 2019 +0200 vkd3d: Allow 0 vertex stride. 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> --- libs/vkd3d/state.c | 3 - tests/d3d12.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6a7b6e5..054a9ae 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2744,9 +2744,6 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta b->stride = strides[binding]; b->inputRate = graphics->input_rates[binding]; - if (!b->stride) - FIXME("Invalid stride for input slot %u.\n", binding); - pipeline_key.strides[binding_count] = strides[binding]; ++binding_count; diff --git a/tests/d3d12.c b/tests/d3d12.c index 2c8c44b..d5f491e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21627,6 +21627,176 @@ static void test_dispatch_zero_thread_groups(void) destroy_test_context(&context); } +static void test_zero_vertex_stride(void) +{ + ID3D12PipelineState *instance_pipeline_state; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_VERTEX_BUFFER_VIEW vbv[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb[2]; + + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"sv_position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"color", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_INPUT_ELEMENT_DESC instance_layout_desc[] = + { + {"sv_position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"color", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + struct vs_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + void main(in struct vs_data vs_input, out struct vs_data vs_output) + { + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; + } +#endif + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD ps_code[] = + { +#if 0 + struct ps_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + float4 main(struct ps_data ps_input) : SV_Target + { + return ps_input.color; + } +#endif + 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const struct vec4 positions[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, + }; + static const struct vec4 colors[] = + { + {0.0f, 1.0f, 0.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.5f, 0.5f, 0.5f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + input_layout.pInputElementDescs = instance_layout_desc; + input_layout.NumElements = ARRAY_SIZE(instance_layout_desc); + instance_pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + memset(vbv, 0, sizeof(vbv)); + vb[0] = create_upload_buffer(context.device, sizeof(positions), positions); + vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); + vbv[0].StrideInBytes = sizeof(*positions); + vbv[0].SizeInBytes = sizeof(positions); + + vb[1] = create_upload_buffer(context.device, sizeof(colors), colors); + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]) + 2 * sizeof(*colors); + vbv[1].StrideInBytes = 0; + vbv[1].SizeInBytes = sizeof(colors); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff808080, 2); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, instance_pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(vb[1]); + ID3D12Resource_Release(vb[0]); + ID3D12PipelineState_Release(instance_pipeline_state); + destroy_test_context(&context); +} + static void test_instance_id(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -28910,6 +29080,7 @@ START_TEST(d3d12) run_test(test_resolve_query_data_in_reordered_command_list); run_test(test_execute_indirect); run_test(test_dispatch_zero_thread_groups); + run_test(test_zero_vertex_stride); run_test(test_instance_id); run_test(test_vertex_id); run_test(test_copy_texture);

1 0

Józef Kucia : include: Define TRACE_ON() for VKD3D_NO_TRACE_MESSAGES.
by Alexandre Julliard 06 May '19

06 May '19

Module: vkd3d Branch: master Commit: 9babc0fb44f70c739b2d7cea7f8e43fe2690a89a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9babc0fb44f70c739b2d7ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:43 2019 +0200 include: Define TRACE_ON() for VKD3D_NO_TRACE_MESSAGES. 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> --- include/private/vkd3d_debug.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 7642dec..80c5781 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -26,6 +26,7 @@ #ifdef VKD3D_NO_TRACE_MESSAGES #define TRACE(args...) do { } while (0) +#define TRACE_ON() (false) #endif #ifdef VKD3D_NO_DEBUG_MESSAGES @@ -74,7 +75,9 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define ERR VKD3D_DBG_LOG(ERR) +#ifndef TRACE_ON #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) +#endif #define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name

1 0

Alexandre Julliard : winetest: Add an mp3 test file.
by Alexandre Julliard 03 May '19

03 May '19

Module: tools Branch: master Commit: a62e145e9b4014cd88fdd6b1246714d0113ff8d7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a62e145e9b4014cd88fdd6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 23:05:14 2019 +0200 winetest: Add an mp3 test file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/test.mp3 | Bin 0 -> 4365 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/winetest/tests/test.mp3 b/winetest/tests/test.mp3 new file mode 100644 index 0000000..3e0b407 Binary files /dev/null and b/winetest/tests/test.mp3 differ

1 0

Jacek Caban : ntoskrnl.exe: Associate file object with server object before calling IRP routine.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: bd94c43fcf1552a08856a35b15767e620850e204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd94c43fcf1552a08856a35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:40:57 2019 +0200 ntoskrnl.exe: Associate file object with server object before calling IRP routine. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 +++++------- include/wine/server_protocol.h | 3 +-- server/device.c | 2 -- server/protocol.def | 1 - server/request.h | 3 +-- server/trace.c | 1 - 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 016245d..bfc8d27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -562,7 +562,6 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, { req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; - req->file_ptr = wine_server_client_ptr( file ); if (irp->IoStatus.u.Status >= 0) { req->size = irp->IoStatus.Information; @@ -606,8 +605,10 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON IO_STACK_LOCATION *irpsp; FILE_OBJECT *file; DEVICE_OBJECT *device = wine_server_get_ptr( params->create.device ); + HANDLE handle = wine_server_ptr_handle( params->create.file ); - if (!(file = alloc_kernel_object( IoFileObjectType, NULL, sizeof(*file), 1 ))) return STATUS_NO_MEMORY; + if (!(file = alloc_kernel_object( IoFileObjectType, handle, sizeof(*file), 0 ))) + return STATUS_NO_MEMORY; TRACE( "device %p -> file %p\n", device, file ); @@ -615,12 +616,9 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON file->Size = sizeof(*file); file->DeviceObject = device; - if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) - { - ObDereferenceObject( file ); - return STATUS_NO_MEMORY; - } + if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) return STATUS_NO_MEMORY; + ObReferenceObject( file ); irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CREATE; irpsp->FileObject = file; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 17d2654..a45d092 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3429,7 +3429,6 @@ struct set_irp_result_request obj_handle_t handle; unsigned int status; data_size_t size; - client_ptr_t file_ptr; /* VARARG(data,bytes); */ }; struct set_irp_result_reply @@ -6695,6 +6694,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 582 +#define SERVER_PROTOCOL_VERSION 583 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index e2364d2..6885bf0 100644 --- a/server/device.c +++ b/server/device.c @@ -943,8 +943,6 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (irp->file && irp->file->device->manager) - set_kernel_object( irp->file->device->manager, &irp->file->obj, req->file_ptr ); set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp ); diff --git a/server/protocol.def b/server/protocol.def index fc7c4d0..21008d7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2476,7 +2476,6 @@ enum message_type obj_handle_t handle; /* handle to the irp */ unsigned int status; /* status of the irp */ data_size_t size; /* result size (input or output depending on the operation) */ - client_ptr_t file_ptr; /* opaque pointer to the file object */ VARARG(data,bytes); /* output data of the irp */ @END diff --git a/server/request.h b/server/request.h index b46a1d9..07918df 100644 --- a/server/request.h +++ b/server/request.h @@ -1656,8 +1656,7 @@ C_ASSERT( sizeof(struct ioctl_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, status) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, size) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, file_ptr) == 24 ); -C_ASSERT( sizeof(struct set_irp_result_request) == 32 ); +C_ASSERT( sizeof(struct set_irp_result_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, options) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, sharing) == 20 ); diff --git a/server/trace.c b/server/trace.c index f149ed2..28bf3dd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3014,7 +3014,6 @@ static void dump_set_irp_result_request( const struct set_irp_result_request *re fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", status=%08x", req->status ); fprintf( stderr, ", size=%u", req->size ); - dump_uint64( ", file_ptr=", &req->file_ptr ); dump_varargs_bytes( ", data=", cur_size ); }

1 0

Jacek Caban : ntoskrnl.exe: Don' t keep reference to driver created file objects on client side.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 7223f11d4ad9c078a15909b72270352b3f41c5bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7223f11d4ad9c078a15909b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:41:18 2019 +0200 ntoskrnl.exe: Don't keep reference to driver created file objects on client side. Server keeps instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bfc8d27..cf5cde9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -551,7 +551,6 @@ static void *create_file_object( HANDLE handle ) /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { - FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject; HANDLE irp_handle = context; void *out_buff = irp->UserBuffer; @@ -571,12 +570,6 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; - if (irp->Flags & IRP_CLOSE_OPERATION) - { - ObDereferenceObject( file ); - irp->Tail.Overlay.OriginalFileObject = NULL; - } - if (irp->UserBuffer != irp->AssociatedIrp.SystemBuffer) { HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); @@ -618,7 +611,6 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) return STATUS_NO_MEMORY; - ObReferenceObject( file ); irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CREATE; irpsp->FileObject = file;

1 0

Enol Puente : wrc: Add Asturian locale.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: ec3181633b0e5d2d2b66cab711eacc6241c2597a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3181633b0e5d2d2b66cab7… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:34 2019 -0600 wrc: Add Asturian locale. Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.rh | 1 + tools/wrc/po.c | 2 ++ tools/wrc/utils.c | 1 + 3 files changed, 4 insertions(+) diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1..59791bc 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 913a918..3f5affd 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -239,6 +239,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" }, diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5533a53..a1e07b8 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -457,6 +457,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 },

1 0

Enol Puente : wmc: Support Asturian.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: af5f7a8785ccde66b628c683406c78cbbf83a065 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af5f7a8785ccde66b628c683… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:34 2019 -0600 wmc: Support Asturian. Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/po.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 8a8064a..bf10c50 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -82,6 +82,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" },

1 0

Enol Puente : kernel32: Add Asturian locale.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: ff8dcba46648364fa6b342969c66de6007451e69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8dcba46648364fa6b34296… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:35 2019 -0600 kernel32: Add Asturian locale. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ast.nls | 171 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 3f9cfd4..c6bb407 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -256,4 +256,6 @@ #include "nls/gdv.nls" /* 0x0494 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */ +#include "nls/ast.nls" /* 0x04a5 LANG_ASTURIAN, SUBLANG_DEFAULT */ + #include "nls/ivl.nls" /* 0x047f LANG_INVARIANT, SUBLANG_NEUTRAL */ diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls new file mode 100644 index 0000000..a990295 --- /dev/null +++ b/dlls/kernel32/nls/ast.nls @@ -0,0 +1,171 @@ +/* + * Locale definitions for Asturian + * + * Copyright 2019 Enol Puente for Softastur + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "34" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "34" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "04a5" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "ESP" + LOCALE_SABBREVDAYNAME1 "Llu" + LOCALE_SABBREVDAYNAME2 "Mar" + LOCALE_SABBREVDAYNAME3 "Mie" + LOCALE_SABBREVDAYNAME4 "Xue" + LOCALE_SABBREVDAYNAME5 "Vie" + LOCALE_SABBREVDAYNAME6 "Sáb" + LOCALE_SABBREVDAYNAME7 "Dom" + LOCALE_SABBREVLANGNAME "AST" + LOCALE_SABBREVMONTHNAME1 "Xin" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Abr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Xun" + LOCALE_SABBREVMONTHNAME7 "Xnt" + LOCALE_SABBREVMONTHNAME8 "Ago" + LOCALE_SABBREVMONTHNAME9 "Set" + LOCALE_SABBREVMONTHNAME10 "Och" + LOCALE_SABBREVMONTHNAME11 "Pay" + LOCALE_SABBREVMONTHNAME12 "Avi" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Spain" + LOCALE_SCURRENCY "€" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Llunes" + LOCALE_SDAYNAME2 "Martes" + LOCALE_SDAYNAME3 "Miércoles" + LOCALE_SDAYNAME4 "Xueves" + LOCALE_SDAYNAME5 "Vienres" + LOCALE_SDAYNAME6 "Sábadu" + LOCALE_SDAYNAME7 "Domingu" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Spain" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Asturian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "ES" + LOCALE_SISO639LANGNAME "ast" + LOCALE_SLANGUAGE "Asturian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "Xineru" + LOCALE_SMONTHNAME2 "Febreru" + LOCALE_SMONTHNAME3 "Marzu" + LOCALE_SMONTHNAME4 "Abril" + LOCALE_SMONTHNAME5 "Mayu" + LOCALE_SMONTHNAME6 "Xunu" + LOCALE_SMONTHNAME7 "Xunetu" + LOCALE_SMONTHNAME8 "Agostu" + LOCALE_SMONTHNAME9 "Setiembre" + LOCALE_SMONTHNAME10 "Ochobre" + LOCALE_SMONTHNAME11 "Payares" + LOCALE_SMONTHNAME12 "Avientu" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "ast-ES" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "España" + LOCALE_SNATIVECURRNAME "Euru" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Asturianu" + LOCALE_SNATIVELANGNAME "Asturianu" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "AST " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "ast" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "Ll" + LOCALE_SSHORTESTDAYNAME2 "Ma" + LOCALE_SSHORTESTDAYNAME3 "Mi" + LOCALE_SSHORTESTDAYNAME4 "Xu" + LOCALE_SSHORTESTDAYNAME5 "Vi" + LOCALE_SSHORTESTDAYNAME6 "Sá" + LOCALE_SSHORTESTDAYNAME7 "Do" + LOCALE_SSHORTTIME "HH:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM' / 'yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

Enol Puente : po: Add Asturian translation.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: c50b19c9453e2f2bf46ad9edabe6148ccc101491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c50b19c9453e2f2bf46ad9ed… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:36 2019 -0600 po: Add Asturian translation. Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/Makefile.in | 1 + po/ast.po | 16337 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 16338 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c50b19c9453e2f2bf46a…

1 0