October 2010 - Wine-Commits

Charles Davis : kernel32/tests: Fix the mixed-case short path test to actually test something.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

Module: wine Branch: master Commit: 717fc6f3a82516e9326b8b7d7168783594d67d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717fc6f3a82516e9326b8b7d7… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Thu Oct 28 17:57:48 2010 -0600 kernel32/tests: Fix the mixed-case short path test to actually test something. --- dlls/kernel32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 2775ab1..3d32767 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -571,7 +571,7 @@ static void test_ShortPathCase(const char *tmpdir, const char *dirname, /* Now for the real test */ for(i=0;i<strlen(shortbuf);i++) if (i % 2) - shortbuf[i] = toupper(shortbuf[i]); + shortbuf[i] = tolower(shortbuf[i]); hndl = CreateFileA(shortbuf,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed (%d)\n",GetLastError()); CloseHandle(hndl);

1 0

Gustavo Henrique Milaré : jscript: Update Portuguese translation.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

Module: wine Branch: master Commit: 8b3786f5cf469e5c9ac67bafa34ca5a80a2fe765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3786f5cf469e5c9ac67bafa… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Oct 28 23:39:13 2010 -0200 jscript: Update Portuguese translation. --- dlls/jscript/jscript_Pt.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Pt.rc b/dlls/jscript/jscript_Pt.rc index 1ead171..6901800 100644 --- a/dlls/jscript/jscript_Pt.rc +++ b/dlls/jscript/jscript_Pt.rc @@ -27,8 +27,10 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Erro ao converter objeto em tipo primitivo" IDS_INVALID_CALL_ARG "Argumento ou chamada de procedimento inválida" + IDS_SUBSCRIPT_OUT_OF_RANGE "Subscript fora de alcance" IDS_CREATE_OBJ_ERROR "O servidor de automação não conseguiu criar o objeto" IDS_NO_PROPERTY "O objeto não suporta esta propriedade ou método" + IDS_UNSUPPORTED_ACTION "O objeto não suporta esta ação" IDS_ARG_NOT_OPT "Argumento não opcional" IDS_SYNTAX_ERROR "Erro de sintaxe" IDS_SEMICOLON "';' esperado" @@ -42,6 +44,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Atribuição ilegal" IDS_UNDEFINED "'|' é indefinido" IDS_NOT_BOOL "Objeto boleano esperado" + IDS_NOT_VBARRAY "Objeto VBArray esperado" IDS_JSCRIPT_EXPECTED "Objeto JScript esperado" IDS_REGEXP_SYNTAX_ERROR "Erro de sintaxe na expressão regular" IDS_URI_INVALID_CHAR "URI a ser codificado contém caracteres inválidos" @@ -55,8 +58,10 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Erro ao converter objecto em tipo primitivo" IDS_INVALID_CALL_ARG "Argumento ou chamada de procedimento inválida" + IDS_SUBSCRIPT_OUT_OF_RANGE "Subscript fora de alcance" IDS_CREATE_OBJ_ERROR "O servidor de automação não conseguiu criar o objecto" IDS_NO_PROPERTY "O objecto não suporta esta propriedade ou método" + IDS_UNSUPPORTED_ACTION "O objecto não suporta esta acção" IDS_ARG_NOT_OPT "Argumento não opcional" IDS_SYNTAX_ERROR "Erro de sintaxe" IDS_SEMICOLON "';' esperado" @@ -70,6 +75,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Atribuição ilegal" IDS_UNDEFINED "'|' é indefinido" IDS_NOT_BOOL "Objecto boleano esperado" + IDS_NOT_VBARRAY "Objecto VBArray esperado" IDS_JSCRIPT_EXPECTED "Objecto JScript esperado" IDS_REGEXP_SYNTAX_ERROR "Erro de sintaxe na expressão regular" IDS_URI_INVALID_CHAR "URI a ser codificado contém caracteres inválidos"

1 0

Andrew Nguyen : configure: Check for GStreamer functionality present in 0. 10.26.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

Module: wine Branch: master Commit: de4179741b667274285fe0e26dd8bf299e26e153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4179741b667274285fe0e26… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Oct 29 00:26:04 2010 -0500 configure: Check for GStreamer functionality present in 0.10.26. --- configure | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 10 ++++++---- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/configure b/configure index baebf88..a9e0e76 100755 --- a/configure +++ b/configure @@ -10501,8 +10501,47 @@ then done ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_gst_incl" - ac_fn_c_check_header_mongrel "$LINENO" "gst/app/gstappsink.h" "ac_cv_header_gst_app_gstappsink_h" "$ac_includes_default" + ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default" +if test "x$ac_cv_header_gst_gstpad_h" = x""yes; then : + ac_fn_c_check_header_mongrel "$LINENO" "gst/app/gstappsink.h" "ac_cv_header_gst_app_gstappsink_h" "$ac_includes_default" if test "x$ac_cv_header_gst_app_gstappsink_h" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_get_caps_reffed in -lgstreamer-0.10" >&5 +$as_echo_n "checking for gst_pad_get_caps_reffed in -lgstreamer-0.10... " >&6; } +if test "${ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgstreamer-0.10 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gst_pad_get_caps_reffed (); +int +main () +{ +return gst_pad_get_caps_reffed (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed=yes +else + ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed" >&5 +$as_echo "$ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed" >&6; } +if test "x$ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed" = x""yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_app_buffer_new in -lgstapp-0.10" >&5 $as_echo_n "checking for gst_app_buffer_new in -lgstapp-0.10... " >&6; } if test "${ac_cv_lib_gstapp_0_10_gst_app_buffer_new+set}" = set; then : @@ -10542,13 +10581,18 @@ $as_echo "$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" >&6; } if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = x""yes; then : GSTREAMER_LIBS="$ac_gst_libs" - GSTREAMER_INCL="$ac_gst_incl" + GSTREAMER_INCL="$ac_gst_incl" + +fi fi fi +fi + + fi CPPFLAGS="$ac_save_CPPFLAGS" fi diff --git a/configure.ac b/configure.ac index 50feee4..eb3285a 100644 --- a/configure.ac +++ b/configure.ac @@ -1418,10 +1418,12 @@ then done ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_gst_incl" - AC_CHECK_HEADER([gst/app/gstappsink.h], - [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new, - [AC_SUBST(GSTREAMER_LIBS,"$ac_gst_libs") - AC_SUBST(GSTREAMER_INCL,"$ac_gst_incl")],,[$ac_gst_libs])]) + AC_CHECK_HEADER([gst/gstpad.h], + [AC_CHECK_HEADER([gst/app/gstappsink.h], + [AC_CHECK_LIB(gstreamer-0.10,gst_pad_get_caps_reffed, + [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new, + [AC_SUBST(GSTREAMER_LIBS,"$ac_gst_libs") + AC_SUBST(GSTREAMER_INCL,"$ac_gst_incl")],,[$ac_gst_libs])])])]) fi CPPFLAGS="$ac_save_CPPFLAGS" fi

1 0

Henri Verbeet : wined3d: Access reg_maps though ins->ctx in shader_hw_mov() .
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: ac2805e5b3a2def5b3d37ec13b7b9581fed9f6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2805e5b3a2def5b3d37ec13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:49:58 2010 +0200 wined3d: Access reg_maps though ins->ctx in shader_hw_mov(). --- dlls/wined3d/arb_program_shader.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3193534..88f0ec0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1744,11 +1744,12 @@ static void shader_hw_nop(const struct wined3d_shader_instruction *ins) static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - BOOL pshader = shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type); + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; + BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; - const char *zero = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_ZERO); - const char *one = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_ONE); - const char *two = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_TWO); + const char *zero = arb_get_helper_value(reg_maps->shader_version.type, ARB_ZERO); + const char *one = arb_get_helper_value(reg_maps->shader_version.type, ARB_ONE); + const char *two = arb_get_helper_value(reg_maps->shader_version.type, ARB_TWO); struct wined3d_shader_buffer *buffer = ins->ctx->buffer; char src0_param[256]; @@ -1787,8 +1788,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MUL A0_SHADOW%s, TA, A0_SHADOW;\n", write_mask); ((struct shader_arb_ctx_priv *)ins->ctx->backend_data)->addr_reg[0] = '\0'; - } else if (ins->ctx->reg_maps->shader_version.major == 1 - && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) + } + else if (reg_maps->shader_version.major == 1 + && !shader_is_pshader_version(reg_maps->shader_version.type) && ins->dst[0].reg.type == WINED3DSPR_ADDR) { src0_param[0] = '\0';

