wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Stefan Dösinger : wined3d: Use the map binding to optimize sysmem->sysmem blits.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 28bfc2058903793d87097941cc12f00f14e0c3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bfc2058903793d87097941c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:00 2014 +0100 wined3d: Use the map binding to optimize sysmem->sysmem blits. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 54891ac..7023bd7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6216,8 +6216,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC { /* In principle this would apply to depth blits as well, but we don't * implement those in the CPU blitter at the moment. */ - if ((dst_surface->flags & SFLAG_INSYSMEM) - && (!src_surface || (src_surface->flags & SFLAG_INSYSMEM))) + if ((dst_surface->flags & dst_surface->map_binding) + && (!src_surface || (src_surface->flags & src_surface->map_binding))) { if (scale) TRACE("Not doing sysmem blit because of scaling.\n");

1 0

Dmitry Timoshkov : secur32: Slightly simplify the GetUserNameExW implementation.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: bc59d7e8303a45d7356f3972d1d8e9478552fde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc59d7e8303a45d7356f3972d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 13 19:07:31 2014 +0900 secur32: Slightly simplify the GetUserNameExW implementation. --- dlls/secur32/secur32.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index acb09cf..867fa2c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1096,16 +1096,16 @@ BOOLEAN WINAPI GetUserNameExA( BOOLEAN WINAPI GetUserNameExW( EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) { - BOOLEAN status; - WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1]; - LPWSTR out; - DWORD len; TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); switch (NameFormat) { case NameSamCompatible: { + WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1]; + LPWSTR out; + DWORD len; + /* This assumes the current user is always a local account */ len = MAX_COMPUTERNAME_LENGTH + 1; if (GetComputerNameW(samname, &len)) @@ -1115,25 +1115,20 @@ BOOLEAN WINAPI GetUserNameExW( len = UNLEN + 1; if (GetUserNameW(out, &len)) { - status = (lstrlenW(samname) < *nSize); - if (status) + if (lstrlenW(samname) < *nSize) { lstrcpyW(lpNameBuffer, samname); *nSize = lstrlenW(samname); + return TRUE; } - else - { - SetLastError(ERROR_MORE_DATA); - *nSize = lstrlenW(samname) + 1; - } + + SetLastError(ERROR_MORE_DATA); + *nSize = lstrlenW(samname) + 1; } - else - status = FALSE; } - else - status = FALSE; + return FALSE; } - break; + case NameUnknown: case NameFullyQualifiedDN: case NameDisplay: @@ -1144,14 +1139,12 @@ BOOLEAN WINAPI GetUserNameExW( case NameServicePrincipal: case NameDnsDomain: SetLastError(ERROR_NONE_MAPPED); - status = FALSE; - break; + return FALSE; + default: SetLastError(ERROR_INVALID_PARAMETER); - status = FALSE; + return FALSE; } - - return status; } BOOLEAN WINAPI TranslateNameA(

1 0

Dmitry Timoshkov : taskschd/tests: Add some tests for ITaskService:: Connect.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 55ad9da91f04001351b805675d12e2ffb72cef44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ad9da91f04001351b805675… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 13 19:07:04 2014 +0900 taskschd/tests: Add some tests for ITaskService::Connect. --- configure | 1 + configure.ac | 1 + dlls/taskschd/tests/Makefile.in | 5 ++ dlls/taskschd/tests/scheduler.c | 118 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 125 insertions(+) diff --git a/configure b/configure index 573bb96..7255985 100755 --- a/configure +++ b/configure @@ -17068,6 +17068,7 @@ wine_fn_config_dll system.drv16 enable_win16 wine_fn_config_dll t2embed enable_t2embed wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean +wine_fn_config_test dlls/taskschd/tests taskschd_test wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic wine_fn_config_dll twain.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index a4f0063..dcabb55 100644 --- a/configure.ac +++ b/configure.ac @@ -3121,6 +3121,7 @@ WINE_CONFIG_DLL(system.drv16,enable_win16) WINE_CONFIG_DLL(t2embed) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) +WINE_CONFIG_TEST(dlls/taskschd/tests) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) WINE_CONFIG_DLL(twain.dll16,enable_win16) diff --git a/dlls/taskschd/tests/Makefile.in b/dlls/taskschd/tests/Makefile.in new file mode 100644 index 0000000..63424da --- /dev/null +++ b/dlls/taskschd/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = taskschd.dll +IMPORTS = oleaut32 ole32 + +C_SRCS = \ + scheduler.c diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c new file mode 100644 index 0000000..9b99258 --- /dev/null +++ b/dlls/taskschd/tests/scheduler.c @@ -0,0 +1,118 @@ +/* + * Copyright 2014 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "taskschd.h" + +#include <wine/test.h> + +static void test_Connect(void) +{ + static const WCHAR deadbeefW[] = { 'd','e','a','d','b','e','e','f',0 }; + WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len; + HRESULT hr; + BSTR bstr; + VARIANT v_null, v_comp; + VARIANT_BOOL vbool; + ITaskService *service; + + hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_TaskScheduler) error %#x\n", hr); + return; + } + + vbool = 0xdead; + hr = ITaskService_get_Connected(service, &vbool); +todo_wine + ok(hr == S_OK, "get_Connected error %#x\n", hr); +todo_wine + ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + + hr = ITaskService_get_TargetServer(service, &bstr); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#x\n", hr); + + /* Win7 doesn't support UNC \\ prefix, but according to a user + * comment on MSDN Win8 supports both ways. + */ + len = sizeof(comp_name)/sizeof(comp_name[0]); + GetComputerNameW(comp_name, &len); + + V_VT(&v_null) = VT_NULL; + + V_VT(&v_comp) = VT_BSTR; + V_BSTR(&v_comp) = SysAllocString(comp_name); + + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); +todo_wine + ok(hr == S_OK || hr == E_ACCESSDENIED /* not an administrator */, "Connect error %#x\n", hr); + + SysFreeString(V_BSTR(&v_comp)); + V_BSTR(&v_comp) = SysAllocString(deadbeefW); + + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "expected ERROR_BAD_NETPATH, got %#x\n", hr); + + vbool = 0xdead; + hr = ITaskService_get_Connected(service, &vbool); +todo_wine + ok(hr == S_OK, "get_Connected error %#x\n", hr); +todo_wine + ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); +todo_wine + ok(hr == S_OK, "Connect error %#x\n", hr); + + vbool = 0xdead; + hr = ITaskService_get_Connected(service, &vbool); +todo_wine + ok(hr == S_OK, "get_Connected error %#x\n", hr); +todo_wine + ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + + hr = ITaskService_get_TargetServer(service, &bstr); +todo_wine + ok(hr == S_OK, "get_TargetServer error %#x\n", hr); + if (hr == S_OK) + { + ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } + SysFreeString(V_BSTR(&v_comp)); +} + +START_TEST(scheduler) +{ + OleInitialize(NULL); + + test_Connect(); + + OleUninitialize(); +}

