January 2007 - Wine-commits

Francois Gouget : mcicda: Compare GetLastError() to kernel error codes, not ntdll ones.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: eb75b17801cf07903a62c44ddd2d5ce25dba049f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb75b17801cf07903a62c44dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 9 12:17:54 2007 +0100 mcicda: Compare GetLastError() to kernel error codes, not ntdll ones. --- dlls/mcicda/mcicda.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index e134b12..359df7f 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -121,7 +121,7 @@ static DWORD MCICDA_GetStatus(WINE_MC fmt.Format = IOCTL_CDROM_CURRENT_POSITION; if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), &data, sizeof(data), &br, NULL)) { - if (GetLastError() == STATUS_NO_MEDIA_IN_DEVICE) mode = MCI_MODE_OPEN; + if (GetLastError() == ERROR_NOT_READY) mode = MCI_MODE_OPEN; } else { switch (data.CurrentPosition.Header.AudioStatus) { @@ -145,8 +145,8 @@ static int MCICDA_GetError(WINE_MCICDAUD { switch (GetLastError()) { - case STATUS_NO_MEDIA_IN_DEVICE: return MCIERR_DEVICE_NOT_READY; - case STATUS_IO_DEVICE_ERROR: return MCIERR_HARDWARE; + case ERROR_NOT_READY: return MCIERR_DEVICE_NOT_READY; + case ERROR_IO_DEVICE: return MCIERR_HARDWARE; default: FIXME("Unknown mode %x\n", GetLastError()); }

1 0

Francois Gouget : wintrust/tests: Print GetLastError() in decimal with '%u' .
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: b66eeddec6d338d18b911e906087b1931577654b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66eeddec6d338d18b911e906… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 9 12:21:57 2007 +0100 wintrust/tests: Print GetLastError() in decimal with '%u'. --- dlls/wintrust/tests/register.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 8a55c11..d442c07 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -75,7 +75,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %u.\n", GetLastError()); /* NULL functions */ SetLastError(0xdeadbeef); @@ -83,7 +83,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %u.\n", GetLastError()); /* All OK (although no functions defined), except cbStruct is not set in ActionIDFunctions */ SetLastError(0xdeadbeef); @@ -92,7 +92,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %u.\n", GetLastError()); /* All OK (although no functions defined) and cbStruct is set now */ SetLastError(0xdeadbeef); @@ -101,7 +101,7 @@ static void test_AddRem_ActionID(void) ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* All OK and all (but 1) functions are correctly defined. The DLL and entrypoints * are not present. @@ -120,7 +120,7 @@ static void test_AddRem_ActionID(void) ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* All OK and all functions are correctly defined. The DLL and entrypoints * are not present. @@ -139,26 +139,26 @@ static void test_AddRem_ActionID(void) ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d.\n", GetLastError()); + "Expected 0xdeadbeef, got %u.\n", GetLastError()); SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(&ActionID); - ok ( ret, "WintrustRemoveActionID failed : 0x%08x\n", GetLastError()); - ok ( GetLastError() == 0xdeadbeef, "Last error should not have been changed: 0x%08x\n", GetLastError()); + ok ( ret, "WintrustRemoveActionID failed : %d\n", GetLastError()); + ok ( GetLastError() == 0xdeadbeef, "Last error should not have been changed: %u\n", GetLastError()); /* NULL input */ SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(NULL); ok (ret, "Expected WintrustRemoveActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* The passed GUID is removed by a previous call, so it's basically a test with a nonexistent Trust provider */ SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(&ActionID); ok (ret, "Expected WintrustRemoveActionID to succeed.\n"); ok (GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d.\n", GetLastError()); + "Expected 0xdeadbeef, got %u.\n", GetLastError()); } static void test_AddDefaultForUsage(void) @@ -177,14 +177,14 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(NULL, NULL); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* NULL defusage */ SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(oid, NULL); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* NULL oid and proper defusage */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -197,7 +197,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(NULL, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* Just the ActionID */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -207,7 +207,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); ok (GetLastError() == 0xdeadbeef, - "Last error should not have been changed: 0x%08x\n", GetLastError()); + "Last error should not have been changed: %u\n", GetLastError()); /* No ActionID */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -218,7 +218,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* cbStruct set to 0 */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -231,7 +231,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* All OK */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -244,7 +244,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); ok (GetLastError() == 0xdeadbeef, - "Last error should not have been changed: 0x%08x\n", GetLastError()); + "Last error should not have been changed: %u\n", GetLastError()); /* There is no corresponding remove for WintrustAddDefaultForUsage * so we delete the registry key manually.

1 0

Hans Leidekker : kernel32: Add a stub implementation for GetVolumeNameForVolumeMountPoint{A, W}.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 7918c59f867e438b1e609010d5057025764693b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7918c59f867e438b1e609010d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 7 13:08:31 2007 +0100 kernel32: Add a stub implementation for GetVolumeNameForVolumeMountPoint{A, W}. --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/tests/volume.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/volume.c | 41 +++++++++++++++++++++++++++++++++++--- 3 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fa52d1b..0e8a1fc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -649,8 +649,8 @@ @ stdcall GetVersionExW(ptr) @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) -@ stub GetVolumeNameForVolumeMountPointA -@ stdcall GetVolumeNameForVolumeMountPointW(wstr long long) +@ stdcall GetVolumeNameForVolumeMountPointA(str ptr long) +@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) @ stdcall GetVolumePathNameA(str ptr long) @ stdcall GetVolumePathNameW(wstr ptr long) # @ stub GetVolumePathNamesForVolumeNameA diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index b27fa74..e940a4b 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -45,7 +45,51 @@ static void test_query_dos_deviceA(void) } } +static void test_GetVolumeNameForVolumeMountPointA(void) +{ + BOOL ret; + char volume[MAX_PATH], path[] = "c:\\"; + DWORD len = sizeof(volume); + + ret = GetVolumeNameForVolumeMountPointA(path, volume, 0); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + + if (0) { /* these crash on XP */ + ret = GetVolumeNameForVolumeMountPointA(path, NULL, len); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + + ret = GetVolumeNameForVolumeMountPointA(NULL, volume, len); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + } + + ret = GetVolumeNameForVolumeMountPointA(path, volume, len); + ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); +} + +static void test_GetVolumeNameForVolumeMountPointW(void) +{ + BOOL ret; + WCHAR volume[MAX_PATH], path[] = {'c',':','\\',0}; + DWORD len = sizeof(volume) / sizeof(WCHAR); + + ret = GetVolumeNameForVolumeMountPointW(path, volume, 0); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + + if (0) { /* these crash on XP */ + ret = GetVolumeNameForVolumeMountPointW(path, NULL, len); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n"); + + ret = GetVolumeNameForVolumeMountPointW(NULL, volume, len); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n"); + } + + ret = GetVolumeNameForVolumeMountPointW(path, volume, len); + ok(ret == TRUE, "GetVolumeNameForVolumeMountPointW failed\n"); +} + START_TEST(volume) { test_query_dos_deviceA(); + test_GetVolumeNameForVolumeMountPointA(); + test_GetVolumeNameForVolumeMountPointW(); } diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index f679250..d73e603 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -748,14 +748,47 @@ BOOL WINAPI SetVolumeLabelA(LPCSTR root, /*********************************************************************** - * GetVolumeNameForVolumeMountPointW (KERNEL32.@) + * GetVolumeNameForVolumeMountPointA (KERNEL32.@) */ -BOOL WINAPI GetVolumeNameForVolumeMountPointW(LPCWSTR str, LPWSTR dst, DWORD size) +BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD size ) { - FIXME("(%s, %p, %x): stub\n", debugstr_w(str), dst, size); - return 0; + BOOL ret; + WCHAR volumeW[50], *pathW = NULL; + DWORD len = min( sizeof(volumeW) / sizeof(WCHAR), size ); + + TRACE("(%s, %p, %x)\n", debugstr_a(path), volume, size); + + if (!path || !(pathW = FILE_name_AtoW( path, TRUE ))) + return FALSE; + + if ((ret = GetVolumeNameForVolumeMountPointW( pathW, volumeW, len ))) + FILE_name_WtoA( volumeW, -1, volume, len ); + + HeapFree( GetProcessHeap(), 0, pathW ); + return ret; } +/*********************************************************************** + * GetVolumeNameForVolumeMountPointW (KERNEL32.@) + */ +BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWORD size ) +{ + BOOL ret = FALSE; + static const WCHAR fmt[] = + { '\\','\\','?','\\','V','o','l','u','m','e','{','%','0','2','x','}','\\',0 }; + + TRACE("(%s, %p, %x)\n", debugstr_w(path), volume, size); + + if (!path || !path[0]) return FALSE; + + if (size >= sizeof(fmt) / sizeof(WCHAR)) + { + /* FIXME: will break when we support volume mounts */ + sprintfW( volume, fmt, tolowerW( path[0] ) - 'a' ); + ret = TRUE; + } + return ret; +} /*********************************************************************** * DefineDosDeviceW (KERNEL32.@)

1 0

Patrik Stridvall : dxguid: Add the rmxfguid.h header and export the GUIDs.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 918152734c6fb799e47aedc2dfd38dbc4f946959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918152734c6fb799e47aedc2d… Author: Patrik Stridvall <patrik(a)stridvall.se> Date: Mon Jan 8 00:47:04 2007 +0100 dxguid: Add the rmxfguid.h header and export the GUIDs. --- dlls/dxguid/dxguid.c | 1 + include/Makefile.in | 1 + include/rmxfguid.h | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index 82bae2a..c222c7c 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -45,3 +45,4 @@ #include "ddrawi.h" #include "dxfile.h" #include "d3drm.h" +#include "rmxfguid.h" diff --git a/include/Makefile.in b/include/Makefile.in index cb1fe5c..36257c4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -249,6 +249,7 @@ WINDOWS_INCLUDES = \ reason.h \ regstr.h \ richedit.h \ + rmxfguid.h \ rpc.h \ rpcdce.h \ rpcdcep.h \ diff --git a/include/rmxfguid.h b/include/rmxfguid.h new file mode 100644 index 0000000..da36e00 --- /dev/null +++ b/include/rmxfguid.h @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2007 Patrik Stridvall + * + * 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 + */ + +#ifndef __WINE_RMXFGUID_H +#define __WINE_RMXFGUID_H + +/***************************************************************************** + * Define GUIDs + */ + +DEFINE_GUID(TID_D3DRMAnimation, 0x3d82ab4f, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMAnimationKey, 0x10dd46a8, 0x775b, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMAnimationOptions, 0xe2bf56c0, 0x840f, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMAnimationSet, 0x3d82ab50, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMAppData, 0xe5745280, 0xb24f, 0x11cf, 0x9d, 0xd5, 0x00, 0xaa, 0x00, 0xa7, 0x1a, 0x2f); + +DEFINE_GUID(TID_D3DRMBoolean, 0x537da6a0, 0xca37, 0x11d0, 0x94, 0x1c, 0x00, 0x80, 0xc8, 0x0c, 0xfa, 0x7b); + +DEFINE_GUID(TID_D3DRMBoolean2d, 0x4885ae63, 0x78e8, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMCamera, 0x3d82ab51, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMColorRGB, 0xd3e16e81, 0x7835, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMColorRGBA, 0x35ff44e0, 0x6c7c, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMCoords2d, 0xf6f23f44, 0x7686, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMExternalVisual, 0x98116aa0, 0xbdba, 0x11d1, 0x82, 0xc0, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x71); + +DEFINE_GUID(TID_D3DRMFloatKeys, 0x10dd46a9, 0x775b, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMFrame, 0x3d82ab46, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMFramePosition, 0xe2bf56c1, 0x840f, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMFrameRotation, 0xe2bf56c3, 0x840f, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMFrameTransformMatrix, 0xf6f23f41, 0x7686, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMFrameVelocity, 0xe2bf56c2, 0x840f, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMGuid, 0xa42790e0, 0x7810, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMIndexedColor, 0x1630b820, 0x7842, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMInfo, 0x2b957100, 0x9e9a, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMInlineData, 0x3a23eea0, 0x94b1, 0x11d0, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMLight, 0x3d82ab4a, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMLightAttenuation, 0xa8a98ba0, 0xc5e5, 0x11cf, 0xb9, 0x41, 0x00, 0x80, 0xc8, 0x0c, 0xfa, 0x7b); + +DEFINE_GUID(TID_D3DRMLightPenumbra, 0xaed22741, 0xb31f, 0x11cf, 0x9d, 0xd5, 0x00, 0xaa, 0x00, 0xa7, 0x1a, 0x2f); + +DEFINE_GUID(TID_D3DRMLightRange, 0xaed22742, 0xb31f, 0x11cf, 0x9d, 0xd5, 0x00, 0xaa, 0x00, 0xa7, 0x1a, 0x2f); + +DEFINE_GUID(TID_D3DRMLightUmbra, 0xaed22740, 0xb31f, 0x11cf, 0x9d, 0xd5, 0x00, 0xaa, 0x00, 0xa7, 0x1a, 0x2f); + +DEFINE_GUID(TID_D3DRMMaterial, 0x3d82ab4d, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMMaterialAmbientColor, 0x01411840, 0x7786, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMaterialArray, 0x35ff44e1, 0x6c7c, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMaterialDiffuseColor, 0x01411841, 0x7786, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMaterialEmissiveColor, 0xd3e16e80, 0x7835, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMaterialPower, 0x01411843, 0x7786, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMaterialSpecularColor, 0x01411842, 0x7786, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMaterialWrap, 0x4885ae60, 0x78e8, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMatrix4x4, 0xf6f23f45, 0x7686, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMesh, 0x3d82ab44, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMMeshFace, 0x3d82ab5f, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMMeshFaceWraps, 0xed1ec5c0, 0xc0a8, 0x11d0, 0x94, 0x1c, 0x00, 0x80, 0xc8, 0x0c, 0xfa, 0x7b); + +DEFINE_GUID(TID_D3DRMMeshMaterialList, 0xf6f23f42, 0x7686, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMeshNormals, 0xf6f23f43, 0x7686, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMeshTextureCoords, 0xf6f23f40, 0x7686, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMMeshVertexColors, 0x1630b821, 0x7842, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMProgressiveMesh, 0x8a63c360, 0x997d, 0x11d0, 0x94, 0x1c, 0x00, 0x80, 0xc8, 0x0c, 0xfa, 0x7b); + +DEFINE_GUID(TID_D3DRMPropertyBag, 0x7f0f21e1, 0xbfe1, 0x11d1, 0x82, 0xc0, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x71); + +DEFINE_GUID(TID_D3DRMRightHanded, 0x7f5d5ea0, 0xd53a, 0x11d1, 0x82, 0xc0, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x71); + +DEFINE_GUID(TID_D3DRMStringProperty, 0x7f0f21e0, 0xbfe1, 0x11d1, 0x82, 0xc0, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x71); + +DEFINE_GUID(TID_D3DRMTextureFilename, 0xa42790e1, 0x7810, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMTextureReference, 0xa42790e2, 0x7810, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMTimedFloatKeys, 0xf406b180, 0x7b3b, 0x11cf, 0x8f, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xa3); + +DEFINE_GUID(TID_D3DRMUrl, 0x3a23eea1, 0x94b1, 0x11d0, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +DEFINE_GUID(TID_D3DRMVector, 0x3d82ab5e, 0x62da, 0x11cf, 0xab, 0x39, 0x00, 0x20, 0xaf, 0x71, 0xe4, 0x33); + +#endif /* __WINE_RMXFGUID_H */

