March 2015 - Wine-commits - list.winehq.org

Francois Gouget : localui: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: ddddd79aec608542653bec9a518eb7a950a4339e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddddd79aec608542653bec9a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:32:19 2015 +0100 localui: Remove an uneeded NONAMELESSUNION directive. --- dlls/localui/localui.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 382e2db..4ea653e 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -20,8 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Francois Gouget : mapi32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 548f986e2516ebc811f9c647e482af709e1c3eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548f986e2516ebc811f9c647e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:32:38 2015 +0100 mapi32: Remove unneeded NONAMELESSXXX directives. --- dlls/mapi32/imalloc.c | 3 +-- dlls/mapi32/prop.c | 3 +-- dlls/mapi32/util.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index eec81b6..90f29a1 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -21,8 +21,7 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index ce122a3..530c41e 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -19,8 +19,7 @@ */ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index c94e3cf..1d16a33 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -23,8 +23,7 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winreg.h"

1 0

Francois Gouget : mmdevapi: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 1ba0d43b6e8a306f259bc8f20a27f8692700c998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba0d43b6e8a306f259bc8f20… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:32:47 2015 +0100 mmdevapi: Remove an uneeded NONAMELESSUNION directive. --- dlls/mmdevapi/audiovolume.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 4cc3226..194cfa3 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define NONAMELESSUNION #define COBJMACROS #include "config.h"

1 0

Francois Gouget : mmsystem.dll16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: b295ba36ac374cb3d4f4c9b075ce85334190d82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b295ba36ac374cb3d4f4c9b07… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:33:01 2015 +0100 mmsystem.dll16: Remove unneeded NONAMELESSXXX directives. --- dlls/mmsystem.dll16/mci16.c | 2 -- dlls/mmsystem.dll16/mmio16.c | 2 -- dlls/mmsystem.dll16/mmsystem.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 2ad82a6..b356a44 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -23,8 +23,6 @@ #include <string.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index df28a66..366d4a5 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -22,8 +22,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index fe8f587..fdf1318 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -30,7 +30,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "mmsystem.h"

1 0

Francois Gouget : winecoreaudio.drv: The drv_keyW variable is unused so remove it.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 04a260faa258ff8e74d9a5714a2ee50f1e048e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a260faa258ff8e74d9a5714… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:35:47 2015 +0100 winecoreaudio.drv: The drv_keyW variable is unused so remove it. --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f8ca7b7..60ff3d9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -192,9 +192,6 @@ typedef struct _SessionMgr { IMMDevice *device; } SessionMgr; -static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v',0}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v','\\','d','e','v','i','c','e','s',0};

1 0

