April 2013 - Wine-commits - list.winehq.org

Stefan Leichter : msvcr80: Add some 64-bit only exports.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 47c6310e464ed82d66ec586ef883f28d479e34d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c6310e464ed82d66ec586ef… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Apr 21 23:02:38 2013 +0200 msvcr80: Add some 64-bit only exports. --- dlls/msvcr80/msvcr80.spec | 50 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 006204a..860383a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -151,14 +151,20 @@ @ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame +@ stub -arch=win64 _GetImageBase +@ stub -arch=win64 _GetThrowImageBase @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths @ cdecl _Gettnames() msvcrt._Gettnames @ extern _HUGE msvcrt._HUGE @ stub _IsExceptionObjectToBeDestroyed -@ stub _NLG_Dispatch2 -@ stub _NLG_Return -@ stub _NLG_Return2 +@ stub -arch=i386 _NLG_Dispatch2 +@ stub -arch=arm,win64 __NLG_Dispatch2 +@ stub -arch=i386 _NLG_Return +@ stub -arch=i386 _NLG_Return2 +@ stub -arch=arm,win64 __NLG_Return2 +@ stub -arch=win64 _SetImageBase +@ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) msvcrt._Strftime @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ stub __AdjustPointer @@ -210,8 +216,10 @@ @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias -@ stub ___fls_getvalue(a)4 -@ stub ___fls_setvalue(a)8 +@ stub -arch=i386 ___fls_getvalue(a)4 +@ stub -arch=x86_64 __fls_getvalue +@ stub -arch=i386 ___fls_setvalue(a)8 +@ stub -arch=x86_64 __fls_setvalue @ cdecl __fpecode() msvcrt.__fpecode @ stub __free_locale @ stub __get_app_type @@ -372,6 +380,7 @@ @ cdecl _chdir(str) msvcrt._chdir @ cdecl _chdrive(long) msvcrt._chdrive @ cdecl _chgsign(double) msvcrt._chgsign +@ cdecl -arch=arm,x86_64 _chgsignf(float) msvcrt._chgsignf @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize @@ -385,6 +394,7 @@ @ cdecl _controlfp(long long) msvcrt._controlfp @ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign(double double) msvcrt._copysign +@ cdecl -arch=arm,x86_64 _copysignf(float float) msvcrt._copysignf @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l @ stub _cprintf_p @@ -395,7 +405,8 @@ @ cdecl _cputws(wstr) msvcrt._cputws @ cdecl _creat(str long) msvcrt._creat @ cdecl _create_locale(long str) msvcrt._create_locale -@ stub _crt_debugger_hook +@ stub -arch=i386 _crt_debugger_hook +@ stub -arch=arm,win64 __crt_debugger_hook @ varargs _cscanf(str) msvcrt._cscanf @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l @ varargs _cscanf_s(str) msvcrt._cscanf_s @@ -469,10 +480,12 @@ @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite(double) msvcrt._finite +@ cdecl -arch=arm,x86_64 _finitef(float) msvcrt._finitef @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall @ extern _fmode msvcrt._fmode @ cdecl _fpclass(double) msvcrt._fpclass +# stub -arch=x86_64 _fpclassf @ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt @ cdecl _fpreset() msvcrt._fpreset @ stub _fprintf_l @@ -662,6 +675,7 @@ @ cdecl _ismbstrail(ptr ptr) msvcrt._ismbstrail @ stub _ismbstrail_l @ cdecl _isnan(double) msvcrt._isnan +@ cdecl -arch=arm,x86_64 _isnanf(float) msvcrt._isnanf @ cdecl _isprint_l(long ptr) msvcrt._isprint_l @ stub _ispunct_l @ cdecl _isspace_l(long ptr) msvcrt._isspace_l @@ -703,6 +717,7 @@ @ cdecl _lock_file(ptr) msvcrt._lock_file @ cdecl _locking(long long long) msvcrt._locking @ cdecl _logb(double) msvcrt._logb +@ cdecl -arch=arm,x86_64 _logbf(float) msvcrt._logbf @ cdecl -arch=i386 _longjmpex(ptr long) msvcrt._longjmpex @ cdecl _lrotl(long long) msvcrt._lrotl @ cdecl _lrotr(long long) msvcrt._lrotr @@ -865,6 +880,7 @@ @ cdecl _mktime64(ptr) msvcrt._mktime64 @ cdecl _msize(ptr) msvcrt._msize @ cdecl _nextafter(double double) msvcrt._nextafter +@ cdecl -arch=arm,x86_64 _nextafterf(float float) msvcrt._nextafterf @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle @@ -908,6 +924,7 @@ @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb(double long) msvcrt._scalb +@ cdecl -arch=arm,x86_64 _scalbf(float long) msvcrt._scalbf @ varargs _scanf_l(str ptr) msvcrt._scanf_l @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l @ varargs _scprintf(str) msvcrt._scprintf @@ -939,6 +956,7 @@ @ cdecl _seterrormode(long) msvcrt._seterrormode @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 +@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) msvcrt._setjmpex @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp @ cdecl _setmode(long long) msvcrt._setmode @@ -1281,11 +1299,15 @@ @ cdecl abort() msvcrt.abort @ cdecl abs(long) msvcrt.abs @ cdecl acos(double) msvcrt.acos +@ cdecl -arch=arm,x86_64 acosf(float) msvcrt.acosf @ cdecl asctime(ptr) msvcrt.asctime @ cdecl asctime_s(ptr long ptr) msvcrt.asctime_s @ cdecl asin(double) msvcrt.asin +@ cdecl -arch=arm,x86_64 asinf(float) msvcrt.asinf @ cdecl atan(double) msvcrt.atan +@ cdecl -arch=arm,x86_64 atanf(float) msvcrt.atanf @ cdecl atan2(double double) msvcrt.atan2 +@ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof @ cdecl atoi(str) msvcrt.atoi @@ -1295,14 +1317,18 @@ @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil +@ cdecl -arch=arm,x86_64 ceilf(float) msvcrt.ceilf @ cdecl clearerr(ptr) msvcrt.clearerr @ stub clearerr_s @ cdecl clock() msvcrt.clock @ cdecl cos(double) msvcrt.cos +@ cdecl -arch=arm,x86_64 cosf(float) msvcrt.cosf @ cdecl cosh(double) msvcrt.cosh +@ cdecl -arch=arm,x86_64 coshf(float) msvcrt.coshf @ cdecl -ret64 div(long long) msvcrt.div @ cdecl exit(long) msvcrt.exit @ cdecl exp(double) msvcrt.exp +@ cdecl -arch=arm,x86_64 expf(float) msvcrt.expf @ cdecl fabs(double) msvcrt.fabs @ cdecl fclose(ptr) msvcrt.fclose @ cdecl feof(ptr) msvcrt.feof @@ -1314,7 +1340,9 @@ @ cdecl fgetwc(ptr) msvcrt.fgetwc @ cdecl fgetws(ptr long ptr) msvcrt.fgetws @ cdecl floor(double) msvcrt.floor +@ cdecl -arch=arm,x86_64 floorf(float) msvcrt.floorf @ cdecl fmod(double double) msvcrt.fmod +@ cdecl -arch=arm,x86_64 fmodf(float float) msvcrt.fmodf @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf @@ -1378,7 +1406,9 @@ @ cdecl ldiv(long long) msvcrt.ldiv @ cdecl localeconv() msvcrt.localeconv @ cdecl log(double) msvcrt.log +@ cdecl -arch=arm,x86_64 logf(float) msvcrt.logf @ cdecl log10(double) msvcrt.log10 +@ cdecl -arch=arm,x86_64 log10f(float) msvcrt.log10f @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen @@ -1397,8 +1427,10 @@ @ cdecl memmove_s(ptr long ptr long) msvcrt.memmove_s @ cdecl memset(ptr long long) msvcrt.memset @ cdecl modf(double ptr) msvcrt.modf +@ cdecl -arch=arm,x86_64 modff(float ptr) msvcrt.modff @ cdecl perror(str) msvcrt.perror @ cdecl pow(double double) msvcrt.pow +@ cdecl -arch=arm,x86_64 powf(float float) msvcrt.powf @ varargs printf(str) msvcrt.printf @ varargs printf_s(str) msvcrt.printf_s @ cdecl putc(long ptr) msvcrt.putc @@ -1418,14 +1450,18 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal @ cdecl sin(double) msvcrt.sin +@ cdecl -arch=arm,x86_64 sinf(float) msvcrt.sinf @ cdecl sinh(double) msvcrt.sinh +@ cdecl -arch=arm,x86_64 sinhf(float) msvcrt.sinhf @ varargs sprintf(ptr str) msvcrt.sprintf @ varargs sprintf_s(ptr long str) msvcrt.sprintf_s @ cdecl sqrt(double) msvcrt.sqrt +@ cdecl -arch=arm,x86_64 sqrtf(float) msvcrt.sqrtf @ cdecl srand(long) msvcrt.srand @ varargs sscanf(str str) msvcrt.sscanf @ varargs sscanf_s(str str) msvcrt.sscanf_s @@ -1462,7 +1498,9 @@ @ varargs swscanf_s(wstr wstr) msvcrt.swscanf_s @ cdecl system(str) msvcrt.system @ cdecl tan(double) msvcrt.tan +@ cdecl -arch=arm,x86_64 tanf(float) msvcrt.tanf @ cdecl tanh(double) msvcrt.tanh +@ cdecl -arch=arm,x86_64 tanhf(float) msvcrt.tanhf @ cdecl tmpfile() msvcrt.tmpfile @ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam

1 0

Matteo Bruni : wined3d: Use ARB_internalformat_query2 for the other texture format caps too.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 197cdcc9ae025e3d81c9f849e2ea23a3b1e082d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197cdcc9ae025e3d81c9f849e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 19 19:06:14 2013 +0200 wined3d: Use ARB_internalformat_query2 for the other texture format caps too. --- dlls/wined3d/utils.c | 67 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 91f2ae1..4a4289c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1407,30 +1407,57 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->height_scale.numerator = 1; format->height_scale.denominator = 1; - if (!gl_info->limits.vertex_samplers) - format->flags &= ~WINED3DFMT_FLAG_VTF; - - if (!(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) - format->flags |= WINED3DFMT_FLAG_FILTERING; - else if (format->id != WINED3DFMT_R32G32B32A32_FLOAT && format->id != WINED3DFMT_R32_FLOAT) - format->flags &= ~WINED3DFMT_FLAG_VTF; - - if (format->glGammaInternal != format->glInternal) + if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { - /* Filter sRGB capabilities if EXT_texture_sRGB is not supported. */ - if (!gl_info->supported[EXT_TEXTURE_SRGB]) + query_format_flag(gl_info, format, format->glInternal, GL_VERTEX_TEXTURE, + WINED3DFMT_FLAG_VTF, "vertex texture usage"); + query_format_flag(gl_info, format, format->glInternal, GL_FILTER, + WINED3DFMT_FLAG_FILTERING, "filtering"); + + if (format->glGammaInternal != format->glInternal) { - format->glGammaInternal = format->glInternal; - format->flags &= ~(WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + query_format_flag(gl_info, format, format->glGammaInternal, GL_SRGB_READ, + WINED3DFMT_FLAG_SRGB_READ, "sRGB read"); + + if (srgb_write) + query_format_flag(gl_info, format, format->glGammaInternal, GL_SRGB_WRITE, + WINED3DFMT_FLAG_SRGB_WRITE, "sRGB write"); + else + format->flags &= ~WINED3DFMT_FLAG_SRGB_WRITE; + + if (!(format->flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) + format->glGammaInternal = format->glInternal; + else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + format->glInternal = format->glGammaInternal; } - else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + } + else + { + if (!gl_info->limits.vertex_samplers) + format->flags &= ~WINED3DFMT_FLAG_VTF; + + if (!(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) + format->flags |= WINED3DFMT_FLAG_FILTERING; + else if (format->id != WINED3DFMT_R32G32B32A32_FLOAT && format->id != WINED3DFMT_R32_FLOAT) + format->flags &= ~WINED3DFMT_FLAG_VTF; + + if (format->glGammaInternal != format->glInternal) { - format->glInternal = format->glGammaInternal; + /* Filter sRGB capabilities if EXT_texture_sRGB is not supported. */ + if (!gl_info->supported[EXT_TEXTURE_SRGB]) + { + format->glGammaInternal = format->glInternal; + format->flags &= ~(WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + } + else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + { + format->glInternal = format->glGammaInternal; + } } - } - if ((format->flags & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write) - format->flags &= ~WINED3DFMT_FLAG_SRGB_WRITE; + if ((format->flags & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write) + format->flags &= ~WINED3DFMT_FLAG_SRGB_WRITE; + } /* Texture conversion stuff */ format->convert = format_texture_info[i].convert; @@ -1563,6 +1590,10 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 }; BOOL filtered; + if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) + /* This was already handled by init_format_texture_info(). */ + return; + if(wined3d_settings.offscreen_rendering_mode != ORM_FBO) { WARN("No FBO support, or no FBO ORM, guessing filter info from GL caps\n");

1 0

Matteo Bruni : winex11.drv: Print the error in wglCreateContextAttribsARB() when context creation fails.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: d62e5874a93095504438b40dd4a4ac9d58961861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62e5874a93095504438b40dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 19 19:06:15 2013 +0200 winex11.drv: Print the error in wglCreateContextAttribsARB() when context creation fails. --- dlls/winex11.drv/opengl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 2313eca..6dd07fa 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1925,6 +1925,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg { struct wgl_context *ret = NULL; struct gl_drawable *gl; + int err = 0; TRACE("(%p %p %p)\n", hdc, hShareContext, attribList); @@ -1983,10 +1984,10 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); ret->ctx = create_glxcontext(gdi_display, ret, NULL); XSync(gdi_display, False); - if (X11DRV_check_error() || !ret->ctx) + if ((err = X11DRV_check_error()) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ - ERR("Context creation failed\n"); + ERR("Context creation failed (error %x)\n", err); HeapFree( GetProcessHeap(), 0, ret ); ret = NULL; }

1 0

Stefan Dösinger : wined3d: Remove leftover texture accesses in GLSL shader generation.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: f663683980f720caeb31cb658b70f50143323a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f663683980f720caeb31cb658… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 17 18:02:41 2012 +0100 wined3d: Remove leftover texture accesses in GLSL shader generation. --- dlls/wined3d/glsl_shader.c | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a88f701..6d4ef6b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -43,7 +43,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_GLSL_SAMPLE_PROJECTED 0x1 -#define WINED3D_GLSL_SAMPLE_RECT 0x2 +#define WINED3D_GLSL_SAMPLE_NPOT 0x2 #define WINED3D_GLSL_SAMPLE_LOD 0x4 #define WINED3D_GLSL_SAMPLE_GRAD 0x8 @@ -1861,7 +1861,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL shadow = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL && (((const struct shader_glsl_ctx_priv *)ctx->backend_data)->cur_ps_args->shadow & (1 << sampler_idx)); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; - BOOL texrect = flags & WINED3D_GLSL_SAMPLE_RECT; + BOOL texrect = flags & WINED3D_GLSL_SAMPLE_NPOT && gl_info->supported[ARB_TEXTURE_RECTANGLE]; BOOL lod = flags & WINED3D_GLSL_SAMPLE_LOD; BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; @@ -3449,15 +3449,13 @@ static void shader_glsl_ret(const struct wined3d_shader_instruction *ins) ********************************************/ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) { - const struct wined3d_shader *shader = ins->ctx->shader; - struct wined3d_device *device = shader->device; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); struct glsl_sample_function sample_function; - const struct wined3d_texture *texture; DWORD sample_flags = 0; DWORD sampler_idx; DWORD mask = 0, swizzle; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; /* 1.0-1.4: Use destination register as sampler source. * 2.0+: Use provided sampler source. */ @@ -3465,11 +3463,9 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) sampler_idx = ins->dst[0].reg.idx[0].offset; else sampler_idx = ins->src[1].reg.idx[0].offset; - texture = device->stateBlock->state.textures[sampler_idx]; if (shader_version < WINED3D_SHADER_VERSION(1,4)) { - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; DWORD flags = (priv->cur_ps_args->tex_transform >> sampler_idx * WINED3D_PSARGS_TEXTRANSFORM_SHIFT) & WINED3D_PSARGS_TEXTRANSFORM_MASK; enum wined3d_sampler_texture_type sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; @@ -3516,8 +3512,8 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) } } - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) - sample_flags |= WINED3D_GLSL_SAMPLE_RECT; + if (priv->cur_ps_args->np2_fixup & (1 << sampler_idx)) + sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; shader_glsl_get_sample_function(ins->ctx, sampler_idx, sample_flags, &sample_function); mask |= sample_function.coord_mask; @@ -3553,15 +3549,13 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { - const struct wined3d_shader *shader = ins->ctx->shader; - struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, dx_param, dy_param; DWORD sample_flags = WINED3D_GLSL_SAMPLE_GRAD; struct glsl_sample_function sample_function; DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - const struct wined3d_texture *texture; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4]) { @@ -3571,9 +3565,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) } sampler_idx = ins->src[1].reg.idx[0].offset; - texture = device->stateBlock->state.textures[sampler_idx]; - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) - sample_flags |= WINED3D_GLSL_SAMPLE_RECT; + if (priv->cur_ps_args->np2_fixup & (1 << sampler_idx)) + sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; shader_glsl_get_sample_function(ins->ctx, sampler_idx, sample_flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); @@ -3586,20 +3579,18 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { - const struct wined3d_shader *shader = ins->ctx->shader; - struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, lod_param; DWORD sample_flags = WINED3D_GLSL_SAMPLE_LOD; struct glsl_sample_function sample_function; DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - const struct wined3d_texture *texture; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; sampler_idx = ins->src[1].reg.idx[0].offset; - texture = device->stateBlock->state.textures[sampler_idx]; - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) - sample_flags |= WINED3D_GLSL_SAMPLE_RECT; + if (ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL + && priv->cur_ps_args->np2_fixup & (1 << sampler_idx)) + sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; shader_glsl_get_sample_function(ins->ctx, sampler_idx, sample_flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param);

1 0

Hans Leidekker : wininet: Fix a request string leak.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 578a1a6b26e62c1dcbda7cab5f3ea8815201c49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=578a1a6b26e62c1dcbda7cab5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 22 11:02:09 2013 +0200 wininet: Fix a request string leak. --- dlls/wininet/http.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 18279da..c28335a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4924,6 +4924,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->appInfo->proxyPassword, NULL)) { + heap_free(requestString); if(!drain_content(request, TRUE)) { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE);

1 0

Hans Leidekker : wininet: Don' t strip the port from URLs returned by InternetQueryOption( INTERNET_OPTION_URL).
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 6f78a63b5ba92bde07f73ad2eec89d52ce816a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f78a63b5ba92bde07f73ad2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 22 11:02:26 2013 +0200 wininet: Don't strip the port from URLs returned by InternetQueryOption(INTERNET_OPTION_URL). --- dlls/wininet/http.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c28335a..dab5dc4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2020,8 +2020,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe host = HTTP_GetHeader(req, hostW); strcpyW(url, httpW); strcatW(url, host->lpszValue); - if (NULL != (pch = strchrW(url + strlenW(httpW), ':'))) - *pch = 0; strcatW(url, req->path); TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url));

1 0

Hans Leidekker : wininet: Add support for INTERNET_OPTION_PROXY_USERNAME and INTERNET_OPTION_PROXY_PASSWORD .
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: bedf296a27d5689beb693637407829b0bd6d8a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedf296a27d5689beb6936374… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 22 11:02:50 2013 +0200 wininet: Add support for INTERNET_OPTION_PROXY_USERNAME and INTERNET_OPTION_PROXY_PASSWORD. --- dlls/wininet/http.c | 81 ++++++++++++---- dlls/wininet/internet.c | 12 +- dlls/wininet/tests/http.c | 225 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 285 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bedf296a27d5689beb693…

1 0

Hans Leidekker : wininet: Include the Proxy-Connection header in the keep-alive check.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 54df9c9101af1f1bd0739bdd99a4ecc0841c0818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54df9c9101af1f1bd0739bdd9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 22 11:03:22 2013 +0200 wininet: Include the Proxy-Connection header in the keep-alive check. --- dlls/wininet/http.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index aa3e461..9f01d0c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4607,8 +4607,9 @@ static void http_process_keep_alive(http_request_t *req) { int index; - index = HTTP_GetCustomHeaderIndex(req, szConnection, 0, FALSE); - if(index != -1) + if ((index = HTTP_GetCustomHeaderIndex(req, szConnection, 0, FALSE)) != -1) + req->netconn->keep_alive = !strcmpiW(req->custHeaders[index].lpszValue, szKeepAlive); + else if ((index = HTTP_GetCustomHeaderIndex(req, szProxy_Connection, 0, FALSE)) != -1) req->netconn->keep_alive = !strcmpiW(req->custHeaders[index].lpszValue, szKeepAlive); else req->netconn->keep_alive = !strcmpiW(req->version, g_szHttp1_1);

1 0

Dmitry Timoshkov : ntdll: Refuse to create new thread if the target process is being terminated.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 59a23fb42f0bd431d06ece753437187f6cbab264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a23fb42f0bd431d06ece753… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 22 18:33:22 2013 +0900 ntdll: Refuse to create new thread if the target process is being terminated. --- dlls/kernel32/tests/loader.c | 17 +++++++---------- dlls/ntdll/thread.c | 2 ++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 8d26678..38c059c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1183,7 +1183,6 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) /* manual call to LdrShutdownProcess doesn't prevent thread creation */ if (param && test_dll_phase != 4) { -todo_wine ok(!handle || broken(handle != 0) /* before win7 */, "CreateThread should fail\n"); if (!handle) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); @@ -1192,16 +1191,15 @@ todo_wine } else { - ok(handle != 0, "CreateThread error %d\n", GetLastError()); - ret = WaitForSingleObject(handle, 1000); /* FIXME: remove once Wine is fixed */ if (test_dll_phase == 4) todo_wine { - ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); - ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + ok(handle != 0, "CreateThread error %d\n", GetLastError()); } else { + ok(handle != 0, "CreateThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); } @@ -1218,7 +1216,6 @@ todo_wine /* manual call to LdrShutdownProcess doesn't prevent thread creation */ if (param && test_dll_phase != 4) { -todo_wine ok(!handle || broken(handle != 0) /* before win7 */, "CreateRemoteThread should fail\n"); if (!handle) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); @@ -1227,19 +1224,19 @@ todo_wine } else { - ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); - ret = WaitForSingleObject(handle, 1000); /* FIXME: remove once Wine is fixed */ if (test_dll_phase == 4) todo_wine { - ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); - ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); } else { + ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); } + CloseHandle(handle); } SetLastError(0xdeadbeef); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 01a8026..4499afa 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -461,6 +461,8 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * return result.create_thread.status; } + if (RtlDllShutdownInProgress()) return STATUS_ACCESS_DENIED; + if (server_pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; wine_server_send_fd( request_pipe[0] );

1 0

Michael Stefaniuc : sxs/tests: Avoid a magic constant.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: d71d7586678d2563211bd71b87886508beb8b597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71d7586678d2563211bd71b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 22 00:14:41 2013 +0200 sxs/tests: Avoid a magic constant. --- dlls/sxs/tests/cache.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index 37c9f69..d0c4817 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -104,17 +104,17 @@ static void test_QueryAssemblyInfo( void ) hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine2W, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == 0x80070490) /* winxp */, "got %08x\n", hr ); + broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine3W, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == 0x80070490) /* winxp */, "got %08x\n", hr ); + broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine4W, NULL ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine5W, NULL ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); GetWindowsDirectoryA( comctl_path1, MAX_PATH ); lstrcatA( comctl_path1, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef" ); @@ -141,7 +141,7 @@ static void test_QueryAssemblyInfo( void ) memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine5W, &info ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info);

1 0