August 2017 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32/tests: Test DialogBoxParam using a dialog template with invalid control class.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: a62a8601db26bd8c39e561505876c6c41b8156bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62a8601db26bd8c39e561505… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 18 19:41:57 2017 +0800 user32/tests: Test DialogBoxParam using a dialog template with invalid control class. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 6 ++++++ dlls/user32/tests/resource.rc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 6b9d704..ac61d4e 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1272,6 +1272,12 @@ static void test_DialogBoxParamA(void) "got %d, expected ERROR_RESOURCE_NAME_NOT_FOUND\n",GetLastError()); SetLastError(0xdeadbeef); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); +todo_wine + ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); + ok(GetLastError() == 0, "got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0); ok(ret == 0, "DefDlgProcA returned %ld, expected 0\n", ret); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index f116b85..756e38f 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -124,6 +124,12 @@ FONT 8, "MS Shell Dlg" EDITTEXT 200,4,4,50,14 } +TEST_DIALOG_INVALID_CLASS DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +{ + CONTROL "",1,"wine invalid class",WS_CHILD,0,0,40,10 +} + IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog"

1 0

Dmitry Timoshkov : user32: DialogBoxParam should return -1 when dialog control creation fails.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 3d66e753e7eb00495690bf54abc27943a9e089db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d66e753e7eb00495690bf54a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 18 19:42:11 2017 +0800 user32: DialogBoxParam should return -1 when dialog control creation fails. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 14 ++++++++------ dlls/user32/tests/dialog.c | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 8b77ae2..c2aad8d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -835,11 +835,12 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, HRSRC hrsrc; LPCDLGTEMPLATEA ptr; + if (owner && !IsWindow(owner)) return 0; + if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); - return 0; + if (!(hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner ))) return -1; + return DIALOG_DoDialogBox( hwnd, owner ); } @@ -853,11 +854,12 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, HRSRC hrsrc; LPCDLGTEMPLATEW ptr; + if (owner && !IsWindow(owner)) return 0; + if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); - return 0; + if (!(hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner ))) return -1; + return DIALOG_DoDialogBox( hwnd, owner ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index ac61d4e..8bf76f1 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1273,7 +1273,6 @@ static void test_DialogBoxParamA(void) SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); -todo_wine ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); ok(GetLastError() == 0, "got %d\n", GetLastError());

1 0