1 0

Huw Davies : mshtml: Release a leaked class factory.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 6da6f1861bb2f299c59c1a733ccfe5571b2594b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da6f1861bb2f299c59c1a733… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 13 13:32:27 2014 +0000 mshtml: Release a leaked class factory. --- dlls/mshtml/npplugin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index f5eb754..0ce72ff 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -635,6 +635,7 @@ static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *n } hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); + IClassFactory_Release(cf); if(FAILED(hres)) return NULL;

1 0

André Hentschel : oleaut32/tests: Mark W2k results as broken.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 0485e528f7c3fcf73f5dbf5ad5d6d1444de43192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0485e528f7c3fcf73f5dbf5ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 12 23:28:14 2014 +0100 oleaut32/tests: Mark W2k results as broken. --- dlls/oleaut32/tests/safearray.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 3e311e3..bb346f6 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1467,11 +1467,17 @@ static void test_SafeArrayCopyData(void) sa = SafeArrayCreateVector(VT_UI1, 0, 2); sacopy = SafeArrayCreateVector(VT_UI1, 0, 2); - ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sa->fFeatures); - ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sacopy->fFeatures); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sa->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sa->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sacopy->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sacopy->fFeatures); hres = SafeArrayCopyData(sa, sacopy); ok(hres == S_OK, "got 0x%08x\n", hres); - ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%04x\n", sacopy->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sacopy->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%04x\n", sacopy->fFeatures); SafeArrayDestroy(sacopy); sacopy = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab); @@ -1771,10 +1777,14 @@ static void test_SafeArrayCopy(void) /* copy from a vector */ sa = SafeArrayCreateVector(VT_UI1, 0, 2); - ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", hres); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(!sa->fFeatures /* W2k */), + "got 0x%08x\n", hres); hres = SafeArrayCopy(sa, &sa2); ok(hres == S_OK, "got 0x%08x\n", hres); - ok(sa2->fFeatures == FADF_HAVEVARTYPE, "got 0x%04x\n", sa2->fFeatures); + ok(sa2->fFeatures == FADF_HAVEVARTYPE || + broken(!sa2->fFeatures /* W2k */), "got 0x%04x\n", + sa2->fFeatures); SafeArrayDestroy(sa2); SafeArrayDestroy(sa);

