wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Bernhard Übelacker : dinput: Implement device property DIPROP_USERNAME.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: fbc85ddc28a3ad6002cd415552684bd8c5b27bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc85ddc28a3ad6002cd41555… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Mar 31 05:39:21 2016 +0200 dinput: Implement device property DIPROP_USERNAME. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 29 +++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput8/tests/device.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index e525f01..0b08e15 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -783,6 +783,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L DIOBJECTDATAFORMAT *obj_df = NULL; DIPROPDWORD dp; DIPROPRANGE dpr; + DIPROPSTRING dps; WCHAR username[MAX_PATH]; DWORD username_size = MAX_PATH; int i, action = 0, num_actions = 0; @@ -863,6 +864,16 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L else lstrcpynW(username, lpszUserName, MAX_PATH); + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + if (dwFlags & DIDSAM_NOUSER) + dps.wsz[0] = '\0'; + else + lstrcpynW(dps.wsz, username, sizeof(dps.wsz)/sizeof(WCHAR)); + IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph); + /* Save the settings to disk */ save_mapping_settings(iface, lpdiaf, username); @@ -1251,6 +1262,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, TRACE("buffersize = %d\n", pd->dwData); break; } + case (DWORD_PTR) DIPROP_USERNAME: + { + LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + + lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); + break; + } case (DWORD_PTR) DIPROP_VIDPID: FIXME("DIPROP_VIDPID not implemented\n"); return DIERR_UNSUPPORTED; @@ -1324,6 +1344,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( LeaveCriticalSection(&This->crit); break; } + case (DWORD_PTR) DIPROP_USERNAME: + { + LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + + lstrcpynW(This->username, ps->wsz, sizeof(This->username)/sizeof(WCHAR)); + break; + } default: WARN("Unknown property %s\n", debugstr_guid(rguid)); return DIERR_UNSUPPORTED; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 52bbec4..c4fbe85 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -81,6 +81,7 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ + WCHAR username[MAX_PATH]; }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 6495559..fc415b7 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -223,8 +223,8 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec dps.wsz[0] = '\0'; hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_USERNAME, &dps.diph); - todo_wine ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); - todo_wine ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1)); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(dps.wsz)); /* Test buffer size */ memset(&dp, 0, sizeof(dp)); @@ -275,6 +275,7 @@ static void test_action_mapping(void) HINSTANCE hinst = GetModuleHandleA(NULL); IDirectInput8A *pDI = NULL; DIACTIONFORMATA af; + DIPROPSTRING dps; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; HWND hwnd; @@ -342,6 +343,30 @@ static void test_action_mapping(void) af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + + /* test DIDSAM_NOUSER */ + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + dps.wsz[0] = '\0'; + + hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (dps.wsz[0] != 0, "Expected any username, got=%s\n", wine_dbgstr_w(dps.wsz)); + + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, DIDSAM_NOUSER); + ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + dps.wsz[0] = '\0'; + + hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (dps.wsz[0] == 0, "Expected empty username, got=%s\n", wine_dbgstr_w(dps.wsz)); } if (data.mouse != NULL)

1 0

Sebastian Lackner : kernel32: Fix handling of GetOverlappedResult when status remains STATUS_PENDING.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 455e6c64ae8751e185820820c4adc5edddab861a URL: http://source.winehq.org/git/wine.git/?a=commit;h=455e6c64ae8751e185820820c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 05:19:43 2016 +0200 kernel32: Fix handling of GetOverlappedResult when status remains STATUS_PENDING. Spotted by Michael Müller. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 ++ dlls/kernel32/tests/file.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b6dba6a..a518e08 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -625,7 +625,9 @@ BOOL WINAPI GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped, if (WaitForSingleObject( lpOverlapped->hEvent ? lpOverlapped->hEvent : hFile, INFINITE ) == WAIT_FAILED) return FALSE; + status = lpOverlapped->Internal; + if (status == STATUS_PENDING) status = STATUS_SUCCESS; } *lpTransferred = lpOverlapped->InternalHigh; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 8353c21..a066692 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3361,6 +3361,11 @@ static void test_overlapped(void) "wrong error %u\n", GetLastError() ); ok( r == FALSE, "should return false\n"); + r = GetOverlappedResult( 0, &ov, &result, TRUE ); + ok( r == TRUE, "should return TRUE\n" ); + ok( result == 0xabcd, "wrong result %u\n", result ); + ok( ov.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", ov.Internal ); + ResetEvent( ov.hEvent ); SetLastError( 0xb00 );

