November 2009 - Wine-Commits

Hans Leidekker : rpcrt4: Implement RpcBindingInqAuthClient{, Ex}.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: 59e3d9b5c7a070a64d2507c372b9a41552659c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e3d9b5c7a070a64d2507c37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:22:53 2009 +0100 rpcrt4: Implement RpcBindingInqAuthClient{, Ex}. --- dlls/rpcrt4/rpc_binding.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 8 ++-- include/rpcdce.h | 22 ++++++++++++ 3 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 29e0709..622918d 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1493,6 +1493,90 @@ RpcBindingInqAuthInfoW( RPC_BINDING_HANDLE Binding, RPC_WSTR *ServerPrincName, U } /*********************************************************************** + * RpcBindingInqAuthClientA (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingInqAuthClientA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc ) +{ + return RpcBindingInqAuthClientExA(ClientBinding, Privs, ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, 0); +} + +/*********************************************************************** + * RpcBindingInqAuthClientW (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingInqAuthClientW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc ) +{ + return RpcBindingInqAuthClientExW(ClientBinding, Privs, ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, 0); +} + +/*********************************************************************** + * RpcBindingInqAuthClientExA (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingInqAuthClientExA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc, ULONG Flags ) +{ + RPC_STATUS status; + RPC_WSTR principal; + + TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, Flags); + + status = RpcBindingInqAuthClientExW(ClientBinding, Privs, ServerPrincName ? &principal : NULL, + AuthnLevel, AuthnSvc, AuthzSvc, Flags); + if (status == RPC_S_OK && ServerPrincName) + { + *ServerPrincName = (RPC_CSTR)RPCRT4_strdupWtoA(principal); + RpcStringFreeW(&principal); + if (!*ServerPrincName) return ERROR_OUTOFMEMORY; + } + + return status; +} + +/*********************************************************************** + * RpcBindingInqAuthClientExW (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc, ULONG Flags ) +{ + RpcBinding *bind = ClientBinding; + + TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, Flags); + + if (!bind->AuthInfo) return RPC_S_BINDING_HAS_NO_AUTH; + + if (Privs) *Privs = (RPC_AUTHZ_HANDLE)bind->AuthInfo->identity; + if (ServerPrincName) + { + *ServerPrincName = RPCRT4_strdupW(bind->AuthInfo->server_principal_name); + if (!*ServerPrincName) return ERROR_OUTOFMEMORY; + } + if (AuthnLevel) *AuthnLevel = bind->AuthInfo->AuthnLevel; + if (AuthnSvc) *AuthnSvc = bind->AuthInfo->AuthnSvc; + if (AuthzSvc) + { + FIXME("authorization service not implemented\n"); + *AuthzSvc = RPC_C_AUTHZ_NONE; + } + if (Flags) + FIXME("flags 0x%x not implemented\n", Flags); + + return RPC_S_OK; +} + +/*********************************************************************** * RpcBindingSetAuthInfoExA (RPCRT4.@) */ RPCRTAPI RPC_STATUS RPC_ENTRY diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0a04769..6ce9401 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -341,10 +341,10 @@ @ stdcall RpcBindingFree(ptr) @ stdcall RpcBindingFromStringBindingA(str ptr) @ stdcall RpcBindingFromStringBindingW(wstr ptr) -@ stub RpcBindingInqAuthClientA -@ stub RpcBindingInqAuthClientExA -@ stub RpcBindingInqAuthClientExW -@ stub RpcBindingInqAuthClientW +@ stdcall RpcBindingInqAuthClientA(ptr ptr ptr ptr ptr ptr) +@ stdcall RpcBindingInqAuthClientExA(ptr ptr ptr ptr ptr ptr long) +@ stdcall RpcBindingInqAuthClientExW(ptr ptr ptr ptr ptr ptr long) +@ stdcall RpcBindingInqAuthClientW(ptr ptr ptr ptr ptr ptr) @ stdcall RpcBindingInqAuthInfoA(ptr ptr ptr ptr ptr ptr) @ stdcall RpcBindingInqAuthInfoExA(ptr ptr ptr ptr ptr ptr long ptr) @ stdcall RpcBindingInqAuthInfoExW(ptr ptr ptr ptr ptr ptr long ptr) diff --git a/include/rpcdce.h b/include/rpcdce.h index de30561..dc2c8de 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -509,6 +509,28 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc ); #define RpcBindingInqAuthInfo WINELIB_NAME_AW(RpcBindingInqAuthInfo) +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqAuthClientA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc ); + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqAuthClientW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc ); +#define RpcBindingInqAuthClient WINELIB_NAME_AW(RpcBindingInqAuthClient) + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqAuthClientExA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc, ULONG Flags ); + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc, ULONG Flags ); +#define RpcBindingInqAuthClientEx WINELIB_NAME_AW(RpcBindingInqAuthClientEx) + RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThread(void*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void*,LONG);

