August 2011 - Wine-commits - list.winehq.org

Hans Leidekker : dnsapi: Mark some test results as broken and conform to the more recent behavior.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: d04d2efacf2fb4e134a6a971540547a6376016d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d2efacf2fb4e134a6a9715… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:22:48 2011 +0200 dnsapi: Mark some test results as broken and conform to the more recent behavior. --- dlls/dnsapi/name.c | 6 ------ dlls/dnsapi/tests/name.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index 3262050..c14c8a0 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -193,8 +193,6 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) { case DnsNameDomain: { - if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) - return DNS_ERROR_NUMERIC_NAME; if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) return DNS_ERROR_NON_RFC_NAME; if ((state & HAS_SPACE) || @@ -214,8 +212,6 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) } case DnsNameHostnameFull: { - if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) - return DNS_ERROR_NUMERIC_NAME; if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) return DNS_ERROR_NON_RFC_NAME; if ((state & HAS_SPACE) || @@ -226,8 +222,6 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) case DnsNameHostnameLabel: { if (state & HAS_DOT) return ERROR_INVALID_NAME; - if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) - return DNS_ERROR_NUMERIC_NAME; if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) return DNS_ERROR_NON_RFC_NAME; if ((state & HAS_SPACE) || diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index d472687..2872c35 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -32,6 +32,7 @@ static const struct LPCSTR name; DNS_NAME_FORMAT format; DNS_STATUS status; + DNS_STATUS status_broken; } test_data[] = { @@ -47,8 +48,8 @@ test_data[] = { "a.*", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, { "a ", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, { "a._b", DnsNameDomain, DNS_ERROR_NON_RFC_NAME }, - { "123", DnsNameDomain, DNS_ERROR_NUMERIC_NAME }, - { "123.456", DnsNameDomain, DNS_ERROR_NUMERIC_NAME }, + { "123", DnsNameDomain, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, + { "123.456", DnsNameDomain, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "a.b", DnsNameDomain, ERROR_SUCCESS }, { "", DnsNameDomainLabel, ERROR_INVALID_NAME }, @@ -79,8 +80,8 @@ test_data[] = { "e.*", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, { "e ", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, { "e._f", DnsNameHostnameFull, DNS_ERROR_NON_RFC_NAME }, - { "789", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME }, - { "789.456", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME }, + { "789", DnsNameHostnameFull, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, + { "789.456", DnsNameHostnameFull, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "e.f", DnsNameHostnameFull, ERROR_SUCCESS }, { "", DnsNameHostnameLabel, ERROR_INVALID_NAME }, @@ -93,7 +94,7 @@ test_data[] = { "*", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, { "g ", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, { "_g", DnsNameHostnameLabel, DNS_ERROR_NON_RFC_NAME }, - { "123", DnsNameHostnameLabel, DNS_ERROR_NUMERIC_NAME }, + { "123", DnsNameHostnameLabel, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "123.456", DnsNameHostnameLabel, ERROR_INVALID_NAME }, { "g.h", DnsNameHostnameLabel, ERROR_INVALID_NAME }, @@ -146,8 +147,8 @@ static void test_DnsValidateName_A( void ) for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++) { status = DnsValidateName_A( test_data[i].name, test_data[i].format ); - ok( status == test_data[i].status, "%d: \'%s\': got %d, expected %d\n", - i, test_data[i].name, status, test_data[i].status ); + ok( status == test_data[i].status || broken(status == test_data[i].status_broken), + "%d: \'%s\': got %d, expected %d\n", i, test_data[i].name, status, test_data[i].status ); } }

1 0

Henri Verbeet : wined3d: Use draw_binding in arbfp_blit_surface().
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 317d76abb4a4ce227643c491dbee190c17c12413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=317d76abb4a4ce227643c491d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:09 2011 +0200 wined3d: Use draw_binding in arbfp_blit_surface(). --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 24c0ff2..1d5b0c4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7247,7 +7247,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, context_release(context); - surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Use draw_binding in device_clear_render_targets().
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 99da66429b349831213e0722022bea693598ead6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99da66429b349831213e07220… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:10 2011 +0200 wined3d: Use draw_binding in device_clear_render_targets(). --- dlls/wined3d/device.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cdc1827..3a3692b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -668,7 +668,9 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { for (i = 0; i < rt_count; ++i) { - if (fb->render_targets[i]) surface_load_location(fb->render_targets[i], SFLAG_INDRAWABLE, NULL); + struct wined3d_surface *rt = fb->render_targets[i]; + if (rt) + surface_load_location(rt, rt->draw_binding, NULL); } } @@ -727,7 +729,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (flags & WINED3DCLEAR_ZBUFFER) { - surface_modify_location(fb->depth_stencil, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(fb->depth_stencil, fb->depth_stencil->draw_binding, TRUE); glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); @@ -740,7 +742,10 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { for (i = 0; i < rt_count; ++i) { - if (fb->render_targets[i]) surface_modify_location(fb->render_targets[i], SFLAG_INDRAWABLE, TRUE); + struct wined3d_surface *rt = fb->render_targets[i]; + + if (rt) + surface_modify_location(rt, rt->draw_binding, TRUE); } glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);

1 0

Henri Verbeet : wined3d: Use draw_binding in wined3d_surface_blt().
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4673330cf41e1a92b9c335f08430a4d1dedbeeea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4673330cf41e1a92b9c335f08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:11 2011 +0200 wined3d: Use draw_binding in wined3d_surface_blt(). --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cc581d2..dea13f8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1686,9 +1686,9 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC TRACE("Using FBO blit.\n"); surface_blt_fbo(device, filter, - src_surface, SFLAG_INDRAWABLE, &src_rect, - dst_surface, SFLAG_INDRAWABLE, &dst_rect); - surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); + src_surface, src_surface->draw_binding, &src_rect, + dst_surface, dst_surface->draw_binding, &dst_rect); + surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Make the device parameter to drawStridedSlow() const.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 22f5d0081f374d3774a1f57dfc5dfe8f7fe4c150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f5d0081f374d3774a1f57df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:12 2011 +0200 wined3d: Make the device parameter to drawStridedSlow() const. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ea2dd8f..dde71b4 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -65,7 +65,7 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit */ /* GL locking is done by the caller */ -static void drawStridedSlow(struct wined3d_device *device, const struct wined3d_context *context, +static void drawStridedSlow(const struct wined3d_device *device, const struct wined3d_context *context, const struct wined3d_stream_info *si, UINT NumVertexes, GLenum glPrimType, const void *idxData, UINT idxSize, UINT startIdx) {

1 0

Henri Verbeet : wined3d: Make the ctx parameter to WineD3D_ReleaseFakeGLContext() const.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: a88611210fc96859b8c3250fc197c8c54c8f016d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88611210fc96859b8c3250fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:13 2011 +0200 wined3d: Make the ctx parameter to WineD3D_ReleaseFakeGLContext() const. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7a659ee..b9cd3ad 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -261,7 +261,7 @@ struct wined3d_fake_gl_ctx HGLRC restore_gl_ctx; }; -static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) { TRACE_(d3d_caps)("Destroying fake GL context.\n");

1 0

Henri Verbeet : wined3d: Make the gl_info parameter to wined3d_guess_gl_vendor() const.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: f80301e3e6cc262ac27221933a607ce9022e446d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80301e3e6cc262ac27221933… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:14 2011 +0200 wined3d: Make the gl_info parameter to wined3d_guess_gl_vendor() const. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b9cd3ad..48d27af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1362,7 +1362,8 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) return MAKEDWORD_VERSION(major, minor); } -static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl_info, const char *gl_vendor_string, const char *gl_renderer) +static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_info *gl_info, + const char *gl_vendor_string, const char *gl_renderer) { /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from

1 0

Robert Millan : configure: Add GNU/kFreeBSD detection.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 535a55ec9eff83ac1cdf58a6514f4a76cab46a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535a55ec9eff83ac1cdf58a65… Author: Robert Millan <rmh(a)debian.org> Date: Tue Aug 23 20:39:45 2011 +0200 configure: Add GNU/kFreeBSD detection. --- configure | 2 +- configure.ac | 2 +- libs/wine/ldt.c | 2 +- tools/winebuild/main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 1c453cf..1497bdb 100755 --- a/configure +++ b/configure @@ -6854,7 +6854,7 @@ eval ac_res=\$$as_ac_var $as_echo "$ac_res" >&6; } if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then : case $host_os in - freebsd*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; esac diff --git a/configure.ac b/configure.ac index e6bbb2a..11d22b9 100644 --- a/configure.ac +++ b/configure.ac @@ -824,7 +824,7 @@ case $host_os in *i[[3456789]]86* | x86_64) WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], [case $host_os in - freebsd*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; esac ]) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 3098061..4e48b16 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -384,7 +384,7 @@ unsigned short wine_ldt_alloc_fs(void) if (errno != ENOSYS) perror( "set_thread_area" ); } else global_fs_sel = (ldt_info.entry_number << 3) | 3; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) global_fs_sel = GSEL( GUFS_SEL, SEL_UPL ); #endif } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 55908d5..0eeeb04 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -65,7 +65,7 @@ enum target_cpu target_cpu = CPU_ARM; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) enum target_platform target_platform = PLATFORM_FREEBSD; #elif defined(__sun) enum target_platform target_platform = PLATFORM_SOLARIS;

