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

Alexandre Julliard : user32: Add support for 64-bit formats in wsprintf.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 4ec27a632de01b45464730510d23bb53e8426512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec27a632de01b45464730510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 12:40:46 2011 +0200 user32: Add support for 64-bit formats in wsprintf. --- dlls/user32/tests/wsprintf.c | 70 ++++++++++++++++++++++++++++++++++++----- dlls/user32/wsprintf.c | 72 +++++++++++++++++++++++++++++++----------- 2 files changed, 115 insertions(+), 27 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index bca16bd..5370df4 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -23,39 +23,93 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winnls.h" + +static const struct +{ + const char *fmt; + ULONGLONG value; + const char *res; +} i64_formats[] = +{ + { "%I64X", ((ULONGLONG)0x12345 << 32) | 0x67890a, "123450067890A" }, + { "%I32X", ((ULONGLONG)0x12345 << 32) | 0x67890a, "67890A" }, + { "%I64d", (ULONGLONG)543210 * 1000000, "543210000000" }, + { "%I64X", (LONGLONG)-0x12345, "FFFFFFFFFFFEDCBB" }, + { "%I32x", (LONGLONG)-0x12345, "fffedcbb" }, + { "%I64u", (LONGLONG)-123, "18446744073709551493" }, + { "%Id", (LONGLONG)-12345, "-12345" }, +#ifdef _WIN64 + { "%Ix", ((ULONGLONG)0x12345 << 32) | 0x67890a, "123450067890a" }, + { "%Ix", (LONGLONG)-0x12345, "fffffffffffedcbb" }, + { "%p", (LONGLONG)-0x12345, "FFFFFFFFFFFEDCBB" }, +#else + { "%Ix", ((ULONGLONG)0x12345 << 32) | 0x67890a, "67890a" }, + { "%Ix", (LONGLONG)-0x12345, "fffedcbb" }, + { "%p", (LONGLONG)-0x12345, "FFFEDCBB" }, +#endif +}; static void wsprintfATest(void) { char buf[25]; + unsigned int i; int rc; rc=wsprintfA(buf, "%010ld", -1); - ok(rc == 10, "wsPrintfA length failure: rc=%d error=%d\n",rc,GetLastError()); + ok(rc == 10, "wsprintfA length failure: rc=%d error=%d\n",rc,GetLastError()); ok((lstrcmpA(buf, "-000000001") == 0), "wsprintfA zero padded negative value failure: buf=[%s]\n",buf); + rc = wsprintfA(buf, "%I64X", (ULONGLONG)0); + if (rc == 4 && !lstrcmpA(buf, "I64X")) + { + win_skip( "I64 formats not supported\n" ); + return; + } + for (i = 0; i < sizeof(i64_formats)/sizeof(i64_formats[0]); i++) + { + rc = wsprintfA(buf, i64_formats[i].fmt, i64_formats[i].value); + ok(rc == strlen(i64_formats[i].res), "%u: wsprintfA length failure: rc=%d\n", i, rc); + ok(!strcmp(buf, i64_formats[i].res), "%u: wrong result [%s]\n", i, buf); + } } static void wsprintfWTest(void) { - static const WCHAR fmt[] = {'%','0','1','0','l','d','\0'}; - static const WCHAR target[] = {'-','0','0','0','0','0','0','0','0','1', '\0'}; - WCHAR buf[25]; + static const WCHAR fmt_010ld[] = {'%','0','1','0','l','d','\0'}; + static const WCHAR res_010ld[] = {'-','0','0','0','0','0','0','0','0','1', '\0'}; + static const WCHAR fmt_I64x[] = {'%','I','6','4','x',0}; + WCHAR buf[25], fmt[25], res[25]; + unsigned int i; int rc; - rc=wsprintfW(buf, fmt, -1); + rc=wsprintfW(buf, fmt_010ld, -1); if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("wsprintfW is not implemented\n"); return; } ok(rc == 10, "wsPrintfW length failure: rc=%d error=%d\n",rc,GetLastError()); - ok((lstrcmpW(buf, target) == 0), + ok((lstrcmpW(buf, res_010ld) == 0), "wsprintfW zero padded negative value failure\n"); + rc = wsprintfW(buf, fmt_I64x, (ULONGLONG)0 ); + if (rc == 4 && !lstrcmpW(buf, fmt_I64x + 1)) + { + win_skip( "I64 formats not supported\n" ); + return; + } + for (i = 0; i < sizeof(i64_formats)/sizeof(i64_formats[0]); i++) + { + MultiByteToWideChar( CP_ACP, 0, i64_formats[i].fmt, -1, fmt, sizeof(fmt)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, i64_formats[i].res, -1, res, sizeof(res)/sizeof(WCHAR) ); + rc = wsprintfW(buf, fmt, i64_formats[i].value); + ok(rc == lstrlenW(res), "%u: wsprintfW length failure: rc=%d\n", i, rc); + ok(!lstrcmpW(buf, res), "%u: wrong result [%s]\n", i, wine_dbgstr_w(buf)); + } } /* Test if the CharUpper / CharLower functions return true 16 bit results, - if the input is a 16 bit input value. Up to Wine 11-2003 the input value - 0xff returns 0xffffffff. */ + if the input is a 16 bit input value. */ static void CharUpperTest(void) { diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index 533c48a..fe20536 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); #define WPRINTF_SHORT 0x0010 /* Short arg ('h' prefix) */ #define WPRINTF_UPPER_HEX 0x0020 /* Upper-case hex ('X' specifier) */ #define WPRINTF_WIDE 0x0040 /* Wide arg ('w' prefix) */ +#define WPRINTF_INTPTR 0x0080 /* Pointer-size arg ('I' prefix) */ +#define WPRINTF_I64 0x0100 /* 64-bit arg ('I64' prefix) */ typedef enum { @@ -65,11 +67,11 @@ typedef struct } WPRINTF_FORMAT; typedef union { - WCHAR wchar_view; - CHAR char_view; - LPCSTR lpcstr_view; - LPCWSTR lpcwstr_view; - INT int_view; + WCHAR wchar_view; + CHAR char_view; + LPCSTR lpcstr_view; + LPCWSTR lpcwstr_view; + LONGLONG int_view; } WPRINTF_DATA; static const CHAR null_stringA[] = "(null)"; @@ -111,6 +113,12 @@ static INT WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res ) if (*p == 'l') { res->flags |= WPRINTF_LONG; p++; } else if (*p == 'h') { res->flags |= WPRINTF_SHORT; p++; } else if (*p == 'w') { res->flags |= WPRINTF_WIDE; p++; } + else if (*p == 'I') + { + if (p[1] == '6' && p[2] == '4') { res->flags |= WPRINTF_I64; p += 3; } + else if (p[1] == '3' && p[2] == '2') p += 3; + else { res->flags |= WPRINTF_INTPTR; p++; } + } switch(*p) { case 'c': @@ -133,8 +141,8 @@ static INT WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res ) res->type = WPR_UNSIGNED; break; case 'p': - res->width = 8; - res->flags |= WPRINTF_ZEROPAD; + res->width = 2 * sizeof(void *); + res->flags |= WPRINTF_ZEROPAD | WPRINTF_INTPTR; /* fall through */ case 'X': res->flags |= WPRINTF_UPPER_HEX; @@ -187,7 +195,13 @@ static INT WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res ) if (*p == 'l') { res->flags |= WPRINTF_LONG; p++; } else if (*p == 'h') { res->flags |= WPRINTF_SHORT; p++; } else if (*p == 'w') { res->flags |= WPRINTF_WIDE; p++; } - switch((CHAR)*p) + else if (*p == 'I') + { + if (p[1] == '6' && p[2] == '4') { res->flags |= WPRINTF_I64; p += 3; } + else if (p[1] == '3' && p[2] == '2') p += 3; + else { res->flags |= WPRINTF_INTPTR; p++; } + } + switch(*p) { case 'c': res->type = (res->flags & WPRINTF_SHORT) ? WPR_CHAR : WPR_WCHAR; @@ -209,8 +223,8 @@ static INT WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res ) res->type = WPR_UNSIGNED; break; case 'p': - res->width = 8; - res->flags |= WPRINTF_ZEROPAD; + res->width = 2 * sizeof(void *); + res->flags |= WPRINTF_ZEROPAD | WPRINTF_INTPTR; /* fall through */ case 'X': res->flags |= WPRINTF_UPPER_HEX; @@ -255,16 +269,32 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, if (len > maxlen) len = maxlen; return (format->precision = len); case WPR_SIGNED: - len = sprintf( number, "%d", arg->int_view ); - break; case WPR_UNSIGNED: - len = sprintf( number, "%u", (UINT)arg->int_view ); - break; case WPR_HEXA: - len = sprintf( number, - (format->flags & WPRINTF_UPPER_HEX) ? "%X" : "%x", - (UINT)arg->int_view); + { + const char *digits = (format->flags & WPRINTF_UPPER_HEX) ? "0123456789ABCDEF" : "0123456789abcdef"; + ULONGLONG num = arg->int_view; + int base = format->type == WPR_HEXA ? 16 : 10; + char buffer[20], *p = buffer, *dst = number; + + if (format->type == WPR_SIGNED && arg->int_view < 0) + { + *dst++ = '-'; + num = -arg->int_view; + } + if (format->flags & WPRINTF_INTPTR) num = (UINT_PTR)num; + else if (!(format->flags & WPRINTF_I64)) num = (UINT)num; + + do + { + *p++ = digits[num % base]; + num /= base; + } while (num); + while (p > buffer) *dst++ = *(--p); + *dst = 0; + len = dst - number; break; + } default: return 0; } @@ -315,7 +345,9 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list arg case WPR_HEXA: case WPR_SIGNED: case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); + if (format.flags & WPRINTF_INTPTR) argData.int_view = va_arg(args, INT_PTR); + else if (format.flags & WPRINTF_I64) argData.int_view = va_arg(args, LONGLONG); + else argData.int_view = va_arg(args, INT); break; default: argData.wchar_view = 0; @@ -418,7 +450,9 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a case WPR_HEXA: case WPR_SIGNED: case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); + if (format.flags & WPRINTF_INTPTR) argData.int_view = va_arg(args, INT_PTR); + else if (format.flags & WPRINTF_I64) argData.int_view = va_arg(args, LONGLONG); + else argData.int_view = va_arg(args, INT); break; default: argData.wchar_view = 0;