1 0

Sebastian Lackner : ntdll: Don' t warn about unsupported environment version 3.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: a919a02ac335094b8f2ff1007faf4002fbd0da62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a919a02ac335094b8f2ff1007… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 04:53:51 2016 +0200 ntdll: Don't warn about unsupported environment version 3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 9c98040..781750b 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1845,7 +1845,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa if (environment) { - if (environment->Version != 1) + if (environment->Version != 1 && environment->Version != 3) FIXME( "unsupported environment version %u\n", environment->Version ); object->group = impl_from_TP_CLEANUP_GROUP( environment->CleanupGroup );

1 0

Sebastian Lackner : ntdll/tests: Add test for threadpool environment version 3.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 18ea2e5f884e60c87bf49f264c1510ff677816d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ea2e5f884e60c87bf49f264… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 04:53:25 2016 +0200 ntdll/tests: Add test for threadpool environment version 3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 304fe91..1d8b1f9 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -477,6 +477,7 @@ static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) static void test_tp_simple(void) { TP_CALLBACK_ENVIRON environment; + TP_CALLBACK_ENVIRON_V3 environment3; TP_CLEANUP_GROUP *group; HANDLE semaphore; NTSTATUS status; @@ -512,6 +513,17 @@ static void test_tp_simple(void) result = WaitForSingleObject(semaphore, 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + /* test with environment version 3 */ + memset(&environment3, 0, sizeof(environment3)); + environment3.Version = 3; + environment3.Pool = pool; + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + environment3.Size = sizeof(environment3); + status = pTpSimpleTryPost(simple_cb, semaphore, (TP_CALLBACK_ENVIRON *)&environment3); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + /* test with invalid version number */ memset(&environment, 0, sizeof(environment)); environment.Version = 9999;

1 0

Sebastian Lackner : include: Add definition for TP_CALLBACK_ENVIRON_V3.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: eb5f4b86d5676700447bd1cfd630122e1d242e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5f4b86d5676700447bd1cfd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 04:52:14 2016 +0200 include: Add definition for TP_CALLBACK_ENVIRON_V3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 559a719..5ece0f7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5936,6 +5936,29 @@ typedef struct _TP_CALLBACK_ENVIRON_V1 } u; } TP_CALLBACK_ENVIRON_V1; +typedef struct _TP_CALLBACK_ENVIRON_V3 +{ + TP_VERSION Version; + PTP_POOL Pool; + PTP_CLEANUP_GROUP CleanupGroup; + PTP_CLEANUP_GROUP_CANCEL_CALLBACK CleanupGroupCancelCallback; + PVOID RaceDll; + struct _ACTIVATION_CONTEXT *ActivationContext; + PTP_SIMPLE_CALLBACK FinalizationCallback; + union + { + DWORD Flags; + struct + { + DWORD LongFunction:1; + DWORD Persistent:1; + DWORD Private:30; + } s; + } u; + TP_CALLBACK_PRIORITY CallbackPriority; + DWORD Size; +} TP_CALLBACK_ENVIRON_V3; + typedef struct _TP_WORK TP_WORK, *PTP_WORK; typedef struct _TP_TIMER TP_TIMER, *PTP_TIMER;

1 0

