January 2014 - Wine-Commits

Stefan Dösinger : wined3d: Use the map binding to optimize sysmem->sysmem blits.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 28bfc2058903793d87097941cc12f00f14e0c3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bfc2058903793d87097941c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:00 2014 +0100 wined3d: Use the map binding to optimize sysmem->sysmem blits. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 54891ac..7023bd7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6216,8 +6216,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC { /* In principle this would apply to depth blits as well, but we don't * implement those in the CPU blitter at the moment. */ - if ((dst_surface->flags & SFLAG_INSYSMEM) - && (!src_surface || (src_surface->flags & SFLAG_INSYSMEM))) + if ((dst_surface->flags & dst_surface->map_binding) + && (!src_surface || (src_surface->flags & src_surface->map_binding))) { if (scale) TRACE("Not doing sysmem blit because of scaling.\n");

1 0

Dmitry Timoshkov : secur32: Slightly simplify the GetUserNameExW implementation.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: bc59d7e8303a45d7356f3972d1d8e9478552fde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc59d7e8303a45d7356f3972d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 13 19:07:31 2014 +0900 secur32: Slightly simplify the GetUserNameExW implementation. --- dlls/secur32/secur32.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index acb09cf..867fa2c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1096,16 +1096,16 @@ BOOLEAN WINAPI GetUserNameExA( BOOLEAN WINAPI GetUserNameExW( EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) { - BOOLEAN status; - WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1]; - LPWSTR out; - DWORD len; TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); switch (NameFormat) { case NameSamCompatible: { + WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1]; + LPWSTR out; + DWORD len; + /* This assumes the current user is always a local account */ len = MAX_COMPUTERNAME_LENGTH + 1; if (GetComputerNameW(samname, &len)) @@ -1115,25 +1115,20 @@ BOOLEAN WINAPI GetUserNameExW( len = UNLEN + 1; if (GetUserNameW(out, &len)) { - status = (lstrlenW(samname) < *nSize); - if (status) + if (lstrlenW(samname) < *nSize) { lstrcpyW(lpNameBuffer, samname); *nSize = lstrlenW(samname); + return TRUE; } - else - { - SetLastError(ERROR_MORE_DATA); - *nSize = lstrlenW(samname) + 1; - } + + SetLastError(ERROR_MORE_DATA); + *nSize = lstrlenW(samname) + 1; } - else - status = FALSE; } - else - status = FALSE; + return FALSE; } - break; + case NameUnknown: case NameFullyQualifiedDN: case NameDisplay: @@ -1144,14 +1139,12 @@ BOOLEAN WINAPI GetUserNameExW( case NameServicePrincipal: case NameDnsDomain: SetLastError(ERROR_NONE_MAPPED); - status = FALSE; - break; + return FALSE; + default: SetLastError(ERROR_INVALID_PARAMETER); - status = FALSE; + return FALSE; } - - return status; } BOOLEAN WINAPI TranslateNameA(

1 0

Stefan Dösinger : wined3d: Move map binding loading to wined3d_surface_map.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 4ca8f7104f429df245eab6373ad0e82eb61703d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca8f7104f429df245eab6373… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:03 2014 +0100 wined3d: Move map binding loading to wined3d_surface_map. --- dlls/wined3d/surface.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a3c3ebf..0c83a0e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -820,23 +820,6 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - surface_prepare_map_memory(surface); - if (flags & WINED3D_MAP_DISCARD) - { - TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); - surface_validate_location(surface, surface->map_binding); - } - else - { - if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) - WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); - - surface_load_location(surface, surface->map_binding); - } - - if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - surface_invalidate_location(surface, ~surface->map_binding); - switch (surface->map_binding) { case SFLAG_INUSERMEM: @@ -3205,6 +3188,24 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } } + surface_prepare_map_memory(surface); + if (flags & WINED3D_MAP_DISCARD) + { + TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", + debug_surflocation(surface->map_binding)); + surface_validate_location(surface, surface->map_binding); + } + else + { + if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); + + surface_load_location(surface, surface->map_binding); + } + + if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) + surface_invalidate_location(surface, ~surface->map_binding); + base_memory = surface->surface_ops->surface_map(surface, rect, flags); if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH)

1 0

Dmitry Timoshkov : taskschd/tests: Add some tests for ITaskService:: Connect.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 55ad9da91f04001351b805675d12e2ffb72cef44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ad9da91f04001351b805675… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 13 19:07:04 2014 +0900 taskschd/tests: Add some tests for ITaskService::Connect. --- configure | 1 + configure.ac | 1 + dlls/taskschd/tests/Makefile.in | 5 ++ dlls/taskschd/tests/scheduler.c | 118 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 125 insertions(+) diff --git a/configure b/configure index 573bb96..7255985 100755 --- a/configure +++ b/configure @@ -17068,6 +17068,7 @@ wine_fn_config_dll system.drv16 enable_win16 wine_fn_config_dll t2embed enable_t2embed wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean +wine_fn_config_test dlls/taskschd/tests taskschd_test wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic wine_fn_config_dll twain.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index a4f0063..dcabb55 100644 --- a/configure.ac +++ b/configure.ac @@ -3121,6 +3121,7 @@ WINE_CONFIG_DLL(system.drv16,enable_win16) WINE_CONFIG_DLL(t2embed) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) +WINE_CONFIG_TEST(dlls/taskschd/tests) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) WINE_CONFIG_DLL(twain.dll16,enable_win16) diff --git a/dlls/taskschd/tests/Makefile.in b/dlls/taskschd/tests/Makefile.in new file mode 100644 index 0000000..63424da --- /dev/null +++ b/dlls/taskschd/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = taskschd.dll +IMPORTS = oleaut32 ole32 + +C_SRCS = \ + scheduler.c diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c new file mode 100644 index 0000000..9b99258 --- /dev/null +++ b/dlls/taskschd/tests/scheduler.c @@ -0,0 +1,118 @@ +/* + * Copyright 2014 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "taskschd.h" + +#include <wine/test.h> + +static void test_Connect(void) +{ + static const WCHAR deadbeefW[] = { 'd','e','a','d','b','e','e','f',0 }; + WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len; + HRESULT hr; + BSTR bstr; + VARIANT v_null, v_comp; + VARIANT_BOOL vbool; + ITaskService *service; + + hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_TaskScheduler) error %#x\n", hr); + return; + } + + vbool = 0xdead; + hr = ITaskService_get_Connected(service, &vbool); +todo_wine + ok(hr == S_OK, "get_Connected error %#x\n", hr); +todo_wine + ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + + hr = ITaskService_get_TargetServer(service, &bstr); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#x\n", hr); + + /* Win7 doesn't support UNC \\ prefix, but according to a user + * comment on MSDN Win8 supports both ways. + */ + len = sizeof(comp_name)/sizeof(comp_name[0]); + GetComputerNameW(comp_name, &len); + + V_VT(&v_null) = VT_NULL; + + V_VT(&v_comp) = VT_BSTR; + V_BSTR(&v_comp) = SysAllocString(comp_name); + + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); +todo_wine + ok(hr == S_OK || hr == E_ACCESSDENIED /* not an administrator */, "Connect error %#x\n", hr); + + SysFreeString(V_BSTR(&v_comp)); + V_BSTR(&v_comp) = SysAllocString(deadbeefW); + + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "expected ERROR_BAD_NETPATH, got %#x\n", hr); + + vbool = 0xdead; + hr = ITaskService_get_Connected(service, &vbool); +todo_wine + ok(hr == S_OK, "get_Connected error %#x\n", hr); +todo_wine + ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); +todo_wine + ok(hr == S_OK, "Connect error %#x\n", hr); + + vbool = 0xdead; + hr = ITaskService_get_Connected(service, &vbool); +todo_wine + ok(hr == S_OK, "get_Connected error %#x\n", hr); +todo_wine + ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + + hr = ITaskService_get_TargetServer(service, &bstr); +todo_wine + ok(hr == S_OK, "get_TargetServer error %#x\n", hr); + if (hr == S_OK) + { + ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } + SysFreeString(V_BSTR(&v_comp)); +} + +START_TEST(scheduler) +{ + OleInitialize(NULL); + + test_Connect(); + + OleUninitialize(); +}