1 0

Andrey Gusev : Assorted typos fixes.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: be367393c95bd391d7ad3309d3e085d9f4be2237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be367393c95bd391d7ad3309d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 11 17:02:02 2014 +0200 Assorted typos fixes. --- dlls/acledit/main.c | 2 +- dlls/advapi32/security.c | 4 ++-- dlls/atl100/atl.c | 2 +- dlls/avifil32/api.c | 2 +- dlls/avifil32/avifile.c | 2 +- dlls/comctl32/dpa.c | 2 +- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/listview.c | 6 +++--- dlls/comctl32/tests/trackbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/fontdlg.c | 2 +- dlls/comdlg32/printdlg.c | 8 ++++---- dlls/crypt32/tests/store.c | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index d1a9ac7..49de8b5 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -55,7 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) LONG WINAPI FMExtensionProcW(HWND hWnd, WORD wEvent, LONG lParam) { - FIXME("%p, %d, 0x%x) stub\n", hWnd, wEvent, lParam); + FIXME("(%p, %d, 0x%x) stub\n", hWnd, wEvent, lParam); return 0; } diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 280ba77..ac0a941 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5302,7 +5302,7 @@ BOOL WINAPI CreateProcessAsUserW( LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation ) { - FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - semi- stub\n", hToken, + FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - semi-stub\n", hToken, debugstr_w(lpApplicationName), debugstr_w(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); @@ -5801,7 +5801,7 @@ DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName, BOOL KeepExplicit, FN_PROGRESS fnProgress, PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args) { - FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p Stub\n", + FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p) stub\n", debugstr_w(pObjectName), ObjectType, SecurityInfo, pOwner, pGroup, pDacl, pSacl, KeepExplicit, fnProgress, ProgressInvokeSetting, Args); diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 9156afb..058fa22 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -391,7 +391,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, */ HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE *winmod) { - TRACE("(%p\n", winmod); + TRACE("(%p)\n", winmod); if(winmod->cbSize != sizeof(*winmod)) return E_INVALIDARG; diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 6c07a2f..20985cd 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1515,7 +1515,7 @@ HRESULT WINAPI AVISaveVA(LPCSTR szFile, CLSID *pclsidHandler, HRESULT hr; int len; - TRACE("%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler, + TRACE("(%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler, lpfnCallback, nStream, ppavi, plpOptions); if (szFile == NULL || ppavi == NULL || plpOptions == NULL) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 7c14805..6295c7b 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1292,7 +1292,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, void if (fcc == ckidSTREAMHANDLERDATA) { if (This->lpHandlerData != NULL) { - FIXME(": handler data already set -- overwirte?\n"); + FIXME(": handler data already set -- overwrite?\n"); return AVIERR_UNSUPPORTED; } diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 11dd14f..0b96df6 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -269,7 +269,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, INT nResult, i; INT nIndex; - TRACE("%p %p %08x %p %p %08lx)\n", + TRACE("(%p %p %08x %p %p %08lx)\n", hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam); if (IsBadWritePtr (hdpa1, sizeof(*hdpa1))) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 6461df6..ec90a9c 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2889,7 +2889,7 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) himl->hbmImage = hbmNewBitmap; } else - ERR("Could not create new image bitmap !\n"); + ERR("Could not create new image bitmap!\n"); if (himl->hbmMask) { diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5ce7de2..bc9a04c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8247,7 +8247,7 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) INT max_cx = 0; HDITEMW hdi; - TRACE("(nColumn=%d, cx=%d\n", nColumn, cx); + TRACE("(nColumn=%d, cx=%d)\n", nColumn, cx); /* set column width only if in report or list mode */ if (infoPtr->uView != LV_VIEW_DETAILS && infoPtr->uView != LV_VIEW_LIST) return FALSE; @@ -8631,7 +8631,7 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG INT oldHeight = infoPtr->nItemHeight; HIMAGELIST himlOld = 0; - TRACE("(nType=%d, himl=%p\n", nType, himl); + TRACE("(nType=%d, himl=%p)\n", nType, himl); switch (nType) { @@ -8786,7 +8786,7 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO { POINT Origin, Pt; - TRACE("(nItem=%d, pt=%s\n", nItem, wine_dbgstr_point(pt)); + TRACE("(nItem=%d, pt=%s)\n", nItem, wine_dbgstr_point(pt)); if (!pt || nItem < 0 || nItem >= infoPtr->nItemCount || !(infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON)) return FALSE; diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 3ee7fda..32c9575 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -777,7 +777,7 @@ static void test_tic_settings(HWND hWndTrackbar){ ok(r == TRUE, "Expected TRUE, got %d\n", r); r = SendMessageA(hWndTrackbar, TBM_SETTIC, 0, 20); - ok(r == FALSE, "Expected False, got %d\n", r); + ok(r == FALSE, "Expected FALSE, got %d\n", r); /* test TBM_SETTICFREQ */ SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10)); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a885543..b2eed3c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3428,7 +3428,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, TREEVIEW_ITEM *nextItem, *tmpItem; BOOL sendsNotifications; - TRACE("(%p, %p, partial=%d, %d\n", infoPtr, item, partial, user); + TRACE("(%p, %p, partial=%d, %d)\n", infoPtr, item, partial, user); if (!TREEVIEW_HasChildren(infoPtr, item)) return FALSE; diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 5f4c676..0409915 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -89,7 +89,7 @@ static BOOL FD31_Init(void) if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 || hHDisk == 0 || hCDRom == 0 || hNet == 0) { - ERR("Error loading icons !\n"); + ERR("Error loading icons!\n"); return FALSE; } initialized = TRUE; diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 68f0467..9e73ec9 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -632,7 +632,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) if (lpcf->lStructSize != sizeof(CHOOSEFONTW)) { - ERR("structure size failure !!!\n"); + ERR("structure size failure!!!\n"); EndDialog (hDlg, 0); return FALSE; } diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 292f764..d52b47d 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1495,7 +1495,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, PrintStructures->hNoCollateIcon == 0 || PrintStructures->hPortraitIcon == 0 || PrintStructures->hLandscapeIcon == 0) { - ERR("no icon in resourcefile\n"); + ERR("no icon in resource file\n"); COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); EndDialog(hDlg, FALSE); } @@ -1603,7 +1603,7 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, PrintStructures->hNoCollateIcon == 0 || PrintStructures->hPortraitIcon == 0 || PrintStructures->hLandscapeIcon == 0) { - ERR("no icon in resourcefile\n"); + ERR("no icon in resource file\n"); COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); EndDialog(hDlg, FALSE); } @@ -2263,7 +2263,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) } if(lppd->lStructSize != sizeof(PRINTDLGA)) { - WARN("structure size failure !!!\n"); + WARN("structure size failure!!!\n"); COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE); return FALSE; } @@ -2414,7 +2414,7 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) } if(lppd->lStructSize != sizeof(PRINTDLGW)) { - WARN("structure size failure !!!\n"); + WARN("structure size failure!!!\n"); COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE); return FALSE; } diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 1fa3ffa..a416a39 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -130,7 +130,7 @@ static void _test_store_is_empty(unsigned line, HCERTSTORE store) const CERT_CONTEXT *cert; cert = CertEnumCertificatesInStore(store, NULL); - ok_(__FILE__,line)(!cert && GetLastError() == CRYPT_E_NOT_FOUND, "store is not epmty\n"); + ok_(__FILE__,line)(!cert && GetLastError() == CRYPT_E_NOT_FOUND, "store is not empty\n"); } static void testMemStore(void)