Vincent Povirk : wmphoto: Add stub dll.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 618f9de37e349aa270588813f9b5cf1913fa8926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618f9de37e349aa270588813f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 16 16:08:51 2017 -0500 wmphoto: Add stub dll. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wmphoto/Makefile.in | 3 +++ dlls/wmphoto/main.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmphoto/wmphoto.spec | 4 +++ 5 files changed, 77 insertions(+) diff --git a/configure b/configure index 2ccbb09..1444c48 100755 --- a/configure +++ b/configure @@ -1515,6 +1515,7 @@ enable_wmasf enable_wmi enable_wmiutils enable_wmp +enable_wmphoto enable_wmvcore enable_wnaspi32 enable_wpc @@ -18830,6 +18831,7 @@ wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp clean wine_fn_config_test dlls/wmp/tests wmp_test +wine_fn_config_dll wmphoto enable_wmphoto wine_fn_config_dll wmvcore enable_wmvcore implib wine_fn_config_test dlls/wmvcore/tests wmvcore_test wine_fn_config_dll wnaspi32 enable_wnaspi32 implib diff --git a/configure.ac b/configure.ac index 4796492..0a8a89b 100644 --- a/configure.ac +++ b/configure.ac @@ -3612,6 +3612,7 @@ WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp,,[clean]) WINE_CONFIG_TEST(dlls/wmp/tests) +WINE_CONFIG_DLL(wmphoto) WINE_CONFIG_DLL(wmvcore,,[implib]) WINE_CONFIG_TEST(dlls/wmvcore/tests) WINE_CONFIG_DLL(wnaspi32,,[implib]) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in new file mode 100644 index 0000000..115de54 --- /dev/null +++ b/dlls/wmphoto/Makefile.in @@ -0,0 +1,3 @@ +MODULE = wmphoto.dll + +C_SRCS = main.c diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c new file mode 100644 index 0000000..48fd5dc --- /dev/null +++ b/dlls/wmphoto/main.c @@ -0,0 +1,67 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#define COBJMAcROS +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + } + + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) +{ + FIXME("wmphoto: stub\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("wmphoto: stub\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("wmphoto: stub\n"); + return E_NOTIMPL; +} diff --git a/dlls/wmphoto/wmphoto.spec b/dlls/wmphoto/wmphoto.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/wmphoto/wmphoto.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Vincent Povirk : wmphoto: Register WMP encoder and decoder classes.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: aa7e28497cdba1d0b1eb7aebe07e93a610baa31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7e28497cdba1d0b1eb7aebe… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 16 16:08:52 2017 -0500 wmphoto: Register WMP encoder and decoder classes. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/wmphoto/Makefile.in | 2 ++ dlls/wmphoto/main.c | 10 ++++++---- dlls/wmphoto/wmphoto.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 1444c48..302087e 100755 --- a/configure +++ b/configure @@ -18831,7 +18831,7 @@ wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp clean wine_fn_config_test dlls/wmp/tests wmp_test -wine_fn_config_dll wmphoto enable_wmphoto +wine_fn_config_dll wmphoto enable_wmphoto clean wine_fn_config_dll wmvcore enable_wmvcore implib wine_fn_config_test dlls/wmvcore/tests wmvcore_test wine_fn_config_dll wnaspi32 enable_wnaspi32 implib diff --git a/configure.ac b/configure.ac index 0a8a89b..9aeaf34 100644 --- a/configure.ac +++ b/configure.ac @@ -3612,7 +3612,7 @@ WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp,,[clean]) WINE_CONFIG_TEST(dlls/wmp/tests) -WINE_CONFIG_DLL(wmphoto) +WINE_CONFIG_DLL(wmphoto,,[clean]) WINE_CONFIG_DLL(wmvcore,,[implib]) WINE_CONFIG_TEST(dlls/wmvcore/tests) WINE_CONFIG_DLL(wnaspi32,,[implib]) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index 115de54..d31af33 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -1,3 +1,5 @@ MODULE = wmphoto.dll C_SRCS = main.c + +IDL_SRCS = wmphoto.idl diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c index 48fd5dc..a92f18b 100644 --- a/dlls/wmphoto/main.c +++ b/dlls/wmphoto/main.c @@ -24,16 +24,20 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static HINSTANCE WMPHOTO_hInstance; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) { case DLL_PROCESS_ATTACH: + WMPHOTO_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; case DLL_WINE_PREATTACH: @@ -56,12 +60,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) HRESULT WINAPI DllRegisterServer(void) { - FIXME("wmphoto: stub\n"); - return E_NOTIMPL; + return __wine_register_resources( WMPHOTO_hInstance ); } HRESULT WINAPI DllUnregisterServer(void) { - FIXME("wmphoto: stub\n"); - return E_NOTIMPL; + return __wine_unregister_resources( WMPHOTO_hInstance ); } diff --git a/dlls/wmphoto/wmphoto.idl b/dlls/wmphoto/wmphoto.idl new file mode 100644 index 0000000..b2a47c1 --- /dev/null +++ b/dlls/wmphoto/wmphoto.idl @@ -0,0 +1,42 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +import "unknwn.idl"; +import "wincodec.idl"; + +[ + helpstring("WIC WMP Decoder"), + uuid(a26cec36-234c-4950-ae16-e34aace71d0d), + threading(both) +] +coclass WICWmpDecoder +{ + [default] interface IWICBitmapDecoder; +}; + +[ + helpstring("WIC WMP Encoder"), + uuid(ac4ce3cb-e1c1-44cd-8215-5a1665509ec2), + threading(both) +] +coclass WICWmpEncoder +{ + [default] interface IWICBitmapEncoder; +};

1 0

Vincent Povirk : shell32: Change default ProgramData folder and set ProfileList key.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: dcb1359b5ec36612ad1539836a6e79a8ad11cbce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb1359b5ec36612ad1539836… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 16 14:40:31 2017 -0500 shell32: Change default ProgramData folder and set ProfileList key. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 73 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcb1359b5ec36612ad153…