1 0

Mike McCormack : kernel32: Implement EndUpdateResource for the case existing resources are deleted.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 4d72d7897f0b5b961be6f1adfd22a3d53cc20a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d72d7897f0b5b961be6f1adf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 8 18:08:15 2007 +0900 kernel32: Implement EndUpdateResource for the case existing resources are deleted. --- dlls/kernel32/resource.c | 433 +++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/resource.c | 21 ++- 2 files changed, 439 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d72d7897f0b5b961be6f…

1 0

Samuel Lidén Borell : kernel32: Add SetTermsrvAppInstallMode stub.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: a7c9970762780b16ee1ecfef4f330b518aef06c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c9970762780b16ee1ecfef4… Author: Samuel Lidén Borell <samuellb(a)bredband.net> Date: Mon Jan 8 16:16:45 2007 +0100 kernel32: Add SetTermsrvAppInstallMode stub. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/version.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 903557f..fa52d1b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1024,7 +1024,7 @@ @ stdcall SetSystemTimeAdjustment(long long) @ stdcall SetTapeParameters(ptr long ptr) @ stdcall SetTapePosition(ptr long long long long long) -@ stub SetTermsrvAppInstallMode +@ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall SetThreadContext(long ptr) @ stdcall SetThreadExecutionState(long) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 811c426..3160983 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -374,3 +374,19 @@ BOOL WINAPI TermsrvAppInstallMode(void) FIXME("stub\n"); return FALSE; } + +/*********************************************************************** + * SetTermsrvAppInstallMode (KERNEL32.@) + * + * This function is said to switch between the INSTALL (TRUE) or + * EXECUTE (FALSE) terminal server modes. + * + * This function always returns zero on WinXP Home so it's probably + * safe to return that value in most cases. However, if a terminal + * server is running it will probably return something else. + */ +DWORD WINAPI SetTermsrvAppInstallMode(BOOL bInstallMode) +{ + FIXME("(%d): stub\n", bInstallMode); + return 0; +}

