February 2015 - Wine-commits

Henri Verbeet : wined3d: Do not validate format restrictions for buffers.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 1dfea3a4ba16299359476c606c5d40dbbb5545a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dfea3a4ba16299359476c606… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:15 2015 +0100 wined3d: Do not validate format restrictions for buffers. Buffers don't have a format as such, and are created with either WINED3DFMT_UNKNOWN or WINED3DFMT_VERTEXDATA. --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f4134e2..205f074 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -81,7 +81,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d *d3d = device->wined3d; resource_check_usage(usage); - if (pool != WINED3D_POOL_SCRATCH) + if (pool != WINED3D_POOL_SCRATCH && type != WINED3D_RTYPE_BUFFER) { if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET)) {

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_SQRT in the GLSL shader backend.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 8506da62e0ac9ab882a9689d326fcac638788c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8506da62e0ac9ab882a9689d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:16 2015 +0100 wined3d: Implement WINED3DSIH_SQRT in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b02cbff..6ac1b5c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2606,6 +2606,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; + case WINED3DSIH_SQRT: instruction = "sqrt"; break; default: instruction = ""; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); break; @@ -6788,7 +6789,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SGN */ shader_glsl_sgn, /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, - /* WINED3DSIH_SQRT */ NULL, + /* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem,

1 0

Henri Verbeet : wined3d: Recognize the SM4 ne opcode.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 3225fea30ccc913b74e2e90e042efda9abdf25ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3225fea30ccc913b74e2e90e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:17 2015 +0100 wined3d: Recognize the SM4 ne opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 763a4a2..e543ebf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5238,6 +5238,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MOVA */ shader_hw_mov, /* WINED3DSIH_MOVC */ NULL, /* WINED3DSIH_MUL */ shader_hw_map2gl, + /* WINED3DSIH_NE */ NULL, /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6ac1b5c..6e6be8d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2357,6 +2357,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IGE: op = "greaterThanEqual"; break; case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; + case WINED3DSIH_NE: op = "notEqual"; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -2375,6 +2376,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IGE: op = ">="; break; case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; + case WINED3DSIH_NE: op = "!="; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -6772,6 +6774,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MOVC */ shader_glsl_conditional_move, /* WINED3DSIH_MUL */ shader_glsl_binop, + /* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 766e91f..f98074e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_MOVA */ "mova", /* WINED3DSIH_MOVC */ "movc", /* WINED3DSIH_MUL */ "mul", + /* WINED3DSIH_NE */ "ne", /* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NRM */ "nrm", /* WINED3DSIH_PHASE */ "phase", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 046b252..acf4b37 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -111,6 +111,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, + WINED3D_SM4_OP_NE = 0x39, WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_RSQ = 0x44, @@ -278,6 +279,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, "F", "F"}, {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "F", "UFF"}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"}, + {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 539f18c..1415990 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_MOVA, WINED3DSIH_MOVC, WINED3DSIH_MUL, + WINED3DSIH_NE, WINED3DSIH_NOP, WINED3DSIH_NRM, WINED3DSIH_PHASE,

1 0

