September 2013 - Wine-Commits

Henri Verbeet : d3d10: Avoid LPCSTR.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 708615056ceca237cab1301cf385b720ec602e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708615056ceca237cab1301cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:12 2013 +0200 d3d10: Avoid LPCSTR. --- dlls/d3d10/d3d10_main.c | 6 +- dlls/d3d10/effect.c | 111 +++++++++++++++++++++--------------------- dlls/d3d10/shader.c | 4 +- include/d3d10.idl | 10 ++-- include/d3d10_1shader.h | 6 +- include/d3d10effect.h | 122 +++++++++++++++++++++++----------------------- include/d3d10shader.h | 30 ++++++------ include/d3dcommon.idl | 4 +- 8 files changed, 148 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=708615056ceca237cab13…

1 0

Henri Verbeet : ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_set_render_target ().
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 2cc421f59d0e25a69dd876fd0438af2b2aba4a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc421f59d0e25a69dd876fd0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:11 2013 +0200 ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_set_render_target(). --- dlls/ddraw/device.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9f537c1..3f3cb18 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1796,6 +1796,15 @@ static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, ID (IDirect3DViewport3 **)viewport); } +static BOOL validate_surface_palette(struct ddraw_surface *surface) +{ + return !(surface->surface_desc.u4.ddpfPixelFormat.dwFlags + & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 + | DDPF_PALETTEINDEXEDTO8)) + || wined3d_surface_get_palette(surface->wined3d_surface); +} + static HRESULT d3d_device_set_render_target(struct d3d_device *device, struct ddraw_surface *target, IUnknown *rt_iface) { @@ -1803,6 +1812,13 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, wined3d_mutex_lock(); + if (!validate_surface_palette(target)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + if (device->rt_iface == rt_iface) { TRACE("No-op SetRenderTarget operation, not doing anything\n"); @@ -6752,11 +6768,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_INVALIDCAPS; } - if ((target->surface_desc.u4.ddpfPixelFormat.dwFlags - & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 - | DDPF_PALETTEINDEXEDTO8)) - && !wined3d_surface_get_palette(target->wined3d_surface)) + if (!validate_surface_palette(target)) { WARN("Surface %p has an indexed pixel format, but no palette.\n", target); return DDERR_NOPALETTEATTACHED;

1 0

Roderick Colenbrander : winex11: Support GLX_MESA_swap_control for WGL_EXT_swap_control.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: af58ccebbaeaa732a678a42081afb5d2bad47148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af58ccebbaeaa732a678a4208… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 14 19:57:39 2013 -0700 winex11: Support GLX_MESA_swap_control for WGL_EXT_swap_control. --- dlls/winex11.drv/opengl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5ec33c8..e28302e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -258,7 +258,8 @@ enum glx_swap_control_method { GLX_SWAP_CONTROL_NONE, GLX_SWAP_CONTROL_EXT, - GLX_SWAP_CONTROL_SGI + GLX_SWAP_CONTROL_SGI, + GLX_SWAP_CONTROL_MESA }; /* X context to associate a struct gl_drawable to an hwnd */ @@ -404,6 +405,7 @@ static void (*pglXFreeMemoryNV)(GLvoid *pointer); /* MESA GLX Extensions */ static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); +static int (*pglXSwapIntervalMESA)(unsigned int interval); /* Standard OpenGL */ static void (*pglFinish)(void); @@ -650,6 +652,8 @@ static BOOL has_opengl(void) LOAD_FUNCPTR(glXCreateContextAttribsARB); /* EXT GLX Extension */ LOAD_FUNCPTR(glXSwapIntervalEXT); + /* MESA GLX Extension */ + LOAD_FUNCPTR(glXSwapIntervalMESA); /* SGI GLX Extension */ LOAD_FUNCPTR(glXSwapIntervalSGI); /* NV GLX Extension */ @@ -2963,6 +2967,10 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) ret = !X11DRV_check_error(); break; + case GLX_SWAP_CONTROL_MESA: + ret = !pglXSwapIntervalMESA(interval); + break; + case GLX_SWAP_CONTROL_SGI: /* wglSwapIntervalEXT considers an interval value of zero to mean that * vsync should be disabled, but glXSwapIntervalSGI considers such a @@ -3146,6 +3154,10 @@ static void X11DRV_WineGL_LoadExtensions(void) has_swap_control_tear = TRUE; } } + else if (has_extension( WineGLInfo.glxExtensions, "GLX_MESA_swap_control")) + { + swap_control_method = GLX_SWAP_CONTROL_MESA; + } else if (has_extension( WineGLInfo.glxExtensions, "GLX_SGI_swap_control")) { swap_control_method = GLX_SWAP_CONTROL_SGI;

1 0

Henri Verbeet : ddraw: Verify that the surface is in video memory in d3d_device_create().
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 4f899571617d3cde94da2e9b54cc53557784b956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f899571617d3cde94da2e9b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:10 2013 +0200 ddraw: Verify that the surface is in video memory in d3d_device_create(). --- dlls/ddraw/device.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 210a522..9f537c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6762,6 +6762,12 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_NOPALETTEATTACHED; } + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target); + return D3DERR_SURFACENOTINVIDMEM; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Piotr Caban : msvcrt: Don' t use CDECL calling convention in MSVCRT_wcsrtombs_l (internal function).
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 1f1624612e45d4ff6330fc3acb82db30bf906ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1624612e45d4ff6330fc3ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 18 09:25:26 2013 +0200 msvcrt: Don't use CDECL calling convention in MSVCRT_wcsrtombs_l (internal function). --- dlls/msvcrt/wcs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index dca6a3d..60eae92 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -392,7 +392,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, /********************************************************************* * wcsrtombs_l (INTERNAL) */ -static MSVCRT_size_t CDECL MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcstr, +static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo;

