February 2020 - Wine-commits

Francois Gouget : bcrypt: Make format_gnutls_signature() static.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: c9f9f836312a41b9754fc9ecbd49b046f0882b13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f9f836312a41b9754fc9ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 3 12:15:53 2020 +0100 bcrypt: Make format_gnutls_signature() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 868f898bbb..1d78b9f4d1 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1141,8 +1141,8 @@ static unsigned int get_signature_length( enum alg_id id ) } } -NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, UCHAR *output, - ULONG output_len, ULONG *ret_len ) +static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, + UCHAR *output, ULONG output_len, ULONG *ret_len ) { switch (type) {

1 0

Jacek Caban : jscript: Propagate Invoke error code using jsexcept_t.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 83fa76c25e89897766eb6abde3c266e129f1baa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83fa76c25e89897766eb6abd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:07 2020 +0100 jscript: Propagate Invoke error code using jsexcept_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index cdfbf9f57e..5b41f2702c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1974,7 +1974,8 @@ static HRESULT disp_invoke(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD f if(hres == DISP_E_EXCEPTION) { TRACE("DISP_E_EXCEPTION: %08x %s %s\n", ei.scode, debugstr_w(ei.bstrSource), debugstr_w(ei.bstrDescription)); - hres = SUCCEEDED(ei.scode) ? E_FAIL : ei.scode; + reset_ei(ctx->ei); + ctx->ei->error = (SUCCEEDED(ei.scode) || ei.scode == DISP_E_EXCEPTION) ? E_FAIL : ei.scode; SysFreeString(ei.bstrSource); SysFreeString(ei.bstrDescription); SysFreeString(ei.bstrHelpFile);

1 0

Nikolay Sivov : shdocvw: Forward WhichPlatform() to shlwapi.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: cf4a78b3e50946c274b2a5c0a31b43a2a8af71ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4a78b3e50946c274b2a5c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:07 2020 +0300 shdocvw: Forward WhichPlatform() to shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 11 ----------- include/shlwapi.h | 8 +++++++- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 485d1608db..aa1b5e0c96 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -2,7 +2,7 @@ 101 stdcall -noname IEWinMain(str long) 102 stub -noname CreateShortcutInDirA 103 stub -noname CreateShortcutInDirW -104 stdcall -noname WhichPlatformFORWARD() +104 stdcall -noname WhichPlatform() shlwapi.WhichPlatform 105 stub -noname CreateShortcutInDirEx 106 stub HlinkFindFrame 107 stub SetShellOfflineState diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 98d0d2cde2..ac3913dd23 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -283,17 +283,6 @@ static void* fetch_shlwapi_ordinal(UINT_PTR ord) return (void*)GetProcAddress(h, (const char*)ord); } -/****************************************************************** - * WhichPlatformFORWARD (SHDOCVW.@) - */ -DWORD WINAPI WhichPlatformFORWARD(void) -{ - static DWORD (WINAPI *p)(void); - - if (p || (p = fetch_shlwapi_ordinal(276))) return p(); - return 1; /* not integrated, see shlwapi.WhichPlatform */ -} - /****************************************************************** * StopWatchModeFORWARD (SHDOCVW.@) */ diff --git a/include/shlwapi.h b/include/shlwapi.h index 8d6801a94d..2bfca0bc90 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1135,7 +1135,6 @@ BOOL WINAPI IsOS(DWORD); #define FDTF_RTLDATE 0x00000200 #define FDTF_NOAUTOREADINGORDER 0x00000400 - typedef struct { const IID *piid; @@ -1144,6 +1143,13 @@ typedef struct HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv); +#define PLATFORM_UNKNOWN 0 +#define PLATFORM_IE3 1 +#define PLATFORM_BROWSERONLY 1 +#define PLATFORM_INTEGRATED 2 + +UINT WINAPI WhichPlatform(void); + #include <poppack.h> #ifdef __cplusplus

1 0

Nikolay Sivov : shlwapi: Use public definitions for WhichPlatform().
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 017c953d868b7313a16e465851fc3f46f62cd77d URL: https://source.winehq.org/git/wine.git/?a=commit;h=017c953d868b7313a16e4658… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:08 2020 +0300 shlwapi: Use public definitions for WhichPlatform(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 66 --------------------------------------------- dlls/shlwapi/shlwapi_main.c | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 66 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index c5c4fa14ad..dd39366c80 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2291,72 +2291,6 @@ BOOL WINAPI GUIDFromStringW(LPCWSTR idstr, CLSID *id) return SUCCEEDED(CLSIDFromString((LPCOLESTR)idstr, id)); } -/************************************************************************* - * @ [SHLWAPI.276] - * - * Determine if the browser is integrated into the shell, and set a registry - * key accordingly. - * - * PARAMS - * None. - * - * RETURNS - * 1, If the browser is not integrated. - * 2, If the browser is integrated. - * - * NOTES - * The key "HKLM\Software\Microsoft\Internet Explorer\IntegratedBrowser" is - * either set to TRUE, or removed depending on whether the browser is deemed - * to be integrated. - */ -DWORD WINAPI WhichPlatform(void) -{ - static const char szIntegratedBrowser[] = "IntegratedBrowser"; - static DWORD dwState = 0; - HKEY hKey; - DWORD dwRet, dwData, dwSize; - HMODULE hshell32; - - if (dwState) - return dwState; - - /* If shell32 exports DllGetVersion(), the browser is integrated */ - dwState = 1; - hshell32 = LoadLibraryA("shell32.dll"); - if (hshell32) - { - FARPROC pDllGetVersion; - pDllGetVersion = GetProcAddress(hshell32, "DllGetVersion"); - dwState = pDllGetVersion ? 2 : 1; - FreeLibrary(hshell32); - } - - /* Set or delete the key accordingly */ - dwRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Internet Explorer", 0, - KEY_ALL_ACCESS, &hKey); - if (!dwRet) - { - dwRet = RegQueryValueExA(hKey, szIntegratedBrowser, 0, 0, - (LPBYTE)&dwData, &dwSize); - - if (!dwRet && dwState == 1) - { - /* Value exists but browser is not integrated */ - RegDeleteValueA(hKey, szIntegratedBrowser); - } - else if (dwRet && dwState == 2) - { - /* Browser is integrated but value does not exist */ - dwData = TRUE; - RegSetValueExA(hKey, szIntegratedBrowser, 0, REG_DWORD, - (LPBYTE)&dwData, sizeof(dwData)); - } - RegCloseKey(hKey); - } - return dwState; -} - /************************************************************************* * @ [SHLWAPI.278] * diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index fc1b6d6137..af79c33cb6 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -108,3 +108,51 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); return E_INVALIDARG; } + +/************************************************************************* + * WhichPlatform() [SHLWAPI.276] + */ +UINT WINAPI WhichPlatform(void) +{ + static const char szIntegratedBrowser[] = "IntegratedBrowser"; + static DWORD state = PLATFORM_UNKNOWN; + DWORD ret, data, size; + HMODULE hshell32; + HKEY hKey; + + if (state) + return state; + + /* If shell32 exports DllGetVersion(), the browser is integrated */ + state = PLATFORM_BROWSERONLY; + hshell32 = LoadLibraryA("shell32.dll"); + if (hshell32) + { + FARPROC pDllGetVersion; + pDllGetVersion = GetProcAddress(hshell32, "DllGetVersion"); + state = pDllGetVersion ? PLATFORM_INTEGRATED : PLATFORM_BROWSERONLY; + FreeLibrary(hshell32); + } + + /* Set or delete the key accordingly */ + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Internet Explorer", 0, KEY_ALL_ACCESS, &hKey); + if (!ret) + { + size = sizeof(data); + ret = RegQueryValueExA(hKey, szIntegratedBrowser, 0, 0, (BYTE *)&data, &size); + if (!ret && state == PLATFORM_BROWSERONLY) + { + /* Value exists but browser is not integrated */ + RegDeleteValueA(hKey, szIntegratedBrowser); + } + else if (ret && state == PLATFORM_INTEGRATED) + { + /* Browser is integrated but value does not exist */ + data = TRUE; + RegSetValueExA(hKey, szIntegratedBrowser, 0, REG_DWORD, (BYTE *)&data, sizeof(data)); + } + RegCloseKey(hKey); + } + + return state; +}

1 0

Nikolay Sivov : shlwapi: Fix SHGetViewStatePropertyBag() prototype.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 8363316f620f00693fedea8a168276b53d9e86f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8363316f620f00693fedea8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:09 2020 +0300 shlwapi: Fix SHGetViewStatePropertyBag() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 27 --------------------------- dlls/shlwapi/shlwapi_main.c | 10 ++++++++++ include/shlwapi.h | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index dd39366c80..8767d0b579 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4284,33 +4284,6 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, return E_NOTIMPL; } -/*********************************************************************** - * SHGetViewStatePropertyBag [SHLWAPI.515] - * - * Retrieves a property bag in which the view state information of a folder - * can be stored. - * - * PARAMS - * pidl [I] PIDL of the folder requested - * bag_name [I] Name of the property bag requested - * flags [I] Optional flags - * riid [I] IID of requested property bag interface - * ppv [O] Address to receive pointer to the new interface - * - * RETURNS - * success: S_OK - * failure: error code - * - */ -HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name, - DWORD flags, REFIID riid, void **ppv) -{ - FIXME("%p %s %d %s %p STUB\n", pidl, debugstr_w(bag_name), flags, - debugstr_guid(riid), ppv); - - return E_NOTIMPL; -} - /*********************************************************************** * SHFormatDateTimeW [SHLWAPI.354] * diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index af79c33cb6..3717dfa712 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -156,3 +156,13 @@ UINT WINAPI WhichPlatform(void) return state; } + +/*********************************************************************** + * SHGetViewStatePropertyBag [SHLWAPI.515] + */ +HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name, DWORD flags, REFIID riid, void **ppv) +{ + FIXME("%p, %s, %#x, %s, %p stub.\n", pidl, debugstr_w(bag_name), flags, debugstr_guid(riid), ppv); + + return E_NOTIMPL; +} diff --git a/include/shlwapi.h b/include/shlwapi.h index 2bfca0bc90..4fd47d249f 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1150,6 +1150,20 @@ HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv); UINT WINAPI WhichPlatform(void); +#define SHGVSPB_PERUSER 0x00000001 +#define SHGVSPB_ALLUSERS 0x00000002 +#define SHGVSPB_PERFOLDER 0x00000004 +#define SHGVSPB_ALLFOLDERS 0x00000008 +#define SHGVSPB_INHERIT 0x00000010 +#define SHGVSPB_ROAM 0x00000020 +#define SHGVSPB_NOAUTODEFAULTS 0x80000000 +#define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) +#define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) +#define SHGVSPB_USERDEFAULTS (SHGVSPB_PERUSER | SHGVSPB_ALLFOLDERS) +#define SHGVSPB_GLOBALDEFAULTS (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS) + +HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bagname, DWORD flags, REFIID riid, void **ppv); + #include <poppack.h> #ifdef __cplusplus

