December 2008 - Wine-commits

Ricardo Filipe : include: Add header information for CDN_INCLUDEITEM notification.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 810508f7dee877dc6d7216ff5352e2d0a29e8e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=810508f7dee877dc6d7216ff5… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Dec 17 21:33:37 2008 +0000 include: Add header information for CDN_INCLUDEITEM notification. --- include/commdlg.h | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index 34e6b22..8d410bd 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -149,6 +149,25 @@ typedef struct DECL_WINELIB_TYPE_AW(OFNOTIFY) DECL_WINELIB_TYPE_AW(LPOFNOTIFY) +typedef struct _OFNOTIFYEXA +{ + NMHDR hdr; + LPOPENFILENAMEA lpOFN; + LPVOID psf; + LPVOID pidl; +} OFNOTIFYEXA, *LPOFNOTIFYEXA; + +typedef struct _OFNOTIFYEXW +{ + NMHDR hdr; + LPOPENFILENAMEW lpOFN; + LPVOID psf; + LPVOID pidl; +} OFNOTIFYEXW, *LPOFNOTIFYEXW; + +DECL_WINELIB_TYPE_AW(OFNOTIFYEX) +DECL_WINELIB_TYPE_AW(LPOFNOTIFYEX) + typedef UINT (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM); typedef struct { @@ -414,7 +433,6 @@ static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', #endif #define HELPMSGSTRING WINELIB_NAME_AW(HELPMSGSTRING) - #define CD_LBSELNOITEMS -1 #define CD_LBSELCHANGE 0 #define CD_LBSELSUB 1 @@ -430,6 +448,7 @@ static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', #define CDN_HELP (CDN_FIRST - 0x0004) #define CDN_FILEOK (CDN_FIRST - 0x0005) #define CDN_TYPECHANGE (CDN_FIRST - 0x0006) +#define CDN_INCLUDEITEM (CDN_FIRST - 0x0007) #define CDM_FIRST (WM_USER + 100) #define CDM_LAST (WM_USER + 200)

1 0

Roderick Colenbrander : wined3d: Add GL_ARB_texture_rg / GL_EXT_texture_swizzle support. These extensions are needed for more efficient R32F/RG32F support.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 7238bce79d6c465a7f03de478874399069e99954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7238bce79d6c465a7f03de478… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Dec 17 23:20:02 2008 +0100 wined3d: Add GL_ARB_texture_rg / GL_EXT_texture_swizzle support. These extensions are needed for more efficient R32F/RG32F support. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb7869a..149c330 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -82,6 +82,7 @@ static const struct { {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT, 0 }, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO, MAKEDWORD_VERSION(2, 0) }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE, 0 }, + {"GL_ARB_texture_rg", ARB_TEXTURE_RG, 0 }, {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND, 0 }, {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT, 0 }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM, 0 }, @@ -109,6 +110,7 @@ static const struct { {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE, 0 }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3, 0 }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB, 0 }, + {"GL_EXT_texture_swizzle", EXT_TEXTURE_SWIZZLE, 0 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC, 0 }, {"GL_EXT_texture_lod", EXT_TEXTURE_LOD, 0 }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index bca828d..2d9c18a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2037,6 +2037,39 @@ typedef void (WINE_GLAPI * PGLFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint le #define GL_RGBA16F_ARB 0x881A #define GL_RGB16F_ARB 0x881B #endif +/* GL_ARB_texture_rg */ +#ifndef GL_ARB_texture_rg +#define GL_RG 0x8227 +#define GL_RG_INTEGER 0x8228 +#define GL_R8 0x8229 +#define GL_R16 0x822A +#define GL_RG8 0x822B +#define GL_RG16 0x822C +#define GL_R16F 0x822D +#define GL_R32F 0x822E +#define GL_RG16F 0x822F +#define GL_RG32F 0x8230 +#define GL_R8I 0x8231 +#define GL_R8UI 0x8232 +#define GL_R16I 0x8233 +#define GL_R16UI 0x8234 +#define GL_R32I 0x8235 +#define GL_R32UI 0x8236 +#define GL_RG8I 0x8237 +#define GL_RG8UI 0x8238 +#define GL_RG16I 0x8239 +#define GL_RG16UI 0x823A +#define GL_RG32I 0x823B +#define GL_RG32UI 0x823C +#endif +/* GL_EXT_texture_swizzle */ +#ifndef GL_EXT_texture_swizzle +#define GL_TEXTURE_SWIZZLE_R_EXT 0x8E42 +#define GL_TEXTURE_SWIZZLE_G_EXT 0x8E43 +#define GL_TEXTURE_SWIZZLE_B_EXT 0x8E44 +#define GL_TEXTURE_SWIZZLE_A_EXT 0x8E45 +#define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8E46 +#endif /* GL_ARB_half_float_pixel */ #ifndef GL_ARB_half_float_pixel #define GL_ARB_half_float_pixel @@ -3317,6 +3350,7 @@ typedef enum _GL_SupportedExt { ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, + ARB_TEXTURE_RG, ARB_VERTEX_PROGRAM, ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT, @@ -3347,6 +3381,7 @@ typedef enum _GL_SupportedExt { EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_SRGB, + EXT_TEXTURE_SWIZZLE, EXT_GPU_PROGRAM_PARAMETERS, /* NVIDIA */ NV_HALF_FLOAT,

1 0

Ricardo Filipe : include: Add DEVNODEID and DEVINSTID definitions.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 27a537d13fa849f9b91759b44b12a31366ba14f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a537d13fa849f9b91759b44… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Thu Dec 18 09:48:16 2008 +0000 include: Add DEVNODEID and DEVINSTID definitions. --- include/cfgmgr32.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 5862fa6..635ac98 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -21,6 +21,13 @@ /* FIXME: #include <cfg.h> */ +/* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ +#ifdef WINE_NO_UNICODE_MACROS +# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */ +#else +# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; +#endif + #define CMAPI typedef DWORD CONFIGRET; @@ -97,6 +104,11 @@ typedef DWORD CONFIGRET; typedef DWORD DEVINST, *PDEVINST; typedef DWORD DEVNODE, *PDEVNODE; typedef HANDLE HMACHINE, *PHMACHINE; +typedef CHAR *DEVNODEID_A, *DEVINSTID_A; +typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; + +DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) +DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) #ifdef __cplusplus extern "C" { @@ -122,4 +134,6 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); } #endif +#undef DECL_WINELIB_CFGMGR32_TYPE_AW + #endif /* _CFGMGR32_H_ */

1 0

Francois Gouget : wineoss.drv: Fix the m[io]dMessage() documentation.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 2b8b8b837c9269a8b5f8cfda0f79d6b59ef174f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8b8b837c9269a8b5f8cfda0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 19 09:15:25 2008 +0100 wineoss.drv: Fix the m[io]dMessage() documentation. --- dlls/wineoss.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index a3a6329..7d995c2 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1699,7 +1699,7 @@ LRESULT OSS_MidiExit(void) *======================================================================*/ /************************************************************************** - * midMessage (WINEOSS.4) + * midMessage (WINEOSS.@) */ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) @@ -1742,7 +1742,7 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, } /************************************************************************** - * modMessage (WINEOSS.5) + * modMessage (WINEOSS.@) */ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2)

