May 2007 - Wine-Commits - list.winehq.org

Francois Gouget : schannel: The PSDK defines no SECPKG_FUNCTION_TABLE_SIZE_* macro.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: ecaeeb2c9b7d20a8708219ede00a0bb35498b13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecaeeb2c9b7d20a8708219ede… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:36:30 2007 +0200 schannel: The PSDK defines no SECPKG_FUNCTION_TABLE_SIZE_* macro. --- dlls/schannel/tests/main.c | 7 +++++++ include/ntsecpkg.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index d09a17c..88cafc7 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -32,6 +32,13 @@ #include "wine/test.h" +/* Helper macros to find the size of SECPKG_FUNCTION_TABLE */ +#define SECPKG_FUNCTION_TABLE_SIZE_1 offsetof(SECPKG_FUNCTION_TABLE, \ + SpSetContextAttributes) +#define SECPKG_FUNCTION_TABLE_SIZE_2 offsetof(SECPKG_FUNCTION_TABLE, \ + SetCredentialsAttributes) +#define SECPKG_FUNCTION_TABLE_SIZE_3 sizeof(SECPKG_FUNCTION_TABLE) + static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); static NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG, diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 8cca976..b8ef222 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -405,13 +405,6 @@ typedef struct SECPKG_FUNCTION_TABLE { } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE; -/* Helper macros to find the size of SECPKG_FUNCTION_TABLE */ -#define SECPKG_FUNCTION_TABLE_SIZE_1 offsetof(SECPKG_FUNCTION_TABLE, \ - SpSetContextAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_2 offsetof(SECPKG_FUNCTION_TABLE, \ - SetCredentialsAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_3 sizeof(SECPKG_FUNCTION_TABLE) - /* dispatch tables of user-mode functions implemented by SSP/AP */ typedef struct SECPKG_USER_FUNCTION_TABLE { SpInstanceInitFn *InstanceInit;

1 0

Francois Gouget : include: The PSDK does not define the DEFINE_SHLGUID() macro anymore.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: efba2935823f5884f8e40dbacd90c45c8d15f4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=efba2935823f5884f8e40dbac… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:37:55 2007 +0200 include: The PSDK does not define the DEFINE_SHLGUID() macro anymore. --- dlls/mshtml/tests/htmldoc.c | 2 +- include/shlguid.h | 88 +++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 37e7f5a..2627a85 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -35,7 +35,7 @@ #include "shlguid.h" #include "initguid.h" -DEFINE_SHLGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE diff --git a/include/shlguid.h b/include/shlguid.h index 1214a2d..ed677c0 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -19,62 +19,60 @@ #ifndef __WINE_SHLGUID_H #define __WINE_SHLGUID_H -#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2) +DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); +DEFINE_OLEGUID(CLSID_ShellLink, 0x00021401L, 0, 0); -DEFINE_SHLGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); -DEFINE_SHLGUID(CLSID_ShellLink, 0x00021401L, 0, 0); - -DEFINE_SHLGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); -DEFINE_SHLGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); -DEFINE_SHLGUID(CATID_DeskBand, 0x00021492L, 0, 0); -DEFINE_SHLGUID(CATID_InfoBand, 0x00021493L, 0, 0); -DEFINE_SHLGUID(CATID_CommBand, 0x00021494L, 0, 0); +DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); +DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); +DEFINE_OLEGUID(CATID_DeskBand, 0x00021492L, 0, 0); +DEFINE_OLEGUID(CATID_InfoBand, 0x00021493L, 0, 0); +DEFINE_OLEGUID(CATID_CommBand, 0x00021494L, 0, 0); /* shell32 formatids */ -DEFINE_SHLGUID(FMTID_Intshcut, 0x000214A0L, 0, 0); -DEFINE_SHLGUID(FMTID_InternetSite, 0x000214A1L, 0, 0); +DEFINE_OLEGUID(FMTID_Intshcut, 0x000214A0L, 0, 0); +DEFINE_OLEGUID(FMTID_InternetSite, 0x000214A1L, 0, 0); /* command group ids */ -DEFINE_SHLGUID(CGID_Explorer, 0x000214D0L, 0, 0); -DEFINE_SHLGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); -DEFINE_SHLGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); -DEFINE_SHLGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); - -DEFINE_SHLGUID(IID_IShellIcon, 0x000214E5L, 0, 0); -DEFINE_SHLGUID(IID_IShellDetails, 0x000214ECL, 0, 0); -DEFINE_SHLGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); -DEFINE_SHLGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerA, 0x000214F0L, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0); -DEFINE_SHLGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerW, 0x000214F8L, 0, 0); -DEFINE_SHLGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0); -DEFINE_SHLGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); -DEFINE_SHLGUID(IID_IQueryInfo, 0x00021500L, 0, 0); +DEFINE_OLEGUID(CGID_Explorer, 0x000214D0L, 0, 0); +DEFINE_OLEGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); +DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); +DEFINE_OLEGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); + +DEFINE_OLEGUID(IID_IShellIcon, 0x000214E5L, 0, 0); +DEFINE_OLEGUID(IID_IShellDetails, 0x000214ECL, 0, 0); +DEFINE_OLEGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerA, 0x000214F0L, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0); +DEFINE_OLEGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerW, 0x000214F8L, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0); +DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); +DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500L, 0, 0); DEFINE_GUID(IID_IACList, 0x77A130B0L,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); DEFINE_GUID(IID_IACList2, 0x470141A0L,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); DEFINE_GUID(IID_IObjMgr, 0x00BB2761L,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); /* avoid duplicate definitions with shobjidl.h (FIXME) */ -/* DEFINE_SHLGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ -/* DEFINE_SHLGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellView, 0x000214E3L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ -/* DEFINE_SHLGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ -/* DEFINE_SHLGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ +/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory

1 0

Francois Gouget : shlwapi/tests: The PSDK does not define IID_IDelayedRelease anymore.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 40838cec781fa461f00cb759d9b6ce39fd91edb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40838cec781fa461f00cb759d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:37:37 2007 +0200 shlwapi/tests: The PSDK does not define IID_IDelayedRelease anymore. --- dlls/shlwapi/tests/clsid.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index 66712a5..8f0830c 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -31,6 +31,9 @@ #define INITGUID #include "initguid.h" +/* This GUID has been removed from the PSDK */ +DEFINE_OLEGUID(WINE_IID_IDelayedRelease, 0x000214EDL, 0, 0); + /* Function ptrs for ordinal calls */ static HMODULE hShlwapi = 0; static BOOL (WINAPI *pSHLWAPI_269)(LPCSTR, CLSID *) = 0; @@ -59,7 +62,7 @@ const GUID * TEST_guids[] = { &IID_IPersistFolder, &IID_IExtractIconA, &IID_IShellDetails, - &IID_IDelayedRelease, + &WINE_IID_IDelayedRelease, &IID_IShellLinkA, &IID_IShellCopyHookA, &IID_IFileViewerA,

1 0

Francois Gouget : shell32/tests: With recent PSDKs, CSIDL_MYDOCUMENTS is a synonym for CSIDL_PERSONAL. So define our own constant.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 258f2972aa3bd014915d4fe23abd843cd2c8782f URL: http://source.winehq.org/git/wine.git/?a=commit;h=258f2972aa3bd014915d4fe23… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:37:14 2007 +0200 shell32/tests: With recent PSDKs, CSIDL_MYDOCUMENTS is a synonym for CSIDL_PERSONAL. So define our own constant. --- dlls/shell32/tests/shellpath.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f793c2d..402ff42 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -197,6 +197,11 @@ static void loadShell32(void) #define CSIDL_PROFILES 0x003e #endif +/* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want + * here is its original value. + */ +#define OLD_CSIDL_MYDOCUMENTS 0x000c + /* A couple utility printing functions */ static const char *getFolderName(int folder) { @@ -217,7 +222,7 @@ static const char *getFolderName(int folder) CSIDL_TO_STR(CSIDL_SENDTO); CSIDL_TO_STR(CSIDL_BITBUCKET); CSIDL_TO_STR(CSIDL_STARTMENU); - CSIDL_TO_STR(CSIDL_MYDOCUMENTS); + CSIDL_TO_STR(OLD_CSIDL_MYDOCUMENTS); CSIDL_TO_STR(CSIDL_MYMUSIC); CSIDL_TO_STR(CSIDL_MYVIDEO); CSIDL_TO_STR(CSIDL_DESKTOPDIRECTORY);