1 0

Peter Urbanec : winex11: Implement AlphaBlend mode for the case where SourceConstantAlpha is combined with source alpha .
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: ab081aa84535e013b89a6c4c3a8a9fcee636840d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab081aa84535e013b89a6c4c3… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Wed Nov 11 02:58:41 2009 +1100 winex11: Implement AlphaBlend mode for the case where SourceConstantAlpha is combined with source alpha. --- dlls/winex11.drv/xrender.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 005296b..2eb1d1e 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1956,9 +1956,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid return FALSE; } - if ((blendfn.AlphaFormat & AC_SRC_ALPHA) && blendfn.SourceConstantAlpha != 0xff) - FIXME("Ignoring SourceConstantAlpha %d for AC_SRC_ALPHA\n", blendfn.SourceConstantAlpha); - if(dib.dsBm.bmBitsPixel != 32) { FIXME("not a 32 bpp dibsection\n"); return FALSE; @@ -1979,11 +1976,35 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid if (blendfn.AlphaFormat & AC_SRC_ALPHA) { - for(; y >= y2; y--) + if (blendfn.SourceConstantAlpha == 0xff) { - memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, - widthSrc * 4); - dstbits += (top_down ? -1 : 1) * widthSrc; + for (; y >= y2; y--) + { + memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, + widthSrc * 4); + dstbits += (top_down ? -1 : 1) * widthSrc; + } + } + else + { + /* SourceConstantAlpha combined with source alpha */ + for (; y >= y2; y--) + { + int x; + DWORD *srcbits = (DWORD *)((char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes) + xSrc; + for (x = 0; x < widthSrc; x++) + { + DWORD argb = *srcbits++; + BYTE *s = (BYTE *) &argb; + s[0] = (s[0] * blendfn.SourceConstantAlpha) / 255; + s[1] = (s[1] * blendfn.SourceConstantAlpha) / 255; + s[2] = (s[2] * blendfn.SourceConstantAlpha) / 255; + s[3] = (s[3] * blendfn.SourceConstantAlpha) / 255; + *dstbits++ = argb; + } + if (top_down) /* we traversed the row forward so we should go back by two rows */ + dstbits -= 2 * widthSrc; + } } } else

1 0

Hans Leidekker : include: Add protocol sequence constants.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: bdfaa8463b69d2b257483497c253e3459908946c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfaa8463b69d2b257483497c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:22:01 2009 +0100 include: Add protocol sequence constants. --- include/rpcdce.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index 5b714b5..de30561 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -108,6 +108,11 @@ typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_LISTEN_MAX_CALLS_DEFAULT 1234 #define RPC_C_PROTSEQ_MAX_REQS_DEFAULT 10 +#define RPC_PROTSEQ_TCP 0x1 +#define RPC_PROTSEQ_NMP 0x2 +#define RPC_PROTSEQ_LRPC 0x3 +#define RPC_PROTSEQ_HTTP 0x4 + /* RPC_POLICY EndpointFlags */ #define RPC_C_BIND_TO_ALL_NICS 0x1 #define RPC_C_USE_INTERNET_PORT 0x1

1 0

Alexandre Julliard : gdi32: Don' t update the metafile bounding box in ExtTextOut if there's no rectangle.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: 872feb47c4dbcf342e7017800535ccd5f9beba44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872feb47c4dbcf342e7017800… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 13:07:10 2009 +0100 gdi32: Don't update the metafile bounding box in ExtTextOut if there's no rectangle. --- dlls/gdi32/enhmfdrv/graphics.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index f0630d2..9c9cf6b 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -826,11 +826,10 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, pemr->rclBounds.bottom = y + textHeight + 1; } } + EMFDRV_UpdateBBox( dev, &pemr->rclBounds ); no_bounds: ret = EMFDRV_WriteRecord( dev, &pemr->emr ); - if(ret) - EMFDRV_UpdateBBox( dev, &pemr->rclBounds ); HeapFree( GetProcessHeap(), 0, pemr ); return ret; }

1 0