1 0

Francois Gouget : winealsa.drv: Fix the m[io]dMessage() documentation.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: f36172ff14a0e36b55a9d211983bc4fdac7fb90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36172ff14a0e36b55a9d2119… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 19 09:15:32 2008 +0100 winealsa.drv: Fix the m[io]dMessage() documentation. --- dlls/winealsa.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index bcb39cd..dedfe02 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1314,7 +1314,7 @@ LONG ALSA_MidiInit(void) } /************************************************************************** - * midMessage (WINEOSS.4) + * midMessage (WINEALSA.@) */ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) @@ -1357,7 +1357,7 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, } /************************************************************************** - * modMessage (WINEOSS.5) + * modMessage (WINEALSA.@) */ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2)

1 0

Lei Zhang : quartz: Ignore unknown chunks when parsing AVI headers.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: d17609ad9270a0ebd28399bc187268d7f8058daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17609ad9270a0ebd28399bc1… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 18 16:47:09 2008 -0800 quartz: Ignore unknown chunks when parsing AVI headers. --- dlls/quartz/avisplit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 94d2c9b..1c9631d 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1081,7 +1081,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, pos += sizeof(RIFFCHUNK) + list.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); - while (list.fcc == ckidAVIPADDING || (list.fcc == FOURCC_LIST && list.fccListType == ckidINFO)) + while (list.fcc == ckidAVIPADDING || (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE)) { pos += sizeof(RIFFCHUNK) + list.cb;

1 0

Juan Lang : include: Document definitions missing from cryptuiapi.h.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: deaf539f47cac0ef4ab05987e12cdaf10f6333c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deaf539f47cac0ef4ab05987e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 21:07:08 2008 -0800 include: Document definitions missing from cryptuiapi.h. --- include/cryptuiapi.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index 2670b78..510c7d1 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -335,6 +335,93 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore); +/* Definitions missing from PSDK's cryptuiapi.h, but documented on MSDN. */ +typedef BOOL (WINAPI *PFNCCERTDISPLAYPROC)(PCCERT_CONTEXT pCertContext, + HWND hWndSelCertDlg, void *pvCallbackData); + +/* Values for CRYPTUI_SELECTCERTIFICATE_STRUCT's dwFlags */ +#define CRYPTUI_SELECTCERT_MULTISELECT 0x00000001 + +typedef struct _CRYPTUI_SELECTCERTIFICATE_STRUCTA +{ + DWORD dwSize; + HWND hwndParent; + DWORD dwFlags; + LPCWSTR szTitle; + DWORD dwDontUseColumn; + LPCWSTR szDisplayString; + PFNCFILTERPROC pFilterCallback; + PFNCCERTDISPLAYPROC pDisplayCallback; + void *pvCallbackData; + DWORD cStores; + HCERTSTORE *rghStores; + DWORD cPropSheetPages; + LPCPROPSHEETPAGEW rgPropSheetPages; + HCERTSTORE hSelectedCertStore; +} CRYPTUI_SELECTCERTIFICATE_STRUCTA, *PCRYPTUI_SELECTCERTIFICATE_STRUCTA; +typedef const CRYPTUI_SELECTCERTIFICATE_STRUCTA * + PCCRYPTUI_SELECTCERTIFICATE_STRUCTA; + +typedef struct _CRYPTUI_SELECTCERTIFICATE_STRUCTW +{ + DWORD dwSize; + HWND hwndParent; + DWORD dwFlags; + LPCWSTR szTitle; + DWORD dwDontUseColumn; + LPCWSTR szDisplayString; + PFNCFILTERPROC pFilterCallback; + PFNCCERTDISPLAYPROC pDisplayCallback; + void *pvCallbackData; + DWORD cStores; + HCERTSTORE *rghStores; + DWORD cPropSheetPages; + LPCPROPSHEETPAGEW rgPropSheetPages; + HCERTSTORE hSelectedCertStore; +} CRYPTUI_SELECTCERTIFICATE_STRUCTW, *PCRYPTUI_SELECTCERTIFICATE_STRUCTW; +typedef const CRYPTUI_SELECTCERTIFICATE_STRUCTW * + PCCRYPTUI_SELECTCERTIFICATE_STRUCTW; + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA( + PCCRYPTUI_SELECTCERTIFICATE_STRUCTA pcsc); +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateW( + PCCRYPTUI_SELECTCERTIFICATE_STRUCTW pcsc); + +typedef struct tagCRYPTUI_VIEWSIGNERINFO_STRUCTA +{ + DWORD dwSize; + HWND hwndParent; + DWORD dwFlags; + LPCSTR szTitle; + CMSG_SIGNER_INFO *pSignerInfo; + HCRYPTMSG hMsg; + LPCSTR pszOID; + DWORD_PTR dwReserved; + DWORD cStores; + HCERTSTORE *rghStores; + DWORD cPropSheetPages; + LPCPROPSHEETPAGEA rgPropSheetPages; +} CRYPTUI_VIEWSIGNERINFO_STRUCTA, *PCRYPTUI_VIEWSIGNERINFO_STRUCTA; + +typedef struct tagCRYPTUI_VIEWSIGNERINFO_STRUCTW +{ + DWORD dwSize; + HWND hwndParent; + DWORD dwFlags; + LPCWSTR szTitle; + CMSG_SIGNER_INFO *pSignerInfo; + HCRYPTMSG hMsg; + LPCSTR pszOID; + DWORD_PTR dwReserved; + DWORD cStores; + HCERTSTORE *rghStores; + DWORD cPropSheetPages; + LPCPROPSHEETPAGEW rgPropSheetPages; +} CRYPTUI_VIEWSIGNERINFO_STRUCTW, *PCRYPTUI_VIEWSIGNERINFO_STRUCTW; + +BOOL WINAPI CryptUIDlgViewSignerInfoA(CRYPTUI_VIEWSIGNERINFO_STRUCTA *pcvsi); +BOOL WINAPI CryptUIDlgViewSignerInfoW(CRYPTUI_VIEWSIGNERINFO_STRUCTW *pcvsi); + #include <poppack.h> #ifdef __cplusplus