1 0

Michael Stefaniuc : dmloader/tests: Fix a crash due to a missing audio driver.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 3fef1be56f70075076d9ddb767b47d1a059152e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fef1be56f70075076d9ddb76… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 23:07:26 2014 +0100 dmloader/tests: Fix a crash due to a missing audio driver. --- dlls/dmloader/tests/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index ea5edca..8759033 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -73,6 +73,10 @@ static void test_simple_playing(void) hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); + if (hr == DSERR_NODRIVER) { + skip("No audio driver.\n"); + return; + } ok(hr == S_OK, "InitAudio failed: %08x\n", hr); ok(music != NULL, "Didn't get IDirectMusic pointer\n"); ok(dsound != NULL, "Didn't get IDirectSound pointer\n");

1 0

Michael Stefaniuc : dmime/tests: Fix a crash due to a missing audio driver.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 03d5b1248bcb75cc84b1bebe4e4a2b8a4cca8869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d5b1248bcb75cc84b1bebe4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 23:07:15 2014 +0100 dmime/tests: Fix a crash due to a missing audio driver. --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3d5a426..669e99e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -57,6 +57,10 @@ static void test_COM_audiopath(void) } hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); + if (hr == DSERR_NODRIVER) { + skip("No audio driver\n"); + return; + } ok(hr == S_OK, "DirectMusicPerformance_InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &dmap); ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %08x\n", hr);

