January 2016 - Wine-commits

Hugh McMaster : kernel32/tests: Refresh the console to clear the console font table.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: b36cc985a4af36f51c3080849f8e3a5f63c15f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36cc985a4af36f51c3080849… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 5 18:59:34 2016 +1100 kernel32/tests: Refresh the console to clear the console font table. The testScreenBuffer function unintentionally causes the console font table to increase from 14 entries to about 40. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 240d9d8..3ba1da5 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2787,6 +2787,17 @@ START_TEST(console) testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification / codepage handling */ testScreenBuffer(hConOut); + + /* clear duplicated console font table */ + CloseHandle(hConIn); + CloseHandle(hConOut); + FreeConsole(); + ok(AllocConsole(), "Couldn't alloc console\n"); + hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hConIn != INVALID_HANDLE_VALUE, "Opening ConIn\n"); + ok(hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); + testCtrlHandler(); /* still to be done: access rights & access on objects */

1 0

Hugh McMaster : kernel32/tests: Add tests for GetLargestConsoleWindowSize.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: c3ea629f3c3c6a3970af3a8675cf05c2f4cdf5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ea629f3c3c6a3970af3a867… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 5 18:59:35 2016 +1100 kernel32/tests: Add tests for GetLargestConsoleWindowSize. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3ba1da5..f362415 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2681,6 +2681,69 @@ static void test_GetConsoleFontSize(HANDLE std_output) ok(!c.Y, "got %d, expected 0\n", c.Y); } +static void test_GetLargestConsoleWindowSize(HANDLE std_output) +{ + COORD c, font; + RECT r; + LONG workarea_w, workarea_h, maxcon_w, maxcon_h; + CONSOLE_FONT_INFO cfi; + DWORD index, i; + HMODULE hmod; + DWORD (WINAPI *pGetNumberOfConsoleFonts)(void); + BOOL (WINAPI *pSetConsoleFont)(HANDLE, DWORD); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetLargestConsoleWindowSize(NULL); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetLargestConsoleWindowSize(GetStdHandle(STD_INPUT_HANDLE)); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + + SystemParametersInfoW(SPI_GETWORKAREA, 0, &r, 0); + workarea_w = r.right - r.left; + workarea_h = r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION); + + GetCurrentConsoleFont(std_output, FALSE, &cfi); + index = cfi.nFont; /* save current font index */ + + hmod = GetModuleHandleA("kernel32.dll"); + pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); + if (!pGetNumberOfConsoleFonts) + { + win_skip("GetNumberOfConsoleFonts is not available\n"); + return; + } + pSetConsoleFont = (void *)GetProcAddress(hmod, "SetConsoleFont"); + if (!pSetConsoleFont) + { + win_skip("SetConsoleFont is not available\n"); + return; + } + + for (i = 0; i < pGetNumberOfConsoleFonts(); i++) + { + pSetConsoleFont(std_output, i); + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetLargestConsoleWindowSize(std_output); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + GetCurrentConsoleFont(std_output, FALSE, &cfi); + font = GetConsoleFontSize(std_output, cfi.nFont); + maxcon_w = workarea_w / font.X; + maxcon_h = workarea_h / font.Y; + ok(c.X == maxcon_w || c.X == maxcon_w - 1 /* Win10 */, "got %d, expected %d\n", c.X, maxcon_w); + ok(c.Y == maxcon_h || c.Y == maxcon_h - 1 /* Win10 */, "got %d, expected %d\n", c.Y, maxcon_h); + } + pSetConsoleFont(std_output, index); /* restore original font size */ +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -2826,4 +2889,5 @@ START_TEST(console) test_ReadConsoleOutputAttribute(hConOut); test_GetCurrentConsoleFont(hConOut); test_GetConsoleFontSize(hConOut); + test_GetLargestConsoleWindowSize(hConOut); }

1 0

