January 2014 - Wine-Commits

Dmitry Timoshkov : windowscodecs: Move the aggregation check from object constructors to class factory.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d03f65a51fd4977f7875d87a6dffe5769caa8e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03f65a51fd4977f7875d87a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 20:18:11 2014 +0900 windowscodecs: Move the aggregation check from object constructors to class factory. --- dlls/windowscodecs/bmpdecode.c | 14 ++++----- dlls/windowscodecs/bmpencode.c | 6 ++-- dlls/windowscodecs/clsfactory.c | 8 ++++-- dlls/windowscodecs/converter.c | 6 ++-- dlls/windowscodecs/gifformat.c | 26 ++++++++--------- dlls/windowscodecs/icnsformat.c | 8 ++---- dlls/windowscodecs/icoformat.c | 8 ++---- dlls/windowscodecs/imgfactory.c | 8 ++---- dlls/windowscodecs/jpegformat.c | 16 ++++------- dlls/windowscodecs/metadatahandler.c | 12 ++++---- dlls/windowscodecs/pngformat.c | 20 ++++++------- dlls/windowscodecs/proxy.c | 2 +- dlls/windowscodecs/tgaformat.c | 6 ++-- dlls/windowscodecs/tiffformat.c | 16 ++++------- dlls/windowscodecs/wincodecs_private.h | 49 ++++++++++++++++---------------- 15 files changed, 89 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d03f65a51fd4977f7875d…

1 0

Alexandre Julliard : gdi32/tests: Update a few more failing DIB cases.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 36301db4d3b7dcb544e32d9da3f69288ecc74f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36301db4d3b7dcb544e32d9da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 20:10:41 2014 +0100 gdi32/tests: Update a few more failing DIB cases. --- dlls/gdi32/tests/dib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d23fba5..6e0fccd 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1127,12 +1127,12 @@ static const char *sha1_graphics_1[] = "4842a30dd7fdf38ddc3ddec85c08efe13a0e2e0b", "cc76db6da5ba1776f20240a5ad97a26a9cdf96b0", "014f477664a7f4ce4a948d6359a2707119afc8e2", - "1ee4e951743efc8764249fbc7adecefbfec0428e", + "74d01690e344bc22e7a0478e7a09ccd92354c486", "9ab50a663b74577b656e9849484a909d7ac52eeb", "128eefd2ee043d59dc37918065f687e378e5ca95", - "c642abc651f525332d9d635049646d309e877839", + "d7e2daab98ce1f698c4bfedfc01c0d79fcb76b8e", "8d34215487088b5d4ef63062270ce25c2862643d", - "3dc3075b0c87fdcaabbbae8928303fb2358c15c2", + "826562eb11a0d0bba77fa21245f7406a194e9225", "bbae6f0659e095a42b420082079663f937065813", "bbabe686a6955402c90530e7c67f1428868369b3", NULL

1 0