1 0

Vincent Povirk : kernel32: Set the ProgramData environment variable.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: e8ef521c8333a98bc516ea9c1ce02dd930c7d683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ef521c8333a98bc516ea9c1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 16 14:40:32 2017 -0500 kernel32: Set the ProgramData environment variable. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4810965..9097542 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -517,9 +517,10 @@ static void set_additional_environment(void) static const WCHAR all_users_valueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; + static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - WCHAR *profile_dir = NULL, *all_users_dir = NULL; + WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL; WCHAR buf[MAX_COMPUTERNAME_LENGTH+1]; HANDLE hkey; DWORD len; @@ -542,6 +543,7 @@ static void set_additional_environment(void) { profile_dir = get_reg_value( hkey, profiles_valueW ); all_users_dir = get_reg_value( hkey, all_users_valueW ); + program_data_dir = get_reg_value( hkey, programdataW ); NtClose( hkey ); } @@ -559,8 +561,14 @@ static void set_additional_environment(void) HeapFree( GetProcessHeap(), 0, value ); } + if (program_data_dir) + { + SetEnvironmentVariableW( programdataW, program_data_dir ); + } + HeapFree( GetProcessHeap(), 0, all_users_dir ); HeapFree( GetProcessHeap(), 0, profile_dir ); + HeapFree( GetProcessHeap(), 0, program_data_dir ); } /***********************************************************************

1 0

Huw Davies : gdi32: Cache the device caps from the reference dc, since the dc may become invalid.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 9ea33ed00a242392a7c19dbb51afb54c0770d178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea33ed00a242392a7c19dbb5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 22 12:42:34 2017 +0100 gdi32: Cache the device caps from the reference dc, since the dc may become invalid. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 4 +++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 +-- dlls/gdi32/enhmfdrv/init.c | 42 ++++++++++++++++++++++++++++-------- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 531392b..37180fe 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -510,7 +510,9 @@ INT EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - return GetDeviceCaps( physDev->ref_dc, cap ); + if (cap >= 0 && cap < sizeof(physDev->dev_caps) / sizeof(physDev->dev_caps[0])) + return physDev->dev_caps[cap]; + return 0; } diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 547c411..1763781 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -40,10 +40,9 @@ typedef struct HANDLE hFile; /* Handle for disk based MetaFile */ HBRUSH dc_brush; HPEN dc_pen; - HDC ref_dc; /* Reference device */ - HDC screen_dc; /* Screen DC if no reference device specified */ INT restoring; /* RestoreDC counter */ BOOL path; + INT dev_caps[COLORMGMTCAPS + 1]; } EMFDRV_PDEVICE; static inline EMFDRV_PDEVICE *get_emf_physdev( PHYSDEV dev ) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index d241f21..6f9a956 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -301,6 +301,23 @@ HDC WINAPI CreateEnhMetaFileA( return hReturnDC; } +static inline BOOL devcap_is_valid( int cap ) +{ + if (cap >= 0 && cap <= ASPECTXY) return !(cap & 1); + if (cap >= PHYSICALWIDTH && cap <= COLORMGMTCAPS) return TRUE; + switch (cap) + { + case LOGPIXELSX: + case LOGPIXELSY: + case CAPS1: + case SIZEPALETTE: + case NUMRESERVED: + case COLORRES: + return TRUE; + } + return FALSE; +} + /********************************************************************** * CreateEnhMetaFileW (GDI32.@) */ @@ -312,12 +329,13 @@ HDC WINAPI CreateEnhMetaFileW( ) { static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - HDC ret; + HDC ret, ref_dc; DC *dc; EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; DWORD bytes_written; + int cap; TRACE("(%p %s %s %s)\n", hdc, debugstr_w(filename), wine_dbgstr_rect(rect), debugstr_w(description) ); @@ -350,13 +368,20 @@ HDC WINAPI CreateEnhMetaFileW( physDev->hFile = 0; physDev->dc_brush = 0; physDev->dc_pen = 0; - physDev->screen_dc = 0; physDev->restoring = 0; physDev->path = FALSE; + if (hdc) /* if no ref, use current display */ - physDev->ref_dc = hdc; + ref_dc = hdc; else - physDev->ref_dc = physDev->screen_dc = CreateDCW( displayW, NULL, NULL, NULL ); + ref_dc = CreateDCW( displayW, NULL, NULL, NULL ); + + memset( physDev->dev_caps, 0, sizeof(physDev->dev_caps) ); + for (cap = 0; cap < sizeof(physDev->dev_caps) / sizeof(physDev->dev_caps[0]); cap++) + if (devcap_is_valid( cap )) + physDev->dev_caps[cap] = GetDeviceCaps( ref_dc, cap ); + + if (!hdc) DeleteDC( ref_dc ); SetVirtualResolution(physDev->dev.hdc, 0, 0, 0, 0); @@ -390,12 +415,12 @@ HDC WINAPI CreateEnhMetaFileW( physDev->emh->nPalEntries = 0; /* I guess this should start at 0 */ /* Size in pixels */ - physDev->emh->szlDevice.cx = GetDeviceCaps( physDev->ref_dc, HORZRES ); - physDev->emh->szlDevice.cy = GetDeviceCaps( physDev->ref_dc, VERTRES ); + physDev->emh->szlDevice.cx = physDev->dev_caps[HORZRES]; + physDev->emh->szlDevice.cy = physDev->dev_caps[VERTRES]; /* Size in millimeters */ - physDev->emh->szlMillimeters.cx = GetDeviceCaps( physDev->ref_dc, HORZSIZE ); - physDev->emh->szlMillimeters.cy = GetDeviceCaps( physDev->ref_dc, VERTSIZE ); + physDev->emh->szlMillimeters.cx = physDev->dev_caps[HORZSIZE]; + physDev->emh->szlMillimeters.cy = physDev->dev_caps[VERTSIZE]; /* Size in micrometers */ physDev->emh->szlMicrometers.cx = physDev->emh->szlMillimeters.cx * 1000; @@ -457,7 +482,6 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); - if (physDev->screen_dc) DeleteDC( physDev->screen_dc ); emr.emr.iType = EMR_EOF; emr.emr.nSize = sizeof(emr);

1 0

Huw Davies : wineps: Fall back to the null driver for common device caps.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: dd26e02c58006de03ee53a8c2df76f254f7e36fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd26e02c58006de03ee53a8c2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 22 12:42:35 2017 +0100 wineps: Fall back to the null driver for common device caps. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/init.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3b00343..5b32879 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -486,42 +486,23 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) return MulDiv(physDev->vertSize, 100, physDev->Devmode->dmPublic.u1.s1.dmScale); case HORZRES: - case DESKTOPHORZRES: return physDev->horzRes; case VERTRES: - case DESKTOPVERTRES: return physDev->vertRes; case BITSPIXEL: /* Although Windows returns 1 for monochrome printers, we want CreateCompatibleBitmap to provide something other than 1 bpp */ return 32; - case PLANES: - return 1; - case NUMBRUSHES: - return -1; case NUMPENS: return 10; - case NUMMARKERS: - return 0; case NUMFONTS: return 39; case NUMCOLORS: return -1; case PDEVICESIZE: return sizeof(PSDRV_PDEVICE); - case CURVECAPS: - return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | - CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); - case LINECAPS: - return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | - LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); - case POLYGONALCAPS: - return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | - PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); case TEXTCAPS: return TC_CR_ANY | TC_VA_ABLE; /* psdrv 0x59f7 */ - case CLIPCAPS: - return CP_RECTANGLE; case RASTERCAPS: return (RC_BITBLT | RC_BITMAP64 | RC_GDI20_OUTPUT | RC_DIBTODEV | RC_STRETCHBLT | RC_STRETCHDIB); /* psdrv 0x6e99 */ @@ -529,17 +510,12 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) return physDev->logPixelsX; case ASPECTY: return physDev->logPixelsY; - case ASPECTXY: - return (int)hypot( (double)physDev->logPixelsX, - (double)physDev->logPixelsY ); case LOGPIXELSX: return MulDiv(physDev->logPixelsX, physDev->Devmode->dmPublic.u1.s1.dmScale, 100); case LOGPIXELSY: return MulDiv(physDev->logPixelsY, physDev->Devmode->dmPublic.u1.s1.dmScale, 100); - case SIZEPALETTE: - return 0; case NUMRESERVED: return 0; case COLORRES: @@ -568,16 +544,9 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) } return physDev->PageSize.cy - physDev->ImageableArea.top; - case SCALINGFACTORX: - case SCALINGFACTORY: - case VREFRESH: - case BLTALIGNMENT: - return 0; - case SHADEBLENDCAPS: - return SB_NONE; default: - FIXME("(%p): unsupported capability %d, will return 0\n", dev->hdc, cap ); - return 0; + dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); + return dev->funcs->pGetDeviceCaps( dev, cap ); } }