1 0

Felix Nawothnig : treeview: Initialize iImage and iSelectedImage with zero.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 2eb171c1f559fcc79068e3e61789469a0281a74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb171c1f559fcc79068e3e61… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Tue Jan 9 08:03:39 2007 +0100 treeview: Initialize iImage and iSelectedImage with zero. --- dlls/comctl32/tests/treeview.c | 8 ++++++++ dlls/comctl32/treeview.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index adf0ea4..ba14dd6 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -70,6 +70,7 @@ static void IdentifyItem(HTREEITEM hItem static void FillRoot(void) { TVINSERTSTRUCTA ins; + TVITEM tvi; static CHAR root[] = "Root", child[] = "Child"; @@ -82,6 +83,13 @@ static void FillRoot(void) hRoot = TreeView_InsertItem(hTree, &ins); assert(hRoot); + /* UMLPad 1.15 depends on this being not -1 (I_IMAGECALLBACK) */ + tvi.hItem = hRoot; + tvi.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; + SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tvi ); + ok(tvi.iImage == 0, "tvi.iImage=%d\n", tvi.iImage); + ok(tvi.iSelectedImage == 0, "tvi.iSelectedImage=%d\n", tvi.iSelectedImage); + AddItem('B'); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index aefce78..4fb2a32 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1010,8 +1010,12 @@ TREEVIEW_AllocateItem(TREEVIEW_INFO *inf if (!newItem) return NULL; - newItem->iImage = -1; - newItem->iSelectedImage = -1; + /* I_IMAGENONE would make more sense but this is neither what is + * documented (MSDN doesn't specify) nor what Windows actually does + * (it sets it to zero)... and I can so imagine an application using + * inc/dec to toggle the images. */ + newItem->iImage = 0; + newItem->iSelectedImage = 0; if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) {

1 0

Patrik Stridvall : make_makefiles: Add *_crosstest.exe to .gitignore.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 8ef6b39c9f158f88caf71d677c85a2ec1d655615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef6b39c9f158f88caf71d677… Author: Patrik Stridvall <patrik(a)stridvall.se> Date: Mon Jan 8 00:12:25 2007 +0100 make_makefiles: Add *_crosstest.exe to .gitignore. --- .gitignore | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 6 +++- 2 files changed, 59 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ef6b39c9f158f88caf71…

1 0

Ken Thomases : kernel32: Don't release preferred_locales until we' re done with its members.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 5a220321dfd96ded46ee95d9ae971f552ba5ffe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a220321dfd96ded46ee95d9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 8 22:28:07 2007 -0600 kernel32: Don't release preferred_locales until we're done with its members. --- dlls/kernel32/locale.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index fcb8f18..845234d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2842,12 +2842,8 @@ void LOCALE_Init(void) */ all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); - if (preferred_locales) - { - if (CFArrayGetCount( preferred_locales )) - user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ); - CFRelease( preferred_locales ); - } + if (preferred_locales && CFArrayGetCount( preferred_locales )) + user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ); CFRelease( all_locales ); #endif /* __APPLE__ */ @@ -2868,6 +2864,8 @@ void LOCALE_Init(void) lcid_LC_MESSAGES = locale_name.lcid; TRACE( "setting lcid_LC_MESSAGES to '%s'\n", user_locale ); } + if (preferred_locales) + CFRelease( preferred_locales ); #endif NtSetDefaultUILanguage( LANGIDFROMLCID(lcid_LC_MESSAGES) );