1 0

Akihiro Sagawa : gdi32/tests: Add more GetCharABCWidths tests for rotated font.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: b8f22f475586bda13a4b348695ddf3d520bdfa17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f22f475586bda13a4b34869… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:56 2014 +0900 gdi32/tests: Add more GetCharABCWidths tests for rotated font. --- dlls/gdi32/tests/font.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 54e32ad..28bec52 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1300,7 +1300,7 @@ static void test_GetCharABCWidths(void) memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); - lf.lfHeight = 20; + lf.lfHeight = 200; hfont = CreateFontIndirectA(&lf); /* test empty glyph's metrics */ @@ -1312,10 +1312,35 @@ static void test_GetCharABCWidths(void) ok(ret, "GetCharABCWidthsW should have succeeded\n"); ok(abcw[0].abcB == 1, "got %u\n", abcw[0].abcB); + /* 1) prepare unrotated font metrics */ + ret = pGetCharABCWidthsW(hdc, 'a', 'a', abcw); + ok(ret, "GetCharABCWidthsW should have succeeded\n"); + DeleteObject(SelectObject(hdc, hfont)); + + /* 2) get rotated font metrics */ + lf.lfEscapement = lf.lfOrientation = 900; + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + ret = pGetCharABCWidthsW(hdc, 'a', 'a', abc); + ok(ret, "GetCharABCWidthsW should have succeeded\n"); + + /* 3) compare ABC results */ + todo_wine { + ok(match_off_by_1(abcw[0].abcA, abc[0].abcA, FALSE), + "got %d, expected %d (A)\n", abc[0].abcA, abcw[0].abcA); + ok(match_off_by_1(abcw[0].abcB, abc[0].abcB, FALSE), + "got %d, expected %d (B)\n", abc[0].abcB, abcw[0].abcB); + ok(match_off_by_1(abcw[0].abcC, abc[0].abcC, FALSE), + "got %d, expected %d (C)\n", abc[0].abcC, abcw[0].abcC); + } + DeleteObject(SelectObject(hdc, hfont)); ReleaseDC(NULL, hdc); trace("ABC sign test for a variety of transforms:\n"); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = 20; hfont = CreateFontIndirectA(&lf); hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL);