1 0

André Hentschel : wininet: Test and fix possible error situations for InternetQueryOption with INTERNET_OPTION_PROXY .
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 37cdf6bd2609690a42d7c7b8b47a5572290642d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37cdf6bd2609690a42d7c7b8b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 23 21:01:44 2011 +0200 wininet: Test and fix possible error situations for InternetQueryOption with INTERNET_OPTION_PROXY. --- dlls/wininet/internet.c | 1 + dlls/wininet/tests/http.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cf555c7..79ec790 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -802,6 +802,7 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe } case INTERNET_OPTION_PROXY: + if(!size) return ERROR_INVALID_PARAMETER; if (unicode) { INTERNET_PROXY_INFOW *pi = (INTERNET_PROXY_INFOW *)buffer; DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2110dec..f3e85cb 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2697,6 +2697,27 @@ static void test_options(int port) ok(ret, "InternetQueryOption failed %u\n", GetLastError()); ok(ctx == 3, "expected 3 got %lu\n", ctx); + /* INTERNET_OPTION_PROXY */ + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, &ctx, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + size = 0; + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size >= sizeof(INTERNET_PROXY_INFOA), "expected size to be greater or equal to the struct size\n"); + InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses);

1 0

Alexander Morozov : cryptui: Disable some buttons if a certificate is not selected.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4b6b0fe6815b8979fe2375b8a1afefa03a29de23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6b0fe6815b8979fe2375b8a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Aug 8 19:39:07 2011 +0400 cryptui: Disable some buttons if a certificate is not selected. --- dlls/cryptui/main.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 23f247e..15e71d5 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1164,20 +1164,19 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; case LVN_ITEMCHANGED: { - NMITEMACTIVATE *nm; + WCHAR empty[] = { 0 }; + NMITEMACTIVATE *nm = (NMITEMACTIVATE*)lp; HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0); - nm = (NMITEMACTIVATE*)lp; - if (nm->uNewState & LVN_ITEMACTIVATE) - { - int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0); - - EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), numSelected > 0); - EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), numSelected > 0); - EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), numSelected == 1); - if (numSelected == 1) - cert_mgr_show_cert_usages(hwnd, nm->iItem); - } + EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), numSelected > 0); + EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), numSelected > 0); + EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), numSelected == 1); + if (numSelected == 1) + cert_mgr_show_cert_usages(hwnd, nm->iItem); + else + SendMessageW(GetDlgItem(hwnd, IDC_MGR_PURPOSES), WM_SETTEXT, 0, + (LPARAM)empty); break; } case NM_DBLCLK:

1 0