Nikolay Sivov : fontsub: Added CreateFontPackage() stub.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 72da5888e9e96e9cfc09c4d5a0e4ab0ecea8f64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72da5888e9e96e9cfc09c4d5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 16:27:19 2016 +0300 fontsub: Added CreateFontPackage() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fontsub/fontsub.spec | 2 +- dlls/fontsub/main.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/fontsub.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/fontsub/fontsub.spec b/dlls/fontsub/fontsub.spec index dfb47fb..61b7fd3 100644 --- a/dlls/fontsub/fontsub.spec +++ b/dlls/fontsub/fontsub.spec @@ -1,2 +1,2 @@ -@ stub CreateFontPackage +@ cdecl CreateFontPackage(ptr long ptr ptr ptr long long long long long long ptr long ptr ptr ptr ptr) @ stub MergeFontPackage diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index 515c2d3..b78bd58 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "fontsub.h" #include "wine/debug.h" @@ -38,3 +39,16 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, + ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, + const unsigned short format, const unsigned short lang, const unsigned short platform, const unsigned short encoding, + const unsigned short *keep_list, const unsigned short keep_len, CFP_ALLOCPROC allocproc, + CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved) +{ + FIXME("(%p %u %p %p %p %#x %u %u %u %u %u %p %u %p %p %p %p): stub\n", src, src_len, dest, dest_len, + written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, + reallocproc, freeproc, reserved); + + return ERR_GENERIC; +} diff --git a/include/Makefile.in b/include/Makefile.in index 8283616..6e9803c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -355,6 +355,7 @@ HEADER_SRCS = \ fdi.h \ fileapi.h \ fltdefs.h \ + fontsub.h \ gdiplus.h \ gdipluscolor.h \ gdipluscolormatrix.h \ diff --git a/include/fontsub.h b/include/fontsub.h new file mode 100644 index 0000000..6fc7793 --- /dev/null +++ b/include/fontsub.h @@ -0,0 +1,42 @@ +/* + * Copyright 2016 Nikolay Sivov 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 + */ + +#ifndef __WINE_FONTSUB_H +#define __WINE_FONTSUB_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); +typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); +typedef void (__cdecl *CFP_FREEPROC)(void *); + +ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, + ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, + const unsigned short format, const unsigned short lang, const unsigned short platform, + const unsigned short encoding, const unsigned short *keep_list, const unsigned short keep_len, + CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved); + +#define ERR_GENERIC 1000 + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Nikolay Sivov : t2embed: Implement TTGetEmbeddingType().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 12fbfe838c2e6f41ead7445decc447b41921474a URL: http://source.winehq.org/git/wine.git/?a=commit;h=12fbfe838c2e6f41ead7445de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 13:00:26 2016 +0300 t2embed: Implement TTGetEmbeddingType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/t2embed/Makefile.in | 2 ++ dlls/t2embed/main.c | 28 +++++++++++++-- dlls/t2embed/tests/Makefile.in | 5 +++ dlls/t2embed/tests/t2embed.c | 82 ++++++++++++++++++++++++++++++++++++++++++ include/t2embapi.h | 4 +++ 7 files changed, 122 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 764ac45..c1abf1f 100755 --- a/configure +++ b/configure @@ -17969,7 +17969,8 @@ wine_fn_config_dll svrapi enable_svrapi wine_fn_config_dll sxs enable_sxs implib wine_fn_config_test dlls/sxs/tests sxs_test wine_fn_config_dll system.drv16 enable_win16 -wine_fn_config_dll t2embed enable_t2embed +wine_fn_config_dll t2embed enable_t2embed implib +wine_fn_config_test dlls/t2embed/tests t2embed_test 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 diff --git a/configure.ac b/configure.ac index f63dd61..c89aa08 100644 --- a/configure.ac +++ b/configure.ac @@ -3266,7 +3266,8 @@ WINE_CONFIG_DLL(svrapi) WINE_CONFIG_DLL(sxs,,[implib]) WINE_CONFIG_TEST(dlls/sxs/tests) WINE_CONFIG_DLL(system.drv16,enable_win16) -WINE_CONFIG_DLL(t2embed) +WINE_CONFIG_DLL(t2embed,,[implib]) +WINE_CONFIG_TEST(dlls/t2embed/tests) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_TEST(dlls/taskschd/tests) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index d123846..e585fe2 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -1,4 +1,6 @@ MODULE = t2embed.dll +IMPORTLIB = t2embed +IMPORTS = gdi32 C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e1a880d..2794f0f 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "t2embapi.h" #include "wine/debug.h" @@ -73,9 +74,30 @@ LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivS LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { - FIXME("(%p %p) stub\n", hDC, status); - if (status) *status = EMBED_NOEMBEDDING; - return E_API_NOTIMPL; + OUTLINETEXTMETRICW otm; + + TRACE("(%p %p)\n", hDC, status); + + if (!hDC) + return E_HDCINVALID; + + otm.otmSize = sizeof(otm); + if (!GetOutlineTextMetricsW(hDC, otm.otmSize, &otm)) + return E_NOTATRUETYPEFONT; + + if (!status) + return E_PERMISSIONSINVALID; + + if (otm.otmfsType == LICENSE_INSTALLABLE) + *status = EMBED_INSTALLABLE; + else if (otm.otmfsType & LICENSE_NOEMBEDDING) + *status = EMBED_NOEMBEDDING; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; + else if (otm.otmfsType & LICENSE_EDITABLE) + *status = EMBED_EDITABLE; + + return E_NONE; } LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in new file mode 100644 index 0000000..f7a5809 --- /dev/null +++ b/dlls/t2embed/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = t2embed.dll +IMPORTS = gdi32 t2embed + +C_SRCS = \ + t2embed.c diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c new file mode 100644 index 0000000..cdc2f49 --- /dev/null +++ b/dlls/t2embed/tests/t2embed.c @@ -0,0 +1,82 @@ +/* + * Copyright 2016 Nikolay Sivov 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "wingdi.h" +#include "t2embapi.h" +#include "wine/test.h" + +static void test_TTGetEmbeddingType(void) +{ + HFONT hfont, old_font; + LOGFONTA logfont; + ULONG status; + LONG ret; + HDC hdc; + + ret = TTGetEmbeddingType(NULL, NULL); + ok(ret == E_HDCINVALID, "got %d\n", ret); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType(NULL, &status); + ok(ret == E_HDCINVALID, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType((HDC)0xdeadbeef, &status); + ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + hdc = CreateCompatibleDC(0); + + ret = TTGetEmbeddingType(hdc, NULL); + ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&logfont); + ok(hfont != NULL, "got %p\n", hfont); + + old_font = SelectObject(hdc, hfont); + + status = 0; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NONE, "got %#x\n", ret); + ok(status != 0, "got %u\n", status); + + ret = TTGetEmbeddingType(hdc, NULL); + ok(ret == E_PERMISSIONSINVALID, "got %#x\n", ret); + + SelectObject(hdc, old_font); + DeleteObject(hfont); + DeleteDC(hdc); +} + +START_TEST(t2embed) +{ + test_TTGetEmbeddingType(); +} diff --git a/include/t2embapi.h b/include/t2embapi.h index 16d68f3..60fda64 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -39,6 +39,10 @@ extern "C" { /* Possible return values. */ #define E_NONE __MSABI_LONG(0x0000) #define E_API_NOTIMPL __MSABI_LONG(0x0001) +#define E_HDCINVALID __MSABI_LONG(0x0006) +#define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a) +#define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c) +#define E_PERMISSIONSINVALID __MSABI_LONG(0x0117) typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG);