1 0

Nikolay Sivov : shlwapi: Fix spec entries for SHFormatDateTime().
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 1d1aa186547da3a7805f6b805bbf9fcee7d0ae27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1aa186547da3a7805f6b80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:10 2020 +0300 shlwapi: Fix spec entries for SHFormatDateTime(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi.spec | 4 ++-- include/shlwapi.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 9b4b6357c6..f47f41aea4 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -350,8 +350,8 @@ 350 stdcall -noname GetFileVersionInfoSizeWrapW(wstr ptr) 351 stdcall -noname GetFileVersionInfoWrapW(wstr long long ptr) 352 stdcall -noname VerQueryValueWrapW(ptr wstr ptr ptr) -353 stdcall -ordinal SHFormatDateTimeA(ptr ptr str long) -354 stdcall -ordinal SHFormatDateTimeW(ptr ptr wstr long) +353 stdcall -ordinal SHFormatDateTimeA(ptr ptr ptr long) +354 stdcall -ordinal SHFormatDateTimeW(ptr ptr ptr long) 355 stdcall -noname IUnknown_EnableModeless(ptr long) 356 stdcall -noname CreateAllAccessSecurityAttributes(ptr ptr long) 357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long) diff --git a/include/shlwapi.h b/include/shlwapi.h index 4fd47d249f..02517a944a 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1135,6 +1135,9 @@ BOOL WINAPI IsOS(DWORD); #define FDTF_RTLDATE 0x00000200 #define FDTF_NOAUTOREADINGORDER 0x00000400 +int WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *filetime, DWORD *flags, LPSTR buffer, UINT size); +int WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *filetime, DWORD *flags, LPWSTR buffer, UINT size); + typedef struct { const IID *piid;