Francois Gouget : wshom.ocx: Make enum_thread_wnd_proc() static.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: ef9d3f1181e6963ea3ad0aac42695a5af99bacd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9d3f1181e6963ea3ad0aac4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:49:45 2015 +0100 wshom.ocx: Make enum_thread_wnd_proc() static. --- dlls/wshom.ocx/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 97781a5..826e290 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -254,7 +254,7 @@ static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) return E_NOTIMPL; } -BOOL CALLBACK enum_thread_wnd_proc(HWND hwnd, LPARAM lParam) +static BOOL CALLBACK enum_thread_wnd_proc(HWND hwnd, LPARAM lParam) { INT *count = (INT*)lParam;

1 0

Stefan Dösinger : d3d9: Correct ColorFill validation.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: d25cc9695bfe9a2a735fbbd69c87b6702edc5dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25cc9695bfe9a2a735fbbd69… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 12 10:55:15 2015 +0100 d3d9: Correct ColorFill validation. --- dlls/d3d9/device.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a80b30a..da462b1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1287,18 +1287,22 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, wined3d_resource = wined3d_surface_get_resource(surface_impl->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &desc); - /* This method is only allowed with surfaces that are render targets, or - * offscreen plain surfaces in D3DPOOL_DEFAULT. */ - if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3D_POOL_DEFAULT) + if (desc.pool != WINED3D_POOL_DEFAULT) { wined3d_mutex_unlock(); - WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n"); + WARN("Colorfill is not allowed on surfaces in pool %#x, returning D3DERR_INVALIDCALL.\n", desc.pool); return D3DERR_INVALIDCALL; } - - if (desc.pool != WINED3D_POOL_DEFAULT && desc.pool != WINED3D_POOL_SYSTEM_MEM) + if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE) + { + wined3d_mutex_unlock(); + WARN("Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + if (desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { - WARN("Color-fill not allowed on surfaces in pool %#x.\n", desc.pool); + wined3d_mutex_unlock(); + WARN("Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; }

1 0

Stefan Dösinger : d3d9/tests: Relax the fog range test a bit.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: c5fdc1670b46dd4c1836b296559abe60e5dab1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fdc1670b46dd4c1836b2965… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 12 10:55:17 2015 +0100 d3d9/tests: Relax the fog range test a bit. --- dlls/d3d9/tests/visual.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 34ba3da..a345af1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1009,10 +1009,10 @@ static void fog_test(void) }, untransformed_3[] = { - {-1.0f, -1.0f, 0.4999f, 0xffff0000, 0xff000000}, - {-1.0f, 1.0f, 0.4999f, 0xffff0000, 0xff000000}, - { 1.0f, -1.0f, 0.4999f, 0xffff0000, 0xff000000}, - { 1.0f, 1.0f, 0.4999f, 0xffff0000, 0xff000000}, + {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + {-1.0f, 1.0f, 0.5f, 0xffff0000, 0xff000000}, + { 1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + { 1.0f, 1.0f, 0.5f, 0xffff0000, 0xff000000}, }, far_quad1[] = { @@ -1429,15 +1429,12 @@ static void fog_test(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_RANGEFOGENABLE, TRUE); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); - /* z=0.4999, set the fogstart to 0.5 and fogend slightly higher. If range fog - * is not used, the fog coordinate will be equal to fogstart and the quad not - * fogged. If range fog is used the fog coordinate will be slightly higher and - * the fog coordinate will be > fogend, so we get a fully fogged quad. The fog - * is calculated per vertex and interpolated, so even the center of the screen - * where the difference doesn't matter will be fogged, but check the corners in - * case a d3d/gl implementation decides to calculate the fog factor per fragment */ - start = 0.5f; - end = 0.50001f; + /* z=0.5, x = +/- 1.0, y = +/- 1.0. In case of z fog the fog coordinate is + * 0.5. With range fog it is sqrt(x*x + y*y + z*z) = 1.5 for all vertices. + * Note that the fog coordinate is interpolated linearly across the vertices, + * so the different eye distance at the screen center should not matter. */ + start = 0.75f; + end = 0.75001f; hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end));

1 0

Alexandre Julliard : msvcp60: Merge I/ O stream code with msvcp90 where possible to reduce the differences.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 402a72a07aef28aba2327baea8e8f20b08cc15ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=402a72a07aef28aba2327baea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 13:14:03 2015 +0900 msvcp60: Merge I/O stream code with msvcp90 where possible to reduce the differences. --- dlls/msvcp60/ios.c | 992 +++++++++++++++++++++++++++++++++++++++------------ dlls/msvcp60/msvcp.h | 2 + dlls/msvcp90/ios.c | 44 ++- 3 files changed, 809 insertions(+), 229 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=402a72a07aef28aba2327…

1 0

Alexandre Julliard : msvcp60: Add MSVCP prefix on more string functions.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: c54fa4fc8db75643642a743bfb08f1bf34992e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54fa4fc8db75643642a743bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 14:34:45 2015 +0900 msvcp60: Add MSVCP prefix on more string functions. --- dlls/msvcp60/msvcp60.spec | 872 ++++++++++++++++++++++---------------------- dlls/msvcp60/string.c | 900 +++++++++++++++++++++++----------------------- 2 files changed, 886 insertions(+), 886 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c54fa4fc8db75643642a7…

1 0