1 0

Stefan Dösinger : wined3d: Start to split up surface_prepare_system_memory.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: e2c0bc63cb95b83386b192e6e130abbc9a0c8a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c0bc63cb95b83386b192e6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:02 2014 +0100 wined3d: Start to split up surface_prepare_system_memory. --- dlls/wined3d/surface.c | 35 ++++++++++++++++++++++++++--------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ac2241..a3c3ebf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,7 +589,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win context_release(context); } -void surface_prepare_system_memory(struct wined3d_surface *surface) +static void surface_prepare_system_memory(struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; @@ -597,8 +597,7 @@ void surface_prepare_system_memory(struct wined3d_surface *surface) if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO - || surface->user_memory)) + else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ @@ -611,6 +610,24 @@ void surface_prepare_system_memory(struct wined3d_surface *surface) } } +void surface_prepare_map_memory(struct wined3d_surface *surface) +{ + switch (surface->map_binding) + { + case SFLAG_INUSERMEM: + if (!surface->user_memory) + ERR("Map binding is set to SFLAG_INUSERMEM but surface->user_memory is NULL.\n"); + break; + + case SFLAG_INSYSMEM: + surface_prepare_system_memory(surface); + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + } +} + static void surface_evict_sysmem(struct wined3d_surface *surface) { if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) @@ -767,7 +784,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -803,7 +820,7 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); @@ -1392,7 +1409,7 @@ static void surface_unload(struct wined3d_resource *resource) } else { - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -2323,7 +2340,7 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it. */ - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ @@ -5024,7 +5041,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5034,7 +5051,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 090290f..897af19 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,7 +735,7 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub { struct wined3d_surface *surface = surface_from_resource(sub_resource); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce1711b..985f86f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2273,7 +2273,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; -void surface_prepare_system_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Make the callers of load_location responsible for allocating sysmem.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 676a7f2140aaefa50358001dbec89cc9a8d591e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=676a7f2140aaefa50358001db… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:01 2014 +0100 wined3d: Make the callers of load_location responsible for allocating sysmem. --- dlls/wined3d/surface.c | 12 ++++++++---- dlls/wined3d/texture.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7023bd7..5ac2241 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,7 +589,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win context_release(context); } -static void surface_prepare_system_memory(struct wined3d_surface *surface) +void surface_prepare_system_memory(struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; @@ -767,6 +767,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -802,10 +803,10 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); + surface_prepare_system_memory(surface); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); - surface_prepare_system_memory(surface); surface_validate_location(surface, surface->map_binding); } else @@ -1391,6 +1392,7 @@ static void surface_unload(struct wined3d_resource *resource) } else { + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -2321,6 +2323,7 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it. */ + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ @@ -4907,8 +4910,6 @@ static DWORD resource_access_from_location(DWORD location) static void surface_load_sysmem(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { - surface_prepare_system_memory(surface); - if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED)) surface_load_location(surface, SFLAG_INTEXTURE); @@ -5023,6 +5024,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5032,6 +5034,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5040,6 +5043,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); /* Lets hope we get it from somewhere... */ + surface_prepare_system_memory(surface); surface_load_location(surface, SFLAG_INSYSMEM); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f06db6d..090290f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,6 +735,7 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub { struct wined3d_surface *surface = surface_from_resource(sub_resource); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a57e11b..ce1711b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2273,6 +2273,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; +void surface_prepare_system_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Akihiro Sagawa : gdi32: Fix sub-pixel shift calculations for vertical writing.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: e9188970a78336358c7f160d78c5705ab230c974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9188970a78336358c7f160d7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:54 2014 +0900 gdi32: Fix sub-pixel shift calculations for vertical writing. --- dlls/gdi32/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1c3e6fc..f8b365b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6790,7 +6790,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vmul = 3; } - x_shift = ft_face->glyph->bitmap_left - gm.gmptGlyphOrigin.x; + x_shift = ft_face->glyph->bitmap_left - (left >> 6); if ( x_shift < 0 ) { src += hmul * -x_shift; @@ -6802,7 +6802,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width -= x_shift; } - y_shift = gm.gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; + y_shift = (top >> 6) - ft_face->glyph->bitmap_top; if ( y_shift < 0 ) { src += src_pitch * vmul * -y_shift;

1 0

Alexandre Julliard : makedep: Expand tool names into the generated rules.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 7d1d9b40f105a4eb26421a254f19302484d7d37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1d9b40f105a4eb26421a254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 15:04:30 2014 +0100 makedep: Expand tool names into the generated rules. --- Make.vars.in | 5 ---- tools/makedep.c | 77 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d1d9b40f105a4eb26421…

1 0

Bruno Jesus : iphlpapi: Return error for IP address with value zero in IcmpSendEcho.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 1470d7b4cc607976b7d379d5ce594f65b3ca3c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1470d7b4cc607976b7d379d5c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 9 20:45:37 2014 -0200 iphlpapi: Return error for IP address with value zero in IcmpSendEcho. --- dlls/iphlpapi/icmp.c | 5 +++++ dlls/iphlpapi/tests/iphlpapi.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 7d84811..abd8ddc 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -239,6 +239,11 @@ DWORD WINAPI IcmpSendEcho( } /* check the request size against SO_MAX_MSG_SIZE using getsockopt */ + if (!DestinationAddress) { + SetLastError(ERROR_INVALID_NETNAME); + return 0; + } + /* Prepare the request */ id=getpid() & 0xFFFF; seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 94716d7..13a21c0 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -906,12 +906,10 @@ todo_wine SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); - todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_NETNAME || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, "expected 1214, got %d\n", error); - } address = htonl(INADDR_LOOPBACK); if (0) /* crashes in XP */