Henri Verbeet : wined3d: Recognize the SM4 or opcode.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: e4cb3b5081a93fc7643a86069eefb33e3057272e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4cb3b5081a93fc7643a86069… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:18 2015 +0100 wined3d: Recognize the SM4 or opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e543ebf..688bdb7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5241,6 +5241,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NE */ NULL, /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, + /* WINED3DSIH_OR */ NULL, /* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_POW */ shader_hw_pow, /* WINED3DSIH_RCP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6e6be8d..0017e45 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2319,6 +2319,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IADD: op = "+"; break; case WINED3DSIH_ISHL: op = "<<"; break; case WINED3DSIH_MUL: op = "*"; break; + case WINED3DSIH_OR: op = "|"; break; case WINED3DSIH_SUB: op = "-"; break; case WINED3DSIH_USHR: op = ">>"; break; case WINED3DSIH_XOR: op = "^"; break; @@ -6777,6 +6778,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, + /* WINED3DSIH_OR */ shader_glsl_binop, /* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f98074e..28f3b17 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -111,6 +111,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_NE */ "ne", /* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NRM */ "nrm", + /* WINED3DSIH_OR */ "or", /* WINED3DSIH_PHASE */ "phase", /* WINED3DSIH_POW */ "pow", /* WINED3DSIH_RCP */ "rcp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index acf4b37..9f8fe12 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -112,6 +112,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_NE = 0x39, + WINED3D_SM4_OP_OR = 0x3c, WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_RSQ = 0x44, @@ -280,6 +281,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "F", "UFF"}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"}, {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"}, + {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "U", "UU"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1415990..2c1a00c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_NE, WINED3DSIH_NOP, WINED3DSIH_NRM, + WINED3DSIH_OR, WINED3DSIH_PHASE, WINED3DSIH_POW, WINED3DSIH_RCP,

1 0

Matteo Bruni : wined3d: Use unsigned short for the bitfields in struct color_fixup_desc.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 20e61b396e98e7b2fefb20c1b4401718da8e4a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e61b396e98e7b2fefb20c1b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 10 20:14:48 2015 +0100 wined3d: Use unsigned short for the bitfields in struct color_fixup_desc. --- dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4373805..539f18c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -95,14 +95,14 @@ enum complex_fixup #include <pshpack2.h> struct color_fixup_desc { - unsigned x_sign_fixup : 1; - unsigned x_source : 3; - unsigned y_sign_fixup : 1; - unsigned y_source : 3; - unsigned z_sign_fixup : 1; - unsigned z_source : 3; - unsigned w_sign_fixup : 1; - unsigned w_source : 3; + unsigned short x_sign_fixup : 1; + unsigned short x_source : 3; + unsigned short y_sign_fixup : 1; + unsigned short y_source : 3; + unsigned short z_sign_fixup : 1; + unsigned short z_source : 3; + unsigned short w_sign_fixup : 1; + unsigned short w_source : 3; }; #include <poppack.h>

1 0

Matteo Bruni : wined3d: Call glReadBuffer() through the appropriate function pointer.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: f4da723151d031f84323ef3cdbb71cda724ca13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4da723151d031f84323ef3cd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 9 21:19:49 2015 +0100 wined3d: Call glReadBuffer() through the appropriate function pointer. --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b3fa5a1..843905a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -437,7 +437,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */ - glReadBuffer(GL_NONE); + gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); context_set_draw_buffer(context, GL_NONE); if (target != GL_FRAMEBUFFER) {

1 0

Matteo Bruni : wined3d: Use GL_CLAMP_TO_EDGE instead of GL_CLAMP.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: b875a4a44ad17e902398a751b15eeb7379a4cab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b875a4a44ad17e902398a751b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 9 21:19:50 2015 +0100 wined3d: Use GL_CLAMP_TO_EDGE instead of GL_CLAMP. GL_CLAMP was removed from core profile and probably GL_CLAMP_TO_EDGE was intended to be used here anyway. --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1753cd0..8aaa82b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -315,8 +315,8 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MIN_FILTER, wined3d_gl_min_mip_filter(filter, WINED3D_TEXF_NONE)); checkGLcall("glTexParameteri"); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); @@ -3306,8 +3306,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } /* draw the source texture stretched and upside down. The correct surface is bound already */ - gl_info->gl_ops.gl.p_glTexParameteri(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP); - gl_info->gl_ops.gl.p_glTexParameteri(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP); + gl_info->gl_ops.gl.p_glTexParameteri(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); context_set_draw_buffer(context, drawBuffer); gl_info->gl_ops.gl.p_glReadBuffer(drawBuffer);

1 0