1 0

Henri Verbeet : wined3d: Store a pointer to the state table in the context.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: b09b7e323c386deb23110817dceaabd7f0de0aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09b7e323c386deb23110817d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 24 21:48:11 2011 +0200 wined3d: Store a pointer to the state table in the context. --- dlls/wined3d/arb_program_shader.c | 5 +++-- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 29 +++++++++++++++-------------- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 7 ++++--- 5 files changed, 25 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b09b7e323c386deb23110…

1 0

Dan Kegel : kernel32: Add initial test for DefineDosDevice.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: c63d085d1f0dd1d7c28aa7e17fbfd21180e24c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63d085d1f0dd1d7c28aa7e17… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jul 23 15:09:57 2011 -0700 kernel32: Add initial test for DefineDosDevice. --- dlls/kernel32/tests/volume.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index fb920f3..813ff0b 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -75,6 +75,40 @@ static void test_query_dos_deviceA(void) HeapFree( GetProcessHeap(), 0, buffer ); } +void test_define_dos_deviceA(void) +{ + char drivestr[3]; + char buf[MAX_PATH]; + DWORD ret; + + /* Find an unused drive letter */ + drivestr[1] = ':'; + drivestr[2] = 0; + for (drivestr[0] = 'a'; drivestr[0] <= 'z'; drivestr[0]++) { + ret = QueryDosDeviceA( drivestr, buf, sizeof(buf)); + if (!ret) break; + } + if (drivestr[0] > 'z') { + skip("can't test creating a dos drive, none available\n"); + return; + } + + /* Map it to point to the current directory */ + ret = GetCurrentDirectory(sizeof(buf), buf); + ok(ret, "GetCurrentDir\n"); + + ret = DefineDosDeviceA(0, drivestr, buf); + todo_wine + ok(ret, "Could not make drive %s point to %s! \n", drivestr, buf); + + if (!ret) { + skip("can't test removing fake drive\n"); + } else { + ret = DefineDosDeviceA(DDD_REMOVE_DEFINITION, drivestr, NULL); + ok(ret, "Could not remove fake drive %s!\n", drivestr); + } +} + static void test_FindFirstVolume(void) { char volume[51]; @@ -705,6 +739,7 @@ START_TEST(volume) pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW"); test_query_dos_deviceA(); + test_define_dos_deviceA(); test_FindFirstVolume(); test_GetVolumeNameForVolumeMountPointA(); test_GetVolumeNameForVolumeMountPointW();

1 0

Henri Verbeet : wined3d: Make the shader and ctx_priv parameters to shader_generate_glsl_declarations () const.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 68b9071329163af09e0e0957b3e9c7377a79a93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b9071329163af09e0e0957b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 24 21:48:10 2011 +0200 wined3d: Make the shader and ctx_priv parameters to shader_generate_glsl_declarations() const. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5694d4c..2fec8b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -918,8 +918,8 @@ static unsigned int vec4_varyings(DWORD shader_major, const struct wined3d_gl_in /** Generate the variable & register declarations for the GLSL output target */ static void shader_generate_glsl_declarations(const struct wined3d_context *context, - struct wined3d_shader_buffer *buffer, struct wined3d_shader *shader, - const struct wined3d_shader_reg_maps *reg_maps, struct shader_glsl_ctx_priv *ctx_priv) + struct wined3d_shader_buffer *buffer, const struct wined3d_shader *shader, + const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv) { const struct wined3d_state *state = &shader->device->stateBlock->state; const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args;

1 0

Henri Verbeet : wined3d: Get rid of the vpos_uniform field from the wined3d_pixel_shader structure.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 6a046eddd7c0f5a281e232469f9ec23a76de64f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a046eddd7c0f5a281e232469… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 24 21:48:09 2011 +0200 wined3d: Get rid of the vpos_uniform field from the wined3d_pixel_shader structure. --- dlls/wined3d/glsl_shader.c | 3 +-- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d421e65..5694d4c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -823,7 +823,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, } } - if (pshader->u.ps.vpos_uniform) + if (prog->ycorrection_location != -1) { float correction_params[4]; @@ -1043,7 +1043,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont + 1 < gl_info->limits.glsl_ps_float_constants) { shader_addline(buffer, "uniform vec4 ycorrection;\n"); - shader->u.ps.vpos_uniform = 1; extra_constants_needed++; } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77ea8c2..0de11a4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2566,7 +2566,6 @@ struct wined3d_pixel_shader unsigned int declared_in_count; /* Some information about the shader behavior */ - char vpos_uniform; BOOL color0_mov; DWORD color0_reg; };