1 0

Akihiro Sagawa : gdi32: Improve vertical writing metrics.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: f6475ace5fc812749beefc8fc17add8c4281bc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6475ace5fc812749beefc8fc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:30:01 2014 +0900 gdi32: Improve vertical writing metrics. --- dlls/gdi32/freetype.c | 44 ++++++++++++++------------------------------ dlls/gdi32/tests/font.c | 2 -- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3cc8dd8..722a211 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6443,6 +6443,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } else { INT xc, yc; FT_Vector vec; + FT_Pos lsb; left = right = 0; @@ -6468,41 +6469,24 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = bottom & -64; top = (top + 63) & -64; - if (tategaki) + if (tategaki && (font->potm || get_outline_text_metrics(font))) { - for(xc = 0; xc < 2; xc++) - { - for(yc = 0; yc < 2; yc++) - { - if (vertical_metrics) - { - vec.x = metrics.vertBearingY + xc * metrics.height; - vec.y = metrics.horiBearingX - yc * (metrics.vertBearingX * 2); - } - else - { - vec.x = metrics.horiBearingY - xc * metrics.height; - vec.y = metrics.horiBearingX + yc * metrics.width; - } - - TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); - pFT_Vector_Transform(&vec, &transMat); - if(xc == 0 && yc == 0) { - origin_x = vec.x; - origin_y = vec.y; - } else { - if(vec.x < origin_x) origin_x = vec.x; - if(vec.y > origin_y) origin_y = vec.y; - } - } - } - origin_x = origin_x & -64; - origin_y = (origin_y + 63) & -64; + if (vertical_metrics) + lsb = metrics.horiBearingY + metrics.vertBearingY; + else + lsb = metrics.vertAdvance + (font->potm->otmDescent << 6); + vec.x = lsb; + vec.y = font->potm->otmDescent << 6; + TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); + pFT_Vector_Transform(&vec, &transMat); + origin_x = (vec.x + left) & -64; + origin_y = (vec.y + top + 63) & -64; } else { origin_x = left; origin_y = top; + lsb = metrics.horiBearingX; } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); @@ -6537,7 +6521,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, adv = pFT_MulFix(vec.x, em_scale) * 2; } - vec.x = metrics.horiBearingX; + vec.x = lsb; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); abc->abcA = vec.x >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bea7f28..7e93f9d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5294,13 +5294,11 @@ static void check_vertical_metrics(const char *face) } else { - todo_wine ok(vgm.gmptGlyphOrigin.x == rgm.gmptGlyphOrigin.x + vgm.gmCellIncX + otm.otmDescent, "got %d, expected rgm.origin.x(%d) + vgm.cellIncX(%d) + descent(%d)\n", vgm.gmptGlyphOrigin.x, rgm.gmptGlyphOrigin.x, vgm.gmCellIncX, otm.otmDescent); } - todo_wine ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent, "got %d, expected abcA(%d) + abcB(%u) + descent(%d)\n", (INT)vgm.gmptGlyphOrigin.y, abc.abcA, abc.abcB, otm.otmDescent);

1 0

