December 2014 - Wine-commits

André Hentschel : winetest: Improve output when dll is a stub.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: tools Branch: master Commit: af075ef37059020ee9595971fcb55dcfef60851e URL: http://source.winehq.org/git/tools.git/?a=commit;h=af075ef37059020ee9595971… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 4 00:16:35 2014 +0100 winetest: Improve output when dll is a stub. --- winetest/dissect | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 61e85ca..cd24fc3 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -252,7 +252,7 @@ while ($_ = <IN>) { last if (!/^\s+([^ =]+)=(.*)\r?$/); my $module = $1; $dllinfo{$module} = { version => $2 }; - if ($2 eq "dll is missing" || $2 =~ /^load error/) + if ($2 eq "dll is missing" || $2 =~ /^load error/ || $2 eq "dll is a stub") { print SUM "- $module - missing - - - - -\n"; } @@ -365,6 +365,10 @@ foreach my $dll (sort keys %dllinfo) { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); } + elsif ($dllinfo{$dll}->{version} eq "dll is a stub") + { + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">dll is a stub</td></tr>\n", escapeHTML($dll); + } elsif ($dllinfo{$dll}->{version} =~ /^load error/) { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n",

1 0

Henri Verbeet : wined3d: Record the data type of shader resources.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 3aa9fe6bef7a3440845c7410c98e3e98a79eb70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa9fe6bef7a3440845c7410c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:11 2014 +0100 wined3d: Record the data type of shader resources. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 32 +++++++++++----------- dlls/wined3d/glsl_shader.c | 16 +++++------ dlls/wined3d/shader.c | 56 ++++++++++++++++++++++++++++++--------- dlls/wined3d/shader_sm1.c | 1 + dlls/wined3d/shader_sm4.c | 36 +++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 11 +++++++- 7 files changed, 115 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3aa9fe6bef7a3440845c7…

1 0

Henri Verbeet : wined3d: Take the resource data type into account in shader_glsl_gen_sample_code() .
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 5c3d52468cf9f33f816d2d67d7a0022eeeead9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3d52468cf9f33f816d2d67d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:12 2014 +0100 wined3d: Take the resource data type into account in shader_glsl_gen_sample_code(). --- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a351932..0ab591f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -65,6 +65,7 @@ struct glsl_sample_function { const char *name; DWORD coord_mask; + enum wined3d_data_type data_type; }; enum heap_node_op @@ -1800,14 +1801,15 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, - const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *dst) + const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *dst, + enum wined3d_data_type data_type) { struct glsl_dst_param glsl_dst; DWORD mask; if ((mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst))) { - switch (dst->reg.data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: shader_addline(buffer, "%s%s = %s(", @@ -1824,7 +1826,7 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break; default: - FIXME("Unhandled data type %#x.\n", dst->reg.data_type); + FIXME("Unhandled data type %#x.\n", data_type); shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break; @@ -1837,7 +1839,7 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst(struct wined3d_shader_buffer *buffer, const struct wined3d_shader_instruction *ins) { - return shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + return shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); } /** Process GLSL instruction modifiers */ @@ -1899,6 +1901,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL lod = flags & WINED3D_GLSL_SAMPLE_LOD; BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; + sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; + /* Note that there's no such thing as a projected cube texture. */ switch (resource_type) { @@ -2265,7 +2269,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s fixup = COLOR_FIXUP_IDENTITY; /* FIXME: Vshader color fixup */ } - shader_glsl_append_dst(ins->ctx->buffer, ins); + shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], sample_function->data_type); shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", sample_function->name, shader_glsl_get_prefix(version->type), sampler); @@ -2397,7 +2401,7 @@ static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); @@ -2425,17 +2429,17 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "tmp0%s = %s / %s;\n", dst_mask, src0_param.param_str, src1_param.param_str); - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s %% %s));\n", src0_param.param_str, src1_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s / %s);\n", src0_param.param_str, src1_param.param_str); @@ -2443,7 +2447,7 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) } else if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s %% %s);\n", src0_param.param_str, src1_param.param_str); @@ -2907,7 +2911,7 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction continue; shader_addline(ins->ctx->buffer, "tmp0%s = (", mask_char); } - else if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst))) + else if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); @@ -3185,23 +3189,23 @@ static void shader_glsl_sincos(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "tmp0%s = sin(%s);\n", dst_mask, src0_param.param_str); - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "cos(%s));\n", src0_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "sin(%s));\n", src0_param.param_str); } } else if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "cos(%s));\n", src0_param.param_str); }