1 0

Juan Lang : cryptui: Partially implement CryptUIDlgViewContext.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 472f1bf50837d9cdd2ecdacef26d5119a29e8110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=472f1bf50837d9cdd2ecdacef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 21:17:36 2008 -0800 cryptui: Partially implement CryptUIDlgViewContext. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index 201282f..9c5a861 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -15,7 +15,7 @@ 15 stub CryptUIDlgViewCertificatePropertiesA 16 stub CryptUIDlgViewCertificatePropertiesW 17 stdcall CryptUIDlgViewCertificateW(ptr ptr) -18 stub CryptUIDlgViewContext +18 stdcall CryptUIDlgViewContext(long ptr ptr wstr long ptr) 19 stub CryptUIDlgViewSignerInfoA 20 stub CryptUIDlgViewSignerInfoW 21 stub CryptUIFreeCertificatePropertiesPagesA diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 83fffb1..6b00c37 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -2945,6 +2945,39 @@ BOOL WINAPI CryptUIDlgViewCertificateW( return ret; } +/*********************************************************************** + * CryptUIDlgViewContext (CRYPTUI.@) + */ +BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext, + HWND hwnd, LPCWSTR pwszTitle, DWORD dwFlags, LPVOID pvReserved) +{ + BOOL ret; + + TRACE("(%d, %p, %p, %s, %08x, %p)\n", dwContextType, pvContext, hwnd, + debugstr_w(pwszTitle), dwFlags, pvReserved); + + switch (dwContextType) + { + case CERT_STORE_CERTIFICATE_CONTEXT: + { + CRYPTUI_VIEWCERTIFICATE_STRUCTW viewInfo; + + memset(&viewInfo, 0, sizeof(viewInfo)); + viewInfo.dwSize = sizeof(viewInfo); + viewInfo.hwndParent = hwnd; + viewInfo.szTitle = pwszTitle; + viewInfo.pCertContext = pvContext; + ret = CryptUIDlgViewCertificateW(&viewInfo, NULL); + break; + } + default: + FIXME("unimplemented for context type %d\n", dwContextType); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + return ret; +} + static PCCERT_CONTEXT make_cert_from_file(LPCWSTR fileName) { HANDLE file;

1 0

Francois Gouget : wintrust/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: c36c161ce67c4d89746633331c58e9d5777a58cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36c161ce67c4d89746633331… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 19 09:15:18 2008 +0100 wintrust/tests: Add a trailing '\n' to ok() calls. --- dlls/wintrust/tests/crypt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 99f3066..6811fd4 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -362,7 +362,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) if (!GetTempFileNameA(CURR_DIR, "cat", 0, tmpfile)) return; DeleteFileA(tmpfile); file = CreateFileA(tmpfile, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); CloseHandle(file); ret = pCryptCATAdminAcquireContext(&hcatadmin, &dummy, 0); @@ -404,7 +404,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) DeleteFileA(tmpfile); file = CreateFileA(tmpfile, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); WriteFile(file, test_catalog, sizeof(test_catalog), &written, NULL); CloseHandle(file);