1 0

Henri Verbeet : ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_create ().
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: c69cd599a394a8e54094679e1551391f5b0ce3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69cd599a394a8e54094679e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:09 2013 +0200 ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_create(). --- dlls/ddraw/device.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7510ed8..210a522 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6752,6 +6752,16 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_INVALIDCAPS; } + if ((target->surface_desc.u4.ddpfPixelFormat.dwFlags + & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 + | DDPF_PALETTEINDEXEDTO8)) + && !wined3d_surface_get_palette(target->wined3d_surface)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target); + return DDERR_NOPALETTEATTACHED; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Jacek Caban : winetest: Added a binary file that has no known MIME type.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: tools Branch: master Commit: 6fb74a2f0458c41c31ed0535ca2ba7dd3ce85c3d URL: http://source.winehq.org/git/tools.git/?a=commit;h=6fb74a2f0458c41c31ed0535… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 15:43:39 2013 +0200 winetest: Added a binary file that has no known MIME type. --- winetest/tests/file.winetest | Bin 0 -> 4839 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/winetest/tests/file.winetest b/winetest/tests/file.winetest new file mode 100644 index 0000000..b42dec0 Binary files /dev/null and b/winetest/tests/file.winetest differ

1 0

Piotr Caban : msvcrt: Fix loop condition when printing Inf or NaN.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: bffc240b4eab673b0d30c112551f540c5c4f2a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffc240b4eab673b0d30c1125… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 15:23:39 2013 +0200 msvcrt: Fix loop condition when printing Inf or NaN. --- dlls/msvcrt/printf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index dd36f59..96e7845 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -594,7 +594,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API static const char inf_str[] = "#INF"; static const char ind_str[] = "#IND"; - for(i=1; i<=sizeof(inf ? inf_str : ind_str); i++) { + for(i=1; i<(inf ? sizeof(inf_str) : sizeof(ind_str)); i++) { if(decimal_point[i]<'0' || decimal_point[i]>'9') break;

1 0

Piotr Caban : msvcrt: Don't forward strstr to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 019c34ca1ebc9cae7e334e8e08edea2d2f5f9f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019c34ca1ebc9cae7e334e8e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:46:07 2013 +0200 msvcrt: Don't forward strstr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 304881a..4de1722 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1437,7 +1437,7 @@ @ cdecl strpbrk(str str) ntdll.strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) ntdll.strstr +@ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 9232d63..d3bde66 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1735,3 +1735,11 @@ int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) { return MSVCRT__strnicmp_l(s1, s2, -1, NULL); } + +/********************************************************************* + * strstr (MSVCRT.@) + */ +char* __cdecl MSVCRT_strstr(const char *haystack, const char *needle) +{ + return strstr(haystack, needle); +}

1 0

Piotr Caban : msvcrt: Don't forward strrchr to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 138df7da33c6aa8aa3fa004a3dfe4f56923508ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=138df7da33c6aa8aa3fa004a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:53 2013 +0200 msvcrt: Don't forward strrchr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5445e3e..304881a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1435,7 +1435,7 @@ @ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(str long) MSVCRT_strnlen @ cdecl strpbrk(str str) ntdll.strpbrk -@ cdecl strrchr(str long) ntdll.strrchr +@ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) ntdll.strstr @ cdecl strtod(str ptr) MSVCRT_strtod diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 677db63..9232d63 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1650,6 +1650,14 @@ char* __cdecl MSVCRT_strchr(const char *str, int c) } /********************************************************************* + * strrchr (MSVCRT.@) + */ +char* __cdecl MSVCRT_strrchr(const char *str, int c) +{ + return strrchr(str, c); +} + +/********************************************************************* * memchr (MSVCRT.@) */ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n)

1 0