January 2014 - Wine-Commits

Frédéric Delanoy : crypt32: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 4cece0dd43c2fb0e44fafd6e85dfcbae31bccbd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cece0dd43c2fb0e44fafd6e8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 8 03:37:51 2014 +0100 crypt32: Use BOOL type where appropriate. --- dlls/crypt32/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 7590012..29b3a66 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2077,7 +2077,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, return ret; } -static inline int isprintableW(WCHAR wc) +static inline BOOL isprintableW(WCHAR wc) { return isalnumW(wc) || isspaceW(wc) || wc == '\'' || wc == '(' || wc == ')' || wc == '+' || wc == ',' || wc == '-' || wc == '.' ||

1 0

Jacek Caban : dxdiagn: Don' t fail the whole initialization for invalid filter data in build_directshowfilters_tree.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: bcf78a227f145ccb177fcdcf766a5ab09762c46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf78a227f145ccb177fcdcf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 9 11:11:25 2014 +0100 dxdiagn: Don't fail the whole initialization for invalid filter data in build_directshowfilters_tree. --- dlls/dxdiagn/provider.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 145e5a3..76bbcf0 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1632,16 +1632,17 @@ static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node } hr = fill_filter_container(subcont, pMoniker); + IMoniker_Release(pMoniker); if (FAILED(hr)) { + WARN("Skipping invalid filter\n"); free_information_tree(subcont); - IMoniker_Release(pMoniker); - break; + hr = S_OK; + continue; } add_subcontainer(node, subcont); i++; - IMoniker_Release(pMoniker); } IEnumMoniker_Release(pEnum);

1 0

Bruno Jesus : iphlpapi/tests: Add more IcmpSendEcho tests related to the reply size.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 2548d75f1681172f058ff862e8b0726638d4e8a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2548d75f1681172f058ff862e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 8 21:47:11 2014 -0200 iphlpapi/tests: Add more IcmpSendEcho tests related to the reply size. --- dlls/iphlpapi/tests/iphlpapi.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index dbf97b2..94716d7 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -44,6 +44,8 @@ #include <stdio.h> #include <stdlib.h> +#define ICMP_MINLEN 8 /* copied from dlls/iphlpapi/ip_icmp.h file */ + static HMODULE hLibrary = NULL; static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD); @@ -956,7 +958,8 @@ todo_wine "expected 87, got %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, sizeof(replydata) - 1, 1000); + replysz = sizeof(replydata) - 1; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); @@ -965,8 +968,42 @@ todo_wine "expected 11050, got %d\n", error); } + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY); + ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); +todo_wine + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); + error = GetLastError(); +todo_wine + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + /* in windows >= vista the timeout can't be invalid */ SetLastError(0xdeadbeef); + replysz = sizeof(replydata); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); error = GetLastError(); if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error);

1 0

Dmitry Timoshkov : msxml3: Remove unused IUnknown *outer parameter from object constructors.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: cdc9eff5d2cb46a0a50bdde1f5822a00b7317c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc9eff5d2cb46a0a50bdde1f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 9 20:57:58 2014 +0900 msxml3: Remove unused IUnknown *outer parameter from object constructors. --- dlls/msxml3/domdoc.c | 8 ++++---- dlls/msxml3/factory.c | 8 ++++---- dlls/msxml3/httprequest.c | 14 +++++++------- dlls/msxml3/msxml_private.h | 26 +++++++++++++------------- dlls/msxml3/mxnamespace.c | 4 ++-- dlls/msxml3/mxwriter.c | 10 ++++------ dlls/msxml3/saxreader.c | 6 +++--- dlls/msxml3/schema.c | 8 ++++---- dlls/msxml3/stylesheet.c | 8 +++----- dlls/msxml3/xmldoc.c | 10 +++++----- dlls/msxml3/xmlelem.c | 18 +++++++++--------- dlls/msxml3/xmlparser.c | 7 ++----- dlls/msxml3/xmlview.c | 13 +++++-------- 13 files changed, 65 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdc9eff5d2cb46a0a50bd…

1 0

Jacek Caban : devenum: Make CLSID_VideoCompressorCategory a special category.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: e303f1162887e5e0782d8ae908de15fc53f60b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e303f1162887e5e0782d8ae90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 9 11:11:35 2014 +0100 devenum: Make CLSID_VideoCompressorCategory a special category. --- dlls/devenum/createdevenum.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 11990d6..e9f9606 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -113,6 +113,7 @@ static BOOL IsSpecialCategory(const CLSID *clsid) return IsEqualGUID(clsid, &CLSID_AudioRendererCategory) || IsEqualGUID(clsid, &CLSID_AudioInputDeviceCategory) || IsEqualGUID(clsid, &CLSID_VideoInputDeviceCategory) || + IsEqualGUID(clsid, &CLSID_VideoCompressorCategory) || IsEqualGUID(clsid, &CLSID_MidiRendererCategory); }

1 0

Jacek Caban : devenum: Added more strict CLSID_VideoCompressorCategory test.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 51e3c2397ca752f5f095a61344a52886a10187c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e3c2397ca752f5f095a6134… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 9 11:11:45 2014 +0100 devenum: Added more strict CLSID_VideoCompressorCategory test. --- dlls/devenum/tests/devenum.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c7f765b..b6158d6 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -29,6 +29,8 @@ #include "uuids.h" static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; +static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; +static const WCHAR mrleW[] = {'m','r','l','e',0}; struct category { @@ -52,6 +54,7 @@ static void test_devenum(IBindCtx *bind_ctx) HRESULT res; ICreateDevEnum* create_devenum; IEnumMoniker* enum_moniker = NULL; + BOOL have_mrle = FALSE; int i; res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, @@ -96,6 +99,17 @@ static void test_devenum(IBindCtx *bind_ctx) { trace(" ???\n"); } + + if (IsEqualGUID(&CLSID_VideoCompressorCategory, am_categories[i].clsid)) { + /* Test well known compressor to ensure that we really enumerate codecs */ + hr = IPropertyBag_Read(prop_bag, fcc_handlerW, &var, NULL); + if (SUCCEEDED(hr)) { + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + if(!lstrcmpW(V_BSTR(&var), mrleW)) + have_mrle = TRUE; + VariantClear(&var); + } + } } if (prop_bag) @@ -107,6 +121,10 @@ static void test_devenum(IBindCtx *bind_ctx) } ICreateDevEnum_Release(create_devenum); + + /* 64-bit windows are missing mrle codec */ + if(sizeof(void*) == 4) + ok(have_mrle, "mrle codec not found\n"); } /* CLSID_CDeviceMoniker */

1 0

Henri Verbeet : wined3d: Store color keys in textures instead of in surfaces.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 4710c4b51aef7b6f37d80d76a9333d33f59835d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4710c4b51aef7b6f37d80d76a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:17:00 2014 +0100 wined3d: Store color keys in textures instead of in surfaces. --- dlls/ddraw/surface.c | 49 +++++++++------- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 26 ++++----- dlls/wined3d/surface.c | 114 +++++++++---------------------------- dlls/wined3d/texture.c | 61 ++++++++++++++++++++ dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 14 ++--- include/wine/wined3d.h | 4 +- 10 files changed, 139 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4710c4b51aef7b6f37d80…

1 0