1 0

Alexandre Julliard : taskschd/tests: Don' t depend on the directory lookup order.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: f48a0d8ca30e8f39af17b531dcdedd6bb4d8cefc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48a0d8ca30e8f39af17b531d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 11:25:51 2014 +0100 taskschd/tests: Don't depend on the directory lookup order. --- dlls/taskschd/tests/scheduler.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 74a5263..5e906ce 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -421,6 +421,7 @@ static void test_FolderCollection(void) IUnknown *unknown; IEnumVARIANT *enumvar; ULONG count, i; + BOOL is_first; VARIANT idx; static const int vt[] = { VT_I1, VT_I2, VT_I4, VT_I8, VT_UI1, VT_UI2, VT_UI4, VT_UI8, VT_INT, VT_UINT }; @@ -507,7 +508,8 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Path(subfolder, &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - if (i == 1) + is_first = !lstrcmpW(bstr, Wine_Folder1); + if (is_first) ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -515,7 +517,7 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Name(subfolder, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); - if (i == 1) + if (is_first) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -530,7 +532,7 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Path(subfolder, &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - if (i == 1) + if (is_first) ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -538,7 +540,7 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Name(subfolder, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); - if (i == 1) + if (is_first) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -591,11 +593,18 @@ static void test_FolderCollection(void) ok(count == 1, "expected 1, got %d\n", count); hr = ITaskFolder_get_Path((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + is_first = !lstrcmpW(bstr, Wine_Folder1); + if (is_first) + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = ITaskFolder_get_Name((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); - ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + if (is_first) + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); IDispatch_Release(V_DISPATCH(&var[0])); memset(var, 0, sizeof(var)); @@ -628,7 +637,8 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Path(subfolder, &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - if (i == 0) + is_first = !lstrcmpW(bstr, Wine_Folder1); + if (is_first) ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); @@ -636,7 +646,7 @@ static void test_FolderCollection(void) hr = ITaskFolder_get_Name(subfolder, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); - if (i == 0) + if (is_first) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr));

1 0

Alexandre Julliard : kernel32/tests: Allow the parent directory to receive a modified event.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 0ab2311cd5c766fb14d8ce799cd02461c40c5aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab2311cd5c766fb14d8ce799… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 21:32:46 2014 +0100 kernel32/tests: Allow the parent directory to receive a modified event. --- dlls/kernel32/tests/change.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index ad22f18..19e55bb 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -554,9 +554,18 @@ static void test_readdirectorychanges(void) ok( r == WAIT_OBJECT_0, "should be ready\n" ); ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); + ok( ov.InternalHigh == 0x18 || ov.InternalHigh == 0x12 + 0x18, + "ov.InternalHigh wrong %lx\n", ov.InternalHigh); pfni = (PFILE_NOTIFY_INFORMATION) buffer; + if (pfni->NextEntryOffset) /* we may get a modified event on the parent dir */ + { + ok( pfni->NextEntryOffset == 0x12, "offset wrong %x\n", pfni->NextEntryOffset ); + ok( pfni->Action == FILE_ACTION_MODIFIED, "action wrong %d\n", pfni->Action ); + ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong\n" ); + ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n"); + pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + } ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" );

1 0