Vladimir Pankratov : jscript: Update Russian translation.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: 456835f360a1f2bec8a27693c1f042a1699f2085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456835f360a1f2bec8a27693c… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Nov 11 16:19:29 2009 +0500 jscript: Update Russian translation. --- dlls/jscript/jscript_Ru.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Ru.rc b/dlls/jscript/jscript_Ru.rc index 95745bd..9632d3f 100644 --- a/dlls/jscript/jscript_Ru.rc +++ b/dlls/jscript/jscript_Ru.rc @@ -44,6 +44,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Ожидается объект типа 'bool'" IDS_JSCRIPT_EXPECTED "Ожидается объект типа 'JScript'" IDS_REGEXP_SYNTAX_ERROR "Синтаксическая ошибка в регулярном выражении" + IDS_URI_INVALID_CHAR "URI содержит неверные символы" IDS_INVALID_LENGTH "Длиной массива должно быть конечное положительное число" IDS_ARRAY_EXPECTED "Ожидается объект типа 'Array'" }

1 0

Hans Leidekker : ole32: Return success from OleLockRunning when the object does not support IRunnableObject .
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: e265d534e4215855233b04cf701fd77c5e427e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e265d534e4215855233b04cf7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:21:11 2009 +0100 ole32: Return success from OleLockRunning when the object does not support IRunnableObject. --- dlls/ole32/ole2.c | 4 ++-- dlls/ole32/tests/ole2.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 3b87aac..c612f33 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1140,8 +1140,8 @@ HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCl return hres; } - else - return E_INVALIDARG; + + return S_OK; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 214c17e..8d23df5 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1556,6 +1556,45 @@ static void test_runnable(void) g_showRunnable = TRUE; } +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl UnknownVtbl = +{ + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release +}; + +static IUnknown Unknown = { &UnknownVtbl }; + +static void test_OleLockRunning(void) +{ + HRESULT hr; + + hr = OleLockRunning((LPUNKNOWN)&Unknown, TRUE, FALSE); + ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); +} + START_TEST(ole2) { DWORD dwRegister; @@ -1587,6 +1626,7 @@ START_TEST(ole2) test_data_cache(); test_default_handler(); test_runnable(); + test_OleLockRunning(); CoUninitialize(); }

1 0

Ilya Shpigor : extrac32: Implementation of the CAB archive extraction.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: 007586ea29859a2698a0c05ffe81045f9d94fbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=007586ea29859a2698a0c05ff… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Mon Nov 9 14:04:08 2009 +0300 extrac32: Implementation of the CAB archive extraction. --- programs/extrac32/Makefile.in | 2 +- programs/extrac32/extrac32.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in index 31aa7e0..78e4fef 100644 --- a/programs/extrac32/Makefile.in +++ b/programs/extrac32/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = extrac32.exe APPMODE = -mwindows -municode EXTRADEFS = -DWINE_NO_UNICODE -IMPORTS = shell32 user32 kernel32 +IMPORTS = shell32 setupapi user32 kernel32 C_SRCS = \ extrac32.c diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index e6fefc9..7e66458 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -21,12 +21,39 @@ #include <windows.h> #include <shellapi.h> +#include <setupapi.h> #include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(extrac32); +static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) +{ + FILE_IN_CABINET_INFO_W *pInfo; + FILEPATHS_W *pFilePaths; + + switch(Notification) + { + case SPFILENOTIFY_FILEINCABINET: + pInfo = (FILE_IN_CABINET_INFO_W*)Param1; + lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); + lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); + return FILEOP_DOIT; + case SPFILENOTIFY_FILEEXTRACTED: + pFilePaths = (FILEPATHS_W*)Param1; + WINE_TRACE("Extracted %s\n", wine_dbgstr_w(pFilePaths->Target)); + return NO_ERROR; + } + return NO_ERROR; +} + +static void extract(LPCWSTR cabfile, LPWSTR destdir) +{ + if (!SetupIterateCabinetW(cabfile, 0, ExtCabCallback, destdir)) + WINE_ERR("Could not extract cab file %s\n", wine_dbgstr_w(cabfile)); +} + int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show) { LPWSTR *argv; @@ -105,7 +132,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho break; case 'E': /* Extract CAB archive */ - WINE_FIXME("/E not implemented\n"); + extract(cabfile, path); break; case 0: case 'D':

1 0

Jörg Höhle : mciwave: Play/ Record return MCIERR_OUTOFRANGE as required.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: 23060afdcd0f34cf25a5e855ce06242f01ab3048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23060afdcd0f34cf25a5e855c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Oct 21 17:44:58 2009 +0200 mciwave: Play/Record return MCIERR_OUTOFRANGE as required. --- dlls/mciwave/mciwave.c | 75 +++++++++++++++++++++--------------------------- dlls/winmm/tests/mci.c | 44 +++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23060afdcd0f34cf25a5e…