1 0

Francois Gouget : In the PSDK HRESULT_FROM_WIN32() is now an inline function, and it is __HRESULT_FROM_WIN32() which is a macro.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: c85b74d63e770c378ca5836966f4c8ecd197ffed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c85b74d63e770c378ca583696… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:28:58 2007 +0200 In the PSDK HRESULT_FROM_WIN32() is now an inline function, and it is __HRESULT_FROM_WIN32() which is a macro. --- dlls/urlmon/tests/misc.c | 4 ++-- include/winerror.h | 14 +++++++++++++- include/winnt.h | 5 ++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 67e0d3d..375875b 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -373,9 +373,9 @@ static const struct { {url2, mimeTextHtml, S_OK}, {url3, mimeTextHtml, S_OK}, {url4, NULL, E_FAIL}, - {url5, NULL, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, + {url5, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, {url6, NULL, E_FAIL}, - {url7, NULL, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} + {url7, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} }; static BYTE data1[] = "test data\n"; diff --git a/include/winerror.h b/include/winerror.h index 437cc83..6eb6822 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -81,8 +81,20 @@ #define HRESULT_SEVERITY(hr) (((hr) >> 31) & 0x1) #define SCODE_SEVERITY(sc) (((sc) >> 31) & 0x1) +#define __HRESULT_FROM_WIN32(x) ((x) ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0 ) +#ifndef _HRESULT_DEFINED +#define _HRESULT_DEFINED +# ifdef _MSC_VER +typedef long HRESULT; +# else +typedef int HRESULT; +# endif +#endif +static inline HRESULT HRESULT_FROM_WIN32(unsigned long x) +{ + return x ? ((HRESULT) ((x & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0; +} #define FACILITY_NT_BIT 0x10000000 -#define HRESULT_FROM_WIN32(x) ((x) ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0 ) #define HRESULT_FROM_NT(x) ((HRESULT) ((x) | FACILITY_NT_BIT)) /* SCODE <-> HRESULT functions */ diff --git a/include/winnt.h b/include/winnt.h index 04f5cf6..71dbf6d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -398,10 +398,13 @@ typedef LPCSTR PCTSTR, LPCTSTR; /* Misc common WIN32 types */ typedef char CCHAR; -typedef LONG HRESULT; typedef DWORD LCID, *PLCID; typedef WORD LANGID; typedef DWORD EXECUTION_STATE; +#ifndef _HRESULT_DEFINED +#define _HRESULT_DEFINED +typedef LONG HRESULT; +#endif /* Handle type */

1 0

Francois Gouget : ddraw: Fix the name of DDSPD_IUNKNOWNPOINTER.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 47b6392b44dca86b8c61daa902bd35e73cca5e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b6392b44dca86b8c61daa90… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:24:21 2007 +0200 ddraw: Fix the name of DDSPD_IUNKNOWNPOINTER. --- dlls/ddraw/tests/dsurface.c | 14 +++++++------- include/ddraw.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 2d3f620..adafb87 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2163,15 +2163,15 @@ static void PrivateDataTest(void) } /* This fails */ - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, 0, DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, 0, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, 5, DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, 5, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, sizeof(IUnknown *) * 2, DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, sizeof(IUnknown *) * 2, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); ref = getref((IUnknown *) lpDD); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7 /* Abuse this tag */, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); ok(hr == DD_OK, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref + 1, "Object reference is %d, expected %d\n", ref2, ref + 1); @@ -2179,14 +2179,14 @@ static void PrivateDataTest(void) ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref, "Object reference is %d, expected %d\n", ref2, ref); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); ok(hr == DD_OK, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, surface7, sizeof(IUnknown *), DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, surface7, sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); ok(hr == DD_OK, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref, "Object reference is %d, expected %d\n", ref2, ref); - hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPTR); + hr = IDirectDrawSurface7_SetPrivateData(surface7, &IID_IDirectDrawSurface7, lpDD, sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); ok(hr == DD_OK, "IDirectDrawSurface7_SetPrivateData failed with %08x\n", hr); hr = IDirectDrawSurface7_GetPrivateData(surface7, &IID_IDirectDrawSurface7, &ptr, &size); ok(hr == DD_OK, "IDirectDrawSurface7_GetPrivateData failed with %08x\n", hr); diff --git a/include/ddraw.h b/include/ddraw.h index 0585ee6..4572d08 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -251,7 +251,7 @@ typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL; #define DDGFS_ISFLIPDONE 2L /* dwFlags for IDirectDrawSurface7::SetPrivateData */ -#define DDSPD_IUNKNOWNPTR 1L +#define DDSPD_IUNKNOWNPOINTER 1L #define DDSPD_VOLATILE 2L /* DDSCAPS.dwCaps */