1 0

Nikolay Sivov : shlwapi: Add header entries for SHIsLowMemoryMachine().
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: b84d56fb04712d71148c9d51e36dab29e06614c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b84d56fb04712d71148c9d51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:11 2020 +0300 shlwapi: Add header entries for SHIsLowMemoryMachine(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 18 ------------------ dlls/shlwapi/shlwapi_main.c | 10 ++++++++++ include/shlwapi.h | 4 ++++ 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8767d0b579..8c9e324ae0 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3564,24 +3564,6 @@ HRESULT WINAPI SHGetInverseCMAP(LPDWORD dest, DWORD dwSize) return 0; } -/************************************************************************* - * SHIsLowMemoryMachine [SHLWAPI.@] - * - * Determine if the current computer has low memory. - * - * PARAMS - * x [I] FIXME - * - * RETURNS - * TRUE if the users machine has 16 Megabytes of memory or less, - * FALSE otherwise. - */ -BOOL WINAPI SHIsLowMemoryMachine (DWORD x) -{ - FIXME("(0x%08x) stub\n", x); - return FALSE; -} - /************************************************************************* * GetMenuPosFromID [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 3717dfa712..04abf30ffc 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -166,3 +166,13 @@ HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name return E_NOTIMPL; } + +/************************************************************************* + * SHIsLowMemoryMachine [SHLWAPI.@] + */ +BOOL WINAPI SHIsLowMemoryMachine(DWORD type) +{ + FIXME("%d stub\n", type); + + return FALSE; +} diff --git a/include/shlwapi.h b/include/shlwapi.h index 02517a944a..ca15bd2077 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1167,6 +1167,10 @@ UINT WINAPI WhichPlatform(void); HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bagname, DWORD flags, REFIID riid, void **ppv); +#define ILMM_IE4 0 + +BOOL WINAPI SHIsLowMemoryMachine(DWORD type); + #include <poppack.h> #ifdef __cplusplus