1 0

Henri Verbeet : wined3d: Access reg_maps though ins->ctx in get_bool_const( ).
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 5b36e29298d132332703dec1541592a3dfb49219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b36e29298d132332703dec15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:49:59 2010 +0200 wined3d: Access reg_maps though ins->ctx in get_bool_const(). --- dlls/wined3d/arb_program_shader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 88f0ec0..39b7015 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5034,13 +5034,14 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, DWORD idx) { - BOOL vshader = shader_is_vshader_version(This->baseShader.reg_maps.shader_version.type); + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; + BOOL vshader = shader_is_vshader_version(reg_maps->shader_version.type); WORD bools = 0; WORD flag = (1 << idx); const local_constant *constant; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; - if(This->baseShader.reg_maps.local_bool_consts & flag) + if (reg_maps->local_bool_consts & flag) { /* What good is a if(bool) with a hardcoded local constant? I don't know, but handle it */ LIST_FOR_EACH_ENTRY(constant, &This->baseShader.constantsB, local_constant, entry)

1 0

Henri Verbeet : wined3d: Access reg_maps though ins-> ctx in get_loop_control_const().
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: f216dba1e39de775165fc1e4f3b43c8f4e0e28e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f216dba1e39de775165fc1e4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:50:00 2010 +0200 wined3d: Access reg_maps though ins->ctx in get_loop_control_const(). --- dlls/wined3d/arb_program_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 39b7015..a93327e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5065,11 +5065,12 @@ static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, static void get_loop_control_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, UINT idx, struct wined3d_shader_loop_control *loop_control) { + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; /* Integer constants can either be a local constant, or they can be stored in the shader * type specific compile args. */ - if (This->baseShader.reg_maps.local_int_consts & (1 << idx)) + if (reg_maps->local_int_consts & (1 << idx)) { const local_constant *constant; @@ -5092,7 +5093,7 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins, return; } - switch (This->baseShader.reg_maps.shader_version.type) + switch (reg_maps->shader_version.type) { case WINED3D_SHADER_TYPE_VERTEX: /* Count and aL start value are unsigned */ @@ -5109,7 +5110,7 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins, break; default: - FIXME("Unhandled shader type %#x.\n", This->baseShader.reg_maps.shader_version.type); + FIXME("Unhandled shader type %#x.\n", reg_maps->shader_version.type); break; } }

1 0

Henri Verbeet : wined3d: Access reg_maps though ins-> ctx in shader_arb_get_register_name().
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 6c5caf7a8ba81b37c79f6c35a2cf30c70915e0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5caf7a8ba81b37c79f6c35a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:49:57 2010 +0200 wined3d: Access reg_maps though ins->ctx in shader_arb_get_register_name(). --- dlls/wined3d/arb_program_shader.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 49263c0..3193534 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -933,7 +933,8 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction /* oPos, oFog and oPts in D3D */ static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - BOOL pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; + BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; *is_color = FALSE; @@ -947,7 +948,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction case WINED3DSPR_INPUT: if (pshader) { - if(This->baseShader.reg_maps.shader_version.major < 3) + if (reg_maps->shader_version.major < 3) { if (!reg->idx) strcpy(register_name, "fragment.color.primary"); else strcpy(register_name, "fragment.color.secondary"); @@ -972,7 +973,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction sprintf(register_name, "out_of_bounds_%u", idx); } } - else if(This->baseShader.reg_maps.input_registers & 0x0300) + else if (reg_maps->input_registers & 0x0300) { /* There are two ways basically: * @@ -1036,7 +1037,8 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction BOOL aL = FALSE; char rel_reg[50]; UINT rel_offset = ((IWineD3DVertexShaderImpl *)This)->rel_offset; - if(This->baseShader.reg_maps.shader_version.major < 2) { + if (reg_maps->shader_version.major < 2) + { sprintf(rel_reg, "A0.x"); } else { shader_arb_get_src_param(ins, reg->rel_addr, 0, rel_reg); @@ -1059,7 +1061,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if (This->baseShader.reg_maps.usesrelconstF) + if (reg_maps->usesrelconstF) sprintf(register_name, "C[%u]", reg->idx); else sprintf(register_name, "C%u", reg->idx); @@ -1067,9 +1069,11 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction break; case WINED3DSPR_TEXTURE: /* case WINED3DSPR_ADDR: */ - if (pshader) { - if(This->baseShader.reg_maps.shader_version.major == 1 && - This->baseShader.reg_maps.shader_version.minor <= 3) { + if (pshader) + { + if (reg_maps->shader_version.major == 1 + && reg_maps->shader_version.minor <= 3) + { /* In ps <= 1.3, Tx is a temporary register as destination to all instructions, * and as source to most instructions. For some instructions it is the texcoord * input. Those instructions know about the special use @@ -1082,7 +1086,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if(This->baseShader.reg_maps.shader_version.major == 1 || ctx->target_version >= NV2) + if (reg_maps->shader_version.major == 1 || ctx->target_version >= NV2) { sprintf(register_name, "A%u", reg->idx); } @@ -1101,7 +1105,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction else { if(ctx->cur_ps_args->super.srgb_correction) FIXME("sRGB correction on higher render targets\n"); - if(This->baseShader.reg_maps.highest_render_target > 0) + if (reg_maps->highest_render_target > 0) { sprintf(register_name, "result.color[%u]", reg->idx); } @@ -1134,7 +1138,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if(This->baseShader.reg_maps.shader_version.major < 3) + if (reg_maps->shader_version.major < 3) { strcpy(register_name, ctx->texcrd_output[reg->idx]); }

1 0

Travis Athougies : d3dcompiler_43/tests: Added HLSL test suite.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 7c56eb88729d7c12313985e48fca7fc7aa0f2737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c56eb88729d7c12313985e48… Author: Travis Athougies <iammisc(a)gmail.com> Date: Sun Oct 24 23:54:20 2010 -0700 d3dcompiler_43/tests: Added HLSL test suite. --- dlls/d3dcompiler_43/tests/Makefile.in | 5 +- dlls/d3dcompiler_43/tests/hlsl.c | 368 +++++++++++++++++++++++++++++++++ 2 files changed, 371 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c56eb88729d7c1231398…

1 0

Vincent Povirk : mscoree: Implement LoadLibraryShim.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 1682a92dd5552ce2996a9a002fe86adff20fdbe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1682a92dd5552ce2996a9a002… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 27 10:51:19 2010 -0500 mscoree: Implement LoadLibraryShim. --- dlls/mscoree/metahost.c | 17 +++++++++++++++-- dlls/mscoree/mscoree_main.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/mscoree/mscoree_private.h | 2 ++ dlls/mscoree/tests/mscoree.c | 2 +- 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 57fce37..0f28788 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -249,9 +249,17 @@ static HRESULT WINAPI CLRRuntimeInfo_LoadErrorString(ICLRRuntimeInfo* iface, static HRESULT WINAPI CLRRuntimeInfo_LoadLibrary(ICLRRuntimeInfo* iface, LPCWSTR pwzDllName, HMODULE *phndModule) { - FIXME("%p %s %p\n", iface, debugstr_w(pwzDllName), phndModule); + WCHAR version[MAX_PATH]; + HRESULT hr; + DWORD cchBuffer; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(pwzDllName), phndModule); + + cchBuffer = MAX_PATH; + hr = ICLRRuntimeInfo_GetVersionString(iface, version, &cchBuffer); + if (FAILED(hr)) return hr; + + return LoadLibraryShim(pwzDllName, version, NULL, phndModule); } static HRESULT WINAPI CLRRuntimeInfo_GetProcAddress(ICLRRuntimeInfo* iface, @@ -947,3 +955,8 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, return CLR_E_SHIM_RUNTIME; } + +HRESULT force_get_runtime_info(ICLRRuntimeInfo **result) +{ + return IUnknown_QueryInterface((IUnknown*)&runtimes[0], &IID_ICLRRuntimeInfo, (void**)result); +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index a57d766..9c91112 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -549,10 +549,42 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST HRESULT WINAPI LoadLibraryShim( LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE * phModDll) { - FIXME("(%p %s, %p, %p, %p): semi-stub\n", szDllName, debugstr_w(szDllName), szVersion, pvReserved, phModDll); + HRESULT ret=S_OK; + WCHAR dll_filename[MAX_PATH]; + WCHAR version[MAX_PATH]; + static const WCHAR default_version[] = {'v','1','.','1','.','4','3','2','2',0}; + static const WCHAR slash[] = {'\\',0}; + DWORD dummy; - if (phModDll) *phModDll = LoadLibraryW(szDllName); - return S_OK; + TRACE("(%p %s, %p, %p, %p)\n", szDllName, debugstr_w(szDllName), szVersion, pvReserved, phModDll); + + if (!szDllName || !phModDll) + return E_POINTER; + + if (!get_install_root(dll_filename)) + { + ERR("error reading registry key for installroot\n"); + dll_filename[0] = 0; + } + else + { + if (!szVersion) + { + ret = GetCORVersion(version, MAX_PATH, &dummy); + if (SUCCEEDED(ret)) + szVersion = version; + else + szVersion = default_version; + } + strcatW(dll_filename, szVersion); + strcatW(dll_filename, slash); + } + + strcatW(dll_filename, szDllName); + + *phModDll = LoadLibraryW(dll_filename); + + return *phModDll ? S_OK : E_HANDLE; } HRESULT WINAPI LockClrVersion(FLockClrVersionCallback hostCallback, FLockClrVersionCallback *pBeginHostSetup, FLockClrVersionCallback *pEndHostSetup) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 6273b82..62fa0bf 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -48,6 +48,8 @@ typedef struct CLRRuntimeInfo extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result); +extern HRESULT force_get_runtime_info(ICLRRuntimeInfo **result); + /* Mono 2.6 embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly; diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index cafd8d8..6426ac6 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -241,7 +241,7 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(nosuchdll, latest, NULL, &hdll); - todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr)) FreeLibrary(hdll);

1 0

Charles Davis : kernel32/tests: Add a test for opening short paths of differing case.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 2d18a012a8cc0058509f4afcb0d325c505780b6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d18a012a8cc0058509f4afcb… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 27 21:58:55 2010 -0600 kernel32/tests: Add a test for opening short paths of differing case. --- dlls/kernel32/tests/path.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0065ebf..2775ab1 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -555,6 +555,28 @@ static void test_CleanupPathA(CHAR *origdir, CHAR *curdir) ok(RemoveDirectoryA(curdir),"RemoveDirectoryA failed\n"); } +/* test that short path name functions work regardless of case */ +static void test_ShortPathCase(const char *tmpdir, const char *dirname, + const char *filename) +{ + char buf[MAX_PATH], shortbuf[MAX_PATH]; + HANDLE hndl; + int i; + + snprintf(buf,sizeof(buf),"%s\\%s\\%s",tmpdir,dirname,filename); + GetShortPathNameA(buf,shortbuf,sizeof(shortbuf)); + hndl = CreateFileA(shortbuf,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); + ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed (%d)\n",GetLastError()); + CloseHandle(hndl); + /* Now for the real test */ + for(i=0;i<strlen(shortbuf);i++) + if (i % 2) + shortbuf[i] = toupper(shortbuf[i]); + hndl = CreateFileA(shortbuf,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); + ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed (%d)\n",GetLastError()); + CloseHandle(hndl); +} + /* This routine will test Get(Full|Short|Long)PathNameA */ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) { @@ -878,6 +900,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) sprintf(tmpstr,"Long File %c",funny_chars[i]); test_FunnyChars(curdir,curdir_short,tmpstr,valid,tmpstr1); } + /* Now try it on mixed case short names */ + test_ShortPathCase(curdir,SHORTDIR,LONGFILE); + test_ShortPathCase(curdir,LONGDIR,SHORTFILE); + test_ShortPathCase(curdir,LONGDIR,LONGFILE); } static void test_GetTempPathA(char* tmp_dir)

1 0