February 2015 - Wine-Commits

Jacek Caban : vbscript: Added InStrRev implementation.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: 9b0ebaeb78374d23e2d1a14ec303b3643d6daca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0ebaeb78374d23e2d1a14ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 10 18:46:25 2015 +0100 vbscript: Added InStrRev implementation. --- dlls/vbscript/global.c | 58 ++++++++++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 58 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index bbbe22c..9bcd2b2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1777,10 +1777,62 @@ static HRESULT Global_StrReverse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt return return_bstr(res, ret); } -static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int start, ret = 0; + BSTR str1, str2; + HRESULT hres; + + TRACE("%s %s arg_cnt=%u\n", debugstr_variant(args), debugstr_variant(args+1), args_cnt); + + if(args_cnt > 3) { + FIXME("Unsupported args\n"); + return E_NOTIMPL; + } + + assert(2 <= args_cnt && args_cnt <= 4); + + if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || V_VT(args+2) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_string(args, &str1); + if(FAILED(hres)) + return hres; + + hres = to_string(args+1, &str2); + if(SUCCEEDED(hres)) { + if(args_cnt > 2) { + hres = to_int(args+2, &start); + if(SUCCEEDED(hres) && start <= 0) { + FIXME("Unsupported start %d\n", start); + hres = E_NOTIMPL; + } + }else { + start = SysStringLen(str1); + } + } + + if(SUCCEEDED(hres)) { + const WCHAR *ptr; + size_t len; + + len = SysStringLen(str2); + if(start >= len && start <= SysStringLen(str1)) { + for(ptr = str1+start-SysStringLen(str2); ptr >= str1; ptr--) { + if(!memcmp(ptr, str2, len*sizeof(WCHAR))) { + ret = ptr-str1+1; + break; + } + } + } + } + + SysFreeString(str1); + SysFreeString(str2); + if(FAILED(hres)) + return hres; + + return return_int(res, ret); } static HRESULT Global_LoadPicture(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1b68d2e..8c92cf5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -282,6 +282,64 @@ Call ok(x = 2, "InStr returned " & x) x = InStr(2.6, "abcd", "bc") Call ok(x = 0, "InStr returned " & x) + +x = InStrRev("bcabcd", "bc") +Call ok(x = 4, "InStrRev returned " & x) +Call ok(getVT(x) = "VT_I4*", "getVT(InStrRev) returned " & getVT(x)) + +x = InStrRev("bcabcd", "bc", 6) +Call ok(x = 4, "InStrRev returned " & x) + +x = InStrRev("abcd", "bcx") +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 3) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "b", 2) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 5) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 15) +Call ok(x = 0, "InStrRev returned " & x) + +x = "abcd" +x = InStrRev(x, "bc") +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 1.3) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2.3) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2.6) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("1234", 34) +Call ok(x = 3, "InStrRev returned " & x) + +x = InStrRev(1234, 34) +Call ok(x = 3, "InStrRev returned " & x) + +Sub testInStrRevError(arg1, arg2, arg3, error_num) + on error resume next + Dim x + + Call Err.clear() + x = InStrRev(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +call testInStrRevError("abcd", null, 2, 94) +call testInStrRevError(null, "abcd", 2, 94) +call testInStrRevError("abcd", "abcd", null, 94) + Sub TestMid(str, start, len, ex) x = Mid(str, start, len) Call ok(x = ex, "Mid(" & str & ", " & start & ", " & len & ") = " & x & " expected " & ex)

1 0

Matteo Bruni : opengl32: Introduce wrappers for glGetIntegerv and glGetStringi. (v3).
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: 9e45ae04137c58e009f62f6e719afde4b3ba0083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e45ae04137c58e009f62f6e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 10 20:13:44 2015 +0100 opengl32: Introduce wrappers for glGetIntegerv and glGetStringi. (v3). --- dlls/opengl32/make_opengl | 8 +++++++- dlls/opengl32/opengl_ext.c | 6 +----- dlls/opengl32/opengl_norm.c | 9 --------- dlls/opengl32/wgl.c | 33 ++++++++++++++++++++++++--------- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 9ca5ebd..2b15f58 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -236,6 +236,7 @@ sub GenerateThunk($$$$) my $trace_arg = ""; return "" if $name eq "glDebugEntry"; + return "" if $name eq "glGetIntegerv"; return "" if $name eq "glGetString"; return "" if $func_ref->[2] && $func_ref->[2]->[0] =~ /WGL_/; @@ -285,6 +286,7 @@ sub GenerateThunk($$$$) } } $ret .= 'void ' if (!@{$func_ref->[1]}); + return "$ret) DECLSPEC_HIDDEN;\n" if $name eq "glGetStringi"; $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; if ($func_ref->[0] ne "void" && $gen_thread_safe) { @@ -951,7 +953,11 @@ my $count = keys %ext_functions; print EXT "const int extension_registry_size = $count;\n"; foreach (sort keys %ext_functions) { my $string = GenerateThunk($_, $ext_functions{$_}, 0, "ext"); - print EXT "\nstatic $string" if $string; + if ($string =~ /DECLSPEC_HIDDEN/) { + print EXT "\n$string"; + } else { + print EXT "\nstatic $string" if $string; + } } # Then the table giving the string <-> function correspondence */ diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 9b9dfa7..67ebc59 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -5014,11 +5014,7 @@ static void WINAPI glGetSharpenTexFuncSGIS( GLenum target, GLfloat* points ) { funcs->ext.p_glGetSharpenTexFuncSGIS( target, points ); } -static const GLubyte* WINAPI glGetStringi( GLenum name, GLuint index ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("(%d, %d)\n", name, index ); - return funcs->ext.p_glGetStringi( name, index ); -} +const GLubyte* WINAPI glGetStringi( GLenum name, GLuint index ) DECLSPEC_HIDDEN; static GLuint WINAPI glGetSubroutineIndex( GLuint program, GLenum shadertype, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index 52fb00b..34a4892 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/dlls/opengl32/opengl_norm.c @@ -948,15 +948,6 @@ void WINAPI glGetFloatv( GLenum pname, GLfloat* data ) { } /*********************************************************************** - * glGetIntegerv (OPENGL32.@) - */ -void WINAPI glGetIntegerv( GLenum pname, GLint* data ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("(%d, %p)\n", pname, data ); - funcs->gl.p_glGetIntegerv( pname, data ); -} - -/*********************************************************************** * glGetLightfv (OPENGL32.@) */ void WINAPI glGetLightfv( GLenum light, GLenum pname, GLfloat* params ) { diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6ff54f0..b028fe0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -687,27 +687,42 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } +void WINAPI glGetIntegerv(GLenum pname, GLint *data) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE("(%d, %p)\n", pname, data); + funcs->gl.p_glGetIntegerv(pname, data); +} + +const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE("(%d, %d)\n", name, index); + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + + *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); + } + + return funcs->ext.p_glGetStringi(name, index); +} + /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext, size_t len ) { if (!list) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *gl_ext; unsigned int i; GLint extensions_count; - if (!funcs->ext.p_glGetStringi) - { - void **func_ptr = (void **)&funcs->ext.p_glGetStringi; - - *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); - } - glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); for (i = 0; i < extensions_count; ++i) { - gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, i); + gl_ext = (const char *)glGetStringi(GL_EXTENSIONS, i); if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) return TRUE; }

1 0

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

Feb. 11, 2015

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: Recognize the SM4 or opcode.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

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 Feb. 11, 2015

Feb. 11, 2015

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

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

Feb. 10, 2015

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

Austin English : rpcrt4: Add a stub for I_RpcBindingInqLocalClientPID.
by Alexandre Julliard Feb. 10, 2015

Feb. 10, 2015

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

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

Feb. 10, 2015

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 Feb. 10, 2015

Feb. 10, 2015

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

Erich E. Hoover : server: Implement socket-specific ioctl() routine.
by Alexandre Julliard Feb. 10, 2015

Feb. 10, 2015

Module: wine Branch: master Commit: 1239663fcb82dee80c94bd5d121914126e58b2c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1239663fcb82dee80c94bd5d1… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Apr 3 09:21:51 2014 -0600 server: Implement socket-specific ioctl() routine. --- Makefile.in | 3 ++- server/sock.c | 26 ++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5c163b8..b600cf7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,8 @@ __tooldeps__: libs/port libs/wine libs/wpp __builddeps__: __tooldeps__ include .PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__ -loader server: libs/port libs/wine tools +loader: libs/port libs/wine tools +server: libs/port libs/wine tools include fonts: tools/sfnt2fon include: tools tools/widl libs/wine tools: libs/port diff --git a/server/sock.c b/server/sock.c index 7c0212e..6a75934 100644 --- a/server/sock.c +++ b/server/sock.c @@ -52,6 +52,8 @@ #include "windef.h" #include "winternl.h" #include "winerror.h" +#define USE_WS_PREFIX +#include "winsock2.h" #include "process.h" #include "file.h" @@ -86,9 +88,6 @@ #define FD_WINE_RAW 0x80000000 #define FD_WINE_INTERNAL 0xFFFF0000 -/* Constants for WSAIoctl() */ -#define WSA_FLAG_OVERLAPPED 0x01 - struct sock { struct object obj; /* object header */ @@ -121,6 +120,8 @@ static void sock_destroy( struct object *obj ); static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); static enum server_fd_type sock_get_fd_type( struct fd *fd ); +static obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, + int blocking, const void *data, data_size_t size ); static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); static void sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ); @@ -155,7 +156,7 @@ static const struct fd_ops sock_fd_ops = sock_poll_event, /* poll_event */ no_flush, /* flush */ sock_get_fd_type, /* get_fd_type */ - default_fd_ioctl, /* ioctl */ + sock_ioctl, /* ioctl */ sock_queue_async, /* queue_async */ sock_reselect_async, /* reselect_async */ sock_cancel_async /* cancel_async */ @@ -523,6 +524,23 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) return FD_TYPE_SOCKET; } +obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, + int blocking, const void *data, data_size_t size ) +{ + struct sock *sock = get_fd_user( fd ); + + assert( sock->obj.ops == &sock_ops ); + + switch(code) + { + case WS_SIO_ADDRESS_LIST_CHANGE: + /* intentional fallthrough, not yet supported */ + default: + set_error( STATUS_NOT_SUPPORTED ); + return 0; + } +} + static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) { struct sock *sock = get_fd_user( fd );

1 0