Akihiro Sagawa : gdi32/tests: Add tests for vertical writing metrics.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: a221654aaee6ff112da03b9d25c742344a47f58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a221654aaee6ff112da03b9d2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:59 2014 +0900 gdi32/tests: Add tests for vertical writing metrics. --- dlls/gdi32/tests/font.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e05cfea..bea7f28 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5229,13 +5229,98 @@ static void check_vertical_font(const char *name, BOOL *installed, BOOL *selecte ReleaseDC(NULL, hdc); } +static void check_vertical_metrics(const char *face) +{ + LOGFONTA lf; + HFONT hfont, hfont_prev; + HDC hdc; + DWORD ret; + GLYPHMETRICS rgm, vgm; + const UINT code = 0x5EAD, height = 1000; + WORD idx; + ABC abc; + OUTLINETEXTMETRICA otm; + USHORT numOfLongVerMetrics; + + hdc = GetDC(NULL); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, face); + lf.lfHeight = -height; + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfEscapement = lf.lfOrientation = 900; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ret = GetGlyphOutlineW(hdc, code, GGO_METRICS, &rgm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); + ret = GetCharABCWidthsW(hdc, code, code, &abc); + ok(ret, "GetCharABCWidthsW failed\n"); + DeleteObject(SelectObject(hdc, hfont_prev)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "@"); + strcat(lf.lfFaceName, face); + lf.lfHeight = -height; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ret = GetGlyphOutlineW(hdc, code, GGO_METRICS, &vgm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); + + memset(&otm, 0, sizeof(otm)); + otm.otmSize = sizeof(otm); + ret = GetOutlineTextMetricsA(hdc, sizeof(otm), &otm); + ok(ret != 0, "GetOutlineTextMetricsA failed\n"); + ret = GetGlyphIndicesW(hdc, (LPCWSTR)&code, 1, &idx, 0); + ok(ret != 0, "GetGlyphIndicesW failed\n"); + + if (GetFontData(hdc, MS_MAKE_TAG('v','h','e','a'), sizeof(SHORT) * 17, + &numOfLongVerMetrics, sizeof(numOfLongVerMetrics)) != GDI_ERROR) { + int offset; + SHORT topSideBearing; + numOfLongVerMetrics = GET_BE_WORD(numOfLongVerMetrics); + if (numOfLongVerMetrics > idx) + offset = idx * 2 + 1; + else + offset = numOfLongVerMetrics * 2 + (idx - numOfLongVerMetrics); + ret = GetFontData(hdc, MS_MAKE_TAG('v','m','t','x'), offset * sizeof(SHORT), + &topSideBearing, sizeof(SHORT)); + ok(ret != GDI_ERROR, "GetFontData(vmtx) failed\n"); + topSideBearing = GET_BE_WORD(topSideBearing); + ok(match_off_by_1(vgm.gmptGlyphOrigin.x, + MulDiv(topSideBearing, height, otm.otmEMSquare), FALSE), + "expected %d, got %d\n", + MulDiv(topSideBearing, height, otm.otmEMSquare), vgm.gmptGlyphOrigin.x); + } + else + { + todo_wine + ok(vgm.gmptGlyphOrigin.x == rgm.gmptGlyphOrigin.x + vgm.gmCellIncX + otm.otmDescent, + "got %d, expected rgm.origin.x(%d) + vgm.cellIncX(%d) + descent(%d)\n", + vgm.gmptGlyphOrigin.x, rgm.gmptGlyphOrigin.x, vgm.gmCellIncX, otm.otmDescent); + } + + todo_wine + ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent, + "got %d, expected abcA(%d) + abcB(%u) + descent(%d)\n", + (INT)vgm.gmptGlyphOrigin.y, abc.abcA, abc.abcB, otm.otmDescent); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); +} + static void test_vertical_font(void) { char ttf_name[MAX_PATH]; - int num; + int num, i; BOOL ret, installed, selected; GLYPHMETRICS gm; WORD hgi, vgi; + const char* face_list[] = { + "@WineTestVertical", /* has vmtx table */ + "@Ume Gothic", /* doesn't have vmtx table */ + "@MS UI Gothic", /* has vmtx table, available on native */ + }; if (!pAddFontResourceExA || !pRemoveFontResourceExA || !pGetGlyphIndicesW) { @@ -5268,6 +5353,16 @@ static void test_vertical_font(void) ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi); + for (i = 0; i < sizeof(face_list)/sizeof(face_list[0]); i++) { + const char* face = face_list[i]; + if (!is_truetype_font_installed(face)) { + skip("%s is not installed\n", face); + continue; + } + trace("Testing %s...\n", face); + check_vertical_metrics(&face[1]); + } + ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014