Alistair Leslie-Hughes : winetest: Skip over stub dll if detected.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 8885a4a2b9cdd78b8d067a80d6d95db1d2032203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8885a4a2b9cdd78b8d067a80d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 10 12:44:05 2014 +1100 winetest: Skip over stub dll if detected. --- programs/winetest/main.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 2afa813..0149377 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -308,6 +308,35 @@ static BOOL is_native_dll( HMODULE module ) return TRUE; } +/* + * Windows 8 has a concept of stub DLLs. When DLLMain is called the user is prompted + * to install that component. To bypass this check we need to look at the version resource. + */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + static void print_version (void) { #ifdef __i386__ @@ -911,6 +940,17 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP } return TRUE; } + if(is_stub_dll(dllname)) + { + FreeLibrary(dll); + xprintf (" %s=dll is a stub\n", dllname); + if (actctx != INVALID_HANDLE_VALUE) + { + pDeactivateActCtx(0, cookie); + pReleaseActCtx(actctx); + } + return TRUE; + } if (is_native_dll(dll)) { FreeLibrary(dll);

1 0

Yifu Wang : msvcr120: Added wchar_t* fields to struct MSVCRT_lconv.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 08d050899322f0783db52e3b621e16b93aad7cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d050899322f0783db52e3b6… Author: Yifu Wang <ywang(a)esri.com> Date: Fri Nov 21 11:36:46 2014 -0800 msvcr120: Added wchar_t* fields to struct MSVCRT_lconv. --- configure | 1 + configure.ac | 1 + dlls/msvcr120/tests/Makefile.in | 5 ++ dlls/msvcr120/tests/msvcr120.c | 155 ++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/locale.c | 151 ++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 10 +++ 6 files changed, 323 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08d050899322f0783db52…

1 0

Qian Hong : usp10: Make sure fallbackFont is NULL terminated.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 0cf62bec4143ae7ee164b1265b9507c01d0b7c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf62bec4143ae7ee164b1265… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Dec 3 22:15:37 2014 +0800 usp10: Make sure fallbackFont is NULL terminated. --- dlls/usp10/usp10.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6aa6b3e..5efbb82 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -500,23 +500,23 @@ const scriptData scriptInformation[] = { {{Script_Tai_Le, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','a','l','e'), - {'M','i','c','r','o','s','o','f','t',' ','T','a','i',' ','L','e'}}, + {'M','i','c','r','o','s','o','f','t',' ','T','a','i',' ','L','e',0}}, {{Script_New_Tai_Lue, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','a','l','u'), - {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e'}}, + {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e',0}}, {{Script_New_Tai_Lue_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','a','l','u'), - {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e'}}, + {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e',0}}, {{Script_Khmer, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x53, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), - {'D','a','u','n','P','e','n','h'}}, + {'D','a','u','n','P','e','n','h',0}}, {{Script_Khmer_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x53, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), - {'D','a','u','n','P','e','n','h'}}, + {'D','a','u','n','P','e','n','h',0}}, {{Script_CJK_Han, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('h','a','n','i'), @@ -540,59 +540,59 @@ const scriptData scriptInformation[] = { {{Script_Yi, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('y','i',' ',' '), - {'M','i','c','r','o','s','o','f','t',' ','Y','i',' ','B','a','i','t','i'}}, + {'M','i','c','r','o','s','o','f','t',' ','Y','i',' ','B','a','i','t','i',0}}, {{Script_Ethiopic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x5e, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('e','t','h','i'), - {'N','y','a','l','a'}}, + {'N','y','a','l','a',0}}, {{Script_Ethiopic_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x5e, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('e','t','h','i'), - {'N','y','a','l','a'}}, + {'N','y','a','l','a',0}}, {{Script_Mongolian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_MONGOLIAN, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','o','n','g'), - {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i'}}, + {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i',0}}, {{Script_Mongolian_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_MONGOLIAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','o','n','g'), - {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i'}}, + {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i',0}}, {{Script_Tifinagh, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','f','n','g'), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_NKo, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('n','k','o',' '), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_Vai, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('v','a','i',' '), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_Vai_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('v','a','i',' '), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_Cherokee, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x5c, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','h','e','r'), - {'P','l','a','n','t','a','g','e','n','e','t',' ','C','h','e','r','o','k','e','e'}}, + {'P','l','a','n','t','a','g','e','n','e','t',' ','C','h','e','r','o','k','e','e',0}}, {{Script_Canadian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x5d, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','a','n','s'), - {'E','u','p','h','e','m','i','a'}}, + {'E','u','p','h','e','m','i','a',0}}, {{Script_Ogham, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('o','g','a','m'), - {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l',0}}, {{Script_Runic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('r','u','n','r'), - {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l',0}}, {{Script_Braille, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('b','r','a','i'), - {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l',0}}, {{Script_Surrogates, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, 0x00000000, @@ -604,19 +604,19 @@ const scriptData scriptInformation[] = { {{Script_Deseret, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('d','s','r','t'), - {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l',0}}, {{Script_Osmanya, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('o','s','m','a'), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_Osmanya_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('o','s','m','a'), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_MathAlpha, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','a','t','h'), - {'C','a','m','b','r','i','a',' ','M','a','t','h'}}, + {'C','a','m','b','r','i','a',' ','M','a','t','h',0}}, {{Script_Hebrew_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_HEBREW, 0, 1, 0, 0, HEBREW_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('h','e','b','r'),

1 0

Martin Storsjo : api-ms-win-core-fibers-l1-1-1: Add stub dll.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 46e795269e0a04948779da84741078b8b49bec11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e795269e0a04948779da847… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:10 2014 +0200 api-ms-win-core-fibers-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index c291a43..5de7cd5 100755 --- a/configure +++ b/configure @@ -857,6 +857,7 @@ enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 +enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_handle_l1_1_0 @@ -16775,6 +16776,7 @@ wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 +wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 diff --git a/configure.ac b/configure.ac index 8f8a732..ce52430 100644 --- a/configure.ac +++ b/configure.ac @@ -2649,6 +2649,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) diff --git a/dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in b/dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in new file mode 100644 index 0000000..98b7880 --- /dev/null +++ b/dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-fibers-l1-1-1.dll diff --git a/dlls/api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec b/dlls/api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec new file mode 100644 index 0000000..4947543 --- /dev/null +++ b/dlls/api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec @@ -0,0 +1,5 @@ +@ stdcall FlsAlloc(ptr) kernel32.FlsAlloc +@ stdcall FlsFree(long) kernel32.FlsFree +@ stdcall FlsGetValue(long) kernel32.FlsGetValue +@ stdcall FlsSetValue(long ptr) kernel32.FlsSetValue +@ stdcall IsThreadAFiber() kernel32.IsThreadAFiber diff --git a/tools/make_specfiles b/tools/make_specfiles index 411f65e..e67b129 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -159,6 +159,7 @@ my @dll_groups = "api-ms-win-core-file-l2-1-1", "api-ms-win-core-sysinfo-l1-2-1", "api-ms-win-core-processthreads-l1-1-2", + "api-ms-win-core-fibers-l1-1-1", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-file-l2-1-0: Add stub dll.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 7a2701bf0cad57c02ad3036ed8910be937b85e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2701bf0cad57c02ad3036ed… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:11 2014 +0200 api-ms-win-core-file-l2-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-file-l2-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 5de7cd5..8f7d91d 100755 --- a/configure +++ b/configure @@ -859,6 +859,7 @@ enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_l1_2_0 +enable_api_ms_win_core_file_l2_1_0 enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_handle_l1_1_0 enable_api_ms_win_core_heap_l1_2_0 @@ -16778,6 +16779,7 @@ wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_ wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 +wine_fn_config_dll api-ms-win-core-file-l2-1-0 enable_api_ms_win_core_file_l2_1_0 wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-2-0 enable_api_ms_win_core_heap_l1_2_0 diff --git a/configure.ac b/configure.ac index ce52430..0e4028f 100644 --- a/configure.ac +++ b/configure.ac @@ -2651,6 +2651,7 @@ WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) diff --git a/dlls/api-ms-win-core-file-l2-1-0/Makefile.in b/dlls/api-ms-win-core-file-l2-1-0/Makefile.in new file mode 100644 index 0000000..8edf54e --- /dev/null +++ b/dlls/api-ms-win-core-file-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l2-1-0.dll diff --git a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec new file mode 100644 index 0000000..914e0c0 --- /dev/null +++ b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec @@ -0,0 +1,11 @@ +@ stub CopyFile2 +@ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW +@ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW +@ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW +@ stub CreateSymbolicLinkW +@ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx +@ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW +@ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW +@ stub ReOpenFile +@ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW +@ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/tools/make_specfiles b/tools/make_specfiles index e67b129..d5a7ae2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -160,6 +160,7 @@ my @dll_groups = "api-ms-win-core-sysinfo-l1-2-1", "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-1", + "api-ms-win-core-file-l2-1-0", ], [ "ole32",

1 0