1 0

Paul Vriens : shell32/tests: Run tests again on NT4.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: 8d5e5e74a1531ca13af0e64269e496ee6dbaad09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5e5e74a1531ca13af0e6426… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 11 09:09:29 2009 +0100 shell32/tests: Run tests again on NT4. --- dlls/shell32/tests/progman_dde.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 36ce835..e4867e1 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -59,6 +59,16 @@ #define DDE_TEST_NUMMASK 0x0000ffff +static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); + +static void init_function_pointers(void) +{ + HMODULE hmod; + + hmod = GetModuleHandleA("shell32.dll"); + pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); +} + static HDDEDATA CALLBACK DdeCallback(UINT type, UINT format, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hDDEData, ULONG_PTR data1, ULONG_PTR data2) { @@ -233,6 +243,9 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx DWORD attributes; int len; + if (!pSHGetSpecialFolderPathA) + return; + path = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); if (path != NULL) { @@ -243,13 +256,13 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx if (testParams & DDE_TEST_COMMON) { specialFolder = CSIDL_COMMON_PROGRAMS; - err = SHGetSpecialFolderPath(NULL, path, specialFolder, FALSE); + err = pSHGetSpecialFolderPathA(NULL, path, specialFolder, FALSE); /* Win 9x fails, use CSIDL_PROGRAMS (err == FALSE) */ } if (err == FALSE) { specialFolder = CSIDL_PROGRAMS; - err = SHGetSpecialFolderPath(NULL, path, specialFolder, FALSE); + err = pSHGetSpecialFolderPathA(NULL, path, specialFolder, FALSE); } len = strlen(path) + strlen(nameToCheck)+1; if (groupName != NULL) @@ -526,6 +539,12 @@ START_TEST(progman_dde) HCONV hConv; int testnum; + init_function_pointers(); + + /* Only report this once */ + if (!pSHGetSpecialFolderPathA) + win_skip("SHGetSpecialFolderPathA is not available\n"); + /* Initialize DDE Instance */ err = DdeInitialize(&instance, DdeCallback, APPCMD_CLIENTONLY, 0); ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err));

1 0