Henri Verbeet : wined3d: Introduce a common GLSL handler for scalar instructions.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: d412eb568e225adb42a1a317e85e6b976ba173db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d412eb568e225adb42a1a317e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:16:59 2014 +0100 wined3d: Introduce a common GLSL handler for scalar instructions. --- dlls/wined3d/glsl_shader.c | 146 ++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 99 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8fdbb68..351742b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2588,33 +2588,6 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) } } -/* Process the WINED3DSIO_LOG instruction in GLSL (dst = log2(|src0|)) - * Src0 is a scalar. Note that D3D uses the absolute of src0, while - * GLSL uses the value as-is. */ -static void shader_glsl_log(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src0_param; - DWORD dst_write_mask; - unsigned int dst_size; - - dst_write_mask = shader_glsl_append_dst(buffer, ins); - dst_size = shader_glsl_get_write_mask_size(dst_write_mask); - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param); - - if (dst_size > 1) - { - shader_addline(buffer, "vec%u(log2(abs(%s))));\n", - dst_size, src0_param.param_str); - } - else - { - shader_addline(buffer, "log2(abs(%s)));\n", - src0_param.param_str); - } -} - /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { @@ -2688,22 +2661,54 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) } } -static void shader_glsl_exp(const struct wined3d_shader_instruction *ins) +static void shader_glsl_scalar_op(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; - DWORD dst_write_mask; + const char *prefix, *suffix; unsigned int dst_size; + DWORD dst_write_mask; dst_write_mask = shader_glsl_append_dst(buffer, ins); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param); + switch (ins->handler_idx) + { + case WINED3DSIH_EXP: + case WINED3DSIH_EXPP: + prefix = "exp2("; + suffix = ")"; + break; + + case WINED3DSIH_LOG: + case WINED3DSIH_LOGP: + prefix = "log2(abs("; + suffix = "))"; + break; + + case WINED3DSIH_RCP: + prefix = "1.0 / "; + suffix = ""; + break; + + case WINED3DSIH_RSQ: + prefix = "inversesqrt(abs("; + suffix = "))"; + break; + + default: + prefix = ""; + suffix = ""; + FIXME("Unhandled instruction %#x.\n", ins->handler_idx); + break; + } + if (dst_size > 1) - shader_addline(buffer, "vec%u(exp2(%s)));\n", dst_size, src0_param.param_str); + shader_addline(buffer, "vec%u(%s%s%s));\n", dst_size, prefix, src0_param.param_str, suffix); else - shader_addline(buffer, "exp2(%s));\n", src0_param.param_str); + shader_addline(buffer, "%s%s%s);\n", prefix, src0_param.param_str, suffix); } /** Process the WINED3DSIO_EXPP instruction in GLSL: @@ -2717,14 +2722,13 @@ static void shader_glsl_exp(const struct wined3d_shader_instruction *ins) */ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) { - struct glsl_src_param src_param; - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - if (ins->ctx->reg_maps->shader_version.major < 2) { + struct glsl_src_param src_param; char dst_mask[6]; + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); + shader_addline(ins->ctx->buffer, "tmp0.x = exp2(floor(%s));\n", src_param.param_str); shader_addline(ins->ctx->buffer, "tmp0.y = %s - floor(%s);\n", src_param.param_str, src_param.param_str); shader_addline(ins->ctx->buffer, "tmp0.z = exp2(%s);\n", src_param.param_str); @@ -2733,19 +2737,10 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) shader_glsl_append_dst(ins->ctx->buffer, ins); shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(ins->ctx->buffer, "tmp0%s);\n", dst_mask); - } else { - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - - if (mask_size > 1) { - shader_addline(ins->ctx->buffer, "vec%d(exp2(%s)));\n", mask_size, src_param.param_str); - } else { - shader_addline(ins->ctx->buffer, "exp2(%s));\n", src_param.param_str); - } + return; } + + shader_glsl_scalar_op(ins); } static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) @@ -2782,53 +2777,6 @@ static void shader_glsl_to_float(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "float(%s));\n", src_param.param_str); } -/** Process the RCP (reciprocal or inverse) opcode in GLSL (dst = 1 / src) */ -static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) -{ - struct glsl_src_param src_param; - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - - if (mask_size > 1) - { - shader_addline(ins->ctx->buffer, "vec%u(1.0 / %s));\n", - mask_size, src_param.param_str); - } - else - { - shader_addline(ins->ctx->buffer, "1.0 / %s);\n", - src_param.param_str); - } -} - -static void shader_glsl_rsq(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src_param; - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - - if (mask_size > 1) - { - shader_addline(buffer, "vec%u(inversesqrt(abs(%s))));\n", - mask_size, src_param.param_str); - } - else - { - shader_addline(buffer, "inversesqrt(abs(%s)));\n", - src_param.param_str); - } -} - /** Process signed comparison opcodes in GLSL. */ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) { @@ -6688,7 +6636,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, - /* WINED3DSIH_EXP */ shader_glsl_exp, + /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, @@ -6703,8 +6651,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, - /* WINED3DSIH_LOG */ shader_glsl_log, - /* WINED3DSIH_LOGP */ shader_glsl_log, + /* WINED3DSIH_LOG */ shader_glsl_scalar_op, + /* WINED3DSIH_LOGP */ shader_glsl_scalar_op, /* WINED3DSIH_LOOP */ shader_glsl_loop, /* WINED3DSIH_LRP */ shader_glsl_lrp, /* WINED3DSIH_LT */ shader_glsl_relop, @@ -6724,11 +6672,11 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_POW */ shader_glsl_pow, - /* WINED3DSIH_RCP */ shader_glsl_rcp, + /* WINED3DSIH_RCP */ shader_glsl_scalar_op, /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, - /* WINED3DSIH_RSQ */ shader_glsl_rsq, + /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL,

1 0

Jacek Caban : widl: Make identifiers file more compatible with midl.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 0df819eecff79533bd5cc3b71bc81b063d3901e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df819eecff79533bd5cc3b71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 9 12:15:02 2014 +0100 widl: Make identifiers file more compatible with midl. --- tools/widl/header.c | 2 +- tools/widl/header.h | 2 -- tools/widl/widl.c | 38 ++++++++++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index bd9f21c..4ca6ed5 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -119,7 +119,7 @@ int is_conformant_array(const type_t *t) return is_array(t) && type_array_has_conformance(t); } -void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) +static void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) { if (!uuid) return; fprintf(f, "DEFINE_GUID(%s_%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," diff --git a/tools/widl/header.h b/tools/widl/header.h index bf5f426..3af57d6 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -56,8 +56,6 @@ extern const type_t* get_explicit_generic_handle_type(const var_t* var); extern const var_t *get_func_handle_var( const type_t *iface, const var_t *func, unsigned char *explicit_fc, unsigned char *implicit_fc ); extern int has_out_arg_or_return(const var_t *func); -extern void write_guid(FILE *f, const char *guid_prefix, const char *name, - const UUID *uuid); extern int is_const_decl(const var_t *var); static inline int last_ptr(const type_t *type) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 902bc92..5fa67f4 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -446,6 +446,16 @@ void write_dlldata(const statement_list_t *stmts) free_filename_nodes(&filenames); } +static void write_id_guid(FILE *f, const char *type, const char *guid_prefix, const char *name, const UUID *uuid) +{ + if (!uuid) return; + fprintf(f, "MIDL_DEFINE_GUID(%s, %s_%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," + "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x);\n", + type, guid_prefix, name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], + uuid->Data4[1], uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], + uuid->Data4[6], uuid->Data4[7]); +} + static void write_id_data_stmts(const statement_list_t *stmts) { const statement_t *stmt; @@ -460,19 +470,19 @@ static void write_id_data_stmts(const statement_list_t *stmts) if (!is_object(type) && !is_attr(type->attrs, ATTR_DISPINTERFACE)) continue; uuid = get_attrp(type->attrs, ATTR_UUID); - write_guid(idfile, is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", + write_id_guid(idfile, "IID", is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", type->name, uuid); } else if (type_get_type(type) == TYPE_COCLASS) { const UUID *uuid = get_attrp(type->attrs, ATTR_UUID); - write_guid(idfile, "CLSID", type->name, uuid); + write_id_guid(idfile, "CLSID", "CLSID", type->name, uuid); } } else if (stmt->type == STMT_LIBRARY) { const UUID *uuid = get_attrp(stmt->u.lib->attrs, ATTR_UUID); - write_guid(idfile, "LIBID", stmt->u.lib->name, uuid); + write_id_guid(idfile, "IID", "LIBID", stmt->u.lib->name, uuid); write_id_data_stmts(stmt->u.lib->stmts); } } @@ -492,13 +502,33 @@ void write_id_data(const statement_list_t *stmts) fprintf(idfile, "from %s - Do not edit ***/\n\n", input_idl_name); fprintf(idfile, "#include <rpc.h>\n"); fprintf(idfile, "#include <rpcndr.h>\n\n"); - fprintf(idfile, "#include <initguid.h>\n\n"); + + fprintf(idfile, "#ifdef _MIDL_USE_GUIDDEF_\n\n"); + + fprintf(idfile, "#ifndef INITGUID\n"); + fprintf(idfile, "#define INITGUID\n"); + fprintf(idfile, "#include <guiddef.h>\n"); + fprintf(idfile, "#undef INITGUID\n"); + fprintf(idfile, "#else\n"); + fprintf(idfile, "#include <guiddef.h>\n"); + fprintf(idfile, "#endif\n\n"); + + fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); + fprintf(idfile, " DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)\n\n"); + + fprintf(idfile, "#else\n\n"); + + fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); + fprintf(idfile, " const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n"); + + fprintf(idfile, "#endif\n\n"); start_cplusplus_guard(idfile); write_id_data_stmts(stmts); fprintf(idfile, "\n"); end_cplusplus_guard(idfile); + fprintf(idfile, "#undef MIDL_DEFINE_GUID\n" ); fclose(idfile); }