1 0

Henri Verbeet : wined3d: Use the "rts" variable in context_apply_clear_state().
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 43d2515da566376e04e79152770354ef3d87a475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d2515da566376e04e791527… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 24 21:48:08 2011 +0200 wined3d: Use the "rts" variable in context_apply_clear_state(). --- dlls/wined3d/context.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 856ba38..d7a58a9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2076,7 +2076,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != &device->fb || rt_count != context->gl_info->limits.buffers) { - if (!context_validate_rt_config(rt_count, fb->render_targets, fb->depth_stencil)) + if (!context_validate_rt_config(rt_count, rts, fb->depth_stencil)) return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2085,7 +2085,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d ENTER_GL(); - if (!rt_count || surface_is_offscreen(fb->render_targets[0])) + if (!rt_count || surface_is_offscreen(rts[0])) { for (i = 0; i < rt_count; ++i) { @@ -2105,7 +2105,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d else { context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); - rt_mask = context_generate_rt_mask_from_surface(fb->render_targets[0]); + rt_mask = context_generate_rt_mask_from_surface(rts[0]); } LEAVE_GL(); @@ -2121,7 +2121,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && (!rt_count || surface_is_offscreen(fb->render_targets[0]))) + && (!rt_count || surface_is_offscreen(rts[0]))) { for (i = 0; i < rt_count; ++i) {

1 0

Francois Gouget : winegstreamer: Make GSTTf_QueryInterface() static.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 312036d3c872645c6b094f8479af830d04695282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=312036d3c872645c6b094f847… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 23 23:50:45 2011 +0200 winegstreamer: Make GSTTf_QueryInterface() static. --- dlls/winegstreamer/gsttffilter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index f173fa1..b113c4e 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -830,7 +830,7 @@ IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkout, HRESULT *ph return obj; } -HRESULT WINAPI GSTTf_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI GSTTf_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; GstTfImpl *This = (GstTfImpl*)iface;

1 0

Alexandre Julliard : makefiles: Install programs from the top-level makefile.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: fda8b65b9fd65c3e030de8f6cf7c06974501ffb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda8b65b9fd65c3e030de8f6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 9 21:04:23 2011 +0200 makefiles: Install programs from the top-level makefile. --- aclocal.m4 | 37 +++++++++++++++++++++++++++---------- configure | 37 +++++++++++++++++++++++++++---------- 2 files changed, 54 insertions(+), 20 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index c04d269..83ed0ad 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -418,13 +418,17 @@ wine_fn_config_program () ac_dir=programs/$ac_name ac_enable=$[2] ac_flags=$[3] - wine_fn_all_dir_rules $ac_dir programs/Makeprog.rules + ac_program=$ac_name + + case $ac_name in + *.*) ;; + *) ac_program=$ac_program.exe ;; + esac + + wine_fn_config_makefile $ac_dir $ac_enable "$ac_flags" programs/Makeprog.rules AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: $ac_dir -.PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile __builddeps__ dummy - @cd $ac_dir && \$(MAKE)" +"$ac_dir: __builddeps__" if test "x$enable_maintainer_mode" = xyes then @@ -445,19 +449,32 @@ $ac_dir: $ac_dir/Makefile __builddeps__ dummy wine_fn_has_flag install $ac_flags || return wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ ".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ -$ac_dir/__install__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install -$ac_dir/__uninstall__:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall install install-lib:: $ac_dir/__install__ __uninstall__: $ac_dir/__uninstall__" - if test -n "$DLLEXT" -a "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + + if test -n "$DLLEXT" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT + \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + + if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" + fi + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" fi]) } diff --git a/configure b/configure index 20080ec..cf880f3 100755 --- a/configure +++ b/configure @@ -14487,16 +14487,20 @@ wine_fn_config_program () ac_dir=programs/$ac_name ac_enable=$2 ac_flags=$3 - wine_fn_all_dir_rules $ac_dir programs/Makeprog.rules + ac_program=$ac_name + + case $ac_name in + *.*) ;; + *) ac_program=$ac_program.exe ;; + esac + + wine_fn_config_makefile $ac_dir $ac_enable "$ac_flags" programs/Makeprog.rules if eval test \"x\$"$ac_enable"\" = x"no"; then : else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: $ac_dir -.PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile __builddeps__ dummy - @cd $ac_dir && \$(MAKE)" +"$ac_dir: __builddeps__" if test "x$enable_maintainer_mode" = xyes then @@ -14517,19 +14521,32 @@ $ac_dir: $ac_dir/Makefile __builddeps__ dummy wine_fn_has_flag install $ac_flags || return wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ ".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ -$ac_dir/__install__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install -$ac_dir/__uninstall__:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall install install-lib:: $ac_dir/__install__ __uninstall__: $ac_dir/__uninstall__" - if test -n "$DLLEXT" -a "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + + if test -n "$DLLEXT" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT + \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + + if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" + fi + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" fi fi }