1 0

Alexandre Julliard : makedep: Rename top_dir_path to top_src_dir_path for consistency.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 5bec183195fdba3752de4bf0fb433ac97a662b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bec183195fdba3752de4bf0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 14:39:32 2016 +0900 makedep: Rename top_dir_path to top_src_dir_path for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2a9782a..47efda3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -654,9 +654,9 @@ static char *top_obj_dir_path( const struct makefile *make, const char *path ) /******************************************************************* - * top_dir_path + * top_src_dir_path */ -static char *top_dir_path( const struct makefile *make, const char *path ) +static char *top_src_dir_path( const struct makefile *make, const char *path ) { if (make->top_src_dir) return concat_paths( make->top_src_dir, path ); return top_obj_dir_path( make, path ); @@ -1296,7 +1296,7 @@ static struct file *open_global_file( const struct makefile *make, const char *p char *src_path = root_dir_path( path ); struct file *ret = load_file( src_path ); - if (ret) *filename = top_dir_path( make, path ); + if (ret) *filename = top_src_dir_path( make, path ); free( src_path ); return ret; } @@ -2147,7 +2147,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct output_filenames_obj_dir( make, targets ); output( "\n" ); - install_sh = top_dir_path( make, "tools/install-sh" ); + install_sh = top_src_dir_path( make, "tools/install-sh" ); for (i = 0; i < files.count; i += 2) { const char *file = files.str[i]; @@ -2318,8 +2318,10 @@ static struct strarray output_sources( const struct makefile *make ) if (make->src_dir) strarray_add( &includes, strmake( "-I%s", make->src_dir )); if (make->parent_dir) strarray_add( &includes, strmake( "-I%s", src_dir_path( make, make->parent_dir ))); strarray_add( &includes, strmake( "-I%s", top_obj_dir_path( make, "include" ))); - if (make->top_src_dir) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include" ))); - if (make->use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include/msvcrt" ))); + if (make->top_src_dir) + strarray_add( &includes, strmake( "-I%s", top_src_dir_path( make, "include" ))); + if (make->use_msvcrt) + strarray_add( &includes, strmake( "-I%s", top_src_dir_path( make, "include/msvcrt" ))); for (i = 0; i < make->include_paths.count; i++) strarray_add( &includes, strmake( "-I%s", obj_dir_path( make, make->include_paths.str[i] ))); @@ -2527,7 +2529,7 @@ static struct strarray output_sources( const struct makefile *make ) { output( "%s: %s\n", ttf_file, source->filename ); output( "\t%s -script %s %s $@\n", - fontforge, top_dir_path( make, "fonts/genttf.ff" ), source->filename ); + fontforge, top_src_dir_path( make, "fonts/genttf.ff" ), source->filename ); if (!(source->file->flags & FLAG_SFD_FONTS)) output( "all: %s\n", ttf_file ); } if (source->file->flags & FLAG_INSTALL) @@ -2560,7 +2562,7 @@ static struct strarray output_sources( const struct makefile *make ) output( "%s.ico %s.bmp: %s\n", src_dir_path( make, obj ), src_dir_path( make, obj ), source->filename ); output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, - top_dir_path( make, "tools/buildimage" ), source->filename ); + top_src_dir_path( make, "tools/buildimage" ), source->filename ); } } else if (!strcmp( ext, "po" )) /* po file */ @@ -2633,8 +2635,9 @@ static struct strarray output_sources( const struct makefile *make ) strarray_add( &ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); output( "\t%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", - top_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), make->testdll, - replace_extension( make->testdll, ".dll", "_test.exe" ), dll_ext, obj ); + top_src_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), + make->testdll, replace_extension( make->testdll, ".dll", "_test.exe" ), + dll_ext, obj ); } if (!strcmp( ext, "c" ) && !(source->file->flags & FLAG_GENERATED)) strarray_add( &c2man_files, source->filename ); @@ -2764,33 +2767,33 @@ static struct strarray output_sources( const struct makefile *make ) if (c2man_files.count) { output( "manpages::\n" ); - output( "\t%s -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s/man%s", top_obj_dir_path( make, "documentation" ), man_ext )); output_filenames( c2man_files ); output( "\n" ); output( "htmlpages::\n" ); - output( "\t%s -Th -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Th -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/html" ))); output_filenames( c2man_files ); output( "\n" ); output( "sgmlpages::\n" ); - output( "\t%s -Ts -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Ts -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/api-guide" ))); output_filenames( c2man_files ); output( "\n" ); output( "xmlpages::\n" ); - output( "\t%s -Tx -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Tx -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/api-guide-xml" ))); output_filenames( c2man_files ); @@ -3088,8 +3091,8 @@ static struct strarray output_sources( const struct makefile *make ) { const struct makefile *submake = make->submakes[i]; - strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( submake, - strmake ( "%s.in", output_makefile_name )))); + strarray_add( &makefile_deps, top_src_dir_path( make, base_dir_path( submake, + strmake ( "%s.in", output_makefile_name )))); strarray_add( &distclean_files, base_dir_path( submake, output_makefile_name )); if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( submake, ".gitignore" )); if (submake->testdll) strarray_add( &distclean_files, base_dir_path( submake, "testlist.c" )); @@ -3415,7 +3418,7 @@ static void load_sources( struct makefile *make ) make->src_dir = concat_paths( make->top_src_dir, make->base_dir ); } strarray_set_value( &make->vars, "top_builddir", top_obj_dir_path( make, "" )); - strarray_set_value( &make->vars, "top_srcdir", top_dir_path( make, "" )); + strarray_set_value( &make->vars, "top_srcdir", top_src_dir_path( make, "" )); strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" )); make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" );