1 0

Francois Gouget : comctl32/tests: The PSDK does not define ListView_InsertItemA() so don't use it.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: c9533adc522233069882b68af18503afa8ae2828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9533adc522233069882b68af… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:31:21 2007 +0200 comctl32/tests: The PSDK does not define ListView_InsertItemA() so don't use it. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 97c34a6..a64d4d3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -568,7 +568,7 @@ static void insert_item(HWND hwnd, int idx) item.iSubItem = 0; item.pszText = text; - rc = ListView_InsertItemA(hwnd, &item); + rc = ListView_InsertItem(hwnd, &item); expect(idx, rc); }

1 0

Francois Gouget : kernel32/tests: src[i] is a char so there is no point trying to stuff 0xcafedead into it.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: ed94ca1e4f9c65c977275b816e6c6ccd917093d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed94ca1e4f9c65c977275b816… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:30:42 2007 +0200 kernel32/tests: src[i] is a char so there is no point trying to stuff 0xcafedead into it. --- dlls/kernel32/tests/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index bcff9c4..a033096 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -84,7 +84,7 @@ static void test_VirtualAllocEx(void) src = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); dst = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); for (i = 0; i < alloc_size; i++) - src[i] = 0xcafedead + i; + src[i] = i & 0xff; ok(addr1 != NULL, "VirtualAllocEx error %u\n", GetLastError()); b = WriteProcessMemory(hProcess, addr1, src, alloc_size, &bytes_written);

1 0

Francois Gouget : d3d9/tests: Fix compilation with Visual C++ 2005.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: fd578240f22267dac3e053c0d96b18bc08e4d06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd578240f22267dac3e053c0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:25:46 2007 +0200 d3d9/tests: Fix compilation with Visual C++ 2005. --- dlls/d3d9/tests/visual.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0d7f35f..29d963f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -693,8 +693,10 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) { HRESULT hr; DWORD color; - /* NOTE: changing these values will not effect the tests with foggy vertex shader, as the values are hardcoded in the shader*/ - union {float f; DWORD i;} start={.f=0.9}, end={.f=0.1}; + union { + float f; + DWORD i; + } start, end; unsigned int i, j; /* basic vertex shader without fog computation ("non foggy") */ @@ -828,6 +830,10 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) }; + /* NOTE: changing these values will not affect the tests with foggy vertex shader, as the values are hardcoded in the shader*/ + start.f=0.9; + end.f=0.1; + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code2, &vertex_shader[2]);

1 0

Francois Gouget : user32/tests: SWP_STATECHANGED is an undocumented flag so define it ourselves. Fixes compilation with the PSDK.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 1ecd90a2223a4318f68c2c0fe733a1da5030e963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ecd90a2223a4318f68c2c0fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:22:25 2007 +0200 user32/tests: SWP_STATECHANGED is an undocumented flag so define it ourselves. Fixes compilation with the PSDK. --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 12da7f0..aaa47e3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -39,6 +39,7 @@ /* undocumented SWP flags - from SDK 3.1 */ #define SWP_NOCLIENTSIZE 0x0800 #define SWP_NOCLIENTMOVE 0x1000 +#define SWP_STATECHANGED 0x8000 #define SW_NORMALNA 0xCC /* undoc. flag in MinMaximize */

1 0