Michael Stefaniuc : dmscript: Return CLASS_E_CLASSNOTAVAILABLE for classes not implemented.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 1643038eca27f31c4c10487268107946483550cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1643038eca27f31c4c1048726… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 13 21:53:11 2014 +0100 dmscript: Return CLASS_E_CLASSNOTAVAILABLE for classes not implemented. --- dlls/dmscript/dmscript_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index e3dc8b7..6caf158 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -37,7 +37,7 @@ static HRESULT WINAPI create_unimpl_instance(REFIID riid, void **ppv, IUnknown * { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Dmitry Timoshkov : taskschd: Implement ITaskService::get_TargetServer.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: c940a3e97e930e089ab3d168ddbef1da196d689c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c940a3e97e930e089ab3d168d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 17:18:11 2014 +0900 taskschd: Implement ITaskService::get_TargetServer. --- dlls/taskschd/Makefile.in | 1 + dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 2 -- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 2436289..2b49585 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,4 +1,5 @@ MODULE = taskschd.dll +IMPORTS = oleaut32 C_SRCS = \ task.c \ diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index fd64bf9..5ff3761 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -193,8 +193,19 @@ static HRESULT WINAPI TaskService_get_Connected(ITaskService *iface, VARIANT_BOO static HRESULT WINAPI TaskService_get_TargetServer(ITaskService *iface, BSTR *server) { - FIXME("%p,%p: stub\n", iface, server); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, server); + + if (!server) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + *server = SysAllocString(task_svc->comp_name); + if (!*server) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *user) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index bf84c0d..02382c5 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -52,7 +52,6 @@ static void test_Connect(void) 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 @@ -89,7 +88,6 @@ 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) {

1 0

Alexandre Julliard : makefiles: Get rid of Make.rules.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 509364e1dd0c6bd4c1aa90573ddc33c1acd2fca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509364e1dd0c6bd4c1aa90573… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 11:59:25 2014 +0100 makefiles: Get rid of Make.rules. --- Make.rules.in | 30 ------------ Make.vars.in | 1 - aclocal.m4 | 55 ++++----------------- configure | 112 ++++++++++--------------------------------- configure.ac | 12 ++++- documentation/Makefile.in | 2 - fonts/Makefile.in | 4 +- include/Makefile.in | 4 +- libs/port/Makefile.in | 2 - libs/wine/Makefile.in | 3 +- libs/wpp/Makefile.in | 2 - loader/Makefile.in | 3 +- server/Makefile.in | 4 +- tools/Makefile.in | 4 +- tools/make_makefiles | 25 +--------- tools/widl/Makefile.in | 4 +- tools/winebuild/Makefile.in | 4 +- tools/winedump/Makefile.in | 4 +- tools/winegcc/Makefile.in | 4 +- tools/wmc/Makefile.in | 4 +- tools/wrc/Makefile.in | 4 +- 21 files changed, 76 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=509364e1dd0c6bd4c1aa9…

1 0

Ken Thomases : winemac: When setting a view for an OpenGL context and it is latent, clear any existing view.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d57a99b48274e2020382465bccc69df5aa24630e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57a99b48274e2020382465bc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:01 2014 -0600 winemac: When setting a view for an OpenGL context and it is latent, clear any existing view. --- dlls/winemac.drv/cocoa_opengl.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 0b67ed1..752fb77 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -168,7 +168,11 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) [context setLatentView:nil]; } else + { + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; [context setLatentView:view]; + } [context makeCurrentContext];

1 0

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

Jan. 13, 2014

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 Jan. 13, 2014

Jan. 13, 2014

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

Akihiro Sagawa : gdi32: Fix ABC metrics for rotated font.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: f6bc356860a1ea2e5b4aed43e38ddf8b7d24a8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bc356860a1ea2e5b4aed43e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:58 2014 +0900 gdi32: Fix ABC metrics for rotated font. --- dlls/gdi32/freetype.c | 18 ++++++++++++++++-- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f8b365b..3cc8dd8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6438,6 +6438,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, gm.gmCellIncY = 0; origin_x = left; origin_y = top; + abc->abcA = origin_x >> 6; + abc->abcB = metrics.width >> 6; } else { INT xc, yc; FT_Vector vec; @@ -6534,6 +6536,19 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Vector_Transform(&vec, &transMatUnrotated); adv = pFT_MulFix(vec.x, em_scale) * 2; } + + vec.x = metrics.horiBearingX; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + abc->abcA = vec.x >> 6; + + vec.x = metrics.width; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + if (vec.x >= 0) + abc->abcB = vec.x >> 6; + else + abc->abcB = -vec.x >> 6; } width = (right - left) >> 6; @@ -6542,8 +6557,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, gm.gmBlackBoxY = height ? height : 1; gm.gmptGlyphOrigin.x = origin_x >> 6; gm.gmptGlyphOrigin.y = origin_y >> 6; - abc->abcA = left >> 6; - abc->abcB = gm.gmBlackBoxX; + if (!abc->abcB) abc->abcB = 1; abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", gm.gmBlackBoxX, gm.gmBlackBoxY, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 28bec52..e05cfea 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1325,14 +1325,12 @@ static void test_GetCharABCWidths(void) ok(ret, "GetCharABCWidthsW should have succeeded\n"); /* 3) compare ABC results */ - todo_wine { ok(match_off_by_1(abcw[0].abcA, abc[0].abcA, FALSE), "got %d, expected %d (A)\n", abc[0].abcA, abcw[0].abcA); ok(match_off_by_1(abcw[0].abcB, abc[0].abcB, FALSE), "got %d, expected %d (B)\n", abc[0].abcB, abcw[0].abcB); ok(match_off_by_1(abcw[0].abcC, abc[0].abcC, FALSE), "got %d, expected %d (C)\n", abc[0].abcC, abcw[0].abcC); - } DeleteObject(SelectObject(hdc, hfont)); ReleaseDC(NULL, hdc);

1 0

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

Jan. 13, 2014

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