1 0

Michael Stefaniuc : dsound: Remove stray '\' at end of lines.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 3cf9f84561b67a46d91cd70b66fc077817f8157c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf9f84561b67a46d91cd70b6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 9 00:39:23 2007 +0100 dsound: Remove stray '\' at end of lines. --- dlls/dsound/sound3d.c | 12 ++++++------ dlls/dsound/tests/propset.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 6f16686..234c40b 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -70,7 +70,7 @@ static inline D3DVALUE ScalarProduct (LP { D3DVALUE c; c = (a->x*b->x) + (a->y*b->y) + (a->z*b->z); - TRACE("(%f,%f,%f) * (%f,%f,%f) = %f)\n", a->x, a->y, a->z, b->x, b->y, \ + TRACE("(%f,%f,%f) * (%f,%f,%f) = %f)\n", a->x, a->y, a->z, b->x, b->y, b->z, c); return c; } @@ -82,7 +82,7 @@ static inline D3DVECTOR VectorProduct (L c.x = (a->y*b->z) - (a->z*b->y); c.y = (a->z*b->x) - (a->x*b->z); c.z = (a->x*b->y) - (a->y*b->x); - TRACE("(%f,%f,%f) x (%f,%f,%f) = (%f,%f,%f)\n", a->x, a->y, a->z, b->x, b->y, \ + TRACE("(%f,%f,%f) x (%f,%f,%f) = (%f,%f,%f)\n", a->x, a->y, a->z, b->x, b->y, b->z, c.x, c.y, c.z); return c; } @@ -304,7 +304,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBuf /* formula taken from Gianicoli D.: Physics, 4th edition: */ /* FIXME: replace dsb->freq with appropriate frequency ! */ flFreq = dsb->freq * ((DEFAULT_VELOCITY + flListenerVel)/(DEFAULT_VELOCITY + flBufferVel)); - TRACE("doppler: Buffer velocity (component) = %lf, Listener velocity (component) = %lf => Doppler shift: %ld Hz -> %lf Hz\n", flBufferVel, flListenerVel, \ + TRACE("doppler: Buffer velocity (component) = %lf, Listener velocity (component) = %lf => Doppler shift: %ld Hz -> %lf Hz\n", flBufferVel, flListenerVel, dsb->freq, flFreq); /* FIXME: replace following line with correct frequency setting ! */ dsb->freq = flFreq; @@ -860,8 +860,8 @@ static HRESULT WINAPI IDirectSound3DList LPD3DVECTOR lpvOrientTop) { IDirectSound3DListenerImpl *This = (IDirectSound3DListenerImpl *)iface; - TRACE("returning: OrientFront vector = (%f,%f,%f); OrientTop vector = (%f,%f,%f)\n", This->device->ds3dl.vOrientFront.x, \ - This->device->ds3dl.vOrientFront.y, This->device->ds3dl.vOrientFront.z, This->device->ds3dl.vOrientTop.x, This->device->ds3dl.vOrientTop.y, \ + TRACE("returning: OrientFront vector = (%f,%f,%f); OrientTop vector = (%f,%f,%f)\n", This->device->ds3dl.vOrientFront.x, + This->device->ds3dl.vOrientFront.y, This->device->ds3dl.vOrientFront.z, This->device->ds3dl.vOrientTop.x, This->device->ds3dl.vOrientTop.y, This->device->ds3dl.vOrientTop.z); *lpvOrientFront = This->device->ds3dl.vOrientFront; *lpvOrientTop = This->device->ds3dl.vOrientTop; @@ -956,7 +956,7 @@ static HRESULT WINAPI IDirectSound3DList DWORD dwApply) { IDirectSound3DListenerImpl *This = (IDirectSound3DListenerImpl *)iface; - TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %d\n", \ + TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %d\n", xFront, yFront, zFront, xTop, yTop, zTop, dwApply); This->device->ds3dl.vOrientFront.x = xFront; This->device->ds3dl.vOrientFront.y = yFront; diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 3beebf2..3c9a3d4 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -36,17 +36,17 @@ #include "initguid.h" -DEFINE_GUID(DSPROPSETID_VoiceManager, \ +DEFINE_GUID(DSPROPSETID_VoiceManager, 0x62A69BAE,0xDF9D,0x11D1,0x99,0xA6,0x00,0xC0,0x4F,0xC9,0x9D,0x46); -DEFINE_GUID(DSPROPSETID_EAX20_ListenerProperties, \ +DEFINE_GUID(DSPROPSETID_EAX20_ListenerProperties, 0x306a6a8,0xb224,0x11d2,0x99,0xe5,0x0,0x0,0xe8,0xd8,0xc7,0x22); -DEFINE_GUID(DSPROPSETID_EAX20_BufferProperties, \ +DEFINE_GUID(DSPROPSETID_EAX20_BufferProperties, 0x306a6a7,0xb224,0x11d2,0x99,0xe5,0x0,0x0,0xe8,0xd8,0xc7,0x22); -DEFINE_GUID(DSPROPSETID_I3DL2_ListenerProperties, \ +DEFINE_GUID(DSPROPSETID_I3DL2_ListenerProperties, 0xDA0F0520,0x300A,0x11D3,0x8A,0x2B,0x00,0x60,0x97,0x0D,0xB0,0x11); -DEFINE_GUID(DSPROPSETID_I3DL2_BufferProperties, \ +DEFINE_GUID(DSPROPSETID_I3DL2_BufferProperties, 0xDA0F0521,0x300A,0x11D3,0x8A,0x2B,0x00,0x60,0x97,0x0D,0xB0,0x11); -DEFINE_GUID(DSPROPSETID_ZOOMFX_BufferProperties, \ +DEFINE_GUID(DSPROPSETID_ZOOMFX_BufferProperties, 0xCD5368E0,0x3450,0x11D3,0x8B,0x6E,0x00,0x10,0x5A,0x9B,0x7B,0xBC); typedef HRESULT (CALLBACK * MYPROC)(REFCLSID, REFIID, LPVOID *);

1 0