1 0

Vincent Povirk : shell32: Display error messages in ShellExecuteEx.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 5c24f70c8bcee41e7a4dd3c0142d170b2042f59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c24f70c8bcee41e7a4dd3c01… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 15 10:10:07 2008 -0600 shell32: Display error messages in ShellExecuteEx. --- dlls/shell32/shlexec.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 4dc3f12..8a65636 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1447,6 +1447,16 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, return retval; } +static void do_error_dialog( UINT_PTR retval, HWND hwnd ) +{ + WCHAR msg[2048]; + int error_code=GetLastError(); + + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL); + + MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); +} + /************************************************************************* * SHELL_execute [Internal] */ @@ -1458,7 +1468,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) static const WCHAR wHttp[] = {'h','t','t','p',':','/','/',0}; static const DWORD unsupportedFlags = SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY | - SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI | + SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; @@ -1592,6 +1602,8 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { retval = SHELL_execute_class( wszApplicationName, &sei_tmp, sei, execfunc ); + if (retval <= 32 && !(sei_tmp.fMask & SEE_MASK_FLAG_NO_UI)) + do_error_dialog(retval, sei_tmp.hwnd); HeapFree(GetProcessHeap(), 0, wszApplicationName); if (wszParameters != parametersBuffer) HeapFree(GetProcessHeap(), 0, wszParameters); @@ -1815,6 +1827,9 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) HeapFree(GetProcessHeap(), 0, wcmd); sei->hInstApp = (HINSTANCE)(retval > 32 ? 33 : retval); + + if (retval <= 32 && !(sei_tmp.fMask & SEE_MASK_FLAG_NO_UI)) + do_error_dialog(retval, sei_tmp.hwnd); return retval > 32; }

1 0