Austin English : rpcrt4: Add a stub for I_RpcBindingInqLocalClientPID.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: ecdaf568b5644d872f4d291da23e3d8943d6db29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdaf568b5644d872f4d291da… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 9 23:48:29 2015 -0600 rpcrt4: Add a stub for I_RpcBindingInqLocalClientPID. --- dlls/rpcrt4/rpc_binding.c | 10 ++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- include/rpcdcep.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index a6cfb6a..dd9571e 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1949,3 +1949,13 @@ RPC_STATUS WINAPI RpcBindingSetOption(RPC_BINDING_HANDLE BindingHandle, ULONG Op } return RPC_S_OK; } + +/*********************************************************************** + * I_RpcBindingInqLocalClientPID (RPCRT4.@) + */ + +RPC_STATUS WINAPI I_RpcBindingInqLocalClientPID(RPC_BINDING_HANDLE ClientBinding, ULONG *ClientPID) +{ + FIXME("%p %p: stub\n", ClientBinding, ClientPID); + return RPC_S_INVALID_BINDING; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 00fe7c4..378b277 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -29,7 +29,7 @@ @ stub I_RpcBindingInqDynamicEndPoint @ stub I_RpcBindingInqDynamicEndPointA @ stub I_RpcBindingInqDynamicEndPointW -@ stub I_RpcBindingInqLocalClientPID # wxp +@ stdcall I_RpcBindingInqLocalClientPID(ptr ptr) @ stub I_RpcBindingInqSecurityContext @ stdcall I_RpcBindingInqTransportType(ptr ptr) @ stub I_RpcBindingInqWireIdForSnego diff --git a/include/rpcdcep.h b/include/rpcdcep.h index fd0acda..bf51806 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -221,6 +221,9 @@ RPCRTAPI UINT RPC_ENTRY #endif RPCRTAPI RPC_STATUS RPC_ENTRY + I_RpcBindingInqLocalClientPID (RPC_BINDING_HANDLE Binding, ULONG *Pid ); + +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); RPCRTAPI LONG RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS);

1 0

Austin English : connect: Add stub dll.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: be70190c1a23a12865fe5a298b60bb1384624aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=be70190c1a23a12865fe5a298… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Feb 8 15:03:13 2015 -0600 connect: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/connect/Makefile.in | 4 ++++ dlls/connect/connect.spec | 15 +++++++++++++++ dlls/connect/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+) diff --git a/configure b/configure index d8376c8..0307f05 100755 --- a/configure +++ b/configure @@ -942,6 +942,7 @@ enable_comctl32 enable_comdlg32 enable_compstui enable_comsvcs +enable_connect enable_credui enable_crtdll enable_crypt32 @@ -17080,6 +17081,7 @@ wine_fn_config_dll commdlg.dll16 enable_win16 wine_fn_config_dll compobj.dll16 enable_win16 wine_fn_config_dll compstui enable_compstui implib wine_fn_config_dll comsvcs enable_comsvcs implib +wine_fn_config_dll connect enable_connect wine_fn_config_dll credui enable_credui implib,po wine_fn_config_test dlls/credui/tests credui_test wine_fn_config_dll crtdll enable_crtdll implib diff --git a/configure.ac b/configure.ac index 3647406..42d8865 100644 --- a/configure.ac +++ b/configure.ac @@ -2793,6 +2793,7 @@ WINE_CONFIG_DLL(commdlg.dll16,enable_win16) WINE_CONFIG_DLL(compobj.dll16,enable_win16) WINE_CONFIG_DLL(compstui,,[implib]) WINE_CONFIG_DLL(comsvcs,,[implib]) +WINE_CONFIG_DLL(connect) WINE_CONFIG_DLL(credui,,[implib,po]) WINE_CONFIG_TEST(dlls/credui/tests) WINE_CONFIG_DLL(crtdll,,[implib]) diff --git a/dlls/connect/Makefile.in b/dlls/connect/Makefile.in new file mode 100644 index 0000000..95d0211 --- /dev/null +++ b/dlls/connect/Makefile.in @@ -0,0 +1,4 @@ +MODULE = connect.dll + +C_SRCS = \ + main.c diff --git a/dlls/connect/connect.spec b/dlls/connect/connect.spec new file mode 100644 index 0000000..6b4da21 --- /dev/null +++ b/dlls/connect/connect.spec @@ -0,0 +1,15 @@ +@ stub AddConnectionOptionListEntries +@ stub CreateVPNConnection +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub GetInternetConnected +@ stub GetNetworkConnected +@ stub GetVPNConnected +@ stub HrIsInternetConnected +@ stub HrIsInternetConnectedGUID +@ stub IsInternetConnected +@ stub IsInternetConnectedGUID +@ stub IsUniqueConnectionName +@ stub RegisterPageWithPage +@ stub UnregisterPage +@ stub UnregisterPagesLink diff --git a/dlls/connect/main.c b/dlls/connect/main.c new file mode 100644 index 0000000..1c12f72 --- /dev/null +++ b/dlls/connect/main.c @@ -0,0 +1,38 @@ +/* + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Piotr Caban : msvcp70: Add basic_{fstream, ifstream, ofstream, filebuf}:: open exports.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: b02934096d36a3c1e7f79fa73071b44e6bbb2c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02934096d36a3c1e7f79fa73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 10 12:59:02 2015 +0100 msvcp70: Add basic_{fstream, ifstream, ofstream, filebuf}::open exports. --- dlls/msvcp70/msvcp70.spec | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 00303e6..397e3f8 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -3974,47 +3974,47 @@ @ extern -arch=win64 ?npos@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@2_KB MSVCP_basic_string_wchar_npos @ extern -arch=win32 ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2IB MSVCP_basic_string_wchar_npos @ extern -arch=win64 ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2_KB MSVCP_basic_string_wchar_npos -@ stub -arch=win32 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDH@Z -@ stub -arch=win64 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDH@Z +@ thiscall -arch=win32 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDH@Z(ptr str long) basic_filebuf_char_open_mode +@ cdecl -arch=win64 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDH@Z(ptr str long) basic_filebuf_char_open_mode @ thiscall -arch=win32 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBDI@Z(ptr str long) basic_filebuf_char_open_mode @ cdecl -arch=win64 ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBDI@Z(ptr str long) basic_filebuf_char_open_mode -@ stub -arch=win32 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDH@Z +@ thiscall -arch=win32 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDH@Z(ptr str long) basic_filebuf_short_open_mode @ thiscall -arch=win32 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDI@Z(ptr str long) basic_filebuf_short_open_mode @ cdecl -arch=win64 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDI@Z(ptr str long) basic_filebuf_short_open_mode -@ stub -arch=win32 ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV12(a)PBDH@Z +@ thiscall -arch=win32 ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV12(a)PBDH@Z(ptr str long) basic_filebuf_wchar_open_mode @ thiscall -arch=win32 ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV12(a)PBDI@Z(ptr str long) basic_filebuf_wchar_open_mode @ cdecl -arch=win64 ?open@?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAPEAV12(a)PEBDI@Z(ptr str long) basic_filebuf_wchar_open_mode -@ stub -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_fstream_char_open_old +@ cdecl -arch=win64 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_fstream_char_open_old @ thiscall -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_fstream_char_open_old @ cdecl -arch=win64 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_fstream_char_open_old -@ stub -arch=win32 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_fstream_wchar_open_old +@ cdecl -arch=win64 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_fstream_wchar_open_old @ thiscall -arch=win32 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_fstream_wchar_open_old @ cdecl -arch=win64 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_fstream_wchar_open_old -@ stub -arch=win32 ?open@?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_fstream_wchar_open_old @ thiscall -arch=win32 ?open@?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_fstream_wchar_open_old @ cdecl -arch=win64 ?open@?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_fstream_wchar_open_old -@ stub -arch=win32 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ifstream_char_open_old +@ cdecl -arch=win64 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_ifstream_char_open_old @ thiscall -arch=win32 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_ifstream_char_open_old @ cdecl -arch=win64 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_ifstream_char_open_old -@ stub -arch=win32 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ifstream_wchar_open_old +@ cdecl -arch=win64 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_ifstream_wchar_open_old @ thiscall -arch=win32 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_ifstream_wchar_open_old @ cdecl -arch=win64 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_ifstream_wchar_open_old -@ stub -arch=win32 ?open@?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ifstream_wchar_open_old @ thiscall -arch=win32 ?open@?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_ifstream_wchar_open_old @ cdecl -arch=win64 ?open@?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_ifstream_wchar_open_old -@ stub -arch=win32 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ofstream_char_open_old +@ cdecl -arch=win64 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_ofstream_char_open_old @ thiscall -arch=win32 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_ofstream_char_open_old @ cdecl -arch=win64 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_ofstream_char_open_old -@ stub -arch=win32 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ofstream_wchar_open_old +@ cdecl -arch=win64 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_ofstream_wchar_open_old @ thiscall -arch=win32 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_ofstream_wchar_open_old @ cdecl -arch=win64 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_ofstream_wchar_open_old -@ stub -arch=win32 ?open@?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ofstream_wchar_open_old @ thiscall -arch=win32 ?open@?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXPBDI(a)Z(ptr str long) basic_ofstream_wchar_open_old @ cdecl -arch=win64 ?open@?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXPEBDI(a)Z(ptr str long) basic_ofstream_wchar_open_old @ stub -arch=win32 ?open@?$messages(a)D@std@@QBEHABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)ABVlocale@2@@Z

1 0