July 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Only invalidate state for the current context in swapchain_blit().
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: c2ede1d4c895548918b007a81943d73929b6a54e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ede1d4c895548918b007a81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 26 19:52:45 2011 +0200 wined3d: Only invalidate state for the current context in swapchain_blit(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/swapchain.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9892791..b83dab5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1032,7 +1032,7 @@ static void context_enter(struct wined3d_context *context) } } -static void context_invalidate_state(struct wined3d_context *context, DWORD state) +void context_invalidate_state(struct wined3d_context *context, DWORD state) { DWORD rep = context->state_table[state].representative; DWORD idx; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5b065be..a7e61fb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -281,7 +281,6 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) { struct wined3d_surface *backbuffer = swapchain->back_buffers[0]; - struct wined3d_device *device = swapchain->device; UINT src_w = src_rect->right - src_rect->left; UINT src_h = src_rect->bottom - src_rect->top; GLenum gl_filter; @@ -309,16 +308,16 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); context_set_draw_buffer(context, GL_BACK); - device_invalidate_state(device, STATE_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); glDisable(GL_SCISSOR_TEST); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); /* Note that the texture is upside down */ gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, @@ -329,6 +328,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } else { + struct wined3d_device *device = swapchain->device; struct wined3d_context *context2; float tex_left = src_rect->left; float tex_top = src_rect->top; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7699b5..0bbe9d1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1245,6 +1245,7 @@ void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; +void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : rpcrt4/tests: Add a test about unmarshalling of an out-only structure.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 9d4e79e3823267a8b00e8b3433c5e6564b540600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4e79e3823267a8b00e8b343… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 11:51:24 2011 +0200 rpcrt4/tests: Add a test about unmarshalling of an out-only structure. --- dlls/rpcrt4/tests/server.c | 26 ++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 4dbe1ce..ced357c 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -340,6 +340,19 @@ int __cdecl s_sum_cpsc(cpsc_t *cpsc) return sum; } +int __cdecl s_get_cpsc(int n, cpsc_t *cpsc) +{ + static int array[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + int i, ret; + + cpsc->ca = array; + cpsc->a = min( 10, 2 * n ); + cpsc->b = 2; + cpsc->c = 1; + for (i = ret = 0; i < cpsc->a; i++) ret += cpsc->ca[i]; + return ret; +} + int __cdecl s_square_puint(puint_t p) { int n = atoi(p); @@ -1226,6 +1239,7 @@ array_tests(void) cs_t *cs; int n; int ca[5] = {1, -2, 3, -4, 5}; + int tmp[10]; doub_carr_t *dc; int *pi; pints_t api[5]; @@ -1293,6 +1307,18 @@ array_tests(void) cpsc.ca = c; ok(sum_cpsc(&cpsc) == 10, "RPC sum_cpsc\n"); + cpsc.ca = NULL; + ok(get_cpsc(5, &cpsc) == 45, "RPC sum_cpsc\n"); + ok( cpsc.a == 10, "RPC get_cpsc %u\n", cpsc.a ); + for (n = 0; n < 10; n++) ok( cpsc.ca[n] == n, "RPC get_cpsc[%d] = %d\n", n, cpsc.ca[n] ); + + memset( tmp, 0x33, sizeof(tmp) ); + cpsc.ca = tmp; + ok(get_cpsc(4, &cpsc) == 28, "RPC sum_cpsc\n"); + ok( cpsc.a == 8, "RPC get_cpsc %u\n", cpsc.a ); + ok( cpsc.ca == tmp, "RPC get_cpsc %p/%p\n", cpsc.ca, tmp ); + for (n = 0; n < 8; n++) ok( cpsc.ca[n] == n, "RPC get_cpsc[%d] = %d\n", n, cpsc.ca[n] ); + ok(sum_toplev_conf_2n(c, 3) == 15, "RPC sum_toplev_conf_2n\n"); ok(sum_toplev_conf_cond(c, 5, 6, 1) == 10, "RPC sum_toplev_conf_cond\n"); ok(sum_toplev_conf_cond(c, 5, 6, 0) == 15, "RPC sum_toplev_conf_cond\n"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 3be3f33..c7c7237 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -162,6 +162,7 @@ cpp_quote("#endif") int sum_cs(cs_t *cs); int sum_cps(cps_t *cps); int sum_cpsc(cpsc_t *cpsc); + int get_cpsc(int n, [out] cpsc_t *cpsc ); int sum_complex_array(int n, [size_is(n)] refpint_t pi[]); typedef [wire_marshal(int)] void *puint_t;

1 0

Frédéric Delanoy : cmd: Add help for setlocal/ endlocal commands.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 093547e1581e50da44d62d9a60e305a8a0bf2fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=093547e1581e50da44d62d9a6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 25 17:40:46 2011 +0200 cmd: Add help for setlocal/endlocal commands. --- po/ar.po | 100 +++++++++++++++++++++++++++------------------ po/bg.po | 100 +++++++++++++++++++++++++++------------------ po/ca.po | 100 +++++++++++++++++++++++++++------------------ po/cs.po | 101 +++++++++++++++++++++++++++------------------ po/da.po | 101 +++++++++++++++++++++++++++------------------ po/de.po | 101 +++++++++++++++++++++++++++------------------ po/el.po | 100 +++++++++++++++++++++++++++------------------ po/en.po | 102 +++++++++++++++++++++++++++------------------ po/en_US.po | 110 +++++++++++++++++++++++++++++++------------------ po/eo.po | 100 +++++++++++++++++++++++++++------------------ po/es.po | 101 +++++++++++++++++++++++++++------------------ po/fa.po | 100 +++++++++++++++++++++++++++------------------ po/fi.po | 100 +++++++++++++++++++++++++++------------------ po/fr.po | 105 ++++++++++++++++++++++++++++------------------- po/he.po | 101 +++++++++++++++++++++++++++------------------ po/hi.po | 100 +++++++++++++++++++++++++++------------------ po/hu.po | 100 +++++++++++++++++++++++++++------------------ po/it.po | 101 +++++++++++++++++++++++++++------------------ po/ja.po | 101 +++++++++++++++++++++++++++------------------ po/ko.po | 101 +++++++++++++++++++++++++++------------------ po/lt.po | 101 +++++++++++++++++++++++++++------------------ po/ml.po | 100 +++++++++++++++++++++++++++------------------ po/nb_NO.po | 101 +++++++++++++++++++++++++++------------------ po/nl.po | 101 +++++++++++++++++++++++++++------------------ po/or.po | 100 +++++++++++++++++++++++++++------------------ po/pa.po | 100 +++++++++++++++++++++++++++------------------ po/pl.po | 101 +++++++++++++++++++++++++++------------------ po/pt_BR.po | 101 +++++++++++++++++++++++++++------------------ po/pt_PT.po | 101 +++++++++++++++++++++++++++------------------ po/rm.po | 100 +++++++++++++++++++++++++++------------------ po/ro.po | 101 +++++++++++++++++++++++++++------------------ po/ru.po | 101 +++++++++++++++++++++++++++------------------ po/sk.po | 100 +++++++++++++++++++++++++++------------------ po/sl.po | 101 +++++++++++++++++++++++++++------------------ po/sr_RS(a)cyrillic.po | 100 +++++++++++++++++++++++++++------------------ po/sr_RS(a)latin.po | 100 +++++++++++++++++++++++++++------------------ po/sv.po | 101 +++++++++++++++++++++++++++------------------ po/te.po | 100 +++++++++++++++++++++++++++------------------ po/th.po | 100 +++++++++++++++++++++++++++------------------ po/tr.po | 101 +++++++++++++++++++++++++++------------------ po/uk.po | 101 +++++++++++++++++++++++++++------------------ po/wa.po | 100 +++++++++++++++++++++++++++------------------ po/wine.pot | 100 +++++++++++++++++++++++++++------------------ po/zh_CN.po | 100 +++++++++++++++++++++++++++------------------ po/zh_TW.po | 100 +++++++++++++++++++++++++++------------------ programs/cmd/cmd.rc | 14 ++++++ 46 files changed, 2704 insertions(+), 1847 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=093547e1581e50da44d62…

1 0

Marcus Meissner : dinput: const REFGUID is doubled const (Coverity).
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 011a817e65351cdcd7095469fb7bd2c252f6937d URL: http://source.winehq.org/git/wine.git/?a=commit;h=011a817e65351cdcd7095469f… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jul 26 17:43:09 2011 +0200 dinput: const REFGUID is doubled const (Coverity). --- dlls/dinput/dinput_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 37b4673..d07295d 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -874,7 +874,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { - static const REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; + static REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); DIDEVICEINSTANCEA didevi; @@ -945,7 +945,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { - static const REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; + static REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; IDirectInputImpl *This = impl_from_IDirectInput8W(iface); DIDEVICEINSTANCEW didevi;

1 0

Michael Mc Donnell : d3dx/tests: Fixed double free (valgrind).
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: d1e328a0f50d7bb8b213d362dc625700f2c65faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e328a0f50d7bb8b213d362d… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Tue Jul 26 14:51:45 2011 +0200 d3dx/tests: Fixed double free (valgrind). --- dlls/d3dx9_36/tests/mesh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 6522ff1..d4f4e3b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -5399,6 +5399,7 @@ static void test_convert_adjacency_to_point_reps(void) } HeapFree(GetProcessHeap(), 0, point_reps); + point_reps = NULL; if (i != 0) /* First mesh will be freed during cleanup */ mesh->lpVtbl->Release(mesh);

1 0

Piotr Caban : msvcrt: Fixed tmpnam and _wtmpname implementation.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 5e9ee3b909f04d0b2272edd86b0ad630d785203b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9ee3b909f04d0b2272edd86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 26 11:13:37 2011 +0200 msvcrt: Fixed tmpnam and _wtmpname implementation. --- dlls/msvcrt/file.c | 2 ++ dlls/msvcrt/main.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 385771e..f1af1b7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3683,6 +3683,7 @@ char * CDECL MSVCRT_tmpnam(char *s) { size = msvcrt_int_to_base32(tmpnam_unique++, tmpstr); memcpy(p, tmpstr, size); + p[size] = '\0'; if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND) break; @@ -3714,6 +3715,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_wtmpnam(MSVCRT_wchar_t *s) { size = msvcrt_int_to_base32_w(tmpnam_unique++, tmpstr); memcpy(p, tmpstr, size*sizeof(MSVCRT_wchar_t)); + p[size] = '\0'; if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND) break; diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 5d6e37a..45191cd 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -74,6 +74,8 @@ static inline void msvcrt_free_tls_mem(void) HeapFree(GetProcessHeap(),0,tls->strerror_buffer); HeapFree(GetProcessHeap(),0,tls->wcserror_buffer); HeapFree(GetProcessHeap(),0,tls->time_buffer); + HeapFree(GetProcessHeap(),0,tls->tmpnam_buffer); + HeapFree(GetProcessHeap(),0,tls->wtmpnam_buffer); if(tls->have_locale) { free_locinfo(tls->locinfo); free_mbcinfo(tls->mbcinfo);

1 0

Andrew Eikum : mmdevapi: Try loading multiple audio drivers from the registry.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 9fc0377f64c9ba62390bcd505492bf940e66aba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc0377f64c9ba62390bcd505… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 26 07:58:43 2011 -0500 mmdevapi: Try loading multiple audio drivers from the registry. --- dlls/mmdevapi/main.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index f65ea3a..b262e07 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -45,6 +45,7 @@ #include "mmdevapi.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); @@ -99,16 +100,26 @@ static BOOL init_driver(void) return TRUE; if(RegOpenKeyW(HKEY_CURRENT_USER, drv_key, &key) == ERROR_SUCCESS){ - WCHAR driver_name[256]; + WCHAR driver_name[256], *p, *next; DWORD size = sizeof(driver_name); if(RegQueryValueExW(key, drv_value, 0, NULL, (BYTE*)driver_name, - &size) == ERROR_SUCCESS){ - BOOL ret = load_driver(driver_name); + &size) == ERROR_SUCCESS && driver_name[0] != '\0'){ RegCloseKey(key); - if(!ret) - ERR("Failed to load driver: %s\n", wine_dbgstr_w(driver_name)); - return ret; + + for(next = p = driver_name; next; p = next + 1){ + next = strchrW(p, ','); + if(next) + *next = '\0'; + + if(load_driver(p)) + return TRUE; + + TRACE("Failed to load driver: %s\n", wine_dbgstr_w(driver_name)); + } + + ERR("No drivers in the registry loaded successfully!\n"); + return FALSE; } RegCloseKey(key);

1 0

Piotr Caban : msvcrt: Fix %f format handling in printf so it works with big floats.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: d7b5c0b14f00bc14bde8e4d2626203fc478fc035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b5c0b14f00bc14bde8e4d26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 26 12:41:46 2011 +0200 msvcrt: Fix %f format handling in printf so it works with big floats. --- dlls/msvcrt/printf.h | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index ca7870c..fa3bdef 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -535,6 +535,19 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API } else if(flags.Format && strchr("aeEfgG", flags.Format)) { char float_fmt[20], buf_a[32], *tmp = buf_a, *decimal_point; int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; + double val = pf_args(args_ctx, pos, VT_R8, valist).get_double; + + if(flags.Format=='f') { + if(val>-10.0 && val<10.0) + i = 1; + else + i = 1 + log10(val<0 ? -val : val); + /* Default precision is 6, additional space for sign, separator and nullbyte is required */ + i += (flags.Precision==-1 ? 6 : flags.Precision) + 3; + + if(i > max_len) + max_len = i; + } if(max_len > sizeof(buf_a)) tmp = HeapAlloc(GetProcessHeap(), 0, max_len); @@ -543,7 +556,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API FUNC_NAME(pf_rebuild_format_string)(float_fmt, &flags); - sprintf(tmp, float_fmt, pf_args(args_ctx, pos, VT_R8, valist).get_double); + sprintf(tmp, float_fmt, val); if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') FUNC_NAME(pf_fixup_exponent)(tmp);

1 0

Jacek Caban : mshtml: Fixed tests on some old IEs.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 7c04ed36a463bc5ffdab6d748e5f9c1c6e03a591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c04ed36a463bc5ffdab6d748… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 12:56:59 2011 +0200 mshtml: Fixed tests on some old IEs. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index b33c8c8..3309a73 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2988,6 +2988,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember case 1026: case 1027: case 1034: + case 1035: case 1037: case 1047: case 1045:

1 0

Jacek Caban : urlmon: Store URI host len in parse_ipv4address before further parsing.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 8fcf7013bccbcdf6f26781f1e319b7591efa2ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcf7013bccbcdf6f26781f1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 13:57:50 2011 +0200 urlmon: Store URI host len in parse_ipv4address before further parsing. --- dlls/urlmon/tests/uri.c | 25 +++++++++++++++++++++++++ dlls/urlmon/uri.c | 6 +++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a11b9d0..2fe67c2 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -997,6 +997,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "http://127.0.0.1:8000", 0, S_OK, FALSE, + { + {"http://127.0.0.1:8000/",S_OK}, + {"127.0.0.1:8000",S_OK}, + {"http://127.0.0.1:8000/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"127.0.0.1",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://127.0.0.1:8000",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_IPV4,S_OK,FALSE}, + {8000,S_OK,FALSE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, /* Make sure it normalizes partial IPv4 addresses correctly. */ { "http://127.0/", 0, S_OK, FALSE, { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9928070..5dfa8b8 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1493,6 +1493,9 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) data->has_implicit_ip = TRUE; } + data->host_len = *ptr - data->host; + data->host_type = Uri_HOST_IPV4; + /* Check if what we found is the only part of the host name (if it isn't * we don't have an IPv4 address). */ @@ -1511,9 +1514,6 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) return FALSE; } - data->host_len = *ptr - data->host; - data->host_type = Uri_HOST_IPV4; - TRACE("(%p %p %x): IPv4 address found. host=%s host_len=%d host_type=%d\n", ptr, data, flags, debugstr_wn(data->host, data->host_len), data->host_len, data->host_type);

1 0