1 0

Alexandre Julliard : msvcp71: Import the correct msvcrt version.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 0d72182bd80a18799022d75a3cc8a66c4912618e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d72182bd80a18799022d75a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 12:52:28 2014 +0100 msvcp71: Import the correct msvcrt version. --- dlls/msvcp71/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp71/Makefile.in b/dlls/msvcp71/Makefile.in index 03ce2cb..dfa0a2b 100644 --- a/dlls/msvcp71/Makefile.in +++ b/dlls/msvcp71/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp71.dll -IMPORTS = msvcrt +IMPORTS = msvcr71 EXTRADEFS = -D_MSVCP_VER=71 PARENTSRC = ../msvcp90

1 0

Michael Stefaniuc : dmscript: Include the DMUS_OBJECTDESC directly into DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: ae81a130d24f549433903e38ba50f1752a022fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae81a130d24f549433903e38b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:16:23 2014 +0100 dmscript: Include the DMUS_OBJECTDESC directly into DirectMusicScriptTrack. --- dlls/dmscript/scripttrack.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 86e5521..ddae8b5 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -29,7 +29,7 @@ typedef struct DirectMusicScriptTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; IPersistStream IPersistStream_iface; LONG ref; - LPDMUS_OBJECTDESC pDesc; + DMUS_OBJECTDESC desc; } DirectMusicScriptTrack; static inline DirectMusicScriptTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) @@ -318,10 +318,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; - track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(track->pDesc); - track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - track->pDesc->guidClass = CLSID_DirectMusicScriptTrack; + track->desc.dwSize = sizeof(track->desc); + track->desc.dwValidData |= DMUS_OBJ_CLASS; + track->desc.guidClass = CLSID_DirectMusicScriptTrack; track->ref = 1; DMSCRIPT_LockModule();

1 0