1 0

Frédéric Delanoy : mountmgr.sys: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 290cd163580a3c43f1b775200e69bea22234593c URL: http://source.winehq.org/git/wine.git/?a=commit;h=290cd163580a3c43f1b775200… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 8 03:37:52 2014 +0100 mountmgr.sys: Use BOOL type where appropriate. --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 005ec5e..028c17f 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -534,7 +534,7 @@ static void set_drive_info( struct dos_drive *drive, int letter, struct volume * } } -static inline int is_valid_device( struct stat *st ) +static inline BOOL is_valid_device( struct stat *st ) { #if defined(linux) || defined(__sun__) return S_ISBLK( st->st_mode );

1 0

Dmitry Timoshkov : ntdll: Remove shadow local variables.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: c7332fa1dc297e0aab71a7f6cf27d964c598e23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7332fa1dc297e0aab71a7f6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 9 19:06:29 2014 +0900 ntdll: Remove shadow local variables. --- dlls/ntdll/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cf95cd0..d2efcc1 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2134,7 +2134,6 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (size > 0x10000) size = 0x10000; if ((tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - int fd, needs_close; if (!server_get_unix_fd( hFile, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) { int res = recv( fd, tmpbuf, size, MSG_PEEK );

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 9cb328e185a710861dc8edfdb21d91e22e240ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb328e185a710861dc8edfdb… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jan 8 21:59:07 2014 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4efafd9..7122fa2 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-12 22:08+0300\n" +"PO-Revision-Date: 2014-01-08 21:58+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10152,10 +10152,8 @@ msgid "Wine Explorer" msgstr "„Wine“ naršyklė" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Paleidimas" +msgstr "Pradžia" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Nikolay Sivov : oleaut32: Mask out certain features on array copy.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: b058c96136850e543d171d766e5b132ba952cfb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b058c96136850e543d171d766… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 21:39:42 2014 +0400 oleaut32: Mask out certain features on array copy. --- dlls/oleaut32/safearray.c | 23 +++++++--- dlls/oleaut32/tests/safearray.c | 94 +++++++++++++++++++++++++++++++++++---- 2 files changed, 102 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 57a0d10..71f8c69 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -85,6 +85,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); /* Undocumented hidden space before the start of a SafeArray descriptor */ #define SAFEARRAY_HIDDEN_SIZE sizeof(GUID) +/* features listed here are not propagated to newly created array or data copy + created with SafeArrayCopy()/SafeArrayCopyData() */ +static const USHORT ignored_copy_features = + FADF_AUTO | + FADF_STATIC | + FADF_EMBEDDED | + FADF_FIXEDSIZE | + FADF_CREATEVECTOR; + /* Allocate memory */ static inline LPVOID SAFEARRAY_Malloc(ULONG ulSize) { @@ -349,8 +358,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) { ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); - dest->fFeatures = (dest->fFeatures & FADF_CREATEVECTOR) | - (psa->fFeatures & ~(FADF_CREATEVECTOR|FADF_DATADELETED)); + dest->fFeatures = (dest->fFeatures & FADF_CREATEVECTOR) | (psa->fFeatures & ~ignored_copy_features); if (psa->fFeatures & FADF_VARIANT) { @@ -1273,6 +1281,7 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) */ HRESULT WINAPI SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY *psaTarget) { + HRESULT hr; int dim; TRACE("(%p,%p)\n", psaSource, psaTarget); @@ -1288,10 +1297,10 @@ HRESULT WINAPI SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY *psaTarget) psaTarget->rgsabound[dim].cElements) return E_INVALIDARG; - if (SUCCEEDED(SAFEARRAY_DestroyData(psaTarget, 0)) && - SUCCEEDED(SAFEARRAY_CopyData(psaSource, psaTarget))) - return S_OK; - return E_UNEXPECTED; + hr = SAFEARRAY_DestroyData(psaTarget, 0); + if (FAILED(hr)) return hr; + + return SAFEARRAY_CopyData(psaSource, psaTarget); } /************************************************************************ @@ -1371,7 +1380,7 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut) hRet = SafeArrayAllocDescriptor(psa->cDims, ppsaOut); if (SUCCEEDED(hRet)) { - (*ppsaOut)->fFeatures = psa->fFeatures & ~FADF_CREATEVECTOR; + (*ppsaOut)->fFeatures = psa->fFeatures & ~ignored_copy_features; (*ppsaOut)->cbElements = psa->cbElements; } } diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index faec23e..064b038 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -39,6 +39,10 @@ #include "wtypes.h" #include "oleauto.h" +#ifndef FADF_CREATEVECTOR + const USHORT FADF_CREATEVECTOR = 0x2000; +#endif + static HMODULE hOleaut32; static HRESULT (WINAPI *pSafeArrayAllocDescriptorEx)(VARTYPE,UINT,SAFEARRAY**); @@ -57,6 +61,14 @@ static BOOL has_i8; /* Has INT_PTR/UINT_PTR type? */ static BOOL has_int_ptr; +static const USHORT ignored_copy_features[] = + { + FADF_AUTO, + FADF_STATIC, + FADF_EMBEDDED, + FADF_FIXEDSIZE + }; + #define START_REF_COUNT 1 #define RECORD_SIZE 64 #define RECORD_SIZE_FAIL 17 @@ -1250,14 +1262,13 @@ static void test_SafeArrayGetPutElement_VARIANT(void) ok(hres == S_OK, "got 0x%08x\n", hres); } - static void test_SafeArrayCopyData(void) { SAFEARRAYBOUND sab[4]; SAFEARRAY *sa; SAFEARRAY *sacopy; HRESULT hres; - int dimension,size=1; + int dimension, size = 1, i; if (!pSafeArrayCopyData) { @@ -1330,17 +1341,52 @@ static void test_SafeArrayCopyData(void) hres = SafeArrayCopy(sa, &sacopy); ok(hres == S_OK, "copy failed hres 0x%x\n", hres); - if (hres == S_OK) + ok(SafeArrayGetElemsize(sa) == SafeArrayGetElemsize(sacopy),"elemsize wrong\n"); + ok(SafeArrayGetDim(sa) == SafeArrayGetDim(sacopy),"dimensions wrong\n"); + ok(!memcmp(sa->pvData, sacopy->pvData, size * sizeof(int)), "compared different\n"); + hres = SafeArrayDestroy(sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + + sacopy = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab); + ok(sacopy != NULL, "Copy test couldn't create copy array\n"); + ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures); + + for (i = 0; i < sizeof(ignored_copy_features)/sizeof(USHORT); i++) { - ok(SafeArrayGetElemsize(sa) == SafeArrayGetElemsize(sacopy),"elemsize wrong\n"); - ok(SafeArrayGetDim(sa) == SafeArrayGetDim(sacopy),"dimensions wrong\n"); - ok(!memcmp(sa->pvData, sacopy->pvData, size * sizeof(int)), "compared different\n"); - hres = SafeArrayDestroy(sacopy); - ok(hres == S_OK, "got 0x%08x\n", hres); + USHORT feature = ignored_copy_features[i]; + USHORT orig = sacopy->fFeatures; + + sa->fFeatures |= feature; + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sacopy->fFeatures == orig && orig == FADF_HAVEVARTYPE, "got features 0x%04x\n", sacopy->fFeatures); + sa->fFeatures &= ~feature; } + hres = SafeArrayDestroy(sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); + + /* copy data from a vector */ + sa = SafeArrayCreateVector(VT_UI1, 0, 2); + + sacopy = SafeArrayCreateVector(VT_UI1, 0, 2); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sa->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sacopy->fFeatures); + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%04x\n", sacopy->fFeatures); + SafeArrayDestroy(sacopy); + + sacopy = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab); + ok(sacopy != NULL, "Copy test couldn't create copy array\n"); + ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures); + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == E_INVALIDARG, "got 0x%08x\n", hres); + SafeArrayDestroy(sacopy); + + SafeArrayDestroy(sa); } static void test_SafeArrayCreateEx(void) @@ -1541,6 +1587,7 @@ static void test_SafeArrayCopy(void) SAFEARRAY *sa, *sa2; VARIANTARG vSrc, vDst; HRESULT hres; + int i; sab.lLbound = 0; sab.cElements = 10; @@ -1605,6 +1652,37 @@ static void test_SafeArrayCopy(void) ok(hres == S_OK, "got 0x%08x\n", hres); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); + + /* test feature copy */ + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got src features 0x%04x\n", sa->fFeatures); + sa->cbElements = 16; + + for (i = 0; i < sizeof(ignored_copy_features)/sizeof(USHORT); i++) + { + USHORT feature = ignored_copy_features[i]; + + sa->fFeatures |= feature; + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa2->fFeatures == 0, "got features 0x%04x\n", sa2->fFeatures); + hres = SafeArrayDestroy(sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + sa->fFeatures &= ~feature; + } + + SafeArrayDestroy(sa); + + /* copy from a vector */ + sa = SafeArrayCreateVector(VT_UI1, 0, 2); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", hres); + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa2->fFeatures == FADF_HAVEVARTYPE, "got 0x%04x\n", sa2->fFeatures); + + SafeArrayDestroy(sa2); + SafeArrayDestroy(sa); } #define MKARRAY(low,num,typ) sab.lLbound = low; sab.cElements = num; \

1 0

Henri Verbeet : ddraw: Return DDERR_NOTONMIPMAPSUBLEVEL for ddraw_surface7_SetColorKey() on mipmap sub levels.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: bddb0433f3042b1848f9b65fee4c753be812a81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddb0433f3042b1848f9b65fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:17:02 2014 +0100 ddraw: Return DDERR_NOTONMIPMAPSUBLEVEL for ddraw_surface7_SetColorKey() on mipmap sub levels. --- dlls/ddraw/surface.c | 121 +++++++++++++++++++++++++++--------------------- dlls/ddraw/tests/d3d.c | 2 +- 2 files changed, 70 insertions(+), 53 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8ce651c..f569ae8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4494,89 +4494,106 @@ static HRESULT WINAPI ddraw_surface1_GetPalette(IDirectDrawSurface *iface, IDire return ddraw_surface7_GetPalette(&surface->IDirectDrawSurface7_iface, palette); } -static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD Flags, DDCOLORKEY *CKey) +static HRESULT ddraw_surface_set_color_key(struct ddraw_surface *surface, DWORD flags, DDCOLORKEY *color_key) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + DDCOLORKEY fixed_color_key; HRESULT hr = WINED3D_OK; - DDCOLORKEY FixedCKey; - - TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey); wined3d_mutex_lock(); - if (CKey) + + if (color_key) { - FixedCKey = *CKey; + fixed_color_key = *color_key; /* Handle case where dwColorSpaceHighValue < dwColorSpaceLowValue */ - if (FixedCKey.dwColorSpaceHighValue < FixedCKey.dwColorSpaceLowValue) - FixedCKey.dwColorSpaceHighValue = FixedCKey.dwColorSpaceLowValue; + if (fixed_color_key.dwColorSpaceHighValue < fixed_color_key.dwColorSpaceLowValue) + fixed_color_key.dwColorSpaceHighValue = fixed_color_key.dwColorSpaceLowValue; - switch (Flags & ~DDCKEY_COLORSPACE) + switch (flags & ~DDCKEY_COLORSPACE) { - case DDCKEY_DESTBLT: - This->surface_desc.ddckCKDestBlt = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKDESTBLT; - break; + case DDCKEY_DESTBLT: + surface->surface_desc.ddckCKDestBlt = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKDESTBLT; + break; - case DDCKEY_DESTOVERLAY: - This->surface_desc.u3.ddckCKDestOverlay = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; - break; + case DDCKEY_DESTOVERLAY: + surface->surface_desc.u3.ddckCKDestOverlay = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; + break; - case DDCKEY_SRCOVERLAY: - This->surface_desc.ddckCKSrcOverlay = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; - break; + case DDCKEY_SRCOVERLAY: + surface->surface_desc.ddckCKSrcOverlay = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; + break; - case DDCKEY_SRCBLT: - This->surface_desc.ddckCKSrcBlt = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKSRCBLT; - break; + case DDCKEY_SRCBLT: + surface->surface_desc.ddckCKSrcBlt = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKSRCBLT; + break; - default: - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + default: + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } } else { - switch (Flags & ~DDCKEY_COLORSPACE) + switch (flags & ~DDCKEY_COLORSPACE) { - case DDCKEY_DESTBLT: - This->surface_desc.dwFlags &= ~DDSD_CKDESTBLT; - break; + case DDCKEY_DESTBLT: + surface->surface_desc.dwFlags &= ~DDSD_CKDESTBLT; + break; - case DDCKEY_DESTOVERLAY: - This->surface_desc.dwFlags &= ~DDSD_CKDESTOVERLAY; - break; + case DDCKEY_DESTOVERLAY: + surface->surface_desc.dwFlags &= ~DDSD_CKDESTOVERLAY; + break; - case DDCKEY_SRCOVERLAY: - This->surface_desc.dwFlags &= ~DDSD_CKSRCOVERLAY; - break; + case DDCKEY_SRCOVERLAY: + surface->surface_desc.dwFlags &= ~DDSD_CKSRCOVERLAY; + break; - case DDCKEY_SRCBLT: - This->surface_desc.dwFlags &= ~DDSD_CKSRCBLT; - break; + case DDCKEY_SRCBLT: + surface->surface_desc.dwFlags &= ~DDSD_CKSRCBLT; + break; - default: - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + default: + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } } - if (This->wined3d_texture) - hr = wined3d_texture_set_color_key(This->wined3d_texture, Flags, - CKey ? (struct wined3d_color_key *)&FixedCKey : NULL); + + if (surface->wined3d_texture) + hr = wined3d_texture_set_color_key(surface->wined3d_texture, flags, + color_key ? (struct wined3d_color_key *)&fixed_color_key : NULL); + wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); } +static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD flags, DDCOLORKEY *color_key) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + + TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); + + wined3d_mutex_lock(); + if (!surface->wined3d_texture) + { + wined3d_mutex_unlock(); + return DDERR_NOTONMIPMAPSUBLEVEL; + } + wined3d_mutex_unlock(); + + return ddraw_surface_set_color_key(surface, flags, color_key); +} + static HRESULT WINAPI ddraw_surface4_SetColorKey(IDirectDrawSurface4 *iface, DWORD flags, DDCOLORKEY *color_key) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface3_SetColorKey(IDirectDrawSurface3 *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4585,7 +4602,7 @@ static HRESULT WINAPI ddraw_surface3_SetColorKey(IDirectDrawSurface3 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface2_SetColorKey(IDirectDrawSurface2 *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4594,7 +4611,7 @@ static HRESULT WINAPI ddraw_surface2_SetColorKey(IDirectDrawSurface2 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4603,7 +4620,7 @@ static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWOR TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette *palette) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 25da038..be87e63 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2761,7 +2761,7 @@ static void DeviceLoadTest(void) hr = IDirectDrawSurface7_SetColorKey(texture_levels[0][0], DDCKEY_SRCBLT, &ddckey); ok(hr==DD_OK, "IDirectDrawSurface7_SetColorKey returned: %x\n", hr); hr = IDirectDrawSurface7_SetColorKey(texture_levels[0][1], DDCKEY_SRCBLT, &ddckey); - todo_wine ok(hr==DDERR_NOTONMIPMAPSUBLEVEL, "IDirectDrawSurface7_SetColorKey returned: %x\n", hr); + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetColorKey(texture_levels[1][0], DDCKEY_SRCBLT, &ddckey); ok(hr==DDERR_NOCOLORKEY, "IDirectDrawSurface7_GetColorKey returned: %x\n", hr);

1 0

Michael Stefaniuc : dmime: Remove "#if 1" preprocessor directives.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: a4664409ef6cf67d88add6eb85ae503ee2b66fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4664409ef6cf67d88add6eb8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 9 10:37:26 2014 +0100 dmime: Remove "#if 1" preprocessor directives. --- dlls/dmime/segment.c | 2 -- dlls/dmime/segtriggertrack.c | 2 -- dlls/dmime/tempotrack.c | 9 +-------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index fa6a6a9..efc03ec 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1109,7 +1109,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI case DMUS_FOURCC_SEGMENT_CHUNK: { DWORD checkSz = sizeof(FOURCC); TRACE_(dmfile)(": segment chunk\n"); -#if 1 /** DX 7 */ IStream_Read (pStm, &This->header.dwRepeats, sizeof(This->header.dwRepeats), NULL); checkSz += sizeof(This->header.dwRepeats); @@ -1145,7 +1144,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI IStream_Read (pStm, &This->header.rtPlayStart, sizeof(This->header.rtPlayStart), NULL); checkSz += sizeof(This->header.rtPlayStart); } -#endif liMove.QuadPart = Chunk.dwSize - checkSz + sizeof(FOURCC); IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 56847ae..d471114 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -460,7 +460,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST TRACE("(%p, %p): Loading\n", This, pStm); -#if 1 IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -491,7 +490,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST return E_FAIL; } } -#endif return S_OK; } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index cf1b275..2d19a5f 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -328,14 +328,12 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA LPDMUS_PRIVATE_TEMPO_ITEM pNewItem = NULL; DWORD nItem = 0; FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); - -#if 1 + IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_TEMPO_TRACK: { TRACE_(dmfile)(": Tempo track\n"); -#if 1 IStream_Read (pStm, &StreamSize, sizeof(DWORD), NULL); StreamSize -= sizeof(DWORD); StreamCount = 0; @@ -356,10 +354,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA StreamCount += sizeof(item); TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); -#else - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); -#endif break; } default: { @@ -369,7 +363,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA return E_FAIL; } } -#endif return S_OK; }

1 0

Jeremy Newman : disable E_DEPRECATED (-8192) in PHP error reporting
by Jeremy Newman Jan. 9, 2014

Jan. 9, 2014

Module: appdb Branch: master Commit: 1e53df9bf82420c7498d1561cbc0d3277f093c5e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1e53df9bf82420c7498d1561… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 9 09:27:47 2014 -0600 disable E_DEPRECATED (-8192) in PHP error reporting --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 440ee16..98a1d1e 100644 --- a/.htaccess +++ b/.htaccess @@ -12,7 +12,7 @@ ErrorDocument 404 http://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) php_flag allow_call_time_pass_reference 1 -php_value error_reporting 30711 +php_value error_reporting 22519 php_value html_errors "1" php_value display_errors "1" php_value register_globals 0

1 0

Jeremy Newman : disable notices, and strict PHP error reporting
by Jeremy Newman Jan. 9, 2014

Jan. 9, 2014

Module: appdb Branch: master Commit: 9e89f19117f5218c5ef6186a5696c937e14dfc2b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9e89f19117f5218c5ef6186a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 9 09:18:02 2014 -0600 disable notices, and strict PHP error reporting --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 1765613..440ee16 100644 --- a/.htaccess +++ b/.htaccess @@ -12,7 +12,7 @@ ErrorDocument 404 http://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) php_flag allow_call_time_pass_reference 1 -php_value error_reporting "1" +php_value error_reporting 30711 php_value html_errors "1" php_value display_errors "1" php_value register_globals 0

1 0

Jacek Caban : devenum: Moved test for special category GUID to separated function.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 6ce17c1fa4a38f180c10db5db60ae7897e2dcd69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce17c1fa4a38f180c10db5db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 14:12:00 2014 +0100 devenum: Moved test for special category GUID to separated function. --- dlls/devenum/createdevenum.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index b7e288b..58fe7a4 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -107,12 +107,17 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface) return 1; /* non-heap based object */ } +static BOOL IsSpecialCategory(const CLSID *clsid) +{ + return IsEqualGUID(clsid, &CLSID_AudioRendererCategory) || + IsEqualGUID(clsid, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsid, &CLSID_VideoInputDeviceCategory) || + IsEqualGUID(clsid, &CLSID_MidiRendererCategory); +} + HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen) { - if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + if (IsSpecialCategory(clsidDeviceClass)) { *pBaseKey = HKEY_CURRENT_USER; strcpyW(wszRegKeyName, wszActiveMovieKey); @@ -482,10 +487,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( if (FAILED(hr)) return hr; - if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + if (IsSpecialCategory(clsidDeviceClass)) { hr = DEVENUM_CreateSpecialCategories(); if (FAILED(hr))

1 0

Jacek Caban : devenum: Populate CLSID_VideoCompressorCategory category in key in DEVENUM_CreateSpecialCategories.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 81c42ce710bdc9385391310ecb3f22e2a153ac5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c42ce710bdc9385391310ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 14:12:25 2014 +0100 devenum: Populate CLSID_VideoCompressorCategory category in key in DEVENUM_CreateSpecialCategories. --- dlls/devenum/Makefile.in | 1 + dlls/devenum/createdevenum.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index fe12606..38ca83d 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -1,5 +1,6 @@ MODULE = devenum.dll IMPORTS = strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 +DELAYIMPORTS = msvfw32 C_SRCS = \ createdevenum.c \ diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index baeb91e..11990d6 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -28,6 +28,7 @@ #include "devenum_private.h" #include "vfw.h" +#include "aviriff.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -598,6 +599,44 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) return res; } +static void register_vfw_codecs(void) +{ + WCHAR avico_clsid_str[CHARS_IN_GUID]; + HKEY basekey, key; + ICINFO icinfo; + DWORD i, res; + + static const WCHAR CLSIDW[] = {'C','L','S','I','D',0}; + static const WCHAR FccHandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; + static const WCHAR FriendlyNameW[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; + + StringFromGUID2(&CLSID_AVICo, avico_clsid_str, sizeof(avico_clsid_str)/sizeof(WCHAR)); + + basekey = open_special_category_key(&CLSID_VideoCompressorCategory, TRUE); + if(!basekey) { + ERR("Could not create key\n"); + return; + } + + for(i=0; ICInfo(FCC('v','i','d','c'), i, &icinfo); i++) { + WCHAR fcc_str[5] = {LOBYTE(LOWORD(icinfo.fccHandler)), HIBYTE(LOWORD(icinfo.fccHandler)), + LOBYTE(HIWORD(icinfo.fccHandler)), HIBYTE(HIWORD(icinfo.fccHandler))}; + + res = RegCreateKeyW(basekey, fcc_str, &key); + if(res != ERROR_SUCCESS) + continue; + + RegSetValueExW(key, CLSIDW, 0, REG_SZ, (const BYTE*)avico_clsid_str, sizeof(avico_clsid_str)); + RegSetValueExW(key, FccHandlerW, 0, REG_SZ, (const BYTE*)fcc_str, sizeof(fcc_str)); + RegSetValueExW(key, FriendlyNameW, 0, REG_SZ, (const BYTE*)icinfo.szName, (strlenW(icinfo.szName)+1)*sizeof(WCHAR)); + /* FIXME: Set ClassManagerFlags and FilterData values */ + + RegCloseKey(key); + } + + RegCloseKey(basekey); +} + static HANDLE DEVENUM_populate_handle; static const WCHAR DEVENUM_populate_handle_nameW[] = {'_','_','W','I','N','E','_', @@ -648,6 +687,8 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) RegDeleteTreeW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH))) RegDeleteTreeW(basekey, path); + if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoCompressorCategory, &basekey, path, MAX_PATH))) + RegDeleteTreeW(basekey, path); rf2.dwVersion = 2; rf2.dwMerit = MERIT_PREFERRED; @@ -927,6 +968,9 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) if (pMapper) IFilterMapper2_Release(pMapper); + + register_vfw_codecs(); + SetEvent(DEVENUM_populate_handle); return res; }

1 0

Jacek Caban : devenum: Enumerate both regular key and special key for special categories.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 92be7be48dbff2a28f196bceb087b76dee8b2680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92be7be48dbff2a28f196bceb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 14:12:11 2014 +0100 devenum: Enumerate both regular key and special key for special categories. --- dlls/devenum/createdevenum.c | 66 ++++++++++++++++++++++++++++++++-------- dlls/devenum/devenum_private.h | 2 +- dlls/devenum/mediacatenum.c | 32 +++++++++++++------ 3 files changed, 78 insertions(+), 22 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 58fe7a4..baeb91e 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); extern HINSTANCE DEVENUM_hInstance; -const WCHAR wszInstanceKeyName[] ={'I','n','s','t','a','n','c','e',0}; +const WCHAR wszInstanceKeyName[] ={'\\','I','n','s','t','a','n','c','e',0}; static const WCHAR wszRegSeparator[] = {'\\', 0 }; static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\', @@ -134,13 +134,57 @@ HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR if (!StringFromGUID2(clsidDeviceClass, wszRegKeyName + CLSID_STR_LEN, maxLen - CLSID_STR_LEN)) return E_OUTOFMEMORY; - strcatW(wszRegKeyName, wszRegSeparator); strcatW(wszRegKeyName, wszInstanceKeyName); } return S_OK; } +static HKEY open_category_key(const CLSID *clsid) +{ + WCHAR key_name[sizeof(wszInstanceKeyName)/sizeof(WCHAR) + CHARS_IN_GUID-1 + 6 /* strlen("CLSID\") */], *ptr; + HKEY ret; + + strcpyW(key_name, clsid_keyname); + ptr = key_name + strlenW(key_name); + *ptr++ = '\\'; + + if (!StringFromGUID2(clsid, ptr, CHARS_IN_GUID)) + return NULL; + + ptr += strlenW(ptr); + strcpyW(ptr, wszInstanceKeyName); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &ret) != ERROR_SUCCESS) { + WARN("Could not open %s\n", debugstr_w(key_name)); + return NULL; + } + + return ret; +} + +static HKEY open_special_category_key(const CLSID *clsid, BOOL create) +{ + WCHAR key_name[sizeof(wszActiveMovieKey)/sizeof(WCHAR) + CHARS_IN_GUID-1]; + HKEY ret; + LONG res; + + strcpyW(key_name, wszActiveMovieKey); + if (!StringFromGUID2(clsid, key_name + sizeof(wszActiveMovieKey)/sizeof(WCHAR)-1, CHARS_IN_GUID)) + return NULL; + + if(create) + res = RegCreateKeyW(HKEY_CURRENT_USER, key_name, &ret); + else + res = RegOpenKeyExW(HKEY_CURRENT_USER, key_name, 0, KEY_READ, &ret); + if (res != ERROR_SUCCESS) { + WARN("Could not open %s\n", debugstr_w(key_name)); + return NULL; + } + + return ret; +} + static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) { HKEY hkeyTypes = NULL; @@ -466,9 +510,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( IEnumMoniker **ppEnumMoniker, DWORD dwFlags) { - WCHAR wszRegKey[MAX_PATH]; - HKEY hkey; - HKEY hbasekey; + HKEY hkey, special_hkey = NULL; HRESULT hr; TRACE("(%p)->(%s, %p, %x)\n", iface, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags); @@ -483,29 +525,29 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( DEVENUM_RegisterLegacyAmFilters(); } - hr = DEVENUM_GetCategoryKey(clsidDeviceClass, &hbasekey, wszRegKey, MAX_PATH); - if (FAILED(hr)) - return hr; - if (IsSpecialCategory(clsidDeviceClass)) { hr = DEVENUM_CreateSpecialCategories(); if (FAILED(hr)) return hr; - if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) + + special_hkey = open_special_category_key(clsidDeviceClass, FALSE); + if (!special_hkey) { ERR("Couldn't open registry key for special device: %s\n", debugstr_guid(clsidDeviceClass)); return S_FALSE; } } - else if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) + + hkey = open_category_key(clsidDeviceClass); + if (!hkey && !special_hkey) { FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass)); return S_FALSE; } - return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker); + return DEVENUM_IEnumMoniker_Construct(hkey, special_hkey, ppEnumMoniker); } /********************************************************************** diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 17e89a5..4f14423 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -68,7 +68,7 @@ typedef struct } MediaCatMoniker; MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; -HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) DECLSPEC_HIDDEN; +HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, HKEY special_hkey, IEnumMoniker ** ppEnumMoniker) DECLSPEC_HIDDEN; extern ClassFactoryImpl DEVENUM_ClassFactory DECLSPEC_HIDDEN; extern ICreateDevEnum DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 60ba110..ce66711 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -35,7 +35,9 @@ typedef struct IEnumMoniker IEnumMoniker_iface; LONG ref; DWORD index; + DWORD subkey_cnt; HKEY hkey; + HKEY special_hkey; } EnumMonikerImpl; typedef struct @@ -717,6 +719,8 @@ static ULONG WINAPI DEVENUM_IEnumMoniker_Release(IEnumMoniker *iface) if (!ref) { + if(This->special_hkey) + RegCloseKey(This->special_hkey); RegCloseKey(This->hkey); CoTaskMemFree(This); DEVENUM_UnlockModule(); @@ -738,7 +742,12 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, while (fetched < celt) { - res = RegEnumKeyW(This->hkey, This->index, buffer, sizeof(buffer) / sizeof(WCHAR)); + if(This->index+fetched < This->subkey_cnt) + res = RegEnumKeyW(This->hkey, This->index+fetched, buffer, sizeof(buffer) / sizeof(WCHAR)); + else if(This->special_hkey) + res = RegEnumKeyW(This->special_hkey, This->index+fetched-This->subkey_cnt, buffer, sizeof(buffer) / sizeof(WCHAR)); + else + break; if (res != ERROR_SUCCESS) { break; @@ -747,7 +756,8 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, if (!pMoniker) return E_OUTOFMEMORY; - if (RegOpenKeyW(This->hkey, buffer, &pMoniker->hkey) != ERROR_SUCCESS) + if (RegOpenKeyW(This->index+fetched < This->subkey_cnt ? This->hkey : This->special_hkey, + buffer, &pMoniker->hkey) != ERROR_SUCCESS) { IMoniker_Release(&pMoniker->IMoniker_iface); break; @@ -772,17 +782,16 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(IEnumMoniker *iface, ULONG celt) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - DWORD subKeys; + DWORD special_subkeys = 0; TRACE("(%p)->(%d)\n", iface, celt); /* Before incrementing, check if there are any more values to run through. Some programs use the Skip() function to get the number of devices */ - if(RegQueryInfoKeyW(This->hkey, NULL, NULL, NULL, &subKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) - { - return S_FALSE; - } - if((This->index + celt) >= subKeys) + if(This->special_hkey) + RegQueryInfoKeyW(This->special_hkey, NULL, NULL, NULL, &special_subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + if((This->index + celt) >= This->subkey_cnt + special_subkeys) { return S_FALSE; } @@ -824,7 +833,7 @@ static const IEnumMonikerVtbl IEnumMoniker_Vtbl = DEVENUM_IEnumMoniker_Clone }; -HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) +HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, HKEY special_hkey, IEnumMoniker ** ppEnumMoniker) { EnumMonikerImpl * pEnumMoniker = CoTaskMemAlloc(sizeof(EnumMonikerImpl)); if (!pEnumMoniker) @@ -834,9 +843,14 @@ HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) pEnumMoniker->ref = 1; pEnumMoniker->index = 0; pEnumMoniker->hkey = hkey; + pEnumMoniker->special_hkey = special_hkey; *ppEnumMoniker = &pEnumMoniker->IEnumMoniker_iface; + if(RegQueryInfoKeyW(pEnumMoniker->hkey, NULL, NULL, NULL, &pEnumMoniker->subkey_cnt, NULL, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + pEnumMoniker->subkey_cnt = 0; + + DEVENUM_LockModule(); return S_OK;

1 0

Stefan Dösinger : ddraw/tests: Add a getdc test with a custom pitch.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 03b2e737d2dcf1b1c668084c4d24fa7fdccf819c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b2e737d2dcf1b1c668084c4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:16 2014 +0100 ddraw/tests: Add a getdc test with a custom pitch. --- dlls/ddraw/tests/ddraw2.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 40 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 117 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 46882be..30c5b81 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1,6 +1,6 @@ /* * Copyright 2011-2012 Henri Verbeet for CodeWeavers - * Copyright 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2012-2014 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4878,6 +4878,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -4926,6 +4927,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface3_GetDC(surface3, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface3_ReleaseDC(surface3, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0xaaaaaaaa on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface3_Release(surface3); ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index df1a23c..e737b42 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1,6 +1,6 @@ /* * Copyright 2011-2012 Henri Verbeet for CodeWeavers - * Copyright 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2012-2014 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -5479,6 +5479,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -5523,6 +5524,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface4_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface4_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0x00000000 on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface4_Release(surface); ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e36927e..f8fa70f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1,5 +1,5 @@ /* - * Copyright 2006, 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2006, 2012-2014 Stefan Dösinger for CodeWeavers * Copyright 2011 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -5373,6 +5373,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -5417,6 +5418,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface7_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface7_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0x00000000 on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface7_Release(surface); ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref);

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc .
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: b91973daa7601991ea70a75c3e2faebde9d34bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91973daa7601991ea70a75c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:15 2014 +0100 wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc . --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 7 ++++-- dlls/ddraw/surface.c | 25 ++++---------------- dlls/wined3d/device.c | 6 ++--- dlls/wined3d/surface.c | 57 +++++++++++++-------------------------------- dlls/wined3d/wined3d.spec | 3 +-- include/wine/wined3d.h | 4 ++-- 7 files changed, 33 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91973daa7601991ea70a…

1 0

Stefan Dösinger : ddraw: Always set surface width, height and format in ddraw_surface7_SetSurfaceDesc.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 2a012ba16ff03e90cb51a7db4bf9f7b1e8781b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a012ba16ff03e90cb51a7db4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:13 2014 +0100 ddraw: Always set surface width, height and format in ddraw_surface7_SetSurfaceDesc. --- dlls/ddraw/surface.c | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 96f6950..4abe3bf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4278,7 +4278,6 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, const DWORD allowed_flags = DDSD_LPSURFACE | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_CAPS; enum wined3d_format_id format_id; - BOOL update_wined3d = FALSE; UINT pitch, width, height; TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags); @@ -4332,15 +4331,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } if (DDSD->dwWidth != This->surface_desc.dwWidth) - { TRACE("Surface width changed from %u to %u.\n", This->surface_desc.dwWidth, DDSD->dwWidth); - update_wined3d = TRUE; - } if (DDSD->u1.lPitch != This->surface_desc.u1.lPitch) - { TRACE("Surface pitch changed from %u to %u.\n", This->surface_desc.u1.lPitch, DDSD->u1.lPitch); - update_wined3d = TRUE; - } pitch = DDSD->u1.lPitch; width = DDSD->dwWidth; } @@ -4363,10 +4356,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } if (DDSD->dwHeight != This->surface_desc.dwHeight) - { TRACE("Surface height changed from %u to %u.\n", This->surface_desc.dwHeight, DDSD->dwHeight); - update_wined3d = TRUE; - } height = DDSD->dwHeight; } else @@ -4388,36 +4378,30 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } current_format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); if (format_id != current_format_id) - { TRACE("Surface format changed from %#x to %#x.\n", current_format_id, format_id); - update_wined3d = TRUE; - } } else { format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); } - if (update_wined3d) + if (FAILED(hr = wined3d_surface_update_desc(This->wined3d_surface, width, height, + format_id, WINED3D_MULTISAMPLE_NONE, 0))) { - if (FAILED(hr = wined3d_surface_update_desc(This->wined3d_surface, width, height, - format_id, WINED3D_MULTISAMPLE_NONE, 0))) - { - WARN("Failed to update surface desc, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - if (DDSD->dwFlags & DDSD_WIDTH) - This->surface_desc.dwWidth = width; - if (DDSD->dwFlags & DDSD_PITCH) - This->surface_desc.u1.lPitch = DDSD->u1.lPitch; - if (DDSD->dwFlags & DDSD_HEIGHT) - This->surface_desc.dwHeight = height; - if (DDSD->dwFlags & DDSD_PIXELFORMAT) - This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + WARN("Failed to update surface desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; } + if (DDSD->dwFlags & DDSD_WIDTH) + This->surface_desc.dwWidth = width; + if (DDSD->dwFlags & DDSD_PITCH) + This->surface_desc.u1.lPitch = DDSD->u1.lPitch; + if (DDSD->dwFlags & DDSD_HEIGHT) + This->surface_desc.dwHeight = height; + if (DDSD->dwFlags & DDSD_PIXELFORMAT) + This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { if (FAILED(hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface, pitch)))

1 0

Martin Storsjo : api-ms-win-core-profile-l1-1-0: Add stub dll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 3741f7176ae6c276e438cd18fb8738bb6e4d2e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3741f7176ae6c276e438cd18f… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:25 2014 +0200 api-ms-win-core-profile-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-profile-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-profile-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 417a7c9..5af9383 100755 --- a/configure +++ b/configure @@ -859,6 +859,7 @@ enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 +enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16574,6 +16575,7 @@ wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_int wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 +wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 72ece36..2e2bb95 100644 --- a/configure.ac +++ b/configure.ac @@ -2631,6 +2631,7 @@ WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-profile-l1-1-0/Makefile.in b/dlls/api-ms-win-core-profile-l1-1-0/Makefile.in new file mode 100644 index 0000000..2777171 --- /dev/null +++ b/dlls/api-ms-win-core-profile-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-profile-l1-1-0.dll diff --git a/dlls/api-ms-win-core-profile-l1-1-0/api-ms-win-core-profile-l1-1-0.spec b/dlls/api-ms-win-core-profile-l1-1-0/api-ms-win-core-profile-l1-1-0.spec new file mode 100644 index 0000000..3b09bac --- /dev/null +++ b/dlls/api-ms-win-core-profile-l1-1-0/api-ms-win-core-profile-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter +@ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency diff --git a/tools/make_specfiles b/tools/make_specfiles index 6c1a7b7..5cfe758 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -140,6 +140,7 @@ my @dll_groups = "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-2-0", + "api-ms-win-core-profile-l1-1-0", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-processthreads-l1-1-1: Add stub dll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 7918f968f17bc73e7a0c60024826b930fac8dd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7918f968f17bc73e7a0c60024… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:21 2014 +0200 api-ms-win-core-processthreads-l1-1-1: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-1.spec | 63 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 68 insertions(+) diff --git a/configure b/configure index b1449ac..5eae8a0 100755 --- a/configure +++ b/configure @@ -855,6 +855,7 @@ enable_advpack enable_amstream enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 +enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16566,6 +16567,7 @@ wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 +wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 10e9921..58ebafc 100644 --- a/configure.ac +++ b/configure.ac @@ -2627,6 +2627,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-1/Makefile.in new file mode 100644 index 0000000..590aac8 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-1.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec new file mode 100644 index 0000000..c9054d20 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -0,0 +1,63 @@ +@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA +@ stub CreateProcessAsUserW +@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW +@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread +@ stub CreateRemoteThreadEx +@ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread +@ stub DeleteProcThreadAttributeList +@ stdcall ExitProcess(long) kernel32.ExitProcess +@ stdcall ExitThread(long) kernel32.ExitThread +@ stdcall FlushInstructionCache(long long long) kernel32.FlushInstructionCache +@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess +@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId +@ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber +@ stub GetCurrentProcessorNumberEx +@ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread +@ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId +@ stub GetCurrentThreadStackLimits +@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess +@ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread +@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass +@ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount +@ stdcall GetProcessId(long) kernel32.GetProcessId +@ stub GetProcessIdOfThread +@ stub GetProcessMitigationPolicy +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW +@ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext +@ stdcall GetThreadId(ptr) kernel32.GetThreadId +@ stub GetThreadIdealProcessorEx +@ stdcall GetThreadPriority(long) kernel32.GetThreadPriority +@ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost +@ stdcall GetThreadTimes(long ptr ptr ptr ptr) kernel32.GetThreadTimes +@ stub InitializeProcThreadAttributeList +@ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent +@ stdcall OpenProcess(long long long) kernel32.OpenProcess +@ stub OpenProcessToken +@ stdcall OpenThread(long long long) kernel32.OpenThread +@ stub OpenThreadToken +@ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId +@ stub QueryProcessAffinityUpdateMode +@ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC +@ stdcall ResumeThread(long) kernel32.ResumeThread +@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass +@ stub SetProcessAffinityUpdateMode +@ stub SetProcessMitigationPolicy +@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters +@ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext +@ stub SetThreadIdealProcessorEx +@ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority +@ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost +@ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee +@ stub SetThreadToken +@ stdcall SuspendThread(long) kernel32.SuspendThread +@ stdcall SwitchToThread() kernel32.SwitchToThread +@ stdcall TerminateProcess(long long) kernel32.TerminateProcess +@ stdcall TerminateThread(long long) kernel32.TerminateThread +@ stdcall TlsAlloc() kernel32.TlsAlloc +@ stdcall TlsFree(long) kernel32.TlsFree +@ stdcall TlsGetValue(long) kernel32.TlsGetValue +@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue +@ stub UpdateProcThreadAttribute diff --git a/tools/make_specfiles b/tools/make_specfiles index dbfa5e3..89c8f9f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -136,6 +136,7 @@ my @dll_groups = "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", + "api-ms-win-core-processthreads-l1-1-1", ], [ "ole32",

1 0