1 0

Alistair Leslie-Hughes : include: Add IWMPEvents/2/3/ 4 and supporting interfaces.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 1df10eadd1f57b454ba8ecf0e0653bba3cf1f61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df10eadd1f57b454ba8ecf0e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 17 04:35:25 2017 +0000 include: Add IWMPEvents/2/3/4 and supporting interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 463 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 463 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1df10eadd1f57b454ba8e…

1 0

Alistair Leslie-Hughes : wmp/tests: Add tests for IConnectionPointContainer.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 853cca9372f8959986dab13b0b3fca5cfa5a1c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853cca9372f8959986dab13b0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 17 04:35:39 2017 +0000 wmp/tests: Add tests for IConnectionPointContainer. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/oleobj.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 3242d0c..2b646d7 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -854,10 +854,53 @@ static void test_QI(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, (void**)&tmp); ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless iface: %08x\n", hres); IUnknown_Release(tmp); +} + +static void test_IConnectionPointContainer(IOleObject *oleobj) +{ + IConnectionPointContainer *container; + IConnectionPoint *point; + HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&tmp); + hres = IOleObject_QueryInterface(oleobj, &IID_IConnectionPointContainer, (void**)&container); ok(hres == S_OK, "Could not get IConnectionPointContainer iface: %08x\n", hres); - IUnknown_Release(tmp); + + hres = IConnectionPointContainer_FindConnectionPoint(container, &IID_IPropertyNotifySink, &point); + ok(hres == CONNECT_E_NOCONNECTION, "got: %08x\n", hres); + + point = NULL; + hres = IConnectionPointContainer_FindConnectionPoint(container, &IID_IWMPEvents, &point); + todo_wine ok(hres == S_OK, "got: %08x\n", hres); + if(point) + IConnectionPoint_Release(point); + + point = NULL; + hres = IConnectionPointContainer_FindConnectionPoint(container, &IID_IWMPEvents2, &point); + todo_wine ok(hres == S_OK, "got: %08x\n", hres); + if(point) + IConnectionPoint_Release(point); + + point = NULL; + hres = IConnectionPointContainer_FindConnectionPoint(container, &IID_IWMPEvents3, &point); + if(FAILED(hres)) + todo_wine win_skip("IWMPEvents3 not supported\n"); + if(point) + IConnectionPoint_Release(point); + + point = NULL; + hres = IConnectionPointContainer_FindConnectionPoint(container, &IID_IWMPEvents4, &point); + if(FAILED(hres)) + todo_wine win_skip("IWMPEvents4 not supported\n"); + if(point) + IConnectionPoint_Release(point); + + point = NULL; + hres = IConnectionPointContainer_FindConnectionPoint(container, &IID__WMPOCXEvents, &point); + todo_wine ok(hres == S_OK, "got: %08x\n", hres); + if(point) + IConnectionPoint_Release(point); + + IConnectionPointContainer_Release(container); } static void test_extent(IOleObject *oleobj) @@ -955,6 +998,7 @@ static void test_wmp(void) IProvideClassInfo2_Release(class_info); test_QI((IUnknown*)oleobj); + test_IConnectionPointContainer(oleobj); test_extent(oleobj); hres = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &misc_status);

1 0