Michael Stefaniuc : dmscript: Remove the extraneous IUnknown from DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: a5135bdc59c1dcb5d6ffd57a4dbecc9fd44dc077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5135bdc59c1dcb5d6ffd57a4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:14:33 2014 +0100 dmscript: Remove the extraneous IUnknown from DirectMusicScriptTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmscript/scripttrack.c | 118 +++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 72 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 63ab577..86e5521 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -26,15 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); */ typedef struct DirectMusicScriptTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; IPersistStream IPersistStream_iface; LONG ref; LPDMUS_OBJECTDESC pDesc; } DirectMusicScriptTrack; -typedef struct DirectMusicScriptTrack IDirectMusicScriptTrack; - static inline DirectMusicScriptTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { return CONTAINING_RECORD(iface, DirectMusicScriptTrack, IDirectMusicTrack8_iface); @@ -45,80 +42,53 @@ static inline DirectMusicScriptTrack *impl_from_IPersistStream(IPersistStream *i return CONTAINING_RECORD(iface, DirectMusicScriptTrack, IPersistStream_iface); } -/* IDirectMusicScriptTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, UnknownVtbl, iface); - - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_iface; - IDirectMusicTrack_AddRef(&This->IDirectMusicTrack8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->IPersistStream_iface; - IPersistStream_AddRef(&This->IPersistStream_iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicScriptTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSCRIPT_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicScriptTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMSCRIPT_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicScriptTrack_Unknown_Vtbl = { - IDirectMusicScriptTrack_IUnknown_QueryInterface, - IDirectMusicScriptTrack_IUnknown_AddRef, - IDirectMusicScriptTrack_IUnknown_Release -}; - -/* IDirectMusicScriptTrack IDirectMusicTrack8 part: */ +/* DirectMusicScriptTrack IDirectMusicTrack8 part: */ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ret_iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || + IsEqualIID(riid, &IID_IDirectMusicTrack8)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->IPersistStream_iface; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicScriptTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMSCRIPT_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -274,22 +244,22 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicScriptTrack IPersistStream part: */ static HRESULT WINAPI IPersistStreamImpl_QueryInterface(IPersistStream *iface, REFIID riid, - void **ppobj) + void **ret_iface) { DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); - return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ret_iface); } static ULONG WINAPI IPersistStreamImpl_AddRef(IPersistStream *iface) { DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); - return IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IPersistStreamImpl_Release(IPersistStream *iface) { DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); - return IDirectMusicScriptTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID *pClassID) @@ -331,12 +301,13 @@ static const IPersistStreamVtbl persist_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(LPCGUID lpcGUID, void **ppobj, +HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, IUnknown *pUnkOuter) { DirectMusicScriptTrack *track; + HRESULT hr; - *ppobj = NULL; + *ret_iface = NULL; if (pUnkOuter) return CLASS_E_NOAGGREGATION; @@ -345,14 +316,17 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(LPCGUID lpcGUID, void **ppobj if (!track) return E_OUTOFMEMORY; - track->UnknownVtbl = &DirectMusicScriptTrack_Unknown_Vtbl; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicScriptTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMSCRIPT_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, riid, ret_iface); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmscript: Remove the superfluous " IDirectMusicScriptTrack" from method names.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: c56151fa7b1c9a9092129b318c6e4b161009089a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56151fa7b1c9a9092129b318… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:08:13 2014 +0100 dmscript: Remove the superfluous "IDirectMusicScriptTrack" from method names. --- dlls/dmscript/scripttrack.c | 148 ++++++++++++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c56151fa7b1c9a9092129…

1 0

Alexandre Julliard : msvcp90: Don' t build the new-style string iterator functions for old msvcp versions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 581dd68c8a8c7660d1b5b2ce42608a6824507279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581dd68c8a8c7660d1b5b2ce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 11:56:02 2014 +0100 msvcp90: Don't build the new-style string iterator functions for old msvcp versions. --- dlls/msvcp90/string.c | 1288 +++++++++++++++++++++++++------------------------ 1 file changed, 650 insertions(+), 638 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=581dd68c8a8c7660d1b5b…

1 0

Michael Stefaniuc : dmscript: COM cleanup for IDirectMusicTrack8 from DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 7b3c6307151356eb52ec19e8cb5126f59d6236d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3c6307151356eb52ec19e8c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:09:30 2014 +0100 dmscript: COM cleanup for IDirectMusicTrack8 from DirectMusicScriptTrack. --- dlls/dmscript/dmscript_private.h | 16 ------- dlls/dmscript/scripttrack.c | 85 ++++++++++++++++++++++++-------------- 2 files changed, 53 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b3c6307151356eb52ec1…

1 0

Michael Stefaniuc : dmscript/tests: Add COM tests for DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: a0c0e3670106d9b9963baa2250af1f99760b6faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c0e3670106d9b9963baa225… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 23:04:41 2014 +0100 dmscript/tests: Add COM tests for DirectMusicScriptTrack. --- dlls/dmscript/tests/dmscript.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index f9612fa..b2912a4 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -132,6 +132,49 @@ static void test_COM(void) while (IDirectMusicScript_Release(dms)); } +static void test_COM_scripttrack(void) +{ + IDirectMusicTrack *dmt; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, (IUnknown*)&dmt, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmt); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicScriptTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmt, "dmt = %p\n", dmt); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmt); + ok(hr == E_NOINTERFACE, "DirectMusicScriptTrack create failed: %08x, expected E_NOINTERFACE\n", + hr); + + /* Same refcount for all DirectMusicScriptTrack interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void**)&dmt); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicTrack_AddRef(dmt); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicTrack_Release(dmt)); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -143,6 +186,7 @@ START_TEST(dmscript) return; } test_COM(); + test_COM_scripttrack(); CoUninitialize(); }

1 0

Alexandre Julliard : msvcrt: Return per-thread information also in lc_codepage_func and lc_handle_func.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: b88630a42d07bbdbe7710a5a2460be991761cde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88630a42d07bbdbe7710a5a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 14:02:44 2014 +0100 msvcrt: Return per-thread information also in lc_codepage_func and lc_handle_func. --- dlls/msvcrt/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4e8467a..7a33376 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -613,7 +613,7 @@ int CDECL __lconv_init(void) */ LCID* CDECL ___lc_handle_func(void) { - return MSVCRT___lc_handle; + return get_locinfo()->lc_handle; } /********************************************************************* @@ -621,7 +621,7 @@ LCID* CDECL ___lc_handle_func(void) */ unsigned int CDECL ___lc_codepage_func(void) { - return MSVCRT___lc_codepage; + return get_locinfo()->lc_codepage; } /*********************************************************************

1 0

Alexandre Julliard : msvcp90: Call the appropriate secure function instead of duplicating the checks.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 0f81fcb02fbcaf19e3ec60bde76053e03163bc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f81fcb02fbcaf19e3ec60bde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 11:50:10 2014 +0100 msvcp90: Call the appropriate secure function instead of duplicating the checks. --- dlls/msvcp90/string.c | 56 ++++++++++----------------------------------- dlls/msvcp90/tests/misc.c | 17 ++++++++------ 2 files changed, 22 insertions(+), 51 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 97b0f40..f5a9fa7 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -109,14 +109,8 @@ MSVCP_size_t CDECL MSVCP_char_traits_char_length(const char *str) char* CDECL MSVCP_char_traits_char__Copy_s(char *dest, MSVCP_size_t size, const char *src, MSVCP_size_t count) { - if(!dest || !src || size<count) { - if(dest && size) - dest[0] = '\0'; - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memcpy(dest, src, count); + memcpy_s(dest, size, src, count); + return dest; } /* ?copy@?$char_traits(a)D@std@@SAPADPADPBDI(a)Z */ @@ -140,14 +134,8 @@ const char * CDECL MSVCP_char_traits_char_find( char* CDECL MSVCP_char_traits_char__Move_s(char *dest, MSVCP_size_t size, const char *src, MSVCP_size_t count) { - if(!dest || !src || size<count) { - if(dest && size) - dest[0] = '\0'; - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memmove(dest, src, count); + memmove_s(dest, size, src, count); + return dest; } /* ?move@?$char_traits(a)D@std@@SAPADPADPBDI(a)Z */ @@ -245,14 +233,8 @@ MSVCP_size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str) wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest, MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) { - if(!dest || !src || size<count) { - if(dest && size) - dest[0] = '\0'; - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memcpy(dest, src, count * sizeof(wchar_t)); + memcpy_s(dest, size * sizeof(wchar_t), src, count * sizeof(wchar_t)); + return dest; } /* ?copy@?$char_traits(a)_W@std@@SAPA_WPA_WPB_WI(a)Z */ @@ -282,14 +264,8 @@ const wchar_t* CDECL MSVCP_char_traits_wchar_find( wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest, MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) { - if(!dest || !src || size<count) { - if(dest && size) - dest[0] = '\0'; - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memmove(dest, src, count * sizeof(WCHAR)); + memmove_s(dest, size * sizeof(wchar_t), src, count * sizeof(wchar_t)); + return dest; } /* ?move@?$char_traits(a)_W@std@@SAPA_WPA_WPB_WI(a)Z */ @@ -404,12 +380,8 @@ MSVCP_size_t CDECL MSVCP_char_traits_short_length(const unsigned short *str) unsigned short * CDECL MSVCP_char_traits_short__Copy_s(unsigned short *dest, MSVCP_size_t size, const unsigned short *src, MSVCP_size_t count) { - if(size<count) { - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memcpy(dest, src, count * sizeof(unsigned short)); + memcpy_s(dest, size * sizeof(unsigned short), src, count * sizeof(unsigned short)); + return dest; } /* ?copy@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z */ @@ -439,12 +411,8 @@ const unsigned short* CDECL MSVCP_char_traits_short_find( unsigned short* CDECL MSVCP_char_traits_short__Move_s(unsigned short *dest, MSVCP_size_t size, const unsigned short *src, MSVCP_size_t count) { - if(size<count) { - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memmove(dest, src, count * sizeof(unsigned short)); + memmove_s(dest, size * sizeof(unsigned short), src, count * sizeof(unsigned short)); + return dest; } /* ?move@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z */ diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 445bb45..f294b2a 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -20,6 +20,7 @@ #include <locale.h> #include <wctype.h> #include <float.h> +#include <errno.h> #include <windef.h> #include <winbase.h> @@ -60,6 +61,7 @@ static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); static void (__cdecl *p__free_locale)(_locale_t); static void (__cdecl *p_free)(void*); +static int * (__cdecl *p_errno)(void); static void (__cdecl *p_char_assign)(void*, const void*); static void (__cdecl *p_wchar_assign)(void*, const void*); @@ -196,7 +198,8 @@ static BOOL init(void) p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); p__free_locale = (void*)GetProcAddress(msvcr, "_free_locale"); p_free = (void*)GetProcAddress(msvcr, "free"); - if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p__free_locale || !p_free) { + p_errno = (void*)GetProcAddress(msvcr, "_errno"); + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p__free_locale || !p_free || !p_errno) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -449,7 +452,7 @@ static void test_Copy_s(void) ok(dest[4] == '#', "dest[4] != '#'\n"); ok(!memcmp(dest, src, sizeof(char[4])), "dest = %s\n", dest); - errno = 0xdeadbeef; + *p_errno() = 0xdeadbeef; dest[0] = '#'; ret = p_Copy_s(dest, 3, src, 4); ok(ret == dest, "ret != dest\n"); @@ -457,21 +460,21 @@ static void test_Copy_s(void) ok(invalid_parameter==1, "invalid_parameter = %d\n", invalid_parameter); invalid_parameter = 0; - ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(*p_errno() == ERANGE, "errno = %d\n", *p_errno()); - errno = 0xdeadbeef; + *p_errno() = 0xdeadbeef; p_Copy_s(NULL, 32, src, 4); ok(invalid_parameter==1, "invalid_parameter = %d\n", invalid_parameter); invalid_parameter = 0; - ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(*p_errno() == EINVAL, "errno = %d\n", *p_errno()); - errno = 0xdeadbeef; + *p_errno() = 0xdeadbeef; p_Copy_s(dest, 32, NULL, 4); ok(invalid_parameter==1, "invalid_parameter = %d\n", invalid_parameter); invalid_parameter = 0; - ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(*p_errno() == EINVAL, "errno = %d\n", *p_errno()); } static void test_wctype(void)

1 0

Huw Davies : mshtml: Finish with the correct string.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 5ac8507a8ebaebb407aea439948a07e1ad9bbcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac8507a8ebaebb407aea4399… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 13 11:32:44 2014 +0000 mshtml: Finish with the correct string. --- dlls/mshtml/npplugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 57bb772..f5eb754 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -309,7 +309,7 @@ static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) ERR("GetAttribute failed: %08x\n", nsres); } - nsAString_Finish(&attr_str); + nsAString_Finish(&val_str); return ret; } @@ -557,7 +557,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) ERR("GetAttribute failed: %08x\n", nsres); } - nsAString_Finish(&attr_str); + nsAString_Finish(&val_str); if(!uri) return;