1 0

Alexandre Julliard : makefiles: Install dlls from the top-level makefile.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: bf8f435797cb1fdf756fa58c08a82f6715f6dda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8f435797cb1fdf756fa58c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 11:39:42 2011 +0200 makefiles: Install dlls from the top-level makefile. --- Makefile.in | 5 ++++- aclocal.m4 | 43 +++++++++++++++++++++++++++++-------------- configure | 43 +++++++++++++++++++++++++++++-------------- 3 files changed, 62 insertions(+), 29 deletions(-) diff --git a/Makefile.in b/Makefile.in index ae438b2..056754b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,7 +26,10 @@ EXTRASUBDIRS = \ programs # Destination directories for make install -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) +INSTALLDIRS = \ + $(DESTDIR)$(bindir) \ + $(DESTDIR)$(dlldir) \ + $(DESTDIR)$(fakedlldir) all: wine @echo "Wine build complete." diff --git a/aclocal.m4 b/aclocal.m4 index 01bfa77..c04d269 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -276,35 +276,50 @@ wine_fn_config_dll () ac_flags=$[3] ac_implib=${4:-$ac_name} ac_file=$ac_dir/lib$ac_implib + ac_dll=$ac_name ac_deps="tools/widl tools/winebuild tools/winegcc include" ac_implibflags="" case $ac_name in *16) ac_implibflags=" -m16" ;; + *.*) ;; + *) ac_dll=$ac_dll.dll ;; esac - wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules + wine_fn_config_makefile $ac_dir $ac_enable "$ac_flags" dlls/Makedll.rules AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too [test "$ac_enable" != enable_win16 || return 0], [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: $ac_dir -.PHONY: $ac_dir $ac_dir/__install__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ -$ac_dir: $ac_dir/Makefile __builddeps__ dummy - @cd $ac_dir && \$(MAKE) -$ac_dir/__install__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install -$ac_dir/__install-lib__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install-lib -$ac_dir/__uninstall__:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall -install:: $ac_dir/__install__ -install-lib:: $ac_dir/__install-lib__ -__uninstall__: $ac_dir/__uninstall__ +"$ac_dir: __builddeps__ manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) \$[@]" + if wine_fn_has_flag install-lib $ac_flags + then : + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +".PHONY: $ac_dir/__install-lib__ $ac_dir/__uninstall__ +install install-lib:: $ac_dir/__install-lib__ +__uninstall__: $ac_dir/__uninstall__" + if test -n "$DLLEXT" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" + fi + fi + if test "x$enable_maintainer_mode" = xyes then if wine_fn_has_flag mc $ac_flags diff --git a/configure b/configure index bf6540f..20080ec 100755 --- a/configure +++ b/configure @@ -14344,35 +14344,50 @@ wine_fn_config_dll () ac_flags=$3 ac_implib=${4:-$ac_name} ac_file=$ac_dir/lib$ac_implib + ac_dll=$ac_name ac_deps="tools/widl tools/winebuild tools/winegcc include" ac_implibflags="" case $ac_name in *16) ac_implibflags=" -m16" ;; + *.*) ;; + *) ac_dll=$ac_dll.dll ;; esac - wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules + wine_fn_config_makefile $ac_dir $ac_enable "$ac_flags" dlls/Makedll.rules if eval test \"x\$"$ac_enable"\" = x"no"; then : test "$ac_enable" != enable_win16 || return 0 else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: $ac_dir -.PHONY: $ac_dir $ac_dir/__install__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ -$ac_dir: $ac_dir/Makefile __builddeps__ dummy - @cd $ac_dir && \$(MAKE) -$ac_dir/__install__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install -$ac_dir/__install-lib__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install-lib -$ac_dir/__uninstall__:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall -install:: $ac_dir/__install__ -install-lib:: $ac_dir/__install-lib__ -__uninstall__: $ac_dir/__uninstall__ +"$ac_dir: __builddeps__ manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) \$@" + if wine_fn_has_flag install-lib $ac_flags + then : + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +".PHONY: $ac_dir/__install-lib__ $ac_dir/__uninstall__ +install install-lib:: $ac_dir/__install-lib__ +__uninstall__: $ac_dir/__uninstall__" + if test -n "$DLLEXT" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" + fi + fi + if test "x$enable_maintainer_mode" = xyes then if wine_fn_has_flag mc $ac_flags

1 0

Henri Verbeet : wined3d: Use gl_info from the context in context_apply_clear_state().
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: e5036e365e7221f45d8f7fe79c9ddcc581b6a5c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5036e365e7221f45d8f7fe79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 24 21:48:07 2011 +0200 wined3d: Use gl_info from the context in context_apply_clear_state(). --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3d17691..856ba38 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2074,7 +2074,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d struct wined3d_surface **rts = fb->render_targets; if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != &device->fb - || rt_count != device->adapter->gl_info.limits.buffers) + || rt_count != context->gl_info->limits.buffers) { if (!context_validate_rt_config(rt_count, fb->render_targets, fb->depth_stencil)) return FALSE;

1 0