1 0

Nikolay Sivov : include: Add some newer Edit messages.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 8e48e120b63e9c22368f4ede1484b27e4f2e3d65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e48e120b63e9c22368f4ede… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:20:07 2020 +0300 include: Add some newer Edit messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 700b335fbb..b503f9ef24 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5346,6 +5346,24 @@ typedef struct _tagEDITBALLOONTIP #define EM_GETHILITE (ECM_FIRST + 6) #define EM_NOSETFOCUS (ECM_FIRST + 7) #define EM_TAKEFOCUS (ECM_FIRST + 8) +#define EM_SETEXTENDEDSTYLE (ECM_FIRST + 10) +#define EM_GETEXTENDEDSTYLE (ECM_FIRST + 11) +#define EM_SETENDOFLINE (ECM_FIRST + 12) +#define EM_GETENDOFLINE (ECM_FIRST + 13) +#define EM_ENABLESEARCHWEB (ECM_FIRST + 14) +#define EM_SEARCHWEB (ECM_FIRST + 15) +#define EM_SETCARETINDEX (ECM_FIRST + 17) +#define EM_GETCARETINDEX (ECM_FIRST + 18) +#define EM_FILELINEFROMCHAR (ECM_FIRST + 19) +#define EM_FILELINEINDEX (ECM_FIRST + 20) +#define EM_FILELINELENGTH (ECM_FIRST + 21) +#define EM_GETFILELINE (ECM_FIRST + 22) +#define EM_GETFILELINECOUNT (ECM_FIRST + 23) + +#define EM_GETZOOM (WM_USER + 224) +#define EM_SETZOOM (WM_USER + 225) + +#define EN_SEARCHWEB (EN_FIRST) #define Edit_SetCueBannerText(hwnd, text) \ (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, 0, (LPARAM)(text))

1 0