Jörg Höhle : mciwave: Store only slots from OpenParms that we need.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: e3bce34af53a9c64fda34a99a408febc525e628a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bce34af53a9c64fda34a99a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Nov 5 23:10:06 2009 +0100 mciwave: Store only slots from OpenParms that we need. --- dlls/mciwave/mciwave.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 9380003..6879a57 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -41,8 +41,9 @@ typedef struct { HANDLE hWave; int nUseCount; /* Incremented for each shared open */ HMMIO hFile; /* mmio file handle open as Element */ - MCI_WAVE_OPEN_PARMSW openParms; + MCIDEVICEID wNotifyDeviceID; /* MCI device ID with a pending notification */ HANDLE hCallback; /* Callback handle for pending notification */ + LPWSTR lpFileName; /* Name of file (if any) */ WAVEFORMATEX wfxRef; LPWAVEFORMATEX lpWaveFormat; /* Points to wfxRef until set by OPEN or RECORD */ BOOL fInput; /* FALSE = Output, TRUE = Input */ @@ -210,7 +211,7 @@ static WINE_MCIWAVE *WAVE_mciGetOpenDev(MCIDEVICEID wDevID) */ static void WAVE_mciNotify(DWORD_PTR hWndCallBack, WINE_MCIWAVE* wmw, UINT wStatus) { - MCIDEVICEID wDevID = wmw->openParms.wDeviceID; + MCIDEVICEID wDevID = wmw->wNotifyDeviceID; HANDLE old = InterlockedExchangePointer(&wmw->hCallback, NULL); if (old) mciDriverNotify(old, wDevID, MCI_NOTIFY_SUPERSEDED); mciDriverNotify(HWND_32(LOWORD(hWndCallBack)), wDevID, wStatus); @@ -421,6 +422,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) if (!GetTempPathW(sizeof(szTmpPath)/sizeof(szTmpPath[0]), szTmpPath)) { WARN("can't retrieve temp path!\n"); + *pszTmpFileName = NULL; return MCIERR_FILE_NOT_FOUND; } @@ -450,16 +452,16 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) return dwRet; } -static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, const WCHAR* filename) +static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, LPCWSTR filename) { LRESULT dwRet = MMSYSERR_NOERROR; - WCHAR* fn; + LPWSTR fn; fn = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!fn) return MCIERR_OUT_OF_MEMORY; strcpyW(fn, filename); - HeapFree(GetProcessHeap(), 0, (void*)wmw->openParms.lpstrElementName); - wmw->openParms.lpstrElementName = fn; + HeapFree(GetProcessHeap(), 0, (void*)wmw->lpFileName); + wmw->lpFileName = fn; if (strlenW(filename) > 0) { /* FIXME : what should be done if wmw->hFile is already != 0, or the driver is playin' */ @@ -528,13 +530,12 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P wmw->hWave = 0; wmw->dwStatus = MCI_MODE_NOT_READY; wmw->hFile = 0; - memcpy(&wmw->openParms, lpOpenParms, sizeof(MCI_WAVE_OPEN_PARMSA)); - /* will be set by WAVE_mciOpenFile */ - wmw->openParms.lpstrElementName = NULL; + wmw->lpFileName = NULL; /* will be set by WAVE_mciOpenFile */ wmw->hCallback = NULL; WAVE_mciDefaultFmt(wmw); TRACE("wDevID=%04X (lpParams->wDeviceID=%08X)\n", wDevID, lpOpenParms->wDeviceID); + wmw->wNotifyDeviceID = lpOpenParms->wDeviceID; if (dwFlags & MCI_OPEN_ELEMENT) { if (dwFlags & MCI_OPEN_ELEMENT_ID) { @@ -672,8 +673,8 @@ static DWORD WAVE_mciClose(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM if (wmw->lpWaveFormat != &wmw->wfxRef) HeapFree(GetProcessHeap(), 0, wmw->lpWaveFormat); wmw->lpWaveFormat = &wmw->wfxRef; - HeapFree(GetProcessHeap(), 0, (void*)wmw->openParms.lpstrElementName); - wmw->openParms.lpstrElementName = NULL; + HeapFree(GetProcessHeap(), 0, (void*)wmw->lpFileName); + wmw->lpFileName = NULL; if ((dwFlags & MCI_NOTIFY) && lpParms) { WAVE_mciNotify(lpParms->dwCallback, wmw, @@ -742,7 +743,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw->hFile == 0) { - WARN("Can't play: no file=%s!\n", debugstr_w(wmw->openParms.lpstrElementName)); + WARN("Can't play: no file=%s!\n", debugstr_w(wmw->lpFileName)); return MCIERR_FILE_NOT_FOUND; } @@ -804,7 +805,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, wmw->dwStatus = MCI_MODE_PLAY; if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wmw->openParms.wDeviceID, WAVE_mciPlay, dwFlags, + return MCI_SendCommandAsync(wmw->wNotifyDeviceID, WAVE_mciPlay, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } @@ -1008,7 +1009,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt wmw->dwStatus = MCI_MODE_RECORD; if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wmw->openParms.wDeviceID, WAVE_mciRecord, dwFlags, + return MCI_SendCommandAsync(wmw->wNotifyDeviceID, WAVE_mciRecord, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_RECORD_PARMS)); } @@ -1016,8 +1017,8 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt * we don't modify the wave part of an existing file (ie. we always erase an * existing content, we don't overwrite) */ - HeapFree(GetProcessHeap(), 0, (void*)wmw->openParms.lpstrElementName); - dwRet = create_tmp_file(&wmw->hFile, (WCHAR**)&wmw->openParms.lpstrElementName); + HeapFree(GetProcessHeap(), 0, (void*)wmw->lpFileName); + dwRet = create_tmp_file(&wmw->hFile, (WCHAR**)&wmw->lpFileName); if (dwRet != 0) return dwRet; /* new RIFF file, lpWaveFormat now valid */ @@ -1414,7 +1415,7 @@ static DWORD WAVE_mciSave(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SAVE_PARMSW l /* FIXME: Open file.wav; Save; must not rename the original file. * Nor must Save a.wav; Save b.wav rename a. */ - if (0 == mmioRenameW(wmw->openParms.lpstrElementName, lpParms->lpfilename, 0, 0 )) { + if (0 == mmioRenameW(wmw->lpFileName, lpParms->lpfilename, 0, 0 )) { ret = MMSYSERR_NOERROR; } @@ -1645,7 +1646,7 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { case MCI_INFO_PRODUCT: str = wszAudio; break; - case MCI_INFO_FILE: str = wmw->openParms.lpstrElementName; break; + case MCI_INFO_FILE: str = wmw->lpFileName; break; case MCI_WAVE_INPUT: str = wszWaveIn; break; case MCI_WAVE_OUTPUT: str = wszWaveOut; break; default:

1 0