March 2014 - Wine-Commits - list.winehq.org

Piotr Caban : ole32: Change DoDragDrop return value on IDropTarget:: Drop call.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: bc2c6d39a69201ab64a03822ddd44f904853e8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2c6d39a69201ab64a03822d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 1 14:46:20 2014 +0100 ole32: Change DoDragDrop return value on IDropTarget::Drop call. --- dlls/ole32/ole2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index baaf02e..766b1e7 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2430,11 +2430,11 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) */ case DRAGDROP_S_DROP: if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) - IDropTarget_Drop(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); + trackerInfo->returnValue = IDropTarget_Drop(trackerInfo->curDragTarget, + trackerInfo->dataObject, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); else IDropTarget_DragLeave(trackerInfo->curDragTarget); break;

1 0

Nikolay Sivov : dmime: COM cleanup of IDirectMusicGraph interface.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 91ee56769c4037dc62b945e6b8f74554c0197f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ee56769c4037dc62b945e6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 08:57:06 2014 +0400 dmime: COM cleanup of IDirectMusicGraph interface. --- dlls/dmime/dmime_private.h | 17 -- dlls/dmime/graph.c | 512 +++++++++++++++++++++++--------------------- 2 files changed, 271 insertions(+), 258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91ee56769c4037dc62b94…

1 0

Nikolay Sivov : kernel32: Partial implementation for GetCalendarInfoEx().
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 95142cad53df5d67f5061f9c7861b91a4c179f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95142cad53df5d67f5061f9c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 09:13:56 2014 +0400 kernel32: Partial implementation for GetCalendarInfoEx(). --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/time.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 7c6f6fe..7b3c86f 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -9,7 +9,7 @@ @ stdcall GetACP() kernel32.GetACP @ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo @ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW -@ stub GetCalendarInfoEx +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo @ stub GetFileMUIPath diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f7f3320..f8d3a80 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -442,6 +442,7 @@ @ stdcall GetCPInfoExW(long long ptr) @ stdcall GetCalendarInfoA(long long long ptr long ptr) @ stdcall GetCalendarInfoW(long long long ptr long ptr) +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) # @ stub GetComPlusPackageInstallStatus @ stdcall GetCommConfig(long ptr long) @ stdcall GetCommMask(long ptr) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 77c71cb..4dc5d0e 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -798,6 +798,18 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, } /********************************************************************* + * GetCalendarInfoEx (KERNEL32.@) + */ +int WINAPI GetCalendarInfoEx(LPCWSTR locale, CALID calendar, LPCWSTR lpReserved, CALTYPE caltype, + LPWSTR data, int len, DWORD *value) +{ + LCID lcid = LocaleNameToLCID(locale, 0); + FIXME("(%s, %d, %p, 0x%08x, %p, %d, %p): semi-stub\n", debugstr_w(locale), calendar, lpReserved, caltype, + data, len, value); + return GetCalendarInfoW(lcid, calendar, caltype, data, len, value); +} + +/********************************************************************* * SetCalendarInfoA (KERNEL32.@) * */

1 0

Henri Verbeet : d3d9/tests: Get rid of "skip_once" in yuv_layout_test().
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 1168948764ebe0ecc9a22a3cd509b8525b195a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1168948764ebe0ecc9a22a3cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:50 2014 +0100 d3d9/tests: Get rid of "skip_once" in yuv_layout_test(). --- dlls/d3d9/tests/visual.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e107471..4d921dc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10522,7 +10522,6 @@ static void yuv_layout_test(IDirect3DDevice9 *device) BYTE *buf, *chroma_buf, *u_buf, *v_buf; UINT width = 20, height = 16; D3DCAPS9 caps; - D3DFORMAT skip_once = D3DFMT_UNKNOWN; D3DSURFACE_DESC desc; static const struct @@ -10582,21 +10581,13 @@ static void yuv_layout_test(IDirect3DDevice9 *device) if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, format) != D3D_OK) { - if (skip_once != format) - { - skip("%s is not supported.\n", fmt_string); - skip_once = format; - } + skip("%s is not supported.\n", fmt_string); continue; } if (FAILED(IDirect3D9_CheckDeviceFormatConversion(d3d, 0, D3DDEVTYPE_HAL, format, desc.Format))) { - if (skip_once != format) - { - skip("Driver cannot blit %s surfaces.\n", fmt_string); - skip_once = format; - } + skip("Driver cannot blit %s surfaces.\n", fmt_string); continue; }

1 0

Henri Verbeet : ddraw/tests: Try 24 bpp display modes if 32 bpp modes are unavailable.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 048f4d4c2663bcbf1216552b130459933420fb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048f4d4c2663bcbf1216552b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:51 2014 +0100 ddraw/tests: Try 24 bpp display modes if 32 bpp modes are unavailable. --- dlls/ddraw/tests/ddraw1.c | 63 ++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw2.c | 75 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw4.c | 75 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 75 +++++++++++++++++++++++++-------------------- 4 files changed, 158 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=048f4d4c2663bcbf12165…

1 0