Nikolay Sivov : ole32/tests: Add some tests for MonikerCommonPrefixWith().
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: f117d938a7eb5ab2a49358ef6658bc9b0de0948d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f117d938a7eb5ab2a49358ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:20:29 2020 +0300 ole32/tests: Add some tests for MonikerCommonPrefixWith(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d485360215..4c8d013e42 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -92,6 +92,24 @@ todo_wine_if(todo) ok_(__FILE__, line)(type2 == type, "Unexpected moniker type %d.\n", type2); } +#define TEST_DISPLAY_NAME(m,name) _test_moniker_name(m, name, __LINE__) +static void _test_moniker_name(IMoniker *moniker, const WCHAR *name, int line) +{ + WCHAR *display_name; + IBindCtx *pbc; + HRESULT hr; + + hr = CreateBindCtx(0, &pbc); + ok_(__FILE__, line)(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, pbc, NULL, &display_name); + ok_(__FILE__, line)(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); + ok_(__FILE__, line)(!lstrcmpW(display_name, name), "Unexpected display name %s.\n", wine_dbgstr_w(display_name)); + + CoTaskMemFree(display_name); + IBindCtx_Release(pbc); +} + static IMoniker *create_antimoniker(DWORD level) { LARGE_INTEGER pos; @@ -3221,6 +3239,104 @@ static void test_save_load_filemoniker(void) IStream_Release(pStm); } +static void test_MonikerCommonPrefixWith(void) +{ + IMoniker *moniker, *item, *file1, *file2, *composite, *composite2; + HRESULT hr; + + moniker = (void *)0xdeadbeef; + hr = MonikerCommonPrefixWith(NULL, NULL, &moniker); +todo_wine { + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + ok(!moniker, "Unexpected pointer.\n"); +} + if (hr == E_NOTIMPL) + return; + + hr = CreateItemMoniker(L"!", L"Item", &item); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(item, NULL, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(NULL, item, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(item, item, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateFileMoniker(L"C:\\test.txt", &file1); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(file1, NULL, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(NULL, file1, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + /* F x F */ + hr = MonikerCommonPrefixWith(file1, file1, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateFileMoniker(L"C:\\a\\test.txt", &file2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + /* F1 x F2 */ + hr = MonikerCommonPrefixWith(file1, file2, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateGenericComposite(file1, item, &composite); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = CreateGenericComposite(file2, item, &composite2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + /* F x (F,I) -> F */ + hr = MonikerCommonPrefixWith(file1, composite, &moniker); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker == file1, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* F1 x (F2,I) -> F */ + hr = MonikerCommonPrefixWith(file1, composite2, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_FILEMONIKER); + TEST_DISPLAY_NAME(moniker, L"C:\\"); + IMoniker_Release(moniker); + + /* (F2,I) x F1 -> F */ + hr = MonikerCommonPrefixWith(composite2, file1, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_FILEMONIKER); + TEST_DISPLAY_NAME(moniker, L"C:\\"); + IMoniker_Release(moniker); + + /* (F,I) x (F) -> F */ + hr = MonikerCommonPrefixWith(composite, file1, &moniker); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker == file1, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* (F,I) x (F,I) -> (F,I) */ + hr = MonikerCommonPrefixWith(composite, composite, &moniker); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_GENERICCOMPOSITE); + TEST_DISPLAY_NAME(moniker, L"C:\\test.txt!Item"); + ok(moniker != composite, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* (F1,I) x (F2,I) -> () */ + hr = MonikerCommonPrefixWith(composite, composite2, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!moniker, "Unexpected pointer %p.\n", moniker); + + IMoniker_Release(composite2); + IMoniker_Release(composite); + IMoniker_Release(file2); + IMoniker_Release(file1); + IMoniker_Release(item); +} + START_TEST(moniker) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -3235,6 +3351,7 @@ START_TEST(moniker) test_generic_composite_moniker(); test_pointer_moniker(); test_save_load_filemoniker(); + test_MonikerCommonPrefixWith(); /* FIXME: test moniker creation funcs and parsing other moniker formats */

1 0