1 0

Alexandre Julliard : winegcc: Support building from the top directory.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 2b525db8a29080b650f57647a8839ee0b5c959f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b525db8a29080b650f57647a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 14:34:46 2016 +0900 winegcc: Support building from the top directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1ddafc6..119e12b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1464,6 +1464,11 @@ int main(int argc, char **argv) /* don't pass it to the compiler, this generates warnings */ raw_compiler_arg = raw_linker_arg = 0; } + else if (!strcmp(str, "tools/winebuild")) + { + opts.wine_objdir = "."; + raw_compiler_arg = raw_linker_arg = 0; + } if (!opts.prefix) opts.prefix = strarray_alloc(); strarray_add(opts.prefix, str); break;

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_invalidate_location().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 984934f685d8d9d85d0be2fd4b96afd260718b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=984934f685d8d9d85d0be2fd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 30 21:30:19 2016 +0200 wined3d: Introduce wined3d_texture_invalidate_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 4 +-- dlls/wined3d/device.c | 19 +++++++++----- dlls/wined3d/drawprim.c | 3 ++- dlls/wined3d/surface.c | 39 +++++++++------------------ dlls/wined3d/swapchain.c | 33 ++++++++++++----------- dlls/wined3d/texture.c | 55 +++++++++++++++++++++------------------ dlls/wined3d/volume.c | 23 ++++------------ dlls/wined3d/wined3d_private.h | 4 +-- 9 files changed, 84 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=984934f685d8d9d85d0be…

1 0

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 March 2016