1 0

Francois Gouget : riched20: Make ME_GetDITypeName() static.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 25e0f11ced51e9462fefe06da7e71d6423f50ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e0f11ced51e9462fefe06da… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 13 13:30:37 2014 +0100 riched20: Make ME_GetDITypeName() static. --- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 31 ++++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 40bf04c..ae8b81a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -95,7 +95,6 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; -const char *ME_GetDITypeName(ME_DIType type) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 7722fc9..a6b3c65 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -139,9 +139,24 @@ ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass) return NULL; } +static const char *ME_GetDITypeName(ME_DIType type) +{ + switch(type) + { + case diParagraph: return "diParagraph"; + case diRun: return "diRun"; + case diCell: return "diCell"; + case diTextStart: return "diTextStart"; + case diTextEnd: return "diTextEnd"; + case diStartRow: return "diStartRow"; + default: return "?"; + } +} + void ME_DestroyDisplayItem(ME_DisplayItem *item) { -/* TRACE("type=%s\n", ME_GetDITypeName(item->type)); */ + if (0) + TRACE("type=%s\n", ME_GetDITypeName(item->type)); if (item->type==diParagraph) { FREE_OBJ(item->member.para.pFmt); @@ -172,20 +187,6 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) return item; } -const char *ME_GetDITypeName(ME_DIType type) -{ - switch(type) - { - case diParagraph: return "diParagraph"; - case diRun: return "diRun"; - case diCell: return "diCell"; - case diTextStart: return "diTextStart"; - case diTextEnd: return "diTextEnd"; - case diStartRow: return "diStartRow"; - default: return "?"; - } -} - void ME_DumpDocument(ME_TextBuffer *buffer) { /* FIXME this is useless, */

1 0

Alexandre Julliard : makedep: Expand the winegcc target arguments into the generated rules.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: c7411e22bec85336ea3220944f3c067201bb2c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7411e22bec85336ea3220944… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 14:44:26 2014 +0100 makedep: Expand the winegcc target arguments into the generated rules. --- Make.vars.in | 4 ++-- tools/makedep.c | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 75cb1e6..9814b88 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -24,6 +24,7 @@ CPPFLAGS = @CPPFLAGS@ EXTRACFLAGS = @EXTRACFLAGS@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ +UNWINDFLAGS = @UNWINDFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ @@ -59,12 +60,11 @@ WIDL = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT) WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) +WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc$(TOOLSEXT) LIBPORT = $(top_builddir)/libs/port/libwine_port.a LIBWPP = $(top_builddir)/libs/wpp/libwpp.a LIBWINE = -L$(top_builddir)/libs/wine -lwine LIBWINE_STATIC = $(top_builddir)/libs/wine/libwine_static.a -WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@ -CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ diff --git a/tools/makedep.c b/tools/makedep.c index c968187..94609a2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -104,6 +104,7 @@ static const char *src_dir; static const char *top_src_dir; static const char *top_obj_dir; static const char *parent_dir; +static const char *tools_dir; static const char *makefile_name = "Makefile"; static const char *Separator = "### Dependencies"; static const char *input_file_name; @@ -497,6 +498,17 @@ static char *top_dir_path( const char *path ) /******************************************************************* + * tools_dir_path + */ +static char *tools_dir_path( const char *path ) +{ + if (tools_dir) return strmake( "%s/tools/%s", tools_dir, path ); + if (top_obj_dir) return strmake( "%s/tools/%s", top_obj_dir, path ); + return strmake( "tools/%s", path ); +} + + +/******************************************************************* * init_paths */ static void init_paths(void) @@ -504,6 +516,7 @@ static void init_paths(void) /* ignore redundant source paths */ if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; + if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; strarray_insert( &include_args, 0, strmake( "-I%s", top_dir_path( "include" ))); } @@ -1718,7 +1731,10 @@ static struct strarray output_sources(void) output_filenames( res_files ); output( "\n" ); output( "\t$(WINEGCC) -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); if (spec_file) { output( " -shared %s", spec_file ); @@ -1854,7 +1870,10 @@ static struct strarray output_sources(void) strarray_add( &clean_files, strmake( "%s%s", stripped, dllext )); output( "%s%s:\n", testmodule, dllext ); output( "\t$(WINEGCC) -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); output_filenames( appmode ); output_filenames( object_files ); output_filenames( res_files ); @@ -1863,7 +1882,10 @@ static struct strarray output_sources(void) output( "\n" ); output( "%s%s:\n", stripped, dllext ); output( "\t$(WINEGCC) -s -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( appmode ); output_filenames( object_files ); @@ -1895,7 +1917,10 @@ static struct strarray output_sources(void) output_filenames( crossobj_files ); output_filenames( res_files ); output( "\n" ); - output( "\t$(CROSSWINEGCC) -o $@ -b %s", crosstarget ); + output( "\t$(WINEGCC) -o $@ -b %s", crosstarget ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); + output_filename( "--lib-suffix=.cross.a" ); output_filenames( crossobj_files ); output_filenames( res_files ); output_filenames( all_libs ); @@ -2104,6 +2129,7 @@ static void update_makefile( const char *path ) top_src_dir = get_expanded_make_variable( "top_srcdir" ); top_obj_dir = get_expanded_make_variable( "top_builddir" ); parent_dir = get_expanded_make_variable( "PARENTSRC" ); + tools_dir = get_expanded_make_variable( "TOOLSDIR" ); appmode = get_expanded_make_var_array( "APPMODE" ); dllflags = get_expanded_make_var_array( "DLLFLAGS" );

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 3ea6334222319ec44ec64000b85a6325e368eda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea6334222319ec44ec64000b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Jan 11 13:40:59 2014 +0200 po: Update Finnish translation. --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index ac1c326..164a493 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-06 21:18+0300\n" +"PO-Revision-Date: 2014-01-11 13:40+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: none\n" "Language: Finnish\n" @@ -10124,10 +10124,8 @@ msgid "Wine Explorer" msgstr "Winen Explorer" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Käynnistys" +msgstr "Käynnistä" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Alexandre Julliard : msvcp90: Add wrappers for functions that don' t exist in old msvcrt versions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 645540beed24327a145b7571ba5fe6d58f890f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645540beed24327a145b7571b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 12:52:17 2014 +0100 msvcp90: Add wrappers for functions that don't exist in old msvcrt versions. --- dlls/msvcp90/locale.c | 7 +++---- dlls/msvcp90/msvcp90.h | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0ae1d8d..263bb8c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#include "msvcp90.h" #include "locale.h" #include "errno.h" #include "limits.h" @@ -29,14 +28,14 @@ #include "wchar.h" #include "wctype.h" #include "time.h" - -#include "wine/list.h" - #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "msvcp90.h" #include "wine/unicode.h" +#include "wine/list.h" #include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(msvcp); char* __cdecl _Getdays(void); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b04faab..026a04d 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -515,3 +515,10 @@ typedef struct { double real; double imag; } complex_double; + +#if _MSVCP_VER < 80 +#define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) +#define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0) +#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) )) +#define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) +#endif

1 0

Alexandre Julliard : msvcp90: Remove parameter checks from functions that are only used for old msvcp versions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 4d7255d2df5a9262970e532c3e078ea7cd75631a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7255d2df5a9262970e532c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 11:50:36 2014 +0100 msvcp90: Remove parameter checks from functions that are only used for old msvcp versions. --- dlls/msvcp90/locale.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 45380d2..f428396 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9713,12 +9713,6 @@ size_t __cdecl mbsrtowcs(wchar_t *dst, const char **pstr, size_t n, mbstate_t *s wchar_t wc; const char *src; - if (!pstr) - { - *_errno() = EINVAL; - _invalid_parameter( NULL, NULL, NULL, 0, 0 ); - return -1; - } src = *pstr; if (!state) state = &local_state; @@ -9757,12 +9751,6 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s char buffer[MB_LEN_MAX]; size_t ret = 0; - if (!pstr) - { - *_errno() = EINVAL; - _invalid_parameter( NULL, NULL, NULL, 0, 0 ); - return -1; - } src = *pstr; while (!dst || n > ret)

1 0