Nikolay Sivov : ole32/tests: Use helper to test display names.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: e0cad34031acdec76e2d70badc679ad621814265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0cad34031acdec76e2d70ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:20:30 2020 +0300 ole32/tests: Use helper to test display names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 56 +++++++++------------------------------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 4c8d013e42..6be75f75c2 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1605,24 +1605,12 @@ static void test_moniker( BOOL same; BYTE buffer[128]; IMoniker * moniker_proxy; - LPOLESTR display_name; - IBindCtx *bindctx; hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "%s: IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", testname, hr); /* Display Name */ - - hr = CreateBindCtx(0, &bindctx); - ok_ole_success(hr, CreateBindCtx); - - hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); - ok_ole_success(hr, IMoniker_GetDisplayName); - ok(!lstrcmpW(display_name, expected_display_name), "%s: unexpected display name %s, %s.\n", testname, - wine_dbgstr_w(display_name), wine_dbgstr_w(expected_display_name)); - - CoTaskMemFree(display_name); - IBindCtx_Release(bindctx); + TEST_DISPLAY_NAME(moniker, expected_display_name); hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "%s: IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", testname, hr); @@ -2096,7 +2084,6 @@ static void test_item_moniker(void) WCHAR displayname[16] = L"display name"; IEnumMoniker *enummoniker; IRunningObjectTable *rot; - WCHAR *display_name; BIND_OPTS bind_opts; LARGE_INTEGER pos; IStream *stream; @@ -2174,12 +2161,7 @@ static void test_item_moniker(void) hr = IMoniker_Load(moniker2, stream); ok(hr == S_OK, "Failed to load moniker, hr %#x.\n", hr); - hr = IMoniker_GetDisplayName(moniker2, bindctx, NULL, &display_name); - ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); - ok(!lstrcmpW(display_name, item_moniker_data[i].display_name), "%d: unexpected display name %s.\n", - i, wine_dbgstr_w(display_name)); - - CoTaskMemFree(display_name); + TEST_DISPLAY_NAME(moniker2, item_moniker_data[i].display_name); } IStream_Release(stream); @@ -2454,7 +2436,6 @@ static void test_anti_moniker(void) static const WCHAR expected_display_name[] = { '\\','.','.',0 }; IEnumMoniker *enummoniker; IStream *stream; - WCHAR *name; hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); @@ -2545,10 +2526,7 @@ static void test_anti_moniker(void) ok(hash == 0x80000002, "Unexpected hash value %#x.\n", hash); /* Display name reflects anti combination. */ - hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); - ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); - ok(!lstrcmpW(name, L"\\..\\.."), "Unexpected display name %s.\n", wine_dbgstr_w(name)); - CoTaskMemFree(name); + TEST_DISPLAY_NAME(moniker, L"\\..\\.."); /* Limit is at 0xfffff. */ stream_write_dword(stream, 0xfffff); @@ -2585,10 +2563,7 @@ static void test_anti_moniker(void) ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); ok(hash == 0x80000000, "Unexpected hash value %#x.\n", hash); - hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); - ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); - ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); - CoTaskMemFree(name); + TEST_DISPLAY_NAME(moniker, L""); /* Back to initial value. */ stream_write_dword(stream, 1); @@ -2704,22 +2679,16 @@ static void test_generic_composite_moniker(void) IBindCtx *bindctx; FILETIME filetime; IUnknown *unknown; - static const WCHAR wszDelimiter1[] = {'!',0}; - static const WCHAR wszObjectName1[] = {'T','e','s','t',0}; - static const WCHAR wszDelimiter2[] = {'#',0}; - static const WCHAR wszObjectName2[] = {'W','i','n','e',0}; - static const WCHAR expected_display_name[] = { '!','T','e','s','t','#','W','i','n','e',0 }; - WCHAR *name; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); - hr = CreateItemMoniker(wszDelimiter1, wszObjectName1, &moniker1); - ok_ole_success(hr, CreateItemMoniker); - hr = CreateItemMoniker(wszDelimiter2, wszObjectName2, &moniker2); - ok_ole_success(hr, CreateItemMoniker); + hr = CreateItemMoniker(L"!", L"Test", &moniker1); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + hr = CreateItemMoniker(L"#", L"Wine", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); hr = CreateGenericComposite(moniker1, moniker2, &moniker); - ok_ole_success(hr, CreateGenericComposite); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); /* Compose with itself. */ EXPECT_REF(moniker1, 2); @@ -2786,10 +2755,7 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); TEST_MONIKER_TYPE(moniker4, MKSYS_GENERICCOMPOSITE); - hr = IMoniker_GetDisplayName(moniker4, bindctx, NULL, &name); - ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); - ok(!lstrcmpW(name, L"!Test#Wine"), "Unexpected name %s.\n", wine_dbgstr_w(name)); - CoTaskMemFree(name); + TEST_DISPLAY_NAME(moniker4, L"!Test#Wine"); IMoniker_Release(moniker4); IMoniker_Release(moniker3); @@ -2807,7 +2773,7 @@ todo_wine expected_gc_moniker_marshal_data, sizeof(expected_gc_moniker_marshal_data), expected_gc_moniker_saved_data, sizeof(expected_gc_moniker_saved_data), expected_gc_moniker_comparison_data, sizeof(expected_gc_moniker_comparison_data), - 160, expected_display_name); + 160, L"!Test#Wine"); /* Hashing */

1 0