Henri Verbeet : wined3d: Also trace "mem" and "pitch" in wined3d_surface_update_desc().
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: b40eda767bfc945823df62a0b52d7d5f20edb162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b40eda767bfc945823df62a0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:54 2014 +0100 wined3d: Also trace "mem" and "pitch" in wined3d_surface_update_desc(). --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 371f3bc..6af6158 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2605,8 +2605,9 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, HRESULT hr; DWORD valid_location = 0; - TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", - surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); + TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u, " + "mem %p, pitch %u.\n", + surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type, mem, pitch); if (!resource_size) return WINED3DERR_INVALIDCALL;

1 0

Francois Gouget : xcopy/tests: Fix the test in case stdin has been redirected.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 8d51235dbeca036f91d6b6022944894f6abe962b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d51235dbeca036f91d6b6022… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 28 19:50:32 2014 +0100 xcopy/tests: Fix the test in case stdin has been redirected. --- programs/xcopy/tests/xcopy.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c index 4cd6b1a..ec7683a 100644 --- a/programs/xcopy/tests/xcopy.c +++ b/programs/xcopy/tests/xcopy.c @@ -31,7 +31,11 @@ static DWORD runcmd(const char* cmd) /* Create a writable copy for CreateProcessA() */ wcmd = HeapAlloc(GetProcessHeap(), 0, strlen(cmd) + 1); strcpy(wcmd, cmd); - rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + /* On Windows 2003 and older, xcopy.exe fails if stdin is not a console + * handle, even with '/I /Y' options. + */ + rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &pi); HeapFree(GetProcessHeap(), 0, wcmd); if (!rc) return 260;

1 0

Hans Leidekker : wbemprox: Implement Win32_DiskDrive.MediaType.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 59b9c36df54ecfaa2b5867064cb7731b6571584a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b9c36df54ecfaa2b5867064… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 28 11:21:11 2014 +0100 wbemprox: Implement Win32_DiskDrive.MediaType. --- dlls/wbemprox/builtin.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4b02ea2..449eb2f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -181,6 +181,8 @@ static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_maxclockspeedW[] = {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; +static const WCHAR prop_mediatypeW[] = + {'M','e','d','i','a','T','y','p','e',0}; static const WCHAR prop_memberW[] = {'M','e','m','b','e','r',0}; static const WCHAR prop_methodW[] = @@ -315,6 +317,7 @@ static const struct column col_diskdrive[] = { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_indexW, CIM_UINT32, VT_I4 }, { prop_manufacturerW, CIM_STRING }, + { prop_mediatypeW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } }; @@ -507,10 +510,12 @@ static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; static const WCHAR diskdrive_deviceidW[] = {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; -static const WCHAR diskdrive_modelW[] = - {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_manufacturerW[] = {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; +static const WCHAR diskdrive_mediatypeW[] = + {'F','i','x','e','d',' ','h','a','r','d',' ','d','i','s','k',0}; +static const WCHAR diskdrive_modelW[] = + {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_serialW[] = {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= @@ -593,6 +598,7 @@ struct record_diskdrive const WCHAR *device_id; UINT32 index; const WCHAR *manufacturer; + const WCHAR *mediatype; const WCHAR *name; const WCHAR *serialnumber; }; @@ -762,7 +768,8 @@ static const struct record_bios data_bios[] = }; static const struct record_diskdrive data_diskdrive[] = { - { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_modelW, diskdrive_serialW } + { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_mediatypeW, diskdrive_modelW, + diskdrive_serialW } }; static const struct record_param data_param[] = {

1 0

André Hentschel : Fix WWN 364
by Jeremy Newman March 3, 2014

March 3, 2014

Module: website Branch: master Commit: 5db1bc5c78614b128de572ba3c0d33d512564ec5 URL: http://source.winehq.org/git/website.git/?a=commit;h=5db1bc5c78614b128de572… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 3 18:51:28 2014 +0100 Fix WWN 364 --- wwn/en/wn20140303_364.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wwn/en/wn20140303_364.xml b/wwn/en/wn20140303_364.xml index 2148c6a..3134161 100644 --- a/wwn/en/wn20140303_364.xml +++ b/wwn/en/wn20140303_364.xml @@ -87,11 +87,9 @@ Shortly after the last WWN, Marcus wrote: <p> Wine is an accepted organization for GSoC 2014, would-be students should now discuss project ideas with us as in one week the Student application period opens. </p> -<quote> <p> -For each article you buy, we donate part of our benefit to Wine HQ. This way we all win :) +See <a href="http://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informations and project ideas. </p> -</quote> </section> <section @@ -101,11 +99,16 @@ For each article you buy, we donate part of our benefit to Wine HQ. This way we posts="0" > <p> -Ismael Barros once wrote: As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a>. +Ismael Barros once wrote: +</p> +<quote> +<p> +As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a> </p> <p> -Ismael Barros once wrote: As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a>. +For each article you buy, we donate part of our benefit to Wine HQ. This way we all win :) </p> +</quote> </section> <section

1 0

André Hentschel : Add WWN 364
by Jeremy Newman March 3, 2014

March 3, 2014

Module: website Branch: master Commit: 9f7757ac780763c972910c426ed72d158d910761 URL: http://source.winehq.org/git/website.git/?a=commit;h=9f7757ac780763c972910c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 3 17:52:05 2014 +0100 Add WWN 364 --- news/de/2014030301.xml | 16 + news/en/2014030301.xml | 16 + wwn/en/wn20140303_364.xml | 1577 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1609 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=9f7757ac780763c972…

1 0