Nikolay Sivov : ole32: Properly implement OleRegGetUserType().
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 8fe18a16f7f5e0326d2fe6ab32ef2aad947b343d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe18a16f7f5e0326d2fe6ab3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 30 23:48:38 2015 +0300 ole32: Properly implement OleRegGetUserType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 84 ++++++++++++++++++----------------- dlls/ole32/tests/compobj.c | 106 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 149 insertions(+), 41 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e7e6510..7929d3d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -661,69 +661,73 @@ HRESULT WINAPI RevokeDragDrop(HWND hwnd) /*********************************************************************** * OleRegGetUserType (OLE32.@) - * - * This implementation of OleRegGetUserType ignores the dwFormOfType - * parameter and always returns the full name of the object. This is - * not too bad since this is the case for many objects because of the - * way they are registered. - */ -HRESULT WINAPI OleRegGetUserType( - REFCLSID clsid, - DWORD dwFormOfType, - LPOLESTR* pszUserType) -{ - DWORD dwKeyType; - DWORD cbData; - HKEY clsidKey; + */ +HRESULT WINAPI OleRegGetUserType(REFCLSID clsid, DWORD form, LPOLESTR *usertype) +{ + static const WCHAR auxusertypeW[] = {'A','u','x','U','s','e','r','T','y','p','e','\\','%','d',0}; + DWORD valuetype, valuelen; + WCHAR auxkeynameW[16]; + HKEY usertypekey; HRESULT hres; LONG ret; - TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwFormOfType, pszUserType); + TRACE("(%s, %u, %p)\n", debugstr_guid(clsid), form, usertype); - if (!pszUserType) + if (!usertype) return E_INVALIDARG; - *pszUserType = NULL; + *usertype = NULL; - hres = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &clsidKey); + /* Return immediately if it's not registered. */ + hres = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &usertypekey); if (FAILED(hres)) return hres; - /* - * Retrieve the size of the name string. - */ - cbData = 0; + valuelen = 0; - if (RegQueryValueExW(clsidKey, emptyW, NULL, &dwKeyType, NULL, &cbData)) + /* Try additional types if requested. If they don't exist fall back to USERCLASSTYPE_FULL. */ + if (form != USERCLASSTYPE_FULL) { - RegCloseKey(clsidKey); - return REGDB_E_READREGDB; + HKEY auxkey; + + sprintfW(auxkeynameW, auxusertypeW, form); + if (COM_OpenKeyForCLSID(clsid, auxkeynameW, KEY_READ, &auxkey) == S_OK) + { + if (!RegQueryValueExW(auxkey, emptyW, NULL, &valuetype, NULL, &valuelen) && valuelen) + { + RegCloseKey(usertypekey); + usertypekey = auxkey; + } + else + RegCloseKey(auxkey); + } } - /* - * Allocate a buffer for the registry value. - */ - *pszUserType = CoTaskMemAlloc(cbData); + valuelen = 0; + if (RegQueryValueExW(usertypekey, emptyW, NULL, &valuetype, NULL, &valuelen)) + { + RegCloseKey(usertypekey); + return REGDB_E_READREGDB; + } - if (*pszUserType==NULL) + *usertype = CoTaskMemAlloc(valuelen); + if (!*usertype) { - RegCloseKey(clsidKey); + RegCloseKey(usertypekey); return E_OUTOFMEMORY; } - ret = RegQueryValueExW(clsidKey, + ret = RegQueryValueExW(usertypekey, emptyW, NULL, - &dwKeyType, - (LPBYTE) *pszUserType, - &cbData); - - RegCloseKey(clsidKey); - + &valuetype, + (LPBYTE)*usertype, + &valuelen); + RegCloseKey(usertypekey); if (ret != ERROR_SUCCESS) { - CoTaskMemFree(*pszUserType); - *pszUserType = NULL; + CoTaskMemFree(*usertype); + *usertype = NULL; return REGDB_E_READREGDB; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 792d7dc..5fe9876 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2229,11 +2229,29 @@ static void test_OleRegGetUserType(void) { static const WCHAR stdfont_usertypeW[] = {'S','t','a','n','d','a','r','d',' ','F','o','n','t',0}; static const WCHAR stdfont2_usertypeW[] = {'C','L','S','I','D','_','S','t','d','F','o','n','t',0}; + static const WCHAR clsidkeyW[] = {'C','L','S','I','D',0}; + static const WCHAR defvalueW[] = {'D','e','f','a','u','l','t',' ','N','a','m','e',0}; + static const WCHAR auxvalue0W[] = {'A','u','x',' ','N','a','m','e',' ','0',0}; + static const WCHAR auxvalue2W[] = {'A','u','x',' ','N','a','m','e',' ','2',0}; + static const WCHAR auxvalue3W[] = {'A','u','x',' ','N','a','m','e',' ','3',0}; + static const WCHAR auxvalue4W[] = {'A','u','x',' ','N','a','m','e',' ','4',0}; + + static const char auxvalues[][16] = { + "Aux Name 0", + "Aux Name 1", + "Aux Name 2", + "Aux Name 3", + "Aux Name 4" + }; + + HKEY clsidhkey, hkey, auxhkey, classkey; + DWORD form, ret, disposition; + WCHAR clsidW[39]; ULONG_PTR cookie; HANDLE handle; HRESULT hr; WCHAR *str; - DWORD form; + int i; for (form = 0; form <= USERCLASSTYPE_APPNAME+1; form++) { hr = OleRegGetUserType(&CLSID_Testclass, form, NULL); @@ -2273,7 +2291,93 @@ static void test_OleRegGetUserType(void) pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); } + + /* test using registered CLSID */ + StringFromGUID2(&CLSID_non_existent, clsidW, sizeof(clsidW)/sizeof(clsidW[0])); + + ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsidkeyW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &clsidhkey, &disposition); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Failed to create test key, skipping some of OleRegGetUserType() tests.\n"); + return; + } + + ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); + + ret = RegCreateKeyExW(clsidhkey, clsidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &classkey, NULL); + ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); + + ret = RegSetValueExW(classkey, NULL, 0, REG_SZ, (const BYTE*)defvalueW, sizeof(defvalueW)); + ok(!ret, "got %d, error %d\n", ret, GetLastError()); + + ret = RegCreateKeyExA(classkey, "AuxUserType", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &auxhkey, NULL); + ok(!ret, "got %d, error %d\n", ret, GetLastError()); + + /* populate AuxUserType */ + for (i = 0; i <= 4; i++) { + char name[16]; + + sprintf(name, "AuxUserType\\%d", i); + ret = RegCreateKeyExA(classkey, name, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!ret, "got %d, error %d\n", ret, GetLastError()); + + ret = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE*)auxvalues[i], strlen(auxvalues[i])); + ok(!ret, "got %d, error %d\n", ret, GetLastError()); + RegCloseKey(hkey); + } + + str = NULL; + hr = OleRegGetUserType(&CLSID_non_existent, 0, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, auxvalue0W), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + str = NULL; + hr = OleRegGetUserType(&CLSID_non_existent, USERCLASSTYPE_FULL, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, defvalueW), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + str = NULL; + hr = OleRegGetUserType(&CLSID_non_existent, USERCLASSTYPE_SHORT, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, auxvalue2W), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + str = NULL; + hr = OleRegGetUserType(&CLSID_non_existent, USERCLASSTYPE_APPNAME, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, auxvalue3W), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + str = NULL; + hr = OleRegGetUserType(&CLSID_non_existent, USERCLASSTYPE_APPNAME+1, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, auxvalue4W), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + str = NULL; + hr = OleRegGetUserType(&CLSID_non_existent, USERCLASSTYPE_APPNAME+2, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, defvalueW), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + /* registry cleanup */ + for (i = 0; i <= 4; i++) + { + char name[2]; + sprintf(name, "%d", i); + RegDeleteKeyA(auxhkey, name); + } + RegCloseKey(auxhkey); + RegDeleteKeyA(classkey, "AuxUserType"); + RegCloseKey(classkey); + RegDeleteKeyW(clsidhkey, clsidW); + RegCloseKey(clsidhkey); + if (disposition == REG_CREATED_NEW_KEY) + RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID"); } + static void test_CoCreateGuid(void) { HRESULT hr;

1 0

Nikolay Sivov : advapi32: Make RegOpenCurrentUser() return real key handles for current SID.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 62d3309a725fb27f0c606800b43e29be69f4bcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d3309a725fb27f0c606800b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 01:18:00 2015 +0300 advapi32: Make RegOpenCurrentUser() return real key handles for current SID. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 48 +++++++++++++++++++++++++++++++++++++++++- dlls/advapi32/tests/registry.c | 13 ++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 8317698..3508407 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -37,6 +37,7 @@ #include "winerror.h" #include "winternl.h" #include "winuser.h" +#include "sddl.h" #include "advapi32_misc.h" #include "wine/unicode.h" @@ -648,6 +649,21 @@ LSTATUS WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) return RegOpenKeyExA( hkey, name, 0, MAXIMUM_ALLOWED, retkey ); } +static WCHAR *get_thread_token_user_sid(HANDLE token) +{ + WCHAR *sidstring = NULL; + TOKEN_USER *info; + DWORD len = 0; + + GetTokenInformation(token, TokenUser, NULL, 0, &len); + + info = heap_alloc(len); + if (GetTokenInformation(token, TokenUser, info, len, &len)) + ConvertSidToStringSidW(info->User.Sid, &sidstring); + heap_free(info); + + return sidstring; +} /****************************************************************************** * RegOpenCurrentUser [ADVAPI32.@] @@ -671,7 +687,37 @@ LSTATUS WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) */ LSTATUS WINAPI RegOpenCurrentUser( REGSAM access, PHKEY retkey ) { - return RegOpenKeyExA( HKEY_CURRENT_USER, "", 0, access, retkey ); + WCHAR *sidstring = NULL; + HANDLE threadtoken; + LSTATUS ret; + + /* get current user SID */ + if (OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &threadtoken)) + { + sidstring = get_thread_token_user_sid(threadtoken); + CloseHandle(threadtoken); + } + + if (!sidstring) + { + ImpersonateSelf(SecurityIdentification); + if (OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &threadtoken)) + { + sidstring = get_thread_token_user_sid(threadtoken); + CloseHandle(threadtoken); + } + RevertToSelf(); + } + + if (sidstring) + { + ret = RegOpenKeyExW( HKEY_USERS, sidstring, 0, access, retkey ); + LocalFree(sidstring); + } + else + ret = RegOpenKeyExA( HKEY_CURRENT_USER, "", 0, access, retkey ); + + return ret; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 254a8b6..ef5d989 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3278,6 +3278,18 @@ static void test_delete_key_value(void) RegCloseKey(subkey); } +static void test_RegOpenCurrentUser(void) +{ + HKEY key; + LONG ret; + + key = HKEY_CURRENT_USER; + ret = RegOpenCurrentUser(KEY_READ, &key); + ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(key != HKEY_CURRENT_USER, "got %p\n", key); + RegCloseKey(key); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -3310,6 +3322,7 @@ START_TEST(registry) test_deleted_key(); test_delete_value(); test_delete_key_value(); + test_RegOpenCurrentUser(); /* cleanup */ delete_key( hkey_main );

1 0

Nikolay Sivov : ole2disp: Implement VariantInit().
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: de60ddb8132b421abe2abbe81ed449a3d1a5f63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de60ddb8132b421abe2abbe81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 5 18:46:34 2016 +0300 ole2disp: Implement VariantInit(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 9 ++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- dlls/ole2disp.dll16/ole2disp.h | 39 +++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 1850346..43336c4 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -276,3 +276,12 @@ HRESULT WINAPI SetErrorInfo16(ULONG dwReserved, IErrorInfo *perrinfo) FIXME("stub: (%d, %p)\n", dwReserved, perrinfo); return E_INVALIDARG; } + +/****************************************************************************** + * VariantInit [OLE2DISP.8] + */ +void WINAPI VariantInit16(VARIANTARG16 *v) +{ + TRACE("(%p)\n", v); + v->vt = VT_EMPTY; +} diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 2cf6784..e4655f0 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -5,7 +5,7 @@ 5 pascal SysReAllocStringLen(ptr str word) SysReAllocStringLen16 6 pascal SysFreeString(segstr) SysFreeString16 7 pascal SysStringLen(segstr) SysStringLen16 -8 stub VARIANTINIT +8 pascal VariantInit(ptr) VariantInit16 9 stub VARIANTCLEAR 10 stub VARIANTCOPY 11 stub VARIANTCOPYIND diff --git a/dlls/ole2disp.dll16/ole2disp.h b/dlls/ole2disp.dll16/ole2disp.h index 7804c82..d8ad6d1 100644 --- a/dlls/ole2disp.dll16/ole2disp.h +++ b/dlls/ole2disp.dll16/ole2disp.h @@ -39,4 +39,43 @@ INT16 WINAPI SysReAllocString16(LPBSTR16,LPCOLESTR16); int WINAPI SysReAllocStringLen16(BSTR16*, const char*, int); int WINAPI SysStringLen16(BSTR16); +typedef struct tagVARIANT16 { + VARTYPE vt; + WORD wReserved1; + WORD wReserved2; + WORD wReserved3; + union { + BYTE bVal; + SHORT iVal; + LONG lVal; + FLOAT fltVal; + DOUBLE dblVal; + VARIANT_BOOL boolVal; + SCODE scode; + DATE date; +/* BSTR16 */ SEGPTR bstrVal; + CY cyVal; +/* IUnknown* */ SEGPTR punkVal; +/* IDispatch* */ SEGPTR pdispVal; +/* SAFEARRAY* */ SEGPTR parray; +/* BYTE* */ SEGPTR pbVal; +/* SHORT* */ SEGPTR piVal; +/* LONG* */ SEGPTR plVal; +/* FLOAT* */ SEGPTR pfltVal; +/* DOUBLE* */ SEGPTR pdblVal; +/* VARIANT_BOOL* */ SEGPTR pboolVal; +/* SCODE* */ SEGPTR pscode; +/* DATE* */ SEGPTR pdate; +/* BSTR16* */ SEGPTR pbstrVal; +/* VARIANT16* */ SEGPTR pvarVal; +/* void* */ SEGPTR byref; +/* CY* */ SEGPTR pcyVal; +/* IUnknown** */ SEGPTR ppunkVal; +/* IDispatch** */ SEGPTR ppdispVal; +/* SAFEARRAY** */ SEGPTR pparray; + } u; +} VARIANT16; + +typedef VARIANT16 VARIANTARG16; + #endif /* !defined(__WINE_OLEAUT32_OLE2DISP_H) */

1 0

Piotr Caban : msvcp120: Add _Add_vtordisp virtual functions to basic_ios class.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: ba35b96e0e72c009942f5cede40a1957d952c0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba35b96e0e72c009942f5cede… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 5 16:28:49 2016 +0100 msvcp120: Add _Add_vtordisp virtual functions to basic_ios class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 236 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 204 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba35b96e0e72c009942f5…

1 0

Piotr Caban : msvcp120: Add vtordisp field to classes with virtual base.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 367b30d8278684aaff373f5666b78264137d7a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=367b30d8278684aaff373f566… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 5 16:28:58 2016 +0100 msvcp120: Add vtordisp field to classes with virtual base. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 223 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 187 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=367b30d8278684aaff373…

1 0

Akihiro Sagawa : gdi32/tests: Refactor test_fake_bold_font() to avoid code duplications.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 6cd42f3df78543284e9785619a713d0fc874ddf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd42f3df78543284e9785619… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 31 13:33:12 2015 +0900 gdi32/tests: Refactor test_fake_bold_font() to avoid code duplications. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 66 +++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 53945da..5f01246 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6304,12 +6304,14 @@ static void test_GetCharWidth32(void) static void test_fake_bold_font(void) { HDC hdc; - HFONT hfont, hfont_old; LOGFONTA lf; BOOL ret; - TEXTMETRICA tm[2]; - ABC abc[2]; - INT w[2]; + struct glyph_data { + TEXTMETRICA tm; + ABC abc; + INT w; + } data[2]; + int i; if (!pGetCharWidth32A || !pGetCharABCWidthsA) { win_skip("GetCharWidth32A/GetCharABCWidthA is not available on this platform\n"); @@ -6319,44 +6321,44 @@ static void test_fake_bold_font(void) /* Test outline font */ memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Wingdings"); - lf.lfWeight = FW_NORMAL; lf.lfCharSet = SYMBOL_CHARSET; - hfont = CreateFontIndirectA(&lf); hdc = GetDC(NULL); - hfont_old = SelectObject(hdc, hfont); - /* base metrics */ - ret = GetTextMetricsA(hdc, &tm[0]); - ok(ret, "got %d\n", ret); - ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &abc[0]); - ok(ret, "got %d\n", ret); + for (i = 0; i <= 1; i++) + { + HFONT hfont, hfont_old; - lf.lfWeight = FW_BOLD; - hfont = CreateFontIndirectA(&lf); - DeleteObject(SelectObject(hdc, hfont)); + lf.lfWeight = i ? FW_BOLD : FW_NORMAL; + hfont = CreateFontIndirectA(&lf); + hfont_old = SelectObject(hdc, hfont); - /* bold metrics */ - ret = GetTextMetricsA(hdc, &tm[1]); - ok(ret, "got %d\n", ret); - ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &abc[1]); - ok(ret, "got %d\n", ret); + ret = GetTextMetricsA(hdc, &data[i].tm); + ok(ret, "got %d\n", ret); + ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &data[i].abc); + ok(ret, "got %d\n", ret); + data[i].w = data[i].abc.abcA + data[i].abc.abcB + data[i].abc.abcC; - DeleteObject(SelectObject(hdc, hfont_old)); + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + } ReleaseDC(NULL, hdc); /* compare results (outline) */ - ok(tm[0].tmHeight == tm[1].tmHeight, "expected %d, got %d\n", tm[0].tmHeight, tm[1].tmHeight); - ok(tm[0].tmAscent == tm[1].tmAscent, "expected %d, got %d\n", tm[0].tmAscent, tm[1].tmAscent); - ok(tm[0].tmDescent == tm[1].tmDescent, "expected %d, got %d\n", tm[0].tmDescent, tm[1].tmDescent); - ok((tm[0].tmAveCharWidth + 1) == tm[1].tmAveCharWidth, - "expected %d, got %d\n", tm[0].tmAveCharWidth + 1, tm[1].tmAveCharWidth); - ok((tm[0].tmMaxCharWidth + 1) == tm[1].tmMaxCharWidth, - "expected %d, got %d\n", tm[0].tmMaxCharWidth + 1, tm[1].tmMaxCharWidth); - ok(tm[0].tmOverhang == tm[1].tmOverhang, "expected %d, got %d\n", tm[0].tmOverhang, tm[1].tmOverhang); - w[0] = abc[0].abcA + abc[0].abcB + abc[0].abcC; - w[1] = abc[1].abcA + abc[1].abcB + abc[1].abcC; - ok((w[0] + 1) == w[1], "expected %d, got %d\n", w[0] + 1, w[1]); + ok(data[0].tm.tmHeight == data[1].tm.tmHeight, + "expected %d, got %d\n", data[0].tm.tmHeight, data[1].tm.tmHeight); + ok(data[0].tm.tmAscent == data[1].tm.tmAscent, + "expected %d, got %d\n", data[0].tm.tmAscent, data[1].tm.tmAscent); + ok(data[0].tm.tmDescent == data[1].tm.tmDescent, + "expected %d, got %d\n", data[0].tm.tmDescent, data[1].tm.tmDescent); + ok(data[0].tm.tmAveCharWidth + 1 == data[1].tm.tmAveCharWidth, + "expected %d, got %d\n", data[0].tm.tmAveCharWidth + 1, data[1].tm.tmAveCharWidth); + ok(data[0].tm.tmMaxCharWidth + 1 == data[1].tm.tmMaxCharWidth, + "expected %d, got %d\n", data[0].tm.tmMaxCharWidth + 1, data[1].tm.tmMaxCharWidth); + ok(data[0].tm.tmOverhang == data[1].tm.tmOverhang, + "expected %d, got %d\n", data[0].tm.tmOverhang, data[1].tm.tmOverhang); + ok(data[0].w + 1 == data[1].w, + "expected %d, got %d\n", data[0].w + 1, data[1].w); }

1 0

Akihiro Sagawa : gdi32/tests: Add font advance tests for synthetic bold face with scaling.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 37fdc50097e6a01a32694654603649154590de1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37fdc50097e6a01a326946546… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 31 13:33:13 2015 +0900 gdi32/tests: Add font advance tests for synthetic bold face with scaling. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 5f01246..417b722 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6303,6 +6303,7 @@ static void test_GetCharWidth32(void) static void test_fake_bold_font(void) { + static const MAT2 x2_mat = { {0,2}, {0,0}, {0,0}, {0,2} }; HDC hdc; LOGFONTA lf; BOOL ret; @@ -6310,8 +6311,10 @@ static void test_fake_bold_font(void) TEXTMETRICA tm; ABC abc; INT w; + GLYPHMETRICS gm; } data[2]; int i; + DWORD r; if (!pGetCharWidth32A || !pGetCharABCWidthsA) { win_skip("GetCharWidth32A/GetCharABCWidthA is not available on this platform\n"); @@ -6338,6 +6341,8 @@ static void test_fake_bold_font(void) ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &data[i].abc); ok(ret, "got %d\n", ret); data[i].w = data[i].abc.abcA + data[i].abc.abcB + data[i].abc.abcC; + r = GetGlyphOutlineA(hdc, 0x76, GGO_METRICS, &data[i].gm, 0, NULL, &x2_mat); + ok(r != GDI_ERROR, "got %d\n", ret); SelectObject(hdc, hfont_old); DeleteObject(hfont); @@ -6360,6 +6365,10 @@ static void test_fake_bold_font(void) ok(data[0].w + 1 == data[1].w, "expected %d, got %d\n", data[0].w + 1, data[1].w); + todo_wine ok(data[0].gm.gmCellIncX + 1 == data[1].gm.gmCellIncX, + "expected %d, got %d\n", data[0].gm.gmCellIncX + 1, data[1].gm.gmCellIncX); + ok(data[0].gm.gmCellIncY == data[1].gm.gmCellIncY, + "expected %d, got %d\n", data[0].gm.gmCellIncY, data[1].gm.gmCellIncY); } static void test_bitmap_font_glyph_index(void)

1 0

Akihiro Sagawa : gdi32: Fixup the internal ntmFlags for bitmap fonts.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 79ab7456ed72119d4b793ce4fbde714ed8b56872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ab7456ed72119d4b793ce4f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 31 13:33:15 2015 +0900 gdi32: Fixup the internal ntmFlags for bitmap fonts. The value is used not for APIs, but for our fake-bold implementation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 693a54d..f7cd0ee 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1942,9 +1942,17 @@ static inline DWORD get_ntm_flags( FT_Face ft_face ) { DWORD flags = 0; FT_ULong table_size = 0; + FT_WinFNT_HeaderRec winfnt_header; if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) flags |= NTM_ITALIC; if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) flags |= NTM_BOLD; + + /* fixup the flag for our fake-bold implementation. */ + if (!FT_IS_SCALABLE( ft_face ) && + !pFT_Get_WinFNT_Header( ft_face, &winfnt_header ) && + winfnt_header.weight > FW_NORMAL ) + flags |= NTM_BOLD; + if (flags == 0) flags = NTM_REGULAR; if (!pFT_Load_Sfnt_Table( ft_face, FT_MAKE_TAG( 'C','F','F',' ' ), 0, NULL, &table_size ))

1 0