- wine-devel - winehq.org

[PATCH 1/7] bcrypt/tests: Fix a key handle leak.
by Hans Leidekker 19 Oct '20

19 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d499ce65a65..0ae4b5dad53 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2603,6 +2603,9 @@ static void test_DSA(void) ok(!memcmp(dssKey, buf, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(!ret, "got %08x\n", ret); } -- 2.28.0

1 0

[PATCH] dwmapi: Quiet noisy fixme
by Louis Lenders 19 Oct '20

19 Oct '20

Should fix problem reported on forum https://forum.winehq.org/viewtopic.php?f=8&t=34459 ( and I also encountered this few times flooding the console ) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index eb11ecb6b7f..45c33c2169a 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -103,7 +103,9 @@ HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) */ HRESULT WINAPI DwmFlush(void) { - FIXME("() stub\n"); + static BOOL once; + + if (!once++) FIXME("() stub\n"); return E_NOTIMPL; } -- 2.28.0

1 0

[PATCH] wbemprox: Use wide-char string literals.
by Michael Stefaniuc 19 Oct '20

19 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The 'root' string is modified thus not const: root[0] = 'A' + i; dlls/wbemprox/builtin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8daa55eaeb4..590714b826b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1320,7 +1320,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond static enum fill_status fill_cdromdrive( struct table *table, const struct expr *cond ) { - WCHAR drive[3], root[] = {'A',':','\\',0}; + WCHAR drive[3], root[] = L"A:\\"; struct record_cdromdrive *rec; UINT i, row = 0, offset = 0; DWORD drives = GetLogicalDrives(); @@ -1846,7 +1846,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c { struct record_datafile *rec; UINT i, len, row = 0, offset = 0, num_expected_rows; - WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; + WCHAR *glob = NULL, *path = NULL, *new_path, root[] = L"A:\\"; DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; @@ -1974,7 +1974,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * { struct record_directory *rec; UINT i, len, row = 0, offset = 0, num_expected_rows; - WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; + WCHAR *glob = NULL, *path = NULL, *new_path, root[] = L"A:\\"; DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; @@ -2071,7 +2071,7 @@ done: static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) { - WCHAR root[] = {'\\','\\','.','\\','A',':',0}; + WCHAR root[] = L"\\\\.\\A:"; ULARGE_INTEGER free; DISK_GEOMETRY_EX info; HANDLE handle; @@ -2130,7 +2130,7 @@ done: static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = L"\\\\\\\\.\\\\PHYSICALDRIVE%u"; - WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = {'A',':','\\',0}; + WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = L"A:\\"; struct record_diskdrive *rec; UINT i, row = 0, offset = 0, index = 0, type; UINT64 size = 1024 * 1024 * 1024; @@ -2283,7 +2283,7 @@ static WCHAR *get_filesystem( const WCHAR *root ) static enum fill_status fill_diskpartition( struct table *table, const struct expr *cond ) { - WCHAR device_id[32], root[] = {'A',':','\\',0}; + WCHAR device_id[32], root[] = L"A:\\"; struct record_diskpartition *rec; UINT i, row = 0, offset = 0, type, index = 0; UINT64 size = 1024 * 1024 * 1024; @@ -2435,7 +2435,7 @@ static WCHAR *get_volumeserialnumber( const WCHAR *root ) static enum fill_status fill_logicaldisk( struct table *table, const struct expr *cond ) { - WCHAR device_id[3], root[] = {'A',':','\\',0}; + WCHAR device_id[3], root[] = L"A:\\"; struct record_logicaldisk *rec; UINT i, row = 0, offset = 0, type; UINT64 size = 1024 * 1024 * 1024; -- 2.26.2

2 1

[PATCH] wbemprox: Use 0 terminated WCHAR strings in wql.y
by Michael Stefaniuc 19 Oct '20

19 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/wql.y | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index f5b249aaba4..95c8d8fe817 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -637,38 +637,25 @@ struct wql_keyword #define MIN_TOKEN_LEN 2 #define MAX_TOKEN_LEN 11 -static const WCHAR andW[] = {'A','N','D'}; -static const WCHAR associatorsW[] = {'A','S','S','O','C','I','A','T','O','R','S'}; -static const WCHAR byW[] = {'B','Y'}; -static const WCHAR falseW[] = {'F','A','L','S','E'}; -static const WCHAR fromW[] = {'F','R','O','M'}; -static const WCHAR isW[] = {'I','S'}; -static const WCHAR likeW[] = {'L','I','K','E'}; -static const WCHAR notW[] = {'N','O','T'}; -static const WCHAR nullW[] = {'N','U','L','L'}; -static const WCHAR ofW[] = {'O','F'}; -static const WCHAR orW[] = {'O','R'}; -static const WCHAR selectW[] = {'S','E','L','E','C','T'}; -static const WCHAR trueW[] = {'T','R','U','E'}; -static const WCHAR whereW[] = {'W','H','E','R','E'}; - +#define X(str) str, ARRAY_SIZE(str) - 1 static const struct wql_keyword keyword_table[] = { - { andW, ARRAY_SIZE(andW), TK_AND }, - { associatorsW, ARRAY_SIZE(associatorsW), TK_ASSOCIATORS }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { falseW, ARRAY_SIZE(falseW), TK_FALSE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { ofW, ARRAY_SIZE(ofW), TK_OF }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { trueW, ARRAY_SIZE(trueW), TK_TRUE }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE } + { X(L"AND"), TK_AND }, + { X(L"ASSOCIATORS"), TK_ASSOCIATORS }, + { X(L"BY"), TK_BY }, + { X(L"FALSE"), TK_FALSE }, + { X(L"FROM"), TK_FROM }, + { X(L"IS"), TK_IS }, + { X(L"LIKE"), TK_LIKE }, + { X(L"NOT"), TK_NOT }, + { X(L"NULL"), TK_NULL }, + { X(L"OF"), TK_OF }, + { X(L"OR"), TK_OR }, + { X(L"SELECT"), TK_SELECT }, + { X(L"TRUE"), TK_TRUE }, + { X(L"WHERE"), TK_WHERE } }; +#undef X static int __cdecl cmp_keyword( const void *arg1, const void *arg2 ) { -- 2.26.2

2 1

[PATCH] rpcss: Use wide-char string literals.
by Michael Stefaniuc 18 Oct '20

18 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/rpcss/rpcss_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index e3859e4c3c9..7df859155e2 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static WCHAR rpcssW[] = {'R','p','c','S','s',0}; +static WCHAR rpcssW[] = L"RpcSs"; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; @@ -149,10 +149,10 @@ static RPC_STATUS RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; static unsigned short irot_endpoint[] = IROT_ENDPOINT; - static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; - static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; - static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; - static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq[] = L"ncacn_np"; + static unsigned short epm_endpoint[] = L"\\pipe\\epmapper"; + static unsigned short epm_protseq_lrpc[] = L"ncalrpc"; + static unsigned short epm_endpoint_lrpc[] = L"epmapper"; static unsigned short irpcss_protseq[] = IRPCSS_PROTSEQ; static unsigned short irpcss_endpoint[] = IRPCSS_ENDPOINT; static const struct protseq_map -- 2.26.2

1 0

[PATCH] taskmgr: shell32 is imported, no need to load it again
by Michael Stefaniuc 18 Oct '20

18 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/run.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c index 6d24f1c745c..177c737bb07 100644 --- a/programs/taskmgr/run.c +++ b/programs/taskmgr/run.c @@ -48,13 +48,10 @@ UINT uFlags); void TaskManager_OnFileNew(void) { - HMODULE hShell32; RUNFILEDLG RunFileDlg; OSVERSIONINFOW versionInfo; - static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; - hShell32 = LoadLibraryW(wszShell32); - RunFileDlg = (void *)GetProcAddress(hShell32, (LPCSTR)61); + RunFileDlg = (void *)GetProcAddress(GetModuleHandleW(L"shell32.dll"), (LPCSTR)61); /* Show "Run..." dialog */ if (RunFileDlg) @@ -76,6 +73,4 @@ void TaskManager_OnFileNew(void) RunFileDlg(hMainWnd, hIcon, NULL, szTitle, NULL, RFF_CALCDIRECTORY); } } - - FreeLibrary(hShell32); } -- 2.26.2

1 0

[PATCH] explorer: Use the WCHAR string version of LoadLibrary
by Michael Stefaniuc 18 Oct '20

18 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/desktop.c | 2 +- programs/explorer/startmenu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 6f1ff54c143..f525c23d819 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1041,7 +1041,7 @@ void manage_desktop( WCHAR *arg ) initialize_systray( graphics_driver, using_root, enable_shell ); if (!using_root) initialize_launchers( hwnd ); - if ((shell32 = LoadLibraryA( "shell32.dll" )) && + if ((shell32 = LoadLibraryW( L"shell32.dll" )) && (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) { pShellDDEInit( TRUE ); diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index f5f50bb3e72..3173ae21fc6 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -375,7 +375,7 @@ static void run_dialog(void) LPCSTR lpszTitle, LPCSTR lpszDesc, DWORD dwFlags); HMODULE hShell32; - hShell32 = LoadLibraryA("shell32"); + hShell32 = LoadLibraryW(L"shell32"); pRunFileDlg = (void*)GetProcAddress(hShell32, (LPCSTR)61); pRunFileDlg(NULL, NULL, NULL, NULL, NULL, 0); -- 2.26.2

1 0

[PATCH] taskmgr: Use GetGuiResources() directly
by Michael Stefaniuc 18 Oct '20

18 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Available since WinXP. programs/taskmgr/perfdata.c | 9 ++------- programs/taskmgr/perfdata.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index d81ab102482..67f0d934412 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -31,7 +31,6 @@ #include "perfdata.h" static PROCNTQSI pNtQuerySystemInformation = NULL; -static PROCGGR pGetGuiResources = NULL; static PROCGPIC pGetProcessIoCounters = NULL; static PROCISW64 pIsWow64Process = NULL; static CRITICAL_SECTION PerfDataCriticalSection; @@ -60,11 +59,9 @@ BOOL PerfDataInitialize(void) { LONG status; static const WCHAR wszNtdll[] = {'n','t','d','l','l','.','d','l','l',0}; - static const WCHAR wszUser32[] = {'u','s','e','r','3','2','.','d','l','l',0}; static const WCHAR wszKernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation"); - pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandleW(wszUser32), "GetGuiResources"); pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters"); pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process"); @@ -297,10 +294,8 @@ void PerfDataRefresh(void) RevertToSelf(); CloseHandle(hProcessToken); } - if (pGetGuiResources) { - pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS); - pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS); - } + pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); + pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); if (pGetProcessIoCounters) pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); if (pIsWow64Process) diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index d6a16028c4b..8b9fabbd910 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -67,7 +67,6 @@ struct _SYSTEM_PAGEFILE_INFORMATION #define GR_USEROBJECTS 1 /* Count of USER objects */ typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG); -typedef DWORD (WINAPI *PROCGGR)(HANDLE,DWORD); typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS); typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL); -- 2.26.2

1 0

[PATCH] dsound: Use wide-char string literals.
by Michael Stefaniuc 18 Oct '20

18 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound_main.c | 10 +++------- dlls/dsound/propset.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 3acee554ad9..ca33ba48046 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -88,7 +88,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; +const WCHAR wine_vxd_drv[] = L"winemm.vxd"; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; @@ -454,10 +454,6 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, BOOL keep_going; HRESULT hr, init_hr; - static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ', - 'S','o','u','n','d',' ','D','r','i','v','e','r',0}; - static const WCHAR empty_drv[] = {0}; - init_hr = get_mmdevenum(&devenum); if(!devenum) return init_hr; @@ -484,8 +480,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, return DS_OK; } - TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc)); - keep_going = cb(NULL, primary_desc, empty_drv, user); + TRACE("Calling back with NULL (Primary Sound Driver)\n"); + keep_going = cb(NULL, L"Primary Sound Driver", L"", user); /* always send the default device first */ if(keep_going){ diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index dcb2b871783..f1f71bef135 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); -static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 }; +static WCHAR wInterface[] = L"Interface"; typedef struct IKsPrivatePropertySetImpl { -- 2.26.2

1 0

[PATCH] ntdll: Add stub for RtlQueryProcessPlaceholderCompatibilityMode
by Louis Lenders 18 Oct '20

18 Oct '20

https://bugs.winehq.org/show_bug.cgi?id=50026 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntifs.h | 8 ++++++++ 4 files changed, 20 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ca427c46c04..2f33b9a0410 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -896,6 +896,7 @@ @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation @ stub RtlQueryProcessLockInformation +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index ca4fea84209..bf873c968f9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -37,6 +37,7 @@ #include "ntdll_misc.h" #include "in6addr.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -2145,3 +2146,12 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); return STATUS_NOT_FOUND; } + +/********************************************************************* + * RtlQueryProcessPlaceholderCompatibilityMode [NTDLL.@] + */ +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) +{ + FIXME("stub\n"); + return PHCM_APPLICATION_DEFAULT; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6ac70c718f1..30eb84f8432 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1212,6 +1212,7 @@ @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) @ stdcall RtlQueryTimeZoneInformation(ptr) @ stdcall -norelay RtlRaiseException(ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 73d602595c4..a9cc753d7e4 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -21,6 +21,13 @@ #include "ntddk.h" +#define PHCM_ERROR_INVALID_PARAMETER (char)-1 +#define PHCM_ERROR_NO_TEB (char)-2 +#define PHCM_APPLICATION_DEFAULT (char)0 +#define PHCM_DISGUISE_PLACEHOLDERS (char)1 +#define PHCM_EXPOSE_PLACEHOLDERS (char)2 +#define PHCM_MAX (char)2 + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -140,5 +147,6 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void); #endif -- 2.28.0

1 0

[PATCH 1/5] wintrust: Stub CryptCATPutMemberInfo().
by Zebediah Figura 18 Oct '20

18 Oct '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 975d51f14fd..15b21a299f3 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -848,6 +848,19 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info return TRUE; } +/*********************************************************************** + * CryptCATPutMemberInfo (WINTRUST.@) + */ +CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, + WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data) +{ + FIXME("catalog %p, filename %s, member %s, subject %s, version %u, size %u, data %p, stub!\n", + catalog, debugstr_w(filename), debugstr_w(member), debugstr_guid(subject), version, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATOpen (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 7ebd53f0396..a01d1dd93c9 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -37,7 +37,7 @@ @ stub CryptCATPersistStore @ stub CryptCATPutAttrInfo @ stub CryptCATPutCatAttrInfo -@ stub CryptCATPutMemberInfo +@ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) diff --git a/include/mscat.h b/include/mscat.h index 4571a0b2647..3931b71596c 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -131,6 +131,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE, CRYPTCATMEMBER *, LPWSTR) CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus } -- 2.28.0

1 4

[PATCH] kernelbase: Fix comment and trace message in console.
by Roman Pišl 18 Oct '20

18 Oct '20

Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernelbase/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d387b49c534..71c594b3c18 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -351,7 +351,7 @@ BOOL WINAPI AllocConsole(void) memset(&console_si, 0, sizeof(console_si)); console_si.cb = sizeof(console_si); - /* setup a view arguments for wineconsole (it'll use them as default values) */ + /* setup a view arguments for conhost (it'll use them as default values) */ if (app_si.dwFlags & STARTF_USECOUNTCHARS) { console_si.dwFlags |= STARTF_USECOUNTCHARS; @@ -386,7 +386,7 @@ BOOL WINAPI AllocConsole(void) if (!init_console_std_handles( !(app_si.dwFlags & STARTF_USESTDHANDLES) )) goto error; RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; - TRACE( "Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); + TRACE( "Started conhost pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); CloseHandle( server ); RtlLeaveCriticalSection( &console_section ); -- 2.20.1

1 0

[PATCH 1/3] user32/tests: Add control color tests.
by Jeff Smith 18 Oct '20

18 Oct '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/colormsg.c | 205 ++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 dlls/user32/tests/colormsg.c diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3c..38f1572cbb4 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ broadcast.c \ class.c \ clipboard.c \ + colormsg.c \ combo.c \ cursoricon.c \ dce.c \ diff --git a/dlls/user32/tests/colormsg.c b/dlls/user32/tests/colormsg.c new file mode 100644 index 00000000000..5916d59403c --- /dev/null +++ b/dlls/user32/tests/colormsg.c @@ -0,0 +1,205 @@ +/* Unit test suite for control coloring via messages. + * + * Copyright 2020 Jeff Smith + * + * 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 <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +#define CTRL_ID 1995 + +struct color_values +{ + HBRUSH brush; + COLORREF brushcolor; + COLORREF altbrushcolor; + COLORREF pencolor; + COLORREF textcolor; + COLORREF bkcolor; + int bkmode; +} static *color_test = NULL; + +static UINT msg_expect; + +static HWND hMainWnd; + +static HWND build_child(const char *class, DWORD style) +{ + return CreateWindowA(class, "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); +} + +static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_CTLCOLORBTN: + case WM_CTLCOLORSTATIC: + if (!color_test) + break; + + ok(msg == msg_expect, "Expected message %#x got %#x\n", msg, msg_expect); + if (msg == msg_expect) + { + HDC hdc = (HDC)wparam; + if (color_test->bkmode) + SetBkMode(hdc, color_test->bkmode); + if (color_test->altbrushcolor != CLR_INVALID) + SetDCBrushColor(hdc, color_test->altbrushcolor); + if (color_test->pencolor != CLR_INVALID) + SetDCPenColor(hdc, color_test->pencolor); + if (color_test->textcolor != CLR_INVALID) + SetTextColor(hdc, color_test->textcolor); + if (color_test->bkcolor != CLR_INVALID) + SetBkColor(hdc, color_test->bkcolor); + if (!color_test->brush && color_test->brushcolor != CLR_INVALID) + color_test->brush = CreateSolidBrush(color_test->brushcolor); + return (LRESULT)color_test->brush; + } + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_style_message(const char *class, int style, LONG inside_x, LONG inside_y) +{ +#define INV CLR_INVALID + struct color_values tests[] = + { + /* WndProc will return NULL */ + {NULL, INV, INV, INV, INV, INV}, + /* WndProc will return non-object */ + {(HBRUSH)(COLOR_HIGHLIGHT+1), INV, INV, INV, INV, INV}, + /* WndProc will return object */ + {NULL, RGB(255,0,0), INV, INV, INV, INV}, + {NULL, RGB(255,0,0), INV, INV, INV, INV, TRANSPARENT}, + {NULL, RGB(255,0,0), RGB(0,255,0), RGB(0,0,255), RGB(255,255,0), + RGB(255,0,255)}, + {NULL, RGB(255,0,0), RGB(0,255,0), RGB(0,0,255), RGB(255,255,0), + RGB(255,0,255), TRANSPARENT}, + }; +#undef INV + COLORREF icolor0, ocolor0; + COLORREF icolor_exp, ocolor_exp; + POINT ptOutside = {90, 90}; + HWND hChild; + HDC hdc; + int i; + + int is_simple = !strcmp(class,"static") && style == SS_SIMPLE; + int is_groupbox = !strcmp(class,"button") && style == BS_GROUPBOX; + int is_pushbutton = !strcmp(class,"button") && + (style == BS_PUSHBUTTON || style == BS_DEFPUSHBUTTON || style == BS_USERBUTTON); + + hChild = build_child(class, style); + SetWindowTextA(hChild, "____"); + msg_expect = is_pushbutton ? WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; + + /* Get system colors for child window */ + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + hdc = GetDC(hChild); + icolor0 = GetPixel(hdc, inside_x, inside_y); + ocolor0 = GetPixel(hdc, ptOutside.x, ptOutside.y); + ReleaseDC(hChild, hdc); + + ocolor_exp = (is_simple || is_groupbox) ? RGB(255, 255, 255) : icolor0; + ok(ocolor0 == ocolor_exp, "(%s,%#x) Expected color %#x outside text area, got %#x\n", + class, style, ocolor_exp, ocolor0); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + COLORREF icolor, ocolor; + + /* Update child window with default colors */ + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + + /* Update child window to exercise control color message */ + color_test = &tests[i]; + InvalidateRect(hChild, NULL, FALSE); + UpdateWindow(hChild); + color_test = NULL; + hdc = GetDC(hChild); + icolor = GetPixel(hdc, inside_x, inside_y); + ocolor = GetPixel(hdc, ptOutside.x, ptOutside.y); + ReleaseDC(hChild, hdc); + + icolor_exp = (tests[i].brushcolor == CLR_INVALID || is_pushbutton) ? icolor0 : + (is_simple && tests[i].bkmode == TRANSPARENT) ? icolor0 : + (tests[i].bkmode == TRANSPARENT) ? tests[i].brushcolor : + (tests[i].bkcolor != CLR_INVALID) ? tests[i].bkcolor : RGB(255, 255, 255); + ocolor_exp = (tests[i].brushcolor == CLR_INVALID || is_pushbutton || is_simple || + is_groupbox) ? ocolor0 : tests[i].brushcolor; + todo_wine_if(tests[i].brush != NULL && tests[i].brushcolor == CLR_INVALID && !is_pushbutton) + ok(icolor == icolor_exp, "(%s,%#x,%d) Expected color %#x inside text area, got %#x\n", + class, style, i, icolor_exp, icolor); + todo_wine_if(tests[i].brush != NULL && tests[i].brushcolor == CLR_INVALID && !is_pushbutton && + !is_simple && !is_groupbox) + ok(ocolor == ocolor_exp, "(%s,%#x,%d) Expected color %#x outside text area, got %#x\n", + class, style, i, ocolor_exp, ocolor); + } + DestroyWindow(hChild); +} + +START_TEST(colormsg) +{ + static const char szClassName[] = "testclass"; + WNDCLASSEXA wndclass; + + wndclass.cbSize = sizeof(wndclass); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); + wndclass.lpszClassName = szClassName; + wndclass.lpszMenuName = NULL; + RegisterClassExA(&wndclass); + + hMainWnd = CreateWindowA(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); + ShowWindow(hMainWnd, SW_SHOW); + + test_style_message("static", SS_SIMPLE, 5, 5); + test_style_message("static", SS_LEFT, 5, 5); + test_style_message("static", SS_RIGHT, 95, 5); + test_style_message("static", SS_CENTER, 50, 5); + test_style_message("static", SS_LEFTNOWORDWRAP, 5, 5); + + test_style_message("button", BS_CHECKBOX, 25, 50); + test_style_message("button", BS_AUTOCHECKBOX, 25, 50); + test_style_message("button", BS_RADIOBUTTON, 25, 50); + test_style_message("button", BS_AUTORADIOBUTTON, 25, 50); + test_style_message("button", BS_3STATE, 25, 50); + test_style_message("button", BS_AUTO3STATE, 25, 50); + test_style_message("button", BS_GROUPBOX, 20, 5); + + test_style_message("button", BS_PUSHBUTTON, 50, 50); + test_style_message("button", BS_DEFPUSHBUTTON, 50, 50); + test_style_message("button", BS_USERBUTTON, 50, 50); + + DestroyWindow(hMainWnd); +} -- 2.23.0

4 6

[PATCH] wine.inf: IsInstalled is a DWORD value.
by Zebediah Figura 17 Oct '20

17 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50016 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b1fab79704d..613ddff42ed 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -765,19 +765,19 @@ HKCU,Software\Microsoft\Protected Storage System Provider,,16 ; Some apps requires at least four subkeys of Active Setup\Installed Components HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},,2,"DirectDrawEx" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"ComponentID",2,"DirectDrawEx" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},,2,"Windows Media Player" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"ComponentID",2,"wmp" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840" -- 2.28.0

1 0

[PATCH] d2d1: Implement and test a few easy functions.
by Giovanni Mascellani 17 Oct '20

17 Oct '20

Signed-off-by: Giovanni Mascellani <gio(a)debian.org> --- dlls/d2d1/d2d1.spec | 6 ++--- dlls/d2d1/factory.c | 16 +++++++++++ dlls/d2d1/tests/d2d1.c | 61 ++++++++++++++++++++++++++++++++++++++++++ include/d2d1_1.idl | 3 +++ 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..0ae894109fb 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos -@ stub D2D1Tan -@ stub D2D1Vec3Length +@ stdcall D2D1SinCos(float ptr ptr) +@ stdcall D2D1Tan(float) +@ stdcall D2D1Vec3Length(float float float) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..447b00fd2d8 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,22 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(FLOAT angle, FLOAT *s, FLOAT *c) +{ + *s = sinf(angle); + *c = cosf(angle); +} + +FLOAT WINAPI D2D1Tan(FLOAT angle) +{ + return tanf(angle); +} + +FLOAT WINAPI D2D1Vec3Length(FLOAT x, FLOAT y, FLOAT z) +{ + return sqrtf(x*x + y*y + z*z); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 166cdfccda6..e6be464162d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,66 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static int compare_fp(FLOAT res, FLOAT exp) +{ + if (exp == 0.0f) + return fabsf(res) <= 10 * FLT_MIN; + else + return fabsf((res-exp) / exp) <= 10 * FLT_EPSILON; +} + +static void test_math(void) +{ + FLOAT s, c, t, l; + int i; + + static const FLOAT sc_data[] = + { + 0.0, 0.0, 1.0, + 1.0, 0.8414709568, 0.5403022766, + 2.0, 0.9092974067, -0.4161468446, + M_PI / 2.0, 1.0, -4.371138829e-008, + M_PI, -8.742277657e-008, -1.0, + }; + + static const FLOAT t_data[] = + { + 0.0, 0.0, + 1.0, 1.557407737, + 2.0, -2.185039759, + M_PI / 2.0, -22877332, + M_PI, 8.742277657e-008, + }; + + static const FLOAT l_data[] = + { + 0.0, 0.0, 0.0, 0.0, + 1.0, 0.0, 0.0, 1.0, + 0.0, 1.0, 0.0, 1.0, + 0.0, 0.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.732050776, + 1.0, 2.0, 2.0, 3.0, + 1.0, 2.0, 3.0, 3.741657495, + }; + + for (i = 0; i < sizeof(sc_data) / sizeof(sc_data[0]); i += 3) { + D2D1SinCos(sc_data[i], &s, &c); + ok(compare_fp(s, sc_data[i+1]), "Wrong sin(%.10g) (%.10g instead of %.10g).\n", sc_data[i], s, sc_data[i+1]); + ok(compare_fp(c, sc_data[i+2]), "Wrong cos(%.10g) (%.10g instead of %.10g).\n", sc_data[i], c, sc_data[i+2]); + } + + for (i = 0; i < sizeof(t_data) / sizeof(t_data[0]); i += 2) { + t = D2D1Tan(t_data[i]); + ok(compare_fp(t, t_data[i+1]), "Wrong tan(%.10g) (%.10g instead of %.10g).\n", t_data[i], t, t_data[i+1]); + } + + for (i = 0; i < sizeof(l_data) / sizeof(l_data[0]); i += 4) { + l = D2D1Vec3Length(l_data[i], l_data[i+1], l_data[i+2]); + ok(compare_fp(l, l_data[i+3]), "Wrong len(%.10g, %.10g, %.10g) (%.10g instead of %.10g).\n", + l_data[i], l_data[i+1], l_data[i+2], l, l_data[i+3]); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9537,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..5a3178845ad 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,6 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(FLOAT angle, FLOAT *s, FLOAT *c); +[local] FLOAT __stdcall D2D1Tan(FLOAT angle); +[local] FLOAT __stdcall D2D1Vec3Length(FLOAT x, FLOAT y, FLOAT z); -- 2.28.0

2 1

[PATCH] ws2_32/tests: Fix an intermittent test failure on w10pro64.
by Zebediah Figura 17 Oct '20

17 Oct '20

Much like 2aebe0b628. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0b10b1bdb37..e8aea522185 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3610,28 +3610,31 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); - - /* When a connection is attempted to a non-listening socket it will get to the except descriptor */ ret = closesocket(fdWrite); ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(address); - fdWrite = setup_connector_socket(&address, len, TRUE); - FD_ZERO_ALL(); - FD_SET(fdWrite, &writefds); - FD_SET(fdWrite, &exceptfds); - select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ - ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - ok(ret == 1, "expected 1, got %d\n", ret); - len = sizeof(id); - id = 0xdeadbeef; - ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); - ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); - ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); - closesocket(fdWrite); + + /* w10pro64 sometimes takes over 2 seconds for an error to be reported. */ + if (winetest_interactive) + { + len = sizeof(address); + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET(fdWrite, &writefds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 10; + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); + closesocket(fdWrite); + } /* Try select() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite); -- 2.28.0

2 1

[PATCH 2/4] ntdll: Stub NtAllocateVirtualMemoryEx.
by Myah Caron 17 Oct '20

17 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This patchset doesn't yet fix anything as far as I know, I only encountered it while debugging a program that crashed soon after initializing mimalloc. While it didn't fix the program in question, I thought I might as well send it in. Considering the apparent trend of games requiring newer Windows APIs without supporting fallbacks, it may be rendered useful soon... dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/virtual.c | 21 +++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 15 +++++++++++++++ include/winternl.h | 1 + 4 files changed, 39 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ca427c46c04..dbd2eab1fa1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -141,6 +141,7 @@ # @ stub NtAllocateUserPhysicalPages @ stdcall -syscall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall -syscall NtAllocateVirtualMemory(long ptr long ptr long long) +@ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long) @ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr) @ stdcall -syscall NtAssignProcessToJobObject(long long) @ stub NtCallbackReturn @@ -1146,6 +1147,7 @@ # @ stub ZwAllocateUserPhysicalPages @ stdcall -private -syscall ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall -private -syscall ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory +@ stdcall -private -syscall ZwAllocateVirtualMemoryEx(long ptr ptr long long ptr long) NtAllocateVirtualMemoryEx @ stdcall -private -syscall ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private -syscall ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject @ stub ZwCallbackReturn diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 7049f234a9f..9c2cf824018 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -34,6 +34,8 @@ static NTSTATUS (WINAPI *pRtlCreateUserStack)(SIZE_T, SIZE_T, ULONG, SIZE_T, SIZ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, + MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); static SYSTEM_BASIC_INFORMATION sbi; @@ -215,6 +217,24 @@ static void test_NtAllocateVirtualMemory(void) size = 0; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed\n"); + + if (!pNtAllocateVirtualMemoryEx) + { + win_skip("NtAllocateVirtualMemoryEx() is missing\n"); + return; + } + + /* simple allocation should succeed */ + size = 0x1000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemoryEx returned %08x\n", status); + + /* specifying a count of >0 with NULL parameters should fail */ + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 1); + ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08x\n", status); } static void test_RtlCreateUserStack(void) @@ -648,6 +668,7 @@ START_TEST(virtual) pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); pRtlFreeUserStack = (void *)GetProcAddress(mod, "RtlFreeUserStack"); pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures"); + pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx"); NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#x\n", sbi.PageSize); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d79e3de662e..614159b7d90 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3452,6 +3452,21 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z return status; } +/*********************************************************************** + * NtAllocateVirtualMemoryEx (NTDLL.@) + * ZwAllocateVirtualMemoryEx (NTDLL.@) + */ +NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, + ULONG count ) +{ + if (count && !parameters) return STATUS_INVALID_PARAMETER; + + if (count) FIXME( "Ignoring %d extended parameters %p\n", count, parameters ); + + return NtAllocateVirtualMemory( process, ret, 0, size_ptr, type, protect ); +} + /*********************************************************************** * NtFreeVirtualMemory (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index 89ea58c2d93..fbce63655ba 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,6 +3020,7 @@ NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemoryEx(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtCallbackReturn(PVOID,ULONG,NTSTATUS); -- 2.28.0

2 1

[PATCH 4/4] kernelbase: Use VirtualAlloc2 in VirtualAllocEx.
by Myah Caron 17 Oct '20

17 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I have no proof that this is what happens under Windows, this is only a guess based on the way most calls appear to be implemented (for example, USVFS needing to hook NtQueryDirectoryFileEx for newer Windows 10 versions, as NtQueryDirectoryFile was no longer being called once the new call was introduced). Feel free to disregard this patch. I'm also guessing VirtualAllocExNuma would likely call VirtualAlloc2 with MemExtendedParameterNumaNode, but since it's not yet implemented there's probably no need to do this for the moment. dlls/kernelbase/memory.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index c3adf2217af..e4adce19b55 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -292,10 +292,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc( void *addr, SIZE_T size, DWORD typ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE process, void *addr, SIZE_T size, DWORD type, DWORD protect ) { - LPVOID ret = addr; - - if (!set_ntstatus( NtAllocateVirtualMemory( process, &ret, 0, &size, type, protect ))) return NULL; - return ret; + return VirtualAlloc2( process, addr, size, type, protect, NULL, 0 ); } -- 2.28.0

1 0

[PATCH 3/4] kernelbase: Implement VirtualAlloc2.
by Myah Caron 17 Oct '20

17 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/memory.c | 15 +++++++++++++++ include/winbase.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9c7babde7fd..16c51a15f1d 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1675,6 +1675,7 @@ @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stdcall VirtualAllocExNuma(long ptr long long long long) +@ stdcall VirtualAlloc2(long ptr long long long ptr long) # @ stub VirtualAllocFromApp @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4ead38f2bc0..c3adf2217af 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -299,6 +299,21 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE process, void *addr, SIZE } +/*********************************************************************** + * VirtualAlloc2 (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2( HANDLE process, void *addr, SIZE_T size, + DWORD type, DWORD protect, + MEM_EXTENDED_PARAMETER* parameters, ULONG count ) +{ + LPVOID ret = addr; + + if (!set_ntstatus( NtAllocateVirtualMemoryEx( process, &ret, &size, type, protect, parameters, count ))) + return NULL; + return ret; +} + + /*********************************************************************** * VirtualFree (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index f1c3198c21a..6bf632387a8 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2746,6 +2746,7 @@ WINBASEAPI BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDL WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); +WINBASEAPI LPVOID WINAPI VirtualAlloc2(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI BOOL WINAPI VirtualFree(LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualFreeEx(HANDLE,LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualLock(LPVOID,SIZE_T); -- 2.28.0

1 0

[PATCH 1/4] include: Introduce MEM_EXTENDED_PARAMETER.
by Myah Caron 17 Oct '20

17 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- include/winnt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 10b3253923b..662db7e58cb 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -736,6 +736,35 @@ typedef struct _MEMORY_BASIC_INFORMATION DWORD Type; } MEMORY_BASIC_INFORMATION, *PMEMORY_BASIC_INFORMATION; +#define MEM_EXTENDED_PARAMETER_TYPE_BITS 8 + +typedef enum MEM_EXTENDED_PARAMETER_TYPE { + MemExtendedParameterInvalidType = 0, + MemExtendedParameterAddressRequirements, + MemExtendedParameterNumaNode, + MemExtendedParameterPartitionHandle, + MemExtendedParameterUserPhysicalHandle, + MemExtendedParameterAttributeFlags, + MemExtendedParameterMax +} MEM_EXTENDED_PARAMETER_TYPE, *PMEM_EXTENDED_PARAMETER_TYPE; + +typedef struct MEM_EXTENDED_PARAMETER { + struct + { + DWORD64 Type : MEM_EXTENDED_PARAMETER_TYPE_BITS; + DWORD64 Reserved : 64 - MEM_EXTENDED_PARAMETER_TYPE_BITS; + } DUMMYSTRUCTNAME; + + union + { + DWORD64 ULong64; + PVOID Pointer; + SIZE_T Size; + HANDLE Handle; + DWORD ULong; + } DUMMYUNIONNAME; +} MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; + #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 #define PAGE_READWRITE 0x04 -- 2.28.0

1 0

[PATCH v2 1/5] ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx().
by Zebediah Figura 16 Oct '20

16 Oct '20

The previous test in fact regularly failed on Windows, hidden by the presence of broken(), since both sockets could be connected before the listener was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 92 +++++++++++++++------------------------- 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ba03e16ebb1..834cca71960 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7413,18 +7413,14 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { - SOCKET listener = INVALID_SOCKET; - SOCKET acceptor = INVALID_SOCKET; - SOCKET connector = INVALID_SOCKET; - SOCKET connector2 = INVALID_SOCKET; + SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; - struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ - int got, conn1, i; + static const struct timeval timeout = {1, 0}; DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; @@ -7703,66 +7699,47 @@ todo_wine iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_ZERO ( &fds_accept ); - FD_ZERO ( &fds_send ); + buffer[0] = '0'; - FD_SET ( listener, &fds_accept ); - FD_SET ( connector, &fds_send ); + FD_ZERO(&fds_accept); + FD_SET(listener, &fds_accept); + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - buffer[0] = '0'; - got = 0; - conn1 = 0; + acceptor2 = WSAAccept(listener, NULL, NULL, AlwaysDeferConditionFunc, 0); + ok(acceptor2 == INVALID_SOCKET, "expected failure\n"); + ok(WSAGetLastError() == WSATRY_AGAIN, "got error %u\n", WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - for (i = 0; i < 4000; ++i) - { - fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + FD_ZERO(&fds_send); + FD_SET(connector, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, - "acceptex test(%d): could not select on socket, errno %d\n" ); + iret = send(connector, "1", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); - /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_openaccept ) ) { - got++; - if (got == 1) { - SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, 0, - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); - } - else if (got == 2) { - /* this should be socket #2 */ - SOCKET tmp = accept(listener, NULL, NULL); - ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); - closesocket(tmp); - } - else { - ok(FALSE, "Got more than 2 connections?\n"); - } - } - if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { - /* Send data on second socket, and stop */ - send(connector2, "2", 1, 0); - FD_CLR ( connector2, &fds_send ); + iret = connect(connector2, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(iret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - break; - } - if ( FD_ISSET ( connector, &fds_opensend ) ) { - /* Once #1 is connected, allow #2 to connect */ - conn1 = 1; + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - send(connector, "1", 1, 0); - FD_CLR ( connector, &fds_send ); + acceptor2 = accept(listener, NULL, NULL); + ok(acceptor2 != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor2); - iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_SET ( connector2, &fds_send ); - } - } + FD_ZERO(&fds_send); + FD_SET(connector2, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - ok (got == 2 || broken(got == 1) /* NT4 */, - "Did not get both connections, got %d\n", got); + iret = send(connector2, "2", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -7774,7 +7751,6 @@ todo_wine set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); - ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector); -- 2.28.0

2 8

[PATCH 1/4] ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx().
by Zebediah Figura 16 Oct '20

16 Oct '20

The previous test in fact regularly failed on Windows, hidden by the presence of broken(), since both sockets could be connected before the listener was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 92 +++++++++++++++------------------------- 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ba03e16ebb1..834cca71960 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7413,18 +7413,14 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { - SOCKET listener = INVALID_SOCKET; - SOCKET acceptor = INVALID_SOCKET; - SOCKET connector = INVALID_SOCKET; - SOCKET connector2 = INVALID_SOCKET; + SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; - struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ - int got, conn1, i; + static const struct timeval timeout = {1, 0}; DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; @@ -7703,66 +7699,47 @@ todo_wine iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_ZERO ( &fds_accept ); - FD_ZERO ( &fds_send ); + buffer[0] = '0'; - FD_SET ( listener, &fds_accept ); - FD_SET ( connector, &fds_send ); + FD_ZERO(&fds_accept); + FD_SET(listener, &fds_accept); + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - buffer[0] = '0'; - got = 0; - conn1 = 0; + acceptor2 = WSAAccept(listener, NULL, NULL, AlwaysDeferConditionFunc, 0); + ok(acceptor2 == INVALID_SOCKET, "expected failure\n"); + ok(WSAGetLastError() == WSATRY_AGAIN, "got error %u\n", WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - for (i = 0; i < 4000; ++i) - { - fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + FD_ZERO(&fds_send); + FD_SET(connector, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, - "acceptex test(%d): could not select on socket, errno %d\n" ); + iret = send(connector, "1", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); - /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_openaccept ) ) { - got++; - if (got == 1) { - SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, 0, - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); - } - else if (got == 2) { - /* this should be socket #2 */ - SOCKET tmp = accept(listener, NULL, NULL); - ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); - closesocket(tmp); - } - else { - ok(FALSE, "Got more than 2 connections?\n"); - } - } - if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { - /* Send data on second socket, and stop */ - send(connector2, "2", 1, 0); - FD_CLR ( connector2, &fds_send ); + iret = connect(connector2, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(iret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - break; - } - if ( FD_ISSET ( connector, &fds_opensend ) ) { - /* Once #1 is connected, allow #2 to connect */ - conn1 = 1; + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - send(connector, "1", 1, 0); - FD_CLR ( connector, &fds_send ); + acceptor2 = accept(listener, NULL, NULL); + ok(acceptor2 != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor2); - iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_SET ( connector2, &fds_send ); - } - } + FD_ZERO(&fds_send); + FD_SET(connector2, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - ok (got == 2 || broken(got == 1) /* NT4 */, - "Did not get both connections, got %d\n", got); + iret = send(connector2, "2", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -7774,7 +7751,6 @@ todo_wine set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); - ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector); -- 2.28.0

2 6

[PATCH] include: add DWRITE_MAKE_FONT_AXIS_TAG macro to dwrite_3.idl
by me＠snkth.com 16 Oct '20

16 Oct '20

Hi, I have attached the patch as a txt file. This is my first time submitting a patch, I think I followed the instructions here (https://wiki.winehq.org/Submitting_Patches) correctly but I might have gotten things wrong, please lemme know here or on #winehackers (I am @sanketh). Thank you. Best, Sanketh

2 2

[PATCH] qmgr/tests: Test registering an IBackgroundCopyCallback2
by Aaron Hill 16 Oct '20

16 Oct '20

Test that we can register an IBackgroundCopyCallback2 with a job successfully. This does not test that any of the callback functions in the IBackgroundCopyCallback2 are actually called. Accordings to the BITS docs, these functions are called on separate threads on Windows, so a any test will need to take this into account to avoid spurious failures. Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> --- dlls/qmgr/tests/Makefile.in | 2 +- dlls/qmgr/tests/job.c | 137 ++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 6482d4d9b7a..2bf92a94019 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = qmgr.dll -IMPORTS = ole32 shlwapi user32 +IMPORTS = uuid ole32 shlwapi user32 C_SRCS = \ enum_files.c \ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 53b724eadbf..d4e256b4469 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -38,6 +38,123 @@ static IBackgroundCopyJob *test_job; static GUID test_jobId; static BG_JOB_TYPE test_type; +typedef struct IBackgroundCopyCallback2Impl { + IBackgroundCopyCallback2 IBackgroundCopyCallback2_iface; + LONG ref; +} IBackgroundCopyCallback2Impl; + +static inline IBackgroundCopyCallback2Impl *impl_from_IBackgroundCopyCallback2(IBackgroundCopyCallback2 *iface) +{ + return CONTAINING_RECORD(iface, IBackgroundCopyCallback2Impl, IBackgroundCopyCallback2_iface); +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_QueryInterface(IBackgroundCopyCallback2 *iface, REFIID riid, void **ppv) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + + if (!ppv) + { + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback2)) + { + *ppv = &This->IBackgroundCopyCallback2_iface; + } + else + { + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_AddRef(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_AddRef called (%p, ref = %d)\n", This, ref); + return ref; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_Release(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_Release called (%p, ref = %d)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobError(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyError *pError) +{ + trace("IBackgroundCopyCallback2Impl_JobError called (%p, %p, %p)\n", iface, pJob, pError); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobModification(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, DWORD dwReserved) +{ + trace("IBackgroundCopyCallback2Impl_JobModification called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob) +{ + trace("IBackgroundCopyCallback2Impl_JobTransferred called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_FileTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyFile *pFile) +{ + trace("IBackgroundCopyCallback2Impl_FileTransferred called (%p, %p, %p)\n", iface, pJob, pFile); + return S_OK; +} + + +static const IBackgroundCopyCallback2Vtbl copyCallback_vtbl = +{ + IBackgroundCopyCallback2Impl_QueryInterface, + IBackgroundCopyCallback2Impl_AddRef, + IBackgroundCopyCallback2Impl_Release, + IBackgroundCopyCallback2Impl_JobTransferred, + IBackgroundCopyCallback2Impl_JobError, + IBackgroundCopyCallback2Impl_JobModification, + IBackgroundCopyCallback2Impl_FileTransferred +}; + +static BOOL create_background_copy_callback2(IBackgroundCopyCallback2 **copyCallback) +{ + IBackgroundCopyCallback2Impl *obj; + *copyCallback = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + trace("Out of memory creating IBackgroundCopyCallback2\n"); + return FALSE; + } + + obj->IBackgroundCopyCallback2_iface.lpVtbl = &copyCallback_vtbl; + obj->ref = 1; + + *copyCallback = &obj->IBackgroundCopyCallback2_iface; + + return TRUE; +} + static HRESULT test_create_manager(void) { HRESULT hres; @@ -512,6 +629,20 @@ static void test_HttpOptions(void) unsigned int i; WCHAR *headers; ULONG flags, orig_flags; + IBackgroundCopyCallback2 *copyCallback; + IUnknown *copyCallbackUnknown; + + ok(create_background_copy_callback2(&copyCallback) == TRUE, "create_background_copy_callback2 failed\n"); + + hr = IBackgroundCopyCallback2_QueryInterface(copyCallback, &IID_IUnknown, (LPVOID*)&copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_QueryInterface(IID_IUnknown) failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyInterface failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyFlags(test_job, BG_NOTIFY_JOB_TRANSFERRED | BG_NOTIFY_JOB_ERROR | BG_NOTIFY_DISABLE | BG_NOTIFY_JOB_MODIFICATION | BG_NOTIFY_FILE_TRANSFERRED); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyFlags failed: %08x\n", hr); + DeleteFileW(test_localPathA); hr = IBackgroundCopyJob_AddFile(test_job, L"http://test.winehq.org/", test_localPathA); @@ -619,6 +750,12 @@ static void test_HttpOptions(void) ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); DeleteFileW(test_localPathA); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, NULL); + ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); + + IUnknown_Release(copyCallbackUnknown); + IBackgroundCopyCallback2_Release(copyCallback); } typedef void (*test_t)(void); -- 2.28.0

3 2

[PATCH 1/4] mf/tests: Add a test for EVRConfig_ handling for already initialized presenter.
by Nikolay Sivov 16 Oct '20

16 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 465bd7e3c43..7dc325424a6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -39,6 +39,7 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "mferror.h" #include "mfidl.h" #include "initguid.h" +#include "uuids.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "evr.h" @@ -3237,6 +3238,7 @@ static void test_evr(void) { IMFVideoSampleAllocatorCallback *allocator_callback; IMFStreamSink *stream_sink, *stream_sink2; + IMFVideoDisplayControl *display_control; IMFMediaType *media_type, *media_type2; IMFMediaEventGenerator *ev_generator; IMFVideoSampleAllocator *allocator; @@ -3292,6 +3294,15 @@ static void test_evr(void) hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!count, "Unexpected count %u.\n", count); + /* Rendering preferences are not immediately propagated to the presenter. */ + hr = IMFAttributes_SetUINT32(attributes, &EVRConfig_ForceBob, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!flags, "Unexpected flags %#x.\n", flags); + IMFVideoDisplayControl_Release(display_control); IMFAttributes_Release(attributes); /* Primary stream type handler. */ -- 2.28.0

1 3

[PATCH] wined3d: Add GPU information for NVIDIA GeForce GTX 1080 Mobile.
by Paul Gofman 16 Oct '20

16 Oct '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 108a190bf61..c11fa22cc38 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -441,6 +441,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_KEPLER, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_KEPLER, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080M, "NVIDIA GeForce GTX 1080M", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_KEPLER, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_KEPLER, 12288}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 901c809d875..6d7dcbc91dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2967,6 +2967,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_GEFORCE_GTX1080M = 0x1be0, CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, -- 2.26.2

2 1

[PATCH vkd3d] vkd3d-shader: Adjust the API for struct vkd3d_shader_macro.
by Zebediah Figura 16 Oct '20

16 Oct '20

To more closely match the behaviour of D3D_SHADER_MACRO. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/vkd3d_shader.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index c168621a..d9e95d7b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -686,12 +686,16 @@ struct vkd3d_shader_spirv_domain_shader_target_info struct vkd3d_shader_macro { /** - * A null-terminated string containing the name of a macro. This macro must - * not be a parameterized (i.e. function-like) macro. If this field is not a - * valid macro identifier, it will be ignored. + * Pointer to a null-terminated string containing the name of a macro. This + * macro must not be a parameterized (i.e. function-like) macro. If this + * field is not a valid macro identifier, this macro will be ignored. */ const char *name; - /** A null-terminated string containing the expansion of the macro. */ + /** + * Optional pointer to a null-terminated string containing the expansion of + * the macro. This field may be set to NULL, in which case the macro has an + * empty expansion. + */ const char *value; }; @@ -764,7 +768,7 @@ struct vkd3d_shader_preprocess_info * be expanded as if a corresponding #define statement were prepended to the * source code. * - * If the same macro is specified multiple times, only the first value is + * If the same macro is specified multiple times, only the last value is * used. */ const struct vkd3d_shader_macro *macros; -- 2.28.0

2 1

[PATCH vkd3d] include: Clarify that struct vkd3d_shader_code is not null-terminated.
by Zebediah Figura 16 Oct '20

16 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/vkd3d_shader.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b677d365..c168621a 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -155,7 +155,13 @@ enum vkd3d_shader_visibility /** A generic structure containing a GPU shader, in text or byte-code format. */ struct vkd3d_shader_code { - /** Pointer to the code. */ + /** + * Pointer to the code. Note that textual formats are not null-terminated. + * Therefore \a size should not include a null terminator, when this + * structure is passed as input to a vkd3d-shader function, and the + * allocated string will not include a null terminator when this structure + * is used as output. + */ const void *code; /** Size of \a code, in bytes. */ size_t size; -- 2.28.0

2 1

[PATCH vkd3d 1/2] vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_shader_trace() (Valgrind).
by Zebediah Figura 16 Oct '20

16 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9b49ca1d..e9c462e5 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1618,16 +1618,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code void vkd3d_shader_trace(void *data) { - const char *p, *q; + const char *p, *q, *end; struct vkd3d_shader_code code; if (vkd3d_dxbc_binary_to_text(data, &code) != VKD3D_OK) return; - for (p = code.code; *p; p = q) + end = (const char *)code.code + code.size; + for (p = code.code; p < end; p = q) { - if (!(q = strstr(p, "\n"))) - q = p + strlen(p); + if (!(q = memchr(p, '\n', end - p))) + q = end; else ++q; TRACE(" %.*s", (int)(q - p), p); -- 2.28.0

2 3

[PATCH] d2d1: Implement and test a few easy functions.
by Giovanni Mascellani 16 Oct '20

16 Oct '20

Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> --- dlls/d2d1/d2d1.spec | 6 ++--- dlls/d2d1/factory.c | 16 +++++++++++ dlls/d2d1/tests/d2d1.c | 61 ++++++++++++++++++++++++++++++++++++++++++ include/d2d1_1.idl | 3 +++ 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..0ae894109fb 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos -@ stub D2D1Tan -@ stub D2D1Vec3Length +@ stdcall D2D1SinCos(float ptr ptr) +@ stdcall D2D1Tan(float) +@ stdcall D2D1Vec3Length(float float float) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..447b00fd2d8 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,22 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(FLOAT angle, FLOAT *s, FLOAT *c) +{ + *s = sinf(angle); + *c = cosf(angle); +} + +FLOAT WINAPI D2D1Tan(FLOAT angle) +{ + return tanf(angle); +} + +FLOAT WINAPI D2D1Vec3Length(FLOAT x, FLOAT y, FLOAT z) +{ + return sqrtf(x*x + y*y + z*z); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 166cdfccda6..e6be464162d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,66 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static int compare_fp(FLOAT res, FLOAT exp) +{ + if (exp == 0.0f) + return fabsf(res) <= 10 * FLT_MIN; + else + return fabsf((res-exp) / exp) <= 10 * FLT_EPSILON; +} + +static void test_math(void) +{ + FLOAT s, c, t, l; + int i; + + static const FLOAT sc_data[] = + { + 0.0, 0.0, 1.0, + 1.0, 0.8414709568, 0.5403022766, + 2.0, 0.9092974067, -0.4161468446, + M_PI / 2.0, 1.0, -4.371138829e-008, + M_PI, -8.742277657e-008, -1.0, + }; + + static const FLOAT t_data[] = + { + 0.0, 0.0, + 1.0, 1.557407737, + 2.0, -2.185039759, + M_PI / 2.0, -22877332, + M_PI, 8.742277657e-008, + }; + + static const FLOAT l_data[] = + { + 0.0, 0.0, 0.0, 0.0, + 1.0, 0.0, 0.0, 1.0, + 0.0, 1.0, 0.0, 1.0, + 0.0, 0.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.732050776, + 1.0, 2.0, 2.0, 3.0, + 1.0, 2.0, 3.0, 3.741657495, + }; + + for (i = 0; i < sizeof(sc_data) / sizeof(sc_data[0]); i += 3) { + D2D1SinCos(sc_data[i], &s, &c); + ok(compare_fp(s, sc_data[i+1]), "Wrong sin(%.10g) (%.10g instead of %.10g).\n", sc_data[i], s, sc_data[i+1]); + ok(compare_fp(c, sc_data[i+2]), "Wrong cos(%.10g) (%.10g instead of %.10g).\n", sc_data[i], c, sc_data[i+2]); + } + + for (i = 0; i < sizeof(t_data) / sizeof(t_data[0]); i += 2) { + t = D2D1Tan(t_data[i]); + ok(compare_fp(t, t_data[i+1]), "Wrong tan(%.10g) (%.10g instead of %.10g).\n", t_data[i], t, t_data[i+1]); + } + + for (i = 0; i < sizeof(l_data) / sizeof(l_data[0]); i += 4) { + l = D2D1Vec3Length(l_data[i], l_data[i+1], l_data[i+2]); + ok(compare_fp(l, l_data[i+3]), "Wrong len(%.10g, %.10g, %.10g) (%.10g instead of %.10g).\n", + l_data[i], l_data[i+1], l_data[i+2], l, l_data[i+3]); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9537,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..5a3178845ad 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,6 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(FLOAT angle, FLOAT *s, FLOAT *c); +[local] FLOAT __stdcall D2D1Tan(FLOAT angle); +[local] FLOAT __stdcall D2D1Vec3Length(FLOAT x, FLOAT y, FLOAT z); -- 2.28.0

3 2

[PATCH 5/5] riched20: Pass and return a paragraph ptr in the paragraph joining function.
by Huw Davies 16 Oct '20

16 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 3 +- dlls/riched20/para.c | 129 +++++++++++++++++++---------------------- dlls/riched20/undo.c | 2 +- 4 files changed, 62 insertions(+), 74 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index cce4755257c..22da616731f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -369,7 +369,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, keepFirstParaFormat = TRUE; } } - ME_JoinParagraphs(editor, c.pPara, keepFirstParaFormat); + para_join( editor, &c.pPara->member.para, keepFirstParaFormat ); /* ME_SkipAndPropagateCharOffset(p->pRun, shift); */ ME_CheckCharOffsets(editor); nChars -= (eollen < nChars) ? eollen : nChars; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b0c3ec46214..ad7978c1f9d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -198,8 +198,6 @@ void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run) DECLSPEC_HIDDEN; void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end) DECLSPEC_HIDDEN; void ME_MakeFirstParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, - BOOL keepFirstParaFormat) DECLSPEC_HIDDEN; void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HIDDEN; BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; @@ -209,6 +207,7 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) DECLSPEC_HIDDEN; void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 7251d1620a6..41debcac1bd 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -654,66 +654,60 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, return new_para; } -/* join tp with tp->member.para.next_para, keeping tp's style; this - * is consistent with the original */ -ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, - BOOL keepFirstParaFormat) +/* join para with the next para keeping para's style using the paragraph fmt + specified in use_first_fmt */ +ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) { - ME_DisplayItem *pNext, *pFirstRunInNext, *pRun, *pTmp, *pCell = NULL; + ME_DisplayItem *tmp, *pCell = NULL; + ME_Paragraph *next = para_next( para ); + ME_Run *end_run, *next_first_run, *tmp_run; int i, shift; int end_len; CHARFORMAT2W fmt; ME_Cursor startCur, endCur; ME_String *eol_str; - assert(tp->type == diParagraph); - assert(tp->member.para.next_para); - assert(tp->member.para.next_para->type == diParagraph); + assert( next && para_next( next ) ); /* Clear any cached para numbering following this paragraph */ - if (tp->member.para.fmt.wNumbering) - para_num_clear_list( editor, &tp->member.para, &tp->member.para.fmt ); + if (para->fmt.wNumbering) para_num_clear_list( editor, para, &para->fmt ); - pNext = tp->member.para.next_para; + end_run = para_end_run( para ); + next_first_run = para_first_run( next ); - /* Need to locate end-of-paragraph run here, in order to know end_len */ - pRun = ME_FindItemBack(pNext, diRunOrParagraph); - - assert(pRun); - assert(pRun->type == diRun); - assert(pRun->member.run.nFlags & MERF_ENDPARA); - - end_len = pRun->member.run.len; - eol_str = ME_VSplitString( tp->member.para.text, pRun->member.run.nCharOfs ); - ME_AppendString( tp->member.para.text, pNext->member.para.text->szData, pNext->member.para.text->nLen ); + end_len = end_run->len; + eol_str = ME_VSplitString( para->text, end_run->nCharOfs ); + ME_AppendString( para->text, next->text->szData, next->text->nLen ); /* null char format operation to store the original char format for the ENDPARA run */ ME_InitCharFormat2W(&fmt); - endCur.pPara = pNext; - endCur.pRun = ME_FindItemFwd(pNext, diRun); - endCur.nOffset = 0; - startCur = endCur; - ME_PrevRun(&startCur.pPara, &startCur.pRun, TRUE); + startCur.pPara = para_get_di( para ); + startCur.pRun = run_get_di( end_run ); + endCur.pPara = para_get_di( next ); + endCur.pRun = run_get_di( next_first_run ); + startCur.nOffset = endCur.nOffset = 0; + ME_SetCharFormat(editor, &startCur, &endCur, &fmt); - if (!editor->bEmulateVersion10) { /* v4.1 */ + if (!editor->bEmulateVersion10) /* v4.1 */ + { /* Table cell/row properties are always moved over from the removed para. */ - tp->member.para.nFlags = pNext->member.para.nFlags; - tp->member.para.pCell = pNext->member.para.pCell; + para->nFlags = next->nFlags; + para->pCell = next->pCell; /* Remove cell boundary if it is between the end paragraph run and the next * paragraph display item. */ - for (pTmp = pRun->next; pTmp != pNext; pTmp = pTmp->next) + for (tmp = run_get_di( end_run ); tmp != para_get_di( next ); tmp = tmp->next) { - if (pTmp->type == diCell) + if (tmp->type == diCell) { - pCell = pTmp; + pCell = tmp; break; } } } - add_undo_split_para( editor, &pNext->member.para, eol_str, pCell ? &pCell->member.cell : NULL ); + add_undo_split_para( editor, next, eol_str, pCell ? &pCell->member.cell : NULL ); if (pCell) { @@ -725,63 +719,58 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_DestroyDisplayItem( pCell ); } - if (!keepFirstParaFormat) + if (!use_first_fmt) { - add_undo_set_para_fmt( editor, &tp->member.para ); - tp->member.para.fmt = pNext->member.para.fmt; - tp->member.para.border = pNext->member.para.border; + add_undo_set_para_fmt( editor, para ); + para->fmt = next->fmt; + para->border = next->border; } - shift = pNext->member.para.nCharOfs - tp->member.para.nCharOfs - end_len; - - pFirstRunInNext = ME_FindItemFwd(pNext, diRunOrParagraph); - - assert(pFirstRunInNext->type == diRun); + shift = next->nCharOfs - para->nCharOfs - end_len; /* Update selection cursors so they don't point to the removed end * paragraph run, and point to the correct paragraph. */ - for (i=0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == pRun) { - editor->pCursors[i].pRun = pFirstRunInNext; + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pRun == run_get_di( end_run )) + { + editor->pCursors[i].pRun = run_get_di( next_first_run ); editor->pCursors[i].nOffset = 0; - } else if (editor->pCursors[i].pPara == pNext) { - editor->pCursors[i].pPara = tp; } + else if (editor->pCursors[i].pPara == para_get_di( next )) + editor->pCursors[i].pPara = para_get_di( para ); } - pTmp = pNext; - do { - pTmp = ME_FindItemFwd(pTmp, diRunOrParagraphOrEnd); - if (pTmp->type != diRun) - break; - TRACE("shifting %s by %d (previous %d)\n", debugstr_run( &pTmp->member.run ), shift, pTmp->member.run.nCharOfs); - pTmp->member.run.nCharOfs += shift; - pTmp->member.run.para = &tp->member.para; - } while(1); + for (tmp_run = next_first_run; tmp_run; tmp_run = run_next( tmp_run )) + { + TRACE( "shifting %s by %d (previous %d)\n", debugstr_run( tmp_run ), shift, tmp_run->nCharOfs ); + tmp_run->nCharOfs += shift; + tmp_run->para = para; + } /* Fix up the para's eop_run ptr */ - tp->member.para.eop_run = pNext->member.para.eop_run; + para->eop_run = next->eop_run; - ME_Remove(pRun); - ME_DestroyDisplayItem(pRun); + ME_Remove( run_get_di( end_run ) ); + ME_DestroyDisplayItem( run_get_di( end_run) ); - if (editor->pLastSelStartPara == pNext) - editor->pLastSelStartPara = tp; - if (editor->pLastSelEndPara == pNext) - editor->pLastSelEndPara = tp; + if (editor->pLastSelStartPara == para_get_di( next )) + editor->pLastSelStartPara = para_get_di( para ); + if (editor->pLastSelEndPara == para_get_di( next )) + editor->pLastSelEndPara = para_get_di( para ); - tp->member.para.next_para = pNext->member.para.next_para; - pNext->member.para.next_para->member.para.prev_para = tp; - ME_Remove(pNext); - destroy_para(editor, pNext); + para->next_para = next->next_para; + next->next_para->member.para.prev_para = para_get_di( para ); + ME_Remove( para_get_di(next) ); + destroy_para( editor, para_get_di( next ) ); - ME_PropagateCharOffset(tp->member.para.next_para, -end_len); + ME_PropagateCharOffset( para->next_para, -end_len ); ME_CheckCharOffsets(editor); editor->nParagraphs--; - para_mark_rewrap( editor, &tp->member.para ); - return tp; + para_mark_rewrap( editor, para ); + return para; } ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *item) { diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 5616c64005a..72e3b74f4c8 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -373,7 +373,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) { ME_Cursor tmp; cursor_from_char_ofs( editor, undo->u.join_paras.pos, &tmp ); - ME_JoinParagraphs(editor, tmp.pPara, TRUE); + para_join( editor, &tmp.pPara->member.para, TRUE ); break; } case undo_split_para: -- 2.23.0

1 0

[PATCH 4/5] riched20: Pass a run ptr to, and return a para ptr from, the para splitting function.
by Huw Davies 16 Oct '20

16 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 14 ++++++++------ dlls/riched20/para.c | 38 +++++++++++++++++++------------------- dlls/riched20/table.c | 10 +++++----- dlls/riched20/undo.c | 20 ++++++++++---------- 5 files changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ffea3ee0c35..cce4755257c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -619,7 +619,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, run = &cursor->pRun->member.run; } - new_para = &ME_SplitParagraph( editor, run_get_di( run ), style, eol_str, eol_len, 0 )->member.para; + new_para = para_split( editor, run, style, eol_str, eol_len, 0 ); end_run = para_end_run( para_prev( new_para ) ); /* Move any cursors that were at the end of the previous run to the beginning of the new para */ diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index fba9616ab4f..b0c3ec46214 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -198,7 +198,6 @@ void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run) DECLSPEC_HIDDEN; void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end) DECLSPEC_HIDDEN; void ME_MakeFirstParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *rp, ME_Style *style, const WCHAR *eol_str, int eol_len, int paraFlags) DECLSPEC_HIDDEN; ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, BOOL keepFirstParaFormat) DECLSPEC_HIDDEN; void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; @@ -207,16 +206,19 @@ BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) D void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; -void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; -void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_next( ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; +void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_prev( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, + const WCHAR *eol_str, int eol_len, int paraFlags ) DECLSPEC_HIDDEN; + static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { return (ME_DisplayItem *)((ptrdiff_t)para - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index e9246fa7cf7..7251d1620a6 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -512,40 +512,40 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA } /* split paragraph at the beginning of the run */ -ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, - ME_Style *style, const WCHAR *eol_str, int eol_len, - int paraFlags) +ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, + const WCHAR *eol_str, int eol_len, int paraFlags ) { ME_Paragraph *new_para = para_create( editor ), *old_para, *next_para; ME_Run *end_run, *next_run; int ofs, i; int run_flags = MERF_ENDPARA; - if (!editor->bEmulateVersion10) { /* v4.1 */ + if (!editor->bEmulateVersion10) /* v4.1 */ + { /* At most 1 of MEPF_CELL, MEPF_ROWSTART, or MEPF_ROWEND should be set. */ - assert(!(paraFlags & ~(MEPF_CELL|MEPF_ROWSTART|MEPF_ROWEND))); - assert(!(paraFlags & (paraFlags-1))); + assert( !(paraFlags & ~(MEPF_CELL | MEPF_ROWSTART | MEPF_ROWEND)) ); + assert( !(paraFlags & (paraFlags-1)) ); if (paraFlags == MEPF_CELL) - run_flags |= MERF_ENDCELL; + run_flags |= MERF_ENDCELL; else if (paraFlags == MEPF_ROWSTART) - run_flags |= MERF_TABLESTART|MERF_HIDDEN; - } else { /* v1.0 - v3.0 */ - assert(!(paraFlags & (MEPF_CELL|MEPF_ROWSTART|MEPF_ROWEND))); + run_flags |= MERF_TABLESTART | MERF_HIDDEN; } - assert(run->type == diRun); - old_para = &ME_GetParagraph( run )->member.para; + else /* v1.0 - v3.0 */ + assert( !(paraFlags & (MEPF_CELL |MEPF_ROWSTART | MEPF_ROWEND)) ); + + old_para = run->para; assert( old_para->fmt.cbSize == sizeof(PARAFORMAT2) ); /* Clear any cached para numbering following this paragraph */ if (old_para->fmt.wNumbering) para_num_clear_list( editor, old_para, &old_para->fmt ); - new_para->text = ME_VSplitString( old_para->text, run->member.run.nCharOfs ); + new_para->text = ME_VSplitString( old_para->text, run->nCharOfs ); end_run = run_create( style, run_flags ); - ofs = end_run->nCharOfs = run->member.run.nCharOfs; + ofs = end_run->nCharOfs = run->nCharOfs; end_run->len = eol_len; - end_run->para = run->member.run.para; + end_run->para = run->para; ME_AppendString( old_para->text, eol_str, eol_len ); next_para = &old_para->next_para->member.para; @@ -555,14 +555,14 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, for (i = 0; i < editor->nCursors; i++) { if (editor->pCursors[i].pPara == para_get_di( old_para ) && - run->member.run.nCharOfs <= editor->pCursors[i].pRun->member.run.nCharOfs) + run->nCharOfs <= editor->pCursors[i].pRun->member.run.nCharOfs) { editor->pCursors[i].pPara = para_get_di( new_para ); } } /* the new paragraph will have a different starting offset, so update its runs */ - for (next_run = &run->member.run; next_run; next_run = run_next( next_run )) + for (next_run = run; next_run; next_run = run_next( next_run )) { next_run->nCharOfs -= ofs; next_run->para = new_para; @@ -584,7 +584,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, next_para->prev_para = para_get_di( new_para ); /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ - ME_InsertBefore( run, para_get_di( new_para ) ); + ME_InsertBefore( run_get_di( run ), para_get_di( new_para ) ); ME_InsertBefore( para_get_di( new_para ), run_get_di( end_run ) ); /* Fix up the paras' eop_run ptrs */ @@ -651,7 +651,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_PropagateCharOffset( para_get_di( next_para ), eol_len ); editor->nParagraphs++; - return para_get_di( new_para ); + return new_para; } /* join tp with tp->member.para.next_para, keeping tp's style; this diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 95b0fb0a8a6..876244c9706 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -64,16 +64,16 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, int paraFlags) { ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - ME_DisplayItem *tp; + ME_Paragraph *para; ME_Cursor* cursor = &editor->pCursors[nCursor]; if (cursor->nOffset) run_split( editor, cursor ); - tp = ME_SplitParagraph(editor, cursor->pRun, pStyle, eol_str, eol_len, paraFlags); + para = para_split( editor, &cursor->pRun->member.run, pStyle, eol_str, eol_len, paraFlags ); ME_ReleaseStyle(pStyle); - cursor->pPara = tp; - cursor->pRun = ME_FindItemFwd(tp, diRun); - return tp; + cursor->pPara = para_get_di( para ); + cursor->pRun = run_get_di( para_first_run( para ) ); + return para_get_di( para ); } ME_DisplayItem* ME_InsertTableRowStartFromCursor(ME_TextEditor *editor) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 3f3fd48bebd..5616c64005a 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -379,29 +379,29 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_split_para: { ME_Cursor tmp; - ME_DisplayItem *this_para, *new_para; + ME_Paragraph *this_para, *new_para; BOOL bFixRowStart; int paraFlags = undo->u.split_para.flags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND); cursor_from_char_ofs( editor, undo->u.split_para.pos, &tmp ); if (tmp.nOffset) run_split( editor, &tmp ); - this_para = tmp.pPara; - bFixRowStart = this_para->member.para.nFlags & MEPF_ROWSTART; + this_para = &tmp.pPara->member.para; + bFixRowStart = this_para->nFlags & MEPF_ROWSTART; if (bFixRowStart) { /* Re-insert the paragraph before the table, making sure the nFlag value * is correct. */ - this_para->member.para.nFlags &= ~MEPF_ROWSTART; + this_para->nFlags &= ~MEPF_ROWSTART; } - new_para = ME_SplitParagraph(editor, tmp.pRun, tmp.pRun->member.run.style, - undo->u.split_para.eol_str->szData, undo->u.split_para.eol_str->nLen, paraFlags); + new_para = para_split( editor, &tmp.pRun->member.run, tmp.pRun->member.run.style, + undo->u.split_para.eol_str->szData, undo->u.split_para.eol_str->nLen, paraFlags ); if (bFixRowStart) - new_para->member.para.nFlags |= MEPF_ROWSTART; - new_para->member.para.fmt = undo->u.split_para.fmt; - new_para->member.para.border = undo->u.split_para.border; + new_para->nFlags |= MEPF_ROWSTART; + new_para->fmt = undo->u.split_para.fmt; + new_para->border = undo->u.split_para.border; if (paraFlags) { - ME_DisplayItem *pCell = new_para->member.para.pCell; + ME_DisplayItem *pCell = new_para->pCell; pCell->member.cell.nRightBoundary = undo->u.split_para.cell_right_boundary; pCell->member.cell.border = undo->u.split_para.cell_border; } -- 2.23.0

1 0

[PATCH 3/5] riched20: Use paragraph and run ptrs in the paragraph splitting function.
by Huw Davies 16 Oct '20

16 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/para.c | 98 ++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 49cf4ad3063..e9246fa7cf7 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -516,12 +516,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_Style *style, const WCHAR *eol_str, int eol_len, int paraFlags) { - ME_DisplayItem *next_para = NULL; - ME_DisplayItem *run_para = NULL; - ME_Paragraph *new_para = para_create( editor ); - ME_Run *end_run; + ME_Paragraph *new_para = para_create( editor ), *old_para, *next_para; + ME_Run *end_run, *next_run; int ofs, i; - ME_DisplayItem *pp; int run_flags = MERF_ENDPARA; if (!editor->bEmulateVersion10) { /* v4.1 */ @@ -536,66 +533,67 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, assert(!(paraFlags & (MEPF_CELL|MEPF_ROWSTART|MEPF_ROWEND))); } assert(run->type == diRun); - run_para = ME_GetParagraph(run); - assert(run_para->member.para.fmt.cbSize == sizeof(PARAFORMAT2)); + old_para = &ME_GetParagraph( run )->member.para; + assert( old_para->fmt.cbSize == sizeof(PARAFORMAT2) ); /* Clear any cached para numbering following this paragraph */ - if (run_para->member.para.fmt.wNumbering) - para_num_clear_list( editor, &run_para->member.para, &run_para->member.para.fmt ); + if (old_para->fmt.wNumbering) + para_num_clear_list( editor, old_para, &old_para->fmt ); - new_para->text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); + new_para->text = ME_VSplitString( old_para->text, run->member.run.nCharOfs ); end_run = run_create( style, run_flags ); ofs = end_run->nCharOfs = run->member.run.nCharOfs; end_run->len = eol_len; end_run->para = run->member.run.para; - ME_AppendString( run_para->member.para.text, eol_str, eol_len ); - next_para = run_para->member.para.next_para; - assert(next_para == ME_FindItemFwd(run_para, diParagraphOrEnd)); + ME_AppendString( old_para->text, eol_str, eol_len ); + next_para = &old_para->next_para->member.para; - add_undo_join_paras( editor, run_para->member.para.nCharOfs + ofs ); + add_undo_join_paras( editor, old_para->nCharOfs + ofs ); /* Update selection cursors to point to the correct paragraph. */ - for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pPara == run_para && + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pPara == para_get_di( old_para ) && run->member.run.nCharOfs <= editor->pCursors[i].pRun->member.run.nCharOfs) { editor->pCursors[i].pPara = para_get_di( new_para ); } } - /* the new paragraph will have a different starting offset, so let's update its runs */ - pp = run; - while(pp->type == diRun) { - pp->member.run.nCharOfs -= ofs; - pp->member.run.para = new_para; - pp = ME_FindItemFwd(pp, diRunOrParagraphOrEnd); + /* the new paragraph will have a different starting offset, so update its runs */ + for (next_run = &run->member.run; next_run; next_run = run_next( next_run )) + { + next_run->nCharOfs -= ofs; + next_run->para = new_para; } - new_para->nCharOfs = run_para->member.para.nCharOfs + ofs; + + new_para->nCharOfs = old_para->nCharOfs + ofs; new_para->nCharOfs += eol_len; new_para->nFlags = 0; para_mark_rewrap( editor, new_para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ - new_para->fmt = run_para->member.para.fmt; - new_para->border = run_para->member.para.border; + new_para->fmt = old_para->fmt; + new_para->border = old_para->border; /* insert paragraph into paragraph double linked list */ - new_para->prev_para = run_para; - new_para->next_para = next_para; - run_para->member.para.next_para = para_get_di( new_para ); - next_para->member.para.prev_para = para_get_di( new_para ); + new_para->prev_para = para_get_di( old_para ); + new_para->next_para = para_get_di( next_para ); + old_para->next_para = para_get_di( new_para ); + next_para->prev_para = para_get_di( new_para ); /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ ME_InsertBefore( run, para_get_di( new_para ) ); ME_InsertBefore( para_get_di( new_para ), run_get_di( end_run ) ); /* Fix up the paras' eop_run ptrs */ - new_para->eop_run = run_para->member.para.eop_run; - run_para->member.para.eop_run = end_run; + new_para->eop_run = old_para->eop_run; + old_para->eop_run = end_run; - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (paraFlags & (MEPF_ROWSTART | MEPF_CELL)) { ME_DisplayItem *cell = ME_MakeDI(diCell); ME_InsertBefore( para_get_di( new_para ), cell ); @@ -603,32 +601,32 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { - run_para->member.para.nFlags |= MEPF_ROWSTART; + old_para->nFlags |= MEPF_ROWSTART; cell->member.cell.prev_cell = NULL; - cell->member.cell.parent_cell = run_para->member.para.pCell; - if (run_para->member.para.pCell) - cell->member.cell.nNestingLevel = run_para->member.para.pCell->member.cell.nNestingLevel + 1; + cell->member.cell.parent_cell = old_para->pCell; + if (old_para->pCell) + cell->member.cell.nNestingLevel = old_para->pCell->member.cell.nNestingLevel + 1; else cell->member.cell.nNestingLevel = 1; } else { - cell->member.cell.prev_cell = run_para->member.para.pCell; + cell->member.cell.prev_cell = old_para->pCell; assert(cell->member.cell.prev_cell); cell->member.cell.prev_cell->member.cell.next_cell = cell; - assert(run_para->member.para.nFlags & MEPF_CELL); - assert(!(run_para->member.para.nFlags & MEPF_ROWSTART)); + assert( old_para->nFlags & MEPF_CELL ); + assert( !(old_para->nFlags & MEPF_ROWSTART) ); cell->member.cell.nNestingLevel = cell->member.cell.prev_cell->member.cell.nNestingLevel; cell->member.cell.parent_cell = cell->member.cell.prev_cell->member.cell.parent_cell; } } else if (paraFlags & MEPF_ROWEND) { - run_para->member.para.nFlags |= MEPF_ROWEND; - run_para->member.para.pCell = run_para->member.para.pCell->member.cell.parent_cell; - new_para->pCell = run_para->member.para.pCell; - assert(run_para->member.para.prev_para->member.para.nFlags & MEPF_CELL); - assert(!(run_para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART)); + old_para->nFlags |= MEPF_ROWEND; + old_para->pCell = old_para->pCell->member.cell.parent_cell; + new_para->pCell = old_para->pCell; + assert( old_para->prev_para->member.para.nFlags & MEPF_CELL ); + assert( !(old_para->prev_para->member.para.nFlags & MEPF_ROWSTART) ); if (new_para->pCell != new_para->next_para->member.para.pCell && new_para->next_para->member.para.pCell && !new_para->next_para->member.para.pCell->member.cell.prev_cell) @@ -637,20 +635,20 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->nFlags |= MEPF_ROWSTART; } } - else new_para->pCell = run_para->member.para.pCell; + else new_para->pCell = old_para->pCell; - table_update_flags( &run_para->member.para ); + table_update_flags( old_para ); table_update_flags( new_para ); } /* force rewrap of the */ - if (run_para->member.para.prev_para->type == diParagraph) - para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); + if (old_para->prev_para->type == diParagraph) + para_mark_rewrap( editor, &old_para->prev_para->member.para ); para_mark_rewrap( editor, &new_para->prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ - ME_PropagateCharOffset(next_para, eol_len); + ME_PropagateCharOffset( para_get_di( next_para ), eol_len ); editor->nParagraphs++; return para_get_di( new_para ); -- 2.23.0

1 0

[PATCH 2/5] riched20: Return a paragraph ptr from the paragraph creation function.
by Huw Davies 16 Oct '20

16 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/para.c | 92 +++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 2d5072e232e..49cf4ad3063 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -29,14 +29,14 @@ void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) para_mark_add( editor, para ); } -static ME_DisplayItem *make_para(ME_TextEditor *editor) +static ME_Paragraph *para_create( ME_TextEditor *editor ) { ME_DisplayItem *item = ME_MakeDI(diParagraph); ME_SetDefaultParaFormat(editor, &item->member.para.fmt); item->member.para.nFlags = MEPF_REWRAP; - return item; + return &item->member.para; } void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) @@ -130,7 +130,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; - ME_DisplayItem *para = make_para(editor); + ME_Paragraph *para = para_create( editor ); ME_Run *run; ME_Style *style; int eol_len; @@ -175,25 +175,25 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) } eol_len = editor->bEmulateVersion10 ? 2 : 1; - para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); + para->text = ME_MakeStringN( cr_lf, eol_len ); run = run_create( style, MERF_ENDPARA ); run->nCharOfs = 0; run->len = eol_len; - run->para = &para->member.para; - para->member.para.eop_run = run; + run->para = para; + para->eop_run = run; - ME_InsertBefore(text->pLast, para); - ME_InsertBefore(text->pLast, run_get_di( run )); - para->member.para.prev_para = text->pFirst; - para->member.para.next_para = text->pLast; - text->pFirst->member.para.next_para = para; - text->pLast->member.para.prev_para = para; + ME_InsertBefore( text->pLast, para_get_di( para) ); + ME_InsertBefore( text->pLast, run_get_di( run ) ); + para->prev_para = text->pFirst; + para->next_para = text->pLast; + text->pFirst->member.para.next_para = para_get_di( para ); + text->pLast->member.para.prev_para = para_get_di( para ); text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; wine_rb_init( &editor->marked_paras, para_mark_compare ); - para_mark_add( editor, &para->member.para ); + para_mark_add( editor, para ); ME_DestroyContext(&c); } @@ -518,7 +518,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, { ME_DisplayItem *next_para = NULL; ME_DisplayItem *run_para = NULL; - ME_DisplayItem *new_para = make_para(editor); + ME_Paragraph *new_para = para_create( editor ); ME_Run *end_run; int ofs, i; ME_DisplayItem *pp; @@ -543,7 +543,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, if (run_para->member.para.fmt.wNumbering) para_num_clear_list( editor, &run_para->member.para, &run_para->member.para.fmt ); - new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); + new_para->text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); end_run = run_create( style, run_flags ); ofs = end_run->nCharOfs = run->member.run.nCharOfs; @@ -560,7 +560,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, if (editor->pCursors[i].pPara == run_para && run->member.run.nCharOfs <= editor->pCursors[i].pRun->member.run.nCharOfs) { - editor->pCursors[i].pPara = new_para; + editor->pCursors[i].pPara = para_get_di( new_para ); } } @@ -568,38 +568,38 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, pp = run; while(pp->type == diRun) { pp->member.run.nCharOfs -= ofs; - pp->member.run.para = &new_para->member.para; + pp->member.run.para = new_para; pp = ME_FindItemFwd(pp, diRunOrParagraphOrEnd); } - new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; - new_para->member.para.nCharOfs += eol_len; - new_para->member.para.nFlags = 0; - para_mark_rewrap( editor, &new_para->member.para ); + new_para->nCharOfs = run_para->member.para.nCharOfs + ofs; + new_para->nCharOfs += eol_len; + new_para->nFlags = 0; + para_mark_rewrap( editor, new_para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ - new_para->member.para.fmt = run_para->member.para.fmt; - new_para->member.para.border = run_para->member.para.border; + new_para->fmt = run_para->member.para.fmt; + new_para->border = run_para->member.para.border; /* insert paragraph into paragraph double linked list */ - new_para->member.para.prev_para = run_para; - new_para->member.para.next_para = next_para; - run_para->member.para.next_para = new_para; - next_para->member.para.prev_para = new_para; + new_para->prev_para = run_para; + new_para->next_para = next_para; + run_para->member.para.next_para = para_get_di( new_para ); + next_para->member.para.prev_para = para_get_di( new_para ); /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ - ME_InsertBefore(run, new_para); - ME_InsertBefore( new_para, run_get_di( end_run )); + ME_InsertBefore( run, para_get_di( new_para ) ); + ME_InsertBefore( para_get_di( new_para ), run_get_di( end_run ) ); /* Fix up the paras' eop_run ptrs */ - new_para->member.para.eop_run = run_para->member.para.eop_run; + new_para->eop_run = run_para->member.para.eop_run; run_para->member.para.eop_run = end_run; if (!editor->bEmulateVersion10) { /* v4.1 */ if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) { ME_DisplayItem *cell = ME_MakeDI(diCell); - ME_InsertBefore(new_para, cell); - new_para->member.para.pCell = cell; + ME_InsertBefore( para_get_di( new_para ), cell ); + new_para->pCell = cell; cell->member.cell.next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { @@ -610,7 +610,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.nNestingLevel = run_para->member.para.pCell->member.cell.nNestingLevel + 1; else cell->member.cell.nNestingLevel = 1; - } else { + } + else + { cell->member.cell.prev_cell = run_para->member.para.pCell; assert(cell->member.cell.prev_cell); cell->member.cell.prev_cell->member.cell.next_cell = cell; @@ -619,37 +621,39 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.nNestingLevel = cell->member.cell.prev_cell->member.cell.nNestingLevel; cell->member.cell.parent_cell = cell->member.cell.prev_cell->member.cell.parent_cell; } - } else if (paraFlags & MEPF_ROWEND) { + } + else if (paraFlags & MEPF_ROWEND) + { run_para->member.para.nFlags |= MEPF_ROWEND; run_para->member.para.pCell = run_para->member.para.pCell->member.cell.parent_cell; - new_para->member.para.pCell = run_para->member.para.pCell; + new_para->pCell = run_para->member.para.pCell; assert(run_para->member.para.prev_para->member.para.nFlags & MEPF_CELL); assert(!(run_para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART)); - if (new_para->member.para.pCell != new_para->member.para.next_para->member.para.pCell - && new_para->member.para.next_para->member.para.pCell - && !new_para->member.para.next_para->member.para.pCell->member.cell.prev_cell) + if (new_para->pCell != new_para->next_para->member.para.pCell + && new_para->next_para->member.para.pCell + && !new_para->next_para->member.para.pCell->member.cell.prev_cell) { /* Row starts just after the row that was ended. */ - new_para->member.para.nFlags |= MEPF_ROWSTART; + new_para->nFlags |= MEPF_ROWSTART; } - } else { - new_para->member.para.pCell = run_para->member.para.pCell; } + else new_para->pCell = run_para->member.para.pCell; + table_update_flags( &run_para->member.para ); - table_update_flags( &new_para->member.para ); + table_update_flags( new_para ); } /* force rewrap of the */ if (run_para->member.para.prev_para->type == diParagraph) para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); - para_mark_rewrap( editor, &new_para->member.para.prev_para->member.para ); + para_mark_rewrap( editor, &new_para->prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ ME_PropagateCharOffset(next_para, eol_len); editor->nParagraphs++; - return new_para; + return para_get_di( new_para ); } /* join tp with tp->member.para.next_para, keeping tp's style; this -- 2.23.0

1 0

[PATCH 1/5] riched20: Pass a paragraph ptr to the table update flags function.
by Huw Davies 16 Oct '20

16 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/para.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 431f89faed3..2d5072e232e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -211,23 +211,20 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast); } -static void ME_UpdateTableFlags(ME_DisplayItem *para) +static void table_update_flags( ME_Paragraph *para ) { - para->member.para.fmt.dwMask |= PFM_TABLE|PFM_TABLEROWDELIMITER; - if (para->member.para.pCell) { - para->member.para.nFlags |= MEPF_CELL; - } else { - para->member.para.nFlags &= ~MEPF_CELL; - } - if (para->member.para.nFlags & MEPF_ROWEND) { - para->member.para.fmt.wEffects |= PFE_TABLEROWDELIMITER; - } else { - para->member.para.fmt.wEffects &= ~PFE_TABLEROWDELIMITER; - } - if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND)) - para->member.para.fmt.wEffects |= PFE_TABLE; - else - para->member.para.fmt.wEffects &= ~PFE_TABLE; + para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; + + if (para->pCell) para->nFlags |= MEPF_CELL; + else para->nFlags &= ~MEPF_CELL; + + if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER; + else para->fmt.wEffects &= ~PFE_TABLEROWDELIMITER; + + if (para->nFlags & (MEPF_ROWSTART | MEPF_CELL | MEPF_ROWEND)) + para->fmt.wEffects |= PFE_TABLE; + else + para->fmt.wEffects &= ~PFE_TABLE; } static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base ) @@ -638,8 +635,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } else { new_para->member.para.pCell = run_para->member.para.pCell; } - ME_UpdateTableFlags(run_para); - ME_UpdateTableFlags(new_para); + table_update_flags( &run_para->member.para ); + table_update_flags( &new_para->member.para ); } /* force rewrap of the */ -- 2.23.0

1 0

[PATCH] winevulkan: Implement VK_EXT_debug_report.
by Georg Lehmann 16 Oct '20

16 Oct '20

Needed for Quake2RTX. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 14 +++-- dlls/winevulkan/vulkan.c | 105 ++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 26 ++++++++ 3 files changed, 138 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f3f2da7548c..5304a139bae 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -86,12 +86,7 @@ EXT_BLOCK_SIZE = 1000 UNSUPPORTED_EXTENSIONS = [ # Instance extensions - "VK_EXT_debug_report", - # Handling of VK_EXT_debug_report requires some consideration. The win32 - # loader already provides it for us and it is somewhat usable. If we add - # plumbing down to the native layer, we will get each message twice as we - # use 2 loaders (win32+native), but we may get output from the driver. - # In any case callback conversion is required. + "VK_EXT_debug_marker", # Needs handle unwrapping "VK_EXT_validation_features", "VK_EXT_validation_flags", "VK_KHR_display", # Needs WSI work. @@ -231,6 +226,11 @@ FUNCTION_OVERRIDES = { "vkSubmitDebugUtilsMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, "vkSetDebugUtilsObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, "vkSetDebugUtilsObjectNameEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, + + # VK_EXT_debug_report + "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkDebugReportMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, } STRUCT_CHAIN_CONVERSIONS = [ @@ -952,6 +952,8 @@ class VkHandle(object): return "wine_cmd_pool_from_handle({0})->command_pool".format(name) if self.name == "VkDebugUtilsMessengerEXT": return "wine_debug_utils_messenger_from_handle({0})->debug_messenger".format(name) + if self.name == "VkDebugReportCallbackEXT": + return "wine_debug_report_callback_from_handle({0})->debug_callback".format(name) native_handle_name = None diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 92c26be1fc0..d486f43e66c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -190,6 +190,30 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB return result; } +static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT object_type, + uint64_t object_handle, size_t location, int32_t code, const char *layer_prefix, const char *message, void *user_data) +{ + struct wine_debug_report_callback *object; + + TRACE("%#x, %#x, 0x%s, 0x%s, %d, %p, %p, %p\n", flags, object_type, wine_dbgstr_longlong(object_handle), + wine_dbgstr_longlong(location), code, layer_prefix, message, user_data); + + object = user_data; + + if (!object->instance->instance) + { + /* instance wasn't yet created, this is a message from the native loader */ + return VK_FALSE; + } + + object_handle = wine_vk_get_wrapper(object->instance, object_handle); + if (!object_handle) + object_type = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT; + + return object->user_callback( + flags, object_type, object_handle, location, code, layer_prefix, message, object->user_data); +} + static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { if (!phys_dev) @@ -471,6 +495,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo VkInstanceCreateInfo *dst, struct VkInstance_T *object) { VkDebugUtilsMessengerCreateInfoEXT *debug_utils_messenger; + VkDebugReportCallbackCreateInfoEXT *debug_report_callback; VkBaseInStructure *header; unsigned int i; VkResult res; @@ -503,6 +528,18 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo debug_utils_messenger->pUserData = &object->utils_messengers[i]; } + debug_report_callback = wine_vk_find_struct(header->pNext, DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT); + if (debug_report_callback) + { + object->default_callback.instance = object; + object->default_callback.debug_callback = VK_NULL_HANDLE; + object->default_callback.user_callback = debug_report_callback->pfnCallback; + object->default_callback.user_data = debug_report_callback->pUserData; + + debug_report_callback->pfnCallback = (void *) &debug_report_callback_conversion; + debug_report_callback->pUserData = &object->default_callback; + } + /* ICDs don't support any layers, so nothing to copy. Modern versions of the loader * filter this data out as well. */ @@ -526,7 +563,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo free_VkInstanceCreateInfo_struct_chain(dst); return VK_ERROR_EXTENSION_NOT_PRESENT; } - if (!strcmp(extension_name, "VK_EXT_debug_utils")) + if (!strcmp(extension_name, "VK_EXT_debug_utils") || !strcmp(extension_name, "VK_EXT_debug_report")) { object->enable_wrapper_list = VK_TRUE; } @@ -1880,6 +1917,72 @@ VkResult WINAPI wine_vkSetDebugUtilsObjectNameEXT(VkDevice device, const VkDebug return thunk_vkSetDebugUtilsObjectNameEXT(device, &wine_name_info); } +VkResult WINAPI wine_vkCreateDebugReportCallbackEXT(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *create_info, + const VkAllocationCallbacks *allocator, VkDebugReportCallbackEXT *callback) +{ + VkDebugReportCallbackCreateInfoEXT wine_create_info; + struct wine_debug_report_callback *object; + VkResult res; + + TRACE("%p, %p, %p, %p\n", instance, create_info, allocator, callback); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + object->instance = instance; + object->user_callback = create_info->pfnCallback; + object->user_data = create_info->pUserData; + + wine_create_info = *create_info; + + wine_create_info.pfnCallback = (void *) debug_report_callback_conversion; + wine_create_info.pUserData = object; + + res = instance->funcs.p_vkCreateDebugReportCallbackEXT(instance->instance, &wine_create_info, NULL, &object->debug_callback); + + if (res != VK_SUCCESS) + { + heap_free(object); + return res; + } + + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->debug_callback); + *callback = wine_debug_report_callback_to_handle(object); + + return VK_SUCCESS; +} + +void WINAPI wine_vkDestroyDebugReportCallbackEXT( + VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks *allocator) +{ + struct wine_debug_report_callback *object; + + TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(callback), allocator); + + object = wine_debug_report_callback_from_handle(callback); + + instance->funcs.p_vkDestroyDebugReportCallbackEXT(instance->instance, object->debug_callback, NULL); + + WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); + + heap_free(object); +} + +void WINAPI wine_vkDebugReportMessageEXT(VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT object_type, + uint64_t object, size_t location, int32_t code, const char *layer_prefix, const char *message) +{ + TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", instance, flags, object_type, wine_dbgstr_longlong(object), + wine_dbgstr_longlong(location), code, layer_prefix, message); + + object = wine_vk_unwrap_handle(object_type, object); + + instance->funcs.p_vkDebugReportMessageEXT( + instance->instance, flags, object_type, object, location, code, layer_prefix, message); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index eec0ef595d0..92c04543587 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -97,6 +97,18 @@ struct VkDevice_T struct wine_debug_utils_messenger; +struct wine_debug_report_callback +{ + struct VkInstance_T *instance; /* parent */ + VkDebugReportCallbackEXT debug_callback; /* native callback object */ + + /* application callback + data */ + PFN_vkDebugReportCallbackEXT user_callback; + void *user_data; + + struct wine_vk_mapping mapping; +}; + struct VkInstance_T { struct wine_vk_base base; @@ -116,6 +128,8 @@ struct VkInstance_T struct wine_debug_utils_messenger *utils_messengers; uint32_t utils_messenger_count; + struct wine_debug_report_callback default_callback; + unsigned int quirks; struct wine_vk_mapping mapping; @@ -187,6 +201,18 @@ static inline VkDebugUtilsMessengerEXT wine_debug_utils_messenger_to_handle( return (VkDebugUtilsMessengerEXT)(uintptr_t)debug_messenger; } +static inline struct wine_debug_report_callback *wine_debug_report_callback_from_handle( + VkDebugReportCallbackEXT handle) +{ + return (struct wine_debug_report_callback *)(uintptr_t)handle; +} + +static inline VkDebugReportCallbackEXT wine_debug_report_callback_to_handle( + struct wine_debug_report_callback *debug_messenger) +{ + return (VkDebugReportCallbackEXT)(uintptr_t)debug_messenger; +} + void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; -- 2.28.0

2 1

[PATCH] msvfw32/tests: add a few tests for MCIWndCreate
by David Adam 16 Oct '20

16 Oct '20

2 2

[PATCH 2/2] taskmgr: SwitchToThisWindow() is available, remove alternate code path
by Michael Stefaniuc 15 Oct '20

15 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/applpage.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 6b2e04077c2..b35881c2323 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -47,8 +47,6 @@ static int nApplicationPageHeight; static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signaled then we refresh the app list */ static BOOL bSortAscending = TRUE; -static const WCHAR wszUser32[] = {'U','S','E','R','3','2','.','D','L','L',0}; - static void ApplicationPageUpdate(void) { /* Enable or disable the "End Task" & "Switch To" buttons */ @@ -743,19 +741,7 @@ void ApplicationPage_OnSwitchTo(void) } } if (pAPLI) { - typedef void (WINAPI *PROCSWITCHTOTHISWINDOW) (HWND, BOOL); - PROCSWITCHTOTHISWINDOW SwitchToThisWindow; - - HMODULE hUser32 = GetModuleHandleW(wszUser32); - SwitchToThisWindow = (PROCSWITCHTOTHISWINDOW)GetProcAddress(hUser32, "SwitchToThisWindow"); - if (SwitchToThisWindow) { - SwitchToThisWindow(pAPLI->hWnd, TRUE); - } else { - if (IsIconic(pAPLI->hWnd)) - ShowWindow(pAPLI->hWnd, SW_RESTORE); - BringWindowToTop(pAPLI->hWnd); - SetForegroundWindow(pAPLI->hWnd); - } + SwitchToThisWindow(pAPLI->hWnd, TRUE); if (TaskManagerSettings.MinimizeOnUse) ShowWindow(hMainWnd, SW_MINIMIZE); } -- 2.26.2

1 0

[PATCH 1/2] taskmgr: There's no need to GetProcAddress() IsHungAppWindow()
by Michael Stefaniuc 15 Oct '20

15 Oct '20

Its available since Win2K. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/applpage.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 5a005290be4..6b2e04077c2 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -238,10 +238,6 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) HICON hIcon; WCHAR wszText[256]; BOOL bLargeIcon = TaskManagerSettings.View_LargeIcons; - BOOL bHung = FALSE; - typedef int (__stdcall *IsHungAppWindowProc)(HWND); - IsHungAppWindowProc IsHungAppWindow; - /* Skip our window */ if (hWnd == hMainWnd) @@ -270,14 +266,7 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) if (!hIcon) hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); - bHung = FALSE; - - IsHungAppWindow = (IsHungAppWindowProc)(FARPROC)GetProcAddress(GetModuleHandleW(wszUser32), "IsHungAppWindow"); - - if (IsHungAppWindow) - bHung = IsHungAppWindow(hWnd); - - AddOrUpdateHwnd(hWnd, wszText, hIcon, bHung); + AddOrUpdateHwnd(hWnd, wszText, hIcon, IsHungAppWindow(hWnd)); return TRUE; } -- 2.26.2

1 0

[PATCH 7/7] kernelbase: Move console code page validation to conhost.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 16 ++-------------- programs/conhost/conhost.c | 6 ++++++ 2 files changed, 8 insertions(+), 14 deletions(-)

2 1

[PATCH 6/7] conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 3 +-- programs/conhost/conhost.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-)

2 1

[PATCH 5/7] kernel32: Import FlushFileBuffers from kernelbase.
by Jacek Caban 15 Oct '20

15 Oct '20

Console special-case is no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 14 -------------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-)

2 1

[PATCH 4/7] server: Implement console input flush in server.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)

2 1

[PATCH 3/7] kernel32: Move FlushConsoleInputBuffer to kernelbase.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 9 --------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-)

2 1

[PATCH 2/7] kernel32: Use new IOCTL_CONDRV_SCROLL ioctl for FlushConsoleInputBuffer implementation.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 28 +--------------------------- include/wine/condrv.h | 1 + programs/conhost/conhost.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 29 deletions(-)

2 1

[PATCH 1/7] kernel32/tests: Add more FlushConsoleInputBuffer tests.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)

2 1

[PATCH] ws2_32: Implement GetHostNameW() function using GetComputerNameW
by Vijay Kiran Kamuju 15 Oct '20

15 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49286 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

3 2

[PATCH] wlanapi:Add a few more stubs.
by Haidong Yu 15 Oct '20

15 Oct '20

1 0

[PATCH 1/3] mf/evr: Add attributes store for the sink.
by Nikolay Sivov 15 Oct '20

15 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 353 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 12 ++ 2 files changed, 365 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 1d55344fe16..7665725405e 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -59,9 +59,11 @@ struct video_renderer IMFGetService IMFGetService_iface; IMFTopologyServiceLookup IMFTopologyServiceLookup_iface; IMediaEventSink IMediaEventSink_iface; + IMFAttributes IMFAttributes_iface; LONG refcount; IMFMediaEventQueue *event_queue; + IMFAttributes *attributes; IMFPresentationClock *clock; IMFTransform *mixer; @@ -115,6 +117,11 @@ static struct video_renderer *impl_from_IMediaEventSink(IMediaEventSink *iface) return CONTAINING_RECORD(iface, struct video_renderer, IMediaEventSink_iface); } +static struct video_renderer *impl_from_IMFAttributes(IMFAttributes *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFAttributes_iface); +} + static struct video_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct video_stream, IMFStreamSink_iface); @@ -579,6 +586,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFGetService_iface; } + else if (IsEqualIID(riid, &IID_IMFAttributes)) + { + *obj = &renderer->IMFAttributes_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -616,6 +627,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) IMFVideoPresenter_Release(renderer->presenter); if (renderer->clock) IMFPresentationClock_Release(renderer->clock); + if (renderer->attributes) + IMFAttributes_Release(renderer->attributes); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -1504,6 +1517,342 @@ static const IMediaEventSinkVtbl media_event_sink_vtbl = video_renderer_event_sink_Notify, }; +static HRESULT WINAPI video_renderer_attributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_attributes_AddRef(IMFAttributes *iface) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_attributes_Release(IMFAttributes *iface) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_attributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetItem(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), type); + + return IMFAttributes_GetItemType(renderer->attributes, key, type); +} + +static HRESULT WINAPI video_renderer_attributes_CompareItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value, + BOOL *result) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, result); + + return IMFAttributes_CompareItem(renderer->attributes, key, value, result); +} + +static HRESULT WINAPI video_renderer_attributes_Compare(IMFAttributes *iface, IMFAttributes *theirs, + MF_ATTRIBUTES_MATCH_TYPE type, BOOL *result) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p, %d, %p.\n", iface, theirs, type, result); + + return IMFAttributes_Compare(renderer->attributes, theirs, type, result); +} + +static HRESULT WINAPI video_renderer_attributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetUINT32(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetUINT64(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetDouble(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_GetGUID(IMFAttributes *iface, REFGUID key, GUID *value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_GetGUID(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_GetStringLength(IMFAttributes *iface, REFGUID key, + UINT32 *length) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), length); + + return IMFAttributes_GetStringLength(renderer->attributes, key, length); +} + +static HRESULT WINAPI video_renderer_attributes_GetString(IMFAttributes *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_guid(key), value, size, length); + + return IMFAttributes_GetString(renderer->attributes, key, value, size, length); +} + +static HRESULT WINAPI video_renderer_attributes_GetAllocatedString(IMFAttributes *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, length); + + return IMFAttributes_GetAllocatedString(renderer->attributes, key, value, length); +} + +static HRESULT WINAPI video_renderer_attributes_GetBlobSize(IMFAttributes *iface, REFGUID key, UINT32 *size) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), size); + + return IMFAttributes_GetBlobSize(renderer->attributes, key, size); +} + +static HRESULT WINAPI video_renderer_attributes_GetBlob(IMFAttributes *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_guid(key), buf, bufsize, blobsize); + + return IMFAttributes_GetBlob(renderer->attributes, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI video_renderer_attributes_GetAllocatedBlob(IMFAttributes *iface, REFGUID key, + UINT8 **buf, UINT32 *size) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), buf, size); + + return IMFAttributes_GetAllocatedBlob(renderer->attributes, key, buf, size); +} + +static HRESULT WINAPI video_renderer_attributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **out) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(key), debugstr_guid(riid), out); + + return IMFAttributes_GetUnknown(renderer->attributes, key, riid, out); +} + +static HRESULT WINAPI video_renderer_attributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetItem(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_DeleteItem(IMFAttributes *iface, REFGUID key) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s.\n", iface, debugstr_guid(key)); + + return IMFAttributes_DeleteItem(renderer->attributes, key); +} + +static HRESULT WINAPI video_renderer_attributes_DeleteAllItems(IMFAttributes *iface) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_DeleteAllItems(renderer->attributes); +} + +static HRESULT WINAPI video_renderer_attributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %u.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetUINT32(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); + + return IMFAttributes_SetUINT64(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %f.\n", iface, debugstr_guid(key), value); + + return IMFAttributes_SetDouble(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_SetGUID(IMFAttributes *iface, REFGUID key, REFGUID value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_guid(value)); + + return IMFAttributes_SetGUID(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_SetString(IMFAttributes *iface, REFGUID key, + const WCHAR *value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_w(value)); + + return IMFAttributes_SetString(renderer->attributes, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_SetBlob(IMFAttributes *iface, REFGUID key, + const UINT8 *buf, UINT32 size) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p, %u.\n", iface, debugstr_guid(key), buf, size); + + return IMFAttributes_SetBlob(renderer->attributes, key, buf, size); +} + +static HRESULT WINAPI video_renderer_attributes_SetUnknown(IMFAttributes *iface, REFGUID key, + IUnknown *unknown) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), unknown); + + return IMFAttributes_SetUnknown(renderer->attributes, key, unknown); +} + +static HRESULT WINAPI video_renderer_attributes_LockStore(IMFAttributes *iface) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_LockStore(renderer->attributes); +} + +static HRESULT WINAPI video_renderer_attributes_UnlockStore(IMFAttributes *iface) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p.\n", iface); + + return IMFAttributes_UnlockStore(renderer->attributes); +} + +static HRESULT WINAPI video_renderer_attributes_GetCount(IMFAttributes *iface, UINT32 *count) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p.\n", iface, count); + + return IMFAttributes_GetCount(renderer->attributes, count); +} + +static HRESULT WINAPI video_renderer_attributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, + GUID *key, PROPVARIANT *value) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); + + return IMFAttributes_GetItemByIndex(renderer->attributes, index, key, value); +} + +static HRESULT WINAPI video_renderer_attributes_CopyAllItems(IMFAttributes *iface, IMFAttributes *dest) +{ + struct video_renderer *renderer = impl_from_IMFAttributes(iface); + + TRACE("%p, %p.\n", iface, dest); + + return IMFAttributes_CopyAllItems(renderer->attributes, dest); +} + +static const IMFAttributesVtbl video_renderer_attributes_vtbl = +{ + video_renderer_attributes_QueryInterface, + video_renderer_attributes_AddRef, + video_renderer_attributes_Release, + video_renderer_attributes_GetItem, + video_renderer_attributes_GetItemType, + video_renderer_attributes_CompareItem, + video_renderer_attributes_Compare, + video_renderer_attributes_GetUINT32, + video_renderer_attributes_GetUINT64, + video_renderer_attributes_GetDouble, + video_renderer_attributes_GetGUID, + video_renderer_attributes_GetStringLength, + video_renderer_attributes_GetString, + video_renderer_attributes_GetAllocatedString, + video_renderer_attributes_GetBlobSize, + video_renderer_attributes_GetBlob, + video_renderer_attributes_GetAllocatedBlob, + video_renderer_attributes_GetUnknown, + video_renderer_attributes_SetItem, + video_renderer_attributes_DeleteItem, + video_renderer_attributes_DeleteAllItems, + video_renderer_attributes_SetUINT32, + video_renderer_attributes_SetUINT64, + video_renderer_attributes_SetDouble, + video_renderer_attributes_SetGUID, + video_renderer_attributes_SetString, + video_renderer_attributes_SetBlob, + video_renderer_attributes_SetUnknown, + video_renderer_attributes_LockStore, + video_renderer_attributes_UnlockStore, + video_renderer_attributes_GetCount, + video_renderer_attributes_GetItemByIndex, + video_renderer_attributes_CopyAllItems, +}; + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; @@ -1524,12 +1873,16 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFGetService_iface.lpVtbl = &video_renderer_get_service_vtbl; object->IMFTopologyServiceLookup_iface.lpVtbl = &video_renderer_service_lookup_vtbl; object->IMediaEventSink_iface.lpVtbl = &media_event_sink_vtbl; + object->IMFAttributes_iface.lpVtbl = &video_renderer_attributes_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto failed; + if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) + goto failed; + /* Create mixer and presenter. */ if (FAILED(hr = video_renderer_create_mixer(attributes, &mixer))) goto failed; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 351a6e1edab..fa3d8111338 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3245,6 +3245,7 @@ static void test_evr(void) IMFClockStateSink *clock_sink; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; + IMFAttributes *attributes; IMFActivate *activate; DWORD flags, count; LONG sample_count; @@ -3283,6 +3284,17 @@ static void test_evr(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFAttributes, (void **)&attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFAttributes_QueryInterface(attributes, &IID_IMFMediaSink, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(!!count, "Unexpected count %u.\n", count); + IMFAttributes_Release(attributes); + /* Primary stream type handler. */ hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.28.0

1 2

[PATCH v3] riched20: implement ITextRange/ITextSelection Copy and Cut
by Damjan Jovanovic 15 Oct '20

15 Oct '20

Try 3 fixes copying from a password masked richedit control, and gets tests to pass. Clipboard handling is unified with the previous code in editor.c. Manual tests show trying to cut from a read-only field beeps when using WM_CUT or Ctrl+X, but not when using these APIs. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 53 ++++++++++++++++--------- dlls/riched20/editor.h | 3 +- dlls/riched20/richole.c | 46 ++++++++++++++++++---- dlls/riched20/tests/richole.c | 74 +++++++++++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 29 deletions(-)

2 2

[PATCH 6/6] riched20: Implement ITextRange/ITextSelection Copy and Cut.
by Huw Davies 15 Oct '20

15 Oct '20

From: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 84 +++++++++++++++++++++-------------- dlls/riched20/editor.h | 2 + dlls/riched20/richole.c | 51 +++++++++++++++++---- dlls/riched20/tests/richole.c | 74 ++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 41 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d9bcea84f74..c5045961077 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2333,52 +2333,70 @@ done: return hr == S_OK; } -static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) +static HRESULT editor_copy( ME_TextEditor *editor, ME_Cursor *start, int chars, IDataObject **data_out ) { - LPDATAOBJECT dataObj = NULL; - HRESULT hr = S_OK; + IDataObject *data = NULL; + HRESULT hr = S_OK; - if (editor->cPasswordMask) - return FALSE; /* Copying or Cutting masked text isn't allowed */ + if (editor->lpOleCallback) + { + CHARRANGE range; + range.cpMin = ME_GetCursorOfs( start ); + range.cpMax = range.cpMin + chars; + hr = IRichEditOleCallback_GetClipboardData( editor->lpOleCallback, &range, RECO_COPY, &data ); + } - if(editor->lpOleCallback) - { - CHARRANGE range; - range.cpMin = ME_GetCursorOfs(start); - range.cpMax = range.cpMin + nChars; - hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); - } - if(FAILED(hr) || !dataObj) - hr = ME_GetDataObject(editor, start, nChars, &dataObj); - if(SUCCEEDED(hr)) { - hr = OleSetClipboard(dataObj); - IDataObject_Release(dataObj); - } - return SUCCEEDED(hr); + if (FAILED( hr ) || !data) + hr = ME_GetDataObject( editor, start, chars, &data ); + + if (SUCCEEDED( hr )) + { + if (data_out) + *data_out = data; + else + { + hr = OleSetClipboard( data ); + IDataObject_Release( data ); + } + } + + return hr; } -static BOOL copy_or_cut(ME_TextEditor *editor, BOOL cut) +HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, BOOL ui, ME_Cursor *start, int count, + IDataObject **data_out ) { - BOOL result; - int offs, num_chars; - int start_cursor = ME_GetSelectionOfs(editor, &offs, &num_chars); - ME_Cursor *sel_start = &editor->pCursors[start_cursor]; + HRESULT hr; if (cut && (editor->styleFlags & ES_READONLY)) { - MessageBeep(MB_ICONERROR); - return FALSE; + return E_ACCESSDENIED; } - num_chars -= offs; - result = ME_Copy(editor, sel_start, num_chars); - if (result && cut) + hr = editor_copy( editor, start, count, data_out ); + if (SUCCEEDED(hr) && cut) { - ME_InternalDeleteText(editor, sel_start, num_chars, FALSE); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor, TRUE); + ME_InternalDeleteText( editor, start, count, FALSE ); + ME_CommitUndo( editor ); + ME_UpdateRepaint( editor, TRUE ); } - return result; + return hr; +} + +static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) +{ + HRESULT hr; + int offs, count; + int start_cursor = ME_GetSelectionOfs( editor, &offs, &count ); + ME_Cursor *sel_start = &editor->pCursors[start_cursor]; + + if (editor->cPasswordMask) return FALSE; + + count -= offs; + hr = editor_copy_or_cut( editor, cut, TRUE, sel_start, count, NULL ); + if (FAILED( hr )) MessageBeep( MB_ICONERROR ); + + return SUCCEEDED( hr ); } /* helper to send a msg filter notification */ diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0503a671ea1..07bcc1aa4b9 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -270,6 +270,8 @@ void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; +HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, BOOL ui, ME_Cursor *start, int count, + IDataObject **data_out ) DECLSPEC_HIDDEN; ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 923984e96b1..6e3ae8ded96 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2594,28 +2594,53 @@ static HRESULT WINAPI ITextRange_fnDelete(ITextRange *me, LONG unit, LONG count, return E_NOTIMPL; } +static HRESULT textrange_copy_or_cut( ITextRange *range, ME_TextEditor *editor, BOOL cut, VARIANT *v ) +{ + LONG start, end; + ME_Cursor cursor; + IDataObject **data_out = NULL; + + ITextRange_GetStart( range, &start ); + ITextRange_GetEnd( range, &end ); + if (start == end) + { + /* If the range is empty, all text is copied */ + LONG prev_end = end; + ITextRange_SetEnd( range, MAXLONG ); + start = 0; + ITextRange_GetEnd( range, &end ); + ITextRange_SetEnd( range, prev_end ); + } + cursor_from_char_ofs( editor, start, &cursor ); + + if (v && V_VT(v) == (VT_UNKNOWN | VT_BYREF) && V_UNKNOWNREF( v )) + data_out = (IDataObject **)V_UNKNOWNREF( v ); + + return editor_copy_or_cut( editor, cut, FALSE, &cursor, end - start, data_out ); +} + static HRESULT WINAPI ITextRange_fnCut(ITextRange *me, VARIANT *v) { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%p): stub\n", This, v); + TRACE("(%p)->(%p)\n", This, v); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + return textrange_copy_or_cut(me, This->child.reole->editor, TRUE, v); } static HRESULT WINAPI ITextRange_fnCopy(ITextRange *me, VARIANT *v) { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%p): stub\n", This, v); + TRACE("(%p)->(%p)\n", This, v); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + return textrange_copy_or_cut(me, This->child.reole->editor, FALSE, v); } static HRESULT WINAPI ITextRange_fnPaste(ITextRange *me, VARIANT *v, LONG format) @@ -5365,25 +5390,35 @@ static HRESULT WINAPI ITextSelection_fnDelete(ITextSelection *me, LONG unit, LON static HRESULT WINAPI ITextSelection_fnCut(ITextSelection *me, VARIANT *v) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; - FIXME("(%p)->(%p): stub\n", This, v); + TRACE("(%p)->(%p): stub\n", This, v); if (!This->reOle) return CO_E_RELEASED; - return E_NOTIMPL; + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = textrange_copy_or_cut(range, This->reOle->editor, TRUE, v); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnCopy(ITextSelection *me, VARIANT *v) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; - FIXME("(%p)->(%p): stub\n", This, v); + TRACE("(%p)->(%p)\n", This, v); if (!This->reOle) return CO_E_RELEASED; - return E_NOTIMPL; + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = textrange_copy_or_cut(range, This->reOle->editor, FALSE, v); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnPaste(ITextSelection *me, VARIANT *v, LONG format) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 16ff1fafa67..a5f439aece7 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -4012,6 +4012,79 @@ static void test_character_movement(void) ITextRange_Release(range); } +#define CLIPBOARD_RANGE_CONTAINS(range, start, end, expected) _clipboard_range_contains(range, start, end, expected, __LINE__, 0); +#define TODO_CLIPBOARD_RANGE_CONTAINS(range, start, end, expected) _clipboard_range_contains(range, start, end, expected, __LINE__, 1); +static void _clipboard_range_contains(ITextRange *range, LONG start, LONG end, const char *expected, int line, int todo) +{ + HRESULT hr; + BOOL clipboard_open; + HGLOBAL global; + const char *clipboard_text; + + hr = ITextRange_SetRange(range, start, end); + ok_(__FILE__,line)(SUCCEEDED(hr), "SetRange failed: 0x%08x\n", hr); + hr = ITextRange_Copy(range, NULL); + ok_(__FILE__,line)(hr == S_OK, "Copy failed: 0x%08x\n", hr); + + clipboard_open = OpenClipboard(NULL); + ok_(__FILE__,line)(clipboard_open, "OpenClipboard failed: %d\n", GetLastError()); + global = GetClipboardData(CF_TEXT); + ok_(__FILE__,line)(global != NULL, "GetClipboardData failed: %p\n", global); + clipboard_text = GlobalLock(global); + ok_(__FILE__,line)(clipboard_text != NULL, "GlobalLock failed: %p\n", clipboard_text); + todo_wine_if(todo) ok_(__FILE__,line)(!strcmp(expected, clipboard_text), "unexpected contents: %s\n", wine_dbgstr_a(clipboard_text)); + GlobalUnlock(global); + CloseClipboard(); +} + +static void test_clipboard(void) +{ + static const char text_in[] = "ab\n c"; + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + ITextRange *range; + ITextSelection *selection; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)text_in); + + hr = ITextDocument_Range(doc, 0, 0, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CLIPBOARD_RANGE_CONTAINS(range, 0, 5, "ab\r\n c") + CLIPBOARD_RANGE_CONTAINS(range, 0, 0, "ab\r\n c") + CLIPBOARD_RANGE_CONTAINS(range, 1, 1, "ab\r\n c") + CLIPBOARD_RANGE_CONTAINS(range, 0, 1, "a") + CLIPBOARD_RANGE_CONTAINS(range, 5, 6, "") + + /* Setting password char does not stop Copy */ + SendMessageA(hwnd, EM_SETPASSWORDCHAR, '*', 0); + CLIPBOARD_RANGE_CONTAINS(range, 0, 1, "a") + + /* Cut can be undone */ + hr = ITextRange_SetRange(range, 0, 1); + ok(SUCCEEDED(hr), "SetRange failed: 0x%08x\n", hr); + hr = ITextRange_Cut(range, NULL); + ok(hr == S_OK, "Cut failed: 0x%08x\n", hr); + CLIPBOARD_RANGE_CONTAINS(range, 0, 4, "b\r\n c"); + hr = ITextDocument_Undo(doc, 1, NULL); + todo_wine ok(hr == S_OK, "Undo failed: 0x%08x\n", hr); + TODO_CLIPBOARD_RANGE_CONTAINS(range, 0, 5, "ab\r\n c"); + + /* Cannot cut when read-only */ + SendMessageA(hwnd, EM_SETREADONLY, TRUE, 0); + hr = ITextRange_SetRange(range, 0, 1); + ok(SUCCEEDED(hr), "SetRange failed: 0x%08x\n", hr); + hr = ITextRange_Cut(range, NULL); + ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + + release_interfaces(&hwnd, &reole, &doc, NULL); + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -4052,4 +4125,5 @@ START_TEST(richole) test_Expand(); test_MoveEnd_story(); test_character_movement(); + test_clipboard(); } -- 2.23.0

1 1

[PATCH] sapi: ISpVoice GetVoice return a default token
by Alistair Leslie-Hughes 15 Oct '20

15 Oct '20

GetVoice returns a default voice when one is not active. This stops a crash on startup with Scrivener. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/sapi/tts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 584c3d56b70..77e54e079ac 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -561,7 +561,7 @@ static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) { FIXME("(%p, %p): stub.\n", iface, token); - return E_NOTIMPL; + return token_create(NULL, &IID_ISpObjectToken, (void **)token); } static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number) -- 2.28.0

1 0

[PATCH v2 6/6] riched20: Implement ITextRange/ITextSelection Copy and Cut.
by Huw Davies 15 Oct '20

15 Oct '20

From: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 84 +++++++++++++++++++++-------------- dlls/riched20/editor.h | 2 + dlls/riched20/richole.c | 51 +++++++++++++++++---- dlls/riched20/tests/richole.c | 74 ++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 41 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d9bcea84f74..e512f2f9ed6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2333,52 +2333,70 @@ done: return hr == S_OK; } -static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) +static HRESULT editor_copy( ME_TextEditor *editor, ME_Cursor *start, int chars, IDataObject **data_out ) { - LPDATAOBJECT dataObj = NULL; - HRESULT hr = S_OK; + IDataObject *data = NULL; + HRESULT hr = S_OK; - if (editor->cPasswordMask) - return FALSE; /* Copying or Cutting masked text isn't allowed */ + if (editor->lpOleCallback) + { + CHARRANGE range; + range.cpMin = ME_GetCursorOfs( start ); + range.cpMax = range.cpMin + chars; + hr = IRichEditOleCallback_GetClipboardData( editor->lpOleCallback, &range, RECO_COPY, &data ); + } - if(editor->lpOleCallback) - { - CHARRANGE range; - range.cpMin = ME_GetCursorOfs(start); - range.cpMax = range.cpMin + nChars; - hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); - } - if(FAILED(hr) || !dataObj) - hr = ME_GetDataObject(editor, start, nChars, &dataObj); - if(SUCCEEDED(hr)) { - hr = OleSetClipboard(dataObj); - IDataObject_Release(dataObj); - } - return SUCCEEDED(hr); + if (FAILED( hr ) || !data) + hr = ME_GetDataObject( editor, start, chars, &data ); + + if (SUCCEEDED( hr )) + { + if (data_out) + *data_out = data; + else + { + hr = OleSetClipboard( data ); + IDataObject_Release( data ); + } + } + + return hr; } -static BOOL copy_or_cut(ME_TextEditor *editor, BOOL cut) +HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, int count, + IDataObject **data_out ) { - BOOL result; - int offs, num_chars; - int start_cursor = ME_GetSelectionOfs(editor, &offs, &num_chars); - ME_Cursor *sel_start = &editor->pCursors[start_cursor]; + HRESULT hr; if (cut && (editor->styleFlags & ES_READONLY)) { - MessageBeep(MB_ICONERROR); - return FALSE; + return E_ACCESSDENIED; } - num_chars -= offs; - result = ME_Copy(editor, sel_start, num_chars); - if (result && cut) + hr = editor_copy( editor, start, count, data_out ); + if (SUCCEEDED(hr) && cut) { - ME_InternalDeleteText(editor, sel_start, num_chars, FALSE); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor, TRUE); + ME_InternalDeleteText( editor, start, count, FALSE ); + ME_CommitUndo( editor ); + ME_UpdateRepaint( editor, TRUE ); } - return result; + return hr; +} + +static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) +{ + HRESULT hr; + int offs, count; + int start_cursor = ME_GetSelectionOfs( editor, &offs, &count ); + ME_Cursor *sel_start = &editor->pCursors[start_cursor]; + + if (editor->cPasswordMask) return FALSE; + + count -= offs; + hr = editor_copy_or_cut( editor, cut, sel_start, count, NULL ); + if (FAILED( hr )) MessageBeep( MB_ICONERROR ); + + return SUCCEEDED( hr ); } /* helper to send a msg filter notification */ diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0503a671ea1..fba9616ab4f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -270,6 +270,8 @@ void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; +HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, int count, + IDataObject **data_out ) DECLSPEC_HIDDEN; ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 923984e96b1..21e92e95cd1 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2594,28 +2594,53 @@ static HRESULT WINAPI ITextRange_fnDelete(ITextRange *me, LONG unit, LONG count, return E_NOTIMPL; } +static HRESULT textrange_copy_or_cut( ITextRange *range, ME_TextEditor *editor, BOOL cut, VARIANT *v ) +{ + LONG start, end; + ME_Cursor cursor; + IDataObject **data_out = NULL; + + ITextRange_GetStart( range, &start ); + ITextRange_GetEnd( range, &end ); + if (start == end) + { + /* If the range is empty, all text is copied */ + LONG prev_end = end; + ITextRange_SetEnd( range, MAXLONG ); + start = 0; + ITextRange_GetEnd( range, &end ); + ITextRange_SetEnd( range, prev_end ); + } + cursor_from_char_ofs( editor, start, &cursor ); + + if (v && V_VT(v) == (VT_UNKNOWN | VT_BYREF) && V_UNKNOWNREF( v )) + data_out = (IDataObject **)V_UNKNOWNREF( v ); + + return editor_copy_or_cut( editor, cut, &cursor, end - start, data_out ); +} + static HRESULT WINAPI ITextRange_fnCut(ITextRange *me, VARIANT *v) { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%p): stub\n", This, v); + TRACE("(%p)->(%p)\n", This, v); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + return textrange_copy_or_cut(me, This->child.reole->editor, TRUE, v); } static HRESULT WINAPI ITextRange_fnCopy(ITextRange *me, VARIANT *v) { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%p): stub\n", This, v); + TRACE("(%p)->(%p)\n", This, v); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + return textrange_copy_or_cut(me, This->child.reole->editor, FALSE, v); } static HRESULT WINAPI ITextRange_fnPaste(ITextRange *me, VARIANT *v, LONG format) @@ -5365,25 +5390,35 @@ static HRESULT WINAPI ITextSelection_fnDelete(ITextSelection *me, LONG unit, LON static HRESULT WINAPI ITextSelection_fnCut(ITextSelection *me, VARIANT *v) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; - FIXME("(%p)->(%p): stub\n", This, v); + TRACE("(%p)->(%p): stub\n", This, v); if (!This->reOle) return CO_E_RELEASED; - return E_NOTIMPL; + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = textrange_copy_or_cut(range, This->reOle->editor, TRUE, v); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnCopy(ITextSelection *me, VARIANT *v) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; - FIXME("(%p)->(%p): stub\n", This, v); + TRACE("(%p)->(%p)\n", This, v); if (!This->reOle) return CO_E_RELEASED; - return E_NOTIMPL; + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = textrange_copy_or_cut(range, This->reOle->editor, FALSE, v); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnPaste(ITextSelection *me, VARIANT *v, LONG format) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 16ff1fafa67..a5f439aece7 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -4012,6 +4012,79 @@ static void test_character_movement(void) ITextRange_Release(range); } +#define CLIPBOARD_RANGE_CONTAINS(range, start, end, expected) _clipboard_range_contains(range, start, end, expected, __LINE__, 0); +#define TODO_CLIPBOARD_RANGE_CONTAINS(range, start, end, expected) _clipboard_range_contains(range, start, end, expected, __LINE__, 1); +static void _clipboard_range_contains(ITextRange *range, LONG start, LONG end, const char *expected, int line, int todo) +{ + HRESULT hr; + BOOL clipboard_open; + HGLOBAL global; + const char *clipboard_text; + + hr = ITextRange_SetRange(range, start, end); + ok_(__FILE__,line)(SUCCEEDED(hr), "SetRange failed: 0x%08x\n", hr); + hr = ITextRange_Copy(range, NULL); + ok_(__FILE__,line)(hr == S_OK, "Copy failed: 0x%08x\n", hr); + + clipboard_open = OpenClipboard(NULL); + ok_(__FILE__,line)(clipboard_open, "OpenClipboard failed: %d\n", GetLastError()); + global = GetClipboardData(CF_TEXT); + ok_(__FILE__,line)(global != NULL, "GetClipboardData failed: %p\n", global); + clipboard_text = GlobalLock(global); + ok_(__FILE__,line)(clipboard_text != NULL, "GlobalLock failed: %p\n", clipboard_text); + todo_wine_if(todo) ok_(__FILE__,line)(!strcmp(expected, clipboard_text), "unexpected contents: %s\n", wine_dbgstr_a(clipboard_text)); + GlobalUnlock(global); + CloseClipboard(); +} + +static void test_clipboard(void) +{ + static const char text_in[] = "ab\n c"; + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + ITextRange *range; + ITextSelection *selection; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)text_in); + + hr = ITextDocument_Range(doc, 0, 0, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CLIPBOARD_RANGE_CONTAINS(range, 0, 5, "ab\r\n c") + CLIPBOARD_RANGE_CONTAINS(range, 0, 0, "ab\r\n c") + CLIPBOARD_RANGE_CONTAINS(range, 1, 1, "ab\r\n c") + CLIPBOARD_RANGE_CONTAINS(range, 0, 1, "a") + CLIPBOARD_RANGE_CONTAINS(range, 5, 6, "") + + /* Setting password char does not stop Copy */ + SendMessageA(hwnd, EM_SETPASSWORDCHAR, '*', 0); + CLIPBOARD_RANGE_CONTAINS(range, 0, 1, "a") + + /* Cut can be undone */ + hr = ITextRange_SetRange(range, 0, 1); + ok(SUCCEEDED(hr), "SetRange failed: 0x%08x\n", hr); + hr = ITextRange_Cut(range, NULL); + ok(hr == S_OK, "Cut failed: 0x%08x\n", hr); + CLIPBOARD_RANGE_CONTAINS(range, 0, 4, "b\r\n c"); + hr = ITextDocument_Undo(doc, 1, NULL); + todo_wine ok(hr == S_OK, "Undo failed: 0x%08x\n", hr); + TODO_CLIPBOARD_RANGE_CONTAINS(range, 0, 5, "ab\r\n c"); + + /* Cannot cut when read-only */ + SendMessageA(hwnd, EM_SETREADONLY, TRUE, 0); + hr = ITextRange_SetRange(range, 0, 1); + ok(SUCCEEDED(hr), "SetRange failed: 0x%08x\n", hr); + hr = ITextRange_Cut(range, NULL); + ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + + release_interfaces(&hwnd, &reole, &doc, NULL); + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -4052,4 +4125,5 @@ START_TEST(richole) test_Expand(); test_MoveEnd_story(); test_character_movement(); + test_clipboard(); } -- 2.23.0

1 0

[PATCH v2 5/6] riched20: Use a run ptr in GetXForArrow().
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4764dec8f33..ffea3ee0c35 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1215,21 +1215,23 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_DisplayItem *pRun = pCursor->pRun; + ME_Run *run = &pCursor->pRun->member.run; int x; if (editor->nUDArrowX != -1) x = editor->nUDArrowX; - else { + else + { if (editor->bCaretAtEnd) { - pRun = ME_FindItemBack(pRun, diRun); - assert(pRun); - x = pRun->member.run.pt.x + pRun->member.run.nWidth; + run = run_prev_all_paras( run ); + assert( run ); + x = run->pt.x + run->nWidth; } - else { - x = pRun->member.run.pt.x; - x += ME_PointFromChar(editor, &pRun->member.run, pCursor->nOffset, TRUE); + else + { + x = run->pt.x; + x += ME_PointFromChar( editor, run, pCursor->nOffset, TRUE ); } editor->nUDArrowX = x; } -- 2.23.0

1 0

[PATCH v2 4/6] riched20: Remove InternalInsertTextFromCursor().
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 110 +++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 61 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d66dd57383b..4764dec8f33 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -460,20 +460,6 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) nChars, FALSE); } -static ME_DisplayItem * -ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style, - int flags) -{ - ME_Cursor *p = &editor->pCursors[nCursor]; - - editor->bCaretAtEnd = FALSE; - - assert(p->pRun->type == diRun); - - return run_get_di( run_insert( editor, p, style, str, len, flags ) ); -} - static struct re_object* create_re_object(const REOBJECT *reo) { struct re_object *reobj = heap_alloc(sizeof(*reobj)); @@ -489,96 +475,98 @@ static struct re_object* create_re_object(const REOBJECT *reo) void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - ME_DisplayItem *di; - WCHAR space = ' '; - ME_DisplayItem *di_prev = NULL; - struct re_object *reobj_prev = NULL; - + ME_Style *style = ME_GetInsertStyle( editor, nCursor ); + ME_Run *run, *prev; + const WCHAR space = ' '; + struct re_object *reobj_prev = NULL; + ME_Cursor *cursor = editor->pCursors + nCursor; + /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_GRAPHICS); - di->member.run.reobj = create_re_object(reo); + run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS ); + editor->bCaretAtEnd = FALSE; + + run->reobj = create_re_object( reo ); - di_prev = di; - while (ME_PrevRun(NULL, &di_prev, TRUE)) + prev = run; + while ((prev = run_prev_all_paras( prev ))) { - if (di_prev->member.run.reobj) + if (prev->reobj) { - reobj_prev = di_prev->member.run.reobj; + reobj_prev = prev->reobj; break; } } if (reobj_prev) - list_add_after(&reobj_prev->entry, &di->member.run.reobj->entry); + list_add_after(&reobj_prev->entry, &run->reobj->entry); else - list_add_head(&editor->reobj_list, &di->member.run.reobj->entry); + list_add_head(&editor->reobj_list, &run->reobj->entry); - ME_ReleaseStyle(pStyle); + ME_ReleaseStyle( style ); } void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - WCHAR space = ' '; + ME_Style *style = ME_GetInsertStyle( editor, nCursor ); + const WCHAR space = ' '; + ME_Cursor *cursor = editor->pCursors + nCursor; /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_ENDROW); - ME_ReleaseStyle(pStyle); + run_insert( editor, cursor, style, &space, 1, MERF_ENDROW ); + editor->bCaretAtEnd = FALSE; + + ME_ReleaseStyle( style ); } void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style) + const WCHAR *str, int len, ME_Style *style) { const WCHAR *pos; - ME_Cursor *p = NULL; + ME_Cursor *cursor = editor->pCursors + nCursor; int oldLen; /* FIXME really HERE ? */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - /* FIXME: is this too slow? */ - /* Didn't affect performance for WM_SETTEXT (around 50sec/30K) */ oldLen = ME_GetTextLength(editor); /* text operations set modified state */ editor->nModifyStep = 1; + editor->bCaretAtEnd = FALSE; assert(style); - assert(nCursor>=0 && nCursor<editor->nCursors); - if (len == -1) - len = lstrlenW(str); + if (len == -1) len = lstrlenW( str ); /* grow the text limit to fit our text */ - if(editor->nTextLimit < oldLen +len) - editor->nTextLimit = oldLen + len; + if (editor->nTextLimit < oldLen + len) editor->nTextLimit = oldLen + len; pos = str; while (len) { /* FIXME this sucks - no respect for unicode (what else can be a line separator in unicode?) */ - while(pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') + while (pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') pos++; - if (pos != str) { /* handle text */ - ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0); - } else if (*pos == '\t') { /* handle tabs */ - WCHAR tab = '\t'; - ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); + if (pos != str) /* handle text */ + run_insert( editor, cursor, style, str, pos - str, 0 ); + else if (*pos == '\t') /* handle tabs */ + { + const WCHAR tab = '\t'; + run_insert( editor, cursor, style, &tab, 1, MERF_TAB ); pos++; - } else { /* handle EOLs */ + } + else /* handle EOLs */ + { ME_Run *end_run, *run, *prev; ME_Paragraph *new_para; int eol_len = 0; @@ -596,7 +584,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, eol_len = 3; else eol_len = 1; - } else { + } + else + { assert(*pos == '\n'); eol_len = 1; } @@ -605,8 +595,8 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, if (!editor->bEmulateVersion10 && eol_len == 3) { /* handle special \r\r\n sequence (richedit 2.x and higher only) */ - WCHAR space = ' '; - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); + const WCHAR space = ' '; + run_insert( editor, cursor, style, &space, 1, 0 ); } else { @@ -618,17 +608,15 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, eol_len = 1; } - p = &editor->pCursors[nCursor]; - - if (p->nOffset == p->pRun->member.run.len) + if (cursor->nOffset == cursor->pRun->member.run.len) { - run = run_next( &p->pRun->member.run ); - if (!run) run = &p->pRun->member.run; + run = run_next( &cursor->pRun->member.run ); + if (!run) run = &cursor->pRun->member.run; } else { - if (p->nOffset) run_split( editor, p ); - run = &p->pRun->member.run; + if (cursor->nOffset) run_split( editor, cursor ); + run = &cursor->pRun->member.run; } new_para = &ME_SplitParagraph( editor, run_get_di( run ), style, eol_str, eol_len, 0 )->member.para; -- 2.23.0

1 0

[PATCH v2 3/6] riched20: Simplify the char offset from run offset function.
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 13 +++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 30441658311..d9bcea84f74 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4322,15 +4322,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } cursor_from_char_ofs( editor, wParam, &cursor ); item = ME_RowStart( cursor.pRun ); - nThisLineOfs = ME_CharOfsFromRunOfs( editor, cursor.pPara, ME_FindItemFwd( item, diRun ), 0 ); + nThisLineOfs = run_char_ofs( &ME_FindItemFwd( item, diRun )->member.run, 0 ); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); if (item_end->type == diStartRow) - nNextLineOfs = ME_CharOfsFromRunOfs(editor, cursor.pPara, ME_FindItemFwd( item_end, diRun ), 0); + nNextLineOfs = run_char_ofs( &ME_FindItemFwd( item_end, diRun )->member.run, 0 ); else { ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); - nNextLineOfs = item_end->member.para.nCharOfs - endRun->member.run.len; + nNextLineOfs = run_char_ofs( &endRun->member.run, 0 ); } nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 163be9c8179..0503a671ea1 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -120,6 +120,7 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; +int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; @@ -140,7 +141,6 @@ ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs) DECLSPEC_HIDDEN; void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 92d0721247c..22a5db8610b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -187,18 +187,15 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) } /****************************************************************************** - * ME_CharOfsFromRunOfs + * run_char_ofs * - * Converts a character position relative to the start of the run, to a + * Converts a character position relative to the start of the run to a * character position relative to the start of the document. - * Kind of a "local to global" offset conversion. */ -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, - const ME_DisplayItem *pRun, int nOfs) + +int run_char_ofs( ME_Run *run, int ofs ) { - assert(pRun && pRun->type == diRun); - assert(pPara && pPara->type == diParagraph); - return pPara->member.para.nCharOfs + pRun->member.run.nCharOfs + nOfs; + return run->para->nCharOfs + run->nCharOfs + ofs; } /****************************************************************************** -- 2.23.0

1 0

[PATCH v2 2/6] riched20: Simplify the cursor from char offset function.
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 4 +- dlls/riched20/editor.c | 47 +++++++++++------------ dlls/riched20/editor.h | 4 +- dlls/riched20/richole.c | 84 ++++++++++++++++++++++------------------- dlls/riched20/run.c | 66 +++++++++++--------------------- dlls/riched20/txtsrv.c | 2 +- dlls/riched20/undo.c | 12 +++--- 7 files changed, 103 insertions(+), 116 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c5fa51894e8..d66dd57383b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -201,7 +201,7 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to) return len; } - ME_CursorFromCharOfs(editor, from, &editor->pCursors[1]); + cursor_from_char_ofs( editor, from, &editor->pCursors[1] ); editor->pCursors[0] = editor->pCursors[1]; ME_MoveCursorChars(editor, &editor->pCursors[0], to - from, FALSE); /* Selection is not allowed in the middle of an end paragraph run. */ @@ -326,7 +326,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, while(nChars > 0) { ME_Run *run; - ME_CursorFromCharOfs(editor, nOfs+nChars, &c); + cursor_from_char_ofs( editor, nOfs + nChars, &c ); if (!c.nOffset && nOfs+nChars == (c.pRun->member.run.nCharOfs + c.pPara->member.para.nCharOfs)) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a144137baa1..30441658311 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1788,7 +1788,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre /* put the cursor at the top */ if (!(format & SFF_SELECTION)) set_selection_cursors(editor, 0, 0); - ME_CursorFromCharOfs(editor, from, &start); + cursor_from_char_ofs( editor, from, &start ); ME_UpdateLinkAttribute(editor, &start, to - from); } @@ -1917,12 +1917,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH /* If possible, find the character before where the search starts */ if ((flags & FR_WHOLEWORD) && nMin) { - ME_CursorFromCharOfs(editor, nMin - 1, &cursor); + cursor_from_char_ofs( editor, nMin - 1, &cursor ); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); ME_MoveCursorChars(editor, &cursor, 1, FALSE); - } else { - ME_CursorFromCharOfs(editor, nMin, &cursor); } + else cursor_from_char_ofs( editor, nMin, &cursor ); while (cursor.pRun && ME_GetCursorOfs(&cursor) + nLen <= nMax) { @@ -1993,12 +1992,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH /* If possible, find the character after where the search ends */ if ((flags & FR_WHOLEWORD) && nMax < nTextLen - 1) { - ME_CursorFromCharOfs(editor, nMax + 1, &cursor); + cursor_from_char_ofs( editor, nMax + 1, &cursor ); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); ME_MoveCursorChars(editor, &cursor, -1, FALSE); - } else { - ME_CursorFromCharOfs(editor, nMax, &cursor); } + else cursor_from_char_ofs( editor, nMax, &cursor ); while (cursor.pRun && ME_GetCursorOfs(&cursor) - nLen >= nMin) { @@ -3009,7 +3007,7 @@ static LONG ME_GetSelectionType(ME_TextEditor *editor) { ME_Cursor cursor; - ME_CursorFromCharOfs(editor, start + i, &cursor); + cursor_from_char_ofs( editor, start + i, &cursor ); if (cursor.pRun->member.run.reobj) object_count++; else @@ -4205,7 +4203,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, nEnd = textlength; if (nStart >= nEnd) return 0; - ME_CursorFromCharOfs(editor, nStart, &start); + cursor_from_char_ofs( editor, nStart, &start ); return ME_GetTextRange(editor, rng->lpstrText, &start, nEnd - nStart, unicode); } case EM_GETLINE: @@ -4313,7 +4311,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { ME_DisplayItem *item, *item_end; int nChars = 0, nThisLineOfs = 0, nNextLineOfs = 0; - ME_DisplayItem *para, *run; + ME_Cursor cursor; if (wParam > ME_GetTextLength(editor)) return 0; @@ -4322,19 +4320,20 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, FIXME("EM_LINELENGTH: returning number of unselected characters on lines with selection unsupported.\n"); return 0; } - ME_RunOfsFromCharOfs(editor, wParam, &para, &run, NULL); - item = ME_RowStart(run); - nThisLineOfs = ME_CharOfsFromRunOfs(editor, para, ME_FindItemFwd(item, diRun), 0); + cursor_from_char_ofs( editor, wParam, &cursor ); + item = ME_RowStart( cursor.pRun ); + nThisLineOfs = ME_CharOfsFromRunOfs( editor, cursor.pPara, ME_FindItemFwd( item, diRun ), 0 ); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); - if (item_end->type == diStartRow) { - nNextLineOfs = ME_CharOfsFromRunOfs(editor, para, ME_FindItemFwd(item_end, diRun), 0); - } else { + if (item_end->type == diStartRow) + nNextLineOfs = ME_CharOfsFromRunOfs(editor, cursor.pPara, ME_FindItemFwd( item_end, diRun ), 0); + else + { ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); nNextLineOfs = item_end->member.para.nCharOfs - endRun->member.run.len; } nChars = nNextLineOfs - nThisLineOfs; - TRACE("EM_LINELENGTH(%ld)==%d\n",wParam, nChars); + TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); return nChars; } case EM_EXLIMITTEXT: @@ -4424,8 +4423,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_POSFROMCHAR: { - ME_DisplayItem *pPara, *pRun; - int nCharOfs, nOffset, nLength; + ME_Cursor cursor; + int nCharOfs, nLength; POINTL pt = {0,0}; nCharOfs = wParam; @@ -4436,11 +4435,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, nCharOfs = min(nCharOfs, nLength); nCharOfs = max(nCharOfs, 0); - ME_RunOfsFromCharOfs(editor, nCharOfs, &pPara, &pRun, &nOffset); - assert(pRun->type == diRun); - pt.y = pRun->member.run.pt.y; - pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset, TRUE); - pt.y += pPara->member.para.pt.y + editor->rcFormat.top; + cursor_from_char_ofs( editor, nCharOfs, &cursor ); + pt.y = cursor.pRun->member.run.pt.y; + pt.x = cursor.pRun->member.run.pt.x + + ME_PointFromChar( editor, &cursor.pRun->member.run, cursor.nOffset, TRUE ); + pt.y += cursor.pPara->member.para.pt.y + editor->rcFormat.top; pt.x += editor->rcFormat.left; pt.x -= editor->horz_si.nPos; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1a9f3fd6fb0..163be9c8179 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -118,6 +118,8 @@ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_H int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ +void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; + ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; @@ -138,8 +140,6 @@ ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor) DECLSPEC_HIDDEN; -void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem **ppPara, ME_DisplayItem **ppRun, int *pOfs) DECLSPEC_HIDDEN; int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs) DECLSPEC_HIDDEN; void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 47d8442d5ce..923984e96b1 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -444,7 +444,7 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, fmt.cbSize = sizeof(fmt); fmt.dwMask = textfont_prop_masks[propid][0]; - ME_CursorFromCharOfs(reole->editor, pos, &from); + cursor_from_char_ofs( reole->editor, pos, &from ); to = from; ME_MoveCursorChars(reole->editor, &to, 1, FALSE); ME_GetCharFormat(reole->editor, &from, &to, &fmt); @@ -662,7 +662,8 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) fmt.wWeight = value; } - if (fmt.dwMask) { + if (fmt.dwMask) + { const IRichEditOleImpl *reole = get_range_reole(range); ME_Cursor from, to; LONG start, end; @@ -670,8 +671,8 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) ITextRange_GetStart(range, &start); ITextRange_GetEnd(range, &end); - ME_CursorFromCharOfs(reole->editor, start, &from); - ME_CursorFromCharOfs(reole->editor, end, &to); + cursor_from_char_ofs( reole->editor, start, &from ); + cursor_from_char_ofs( reole->editor, end, &to ); ME_SetCharFormat(reole->editor, &from, &to, &fmt); } } @@ -828,8 +829,8 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop ITextRange_GetStart(font->range, &start); ITextRange_GetEnd(font->range, &end); - ME_CursorFromCharOfs(reole->editor, start, &from); - ME_CursorFromCharOfs(reole->editor, end, &to); + cursor_from_char_ofs( reole->editor, start, &from ); + cursor_from_char_ofs( reole->editor, end, &to ); ME_SetCharFormat(reole->editor, &from, &to, &fmt); return S_OK; @@ -1349,12 +1350,15 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *me, CHARRANGE *lpchrg, TRACE("(%p,%p,%d)\n",This, lpchrg, reco); if(!lplpdataobj) return E_INVALIDARG; - if(!lpchrg) { + if(!lpchrg) + { int nFrom, nTo, nStartCur = ME_GetSelectionOfs(This->editor, &nFrom, &nTo); start = This->editor->pCursors[nStartCur]; nChars = nTo - nFrom; - } else { - ME_CursorFromCharOfs(This->editor, lpchrg->cpMin, &start); + } + else + { + cursor_from_char_ofs( This->editor, lpchrg->cpMin, &start ); nChars = lpchrg->cpMax - lpchrg->cpMin; } return ME_GetDataObject(This->editor, &start, nChars, lplpdataobj); @@ -1385,7 +1389,7 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, ME_Cursor cursor; TRACE("character offset: %d\n", lpreobject->cp); - ME_CursorFromCharOfs(This->editor, lpreobject->cp, &cursor); + cursor_from_char_ofs( This->editor, lpreobject->cp, &cursor ); if (!cursor.pRun->member.run.reobj) return E_INVALIDARG; else @@ -1647,8 +1651,8 @@ static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *str) } editor = This->child.reole->editor; - ME_CursorFromCharOfs(editor, This->start, &start); - ME_CursorFromCharOfs(editor, This->end, &end); + cursor_from_char_ofs( editor, This->start, &start ); + cursor_from_char_ofs( editor, This->end, &end ); length = This->end - This->start; *str = SysAllocStringLen(NULL, length); @@ -1676,12 +1680,14 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) editor = This->child.reole->editor; /* delete only where's something to delete */ - if (This->start != This->end) { - ME_CursorFromCharOfs(editor, This->start, &cursor); + if (This->start != This->end) + { + cursor_from_char_ofs( editor, This->start, &cursor ); ME_InternalDeleteText(editor, &cursor, This->end - This->start, FALSE); } - if (!str || !*str) { + if (!str || !*str) + { /* will update this range as well */ textranges_update_ranges(This->child.reole, This->start, This->end, RANGE_UPDATE_DELETE); return S_OK; @@ -1690,7 +1696,7 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) /* it's safer not to rely on stored BSTR length */ len = lstrlenW(str); cursor = editor->pCursors[0]; - ME_CursorFromCharOfs(editor, This->start, &editor->pCursors[0]); + cursor_from_char_ofs( editor, This->start, &editor->pCursors[0] ); style = ME_GetInsertStyle(editor, 0); ME_InsertTextFromCursor(editor, 0, str, len, style); ME_ReleaseStyle(style); @@ -1729,7 +1735,7 @@ static HRESULT WINAPI ITextRange_fnGetChar(ITextRange *me, LONG *pch) return E_INVALIDARG; editor = This->child.reole->editor; - ME_CursorFromCharOfs(editor, This->start, &cursor); + cursor_from_char_ofs( editor, This->start, &cursor ); return range_GetChar(editor, &cursor, pch); } @@ -2213,18 +2219,16 @@ static HRESULT textrange_endof(ITextRange *range, ME_TextEditor *editor, LONG un { moved = 0; new_end = old_end; - if (old_end == 0) { + if (old_end == 0) + { ME_Cursor cursor; - ME_CursorFromCharOfs(editor, old_end, &cursor); + cursor_from_char_ofs( editor, old_end, &cursor ); moved = ME_MoveCursorChars(editor, &cursor, 1, TRUE); new_end = old_end + moved; - } else { - if (extend == tomMove) { - if (old_start != old_end) { - moved = 1; - } - } } + else if (extend == tomMove && old_start != old_end) + moved = 1; + ITextRange_SetEnd(range, new_end); if (extend == tomMove) ITextRange_SetStart(range, new_end); @@ -2275,32 +2279,36 @@ static HRESULT textrange_move(ITextRange *range, ME_TextEditor *editor, LONG uni { ME_Cursor cursor; - if (count > 0) { - ME_CursorFromCharOfs(editor, old_end, &cursor); + if (count > 0) + { + cursor_from_char_ofs( editor, old_end, &cursor ); move_by = count; if (old_start != old_end) --move_by; - } else { - ME_CursorFromCharOfs(editor, old_start, &cursor); + } + else + { + cursor_from_char_ofs( editor, old_start, &cursor ); move_by = count; if (old_start != old_end) ++move_by; } moved = ME_MoveCursorChars(editor, &cursor, move_by, FALSE); - if (count > 0) { + if (count > 0) + { new_end = old_end + moved; new_start = new_end; if (old_start != old_end) ++moved; - } else { + } + else + { new_start = old_start + moved; new_end = new_start; if (old_start != old_end) --moved; } - if (delta) { - *delta = moved; - } + if (delta) *delta = moved; break; } default: @@ -2348,7 +2356,7 @@ static HRESULT textrange_movestart(ITextRange *range, ME_TextEditor *editor, LON ME_Cursor cursor; LONG moved; - ME_CursorFromCharOfs(editor, old_start, &cursor); + cursor_from_char_ofs( editor, old_start, &cursor ); moved = ME_MoveCursorChars(editor, &cursor, count, FALSE); new_start = old_start + moved; new_end = old_end; @@ -2404,7 +2412,7 @@ static HRESULT textrange_moveend(ITextRange *range, ME_TextEditor *editor, LONG ME_Cursor cursor; LONG moved; - ME_CursorFromCharOfs(editor, old_end, &cursor); + cursor_from_char_ofs( editor, old_end, &cursor ); moved = ME_MoveCursorChars(editor, &cursor, count, TRUE); new_start = old_start; new_end = old_end + moved; @@ -2700,11 +2708,11 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) switch (value) { case tomStart: - ME_CursorFromCharOfs(editor, This->start, &cursor); + cursor_from_char_ofs( editor, This->start, &cursor ); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; case tomEnd: - ME_CursorFromCharOfs(editor, This->end, &cursor); + cursor_from_char_ofs( editor, This->end, &cursor ); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; default: diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 75195e343ed..92d0721247c 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -202,58 +202,38 @@ int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, } /****************************************************************************** - * ME_CursorFromCharOfs + * cursor_from_char_ofs * * Converts a character offset (relative to the start of the document) to * a cursor structure (which contains a run and a position relative to that * run). */ -void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor) +void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) { - ME_RunOfsFromCharOfs(editor, nCharOfs, &pCursor->pPara, - &pCursor->pRun, &pCursor->nOffset); -} + ME_Paragraph *para; + ME_Run *run; -/****************************************************************************** - * ME_RunOfsFromCharOfs - * - * Find a run and relative character offset given an absolute character offset - * (absolute offset being an offset relative to the start of the document). - * Kind of a "global to local" offset conversion. - */ -void ME_RunOfsFromCharOfs(ME_TextEditor *editor, - int nCharOfs, - ME_DisplayItem **ppPara, - ME_DisplayItem **ppRun, - int *pOfs) -{ - ME_DisplayItem *item, *next_item; + char_ofs = min( max( char_ofs, 0 ), ME_GetTextLength( editor ) ); - nCharOfs = max(nCharOfs, 0); - nCharOfs = min(nCharOfs, ME_GetTextLength(editor)); + /* Find the paragraph at the offset. */ + for (para = editor_first_para( editor ); + para_next( para )->nCharOfs <= char_ofs; + para = para_next( para )) + ; - /* Find the paragraph at the offset. */ - next_item = editor->pBuffer->pFirst->member.para.next_para; - do { - item = next_item; - next_item = item->member.para.next_para; - } while (next_item->member.para.nCharOfs <= nCharOfs); - assert(item->type == diParagraph); - nCharOfs -= item->member.para.nCharOfs; - if (ppPara) *ppPara = item; - - /* Find the run at the offset. */ - next_item = ME_FindItemFwd(item, diRun); - do { - item = next_item; - next_item = ME_FindItemFwd(item, diRunOrParagraphOrEnd); - } while (next_item->type == diRun && - next_item->member.run.nCharOfs <= nCharOfs); - assert(item->type == diRun); - nCharOfs -= item->member.run.nCharOfs; - - if (ppRun) *ppRun = item; - if (pOfs) *pOfs = nCharOfs; + char_ofs -= para->nCharOfs; + + /* Find the run at the offset. */ + for (run = para_first_run( para ); + run_next( run ) && run_next( run )->nCharOfs <= char_ofs; + run = run_next( run )) + ; + + char_ofs -= run->nCharOfs; + + cursor->pPara = para_get_di( para ); + cursor->pRun = run_get_di( run ); + cursor->nOffset = char_ofs; } /****************************************************************************** diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 622d8519285..3fd4ae540c5 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -269,7 +269,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetText(ITextServices *iface, BST if (bstr == NULL) return E_OUTOFMEMORY; - ME_CursorFromCharOfs(This->editor, 0, &start); + cursor_from_char_ofs( This->editor, 0, &start ); ME_GetTextW(This->editor, bstr, length, &start, INT_MAX, FALSE, FALSE); *pbstrText = bstr; } else { diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 1f5c7ae4cd6..3f3fd48bebd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -336,7 +336,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) { ME_Cursor tmp; ME_DisplayItem *para; - ME_CursorFromCharOfs(editor, undo->u.set_para_fmt.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.set_para_fmt.pos, &tmp ); para = ME_FindItemBack(tmp.pRun, diParagraph); add_undo_set_para_fmt( editor, &para->member.para ); para->member.para.fmt = undo->u.set_para_fmt.fmt; @@ -347,7 +347,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_set_char_fmt: { ME_Cursor start, end; - ME_CursorFromCharOfs(editor, undo->u.set_char_fmt.pos, &start); + cursor_from_char_ofs( editor, undo->u.set_char_fmt.pos, &start ); end = start; ME_MoveCursorChars(editor, &end, undo->u.set_char_fmt.len, FALSE); ME_SetCharFormat(editor, &start, &end, &undo->u.set_char_fmt.fmt); @@ -356,7 +356,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_insert_run: { ME_Cursor tmp; - ME_CursorFromCharOfs(editor, undo->u.insert_run.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.insert_run.pos, &tmp ); run_insert( editor, &tmp, undo->u.insert_run.style, undo->u.insert_run.str, undo->u.insert_run.len, undo->u.insert_run.flags ); @@ -365,14 +365,14 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_delete_run: { ME_Cursor tmp; - ME_CursorFromCharOfs(editor, undo->u.delete_run.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.delete_run.pos, &tmp ); ME_InternalDeleteText(editor, &tmp, undo->u.delete_run.len, TRUE); break; } case undo_join_paras: { ME_Cursor tmp; - ME_CursorFromCharOfs(editor, undo->u.join_paras.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.join_paras.pos, &tmp ); ME_JoinParagraphs(editor, tmp.pPara, TRUE); break; } @@ -383,7 +383,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) BOOL bFixRowStart; int paraFlags = undo->u.split_para.flags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND); - ME_CursorFromCharOfs(editor, undo->u.split_para.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.split_para.pos, &tmp ); if (tmp.nOffset) run_split( editor, &tmp ); this_para = tmp.pPara; bFixRowStart = this_para->member.para.nFlags & MEPF_ROWSTART; -- 2.23.0

1 0

[PATCH v2 1/6] riched20: Use run ptrs in GetCharFormat().
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/run.c | 67 +++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index a5888960f38..75195e343ed 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -816,9 +816,9 @@ void ME_SetCharFormat( ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, } } -static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHARFORMAT2W *pFmt) +static void run_copy_char_fmt( ME_Run *run, CHARFORMAT2W *fmt ) { - ME_CopyCharFormat(pFmt, &run->member.run.style->fmt); + ME_CopyCharFormat( fmt, &run->style->fmt ); } /****************************************************************************** @@ -856,33 +856,25 @@ void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * Returns the style consisting of those attributes which are consistently set * in the whole character range. */ -void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, - const ME_Cursor *to, CHARFORMAT2W *pFmt) +void ME_GetCharFormat( ME_TextEditor *editor, const ME_Cursor *from, + const ME_Cursor *to, CHARFORMAT2W *fmt ) { - ME_DisplayItem *run, *run_end; + ME_Run *run, *run_end, *prev_run; CHARFORMAT2W tmp; - run = from->pRun; + run = &from->pRun->member.run; /* special case - if selection is empty, take previous char's formatting */ if (from->pRun == to->pRun && from->nOffset == to->nOffset) { - if (!from->nOffset) - { - ME_DisplayItem *tmp_run = ME_FindItemBack(run, diRunOrParagraph); - if (tmp_run->type == diRun) { - ME_GetRunCharFormat(editor, tmp_run, pFmt); - return; - } - } - ME_GetRunCharFormat(editor, run, pFmt); + if (!from->nOffset && (prev_run = run_prev( run ))) run = prev_run; + run_copy_char_fmt( run, fmt ); return; } - run_end = to->pRun; - if (!to->nOffset) - run_end = ME_FindItemBack(run_end, diRun); + run_end = &to->pRun->member.run; + if (!to->nOffset) run_end = run_prev_all_paras( run_end ); - ME_GetRunCharFormat(editor, run, pFmt); + run_copy_char_fmt( run, fmt ); if (run == run_end) return; @@ -891,40 +883,37 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, DWORD dwAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; DWORD dwEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT; - run = ME_FindItemFwd(run, diRun); + run = run_next_all_paras( run ); - ZeroMemory(&tmp, sizeof(tmp)); + memset( &tmp, 0, sizeof(tmp) ); tmp.cbSize = sizeof(tmp); - ME_GetRunCharFormat(editor, run, &tmp); + run_copy_char_fmt( run, &tmp ); assert((tmp.dwMask & dwAttribs) == dwAttribs); /* reset flags that differ */ - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->dwMask & CFM_FACE) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->dwMask & CFM_FACE) { if (!(tmp.dwMask & CFM_FACE)) - pFmt->dwMask &= ~CFM_FACE; - else if (wcscmp(pFmt->szFaceName, tmp.szFaceName) || - pFmt->bPitchAndFamily != tmp.bPitchAndFamily) - pFmt->dwMask &= ~CFM_FACE; + fmt->dwMask &= ~CFM_FACE; + else if (wcscmp( fmt->szFaceName, tmp.szFaceName ) || + fmt->bPitchAndFamily != tmp.bPitchAndFamily) + fmt->dwMask &= ~CFM_FACE; } - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->bUnderlineType != tmp.bUnderlineType) - pFmt->dwMask &= ~CFM_UNDERLINETYPE; - if (pFmt->dwMask & CFM_COLOR) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->bUnderlineType != tmp.bUnderlineType) fmt->dwMask &= ~CFM_UNDERLINETYPE; + if (fmt->dwMask & CFM_COLOR) { - if (!((pFmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) + if (!((fmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) { - if (pFmt->crTextColor != tmp.crTextColor) - pFmt->dwMask &= ~CFM_COLOR; + if (fmt->crTextColor != tmp.crTextColor) + fmt->dwMask &= ~CFM_COLOR; } } - pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & dwEffects); - pFmt->dwEffects = tmp.dwEffects; + fmt->dwMask &= ~((fmt->dwEffects ^ tmp.dwEffects) & dwEffects); + fmt->dwEffects = tmp.dwEffects; } while(run != run_end); } -- 2.23.0

1 0

[PATCH 5/6] riched20: Use a run ptr in GetXForArrow().
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4764dec8f33..ffea3ee0c35 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1215,21 +1215,23 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_DisplayItem *pRun = pCursor->pRun; + ME_Run *run = &pCursor->pRun->member.run; int x; if (editor->nUDArrowX != -1) x = editor->nUDArrowX; - else { + else + { if (editor->bCaretAtEnd) { - pRun = ME_FindItemBack(pRun, diRun); - assert(pRun); - x = pRun->member.run.pt.x + pRun->member.run.nWidth; + run = run_prev_all_paras( run ); + assert( run ); + x = run->pt.x + run->nWidth; } - else { - x = pRun->member.run.pt.x; - x += ME_PointFromChar(editor, &pRun->member.run, pCursor->nOffset, TRUE); + else + { + x = run->pt.x; + x += ME_PointFromChar( editor, run, pCursor->nOffset, TRUE ); } editor->nUDArrowX = x; } -- 2.23.0

1 0

[PATCH 4/6] riched20: Remove InternalInsertTextFromCursor().
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 110 +++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 61 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d66dd57383b..4764dec8f33 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -460,20 +460,6 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) nChars, FALSE); } -static ME_DisplayItem * -ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style, - int flags) -{ - ME_Cursor *p = &editor->pCursors[nCursor]; - - editor->bCaretAtEnd = FALSE; - - assert(p->pRun->type == diRun); - - return run_get_di( run_insert( editor, p, style, str, len, flags ) ); -} - static struct re_object* create_re_object(const REOBJECT *reo) { struct re_object *reobj = heap_alloc(sizeof(*reobj)); @@ -489,96 +475,98 @@ static struct re_object* create_re_object(const REOBJECT *reo) void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - ME_DisplayItem *di; - WCHAR space = ' '; - ME_DisplayItem *di_prev = NULL; - struct re_object *reobj_prev = NULL; - + ME_Style *style = ME_GetInsertStyle( editor, nCursor ); + ME_Run *run, *prev; + const WCHAR space = ' '; + struct re_object *reobj_prev = NULL; + ME_Cursor *cursor = editor->pCursors + nCursor; + /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_GRAPHICS); - di->member.run.reobj = create_re_object(reo); + run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS ); + editor->bCaretAtEnd = FALSE; + + run->reobj = create_re_object( reo ); - di_prev = di; - while (ME_PrevRun(NULL, &di_prev, TRUE)) + prev = run; + while ((prev = run_prev_all_paras( prev ))) { - if (di_prev->member.run.reobj) + if (prev->reobj) { - reobj_prev = di_prev->member.run.reobj; + reobj_prev = prev->reobj; break; } } if (reobj_prev) - list_add_after(&reobj_prev->entry, &di->member.run.reobj->entry); + list_add_after(&reobj_prev->entry, &run->reobj->entry); else - list_add_head(&editor->reobj_list, &di->member.run.reobj->entry); + list_add_head(&editor->reobj_list, &run->reobj->entry); - ME_ReleaseStyle(pStyle); + ME_ReleaseStyle( style ); } void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - WCHAR space = ' '; + ME_Style *style = ME_GetInsertStyle( editor, nCursor ); + const WCHAR space = ' '; + ME_Cursor *cursor = editor->pCursors + nCursor; /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_ENDROW); - ME_ReleaseStyle(pStyle); + run_insert( editor, cursor, style, &space, 1, MERF_ENDROW ); + editor->bCaretAtEnd = FALSE; + + ME_ReleaseStyle( style ); } void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style) + const WCHAR *str, int len, ME_Style *style) { const WCHAR *pos; - ME_Cursor *p = NULL; + ME_Cursor *cursor = editor->pCursors + nCursor; int oldLen; /* FIXME really HERE ? */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - /* FIXME: is this too slow? */ - /* Didn't affect performance for WM_SETTEXT (around 50sec/30K) */ oldLen = ME_GetTextLength(editor); /* text operations set modified state */ editor->nModifyStep = 1; + editor->bCaretAtEnd = FALSE; assert(style); - assert(nCursor>=0 && nCursor<editor->nCursors); - if (len == -1) - len = lstrlenW(str); + if (len == -1) len = lstrlenW( str ); /* grow the text limit to fit our text */ - if(editor->nTextLimit < oldLen +len) - editor->nTextLimit = oldLen + len; + if (editor->nTextLimit < oldLen + len) editor->nTextLimit = oldLen + len; pos = str; while (len) { /* FIXME this sucks - no respect for unicode (what else can be a line separator in unicode?) */ - while(pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') + while (pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') pos++; - if (pos != str) { /* handle text */ - ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0); - } else if (*pos == '\t') { /* handle tabs */ - WCHAR tab = '\t'; - ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); + if (pos != str) /* handle text */ + run_insert( editor, cursor, style, str, pos - str, 0 ); + else if (*pos == '\t') /* handle tabs */ + { + const WCHAR tab = '\t'; + run_insert( editor, cursor, style, &tab, 1, MERF_TAB ); pos++; - } else { /* handle EOLs */ + } + else /* handle EOLs */ + { ME_Run *end_run, *run, *prev; ME_Paragraph *new_para; int eol_len = 0; @@ -596,7 +584,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, eol_len = 3; else eol_len = 1; - } else { + } + else + { assert(*pos == '\n'); eol_len = 1; } @@ -605,8 +595,8 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, if (!editor->bEmulateVersion10 && eol_len == 3) { /* handle special \r\r\n sequence (richedit 2.x and higher only) */ - WCHAR space = ' '; - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); + const WCHAR space = ' '; + run_insert( editor, cursor, style, &space, 1, 0 ); } else { @@ -618,17 +608,15 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, eol_len = 1; } - p = &editor->pCursors[nCursor]; - - if (p->nOffset == p->pRun->member.run.len) + if (cursor->nOffset == cursor->pRun->member.run.len) { - run = run_next( &p->pRun->member.run ); - if (!run) run = &p->pRun->member.run; + run = run_next( &cursor->pRun->member.run ); + if (!run) run = &cursor->pRun->member.run; } else { - if (p->nOffset) run_split( editor, p ); - run = &p->pRun->member.run; + if (cursor->nOffset) run_split( editor, cursor ); + run = &cursor->pRun->member.run; } new_para = &ME_SplitParagraph( editor, run_get_di( run ), style, eol_str, eol_len, 0 )->member.para; -- 2.23.0

1 0

[PATCH 3/6] riched20: Simplify the char offset from run offset function.
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 13 +++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 30441658311..d9bcea84f74 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4322,15 +4322,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } cursor_from_char_ofs( editor, wParam, &cursor ); item = ME_RowStart( cursor.pRun ); - nThisLineOfs = ME_CharOfsFromRunOfs( editor, cursor.pPara, ME_FindItemFwd( item, diRun ), 0 ); + nThisLineOfs = run_char_ofs( &ME_FindItemFwd( item, diRun )->member.run, 0 ); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); if (item_end->type == diStartRow) - nNextLineOfs = ME_CharOfsFromRunOfs(editor, cursor.pPara, ME_FindItemFwd( item_end, diRun ), 0); + nNextLineOfs = run_char_ofs( &ME_FindItemFwd( item_end, diRun )->member.run, 0 ); else { ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); - nNextLineOfs = item_end->member.para.nCharOfs - endRun->member.run.len; + nNextLineOfs = run_char_ofs( &endRun->member.run, 0 ); } nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 163be9c8179..0503a671ea1 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -120,6 +120,7 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; +int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; @@ -140,7 +141,6 @@ ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs) DECLSPEC_HIDDEN; void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 92d0721247c..22a5db8610b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -187,18 +187,15 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) } /****************************************************************************** - * ME_CharOfsFromRunOfs + * run_char_ofs * - * Converts a character position relative to the start of the run, to a + * Converts a character position relative to the start of the run to a * character position relative to the start of the document. - * Kind of a "local to global" offset conversion. */ -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, - const ME_DisplayItem *pRun, int nOfs) + +int run_char_ofs( ME_Run *run, int ofs ) { - assert(pRun && pRun->type == diRun); - assert(pPara && pPara->type == diParagraph); - return pPara->member.para.nCharOfs + pRun->member.run.nCharOfs + nOfs; + return run->para->nCharOfs + run->nCharOfs + ofs; } /****************************************************************************** -- 2.23.0

1 0

[PATCH 2/6] riched20: Simplify the cursor from char offset function.
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 4 +- dlls/riched20/editor.c | 47 +++++++++++------------ dlls/riched20/editor.h | 4 +- dlls/riched20/richole.c | 84 ++++++++++++++++++++++------------------- dlls/riched20/run.c | 66 +++++++++++--------------------- dlls/riched20/txtsrv.c | 2 +- dlls/riched20/undo.c | 12 +++--- 7 files changed, 103 insertions(+), 116 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c5fa51894e8..d66dd57383b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -201,7 +201,7 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to) return len; } - ME_CursorFromCharOfs(editor, from, &editor->pCursors[1]); + cursor_from_char_ofs( editor, from, &editor->pCursors[1] ); editor->pCursors[0] = editor->pCursors[1]; ME_MoveCursorChars(editor, &editor->pCursors[0], to - from, FALSE); /* Selection is not allowed in the middle of an end paragraph run. */ @@ -326,7 +326,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, while(nChars > 0) { ME_Run *run; - ME_CursorFromCharOfs(editor, nOfs+nChars, &c); + cursor_from_char_ofs( editor, nOfs + nChars, &c ); if (!c.nOffset && nOfs+nChars == (c.pRun->member.run.nCharOfs + c.pPara->member.para.nCharOfs)) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a144137baa1..30441658311 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1788,7 +1788,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre /* put the cursor at the top */ if (!(format & SFF_SELECTION)) set_selection_cursors(editor, 0, 0); - ME_CursorFromCharOfs(editor, from, &start); + cursor_from_char_ofs( editor, from, &start ); ME_UpdateLinkAttribute(editor, &start, to - from); } @@ -1917,12 +1917,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH /* If possible, find the character before where the search starts */ if ((flags & FR_WHOLEWORD) && nMin) { - ME_CursorFromCharOfs(editor, nMin - 1, &cursor); + cursor_from_char_ofs( editor, nMin - 1, &cursor ); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); ME_MoveCursorChars(editor, &cursor, 1, FALSE); - } else { - ME_CursorFromCharOfs(editor, nMin, &cursor); } + else cursor_from_char_ofs( editor, nMin, &cursor ); while (cursor.pRun && ME_GetCursorOfs(&cursor) + nLen <= nMax) { @@ -1993,12 +1992,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH /* If possible, find the character after where the search ends */ if ((flags & FR_WHOLEWORD) && nMax < nTextLen - 1) { - ME_CursorFromCharOfs(editor, nMax + 1, &cursor); + cursor_from_char_ofs( editor, nMax + 1, &cursor ); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); ME_MoveCursorChars(editor, &cursor, -1, FALSE); - } else { - ME_CursorFromCharOfs(editor, nMax, &cursor); } + else cursor_from_char_ofs( editor, nMax, &cursor ); while (cursor.pRun && ME_GetCursorOfs(&cursor) - nLen >= nMin) { @@ -3009,7 +3007,7 @@ static LONG ME_GetSelectionType(ME_TextEditor *editor) { ME_Cursor cursor; - ME_CursorFromCharOfs(editor, start + i, &cursor); + cursor_from_char_ofs( editor, start + i, &cursor ); if (cursor.pRun->member.run.reobj) object_count++; else @@ -4205,7 +4203,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, nEnd = textlength; if (nStart >= nEnd) return 0; - ME_CursorFromCharOfs(editor, nStart, &start); + cursor_from_char_ofs( editor, nStart, &start ); return ME_GetTextRange(editor, rng->lpstrText, &start, nEnd - nStart, unicode); } case EM_GETLINE: @@ -4313,7 +4311,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { ME_DisplayItem *item, *item_end; int nChars = 0, nThisLineOfs = 0, nNextLineOfs = 0; - ME_DisplayItem *para, *run; + ME_Cursor cursor; if (wParam > ME_GetTextLength(editor)) return 0; @@ -4322,19 +4320,20 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, FIXME("EM_LINELENGTH: returning number of unselected characters on lines with selection unsupported.\n"); return 0; } - ME_RunOfsFromCharOfs(editor, wParam, &para, &run, NULL); - item = ME_RowStart(run); - nThisLineOfs = ME_CharOfsFromRunOfs(editor, para, ME_FindItemFwd(item, diRun), 0); + cursor_from_char_ofs( editor, wParam, &cursor ); + item = ME_RowStart( cursor.pRun ); + nThisLineOfs = ME_CharOfsFromRunOfs( editor, cursor.pPara, ME_FindItemFwd( item, diRun ), 0 ); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); - if (item_end->type == diStartRow) { - nNextLineOfs = ME_CharOfsFromRunOfs(editor, para, ME_FindItemFwd(item_end, diRun), 0); - } else { + if (item_end->type == diStartRow) + nNextLineOfs = ME_CharOfsFromRunOfs(editor, cursor.pPara, ME_FindItemFwd( item_end, diRun ), 0); + else + { ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); nNextLineOfs = item_end->member.para.nCharOfs - endRun->member.run.len; } nChars = nNextLineOfs - nThisLineOfs; - TRACE("EM_LINELENGTH(%ld)==%d\n",wParam, nChars); + TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); return nChars; } case EM_EXLIMITTEXT: @@ -4424,8 +4423,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_POSFROMCHAR: { - ME_DisplayItem *pPara, *pRun; - int nCharOfs, nOffset, nLength; + ME_Cursor cursor; + int nCharOfs, nLength; POINTL pt = {0,0}; nCharOfs = wParam; @@ -4436,11 +4435,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, nCharOfs = min(nCharOfs, nLength); nCharOfs = max(nCharOfs, 0); - ME_RunOfsFromCharOfs(editor, nCharOfs, &pPara, &pRun, &nOffset); - assert(pRun->type == diRun); - pt.y = pRun->member.run.pt.y; - pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset, TRUE); - pt.y += pPara->member.para.pt.y + editor->rcFormat.top; + cursor_from_char_ofs( editor, nCharOfs, &cursor ); + pt.y = cursor.pRun->member.run.pt.y; + pt.x = cursor.pRun->member.run.pt.x + + ME_PointFromChar( editor, &cursor.pRun->member.run, cursor.nOffset, TRUE ); + pt.y += cursor.pPara->member.para.pt.y + editor->rcFormat.top; pt.x += editor->rcFormat.left; pt.x -= editor->horz_si.nPos; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1a9f3fd6fb0..163be9c8179 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -118,6 +118,8 @@ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_H int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ +void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; + ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; @@ -138,8 +140,6 @@ ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor) DECLSPEC_HIDDEN; -void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem **ppPara, ME_DisplayItem **ppRun, int *pOfs) DECLSPEC_HIDDEN; int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs) DECLSPEC_HIDDEN; void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 47d8442d5ce..923984e96b1 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -444,7 +444,7 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, fmt.cbSize = sizeof(fmt); fmt.dwMask = textfont_prop_masks[propid][0]; - ME_CursorFromCharOfs(reole->editor, pos, &from); + cursor_from_char_ofs( reole->editor, pos, &from ); to = from; ME_MoveCursorChars(reole->editor, &to, 1, FALSE); ME_GetCharFormat(reole->editor, &from, &to, &fmt); @@ -662,7 +662,8 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) fmt.wWeight = value; } - if (fmt.dwMask) { + if (fmt.dwMask) + { const IRichEditOleImpl *reole = get_range_reole(range); ME_Cursor from, to; LONG start, end; @@ -670,8 +671,8 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) ITextRange_GetStart(range, &start); ITextRange_GetEnd(range, &end); - ME_CursorFromCharOfs(reole->editor, start, &from); - ME_CursorFromCharOfs(reole->editor, end, &to); + cursor_from_char_ofs( reole->editor, start, &from ); + cursor_from_char_ofs( reole->editor, end, &to ); ME_SetCharFormat(reole->editor, &from, &to, &fmt); } } @@ -828,8 +829,8 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop ITextRange_GetStart(font->range, &start); ITextRange_GetEnd(font->range, &end); - ME_CursorFromCharOfs(reole->editor, start, &from); - ME_CursorFromCharOfs(reole->editor, end, &to); + cursor_from_char_ofs( reole->editor, start, &from ); + cursor_from_char_ofs( reole->editor, end, &to ); ME_SetCharFormat(reole->editor, &from, &to, &fmt); return S_OK; @@ -1349,12 +1350,15 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *me, CHARRANGE *lpchrg, TRACE("(%p,%p,%d)\n",This, lpchrg, reco); if(!lplpdataobj) return E_INVALIDARG; - if(!lpchrg) { + if(!lpchrg) + { int nFrom, nTo, nStartCur = ME_GetSelectionOfs(This->editor, &nFrom, &nTo); start = This->editor->pCursors[nStartCur]; nChars = nTo - nFrom; - } else { - ME_CursorFromCharOfs(This->editor, lpchrg->cpMin, &start); + } + else + { + cursor_from_char_ofs( This->editor, lpchrg->cpMin, &start ); nChars = lpchrg->cpMax - lpchrg->cpMin; } return ME_GetDataObject(This->editor, &start, nChars, lplpdataobj); @@ -1385,7 +1389,7 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, ME_Cursor cursor; TRACE("character offset: %d\n", lpreobject->cp); - ME_CursorFromCharOfs(This->editor, lpreobject->cp, &cursor); + cursor_from_char_ofs( This->editor, lpreobject->cp, &cursor ); if (!cursor.pRun->member.run.reobj) return E_INVALIDARG; else @@ -1647,8 +1651,8 @@ static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *str) } editor = This->child.reole->editor; - ME_CursorFromCharOfs(editor, This->start, &start); - ME_CursorFromCharOfs(editor, This->end, &end); + cursor_from_char_ofs( editor, This->start, &start ); + cursor_from_char_ofs( editor, This->end, &end ); length = This->end - This->start; *str = SysAllocStringLen(NULL, length); @@ -1676,12 +1680,14 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) editor = This->child.reole->editor; /* delete only where's something to delete */ - if (This->start != This->end) { - ME_CursorFromCharOfs(editor, This->start, &cursor); + if (This->start != This->end) + { + cursor_from_char_ofs( editor, This->start, &cursor ); ME_InternalDeleteText(editor, &cursor, This->end - This->start, FALSE); } - if (!str || !*str) { + if (!str || !*str) + { /* will update this range as well */ textranges_update_ranges(This->child.reole, This->start, This->end, RANGE_UPDATE_DELETE); return S_OK; @@ -1690,7 +1696,7 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) /* it's safer not to rely on stored BSTR length */ len = lstrlenW(str); cursor = editor->pCursors[0]; - ME_CursorFromCharOfs(editor, This->start, &editor->pCursors[0]); + cursor_from_char_ofs( editor, This->start, &editor->pCursors[0] ); style = ME_GetInsertStyle(editor, 0); ME_InsertTextFromCursor(editor, 0, str, len, style); ME_ReleaseStyle(style); @@ -1729,7 +1735,7 @@ static HRESULT WINAPI ITextRange_fnGetChar(ITextRange *me, LONG *pch) return E_INVALIDARG; editor = This->child.reole->editor; - ME_CursorFromCharOfs(editor, This->start, &cursor); + cursor_from_char_ofs( editor, This->start, &cursor ); return range_GetChar(editor, &cursor, pch); } @@ -2213,18 +2219,16 @@ static HRESULT textrange_endof(ITextRange *range, ME_TextEditor *editor, LONG un { moved = 0; new_end = old_end; - if (old_end == 0) { + if (old_end == 0) + { ME_Cursor cursor; - ME_CursorFromCharOfs(editor, old_end, &cursor); + cursor_from_char_ofs( editor, old_end, &cursor ); moved = ME_MoveCursorChars(editor, &cursor, 1, TRUE); new_end = old_end + moved; - } else { - if (extend == tomMove) { - if (old_start != old_end) { - moved = 1; - } - } } + else if (extend == tomMove && old_start != old_end) + moved = 1; + ITextRange_SetEnd(range, new_end); if (extend == tomMove) ITextRange_SetStart(range, new_end); @@ -2275,32 +2279,36 @@ static HRESULT textrange_move(ITextRange *range, ME_TextEditor *editor, LONG uni { ME_Cursor cursor; - if (count > 0) { - ME_CursorFromCharOfs(editor, old_end, &cursor); + if (count > 0) + { + cursor_from_char_ofs( editor, old_end, &cursor ); move_by = count; if (old_start != old_end) --move_by; - } else { - ME_CursorFromCharOfs(editor, old_start, &cursor); + } + else + { + cursor_from_char_ofs( editor, old_start, &cursor ); move_by = count; if (old_start != old_end) ++move_by; } moved = ME_MoveCursorChars(editor, &cursor, move_by, FALSE); - if (count > 0) { + if (count > 0) + { new_end = old_end + moved; new_start = new_end; if (old_start != old_end) ++moved; - } else { + } + else + { new_start = old_start + moved; new_end = new_start; if (old_start != old_end) --moved; } - if (delta) { - *delta = moved; - } + if (delta) *delta = moved; break; } default: @@ -2348,7 +2356,7 @@ static HRESULT textrange_movestart(ITextRange *range, ME_TextEditor *editor, LON ME_Cursor cursor; LONG moved; - ME_CursorFromCharOfs(editor, old_start, &cursor); + cursor_from_char_ofs( editor, old_start, &cursor ); moved = ME_MoveCursorChars(editor, &cursor, count, FALSE); new_start = old_start + moved; new_end = old_end; @@ -2404,7 +2412,7 @@ static HRESULT textrange_moveend(ITextRange *range, ME_TextEditor *editor, LONG ME_Cursor cursor; LONG moved; - ME_CursorFromCharOfs(editor, old_end, &cursor); + cursor_from_char_ofs( editor, old_end, &cursor ); moved = ME_MoveCursorChars(editor, &cursor, count, TRUE); new_start = old_start; new_end = old_end + moved; @@ -2700,11 +2708,11 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) switch (value) { case tomStart: - ME_CursorFromCharOfs(editor, This->start, &cursor); + cursor_from_char_ofs( editor, This->start, &cursor ); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; case tomEnd: - ME_CursorFromCharOfs(editor, This->end, &cursor); + cursor_from_char_ofs( editor, This->end, &cursor ); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; default: diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 75195e343ed..92d0721247c 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -202,58 +202,38 @@ int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, } /****************************************************************************** - * ME_CursorFromCharOfs + * cursor_from_char_ofs * * Converts a character offset (relative to the start of the document) to * a cursor structure (which contains a run and a position relative to that * run). */ -void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor) +void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) { - ME_RunOfsFromCharOfs(editor, nCharOfs, &pCursor->pPara, - &pCursor->pRun, &pCursor->nOffset); -} + ME_Paragraph *para; + ME_Run *run; -/****************************************************************************** - * ME_RunOfsFromCharOfs - * - * Find a run and relative character offset given an absolute character offset - * (absolute offset being an offset relative to the start of the document). - * Kind of a "global to local" offset conversion. - */ -void ME_RunOfsFromCharOfs(ME_TextEditor *editor, - int nCharOfs, - ME_DisplayItem **ppPara, - ME_DisplayItem **ppRun, - int *pOfs) -{ - ME_DisplayItem *item, *next_item; + char_ofs = min( max( char_ofs, 0 ), ME_GetTextLength( editor ) ); - nCharOfs = max(nCharOfs, 0); - nCharOfs = min(nCharOfs, ME_GetTextLength(editor)); + /* Find the paragraph at the offset. */ + for (para = editor_first_para( editor ); + para_next( para )->nCharOfs <= char_ofs; + para = para_next( para )) + ; - /* Find the paragraph at the offset. */ - next_item = editor->pBuffer->pFirst->member.para.next_para; - do { - item = next_item; - next_item = item->member.para.next_para; - } while (next_item->member.para.nCharOfs <= nCharOfs); - assert(item->type == diParagraph); - nCharOfs -= item->member.para.nCharOfs; - if (ppPara) *ppPara = item; - - /* Find the run at the offset. */ - next_item = ME_FindItemFwd(item, diRun); - do { - item = next_item; - next_item = ME_FindItemFwd(item, diRunOrParagraphOrEnd); - } while (next_item->type == diRun && - next_item->member.run.nCharOfs <= nCharOfs); - assert(item->type == diRun); - nCharOfs -= item->member.run.nCharOfs; - - if (ppRun) *ppRun = item; - if (pOfs) *pOfs = nCharOfs; + char_ofs -= para->nCharOfs; + + /* Find the run at the offset. */ + for (run = para_first_run( para ); + run_next( run ) && run_next( run )->nCharOfs <= char_ofs; + run = run_next( run )) + ; + + char_ofs -= run->nCharOfs; + + cursor->pPara = para_get_di( para ); + cursor->pRun = run_get_di( run ); + cursor->nOffset = char_ofs; } /****************************************************************************** diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 622d8519285..3fd4ae540c5 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -269,7 +269,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetText(ITextServices *iface, BST if (bstr == NULL) return E_OUTOFMEMORY; - ME_CursorFromCharOfs(This->editor, 0, &start); + cursor_from_char_ofs( This->editor, 0, &start ); ME_GetTextW(This->editor, bstr, length, &start, INT_MAX, FALSE, FALSE); *pbstrText = bstr; } else { diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 1f5c7ae4cd6..3f3fd48bebd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -336,7 +336,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) { ME_Cursor tmp; ME_DisplayItem *para; - ME_CursorFromCharOfs(editor, undo->u.set_para_fmt.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.set_para_fmt.pos, &tmp ); para = ME_FindItemBack(tmp.pRun, diParagraph); add_undo_set_para_fmt( editor, &para->member.para ); para->member.para.fmt = undo->u.set_para_fmt.fmt; @@ -347,7 +347,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_set_char_fmt: { ME_Cursor start, end; - ME_CursorFromCharOfs(editor, undo->u.set_char_fmt.pos, &start); + cursor_from_char_ofs( editor, undo->u.set_char_fmt.pos, &start ); end = start; ME_MoveCursorChars(editor, &end, undo->u.set_char_fmt.len, FALSE); ME_SetCharFormat(editor, &start, &end, &undo->u.set_char_fmt.fmt); @@ -356,7 +356,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_insert_run: { ME_Cursor tmp; - ME_CursorFromCharOfs(editor, undo->u.insert_run.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.insert_run.pos, &tmp ); run_insert( editor, &tmp, undo->u.insert_run.style, undo->u.insert_run.str, undo->u.insert_run.len, undo->u.insert_run.flags ); @@ -365,14 +365,14 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_delete_run: { ME_Cursor tmp; - ME_CursorFromCharOfs(editor, undo->u.delete_run.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.delete_run.pos, &tmp ); ME_InternalDeleteText(editor, &tmp, undo->u.delete_run.len, TRUE); break; } case undo_join_paras: { ME_Cursor tmp; - ME_CursorFromCharOfs(editor, undo->u.join_paras.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.join_paras.pos, &tmp ); ME_JoinParagraphs(editor, tmp.pPara, TRUE); break; } @@ -383,7 +383,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) BOOL bFixRowStart; int paraFlags = undo->u.split_para.flags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND); - ME_CursorFromCharOfs(editor, undo->u.split_para.pos, &tmp); + cursor_from_char_ofs( editor, undo->u.split_para.pos, &tmp ); if (tmp.nOffset) run_split( editor, &tmp ); this_para = tmp.pPara; bFixRowStart = this_para->member.para.nFlags & MEPF_ROWSTART; -- 2.23.0

1 0

[PATCH 1/6] riched20: Use run ptrs in GetCharFormat().
by Huw Davies 15 Oct '20

15 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/run.c | 67 +++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index a5888960f38..75195e343ed 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -816,9 +816,9 @@ void ME_SetCharFormat( ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, } } -static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHARFORMAT2W *pFmt) +static void run_copy_char_fmt( ME_Run *run, CHARFORMAT2W *fmt ) { - ME_CopyCharFormat(pFmt, &run->member.run.style->fmt); + ME_CopyCharFormat( fmt, &run->style->fmt ); } /****************************************************************************** @@ -856,33 +856,25 @@ void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * Returns the style consisting of those attributes which are consistently set * in the whole character range. */ -void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, - const ME_Cursor *to, CHARFORMAT2W *pFmt) +void ME_GetCharFormat( ME_TextEditor *editor, const ME_Cursor *from, + const ME_Cursor *to, CHARFORMAT2W *fmt ) { - ME_DisplayItem *run, *run_end; + ME_Run *run, *run_end, *prev_run; CHARFORMAT2W tmp; - run = from->pRun; + run = &from->pRun->member.run; /* special case - if selection is empty, take previous char's formatting */ if (from->pRun == to->pRun && from->nOffset == to->nOffset) { - if (!from->nOffset) - { - ME_DisplayItem *tmp_run = ME_FindItemBack(run, diRunOrParagraph); - if (tmp_run->type == diRun) { - ME_GetRunCharFormat(editor, tmp_run, pFmt); - return; - } - } - ME_GetRunCharFormat(editor, run, pFmt); + if (!from->nOffset && (prev_run = run_prev( run ))) run = prev_run; + run_copy_char_fmt( run, fmt ); return; } - run_end = to->pRun; - if (!to->nOffset) - run_end = ME_FindItemBack(run_end, diRun); + run_end = &to->pRun->member.run; + if (!to->nOffset) run_end = run_prev_all_paras( run_end ); - ME_GetRunCharFormat(editor, run, pFmt); + run_copy_char_fmt( run, fmt ); if (run == run_end) return; @@ -891,40 +883,37 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, DWORD dwAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; DWORD dwEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT; - run = ME_FindItemFwd(run, diRun); + run = run_next_all_paras( run ); - ZeroMemory(&tmp, sizeof(tmp)); + memset( &tmp, 0, sizeof(tmp) ); tmp.cbSize = sizeof(tmp); - ME_GetRunCharFormat(editor, run, &tmp); + run_copy_char_fmt( run, &tmp ); assert((tmp.dwMask & dwAttribs) == dwAttribs); /* reset flags that differ */ - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->dwMask & CFM_FACE) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->dwMask & CFM_FACE) { if (!(tmp.dwMask & CFM_FACE)) - pFmt->dwMask &= ~CFM_FACE; - else if (wcscmp(pFmt->szFaceName, tmp.szFaceName) || - pFmt->bPitchAndFamily != tmp.bPitchAndFamily) - pFmt->dwMask &= ~CFM_FACE; + fmt->dwMask &= ~CFM_FACE; + else if (wcscmp( fmt->szFaceName, tmp.szFaceName ) || + fmt->bPitchAndFamily != tmp.bPitchAndFamily) + fmt->dwMask &= ~CFM_FACE; } - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->bUnderlineType != tmp.bUnderlineType) - pFmt->dwMask &= ~CFM_UNDERLINETYPE; - if (pFmt->dwMask & CFM_COLOR) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->bUnderlineType != tmp.bUnderlineType) fmt->dwMask &= ~CFM_UNDERLINETYPE; + if (fmt->dwMask & CFM_COLOR) { - if (!((pFmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) + if (!((fmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) { - if (pFmt->crTextColor != tmp.crTextColor) - pFmt->dwMask &= ~CFM_COLOR; + if (fmt->crTextColor != tmp.crTextColor) + fmt->dwMask &= ~CFM_COLOR; } } - pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & dwEffects); - pFmt->dwEffects = tmp.dwEffects; + fmt->dwMask &= ~((fmt->dwEffects ^ tmp.dwEffects) & dwEffects); + fmt->dwEffects = tmp.dwEffects; } while(run != run_end); } -- 2.23.0

1 0

[PATCH 3/3] ntdll: Use ProcessCookie in RtlEncode/DecodePointer.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I've opted to use a helper function, as it both makes the code cleaner, as well as avoid unneeded "syscalls" (could be a performance issue for an application that calls Encode/DecodePointer repeatedly). dlls/ntdll/rtl.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 154de807501..8c8c8c9bb1a 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1516,30 +1516,22 @@ WCHAR * WINAPI RtlIpv6AddressToStringW(const IN6_ADDR *address, WCHAR *str) } /*********************************************************************** - * get_pointer_obfuscator (internal) + * get_process_cookie (internal) */ -static DWORD_PTR get_pointer_obfuscator( void ) +static ULONG get_process_cookie( void ) { - static DWORD_PTR pointer_obfuscator; + static ULONG process_cookie; - if (!pointer_obfuscator) + if (!process_cookie) { - ULONG seed = NtGetTickCount(); - ULONG_PTR rand; + ULONG cookie; + NtQueryInformationProcess( NtCurrentProcess(), ProcessCookie, &cookie, + sizeof( cookie ), NULL ); - /* generate a random value for the obfuscator */ - rand = RtlUniform( &seed ); - - /* handle 64bit pointers */ - rand ^= (ULONG_PTR)RtlUniform( &seed ) << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); - - /* set the high bits so dereferencing obfuscated pointers will (usually) crash */ - rand |= (ULONG_PTR)0xc0000000 << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); - - InterlockedCompareExchangePointer( (void**) &pointer_obfuscator, (void*) rand, NULL ); + InterlockedExchange( (LONG*)&process_cookie, cookie ); } - return pointer_obfuscator; + return process_cookie; } /*********************************************************************** @@ -1575,7 +1567,7 @@ PVOID WINAPI RtlEncodePointer( PVOID ptr ) { DWORD_PTR ptrval = (DWORD_PTR) ptr; - DWORD_PTR cookie = get_pointer_obfuscator(); + DWORD_PTR cookie = (DWORD_PTR) get_process_cookie(); /* http://blogs.msdn.com/b/michael_howard/archive/2006/08/16/702707.aspx */ @@ -1586,7 +1578,7 @@ PVOID WINAPI RtlEncodePointer( PVOID ptr ) PVOID WINAPI RtlDecodePointer( PVOID ptr ) { DWORD_PTR ptrval = (DWORD_PTR) ptr; - DWORD_PTR cookie = get_pointer_obfuscator(); + DWORD_PTR cookie = (DWORD_PTR) get_process_cookie(); ptrval = rotl_ptr(ptrval, cookie); return (PVOID)(ptrval ^ cookie); -- 2.28.0

2 1

[PATCH 2/3] ntdll: Implement ProcessCookie for NtQueryInformationProcess.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Due to some of the fields being currently unimplemented by wine, the entropy isn't great. I've opted to not include the rdtsc instruction for the moment, as I believe it'd make the function significantly more complex (through apparently separate inline assembly for i386/x86-64 according to https://stackoverflow.com/a/9887899/13255485), or require compiler-specific intrinsics. dlls/ntdll/unix/process.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 5ccf435e9ff..258ddc1c79d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -62,6 +62,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "unix_private.h" #include "wine/exception.h" #include "wine/server.h" @@ -1166,6 +1167,30 @@ void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) #endif +static ULONG get_process_cookie( void ) +{ + static ULONG process_cookie; + + if (!process_cookie) + { + /* http://blogs.msdn.com/b/michael_howard/archive/2006/08/16/702707.aspx */ + SYSTEM_PERFORMANCE_INFORMATION spi; + ULONG cookie = user_shared_data->TickCount.High1Time; + cookie ^= user_shared_data->TickCount.LowPart; + cookie ^= user_shared_data->InterruptTime.LowPart; + + NtQuerySystemInformation( SystemPerformanceInformation, &spi, sizeof( spi ), NULL ); + cookie ^= spi.SystemCalls; + cookie ^= spi.PageFaults; + + /* todo: cookie ^= (ULONG)rdtsc */ + + InterlockedExchange( (LONG*)&process_cookie, cookie ); + } + + return process_cookie; +} + #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ FIXME( "(process=%p) Unimplemented information class: " #c "\n", handle); \ @@ -1541,11 +1566,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class break; case ProcessCookie: - FIXME( "ProcessCookie (%p,%p,0x%08x,%p) stub\n", handle, info, size, ret_len ); if (handle == NtCurrentProcess()) { len = sizeof(ULONG); - if (size == len) *(ULONG *)info = 0; + if (size == len) *(ULONG *)info = get_process_cookie(); else ret = STATUS_INFO_LENGTH_MISMATCH; } else ret = STATUS_INVALID_PARAMETER; -- 2.28.0

2 1

[PATCH v2] ntdll/tests: Add tests for RtlEncode(System)Pointer.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: - Fix the algorithm according to the linked MSDN post - Don't require _rotr(64) dlls/ntdll/tests/rtl.c | 88 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7a62670ea05..fef7103d677 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -82,6 +82,11 @@ static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, U static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); +static VOID* (WINAPI *pRtlEncodePointer)(void *); +static VOID* (WINAPI *pRtlDecodePointer)(void *); +static VOID* (WINAPI *pRtlEncodeSystemPointer)(void *); +static VOID* (WINAPI *pRtlDecodeSystemPointer)(void *); +static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -122,6 +127,11 @@ static void InitFunctionPtrs(void) pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); + pRtlEncodePointer = (void *)GetProcAddress(hntdll, "RtlEncodePointer"); + pRtlDecodePointer = (void *)GetProcAddress(hntdll, "RtlDecodePointer"); + pRtlEncodeSystemPointer = (void *)GetProcAddress(hntdll, "RtlEncodeSystemPointer"); + pRtlDecodeSystemPointer = (void *)GetProcAddress(hntdll, "RtlDecodeSystemPointer"); + pNtQueryInformationProcess = (void *)GetProcAddress(hntdll, "NtQueryInformationProcess"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -3483,6 +3493,83 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static DWORD_PTR rotr_ptr( DWORD_PTR num, int shift ) +{ +#ifdef _WIN64 +#define ROT_BITS 64 +#else +#define ROT_BITS 32 +#endif + + shift &= ROT_BITS - 1; + return (num >> shift) | (num << (ROT_BITS-shift)); + +#undef ROT_BITS +} + +static PVOID our_encode_pointer( PVOID ptr, ULONG cookie ) +{ + DWORD_PTR ptrval = (DWORD_PTR) ptr; + DWORD_PTR cookieval = (DWORD_PTR) cookie; + + /* http://blogs.msdn.com/b/michael_howard/archive/2006/08/16/702707.aspx */ + + ptrval = (ptrval ^ cookieval); + return (PVOID)rotr_ptr(ptrval, cookie); +} + +static void test_RtlEncodePointer(void) +{ + void *addr = (void*)0xdeadbeef0123abcd; + void *encoded, *encoded1, *decoded; + void *our_encoded; + ULONG process_cookie = 0xdeadbeef; + ULONG system_cookie = *(ULONG*)(0x7ffe0000 + 0x330); /* user_shared_data.Cookie */ + NTSTATUS status; + + if (!pRtlEncodePointer || !pRtlDecodePointer) + { + win_skip("RtlEn/DecodePointer not available\n"); + return; + } + + encoded = pRtlEncodePointer(addr); + ok(encoded != addr, "got %p\n", encoded); + + decoded = pRtlDecodePointer(encoded); + ok(decoded == addr, "got %p\n", decoded); + + if (!pNtQueryInformationProcess) + { + win_skip("NtQueryInformationProcess not available\n"); + } + else + { + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessCookie, &process_cookie, sizeof(process_cookie), NULL); + ok(status == S_OK, "got %08x\n", status); + ok(process_cookie != 0xdeadbeef, "got %08x\n", process_cookie); + + our_encoded = our_encode_pointer(addr, process_cookie); + todo_wine ok(encoded == our_encoded || broken(encoded == (void*)((uintptr_t)addr ^ (uintptr_t)process_cookie)), "got %p (ours %p)\n", encoded, our_encoded); + } + + if (!pRtlEncodeSystemPointer || !pRtlDecodeSystemPointer) + { + win_skip("RtlEn/DecodeSystemPointer not available\n"); + return; + } + + encoded1 = pRtlEncodeSystemPointer(addr); + ok(encoded != addr, "got %p\n", encoded); + todo_wine ok(encoded1 != encoded, "got %p\n", encoded1); + + decoded = pRtlDecodeSystemPointer(encoded1); + ok(decoded == addr, "got %p\n", decoded); + + our_encoded = our_encode_pointer(addr, system_cookie); + todo_wine ok(encoded1 == our_encoded || broken(encoded1 == (void*)((uintptr_t)addr ^ (uintptr_t)system_cookie)), "got %p (ours %p)\n", encoded1, our_encoded); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3523,4 +3610,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_RtlEncodePointer(); } -- 2.28.0

1 0

[PATCH 1/3] ntdll: Use Vista's algorithm for RtlEncode/DecodePointer.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- The algorithm is an implementation of https://web.archive.org/web/20100603042315/http://blogs.msdn.com/b/michael_… I'm sending in this patchset without the tests as I realize the tests are non-deterministic, and therefore probably not acceptable. However, in case it is acceptable I will also send a separate v2 patch for the tests (v1 is 194268), fixing the algorithm according to the linked MSDN post. dlls/ntdll/rtl.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index ca4fea84209..154de807501 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1542,19 +1542,54 @@ static DWORD_PTR get_pointer_obfuscator( void ) return pointer_obfuscator; } +/*********************************************************************** + * rotl_ptr (internal) + */ +#ifdef _WIN64 +#define ROT_BITS 64 +#else +#define ROT_BITS 32 +#endif + +static DWORD_PTR rotl_ptr( DWORD_PTR num, int shift ) +{ + shift &= ROT_BITS - 1; + return (num << shift) | (num >> (ROT_BITS-shift)); +} + +/*********************************************************************** + * rotr_ptr (internal) + */ +static DWORD_PTR rotr_ptr( DWORD_PTR num, int shift ) +{ + shift &= ROT_BITS - 1; + return (num >> shift) | (num << (ROT_BITS-shift)); +} + +#undef ROT_BITS + /************************************************************************* * RtlEncodePointer [NTDLL.@] */ PVOID WINAPI RtlEncodePointer( PVOID ptr ) { + DWORD_PTR ptrval = (DWORD_PTR) ptr; - return (PVOID)(ptrval ^ get_pointer_obfuscator()); + DWORD_PTR cookie = get_pointer_obfuscator(); + + /* http://blogs.msdn.com/b/michael_howard/archive/2006/08/16/702707.aspx */ + + ptrval = (ptrval ^ cookie); + return (PVOID)rotr_ptr(ptrval, cookie); } PVOID WINAPI RtlDecodePointer( PVOID ptr ) { DWORD_PTR ptrval = (DWORD_PTR) ptr; - return (PVOID)(ptrval ^ get_pointer_obfuscator()); + DWORD_PTR cookie = get_pointer_obfuscator(); + + ptrval = rotl_ptr(ptrval, cookie); + return (PVOID)(ptrval ^ cookie); } /************************************************************************* -- 2.28.0

1 0

[PATCH v2] riched20: implement ITextRange/ITextSelection Copy and Cut
by Damjan Jovanovic 15 Oct '20

15 Oct '20

Try 2 is rebased against the latest changes. Clipboard handling is unified with the previous code in editor.c. Manual tests show trying to cut from a read-only field beeps when using WM_CUT or Ctrl+X, but not when using these APIs. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 51 +++++++++++++++--------- dlls/riched20/editor.h | 3 +- dlls/riched20/richole.c | 46 ++++++++++++++++++---- dlls/riched20/tests/richole.c | 74 +++++++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+), 28 deletions(-)

2 1

[PATCH 2/2] winex11: Add ProviderName registry property to display adapters.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/winex11.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index cedf18fe4f8..82fc80446cd 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -54,6 +54,7 @@ static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR driver_versionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; +static const WCHAR provider_nameW[] = {'P','r','o','v','i','d','e','r','N','a','m','e',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -111,6 +112,7 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static const WCHAR driver_version_valueW[] = {'1','.','0','.','0','.','1','0','0','0',0}; +static const WCHAR provider_name_valueW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -489,6 +491,10 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g (strlenW(driver_version_valueW) + 1) * sizeof(WCHAR))) goto done; + if (RegSetValueExW(hkey, provider_nameW, 0, REG_SZ, (BYTE *)provider_name_valueW, + (strlenW(provider_name_valueW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */ -- 2.28.0

1 1

[PATCH 1/2] winex11: Add DriverVersion registry property to display adapters.
by Myah Caron 14 Oct '20

14 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This is read by Minecraft Dungeons Launcher (https://bugs.winehq.org/show_bug.cgi?id=49990) The version format is based on Virtualbox's DriverVersion format (presumably major.minor.patch.commit) dlls/winex11.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 0f61f9f7b2e..cedf18fe4f8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -53,6 +53,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4ab static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR driver_versionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -109,6 +110,7 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR driver_version_valueW[] = {'1','.','0','.','0','.','1','0','0','0',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -483,6 +485,10 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + if (RegSetValueExW(hkey, driver_versionW, 0, REG_SZ, (BYTE *)driver_version_valueW, + (strlenW(driver_version_valueW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */ -- 2.28.0

1 0

[PATCH] widl: Add the [allocate] acf attribute
by Eric Kohl 14 Oct '20

14 Oct '20

Signed-off-by: Eric Kohl <eric.kohl(a)reactos.org> --- tools/widl/parser.l | 3 +++ tools/widl/parser.y | 33 +++++++++++++++++++++++++++++---- tools/widl/typegen.c | 7 +++++++ tools/widl/widltypes.h | 1 + 4 files changed, 40 insertions(+), 4 deletions(-)

1 0

[PATCH] lz32/tests: Use wide-char string literals.
by Michael Stefaniuc 14 Oct '20

14 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Again, not const as that would produce compiler warnings. dlls/lz32/tests/lzexpand_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index c37f3fa47e7..3c80bc09a6b 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -30,23 +30,23 @@ /* Compressed file names end with underscore. */ static char filename [] = "testfile.xxx"; static char filename_[] = "testfile.xx_"; -static WCHAR filenameW [] = {'t','e','s','t','f','i','l','e','.','x','x','x',0}; -static WCHAR filenameW_[] = {'t','e','s','t','f','i','l','e','.','x','x','_',0}; +static WCHAR filenameW [] = L"testfile.xxx"; +static WCHAR filenameW_[] = L"testfile.xx_"; static char dotless [] = "dotless"; static char dotless_[] = "dotless._"; -static WCHAR dotlessW [] = {'d','o','t','l','e','s','s', 0}; -static WCHAR dotlessW_[] = {'d','o','t','l','e','s','s','.','_', 0}; +static WCHAR dotlessW [] = L"dotless"; +static WCHAR dotlessW_[] = L"dotless._"; static char extless [] = "extless."; static char extless_[] = "extless._"; -static WCHAR extlessW [] = {'e','x','t','l','e','s','s','.', 0}; -static WCHAR extlessW_[] = {'e','x','t','l','e','s','s','.','_', 0}; +static WCHAR extlessW [] = L"extless."; +static WCHAR extlessW_[] = L"extless._"; static char _terminated [] = "_terminated.xxxx_"; static char _terminated_[] = "_terminated.xxxx_"; -static WCHAR _terminatedW [] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; -static WCHAR _terminatedW_[] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; +static WCHAR _terminatedW [] = L"_terminated.xxxx_"; +static WCHAR _terminatedW_[] = L"_terminated.xxxx_"; static char filename2[] = "testfile.yyy"; @@ -700,7 +700,7 @@ static void test_LZOpenFileW(void) OFSTRUCT test; DWORD retval; INT file; - static WCHAR badfilenameW[] = {'b','a','d','f','i','l','e','n','a','m','e','.','x','t','n',0}; + static WCHAR badfilenameW[] = L"badfilename.xtn"; char expected[MAX_PATH]; SetLastError(0xfaceabee); -- 2.26.2

1 0

[PATCH] spoolss: Use wide-char string literals.
by Michael Stefaniuc 14 Oct '20

14 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/spoolss/router.c | 2 +- dlls/spoolss/spoolss_main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 764721b202c..24314b1f23a 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -151,7 +151,7 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ################################ */ -static WCHAR localsplW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; +static WCHAR localsplW[] = L"localspl.dll"; /****************************************************************** * strdupW [internal] diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 61c565d2faa..bee58755eee 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss); static HMODULE hwinspool; -static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; - /****************************************************************************** * */ @@ -232,7 +230,7 @@ BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) TRACE("(%p)\n", table); - hwinspool = LoadLibraryW(winspooldrvW); + hwinspool = LoadLibraryW(L"winspool.drv"); if (!hwinspool) return FALSE; table[0] = (void *) GetProcAddress(hwinspool, "OpenPrinterW"); -- 2.26.2

1 0

[PATCH] msisip: Use wide-char string literals.
by Michael Stefaniuc 14 Oct '20

14 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- All those strings are really not const. dlls/msisip/main.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index aabea78ae62..11893f149c3 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -52,21 +52,13 @@ static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, */ HRESULT WINAPI DllRegisterServer(void) { - static WCHAR msisip[] = { 'M','S','I','S','I','P','.','D','L','L',0 }; - static WCHAR getSignedDataMsg[] = { 'M','s','i','S','I','P','G','e','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR putSignedDataMsg[] = { 'M','s','i','S','I','P','P','u','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR createIndirectData[] = { 'M','s','i','S','I','P', - 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR verifyIndirectData[] = { 'M','s','i','S','I','P', - 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR removeSignedDataMsg[] = { 'M','s','i','S','I','P','R','e','m', - 'o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0 }; - static WCHAR isMyTypeOfFile[] = { 'M','s','i','S','I','P', - 'I','s','M','y','T','y','p','e','O','f','F','i','l','e',0 }; + static WCHAR msisip[] = L"MSISIP.DLL"; + static WCHAR getSignedDataMsg[] = L"MsiSIPGetSignedDataMsg"; + static WCHAR putSignedDataMsg[] = L"MsiSIPPutSignedDataMsg"; + static WCHAR createIndirectData[] = L"MsiSIPCreateIndirectData"; + static WCHAR verifyIndirectData[] = L"MsiSIPVerifyIndirectData"; + static WCHAR removeSignedDataMsg[] = L"MsiSIPRemoveSignedDataMsg"; + static WCHAR isMyTypeOfFile[] = L"MsiSIPIsMyTypeOfFile"; SIP_ADD_NEWPROVIDER prov; @@ -100,8 +92,6 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, BYTE *pbSignedDataMsg) { - static const WCHAR digitalSig[] = { 5,'D','i','g','i','t','a','l', - 'S','i','g','n','a','t','u','r','e',0 }; BOOL ret = FALSE; IStorage *stg = NULL; HRESULT r; @@ -120,7 +110,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, goto end; } - r = IStorage_OpenStream(stg, digitalSig, 0, + r = IStorage_OpenStream(stg, L"\5DigitalSignature", 0, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stm); if (FAILED(r)) { -- 2.26.2

1 0

[RFC PATCH] winex11.drv: Use a fixed X11 keycode to Windows scancode table.
by Rémi Bernon 14 Oct '20

14 Oct '20

X11 keycodes are just Linux keycodes + 8 nowadays according to evdev or libinput drivers, and the conversion to Windows scancodes can be much simpler than what we currently do. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm sending this as RFC because I'd like to have some feedback, possibly from people with exotic keyboards. For me and my FR AZERTY keyboard, this fixes all the key mapping issues, such as the 7/è top row keys for instance [1], and I don't understand why we have to go through the layout detection code to find X11 keycode to Windows scancode mapping. There's a bit of mapping to do because higher keycodes don't always match between Windows and Linux, but that's pretty straightfoward. I initially thought it was actually complicated because X11 was mapping evdev keycodes internally but I couldn't find any clue that it does. >From what I can see in xserver source, the X11 keycodes are just evdev keycodes, offseted by 8 [2]. I may be missing something here, maybe some internal remapping, but I couldn't make the keycode change, either with setxkbmap or other ways to dynamically change the keyboard layout (the keysym does change indeed). [1] I used https://www.passmark.com/products/keytest/ to test, and my keyboard layout is wrong without this patch, and completely fixed with it. [2] The key events in X source go like this: The Linux keycode is retrieved from libevdev here: https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/blob/master/s… Then posted to X server there: https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/blob/master/s… Or from libinput and then directly posted to X server: https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/blob/maste… Following which, it goes through the following call chain untouched: https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/hw/xfree86/common… https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/hw/xfree86/common… https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/dix/getevents.c#L… Up to GetKeyboardEvents which generates the raw/nonraw X11 internal events: https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/dix/getevents.c#L… Raw event is generated there, and the keycode just goes into detail.button: https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/dix/getevents.c#L… Normal key event is then generated there, and keycode goes to detail.key: https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/dix/getevents.c#L… dlls/winex11.drv/keyboard.c | 315 +++++++++++++----------------------- 1 file changed, 113 insertions(+), 202 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 48da12c0292..5a9912d5913 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -63,7 +63,42 @@ WINE_DECLARE_DEBUG_CHANNEL(key); static int min_keycode, max_keycode, keysyms_per_keycode; static KeySym *key_mapping; -static WORD keyc2vkey[256], keyc2scan[256]; +static WORD keyc2vkey[256]; + +static const WORD keyc2scan[256] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x011d, 0x001e, 0x001f, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0136, 0x0037, + 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0145, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, + 0x011c, 0x011d, 0x0135, 0x0063, 0x0138, 0x0065, 0x0147, 0x0148, + 0x0149, 0x014b, 0x014d, 0x014f, 0x0150, 0x0151, 0x0152, 0x0153, + 0x0070, 0x0000, 0x0000, 0x0000, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x015b, 0x007e, 0x015d, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, + 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x0000, 0x00a5, 0x00a6, 0x00a7, + 0x00a8, 0x00a9, 0x00aa, 0x0000, 0x00ac, 0x00ad, 0x00ae, 0x00af, + 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, + 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, + 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, + 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, + 0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, + 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, + 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, + 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, + 0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, +}; static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ @@ -80,58 +115,6 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym); /* Keyboard translation tables */ #define MAIN_LEN 49 -static const WORD main_key_scan_qwerty[MAIN_LEN] = -{ -/* this is my (102-key) keyboard layout, sorry if it doesn't quite match yours */ - /* ` 1 2 3 4 5 6 7 8 9 0 - = */ - 0x29,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D, - /* q w e r t y u i o p [ ] */ - 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, - /* a s d f g h j k l ; ' \ */ - 0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2B, - /* z x c v b n m , . / */ - 0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35, - 0x56 /* the 102nd key (actually to the right of l-shift) */ -}; - -static const WORD main_key_scan_abnt_qwerty[MAIN_LEN] = -{ - /* ` 1 2 3 4 5 6 7 8 9 0 - = */ - 0x29,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D, - /* q w e r t y u i o p [ ] */ - 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, - /* a s d f g h j k l ; ' \ */ - 0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2B, - /* \ z x c v b n m , . / */ - 0x5e,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35, - 0x56, /* the 102nd key (actually to the right of l-shift) */ -}; - -static const WORD main_key_scan_dvorak[MAIN_LEN] = -{ - /* ` 1 2 3 4 5 6 7 8 9 0 [ ] */ - 0x29,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x1A,0x1B, - /* ' , . p y f g c r l / = */ - 0x28,0x33,0x34,0x19,0x15,0x21,0x22,0x2E,0x13,0x26,0x35,0x0D, - /* a o e u i d h t n s - \ */ - 0x1E,0x18,0x12,0x16,0x17,0x20,0x23,0x14,0x31,0x1F,0x0C,0x2B, - /* ; q j k x b m w v z */ - 0x27,0x10,0x24,0x25,0x2D,0x30,0x32,0x11,0x2F,0x2C, - 0x56 /* the 102nd key (actually to the right of l-shift) */ -}; - -static const WORD main_key_scan_qwerty_jp106[MAIN_LEN] = -{ - /* 1 2 3 4 5 6 7 8 9 0 - ^ \ (Yen) */ - 0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x7D, - /* q w e r t y u i o p @ [ */ - 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, - /* a s d f g h j k l ; : ] */ - 0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2B, - /* z x c v b n m , . / \ (Underscore) */ - 0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,0x73 -}; - static const WORD main_key_vkey_qwerty[MAIN_LEN] = { @@ -831,13 +814,6 @@ static const char main_key_th[MAIN_LEN][4] = }; /*** VNC keyboard layout */ -static const WORD main_key_scan_vnc[MAIN_LEN] = -{ - 0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x1A,0x1B,0x27,0x28,0x29,0x33,0x34,0x35,0x2B, - 0x1E,0x30,0x2E,0x20,0x12,0x21,0x22,0x23,0x17,0x24,0x25,0x26,0x32,0x31,0x18,0x19,0x10,0x13,0x1F,0x14,0x16,0x2F,0x11,0x2D,0x15,0x2C, - 0x56 -}; - static const WORD main_key_vkey_vnc[MAIN_LEN] = { '1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_PLUS,VK_OEM_4,VK_OEM_6,VK_OEM_1,VK_OEM_7,VK_OEM_3,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,VK_OEM_5, @@ -869,73 +845,72 @@ static const struct { in the appropriate dlls/kernel/nls/.nls file */ const char *comment; const char (*key)[MAIN_LEN][4]; - const WORD (*scan)[MAIN_LEN]; /* scan codes mapping */ const WORD (*vkey)[MAIN_LEN]; /* virtual key codes mapping */ } main_key_tab[]={ - {0x0409, "United States keyboard layout", &main_key_US, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "United States keyboard layout (phantom key version)", &main_key_US_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_scan_dvorak, &main_key_vkey_dvorak}, - {0x0409, "United States International keyboard layout", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0809, "British keyboard layout", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0407, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0807, "Swiss German keyboard layout", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x100c, "Swiss French keyboard layout", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x041d, "Swedish keyboard layout", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2}, - {0x0425, "Estonian keyboard layout", &main_key_ET, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0414, "Norwegian keyboard layout", &main_key_NO, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty}, - {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian French keyboard layout (CA_fr)", &main_key_CA_fr, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, - {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, - {0x0416, "Brazilian ABNT-2 keyboard layout ALT GR", &main_key_PT_br_alt_gr,&main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, - {0x040b, "Finnish keyboard layout", &main_key_FI, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0402, "Bulgarian bds keyboard layout", &main_key_BG_bds, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0402, "Bulgarian phonetic keyboard layout", &main_key_BG_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0423, "Belarusian keyboard layout", &main_key_BY, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout", &main_key_RU, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout (phantom key version)", &main_key_RU_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout KOI8-R", &main_key_RU_koi8r, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout cp1251", &main_key_RU_cp1251, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian phonetic keyboard layout", &main_key_RU_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0422, "Ukrainian keyboard layout KOI8-U", &main_key_UA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0422, "Ukrainian keyboard layout (standard)", &main_key_UA_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout (standard)", &main_key_RU_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040a, "Spanish keyboard layout", &main_key_ES, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0410, "Italian keyboard layout", &main_key_IT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040f, "Icelandic keyboard layout", &main_key_IS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040e, "Hungarian keyboard layout", &main_key_HU, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0415, "Polish (programmer's) keyboard layout", &main_key_PL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0424, "Slovenian keyboard layout", &main_key_SI, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0c1a, "Serbian keyboard layout sr", &main_key_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ - {0x0c1a, "Serbian keyboard layout us,sr", &main_key_US_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ - {0x041a, "Croatian keyboard layout", &main_key_HR, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x041a, "Croatian keyboard layout (specific)", &main_key_HR_jelly, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0411, "Japanese 106 keyboard layout", &main_key_JA_jp106, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, - {0x0411, "Japanese Mac keyboard layout", &main_key_JA_macjp, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, - {0x0411, "Japanese pc98x1 keyboard layout", &main_key_JA_pc98x1, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041b, "Slovak keyboard layout", &main_key_SK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041b, "Slovak and Czech keyboard layout without dead keys", &main_key_SK_prog, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0405, "Czech keyboard layout", &main_key_CS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0405, "Czech keyboard layout cz", &main_key_CZ, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0405, "Czech keyboard layout cz_qwerty", &main_key_CZ_qwerty, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040a, "Latin American keyboard layout", &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0427, "Lithuanian (Baltic) keyboard layout", &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041f, "Turkish keyboard layout", &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041f, "Turkish keyboard layout tr", &main_key_TR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041f, "Turkish keyboard layout trf", &main_key_TR_F, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040d, "Israelian keyboard layout", &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040d, "Israelian phonetic keyboard layout", &main_key_IL_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040d, "Israelian Saharon keyboard layout", &main_key_IL_saharon, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "VNC keyboard layout", &main_key_vnc, &main_key_scan_vnc, &main_key_vkey_vnc}, - {0x0408, "Greek keyboard layout", &main_key_EL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041e, "Thai (Kedmanee) keyboard layout", &main_key_th, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0413, "Dutch keyboard layout", &main_key_NL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - - {0, NULL, NULL, NULL, NULL} /* sentinel */ + {0x0409, "United States keyboard layout", &main_key_US, &main_key_vkey_qwerty}, + {0x0409, "United States keyboard layout (phantom key version)", &main_key_US_phantom, &main_key_vkey_qwerty}, + {0x0409, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_vkey_dvorak}, + {0x0409, "United States International keyboard layout", &main_key_US_intl, &main_key_vkey_qwerty}, + {0x0809, "British keyboard layout", &main_key_UK, &main_key_vkey_qwerty}, + {0x0407, "German keyboard layout", &main_key_DE, &main_key_vkey_qwertz}, + {0x0807, "Swiss German keyboard layout", &main_key_SG, &main_key_vkey_qwertz}, + {0x100c, "Swiss French keyboard layout", &main_key_SF, &main_key_vkey_qwertz}, + {0x041d, "Swedish keyboard layout", &main_key_SE, &main_key_vkey_qwerty_v2}, + {0x0425, "Estonian keyboard layout", &main_key_ET, &main_key_vkey_qwerty}, + {0x0414, "Norwegian keyboard layout", &main_key_NO, &main_key_vkey_qwerty}, + {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_vkey_qwerty}, + {0x040c, "French keyboard layout", &main_key_FR, &main_key_vkey_azerty}, + {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_vkey_qwerty}, + {0x0c0c, "Canadian French keyboard layout (CA_fr)", &main_key_CA_fr, &main_key_vkey_qwerty}, + {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_vkey_qwerty}, + {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_vkey_azerty}, + {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_vkey_qwerty}, + {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_vkey_abnt_qwerty}, + {0x0416, "Brazilian ABNT-2 keyboard layout ALT GR", &main_key_PT_br_alt_gr,&main_key_vkey_abnt_qwerty}, + {0x040b, "Finnish keyboard layout", &main_key_FI, &main_key_vkey_qwerty}, + {0x0402, "Bulgarian bds keyboard layout", &main_key_BG_bds, &main_key_vkey_qwerty}, + {0x0402, "Bulgarian phonetic keyboard layout", &main_key_BG_phonetic, &main_key_vkey_qwerty}, + {0x0423, "Belarusian keyboard layout", &main_key_BY, &main_key_vkey_qwerty}, + {0x0419, "Russian keyboard layout", &main_key_RU, &main_key_vkey_qwerty}, + {0x0419, "Russian keyboard layout (phantom key version)", &main_key_RU_phantom, &main_key_vkey_qwerty}, + {0x0419, "Russian keyboard layout KOI8-R", &main_key_RU_koi8r, &main_key_vkey_qwerty}, + {0x0419, "Russian keyboard layout cp1251", &main_key_RU_cp1251, &main_key_vkey_qwerty}, + {0x0419, "Russian phonetic keyboard layout", &main_key_RU_phonetic, &main_key_vkey_qwerty}, + {0x0422, "Ukrainian keyboard layout KOI8-U", &main_key_UA, &main_key_vkey_qwerty}, + {0x0422, "Ukrainian keyboard layout (standard)", &main_key_UA_std, &main_key_vkey_qwerty}, + {0x0419, "Russian keyboard layout (standard)", &main_key_RU_std, &main_key_vkey_qwerty}, + {0x040a, "Spanish keyboard layout", &main_key_ES, &main_key_vkey_qwerty}, + {0x0410, "Italian keyboard layout", &main_key_IT, &main_key_vkey_qwerty}, + {0x040f, "Icelandic keyboard layout", &main_key_IS, &main_key_vkey_qwerty}, + {0x040e, "Hungarian keyboard layout", &main_key_HU, &main_key_vkey_qwertz}, + {0x0415, "Polish (programmer's) keyboard layout", &main_key_PL, &main_key_vkey_qwerty}, + {0x0424, "Slovenian keyboard layout", &main_key_SI, &main_key_vkey_qwertz}, + {0x0c1a, "Serbian keyboard layout sr", &main_key_SR, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ + {0x0c1a, "Serbian keyboard layout us,sr", &main_key_US_SR, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ + {0x041a, "Croatian keyboard layout", &main_key_HR, &main_key_vkey_qwertz}, + {0x041a, "Croatian keyboard layout (specific)", &main_key_HR_jelly, &main_key_vkey_qwerty}, + {0x0411, "Japanese 106 keyboard layout", &main_key_JA_jp106, &main_key_vkey_qwerty_jp106}, + {0x0411, "Japanese Mac keyboard layout", &main_key_JA_macjp, &main_key_vkey_qwerty_jp106}, + {0x0411, "Japanese pc98x1 keyboard layout", &main_key_JA_pc98x1, &main_key_vkey_qwerty}, + {0x041b, "Slovak keyboard layout", &main_key_SK, &main_key_vkey_qwerty}, + {0x041b, "Slovak and Czech keyboard layout without dead keys", &main_key_SK_prog, &main_key_vkey_qwerty}, + {0x0405, "Czech keyboard layout", &main_key_CS, &main_key_vkey_qwerty}, + {0x0405, "Czech keyboard layout cz", &main_key_CZ, &main_key_vkey_qwertz}, + {0x0405, "Czech keyboard layout cz_qwerty", &main_key_CZ_qwerty, &main_key_vkey_qwerty}, + {0x040a, "Latin American keyboard layout", &main_key_LA, &main_key_vkey_qwerty}, + {0x0427, "Lithuanian (Baltic) keyboard layout", &main_key_LT_B, &main_key_vkey_qwerty}, + {0x041f, "Turkish keyboard layout", &main_key_TK, &main_key_vkey_qwerty}, + {0x041f, "Turkish keyboard layout tr", &main_key_TR, &main_key_vkey_qwerty}, + {0x041f, "Turkish keyboard layout trf", &main_key_TR_F, &main_key_vkey_qwerty}, + {0x040d, "Israelian keyboard layout", &main_key_IL, &main_key_vkey_qwerty}, + {0x040d, "Israelian phonetic keyboard layout", &main_key_IL_phonetic, &main_key_vkey_qwerty}, + {0x040d, "Israelian Saharon keyboard layout", &main_key_IL_saharon, &main_key_vkey_qwerty}, + {0x0409, "VNC keyboard layout", &main_key_vnc, &main_key_vkey_vnc}, + {0x0408, "Greek keyboard layout", &main_key_EL, &main_key_vkey_qwerty}, + {0x041e, "Thai (Kedmanee) keyboard layout", &main_key_th, &main_key_vkey_qwerty}, + {0x0413, "Dutch keyboard layout", &main_key_NL, &main_key_vkey_qwerty}, + + {0, NULL, NULL, NULL} /* sentinel */ }; static unsigned kbd_layout=0; /* index into above table of layouts */ @@ -1005,53 +980,6 @@ static const WORD nonchar_key_vkey[256] = 0, 0, 0, 0, 0, 0, 0, VK_DELETE /* FFF8 */ }; -static const WORD nonchar_key_scan[256] = -{ - /* unused */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF00 */ - /* special keys */ - 0x0E, 0x0F, 0x00, /*?*/ 0, 0x00, 0x1C, 0x00, 0x00, /* FF08 */ - 0x00, 0x00, 0x00, 0x45, 0x46, 0x00, 0x00, 0x00, /* FF10 */ - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, /* FF18 */ - /* Japanese special keys */ - 0x00, 0x29, 0x7B, 0x79, 0x70, 0x00, 0x00, 0x70, /* FF20 */ - 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF28 */ - /* Korean special keys (FF31-) */ - 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF30 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF38 */ - /* unused */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF40 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF48 */ - /* cursor keys */ - 0x147, 0x14B, 0x148, 0x14D, 0x150, 0x149, 0x151, 0x14F, /* FF50 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF58 */ - /* misc keys */ - /*?*/ 0, 0x137, /*?*/ 0, 0x152, 0x00, 0x00, 0x00, 0x15D, /* FF60 */ - /*?*/ 0, /*?*/ 0, 0x38, 0x146, 0x00, 0x00, 0x00, 0x00, /* FF68 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF70 */ - /* keypad keys */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x145, /* FF78 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF80 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x11C, 0x00, 0x00, /* FF88 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x4B, 0x48, /* FF90 */ - 0x4D, 0x50, 0x49, 0x51, 0x4F, 0x4C, 0x52, 0x53, /* FF98 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFA0 */ - 0x00, 0x00, 0x37, 0x4E, 0x53, 0x4A, 0x53, 0x135, /* FFA8 */ - 0x52, 0x4F, 0x50, 0x51, 0x4B, 0x4C, 0x4D, 0x47, /* FFB0 */ - 0x48, 0x49, 0x00, 0x00, 0x00, 0x00, /* FFB8 */ - /* function keys */ - 0x3B, 0x3C, - 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, /* FFC0 */ - 0x57, 0x58, 0x5B, 0x5C, 0x5D, 0x00, 0x00, 0x00, /* FFC8 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD0 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD8 */ - /* modifier keys */ - 0x00, 0x2A, 0x136, 0x1D, 0x11D, 0x3A, 0x00, 0x38, /* FFE0 */ - 0x138, 0x38, 0x138, 0x15b, 0x15c, 0x00, 0x00, 0x00, /* FFE8 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFF0 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x153 /* FFF8 */ -}; - static const WORD xfree86_vendor_key_vkey[256] = { 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF00 */ @@ -1327,7 +1255,7 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) char buf[24]; char *Str = buf; KeySym keysym = 0; - WORD vkey = 0, bScan; + WORD vkey = 0, scan; DWORD dwFlags; int ascii_chars; XIC xic = X11DRV_get_ic( hwnd ); @@ -1398,10 +1326,10 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) vkey = EVENT_event_to_vkey(xic,event); /* X returns keycode 0 for composed characters */ if (!vkey && ascii_chars) vkey = VK_NONAME; - bScan = keyc2scan[event->keycode] & 0xFF; + scan = keyc2scan[event->keycode]; - TRACE_(key)("keycode %u converted to vkey 0x%X scan %02x\n", - event->keycode, vkey, bScan); + TRACE_(key)("keycode %u converted to vkey 0x%X scan %04x\n", + event->keycode, vkey, scan); LeaveCriticalSection( &kbd_section ); @@ -1409,11 +1337,11 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) dwFlags = 0; if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; - if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; + if ( scan & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; update_lock_state( hwnd, vkey, event->state, event_time ); - X11DRV_send_keyboard_input( hwnd, vkey & 0xff, bScan, dwFlags, event_time ); + X11DRV_send_keyboard_input( hwnd, vkey & 0xff, scan & 0xff, dwFlags, event_time ); return TRUE; } @@ -1611,7 +1539,7 @@ void X11DRV_InitKeyboard( Display *display ) KeySym keysym; KeyCode *kcp; XKeyEvent e2; - WORD scan, vkey; + WORD vkey; int keyc, i, keyn, syms; char ckey[4]={0,0,0,0}; const char (*lkey)[MAIN_LEN][4]; @@ -1691,23 +1619,18 @@ void X11DRV_InitKeyboard( Display *display ) keysym = 0; e2.keycode = (KeyCode)keyc; have_chars = XLookupString(&e2, buf, sizeof(buf), &keysym, NULL); - vkey = 0; scan = 0; + vkey = 0; if (keysym) /* otherwise, keycode not used */ { if ((keysym >> 8) == 0xFF) /* non-character key */ { vkey = nonchar_key_vkey[keysym & 0xff]; - scan = nonchar_key_scan[keysym & 0xff]; - /* set extended bit when necessary */ - if (scan & 0x100) vkey |= 0x100; } else if ((keysym >> 8) == 0x1008FF) { /* XFree86 vendor keys */ vkey = xfree86_vendor_key_vkey[keysym & 0xff]; /* All vendor keys are extended with a scan code of 0 per testing on WinXP */ - scan = 0x100; vkey |= 0x100; } else if (keysym == 0x20) { /* Spacebar */ vkey = VK_SPACE; - scan = 0x39; } else if (have_chars) { /* we seem to need to search the layout-dependent scancodes */ int maxlen=0,maxval=-1,ok; @@ -1741,16 +1664,18 @@ void X11DRV_InitKeyboard( Display *display ) } if (maxval>=0) { /* got it */ - const WORD (*lscan)[MAIN_LEN] = main_key_tab[kbd_layout].scan; const WORD (*lvkey)[MAIN_LEN] = main_key_tab[kbd_layout].vkey; - scan = (*lscan)[maxval]; vkey = (*lvkey)[maxval]; } } } + + if (keyc2scan[keyc] == 0x0136) vkey = VK_RSHIFT; + if (keyc2scan[keyc] == 0x011d) vkey = VK_RCONTROL; + if (keyc2scan[keyc] == 0x0138) vkey = VK_RMENU; + TRACE("keycode %u => vkey %04X\n", e2.keycode, vkey); keyc2vkey[e2.keycode] = vkey; - keyc2scan[e2.keycode] = scan; if ((vkey & 0xff) && vkey_used[(vkey & 0xff)]) WARN("vkey %04X is being used by more than one keycode\n", vkey); vkey_used[(vkey & 0xff)] = 1; @@ -1860,20 +1785,6 @@ void X11DRV_InitKeyboard( Display *display ) } /* for */ #undef VKEY_IF_NOT_USED - /* If some keys still lack scancodes, assign some arbitrary ones to them now */ - for (scan = 0x60, keyc = min_keycode; keyc <= max_keycode; keyc++) - if (keyc2vkey[keyc]&&!keyc2scan[keyc]) { - const char *ksname; - keysym = keycode_to_keysym(display, keyc, 0); - ksname = XKeysymToString(keysym); - if (!ksname) ksname = "NoSymbol"; - - /* should make sure the scancode is unassigned here, but >=0x60 currently always is */ - - TRACE_(key)("assigning scancode %02x to unidentified keycode %u (%s)\n",scan,keyc,ksname); - keyc2scan[keyc]=scan++; - } - LeaveCriticalSection( &kbd_section ); } -- 2.28.0

2 2

[PATCH] winex11.drv: Let the Window Manager handle the off-screen window if it's managed.
by Gabriel Ivăncescu 14 Oct '20

14 Oct '20

Some applications control their own position when they are being moved. This means WindowPosChanged is called without an event. Window Managers have their own way to deal with offscreen windows, and we have to respect that, if the window is managed. So let the WM handle this situation instead of unmapping the window ourselves. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15346 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Note that this bug doesn't happen for unmanaged windows. dlls/winex11.drv/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4571739..424acee 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2458,8 +2458,10 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags (!event_type && !(new_style & WS_MINIMIZE) && !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) { + BOOL managed = data->managed; + release_win_data( data ); - unmap_window( hwnd ); + if (!managed) unmap_window( hwnd ); if (is_window_rect_full_screen( &old_window_rect )) reset_clipping_window(); if (!(data = get_win_data( hwnd ))) return; } -- 2.21.0

2 1

[PATCH] riched20: implement ITextRange/ITextSelection Copy and Cut
by Damjan Jovanovic 14 Oct '20

14 Oct '20

Clipboard handling is unified with the previous code in editor.c. Manual tests show trying to cut from a read-only field beeps when using WM_CUT or Ctrl+X, but not when using these APIs. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 51 +++++++++++++++--------- dlls/riched20/editor.h | 3 +- dlls/riched20/richole.c | 46 ++++++++++++++++++---- dlls/riched20/tests/richole.c | 74 +++++++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+), 28 deletions(-)

2 1

[PATCH 4/9] console: Don't allow blocking read ioctls on screen buffer object.
by Jacek Caban 14 Oct '20

14 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49997 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 18 ++++++++++++++++++ server/console.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-)

2 1

[PATCH 3/9] kernel32/tests: Use current console input in test_ReadConsole.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)

2 1

[PATCH 9/9] conhost: Remove no longer needed condrv_input_info fields.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 4 ---- programs/conhost/conhost.c | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-)

1 0

[PATCH 8/9] conhost: Remove no longer needed SET_CONSOLE_OUTPUT_INFO flags.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 4 +--- programs/conhost/conhost.c | 25 ------------------------- 2 files changed, 1 insertion(+), 28 deletions(-)

1 0

[PATCH 7/9] conhost: Remove no longer needed CHAR_INFO_MODE_TEXTSTDATTR.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 1 - programs/conhost/conhost.c | 11 ----------- 2 files changed, 12 deletions(-)

1 0

[PATCH 6/9] conhost: Remove no longer needed SET_CONSOLE_INPUT_INFO flags.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 8 ++----- programs/conhost/conhost.c | 45 -------------------------------------- 2 files changed, 2 insertions(+), 51 deletions(-)

1 0

[PATCH 5/9] conhost: Fix check for the last history index in edit_line_find_history.
by Jacek Caban 14 Oct '20

14 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50000 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/9] server: Remove no longer used console renderer object.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 52 --------- programs/conhost/conhost.c | 5 +- server/console.c | 213 +------------------------------------ server/trace.c | 3 +- 4 files changed, 4 insertions(+), 269 deletions(-)

1 0

[PATCH 1/9] server: Remove no longer needed console_input_events_append.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 55 +----------------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-)

1 0

[PATCH] mf: Unconditionally deliver NULL (EOS) samples.
by Derek Lesho 14 Oct '20

14 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- Without this, I observed the pipeline locking up when a stream had two transforms, the first with the final sample, and the second with an empty sample queue. Calling session_request_sample would end up calling session_deliver_sample_to_node() for the EOS sample, but the second transform wouldn't accept it due to there being no requests. This behavior seems to match session_deliver_sample_to_node's output node behavior, where the request count is only checked if the sample isn't NULL. --- dlls/mf/session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a1b54b7080e..7c82aa42a4b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2599,11 +2599,12 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples, struct sample, entry) { - if (!topo_node->u.transform.outputs[i].requests) + if (!topo_node->u.transform.outputs[i].requests && sample_entry->sample) break; session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); - topo_node->u.transform.outputs[i].requests--; + if (sample_entry->sample) + topo_node->u.transform.outputs[i].requests--; transform_release_sample(sample_entry); } -- 2.28.0

1 0

[PATCH] server: Add SeTcbPrivilege (SE_TCB_NAME) to the list of admin privileges.
by Paul Gofman 14 Oct '20

14 Oct '20

Fixes Origin client update failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Origin Client Service is run as a LocalSystem service and expects AdjustTokenPrivileges() to succeed enabling this privilege. SeTcbPrivilege is available for LocalSystem account on Windows but not for admin users. But since we currently effectively have a single user for everything it looks reasonable to add the privilege. server/token.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/token.c b/server/token.c index 26d9708f2cd..30320851436 100644 --- a/server/token.c +++ b/server/token.c @@ -42,6 +42,7 @@ #define MAX_SUBAUTH_COUNT 1 const LUID SeIncreaseQuotaPrivilege = { 5, 0 }; +const LUID SeTcbPrivilege = { 7, 0 }; const LUID SeSecurityPrivilege = { 8, 0 }; const LUID SeTakeOwnershipPrivilege = { 9, 0 }; const LUID SeLoadDriverPrivilege = { 10, 0 }; @@ -865,6 +866,7 @@ struct token *token_create_admin( void ) const LUID_AND_ATTRIBUTES admin_privs[] = { { SeChangeNotifyPrivilege , SE_PRIVILEGE_ENABLED }, + { SeTcbPrivilege , 0 }, { SeSecurityPrivilege , 0 }, { SeBackupPrivilege , 0 }, { SeRestorePrivilege , 0 }, -- 2.26.2

1 0

[PATCH 1/5] evr: Add already implemented functions from mfplat.dll.
by Nikolay Sivov 14 Oct '20

14 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index aa839295658..dcf062cf5aa 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -3,14 +3,14 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub MFConvertColorInfoFromDXVA -@ stub MFConvertColorInfoToDXVA +@ stdcall -import MFConvertColorInfoToDXVA(ptr ptr) @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array -@ stub MFCopyImage +@ stdcall -import MFCopyImage(ptr long ptr long long long) @ stub MFCreateDXSurfaceBuffer @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader -@ stub MFCreateVideoMediaTypeFromSubtype +@ stdcall -import MFCreateVideoMediaTypeFromSubtype(ptr ptr) @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader @ stdcall MFCreateVideoMixer(ptr ptr ptr ptr) @@ -20,7 +20,7 @@ @ stdcall MFCreateVideoPresenter(ptr ptr ptr ptr) @ stdcall MFCreateVideoSampleAllocator(ptr ptr) @ stdcall MFCreateVideoSampleFromSurface(ptr ptr) -@ stub MFGetPlaneSize +@ stdcall -import MFGetPlaneSize(long long long ptr) @ stub MFGetStrideForBitmapInfoHeader @ stub MFGetUncompressedVideoFormat @ stub MFInitVideoFormat -- 2.28.0

1 4

[PATCH] wined3d: Use wined3d_get_primary_adapter_luid() if we didn't get a valid LUID from Vulkan.
by Henri Verbeet 14 Oct '20

14 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index beda271c32d..3fb9e4ce4b4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2242,7 +2242,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; - LUID *luid = NULL; + LUID primary_luid, *luid = NULL; TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); @@ -2274,6 +2274,8 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (id_properties.deviceLUIDValid) luid = (LUID *)id_properties.deviceLUID; + else if (ordinal == 0 && wined3d_get_primary_adapter_luid(&primary_luid)) + luid = &primary_luid; if (!wined3d_adapter_init(adapter, ordinal, luid, &wined3d_adapter_vk_ops)) { -- 2.20.1

1 0

[PATCH 5/5] riched20: Return a run ptr from the run insert function.
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 5 +++-- dlls/riched20/run.c | 49 ++++++++++++++++++++++++------------------ dlls/riched20/undo.c | 7 +++--- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c56e5961f73..c5fa51894e8 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -471,7 +471,7 @@ ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, assert(p->pRun->type == diRun); - return ME_InsertRunAtCursor(editor, p, style, str, len, flags); + return run_get_di( run_insert( editor, p, style, str, len, flags ) ); } static struct re_object* create_re_object(const REOBJECT *reo) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b41d0f7db68..1a9f3fd6fb0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -119,8 +119,8 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, - ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; +ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, + ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ @@ -133,6 +133,7 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_next_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_prev_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index ed0273395c3..a5888960f38 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -57,6 +57,16 @@ ME_Run *run_next_all_paras( ME_Run *run ) return NULL; } +ME_Run *run_prev_all_paras( ME_Run *run ) +{ + ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + + if (ME_PrevRun( &dummy, &item, TRUE )) + return &item->member.run; + + return NULL; +} + /****************************************************************************** * ME_CanJoinRuns * @@ -347,56 +357,53 @@ ME_Run *run_create( ME_Style *s, int flags ) } /****************************************************************************** - * ME_InsertRunAtCursor + * run_insert * * Inserts a new run with given style, flags and content at a given position, * which is passed as a cursor structure (which consists of a run and * a run-relative character offset). */ -ME_DisplayItem * -ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, - const WCHAR *str, int len, int flags) +ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, + const WCHAR *str, int len, int flags ) { - ME_DisplayItem *insert_before = cursor->pRun, *prev; - ME_Run *run; + ME_Run *insert_before = &cursor->pRun->member.run, *run, *prev; if (cursor->nOffset) { - if (cursor->nOffset == cursor->pRun->member.run.len) + if (cursor->nOffset == insert_before->len) { - insert_before = ME_FindItemFwd( cursor->pRun, diRun ); - if (!insert_before) insert_before = cursor->pRun; /* Always insert before the final eop run */ + insert_before = run_next_all_paras( insert_before ); + if (!insert_before) insert_before = &cursor->pRun->member.run; /* Always insert before the final eop run */ } else { run_split( editor, cursor ); - insert_before = cursor->pRun; + insert_before = &cursor->pRun->member.run; } } - add_undo_delete_run( editor, insert_before->member.run.para->nCharOfs + - insert_before->member.run.nCharOfs, len ); + add_undo_delete_run( editor, insert_before->para->nCharOfs + insert_before->nCharOfs, len ); run = run_create( style, flags ); - run->nCharOfs = insert_before->member.run.nCharOfs; + run->nCharOfs = insert_before->nCharOfs; run->len = len; - run->para = insert_before->member.run.para; + run->para = insert_before->para; ME_InsertString( run->para->text, run->nCharOfs, str, len ); - ME_InsertBefore( insert_before, run_get_di( run ) ); + ME_InsertBefore( run_get_di( insert_before ), run_get_di( run ) ); TRACE("Shift length:%d\n", len); - ME_PropagateCharOffset( insert_before, len ); - para_mark_rewrap( editor, insert_before->member.run.para ); + ME_PropagateCharOffset( run_get_di( insert_before ), len ); + para_mark_rewrap( editor, insert_before->para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ - prev = ME_FindItemBack( run_get_di( run ), diRun ); + prev = run_prev_all_paras( run ); if (prev) { int i; for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == prev && - editor->pCursors[i].nOffset == prev->member.run.len) + if (editor->pCursors[i].pRun == run_get_di( prev ) && + editor->pCursors[i].nOffset == prev->len) { editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = len; @@ -404,7 +411,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, } } - return run_get_di( run ); + return run; } static BOOL run_is_splittable( const ME_Run *run ) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 55574dc412b..1f5c7ae4cd6 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -357,10 +357,9 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) { ME_Cursor tmp; ME_CursorFromCharOfs(editor, undo->u.insert_run.pos, &tmp); - ME_InsertRunAtCursor(editor, &tmp, undo->u.insert_run.style, - undo->u.insert_run.str, - undo->u.insert_run.len, - undo->u.insert_run.flags); + run_insert( editor, &tmp, undo->u.insert_run.style, + undo->u.insert_run.str, undo->u.insert_run.len, + undo->u.insert_run.flags ); break; } case undo_delete_run: -- 2.23.0

1 0

[PATCH 4/5] riched20: Use run ptrs in SetCharFormat().
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 5 +++-- dlls/riched20/run.c | 38 ++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7ae0b5341b0..b41d0f7db68 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -76,8 +76,6 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; -ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; -ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; @@ -132,6 +130,9 @@ int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visua int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_next_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 3f550d8d993..ed0273395c3 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -47,6 +47,16 @@ ME_Run *run_prev( ME_Run *run ) return NULL; } +ME_Run *run_next_all_paras( ME_Run *run ) +{ + ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + + if (ME_NextRun( &dummy, &item, TRUE )) + return &item->member.run; + + return NULL; +} + /****************************************************************************** * ME_CanJoinRuns * @@ -745,22 +755,22 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * * If no text is selected, then nothing is done. */ -void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) +void ME_SetCharFormat( ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *fmt ) { - ME_DisplayItem *run, *start_run = start->pRun, *end_run = NULL; + ME_Run *run, *start_run = &start->pRun->member.run, *end_run = NULL; if (end && start->pRun == end->pRun && start->nOffset == end->nOffset) return; if (start->nOffset == start->pRun->member.run.len) - start_run = ME_FindItemFwd( start->pRun, diRun ); + start_run = run_next_all_paras( &start->pRun->member.run ); else if (start->nOffset) { /* run_split() may or may not update the cursors, depending on whether they * are selection cursors, but we need to make sure they are valid. */ int split_offset = start->nOffset; ME_Run *split_run = run_split( editor, start ); - start_run = start->pRun; + start_run = &start->pRun->member.run; if (end && &end->pRun->member.run == split_run) { end->pRun = start->pRun; @@ -771,26 +781,26 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C if (end) { if (end->nOffset == end->pRun->member.run.len) - end_run = ME_FindItemFwd( end->pRun, diRun ); + end_run = run_next_all_paras( &end->pRun->member.run ); else { if (end->nOffset) run_split( editor, end ); - end_run = end->pRun; + end_run = &end->pRun->member.run; } } - for (run = start_run; run != end_run; run = ME_FindItemFwd( run, diRun )) + for (run = start_run; run != end_run; run = run_next_all_paras( run )) { - ME_Style *new_style = ME_ApplyStyle(editor, run->member.run.style, pFmt); - ME_Paragraph *para = run->member.run.para; + ME_Style *new_style = ME_ApplyStyle( editor, run->style, fmt ); + ME_Paragraph *para = run->para; - add_undo_set_char_fmt( editor, run->member.run.para->nCharOfs + run->member.run.nCharOfs, - run->member.run.len, &run->member.run.style->fmt ); - ME_ReleaseStyle(run->member.run.style); - run->member.run.style = new_style; + add_undo_set_char_fmt( editor, para->nCharOfs + run->nCharOfs, + run->len, &run->style->fmt ); + ME_ReleaseStyle( run->style ); + run->style = new_style; /* The para numbering style depends on the eop style */ - if ((run->member.run.nFlags & MERF_ENDPARA) && para->para_num.style) + if ((run->nFlags & MERF_ENDPARA) && para->para_num.style) { ME_ReleaseStyle(para->para_num.style); para->para_num.style = NULL; -- 2.23.0

1 0

[PATCH 3/5] riched20: Don't return the diTextStart paragraph from para_prev().
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 6 ++---- dlls/riched20/para.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5f7d52aa4cf..c56e5961f73 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -774,12 +774,10 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { para = run->para; /* Skip empty start of table row paragraph */ - if (para_prev( para )->nFlags & MEPF_ROWSTART) + if (para_prev( para ) && para_prev( para )->nFlags & MEPF_ROWSTART) para = para_prev( para ); /* Paragraph breaks are treated as separate words */ - if (para_get_di( para_prev( para ) )->type == diTextStart) - return FALSE; - + if (!para_prev( para )) return FALSE; para = para_prev( para ); run = para_end_run( para ); } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 99ce1706631..431f89faed3 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -64,7 +64,7 @@ ME_Paragraph *para_next( ME_Paragraph *para ) ME_Paragraph *para_prev( ME_Paragraph *para ) { - if (para->prev_para) return &para->prev_para->member.para; + if (para->prev_para && para->prev_para->type == diParagraph) return &para->prev_para->member.para; return NULL; } -- 2.23.0

1 0

[PATCH 2/5] riched20: Don't mark the diTextStart paragraph as requiring repainting.
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 393b1784d4e..26f1c30b83f 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1049,8 +1049,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) else totalWidth = max(totalWidth, para->nWidth); - if (!para->nCharOfs) - update_repaint( para_prev( para ), &repaint ); update_repaint( para, &repaint ); adjust_para_y( para, &c, &repaint ); -- 2.23.0

1 0

[PATCH 1/5] riched20: Return a run ptr from the run splitting function.
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 6 ++++-- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 16 ++++++++-------- dlls/riched20/table.c | 4 ++-- dlls/riched20/undo.c | 4 ++-- dlls/riched20/wrap.c | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1c3f4b16526..5f7d52aa4cf 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -607,7 +607,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, /* handle special \r\r\n sequence (richedit 2.x and higher only) */ WCHAR space = ' '; ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); - } else { + } + else + { const WCHAR cr = '\r', *eol_str = str; if (!editor->bEmulateVersion10) @@ -625,7 +627,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } else { - if (p->nOffset) ME_SplitRunSimple(editor, p); + if (p->nOffset) run_split( editor, p ); run = &p->pRun->member.run; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 244010df735..7ae0b5341b0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -132,7 +132,7 @@ int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visua int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; +ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 84b851039b7..3f550d8d993 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -268,12 +268,12 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) } /****************************************************************************** - * ME_SplitRunSimple + * run_split * * Does the most basic job of splitting a run into two - it does not * update the positions and extents. */ -ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) +ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Run *run = &cursor->pRun->member.run, *new_run; int i; @@ -303,7 +303,7 @@ ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) } } para_mark_rewrap( editor, run->para ); - return run_get_di( run ); + return run; } /****************************************************************************** @@ -359,7 +359,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, } else { - ME_SplitRunSimple( editor, cursor ); + run_split( editor, cursor ); insert_before = cursor->pRun; } } @@ -756,12 +756,12 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C start_run = ME_FindItemFwd( start->pRun, diRun ); else if (start->nOffset) { - /* SplitRunSimple may or may not update the cursors, depending on whether they + /* run_split() may or may not update the cursors, depending on whether they * are selection cursors, but we need to make sure they are valid. */ int split_offset = start->nOffset; - ME_DisplayItem *split_run = ME_SplitRunSimple(editor, start); + ME_Run *split_run = run_split( editor, start ); start_run = start->pRun; - if (end && end->pRun == split_run) + if (end && &end->pRun->member.run == split_run) { end->pRun = start->pRun; end->nOffset -= split_offset; @@ -774,7 +774,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C end_run = ME_FindItemFwd( end->pRun, diRun ); else { - if (end->nOffset) ME_SplitRunSimple(editor, end); + if (end->nOffset) run_split( editor, end ); end_run = end->pRun; } } diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 615145b85e8..95b0fb0a8a6 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -66,8 +66,8 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); ME_DisplayItem *tp; ME_Cursor* cursor = &editor->pCursors[nCursor]; - if (cursor->nOffset) - ME_SplitRunSimple(editor, cursor); + + if (cursor->nOffset) run_split( editor, cursor ); tp = ME_SplitParagraph(editor, cursor->pRun, pStyle, eol_str, eol_len, paraFlags); ME_ReleaseStyle(pStyle); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index c6b898b2ddc..55574dc412b 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -383,9 +383,9 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) ME_DisplayItem *this_para, *new_para; BOOL bFixRowStart; int paraFlags = undo->u.split_para.flags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND); + ME_CursorFromCharOfs(editor, undo->u.split_para.pos, &tmp); - if (tmp.nOffset) - ME_SplitRunSimple(editor, &tmp); + if (tmp.nOffset) run_split( editor, &tmp ); this_para = tmp.pPara; bFixRowStart = this_para->member.para.nFlags & MEPF_ROWSTART; if (bFixRowStart) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index fda1d995577..393b1784d4e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -139,7 +139,7 @@ static ME_Run *split_run_extents( ME_WrapContext *wc, ME_Run *run, int nVChar ) TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), run->pt.x, run->pt.y); - ME_SplitRunSimple(editor, &cursor); + run_split( editor, &cursor ); run2 = &cursor.pRun->member.run; run2->script_analysis = run->script_analysis; @@ -776,7 +776,7 @@ static HRESULT itemize_para( ME_Context *c, ME_Paragraph *para ) if (run->nCharOfs + run->len > items[cur_item+1].iCharPos) { ME_Cursor cursor = {para_get_di( para ), run_get_di( run ), items[cur_item+1].iCharPos - run->nCharOfs}; - ME_SplitRunSimple( c->editor, &cursor ); + run_split( c->editor, &cursor ); } } -- 2.23.0

1 0

[PATCH 2/3] winevulkan: Implement extension faking mechanism
by Joshua Ashton 14 Oct '20

14 Oct '20

- Joshie 🐸✨

6 23

[PATCH 5/5] dssenh: Implement CPGenKey.
by Hans Leidekker 14 Oct '20

14 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 143 ++++++++++++++++++++++++++++--------- dlls/dssenh/tests/dssenh.c | 109 ++++++++++++++-------------- 2 files changed, 164 insertions(+), 88 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 752189d15bb..5ad0ef1505d 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -19,6 +19,8 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wincrypt.h" @@ -309,27 +311,6 @@ BOOL WINAPI CPGetProvParam( HCRYPTPROV hprov, DWORD param, BYTE *data, DWORD *le return FALSE; } -BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *ret_key ) -{ - return FALSE; -} - -BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) -{ - struct key *key = (struct key *)hkey; - - TRACE( "%p, %p\n", (void *)hprov, (void *)hkey ); - - if (key->magic != MAGIC_KEY) - { - SetLastError( NTE_BAD_KEY ); - return FALSE; - } - - destroy_key( key ); - return TRUE; -} - static BOOL store_key_pair( struct key *key, HKEY hkey, DWORD keyspec, DWORD flags ) { const WCHAR *value; @@ -378,6 +359,112 @@ static BOOL store_key_container_keys( struct container *container ) return ret; } +static struct key *duplicate_key( const struct key *key ) +{ + struct key *ret; + + if (!(ret = create_key( key->algid, key->flags ))) return NULL; + + if (BCryptDuplicateKey( key->handle, &ret->handle, NULL, 0, 0 )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +static BOOL generate_key( struct container *container, ALG_ID algid, DWORD bitlen, DWORD flags, HCRYPTKEY *ret_key ) +{ + struct key *key, *sign_key; + NTSTATUS status; + + if (!(key = create_key( algid, flags ))) return FALSE; + + if ((status = BCryptGenerateKeyPair( key->alg_handle, &key->handle, bitlen, 0 ))) + { + ERR( "failed to generate key %08x\n", status ); + destroy_key( key ); + return FALSE; + } + if ((status = BCryptFinalizeKeyPair( key->handle, 0 ))) + { + ERR( "failed to finalize key %08x\n", status ); + destroy_key( key ); + return FALSE; + } + + switch (algid) + { + case AT_SIGNATURE: + case CALG_DSS_SIGN: + if (!(sign_key = duplicate_key( key ))) + { + destroy_key( key ); + return FALSE; + } + destroy_key( container->sign_key ); + container->sign_key = sign_key; + break; + + default: + FIXME( "unhandled algorithm %08x\n", algid ); + return FALSE; + } + + if (!store_key_container_keys( container )) + { + destroy_key( key ); + return FALSE; + } + + *ret_key = (HCRYPTKEY)key; + return TRUE; +} + +BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *ret_key ) +{ + static const unsigned int supported_key_lengths[] = { 512, 768, 1024 }; + struct container *container = (struct container *)hprov; + ULONG i, bitlen = HIWORD(flags) ? HIWORD(flags) : 1024; + + TRACE( "%p, %08x, %08x, %p\n", (void *)hprov, algid, flags, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + + if (bitlen % 2) + { + SetLastError( STATUS_INVALID_PARAMETER ); + return FALSE; + } + for (i = 0; i < ARRAY_SIZE(supported_key_lengths); i++) + { + if (bitlen == supported_key_lengths[i]) break; + } + if (i >= ARRAY_SIZE(supported_key_lengths)) + { + SetLastError( NTE_BAD_FLAGS ); + return FALSE; + } + + return generate_key( container, algid, bitlen, LOWORD(flags), ret_key ); +} + +BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) +{ + struct key *key = (struct key *)hkey; + + TRACE( "%p, %p\n", (void *)hprov, (void *)hkey ); + + if (key->magic != MAGIC_KEY) + { + SetLastError( NTE_BAD_KEY ); + return FALSE; + } + + destroy_key( key ); + return TRUE; +} + #define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) #define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) @@ -493,20 +580,6 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW return !BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PUBLIC_BLOB, data, *len, len, 0 ); } -static struct key *duplicate_key( const struct key *key ) -{ - struct key *ret; - - if (!(ret = create_key( key->algid, key->flags ))) return NULL; - - if (BCryptDuplicateKey( key->handle, &ret->handle, NULL, 0, 0 )) - { - heap_free( ret ); - return NULL; - } - return ret; -} - BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, DWORD flags, HCRYPTKEY *ret_key ) { struct key *key = (struct key *)hkey, *ret; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index c2ab37d288b..4f401254f52 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -184,14 +184,16 @@ struct keylength_test { BOOL expectedResult; DWORD expectedError; DWORD brokenError; + int todo_result; + int todo_error; }; static const struct keylength_test baseDSS_keylength[] = { /* AT_KEYEXCHANGE is not supported by the base DSS provider */ - {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_ALGID}, - {AT_KEYEXCHANGE, 512 << 16, FALSE, NTE_BAD_ALGID}, - {AT_KEYEXCHANGE, 1024 << 16, FALSE, NTE_BAD_ALGID}, - {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_ALGID}, + {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {AT_KEYEXCHANGE, 512 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {AT_KEYEXCHANGE, 1024 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, /* min 512 max 1024 increment by 64 */ {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, @@ -200,15 +202,15 @@ static const struct keylength_test baseDSS_keylength[] = { {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, /* CALG_DH_EPHEM is not supported by the base DSS provider */ - {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_ALGID}, - {CALG_DH_EPHEM, 512 << 16, FALSE, NTE_BAD_ALGID}, - {CALG_DH_EPHEM, 1024 << 16, FALSE, NTE_BAD_ALGID}, - {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_ALGID}, + {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {CALG_DH_EPHEM, 512 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {CALG_DH_EPHEM, 1024 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, /* CALG_DH_SF is not supported by the base DSS provider */ - {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_ALGID}, - {CALG_DH_SF, 512 << 16, FALSE, NTE_BAD_ALGID}, - {CALG_DH_SF, 1024 << 16, FALSE, NTE_BAD_ALGID}, - {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_ALGID}, + {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {CALG_DH_SF, 512 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {CALG_DH_SF, 1024 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, + {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_ALGID, 0, 0, 1}, /* min 512 max 1024, increment by 64 */ {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, @@ -221,10 +223,10 @@ static const struct keylength_test baseDSS_keylength[] = { static const struct keylength_test dssDH_keylength[] = { /* min 512 max 1024, increment by 64 */ {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, - {AT_KEYEXCHANGE, 512 << 16, TRUE}, - {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_BAD_FLAGS}, - {AT_KEYEXCHANGE, 768 << 16, TRUE}, - {AT_KEYEXCHANGE, 1024 << 16, TRUE}, + {AT_KEYEXCHANGE, 512 << 16, TRUE, 0, 0, 1}, + {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_BAD_FLAGS, 0, 0, 1}, + {AT_KEYEXCHANGE, 768 << 16, TRUE, 0, 0, 1}, + {AT_KEYEXCHANGE, 1024 << 16, TRUE, 0, 0, 1}, {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, @@ -233,16 +235,16 @@ static const struct keylength_test dssDH_keylength[] = { {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_EPHEM, 512 << 16, TRUE}, - {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_EPHEM, 768 << 16, TRUE}, - {CALG_DH_EPHEM, 1024 << 16, TRUE}, + {CALG_DH_EPHEM, 512 << 16, TRUE, 0, 0, 1}, + {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_BAD_FLAGS, 0, 0, 1}, + {CALG_DH_EPHEM, 768 << 16, TRUE, 0, 0, 1}, + {CALG_DH_EPHEM, 1024 << 16, TRUE, 0, 0, 1}, {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_SF, 512 << 16, TRUE}, - {CALG_DH_SF, 513 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_SF, 768 << 16, TRUE}, - {CALG_DH_SF, 1024 << 16, TRUE}, + {CALG_DH_SF, 512 << 16, TRUE, 0, 0, 1}, + {CALG_DH_SF, 513 << 16, FALSE, NTE_BAD_FLAGS, 0, 0, 1}, + {CALG_DH_SF, 768 << 16, TRUE, 0, 0, 1}, + {CALG_DH_SF, 1024 << 16, TRUE, 0, 0, 1}, {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, @@ -255,12 +257,12 @@ static const struct keylength_test dssDH_keylength[] = { static const struct keylength_test dssENH_keylength[] = { /* min 512 max 1024 (AT_KEYEXCHANGE, CALG_DH_EPHEM, CALG_DH_SF max 4096), increment by 64*/ {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, - {AT_KEYEXCHANGE, 512 << 16, TRUE}, - {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_BAD_FLAGS}, - {AT_KEYEXCHANGE, 768 << 16, TRUE}, - {AT_KEYEXCHANGE, 1024 << 16, TRUE}, - {AT_KEYEXCHANGE, 1088 << 16, TRUE}, - {AT_KEYEXCHANGE, 2048 << 16, TRUE}, + {AT_KEYEXCHANGE, 512 << 16, TRUE, 0, 0, 1}, + {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_BAD_FLAGS, 0, 0, 1}, + {AT_KEYEXCHANGE, 768 << 16, TRUE, 0, 0, 1}, + {AT_KEYEXCHANGE, 1024 << 16, TRUE, 0, 0, 1}, + {AT_KEYEXCHANGE, 1088 << 16, TRUE, 0, 0, 1}, + {AT_KEYEXCHANGE, 2048 << 16, TRUE, 0, 0, 1}, /* Keylength too large - test bot timeout. {AT_KEYEXCHANGE, 3072 << 16, TRUE}, {AT_KEYEXCHANGE, 4096 << 16, TRUE}, */ @@ -272,20 +274,20 @@ static const struct keylength_test dssENH_keylength[] = { {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1032 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_EPHEM, 512 << 16, TRUE}, - {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_EPHEM, 768 << 16, TRUE}, - {CALG_DH_EPHEM, 1024 << 16, TRUE}, + {CALG_DH_EPHEM, 512 << 16, TRUE, 0, 0, 1}, + {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_BAD_FLAGS, 0, 0, 1}, + {CALG_DH_EPHEM, 768 << 16, TRUE, 0, 0, 1}, + {CALG_DH_EPHEM, 1024 << 16, TRUE, 0, 0, 1}, {CALG_DH_EPHEM, 1040 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_EPHEM, 1088 << 16, TRUE}, + {CALG_DH_EPHEM, 1088 << 16, TRUE, 0, 0, 1}, {CALG_DH_EPHEM, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_SF, 512 << 16, TRUE}, - {CALG_DH_SF, 513 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_SF, 768 << 16, TRUE}, - {CALG_DH_SF, 1024 << 16, TRUE}, + {CALG_DH_SF, 512 << 16, TRUE, 0, 0, 1}, + {CALG_DH_SF, 513 << 16, FALSE, NTE_BAD_FLAGS, 0, 0, 1}, + {CALG_DH_SF, 768 << 16, TRUE, 0, 0, 1}, + {CALG_DH_SF, 1024 << 16, TRUE, 0, 0, 1}, {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, - {CALG_DH_SF, 1088 << 16, TRUE}, + {CALG_DH_SF, 1088 << 16, TRUE, 0, 0, 1}, {CALG_DH_SF, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, @@ -307,16 +309,22 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t result = CryptGenKey(hProv, tests[i].algid, tests[i].flags, &key); /* success */ - if(tests[i].expectedResult) + if (tests[i].expectedResult) { - ok(result, "%d: Expected a key, got %08x\n", i, GetLastError()); - result = CryptDestroyKey(key); - ok(result, "Expected no errors.\n"); + todo_wine_if (tests[i].todo_result) ok(result, "%d: got %08x\n", i, GetLastError()); + if (result) + { + result = CryptDestroyKey(key); + ok(result, "%d: got %08x\n", i, GetLastError()); + } } else - ok(!result && (GetLastError() == tests[i].expectedError || - broken(GetLastError() == tests[i].brokenError)), - "%d: got %x.\n", i, GetLastError()); + { + todo_wine_if (tests[i].todo_result) ok(!result, "%d: got %x\n", i, GetLastError()); + todo_wine_if (tests[i].todo_error) + ok(GetLastError() == tests[i].expectedError || + broken(GetLastError() == tests[i].brokenError), "%d: got %08x\n", i, GetLastError()); + } } } @@ -337,12 +345,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); result = CryptGenKey(hProv, AT_SIGNATURE, 0, &key); - todo_wine ok(result, "Expected no errors.\n"); - if (!result) - { - skip("skipping key length tests\n"); - return; - } + ok(result, "Expected no errors.\n"); result = CryptDestroyKey(key); ok(result, "Expected no errors.\n"); -- 2.28.0

1 0

[PATCH 4/5] dssenh: Implement CPVerifySignature.
by Hans Leidekker 14 Oct '20

14 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index da269807bf9..752189d15bb 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -759,7 +759,24 @@ BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, const WCHAR *desc, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + struct key *key = (struct key *)hpubkey; + UCHAR hashval[MAX_HASH_LEN]; + ULONG hashlen = sizeof(hashval); + + TRACE( "%p, %p, %p, %u %p, %s, %08x\n", (void *)hprov, (void *)hhash, sig, siglen, (void *)hpubkey, + debugstr_w(desc), flags ); + + if (hash->magic != MAGIC_HASH || key->magic != MAGIC_KEY) return FALSE; + if (flags) + { + FIXME( "flags %08x not supported\n", flags ); + return FALSE; + } + + if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; + + return !BCryptVerifySignature( key->handle, NULL, hashval, hashlen, (UCHAR *)sig, siglen, 0 ); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -- 2.28.0

1 0

[PATCH 3/5] dssenh: Implement CPSignHash.
by Hans Leidekker 14 Oct '20

14 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 34 +++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 12 +++++++----- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b575689ab1f..da269807bf9 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -718,10 +718,42 @@ BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD return FALSE; } +static DWORD get_signature_length( DWORD algid ) +{ + switch (algid) + { + case AT_SIGNATURE: + case CALG_DSS_SIGN: return 40; + default: + FIXME( "unhandled algorithm %u\n", algid ); + return 0; + } +} + +#define MAX_HASH_LEN 20 BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const WCHAR *desc, DWORD flags, BYTE *sig, DWORD *siglen ) { - return FALSE; + struct container *container = (struct container *)hprov; + struct hash *hash = (struct hash *)hhash; + UCHAR hashval[MAX_HASH_LEN]; + ULONG len, hashlen = sizeof(hashval); + + TRACE( "%p, %p, %u, %s, %08x, %p, %p\n", (void *)hprov, (void *)hhash, keyspec, debugstr_w(desc), flags, sig, + siglen ); + + if (container->magic != MAGIC_CONTAINER || !container->sign_key) return FALSE; + if (hash->magic != MAGIC_HASH) return FALSE; + + if (!(len = get_signature_length( container->sign_key->algid ))) return FALSE; + if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; + if (*siglen < len) + { + *siglen = len; + return TRUE; + } + + return !BCryptSignHash( container->sign_key->handle, NULL, hashval, hashlen, sig, *siglen, siglen, 0 ); } BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 6ad15225924..c2ab37d288b 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -889,12 +889,8 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(!memcmp(hashValue1, hashValue2, hashLen2), "Hashes were not identical.\n"); /* Sign hash 1 */ + signLen1 = 0; result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, NULL, &signLen1); - if (!result) - { - skip("skipping sign tests\n"); - return; - } ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1); @@ -902,6 +898,7 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to sign hash, got %x\n", GetLastError()); /* Sign hash 2 */ + signLen2 = 0; result = CryptSignHashA(hHash2, AT_SIGNATURE, NULL, 0, NULL, &signLen2); ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen2 == 40, "Expected a 40-byte signature, got %d\n", signLen2); @@ -943,6 +940,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Verify signed hash 1 */ result = CryptVerifySignatureA(hHash1, signValue1, sizeof(signValue1), pubKey, NULL, 0); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to verify signature, got %x\n", GetLastError()); result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash2); -- 2.28.0

1 0

[PATCH 2/5] dssenh: Implement CPExportKey.
by Hans Leidekker 14 Oct '20

14 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 38f249ef04d..b575689ab1f 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include <stdarg.h> #include "windef.h" @@ -469,7 +468,29 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, BYTE *data, DWORD *len ) { - return FALSE; + struct key *key = (struct key *)hkey; + + TRACE( "%p, %p, %p, %08x, %08x, %p, %p\n", (void *)hprov, (void *)hkey, (void *)hexpkey, blobtype, flags, + data, len ); + + if (key->magic != MAGIC_KEY) return FALSE; + if (hexpkey) + { + FIXME( "export key not supported\n" ); + return FALSE; + } + if (blobtype != PUBLICKEYBLOB) + { + FIXME( "blob type %u not supported\n", blobtype ); + return FALSE; + } + if (flags) + { + FIXME( "flags %08x not supported\n", flags ); + return FALSE; + } + + return !BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PUBLIC_BLOB, data, *len, len, 0 ); } static struct key *duplicate_key( const struct key *key ) -- 2.28.0

1 0

[PATCH 1/5] bcrypt: Add support for duplicating asymmetric keys.
by Hans Leidekker 14 Oct '20

14 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 97 +++++++++++++++++++---------------- dlls/bcrypt/gnutls.c | 94 +++++++++++++++++++++++++++++++++ dlls/bcrypt/macos.c | 7 +++ 4 files changed, 155 insertions(+), 44 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 13d6ba8d6c6..463672db470 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -205,6 +205,7 @@ struct key_funcs void (CDECL *key_symmetric_destroy)( struct key * ); NTSTATUS (CDECL *key_asymmetric_init)( struct key * ); NTSTATUS (CDECL *key_asymmetric_generate)( struct key * ); + NTSTATUS (CDECL *key_asymmetric_duplicate)( struct key *, struct key * ); NTSTATUS (CDECL *key_asymmetric_sign)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG ); NTSTATUS (CDECL *key_asymmetric_verify)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, DWORD ); void (CDECL *key_asymmetric_destroy)( struct key * ); diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a91f31e9f09..b0ea7fce191 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1011,36 +1011,6 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) -{ - UCHAR *buffer; - - memset( key_copy, 0, sizeof(*key_copy) ); - key_copy->hdr = key_orig->hdr; - key_copy->alg_id = key_orig->alg_id; - - if (key_is_symmetric( key_orig )) - { - if (!(buffer = heap_alloc( key_orig->u.s.secret_len ))) return STATUS_NO_MEMORY; - memcpy( buffer, key_orig->u.s.secret, key_orig->u.s.secret_len ); - - key_copy->u.s.mode = key_orig->u.s.mode; - key_copy->u.s.block_size = key_orig->u.s.block_size; - key_copy->u.s.secret = buffer; - key_copy->u.s.secret_len = key_orig->u.s.secret_len; - } - else - { - if (!(buffer = heap_alloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY; - memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len ); - - key_copy->u.a.pubkey = buffer; - key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; - } - - return STATUS_SUCCESS; -} - static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { @@ -1482,6 +1452,56 @@ NTSTATUS WINAPI BCryptExportKey( BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE return key_export( key, type, output, output_len, size ); } +static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) +{ + UCHAR *buffer; + NTSTATUS status; + + memset( key_copy, 0, sizeof(*key_copy) ); + key_copy->hdr = key_orig->hdr; + key_copy->alg_id = key_orig->alg_id; + + if (key_is_symmetric( key_orig )) + { + if (!(buffer = heap_alloc( key_orig->u.s.secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->u.s.secret, key_orig->u.s.secret_len ); + + key_copy->u.s.mode = key_orig->u.s.mode; + key_copy->u.s.block_size = key_orig->u.s.block_size; + key_copy->u.s.secret = buffer; + key_copy->u.s.secret_len = key_orig->u.s.secret_len; + } + else + { + if (!(buffer = heap_alloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len ); + + key_copy->u.a.pubkey = buffer; + key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; + + if ((status = key_funcs->key_asymmetric_duplicate( key_orig, key_copy ))) return status; + } + + return STATUS_SUCCESS; +} + +static void key_destroy( struct key *key ) +{ + if (key_is_symmetric( key )) + { + key_funcs->key_symmetric_destroy( key ); + heap_free( key->u.s.vector ); + heap_free( key->u.s.secret ); + } + else + { + key_funcs->key_asymmetric_destroy( key ); + heap_free( key->u.a.pubkey ); + } + key->hdr.magic = 0; + heap_free( key ); +} + NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, UCHAR *object, ULONG object_len, ULONG flags ) { @@ -1498,7 +1518,7 @@ NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE if ((status = key_duplicate( key_orig, key_copy ))) { - heap_free( key_copy ); + key_destroy( key_copy ); return status; } @@ -1564,19 +1584,8 @@ NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) TRACE( "%p\n", handle ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (key_is_symmetric( key )) - { - key_funcs->key_symmetric_destroy( key ); - heap_free( key->u.s.vector ); - heap_free( key->u.s.secret ); - } - else - { - key_funcs->key_asymmetric_destroy( key ); - heap_free( key->u.a.pubkey ); - } - key->hdr.magic = 0; - heap_free( key ); + + key_destroy( key ); return STATUS_SUCCESS; } diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 94e375cc8cf..5ed51e8704c 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -106,6 +106,9 @@ static int (*pgnutls_privkey_export_rsa_raw)(gnutls_privkey_t, gnutls_datum_t *, static int (*pgnutls_privkey_export_dsa_raw)(gnutls_privkey_t, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_privkey_generate)(gnutls_privkey_t, gnutls_pk_algorithm_t, unsigned int, unsigned int); +static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *); /* Not present in gnutls version < 3.6.0 */ static int (*pgnutls_decode_rs_value)(const gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); @@ -205,6 +208,13 @@ static int compat_gnutls_decode_rs_value(const gnutls_datum_t * sig_value, gnutl return GNUTLS_E_INTERNAL_ERROR; } +static int compat_gnutls_privkey_import_rsa_raw(gnutls_privkey_t key, const gnutls_datum_t *m, const gnutls_datum_t *e, + const gnutls_datum_t *d, const gnutls_datum_t *p, const gnutls_datum_t *q, + const gnutls_datum_t *u, const gnutls_datum_t *e1, const gnutls_datum_t *e2) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -315,6 +325,11 @@ static BOOL gnutls_initialize(void) WARN("gnutls_decode_rs_value not found\n"); pgnutls_decode_rs_value = compat_gnutls_decode_rs_value; } + if (!(pgnutls_privkey_import_rsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_import_rsa_raw" ))) + { + WARN("gnutls_privkey_import_rsa_raw not found\n"); + pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; + } if (TRACE_ON( bcrypt )) { @@ -1733,6 +1748,84 @@ static void CDECL key_asymmetric_destroy( struct key *key ) if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey ); } +static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key *key_copy ) +{ + int ret; + + if (!key_data(key_orig)->privkey) return STATUS_SUCCESS; + + if ((ret = pgnutls_privkey_init( &key_data(key_copy)->privkey ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + switch (key_orig->alg_id) + { + case ALG_ID_RSA: + case ALG_ID_RSA_SIGN: + { + gnutls_datum_t m, e, d, p, q, u, e1, e2; + if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key_orig)->privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + ret = pgnutls_privkey_import_rsa_raw( key_data(key_copy)->privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ); + free( m.data ); free( e.data ); free( d.data ); free( p.data ); free( q.data ); free( u.data ); + free( e1.data ); free( e2.data ); + if (ret) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + break; + } + case ALG_ID_DSA: + { + gnutls_datum_t p, q, g, y, x; + if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key_orig)->privkey, &p, &q, &g, &y, &x ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + ret = pgnutls_privkey_import_dsa_raw( key_data(key_copy)->privkey, &p, &q, &g, &y, &x ); + free( p.data ); free( q.data ); free( g.data ); free( y.data ); free( x.data ); + if (ret) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + break; + } + case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + { + gnutls_ecc_curve_t curve; + gnutls_datum_t x, y, k; + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key_orig)->privkey, &curve, &x, &y, &k ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + ret = pgnutls_privkey_import_ecc_raw( key_data(key_copy)->privkey, curve, &x, &y, &k ); + free( x.data ); free( y.data ); free( k.data ); + if (ret) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + break; + } + default: + ERR( "unhandled algorithm %u\n", key_orig->alg_id ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static const struct key_funcs key_funcs = { key_set_property, @@ -1745,6 +1838,7 @@ static const struct key_funcs key_funcs = key_symmetric_destroy, key_asymmetric_init, key_asymmetric_generate, + key_asymmetric_duplicate, key_asymmetric_sign, key_asymmetric_verify, key_asymmetric_destroy, diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 37615e97689..d8bba46ad5c 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -259,6 +259,12 @@ static void CDECL key_asymmetric_destroy( struct key *key ) { } +static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key *key_copy ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static const struct key_funcs key_funcs = { key_set_property, @@ -271,6 +277,7 @@ static const struct key_funcs key_funcs = key_symmetric_destroy, key_asymmetric_init, key_asymmetric_generate, + key_asymmetric_duplicate, key_asymmetric_sign, key_asymmetric_verify, key_asymmetric_destroy, -- 2.28.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 14 Oct '20

14 Oct '20

1 0

[PATCH] dsdmo: add a version resource
by Austin English 14 Oct '20

14 Oct '20

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/dsdmo/Makefile.in | 2 ++ dlls/dsdmo/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 dlls/dsdmo/version.rc diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index d184b025ad0..d86dbbd804a 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ IDL_SRCS = \ dsdmo.idl + +RC_SRCS = version.rc diff --git a/dlls/dsdmo/version.rc b/dlls/dsdmo/version.rc new file mode 100644 index 00000000000..77cc1728fbf --- /dev/null +++ b/dlls/dsdmo/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine dsdmo" +#define WINE_FILENAME_STR "dsdmo.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.26.2

1 0

[PATCH] qasf: add a version resource
by Austin English 14 Oct '20

14 Oct '20

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/qasf/Makefile.in | 2 ++ dlls/qasf/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 dlls/qasf/version.rc diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index 39239d38aea..928bf04d80e 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -10,3 +10,5 @@ C_SRCS = \ IDL_SRCS = \ qasf_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qasf/version.rc b/dlls/qasf/version.rc new file mode 100644 index 00000000000..dab46194395 --- /dev/null +++ b/dlls/qasf/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine qasf" +#define WINE_FILENAME_STR "qasf.dll" +#define WINE_FILEVERSION 9,0,0,4503 +#define WINE_FILEVERSION_STR "9.0.0.4503" +#define WINE_PRODUCTVERSION 9,0,0,4503 +#define WINE_PRODUCTVERSION_STR "9.0.0.4503" + +#include "wine/wine_common_ver.rc" -- 2.26.2

1 0

[PATCH] qedit: add a version resource
by Austin English 14 Oct '20

14 Oct '20

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/qedit/Makefile.in | 2 ++ dlls/qedit/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 dlls/qedit/version.rc diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 4891328c7a9..4eb57322f5e 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -11,3 +11,5 @@ C_SRCS = \ timeline.c IDL_SRCS = qedit_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qedit/version.rc b/dlls/qedit/version.rc new file mode 100644 index 00000000000..dd5f3ccbc7f --- /dev/null +++ b/dlls/qedit/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine qedit" +#define WINE_FILENAME_STR "qedit.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.26.2

1 0

[PATCH] kernelbase: Fix status check in GetExitCodeProcess().
by Paul Gofman 14 Oct '20

14 Oct '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index e7998c00f28..1ec0d478bea 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -746,7 +746,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetExitCodeProcess( HANDLE process, LPDWORD exit_c PROCESS_BASIC_INFORMATION pbi; status = NtQueryInformationProcess( process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); - if (status && exit_code) *exit_code = pbi.ExitStatus; + if (!status && exit_code) *exit_code = pbi.ExitStatus; return set_ntstatus( status ); } -- 2.26.2

1 0

[PATCH] strmbase: Print colorimetry information in strmbase_dump_media_type().
by Zebediah Figura 14 Oct '20

14 Oct '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/mediatype.c | 9 +++++ include/dvdmedia.h | 1 + include/dxva.h | 82 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index c2560352aae..9544d1b8bae 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -21,6 +21,7 @@ #include "strmbase_private.h" #include "dvdmedia.h" +#include "dxva.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); @@ -132,6 +133,14 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags); TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); if (vih->u.dwControlFlags) TRACE("control flags %#x, ", vih->u.dwControlFlags); + if (vih->u.dwControlFlags & AMCONTROL_COLORINFO_PRESENT) + { + const DXVA_ExtendedFormat *colorimetry = (const DXVA_ExtendedFormat *)&vih->u.dwControlFlags; + + TRACE("chroma site %#x, range %#x, matrix %#x, lighting %#x, primaries %#x, transfer function %#x, ", + colorimetry->VideoChromaSubsampling, colorimetry->NominalRange, colorimetry->VideoTransferMatrix, + colorimetry->VideoLighting, colorimetry->VideoPrimaries, colorimetry->VideoTransferFunction); + } TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), diff --git a/include/dvdmedia.h b/include/dvdmedia.h index daf1c9d37cb..6e625b472f8 100644 --- a/include/dvdmedia.h +++ b/include/dvdmedia.h @@ -22,6 +22,7 @@ #define AMCONTROL_USED 0x00000001 #define AMCONTROL_PAD_TO_4x3 0x00000002 #define AMCONTROL_PAD_TO_16x9 0x00000004 +#define AMCONTROL_COLORINFO_PRESENT 0x00000080 typedef struct tagVIDEOINFOHEADER2 { RECT rcSource; diff --git a/include/dxva.h b/include/dxva.h index 25354f58879..4f18f2e60da 100644 --- a/include/dxva.h +++ b/include/dxva.h @@ -565,6 +565,88 @@ typedef struct _DXVA_Status_VPx #include <poppack.h> +typedef enum _DXVA_VideoChromaSubsampling +{ + DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes = 0x1, + DXVA_VideoChromaSubsampling_Vertically_Cosited = 0x2, + DXVA_VideoChromaSubsampling_Horizontally_Cosited = 0x4, + DXVA_VideoChromaSubsampling_ProgressiveChroma = 0x8, + + DXVA_VideoChromaSubsampling_Unknown = 0, + DXVA_VideoChromaSubsampling_Cosited = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes + | DXVA_VideoChromaSubsampling_Vertically_Cosited + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, + DXVA_VideoChromaSubsampling_DV_PAL = DXVA_VideoChromaSubsampling_Vertically_Cosited + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, + DXVA_VideoChromaSubsampling_MPEG1 = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes, + DXVA_VideoChromaSubsampling_MPEG2 = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, +} DXVA_VideoChromaSubsampling; + +typedef enum _DXVA_NominalRange +{ + DXVA_NominalRange_Unknown = 0, + DXVA_NominalRange_0_255 = 1, + DXVA_NominalRange_16_235 = 2, + DXVA_NominalRange_48_208 = 3, + DXVA_NominalRange_Normal = DXVA_NominalRange_0_255, + DXVA_NominalRange_Wide = DXVA_NominalRange_16_235, +} DXVA_NominalRange; + +typedef enum _DXVA_VideoTransferMatrix +{ + DXVA_VideoTransferMatrix_Unknown = 0, + DXVA_VideoTransferMatrix_BT709 = 1, + DXVA_VideoTransferMatrix_BT601 = 2, + DXVA_VideoTransferMatrix_SMPTE240M = 3, +} DXVA_VideoTransferMatrix; + +typedef enum _DXVA_VideoLighting +{ + DXVA_VideoLighting_Unknown = 0, + DXVA_VideoLighting_bright = 1, + DXVA_VideoLighting_office = 2, + DXVA_VideoLighting_dim = 3, + DXVA_VideoLighting_dark = 4, +} DXVA_VideoLighting; + +typedef enum _DXVA_VideoPrimaries +{ + DXVA_VideoPrimaries_Unknown = 0, + DXVA_VideoPrimaries_reserved = 1, + DXVA_VideoPrimaries_BT709 = 2, + DXVA_VideoPrimaries_BT470_2_SysM = 3, + DXVA_VideoPrimaries_BT470_2_SysBG = 4, + DXVA_VideoPrimaries_SMPTE170M = 5, + DXVA_VideoPrimaries_SMPTE420M = 6, + DXVA_VideoPrimaries_EBU3213 = 7, + DXVA_VideoPrimaries_SMPTE_C = 8, +} DXVA_VideoPrimaries; + +typedef enum _DXVA_VideoTransferFunction +{ + DXVA_VideoTransFunc_Unknown = 0, + DXVA_VideoTransFunc_10 = 1, + DXVA_VideoTransFunc_18 = 2, + DXVA_VideoTransFunc_20 = 3, + DXVA_VideoTransFunc_22 = 4, + DXVA_VideoTransFunc_22_709 = 5, + DXVA_VideoTransFunc_22_240M = 6, + DXVA_VideoTransFunc_22_8bit_sRGB = 7, + DXVA_VideoTransFunc_28 = 8, +} DXVA_VideoTransferFunction; + +typedef struct _DXVA_ExtendedFormat +{ + UINT SampleFormat : 8; + UINT VideoChromaSubsampling : 4; + DXVA_NominalRange NominalRange : 3; + DXVA_VideoTransferMatrix VideoTransferMatrix : 3; + DXVA_VideoLighting VideoLighting : 4; + DXVA_VideoPrimaries VideoPrimaries : 5; + DXVA_VideoTransferFunction VideoTransferFunction : 5; +} DXVA_ExtendedFormat; + #ifdef __cplusplus } #endif -- 2.28.0

1 0

[PATCH v6 1/3] winevulkan: Generate helpers for wrapped handles.
by Georg Lehmann 14 Oct '20

14 Oct '20

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 81 +++++++++++++++++++++++++++----- dlls/winevulkan/vulkan.c | 21 +-------- dlls/winevulkan/vulkan_private.h | 3 ++ 3 files changed, 74 insertions(+), 31 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7f89cfdabaa..13a4962dd1a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -371,20 +371,21 @@ class VkEnum(object): # Value is either a value or a bitpos, only one can exist. value = v.attrib.get("value") alias_name = v.attrib.get("alias") + comment = v.attrib.get("comment") if alias_name: alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) + values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex, comment=comment)) elif value: # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True, comment=comment)) else: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), comment=comment)) else: # bitmask value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) + values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True, comment=comment)) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect @@ -435,11 +436,12 @@ class VkEnum(object): class VkEnumValue(object): - def __init__(self, name, value=None, hex=False, alias=None): + def __init__(self, name, value=None, hex=False, alias=None, comment=None): self.name = name self.value = value self.hex = hex self.alias = alias + self.comment = comment def __repr__(self): if self.is_alias(): @@ -885,6 +887,7 @@ class VkHandle(object): self.parent = parent self.alias = alias self.required = False + self.object_type = None @staticmethod def from_alias(handle, alias): @@ -939,9 +942,6 @@ class VkHandle(object): def native_handle(self, name): """ Provide access to the native handle of a wrapped object. """ - # Remember to add any new native handle whose parent is VkDevice - # to unwrap_object_handle() in vulkan.c - if self.name == "VkCommandPool": return "wine_cmd_pool_from_handle({0})->command_pool".format(name) @@ -965,6 +965,9 @@ class VkHandle(object): LOGGER.error("Unhandled native handle for: {0}".format(self.name)) return None + def is_wrapped(self): + return self.native_handle("test") is not None + class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, @@ -2276,6 +2279,36 @@ class VkGenerator(object): f.write(" return TRUE;\n") f.write(" }\n") f.write(" return FALSE;\n") + f.write("}\n\n") + + f.write("BOOL wine_vk_is_type_wrapped(VkObjectType type)\n") + f.write("{\n") + f.write(" return FALSE") + for handle in self.registry.handles: + if not handle.is_required() or not handle.is_wrapped() or handle.is_alias(): + continue + f.write(" ||\n type == {}".format(handle.object_type)) + f.write(";\n") + f.write("}\n\n") + + f.write("uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle)\n") + f.write("{\n") + f.write(" switch(type)\n") + f.write(" {\n") + for handle in self.registry.handles: + if not handle.is_required() or not handle.is_wrapped() or handle.is_alias(): + continue + f.write(" case {}:\n".format(handle.object_type)) + if handle.is_dispatchable(): + f.write(" return (uint64_t) (uintptr_t) ") + f.write(handle.native_handle("(({}) (uintptr_t) handle)".format(handle.name))) + else: + f.write(" return (uint64_t) ") + f.write(handle.native_handle("handle")) + f.write(";\n"); + f.write(" default:\n") + f.write(" return handle;\n") + f.write(" }\n") f.write("}\n") def generate_thunks_h(self, f, prefix): @@ -2619,6 +2652,8 @@ class VkRegistry(object): self._parse_features(root) self._parse_extensions(root) + self._match_object_types() + self.copyright = root.find('./comment').text def _is_feature_supported(self, feature): @@ -2689,6 +2724,26 @@ class VkRegistry(object): elif type_info["category"] == "bitmask": mark_bitmask_dependencies(type_info["data"], self.types) + def _match_object_types(self): + """ Matches each handle with the correct object type. """ + for handle in self.handles: + if not handle.is_required() or handle.is_alias(): + continue + for value in self.enums["VkObjectType"].values: + if value.comment == handle.name: + handle.object_type = value.name + break + else: + LOGGER.warning("No object type found for {}".format(handle.name)) + + for handle in self.handles: + if not handle.is_required() or not handle.is_alias(): + continue + # Use the object type of the alias + handle.object_type = handle.alias.object_type + if not handle.object_type: + LOGGER.warning("No object type found for {}".format(handle.name)) + def _parse_commands(self, root): """ Parse command section containing the Vulkan function calls. """ funcs = {} @@ -2782,10 +2837,12 @@ class VkRegistry(object): if only_aliased and not aliased: return + comment = enum_elem.attrib.get("comment") + if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True, comment=comment)) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part @@ -2802,12 +2859,12 @@ class VkRegistry(object): if direction is not None: value = -value - enum.add(VkEnumValue(enum_elem.attrib["name"], value=value)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=value, comment=comment)) elif "value" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]))) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]), comment=comment)) elif "alias" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) + enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"], comment=comment)) elif "value" in enum_elem.keys(): # Constants are not aliased, no need to add them here, they'll get added later on. diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f730c04923a..3d1e8bd0abd 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1534,30 +1534,13 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDev properties->externalSemaphoreFeatures = 0; } -static uint64_t unwrap_object_handle(VkObjectType type, uint64_t handle) -{ - switch (type) - { - case VK_OBJECT_TYPE_DEVICE: - return (uint64_t) (uintptr_t) ((VkDevice) (uintptr_t) handle)->device; - case VK_OBJECT_TYPE_QUEUE: - return (uint64_t) (uintptr_t) ((VkQueue) (uintptr_t) handle)->queue; - case VK_OBJECT_TYPE_COMMAND_BUFFER: - return (uint64_t) (uintptr_t) ((VkCommandBuffer) (uintptr_t) handle)->command_buffer; - case VK_OBJECT_TYPE_COMMAND_POOL: - return (uint64_t) wine_cmd_pool_from_handle(handle)->command_pool; - default: - return handle; - } -} - VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, VkPrivateDataSlotEXT private_data_slot, uint64_t data) { TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, object_type, wine_dbgstr_longlong(object_handle), wine_dbgstr_longlong(private_data_slot), wine_dbgstr_longlong(data)); - object_handle = unwrap_object_handle(object_type, object_handle); + object_handle = wine_vk_unwrap_handle(object_type, object_handle); return device->funcs.p_vkSetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } @@ -1567,7 +1550,7 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, TRACE("%p, %#x, 0x%s, 0x%s, %p\n", device, object_type, wine_dbgstr_longlong(object_handle), wine_dbgstr_longlong(private_data_slot), data); - object_handle = unwrap_object_handle(object_type, object_handle); + object_handle = wine_vk_unwrap_handle(object_type, object_handle); device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4bcc4de440d..bf09401c52a 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -138,4 +138,7 @@ void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; +BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; +uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDDEN; + #endif /* __WINE_VULKAN_PRIVATE_H */ -- 2.28.0

2 5

[PATCH v2 3/3] winevulkan: Fake support for, VK_EXT_full_screen_exclusive
by Joshua Ashton 14 Oct '20

14 Oct '20

- Joshie 🐸✨

3 2

[PATCH v2 2/3] winevulkan: Implement extension faking mechanism
by Joshua Ashton 14 Oct '20

14 Oct '20

- Joshie 🐸✨

3 2

[PATCH v2 1/3] winevulkan: Migrate, vkGetPhysicalDeviceSurfaceFormats2KHR to a private thunk
by Joshua Ashton 13 Oct '20

13 Oct '20

- Joshie 🐸✨

2 1

[PATCH 3/3] winevulkan: Fake support for VK_EXT_full_screen_exclusive
by Joshua Ashton 13 Oct '20

13 Oct '20

- Joshie 🐸✨

2 1

[PATCH v2 2/2] kernelbase: Remove DECLSPEC_HOTPATCH for GetCommandLine[AW].
by Myah Caron 13 Oct '20

13 Oct '20

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: no change dlls/kernelbase/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index d5fedb4495c..0f707f82d11 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1278,7 +1278,7 @@ BOOL WINAPI BaseFlushAppcompatCache(void) /*********************************************************************** * GetCommandLineA (kernelbase.@) */ -LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) +LPSTR WINAPI GetCommandLineA(void) { return command_lineA; } @@ -1287,7 +1287,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) /*********************************************************************** * GetCommandLineW (kernelbase.@) */ -LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) +LPWSTR WINAPI GetCommandLineW(void) { return command_lineW; } -- 2.28.0

1 0

[PATCH v2 1/2] kernelbase: Use command_lineW for GetCommandLineW.
by Myah Caron 13 Oct '20

13 Oct '20

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: Fix p -> cmdline_backup dlls/kernel32/tests/process.c | 11 +++++++++++ dlls/kernelbase/process.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 109322d6844..7c6a0ff0a84 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -872,6 +872,7 @@ static void test_CommandLine(void) PROCESS_INFORMATION info; STARTUPINFOA startup; BOOL ret; + LPWSTR cmdline, cmdline_backup; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1074,6 +1075,16 @@ static void test_CommandLine(void) ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(!ret, "CreateProcessA unexpectedly succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Test whether GetCommandLineW reads directly from TEB or from a cached address */ + cmdline = GetCommandLineW(); + ok(cmdline == NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer, "Expected address from TEB, got %p\n", cmdline); + + cmdline_backup = cmdline; + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = NULL; + cmdline = GetCommandLineW(); + ok(cmdline == cmdline_backup, "Expected cached address from TEB, got %p\n", cmdline); + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = cmdline_backup; } static void test_Directory(void) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index e7998c00f28..d5fedb4495c 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1289,7 +1289,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) */ LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer; + return command_lineW; } -- 2.28.0

1 0

[PATCH] ntdll: Map top-down if dll characteristics include DYNAMIC_BASE.
by Myah Caron 13 Oct '20

13 Oct '20

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=44893 Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48641 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Since I don't know how to write a test for this with the wine build system, I've written one here: https://github.com/qsniyg/wine_dll_load_test/tree/b2b64bc8d7d1589cbfeb1dbb5… The reason for the two DLLs in the test is because I initially believed the issue was caused by the conflict between both binkw64.dll and skse64_1_5_97.dll having a preferred imagebase of 0x180000000 (as noted by Focht). If --dynamicbase is added to the linker options, it will allocate the DLL top-down rather than bottom-up. This patch fixes the SKSE issue, as it requires its base address to be > 0x78000000. dlls/ntdll/loader.c | 4 +++- dlls/ntdll/unix/loader.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8374dd97326..4d4ce3c6c6c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2230,6 +2230,7 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void SIZE_T len = 0; NTSTATUS status; HANDLE handle, mapping; + ULONG alloc_type; if ((*pwm = find_fullname_module( nt_name ))) { @@ -2287,8 +2288,9 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void *module = NULL; } NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); + alloc_type = (image_info->DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) ? MEM_TOP_DOWN : 0; status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, - ViewShare, 0, PAGE_EXECUTE_READ ); + ViewShare, alloc_type, PAGE_EXECUTE_READ ); if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2b6ea603e3..99ae50970de 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1142,6 +1142,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, SECTION_IMAGE_IN SIZE_T len = 0; NTSTATUS status; HANDLE handle, mapping; + ULONG alloc_type; if ((status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, &attr, 0, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN, @@ -1186,8 +1187,9 @@ static NTSTATUS open_dll_file( const char *name, void **module, SECTION_IMAGE_IN *module = NULL; } NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); + alloc_type = (image_info->DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) ? MEM_TOP_DOWN : 0; status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, - ViewShare, 0, PAGE_EXECUTE_READ ); + ViewShare, alloc_type, PAGE_EXECUTE_READ ); if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); if (status) return status; -- 2.28.0

1 0

[PATCH 1/2] kernelbase: Use command_lineW for GetCommandLineW.
by Myah Caron 13 Oct '20

13 Oct '20

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/kernel32/tests/process.c | 11 +++++++++++ dlls/kernelbase/process.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 109322d6844..33f2e14a086 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -872,6 +872,7 @@ static void test_CommandLine(void) PROCESS_INFORMATION info; STARTUPINFOA startup; BOOL ret; + LPWSTR cmdline, cmdline_backup; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1074,6 +1075,16 @@ static void test_CommandLine(void) ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(!ret, "CreateProcessA unexpectedly succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Test whether GetCommandLineW reads directly from TEB or from a cached address */ + cmdline = GetCommandLineW(); + ok(cmdline == NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer, "Expected address from TEB, got %p\n", cmdline); + + cmdline_backup = cmdline; + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = NULL; + cmdline = GetCommandLineW(); + ok(cmdline == cmdline_backup, "Expected cached address from TEB, got %p\n", cmdline); + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = p; } static void test_Directory(void) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index e7998c00f28..d5fedb4495c 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1289,7 +1289,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) */ LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer; + return command_lineW; } -- 2.28.0

2 1

[PATCH 2/2] vbscript: Support class default sub.
by Jacek Caban 13 Oct '20

13 Oct '20

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 14 +++++++++++--- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 6 ++---- 4 files changed, 44 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] vbscript: Add is_default flag to function_decl_t.
by Jacek Caban 13 Oct '20

13 Oct '20

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 6 ++---- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 - 6 files changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH 10/10] server: Remove no longer needed screen_buffer fields.
by Jacek Caban 13 Oct '20

13 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 90 ++---------------------------------------------- 1 file changed, 2 insertions(+), 88 deletions(-)

2 1

[PATCH 09/10] server: Remove no longer needed console_input fields.
by Jacek Caban 13 Oct '20

13 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-)

2 1

[PATCH 08/10] server: Remove no longer needed server-side console input ioctls.
by Jacek Caban 13 Oct '20

13 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 275 ----------------------------------------------- 1 file changed, 275 deletions(-)

2 1

[PATCH 07/10] server: Remove no longer needed server-side screen buffer ioctls.
by Jacek Caban 13 Oct '20

13 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 694 ----------------------------------------------- 1 file changed, 694 deletions(-)

2 1

[PATCH 06/10] server: Remove no longer used console requests.
by Jacek Caban 13 Oct '20

13 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 153 -------------------------------------------- server/protocol.def | 42 ------------ 2 files changed, 195 deletions(-)

2 1

[PATCH 05/10] kernelbase: Remove no longer needed free_console server call from FreeConsole.
by Jacek Caban 13 Oct '20

13 Oct '20

We can depend on closing console connection handle now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)

2 1

[PATCH 04/10] kernelbase: Remove window position adjustment from SetConsoleCursorPosition.
by Jacek Caban 13 Oct '20

13 Oct '20

It's done in conhost now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-)

2 1

[PATCH 03/10] kernel32: Move ReadConsole and WriteConsole to kernelbase.
by Jacek Caban 13 Oct '20

13 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 86 --------------------------------- dlls/kernel32/kernel32.spec | 8 +-- dlls/kernelbase/console.c | 85 ++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 8 +-- 4 files changed, 93 insertions(+), 94 deletions(-)

2 1

[PATCH v4 1/5] winegstreamer: Insert videoconvert into decoded-video streams.
by Derek Lesho 13 Oct '20

13 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v4: Address nits. --- dlls/winegstreamer/media_source.c | 125 ++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..3371585328d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,43 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + the user throws at us through gstreamer's caps negotiation. */ +static HRESULT media_stream_connect_to_sink(struct media_stream *stream) +{ + GstCaps *source_caps = gst_pad_get_current_caps(stream->their_src); + const gchar *stream_type; + + if (!source_caps) + return E_FAIL; + + stream_type = gst_structure_get_name(gst_caps_get_structure(source_caps, 0)); + gst_caps_unref(source_caps); + + if (!strcmp(stream_type, "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + if (!gst_element_link(videoconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(videoconvert); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + } + + if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK) + return E_FAIL; + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +451,8 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + if (FAILED(hr = media_stream_connect_to_sink(object))) + goto fail; gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +472,88 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + const gchar *major_type; + unsigned int i; HRESULT hr; - stream_type = mf_media_type_from_caps(current_caps); - gst_caps_unref(current_caps); - if (!stream_type) - return E_FAIL; + major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0)); + + if (!strcmp(major_type, "video/x-raw")) + { + /* These are the most common native output types of decoders: + https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-… */ + static const GUID *const video_types[] = + { + &MFVideoFormat_NV12, + &MFVideoFormat_YV12, + &MFVideoFormat_YUY2, + &MFVideoFormat_IYUV, + &MFVideoFormat_I420, + }; - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); + IMFMediaType *base_type = mf_media_type_from_caps(current_caps); + GUID base_subtype; - IMFMediaType_Release(stream_type); + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - if (FAILED(hr)) - return hr; + stream_types = heap_alloc( sizeof(IMFMediaType *) * ARRAY_SIZE(video_types) + 1); - if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; + stream_types[0] = base_type; + type_count = 1; - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); + for (i = 0; i < ARRAY_SIZE(video_types); i++) + { + IMFMediaType *new_type; - IMFMediaTypeHandler_Release(type_handler); + if (IsEqualGUID(&base_subtype, video_types[i])) + continue; + if (FAILED(hr = MFCreateMediaType(&new_type))) + goto done; + stream_types[type_count++] = new_type; + + if (FAILED(hr = IMFMediaType_CopyAllItems(base_type, (IMFAttributes *) new_type))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(new_type, &MF_MT_SUBTYPE, video_types[i]))) + goto done; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } + + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); + return E_FAIL; + } + + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + gst_caps_unref(current_caps); + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; } -- 2.28.0

1 0

[PATCH 02/10] kernel32: Always use conhost for ReadConsoleW.
by Jacek Caban 13 Oct '20

13 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/console.c | 178 +----- dlls/kernel32/console_private.h | 34 - dlls/kernel32/editline.c | 1044 ------------------------------- dlls/kernel32/kernel_main.c | 1 - 5 files changed, 9 insertions(+), 1249 deletions(-) delete mode 100644 dlls/kernel32/console_private.h delete mode 100644 dlls/kernel32/editline.c

2 1

[PATCH 01/10] kernel32: Always use conhost for WriteConsoleW.
by Jacek Caban 13 Oct '20

13 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 207 ++-------------------------------------- 1 file changed, 10 insertions(+), 197 deletions(-)

2 1

[PATCH] mmdevapi/tests: Fix some test failures on Windows <= 7.
by Sven Baars 13 Oct '20

13 Oct '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/mmdevapi/tests/mmdevenum.c | 7 ++++ dlls/mmdevapi/tests/render.c | 60 ++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 11df1f0229b..4708c2fef84 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -218,6 +218,13 @@ static void test_ActivateAudioInterfaceAsync(void) h_mmdev = LoadLibraryA("mmdevapi.dll"); + pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, "ActivateAudioInterfaceAsync"); + if (!pActivateAudioInterfaceAsync) + { + win_skip("ActivateAudioInterfaceAsync is not supported on Win <= 7\n"); + return; + } + /* some applications look this up by ordinal */ pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, (char *)17); ok(pActivateAudioInterfaceAsync != NULL, "mmdevapi.ActivateAudioInterfaceAsync missing!\n"); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 5800ec5fd66..3ad00eaa2e2 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -154,8 +154,11 @@ static void test_audioclient(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); - ok(hr == S_OK, "IAudioClient2 Activation failed with %08x\n", hr); - IAudioClient2_Release(ac2); + ok(hr == S_OK || + broken(hr == E_NOINTERFACE) /* win7 */, + "IAudioClient2 Activation failed with %08x\n", hr); + if(hr == S_OK) + IAudioClient2_Release(ac2); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); @@ -262,39 +265,42 @@ static void test_audioclient(void) } hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2); - ok(hr == S_OK, "Failed to query IAudioClient2 interface: %08x\n", hr); - - hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); - ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); + if (hr == S_OK) + { + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); + ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); - hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); - ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); + ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); - hr = IAudioClient2_SetClientProperties(ac2, NULL); - ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, NULL); + ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); - client_props.cbSize = 0; - client_props.bIsOffload = FALSE; - client_props.eCategory = AudioCategory_BackgroundCapableMedia; - client_props.Options = 0; + client_props.cbSize = 0; + client_props.bIsOffload = FALSE; + client_props.eCategory = AudioCategory_BackgroundCapableMedia; + client_props.Options = 0; - hr = IAudioClient2_SetClientProperties(ac2, &client_props); - ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); - client_props.cbSize = sizeof(client_props); - client_props.bIsOffload = TRUE; + client_props.cbSize = sizeof(client_props); + client_props.bIsOffload = TRUE; - hr = IAudioClient2_SetClientProperties(ac2, &client_props); - if(!offload_capable) - ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); - else - ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + if(!offload_capable) + ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); + else + ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); - client_props.bIsOffload = FALSE; - hr = IAudioClient2_SetClientProperties(ac2, &client_props); - ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + client_props.bIsOffload = FALSE; + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); - IAudioClient2_Release(ac2); + IAudioClient2_Release(ac2); + } + else + win_skip("IAudioClient2 is not present on Win <= 7\n"); hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient3, (void**)&ac3); ok(hr == S_OK || -- 2.25.1

3 2

[PATCH 3/3] wined3d: Do not invalidate STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE).
by Henri Verbeet 13 Oct '20

13 Oct '20

This is no longer used internally; two-sided stencil is handled as part of STATE_DEPTH_STENCIL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3381252e75d..2f42a41754f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -510,10 +510,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct if (gl_mask & GL_STENCIL_BUFFER_BIT) { if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) - { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE)); - } gl_info->gl_ops.gl.p_glStencilMask(~0U); context_invalidate_state(context, STATE_DEPTH_STENCIL); } @@ -5389,10 +5386,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (flags & WINED3DCLEAR_STENCIL) { if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) - { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE)); - } gl_info->gl_ops.gl.p_glStencilMask(~0u); context_invalidate_state(context, STATE_DEPTH_STENCIL); gl_info->gl_ops.gl.p_glClearStencil(stencil); -- 2.20.1

1 0

[PATCH 2/3] wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled.
by Henri Verbeet 13 Oct '20

13 Oct '20

The state itself is ignored in this case, but could still cause additional pipeline variants to be created. That's mostly a consideration for Direct3D 9 and before, since Direct3D 10 and 11 already normalise disabled stencil test state themselves. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 92b8c14e239..f1258842152 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2080,6 +2080,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } + else + { + memset(&key->ds_desc.front, 0, sizeof(key->ds_desc.front)); + memset(&key->ds_desc.back, 0, sizeof(key->ds_desc.back)); + } } else { -- 2.20.1

1 0

[PATCH 1/3] wined3d: Avoid accessing NULL depth/stencil state in wined3d_context_vk_update_graphics_pipeline_key().
by Henri Verbeet 13 Oct '20

13 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fa5aac28fd1..92b8c14e239 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2058,6 +2058,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte { key->ds_desc.depthTestEnable = d->desc.depth; key->ds_desc.depthWriteEnable = d->desc.depth_write; + key->ds_desc.depthCompareOp = vk_compare_op_from_wined3d(d->desc.depth_func); key->ds_desc.stencilTestEnable = state->fb.depth_stencil && d->desc.stencil; if (key->ds_desc.stencilTestEnable) { @@ -2084,9 +2085,9 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte { key->ds_desc.depthTestEnable = VK_TRUE; key->ds_desc.depthWriteEnable = VK_TRUE; + key->ds_desc.depthCompareOp = VK_COMPARE_OP_LESS; key->ds_desc.stencilTestEnable = VK_FALSE; } - key->ds_desc.depthCompareOp = vk_compare_op_from_wined3d(d->desc.depth_func); update = true; } -- 2.20.1

1 0

[PATCH] d3d11/tests: Add some more tests for device context state.
by Nikolay Sivov 13 Oct '20

13 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 127 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e1a6dd6159b..9fc09a5ec83 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6599,11 +6599,14 @@ static void test_device_context_state(void) { ID3DDeviceContextState *context_state, *previous_context_state; ID3D11SamplerState *sampler, *tmp_sampler; + D3D11_DEVICE_CONTEXT_TYPE context_type; ID3D11DeviceContext1 *context = NULL; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; ID3D11Device *d3d11_device; ID3D11Device1 *device; + struct vec4 constant; + ID3D11Buffer *cb, *tmp_cb; ULONG refcount; HRESULT hr; @@ -6650,6 +6653,36 @@ static void test_device_context_state(void) ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); + ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_DSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_GSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_HSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_VSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -6664,6 +6697,47 @@ todo_wine refcount = get_refcount(context_state); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + + cb = create_buffer((ID3D11Device *)device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), NULL); + + ID3D11DeviceContext1_CSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_PSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_PSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_VSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_DSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_GSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_GSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_HSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + /* Enable ID3D10Device behavior. */ previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); @@ -6677,6 +6751,58 @@ todo_wine if (!enable_debug_layer) ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_DSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_GSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_HSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_VSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_PSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_VSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_GSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -6706,6 +6832,7 @@ todo_wine check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11Buffer_Release(cb); ID3D11SamplerState_Release(sampler); ID3D11DeviceContext1_Release(context); refcount = ID3D11Device1_Release(device); -- 2.28.0

3 2

[PATCH 1/5] mf/evr: Do not use IMFVideoMediaType when setting mixer types.
by Nikolay Sivov 13 Oct '20

13 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c3548170afb..298d320ec0c 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -362,35 +362,10 @@ static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -/* Mixer expects special video media type instance. */ -static HRESULT video_renderer_create_video_type(IMFMediaType *media_type, IMFVideoMediaType **video_type) -{ - GUID subtype; - HRESULT hr; - - *video_type = NULL; - - if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) - return hr; - - if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, video_type))) - return hr; - - hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)*video_type); - if (FAILED(hr)) - { - IMFVideoMediaType_Release(*video_type); - *video_type = NULL; - } - - return hr; -} - static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - IMFVideoMediaType *video_type; HRESULT hr; TRACE("%p, %p, %p.\n", iface, in_type, out_type); @@ -401,17 +376,12 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType if (!stream->parent) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = video_renderer_create_video_type(in_type, &video_type))) - return hr; - - if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, + if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, in_type, MFT_SET_TYPE_TEST_ONLY))) { if (out_type) *out_type = NULL; } - IMFVideoMediaType_Release(video_type); - return hr; } @@ -438,7 +408,6 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeH static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - IMFVideoMediaType *video_type; HRESULT hr; TRACE("%p, %p.\n", iface, type); @@ -449,11 +418,7 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH if (!stream->parent) return MF_E_STREAMSINK_REMOVED; - if (FAILED(hr = video_renderer_create_video_type(type, &video_type))) - return hr; - - hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); - IMFVideoMediaType_Release(video_type); + hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, type, 0); return hr; } -- 2.28.0

2 5

[PATCH 5/5] riched20: Return a run ptr from the run creation function.
by Huw Davies 13 Oct '20

13 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 29 +++++----- dlls/riched20/run.c | 121 +++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 74 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index de029f5bcb4..244010df735 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -120,7 +120,7 @@ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_H int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ -ME_DisplayItem *ME_MakeRun(ME_Style *s, int nFlags) DECLSPEC_HIDDEN; +ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1ae7caad618..99ce1706631 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -131,7 +131,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) HFONT hf; ME_TextBuffer *text = editor->pBuffer; ME_DisplayItem *para = make_para(editor); - ME_DisplayItem *run; + ME_Run *run; ME_Style *style; int eol_len; @@ -177,15 +177,14 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) eol_len = editor->bEmulateVersion10 ? 2 : 1; para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); - run = ME_MakeRun(style, MERF_ENDPARA); - run->member.run.nCharOfs = 0; - run->member.run.len = eol_len; - run->member.run.para = &para->member.para; - - para->member.para.eop_run = &run->member.run; + run = run_create( style, MERF_ENDPARA ); + run->nCharOfs = 0; + run->len = eol_len; + run->para = &para->member.para; + para->member.para.eop_run = run; ME_InsertBefore(text->pLast, para); - ME_InsertBefore(text->pLast, run); + ME_InsertBefore(text->pLast, run_get_di( run )); para->member.para.prev_para = text->pFirst; para->member.para.next_para = text->pLast; text->pFirst->member.para.next_para = para; @@ -523,7 +522,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_DisplayItem *next_para = NULL; ME_DisplayItem *run_para = NULL; ME_DisplayItem *new_para = make_para(editor); - ME_DisplayItem *end_run; + ME_Run *end_run; int ofs, i; ME_DisplayItem *pp; int run_flags = MERF_ENDPARA; @@ -549,10 +548,10 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); - end_run = ME_MakeRun(style, run_flags); - ofs = end_run->member.run.nCharOfs = run->member.run.nCharOfs; - end_run->member.run.len = eol_len; - end_run->member.run.para = run->member.run.para; + end_run = run_create( style, run_flags ); + ofs = end_run->nCharOfs = run->member.run.nCharOfs; + end_run->len = eol_len; + end_run->para = run->member.run.para; ME_AppendString( run_para->member.para.text, eol_str, eol_len ); next_para = run_para->member.para.next_para; assert(next_para == ME_FindItemFwd(run_para, diParagraphOrEnd)); @@ -592,11 +591,11 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ ME_InsertBefore(run, new_para); - ME_InsertBefore(new_para, end_run); + ME_InsertBefore( new_para, run_get_di( end_run )); /* Fix up the paras' eop_run ptrs */ new_para->member.para.eop_run = run_para->member.para.eop_run; - run_para->member.para.eop_run = &end_run->member.run; + run_para->member.para.eop_run = end_run; if (!editor->bEmulateVersion10) { /* v4.1 */ if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index eb5aeff0502..84b851039b7 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -273,63 +273,67 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) * Does the most basic job of splitting a run into two - it does not * update the positions and extents. */ -ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) +ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *run = cursor->pRun; - ME_DisplayItem *new_run; - int i; - int nOffset = cursor->nOffset; - - assert(!(run->member.run.nFlags & MERF_NONTEXT)); - - new_run = ME_MakeRun(run->member.run.style, - run->member.run.nFlags & MERF_SPLITMASK); - new_run->member.run.nCharOfs = run->member.run.nCharOfs + nOffset; - new_run->member.run.len = run->member.run.len - nOffset; - new_run->member.run.para = run->member.run.para; - run->member.run.len = nOffset; - cursor->pRun = new_run; - cursor->nOffset = 0; - - ME_InsertBefore(run->next, new_run); - - ME_UpdateRunFlags(editor, &run->member.run); - ME_UpdateRunFlags(editor, &new_run->member.run); - for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == run && - editor->pCursors[i].nOffset >= nOffset) { - editor->pCursors[i].pRun = new_run; - editor->pCursors[i].nOffset -= nOffset; + ME_Run *run = &cursor->pRun->member.run, *new_run; + int i; + int nOffset = cursor->nOffset; + + assert( !(run->nFlags & MERF_NONTEXT) ); + + new_run = run_create( run->style, run->nFlags & MERF_SPLITMASK ); + new_run->nCharOfs = run->nCharOfs + nOffset; + new_run->len = run->len - nOffset; + new_run->para = run->para; + run->len = nOffset; + cursor->pRun = run_get_di( new_run ); + cursor->nOffset = 0; + + ME_InsertBefore( run_get_di( run )->next, run_get_di( new_run ) ); + + ME_UpdateRunFlags( editor, run ); + ME_UpdateRunFlags( editor, new_run ); + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pRun == run_get_di( run ) && + editor->pCursors[i].nOffset >= nOffset) + { + editor->pCursors[i].pRun = run_get_di( new_run ); + editor->pCursors[i].nOffset -= nOffset; + } } - } - para_mark_rewrap( editor, &cursor->pPara->member.para ); - return run; + para_mark_rewrap( editor, run->para ); + return run_get_di( run ); } /****************************************************************************** - * ME_MakeRun + * run_create * * A helper function to create run structures quickly. */ -ME_DisplayItem *ME_MakeRun(ME_Style *s, int nFlags) +ME_Run *run_create( ME_Style *s, int flags ) { - ME_DisplayItem *item = ME_MakeDI(diRun); - item->member.run.style = s; - item->member.run.reobj = NULL; - item->member.run.nFlags = nFlags; - item->member.run.nCharOfs = -1; - item->member.run.len = 0; - item->member.run.para = NULL; - item->member.run.num_glyphs = 0; - item->member.run.max_glyphs = 0; - item->member.run.glyphs = NULL; - item->member.run.vis_attrs = NULL; - item->member.run.advances = NULL; - item->member.run.offsets = NULL; - item->member.run.max_clusters = 0; - item->member.run.clusters = NULL; - ME_AddRefStyle(s); - return item; + ME_DisplayItem *item = ME_MakeDI( diRun ); + ME_Run *run = &item->member.run; + + if (!item) return NULL; + + ME_AddRefStyle( s ); + run->style = s; + run->reobj = NULL; + run->nFlags = flags; + run->nCharOfs = -1; + run->len = 0; + run->para = NULL; + run->num_glyphs = 0; + run->max_glyphs = 0; + run->glyphs = NULL; + run->vis_attrs = NULL; + run->advances = NULL; + run->offsets = NULL; + run->max_clusters = 0; + run->clusters = NULL; + return run; } /****************************************************************************** @@ -343,7 +347,8 @@ ME_DisplayItem * ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) { - ME_DisplayItem *pDI, *insert_before = cursor->pRun, *prev; + ME_DisplayItem *insert_before = cursor->pRun, *prev; + ME_Run *run; if (cursor->nOffset) { @@ -362,18 +367,18 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, add_undo_delete_run( editor, insert_before->member.run.para->nCharOfs + insert_before->member.run.nCharOfs, len ); - pDI = ME_MakeRun(style, flags); - pDI->member.run.nCharOfs = insert_before->member.run.nCharOfs; - pDI->member.run.len = len; - pDI->member.run.para = insert_before->member.run.para; - ME_InsertString( pDI->member.run.para->text, pDI->member.run.nCharOfs, str, len ); - ME_InsertBefore( insert_before, pDI ); + run = run_create( style, flags ); + run->nCharOfs = insert_before->member.run.nCharOfs; + run->len = len; + run->para = insert_before->member.run.para; + ME_InsertString( run->para->text, run->nCharOfs, str, len ); + ME_InsertBefore( insert_before, run_get_di( run ) ); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset( insert_before, len ); para_mark_rewrap( editor, insert_before->member.run.para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ - prev = ME_FindItemBack( pDI, diRun ); + prev = ME_FindItemBack( run_get_di( run ), diRun ); if (prev) { int i; @@ -383,13 +388,13 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, if (editor->pCursors[i].pRun == prev && editor->pCursors[i].nOffset == prev->member.run.len) { - editor->pCursors[i].pRun = pDI; + editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = len; } } } - return pDI; + return run_get_di( run ); } static BOOL run_is_splittable( const ME_Run *run ) -- 2.23.0

1 0

[PATCH 4/5] riched20: Pass a run ptr to the run joining function.
by Huw Davies 13 Oct '20

13 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 33 ++++++++++++++++++--------------- dlls/riched20/wrap.c | 2 +- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f61caa64788..de029f5bcb4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -131,7 +131,7 @@ int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, B int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; -void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; +void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index c3bc7f50b39..eb5aeff0502 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -237,31 +237,34 @@ void ME_RunOfsFromCharOfs(ME_TextEditor *editor, } /****************************************************************************** - * ME_JoinRuns + * run_join * * Merges two adjacent runs, the one given as a parameter and the next one. */ -void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) +void run_join( ME_TextEditor *editor, ME_Run *run ) { - ME_DisplayItem *pNext = p->next; + ME_Run *next = run_next( run ); int i; - assert(p->type == diRun && pNext->type == diRun); - assert(p->member.run.nCharOfs != -1); - para_mark_rewrap( editor, &ME_GetParagraph( p )->member.para ); + + assert( run ); + assert( run->nCharOfs != -1 ); + para_mark_rewrap( editor, run->para ); /* Update all cursors so that they don't contain the soon deleted run */ - for (i=0; i<editor->nCursors; i++) { - if (editor->pCursors[i].pRun == pNext) { - editor->pCursors[i].pRun = p; - editor->pCursors[i].nOffset += p->member.run.len; + for (i = 0; i < editor->nCursors; i++) + { + if (&editor->pCursors[i].pRun->member.run == next) + { + editor->pCursors[i].pRun = run_get_di( run ); + editor->pCursors[i].nOffset += run->len; } } - p->member.run.len += pNext->member.run.len; - ME_Remove(pNext); - ME_DestroyDisplayItem(pNext); - ME_UpdateRunFlags(editor, &p->member.run); - ME_CheckCharOffsets(editor); + run->len += next->len; + ME_Remove( run_get_di( next ) ); + ME_DestroyDisplayItem( run_get_di( next ) ); + ME_UpdateRunFlags( editor, run ); + ME_CheckCharOffsets( editor ); } /****************************************************************************** diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c7b99f5ee24..fda1d995577 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -714,7 +714,7 @@ static void ME_PrepareParagraphForWrapping( ME_TextEditor *editor, ME_Context *c if (p->type == diRun) { while (p->next->type == diRun && ME_CanJoinRuns( &p->member.run, &p->next->member.run )) - ME_JoinRuns( c->editor, p ); + run_join( c->editor, &p->member.run ); } } } -- 2.23.0

1 0

[PATCH 3/5] riched20: Use paragraph ptrs in FindPixelPos().
by Huw Davies 13 Oct '20

13 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 56 +++++++++++++++++++++--------------------- dlls/riched20/editor.c | 4 +++ dlls/riched20/editor.h | 1 + 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index dde0c7faad8..1c3f4b16526 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -892,41 +892,41 @@ int ME_GetCursorOfs(const ME_Cursor *cursor) } /* Helper function for ME_FindPixelPos to find paragraph within tables */ -static ME_DisplayItem* ME_FindPixelPosInTableRow(int x, int y, - ME_DisplayItem *para) +static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) { ME_DisplayItem *cell, *next_cell; - assert(para->member.para.nFlags & MEPF_ROWSTART); - cell = para->member.para.next_para->member.para.pCell; + + assert( para->nFlags & MEPF_ROWSTART ); + cell = para_next( para )->pCell; assert(cell); /* find the cell we are in */ - while ((next_cell = cell->member.cell.next_cell) != NULL) { + while ((next_cell = cell->member.cell.next_cell) != NULL) + { if (x < next_cell->member.cell.pt.x) { - para = ME_FindItemFwd(cell, diParagraph); + para = &ME_FindItemFwd( cell, diParagraph )->member.para; /* Found the cell, but there might be multiple paragraphs in * the cell, so need to search down the cell for the paragraph. */ - while (cell == para->member.para.pCell) { - if (y < para->member.para.pt.y + para->member.para.nHeight) + while (cell == para->pCell) + { + if (y < para->pt.y + para->nHeight) { - if (para->member.para.nFlags & MEPF_ROWSTART) - return ME_FindPixelPosInTableRow(x, y, para); - else - return para; + if (para->nFlags & MEPF_ROWSTART) return pixel_pos_in_table_row( x, y, para ); + else return para; } - para = para->member.para.next_para; + para = para_next( para ); } /* Past the end of the cell, so go back to the last cell paragraph */ - return para->member.para.prev_para; + return para_prev( para ); } cell = next_cell; } /* Return table row delimiter */ - para = ME_FindItemFwd(cell, diParagraph); - assert(para->member.para.nFlags & MEPF_ROWEND); - assert(para->member.para.fmt.dwMask & PFM_TABLEROWDELIMITER); - assert(para->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER); + para = table_row_end( para ); + assert( para->nFlags & MEPF_ROWEND ); + assert( para->fmt.dwMask & PFM_TABLEROWDELIMITER ); + assert( para->fmt.wEffects & PFE_TABLEROWDELIMITER ); return para; } @@ -986,7 +986,7 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { - ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + ME_Paragraph *para = editor_first_para( editor ); ME_DisplayItem *row = NULL; BOOL isExact = TRUE; @@ -997,19 +997,19 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, *is_eol = FALSE; /* find paragraph */ - for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) + for (; para_next( para ); para = para_next( para )) { - if (y < p->member.para.pt.y + p->member.para.nHeight) + if (y < para->pt.y + para->nHeight) { - if (p->member.para.nFlags & MEPF_ROWSTART) - p = ME_FindPixelPosInTableRow(x, y, p); - y -= p->member.para.pt.y; - row = ME_FindItemFwd(p, diStartRow); + if (para->nFlags & MEPF_ROWSTART) + para = pixel_pos_in_table_row( x, y, para ); + y -= para->pt.y; + row = ME_FindItemFwd( para_get_di( para ), diStartRow); break; } - else if (p->member.para.nFlags & MEPF_ROWSTART) + else if (para->nFlags & MEPF_ROWSTART) { - p = para_get_di( table_row_end( &p->member.para ) ); + para = table_row_end( para ); } } /* find row */ @@ -1029,7 +1029,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - row = ME_FindItemBack(p, diStartRow); + row = ME_FindItemBack( para_get_di( para ), diStartRow); } if (row) return ME_FindRunInRow( editor, row, x, result, is_eol ) && isExact; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e7e33c27585..a144137baa1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -280,6 +280,10 @@ static ME_TextBuffer *ME_MakeText(void) { return buf; } +ME_Paragraph *editor_first_para( ME_TextEditor *editor ) +{ + return para_next( &editor->pBuffer->pFirst->member.para ); +} static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6b97a01f82d..f61caa64788 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -268,6 +268,7 @@ void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; +ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 2/5] riched20: Use the run and para helpers in the cursor movement functions.
by Huw Davies 13 Oct '20

13 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 121 +++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 67 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2fe057cdbd1..dde0c7faad8 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -671,7 +671,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO { /* new offset in the same paragraph */ do { - cursor->pRun = ME_FindItemBack(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_prev( &cursor->pRun->member.run ) ); } while (cursor->nOffset < cursor->pRun->member.run.nCharOfs); cursor->nOffset -= cursor->pRun->member.run.nCharOfs; return nRelOfs; @@ -688,27 +688,29 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO /* new offset in a previous paragraph */ do { - cursor->pPara = cursor->pPara->member.para.prev_para; + cursor->pPara = para_get_di( para_prev( &cursor->pPara->member.para ) ); } while (cursor->nOffset < cursor->pPara->member.para.nCharOfs); cursor->nOffset -= cursor->pPara->member.para.nCharOfs; - cursor->pRun = ME_FindItemBack(cursor->pPara->member.para.next_para, diRun); + cursor->pRun = run_get_di( para_end_run( &cursor->pPara->member.para ) ); while (cursor->nOffset < cursor->pRun->member.run.nCharOfs) { - cursor->pRun = ME_FindItemBack(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_prev( &cursor->pRun->member.run ) ); } cursor->nOffset -= cursor->pRun->member.run.nCharOfs; - } else if (cursor->nOffset >= cursor->pRun->member.run.len) { - ME_DisplayItem *next_para; + } + else if (cursor->nOffset >= cursor->pRun->member.run.len) + { + ME_Paragraph *next_para; int new_offset; new_offset = ME_GetCursorOfs(cursor); - next_para = cursor->pPara->member.para.next_para; - if (new_offset < next_para->member.para.nCharOfs) + next_para = para_next( &cursor->pPara->member.para ); + if (new_offset < next_para->nCharOfs) { /* new offset in the same paragraph */ do { cursor->nOffset -= cursor->pRun->member.run.len; - cursor->pRun = ME_FindItemFwd(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_next( &cursor->pRun->member.run ) ); } while (cursor->nOffset >= cursor->pRun->member.run.len); return nRelOfs; } @@ -723,16 +725,16 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO /* new offset in a following paragraph */ do { - cursor->pPara = next_para; - next_para = next_para->member.para.next_para; - } while (new_offset >= next_para->member.para.nCharOfs); + cursor->pPara = para_get_di( next_para ); + next_para = para_next( next_para ); + } while (new_offset >= next_para->nCharOfs); cursor->nOffset = new_offset - cursor->pPara->member.para.nCharOfs; - cursor->pRun = ME_FindItemFwd(cursor->pPara, diRun); + cursor->pRun = run_get_di( para_first_run( &cursor->pPara->member.para ) ); while (cursor->nOffset >= cursor->pRun->member.run.len) { cursor->nOffset -= cursor->pRun->member.run.len; - cursor->pRun = ME_FindItemFwd(cursor->pRun, diRun); + cursor->pRun = run_get_di( run_next( &cursor->pRun->member.run ) ); } } /* else new offset is in the same run */ return nRelOfs; @@ -742,8 +744,8 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { - ME_DisplayItem *pRun = cursor->pRun, *pOtherRun; - ME_DisplayItem *pPara = cursor->pPara; + ME_Run *run = &cursor->pRun->member.run, *other_run; + ME_Paragraph *para = &cursor->pPara->member.para; int nOffset = cursor->nOffset; if (nRelOfs == -1) @@ -751,40 +753,33 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) /* Backward movement */ while (TRUE) { - nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_MOVEWORDLEFT); - if (nOffset) - break; - pOtherRun = ME_FindItemBack(pRun, diRunOrParagraph); - if (pOtherRun->type == diRun) + nOffset = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_MOVEWORDLEFT ); + if (nOffset) break; + other_run = run_prev( run ); + if (other_run) { - if (ME_CallWordBreakProc(editor, get_text( &pOtherRun->member.run, 0 ), - pOtherRun->member.run.len, - pOtherRun->member.run.len - 1, - WB_ISDELIMITER) - && !(pRun->member.run.nFlags & MERF_ENDPARA) - && !(cursor->pRun == pRun && cursor->nOffset == 0) - && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, 0, - WB_ISDELIMITER)) + if (ME_CallWordBreakProc( editor, get_text( other_run, 0 ), other_run->len, other_run->len - 1, WB_ISDELIMITER ) + && !(run->nFlags & MERF_ENDPARA) + && !(&cursor->pRun->member.run == run && cursor->nOffset == 0) + && !ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, 0, WB_ISDELIMITER )) break; - pRun = pOtherRun; - nOffset = pOtherRun->member.run.len; + run = other_run; + nOffset = other_run->len; } - else if (pOtherRun->type == diParagraph) + else { - if (cursor->pRun == pRun && cursor->nOffset == 0) + if (&cursor->pRun->member.run == run && cursor->nOffset == 0) { - pPara = pOtherRun; + para = run->para; /* Skip empty start of table row paragraph */ - if (pPara->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART) - pPara = pPara->member.para.prev_para; + if (para_prev( para )->nFlags & MEPF_ROWSTART) + para = para_prev( para ); /* Paragraph breaks are treated as separate words */ - if (pPara->member.para.prev_para->type == diTextStart) + if (para_get_di( para_prev( para ) )->type == diTextStart) return FALSE; - pRun = ME_FindItemBack(pPara, diRun); - pPara = pPara->member.para.prev_para; + para = para_prev( para ); + run = para_end_run( para ); } break; } @@ -797,43 +792,35 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) while (TRUE) { - if (last_delim && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_ISDELIMITER)) - break; - nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset, WB_MOVEWORDRIGHT); - if (nOffset < pRun->member.run.len) + if (last_delim && !ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_ISDELIMITER )) break; - pOtherRun = ME_FindItemFwd(pRun, diRunOrParagraphOrEnd); - if (pOtherRun->type == diRun) + nOffset = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset, WB_MOVEWORDRIGHT ); + if (nOffset < run->len) break; + other_run = run_next( run ); + if (other_run) { - last_delim = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), - pRun->member.run.len, nOffset - 1, WB_ISDELIMITER); - pRun = pOtherRun; + last_delim = ME_CallWordBreakProc( editor, get_text( run, 0 ), run->len, nOffset - 1, WB_ISDELIMITER ); + run = other_run; nOffset = 0; } - else if (pOtherRun->type == diParagraph) + else { - if (pOtherRun->member.para.nFlags & MEPF_ROWSTART) - pOtherRun = pOtherRun->member.para.next_para; - if (cursor->pRun == pRun) { - pPara = pOtherRun; - pRun = ME_FindItemFwd(pPara, diRun); + para = para_next( para ); + if (para_get_di( para )->type == diTextEnd) + { + if (&cursor->pRun->member.run == run) return FALSE; + nOffset = 0; + break; } - nOffset = 0; - break; - } - else /* diTextEnd */ - { - if (cursor->pRun == pRun) - return FALSE; + if (para->nFlags & MEPF_ROWSTART) para = para_next( para ); + if (&cursor->pRun->member.run == run) run = para_first_run( para ); nOffset = 0; break; } } } - cursor->pPara = pPara; - cursor->pRun = pRun; + cursor->pPara = para_get_di( para ); + cursor->pRun = run_get_di( run ); cursor->nOffset = nOffset; return TRUE; } -- 2.23.0

1 0

[PATCH 1/5] riched20: Use paragraph and run ptrs in InsertTextFromCursor().
by Huw Davies 13 Oct '20

13 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 24 ++++++++++++------------ dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 5 +++++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 69963e66910..2fe057cdbd1 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -579,7 +579,8 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); pos++; } else { /* handle EOLs */ - ME_DisplayItem *tp, *end_run, *run, *prev; + ME_Run *end_run, *run, *prev; + ME_Paragraph *new_para; int eol_len = 0; /* Check if new line is allowed for this control */ @@ -619,31 +620,30 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, if (p->nOffset == p->pRun->member.run.len) { - run = ME_FindItemFwd( p->pRun, diRun ); - if (!run) run = p->pRun; + run = run_next( &p->pRun->member.run ); + if (!run) run = &p->pRun->member.run; } else { if (p->nOffset) ME_SplitRunSimple(editor, p); - run = p->pRun; + run = &p->pRun->member.run; } - tp = ME_SplitParagraph(editor, run, style, eol_str, eol_len, 0); - - end_run = ME_FindItemBack(tp, diRun); + new_para = &ME_SplitParagraph( editor, run_get_di( run ), style, eol_str, eol_len, 0 )->member.para; + end_run = para_end_run( para_prev( new_para ) ); /* Move any cursors that were at the end of the previous run to the beginning of the new para */ - prev = ME_FindItemBack( end_run, diRun ); + prev = run_prev( end_run ); if (prev) { int i; for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == prev && - editor->pCursors[i].nOffset == prev->member.run.len) + if (editor->pCursors[i].pRun == run_get_di( prev ) && + editor->pCursors[i].nOffset == prev->len) { - editor->pCursors[i].pPara = tp; - editor->pCursors[i].pRun = run; + editor->pCursors[i].pPara = para_get_di( new_para ); + editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = 0; } } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6c45a3c6b54..6b97a01f82d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -214,6 +214,7 @@ void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDD ME_Paragraph *para_next( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_prev( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { return (ME_DisplayItem *)((ptrdiff_t)para - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 0f8b76f76d0..1ae7caad618 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -116,6 +116,11 @@ ME_Run *para_first_run( ME_Paragraph *para ) return NULL; } +ME_Run *para_end_run( ME_Paragraph *para ) +{ + return para->eop_run; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; -- 2.23.0

1 0

[PATCH] d3dcompiler/tests: Always expect failure in test_reflection_desc_ps_output() on d3d10.
by Matteo Bruni 13 Oct '20

13 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49950 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/reflection.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 362e070ede02..bc802f016a5f 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1010,22 +1010,21 @@ static void test_reflection_desc_ps_output(void) { const DWORD *blob; D3D11_SIGNATURE_PARAMETER_DESC desc; - BOOL d3d10; } tests[] = { {test_reflection_desc_ps_output_blob_0, - {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}, TRUE}, + {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}}, {test_reflection_desc_ps_output_blob_1, - {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_2, - {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_3, - {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, FALSE}, + {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_4, - {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, TRUE}, + {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, {test_reflection_desc_ps_output_blob_5, - {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}, FALSE}, + {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}}, }; HRESULT hr; ULONG count; @@ -1038,7 +1037,7 @@ static void test_reflection_desc_ps_output(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = call_reflect(tests[i].blob, tests[i].blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - if (!D3D_COMPILER_VERSION && !tests[i].d3d10) + if (!D3D_COMPILER_VERSION) { todo_wine ok(hr == E_INVALIDARG, "(%u): got unexpected hr %x.\n", i, hr); if (SUCCEEDED(hr)) -- 2.26.2

1 0

[PATCH v2 1/4] winex11: Add DriverDate registry property to display adapters.
by Matteo Bruni 13 Oct '20

13 Oct '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Fix date format. After some testing, it looks like the date is always stored in the MM-DD-YYYY format (and the format I initially used was just wrong). dlls/winex11.drv/display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 47e4733dba88..cf55a5c1fb67 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -51,6 +51,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; +static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; @@ -107,6 +108,7 @@ static const WCHAR monitor_instance_fmtW[] = { static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; +static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -403,14 +405,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; + SYSTEMTIME systemtime; WCHAR bufferW[1024]; + FILETIME filetime; HKEY hkey = NULL; GUID guid; LUID luid; INT written; DWORD size; BOOL ret = FALSE; - FILETIME filetime; TRACE("GPU id:0x%s name:%s.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name)); @@ -468,6 +471,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) goto done; + GetSystemTime(&systemtime); + sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); + if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */ -- 2.26.2

4 7

[PATCH] documentation: Update German translation.
by Julian Rüger 13 Oct '20

13 Oct '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] cmd: Set errorlevel to 0 when 'call' is invoked with an empty string.
by Aaron Hill 13 Oct '20

13 Oct '20

Previously, invoking 'call' with an empty string would leave errorlevel unchanged. Reset errorlevel to 0 to match the behavior of the Windows 'cmd.exe'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49982 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> --- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/wcmdmain.c | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 73b0917c275..c7418b759e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3149,6 +3149,9 @@ echo %ErrorLevel% should be 7 if errorlevel 7 echo setting var worked too well, bad call :setError 3 echo %ErrorLevel% should still be 7 +rem Verify that (call ) sets errorlevel to 0 +(call ) +if errorlevel 1 echo errorlevel should have been 0 echo ------------ Testing GOTO ------------ if a==a goto dest1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 47e43fcd675..78f07b1b7b4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1041,6 +1041,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR *lastSlash; WCHAR pathext[MAXSTRING]; WCHAR *firstParam; + DWORD firstParamLen; BOOL extensionsupplied = FALSE; BOOL explicit_path = FALSE; BOOL status; @@ -1053,6 +1054,13 @@ void WCMD_run_program (WCHAR *command, BOOL called) firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); if (!firstParam) return; + firstParamLen = lstrlenW(firstParam); + if (firstParamLen == 0) { + // Windows sets errorlevel to 0 when invoking 'call' on an empty string + errorlevel = 0; + return; + } + /* Calculate the search path and stem to search for */ if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'}; @@ -1063,7 +1071,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) lstrcpyW (pathtosearch, curDir); } if (wcschr(firstParam, '.') != NULL) extensionsupplied = TRUE; - if (lstrlenW(firstParam) >= MAX_PATH) + if (firstParamLen >= MAX_PATH) { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); return; -- 2.28.0

2 1

[PATCH] winegstreamer: Color matrix conversions are needed for YUV -> RGB conversion and vice versa.
by Akihiro Sagawa 13 Oct '20

13 Oct '20

Otherwise, for instance, we get a strange color image when viewing an MPEG movie with RGB32 video renderer. Fixes a regression introduced by fd25ba65e0eb9fedfb2cdfa2b7a4b16e0401dfdf. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)

2 1

[PATCH] amstream: Implement SSUPDATE_CONTINUOUS flag in IDirectDrawStreamSample::Update.
by Anton Baskanov 13 Oct '20

13 Oct '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 36 ++++++++++++++--------- dlls/amstream/tests/amstream.c | 53 ++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5e6e1555d7c..0e5e54bd80d 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -75,10 +75,12 @@ struct ddraw_sample RECT rect; STREAM_TIME start_time; STREAM_TIME end_time; + BOOL continuous_update; CONDITION_VARIABLE update_cv; struct list entry; HRESULT update_hr; + BOOL busy; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -86,6 +88,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw static void remove_queued_update(struct ddraw_sample *sample) { + sample->busy = FALSE; list_remove(&sample->entry); WakeConditionVariable(&sample->update_cv); } @@ -1348,7 +1351,16 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample * sample->update_hr = process_update(sample, top_down_stride, top_down_pointer, start_stream_time, end_stream_time); - remove_queued_update(sample); + if (sample->continuous_update && SUCCEEDED(sample->update_hr)) + { + list_remove(&sample->entry); + list_add_tail(&sample->parent->update_queue, &sample->entry); + } + else + { + remove_queued_update(sample); + } + LeaveCriticalSection(&stream->cs); return S_OK; } @@ -1540,12 +1552,6 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, return E_NOTIMPL; } - if (flags & ~SSUPDATE_ASYNC) - { - FIXME("Unsupported flags %#x.\n", flags); - return E_NOTIMPL; - } - EnterCriticalSection(&sample->parent->cs); if (sample->parent->state != State_Running) @@ -1559,13 +1565,16 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, LeaveCriticalSection(&sample->parent->cs); return MS_S_ENDOFSTREAM; } - if (MS_S_PENDING == sample->update_hr) + if (sample->busy) { LeaveCriticalSection(&sample->parent->cs); return MS_E_BUSY; } - sample->update_hr = MS_S_PENDING; + sample->continuous_update = (flags & SSUPDATE_ASYNC) && (flags & SSUPDATE_CONTINUOUS); + + sample->update_hr = MS_S_NOUPDATE; + sample->busy = TRUE; list_add_tail(&sample->parent->update_queue, &sample->entry); WakeConditionVariable(&sample->parent->update_queued_cv); @@ -1575,7 +1584,7 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, return MS_S_PENDING; } - while (sample->update_hr == MS_S_PENDING) + while (sample->busy) SleepConditionVariableCS(&sample->update_cv, &sample->parent->cs, INFINITE); LeaveCriticalSection(&sample->parent->cs); @@ -1592,18 +1601,17 @@ static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *ifa EnterCriticalSection(&sample->parent->cs); - if (sample->update_hr == MS_S_PENDING) + if (sample->busy) { if (flags & (COMPSTAT_NOUPDATEOK | COMPSTAT_ABORT)) { - sample->update_hr = MS_S_NOUPDATE; remove_queued_update(sample); } else if (flags & COMPSTAT_WAIT) { DWORD start_time = GetTickCount(); DWORD elapsed = 0; - while (sample->update_hr == MS_S_PENDING && elapsed < milliseconds) + while (sample->busy && elapsed < milliseconds) { DWORD sleep_time = milliseconds - elapsed; if (!SleepConditionVariableCS(&sample->update_cv, &sample->parent->cs, sleep_time)) @@ -1613,7 +1621,7 @@ static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *ifa } } - hr = sample->update_hr; + hr = sample->busy ? MS_S_PENDING : sample->update_hr; LeaveCriticalSection(&sample->parent->cs); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9dda5882a4f..6e6f7483b49 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -7665,6 +7665,59 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0); + ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample2, SSUPDATE_ASYNC, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_ENDOFSTREAM, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); -- 2.17.1

2 3

[PATCH v2] amstream: Implement SSUPDATE_CONTINUOUS flag in IDirectDrawStreamSample::Update.
by Anton Baskanov 13 Oct '20

13 Oct '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 37 +++--- dlls/amstream/tests/amstream.c | 224 +++++++++++++++++++++++++++++++++ 2 files changed, 247 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5e6e1555d7c..190034fa008 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -75,10 +75,12 @@ struct ddraw_sample RECT rect; STREAM_TIME start_time; STREAM_TIME end_time; + BOOL continuous_update; CONDITION_VARIABLE update_cv; struct list entry; HRESULT update_hr; + BOOL busy; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -86,6 +88,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw static void remove_queued_update(struct ddraw_sample *sample) { + sample->busy = FALSE; list_remove(&sample->entry); WakeConditionVariable(&sample->update_cv); } @@ -1348,7 +1351,16 @@ static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample * sample->update_hr = process_update(sample, top_down_stride, top_down_pointer, start_stream_time, end_stream_time); - remove_queued_update(sample); + if (sample->continuous_update && SUCCEEDED(sample->update_hr)) + { + list_remove(&sample->entry); + list_add_tail(&sample->parent->update_queue, &sample->entry); + } + else + { + remove_queued_update(sample); + } + LeaveCriticalSection(&stream->cs); return S_OK; } @@ -1540,12 +1552,6 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, return E_NOTIMPL; } - if (flags & ~SSUPDATE_ASYNC) - { - FIXME("Unsupported flags %#x.\n", flags); - return E_NOTIMPL; - } - EnterCriticalSection(&sample->parent->cs); if (sample->parent->state != State_Running) @@ -1559,13 +1565,16 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, LeaveCriticalSection(&sample->parent->cs); return MS_S_ENDOFSTREAM; } - if (MS_S_PENDING == sample->update_hr) + if (sample->busy) { LeaveCriticalSection(&sample->parent->cs); return MS_E_BUSY; } - sample->update_hr = MS_S_PENDING; + sample->continuous_update = (flags & SSUPDATE_ASYNC) && (flags & SSUPDATE_CONTINUOUS); + + sample->update_hr = MS_S_NOUPDATE; + sample->busy = TRUE; list_add_tail(&sample->parent->update_queue, &sample->entry); WakeConditionVariable(&sample->parent->update_queued_cv); @@ -1575,7 +1584,7 @@ static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, return MS_S_PENDING; } - while (sample->update_hr == MS_S_PENDING) + while (sample->busy) SleepConditionVariableCS(&sample->update_cv, &sample->parent->cs, INFINITE); LeaveCriticalSection(&sample->parent->cs); @@ -1592,18 +1601,18 @@ static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *ifa EnterCriticalSection(&sample->parent->cs); - if (sample->update_hr == MS_S_PENDING) + if (sample->busy) { if (flags & (COMPSTAT_NOUPDATEOK | COMPSTAT_ABORT)) { - sample->update_hr = MS_S_NOUPDATE; remove_queued_update(sample); } else if (flags & COMPSTAT_WAIT) { DWORD start_time = GetTickCount(); DWORD elapsed = 0; - while (sample->update_hr == MS_S_PENDING && elapsed < milliseconds) + sample->continuous_update = FALSE; + while (sample->busy && elapsed < milliseconds) { DWORD sleep_time = milliseconds - elapsed; if (!SleepConditionVariableCS(&sample->update_cv, &sample->parent->cs, sleep_time)) @@ -1613,7 +1622,7 @@ static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *ifa } } - hr = sample->update_hr; + hr = sample->busy ? MS_S_PENDING : sample->update_hr; LeaveCriticalSection(&sample->parent->cs); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9dda5882a4f..b436840e407 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -7440,6 +7440,96 @@ static void test_ddrawstreamsample_update(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 5; ++i) + memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + + ammediastream_mem_input_pin = mem_input_pin; + ammediastream_media_sample = media_sample; + ammediastream_sleep_time = 100; + ammediastream_expected_hr = S_OK; + thread = CreateThread(NULL, 0, ammediastream_receive, NULL, 0, NULL); + + hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); + CloseHandle(thread); + + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 5; ++i) + memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 5; ++i) + memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); EXPECT_REF(stream_sample, 1); @@ -7665,6 +7755,140 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0); + ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_ABORT, 0); + ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_E_BUSY, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); + ok(hr == MS_E_BUSY, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample2, SSUPDATE_ASYNC, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == MS_S_ENDOFSTREAM, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_WAIT, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + streamsample_sample = (IStreamSample *)stream_sample1; + streamsample_flags = COMPSTAT_WAIT; + streamsample_timeout = INFINITE; + streamsample_expected_hr = S_OK; + thread = CreateThread(NULL, 0, streamsample_completion_status, NULL, 0, NULL); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "CompletionStatus returned prematurely.\n"); + + media_sample = ammediastream_allocate_sample(&source, test_data, sizeof(test_data)); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); + CloseHandle(thread); + + hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); -- 2.17.1

2 1

[PATCH] tzres: Add Eastern Standard Time (Mexico) Zone.
by Daniel Lehman 13 Oct '20

13 Oct '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index f7eebe73393..a0e3791be1d 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -100,6 +100,8 @@ STRINGTABLE 58593 "Easter Island Daylight Time" 30800 "Eastern Standard Time" 30801 "Eastern Daylight Time" + 59536 "Eastern Standard Time (Mexico)" + 59537 "Eastern Daylight Time (Mexico)" 59424 "Egypt Standard Time" 59425 "Egypt Daylight Time" 45952 "Ekaterinburg Standard Time" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3580a32ca05..ff9a221feaa 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3031,6 +3031,17 @@ HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2006",1,2c HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Display",,"America/Cancun" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Dlt",,"Eastern Daylight Time (Mexico)" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-59537" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-59536" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Std",,"Eastern Standard Time (Mexico)" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"TZI",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2014",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2015",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,02,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2016",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2014" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Display",,"Africa/Cairo" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Dlt",,"Egypt Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Dlt",,"@tzres.dll,-59425" -- 2.25.1

1 0

[PATCH 1/3] winevulkan: Migrate vkGetPhysicalDeviceSurfaceFormats2KHR to a private thunk
by Joshua Ashton 13 Oct '20

13 Oct '20

- Joshie 🐸✨

1 0

[PATCH] ntdll: Always align stack in call_user_apc_dispatcher() on x86_64.
by Paul Gofman 12 Oct '20

12 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49860 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Context passed to NtContinue() (which calls the faulting APC in the referenced bug's app) is the initial thread context. The fault itself is in combase.CoCreateInstance() which happens to use xmm0 for transferring arguments on stack. dlls/ntdll/unix/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e11b2c70b59..00b07c4270c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2011,6 +2011,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "jrcxz 1f\n\t" "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ + "andq $~15,%rsp\n\t" "jmp 2f\n" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ "leaq -0x4d0(%rax),%rsp\n\t" -- 2.26.2

1 0

[PATCH v2] evr/tests: Fix a test failure on Windows 7.
by Sven Baars 12 Oct '20

12 Oct '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- v2: Only check for the presence of D3DPRESENTFLAG_VIDEO. dlls/evr/tests/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 175c30e8188..7649259c5f0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1073,7 +1073,7 @@ static void test_default_presenter(void) ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); ok(present_params.Windowed, "Unexpected windowed mode.\n"); ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); - ok(present_params.Flags == D3DPRESENTFLAG_VIDEO, "Unexpected flags.\n"); + ok(present_params.Flags & D3DPRESENTFLAG_VIDEO, "Unexpected flags %#x.\n", present_params.Flags); ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); IDirect3DDevice9_Release(d3d_device); -- 2.25.1

2 1

[PATCH v2 2/2] vbscript: support for class default sub.
by Robert Wilhelm 12 Oct '20

12 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v2:refactor after Jacek's review. --- dlls/vbscript/compile.c | 21 +++++++++++++++++---- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 6 ++---- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e9f6361aee9..858edff7e4c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1670,7 +1670,8 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) function_decl_t *func_decl, *func_prop_decl; class_desc_t *class_desc; dim_decl_t *prop_decl; - unsigned i; + unsigned i, def=0; + BOOL is_default; HRESULT hres; static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; @@ -1690,15 +1691,25 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) if(!class_desc->name) return E_OUTOFMEMORY; - class_desc->func_cnt = 1; /* always allocate slot for default getter */ + class_desc->func_cnt = 1; /* always allocate slot for default getter or method */ for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { + is_default = FALSE; + if (func_decl->is_default) is_default = TRUE; for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { if(func_prop_decl->is_default) + is_default = TRUE; break; } - if(!func_prop_decl) + if(!is_default) class_desc->func_cnt++; + else + def++; + } + + if(def > 1) { + FIXME("multiple default getters or methods\n"); + return E_FAIL; } class_desc->funcs = compiler_alloc(ctx->code, class_desc->func_cnt*sizeof(*class_desc->funcs)); @@ -1707,7 +1718,9 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) memset(class_desc->funcs, 0, class_desc->func_cnt*sizeof(*class_desc->funcs)); for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { - for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { + func_prop_decl = func_decl; + if (func_decl->is_default) i--; + for(; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { if(func_prop_decl->is_default) { i--; break; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7e6cc17efd6..942e76459c2 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -993,7 +993,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { - if(type == FUNC_PROPGET) { + if(type == FUNC_PROPGET || type == FUNC_FUNCTION || type == FUNC_SUB) { is_default = TRUE; }else { FIXME("Invalid default property\n"); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fc762450a3b..65f8a458cd7 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1750,6 +1750,36 @@ call ok(x.getprop.getprop().prop is obj, "x.getprop.getprop().prop is not obj (e ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) +funcCalled = "" +class DefaultSubTest1 + Public default Sub init(a) + funcCalled = "init" & a + end sub +end class + +Set obj = New DefaultSubTest1 +obj.init(1) +call ok(funcCalled = "init1","funcCalled=" & funcCalled) +funcCalled = "" +obj(2) +call ok(funcCalled = "init2","funcCalled=" & funcCalled) + +class DefaultSubTest2 + Public Default Function init + funcCalled = "init" + end function +end class + +Set obj = New DefaultSubTest2 +funcCalled = "" +obj.init() +call ok(funcCalled = "init","funcCalled=" & funcCalled) +funcCalled = "" +' todo this is not yet supported +'funcCalled = "" +'obj() +'call ok(funcCalled = "init","funcCalled=" & funcCalled) + with nothing end with diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1ff1110e56b..5f493d420bd 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -38,19 +38,17 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t { unsigned i; - for(i = invoke_type == VBDISP_ANY ? 0 : 1; i < This->desc->func_cnt; i++) { + for(i = 0; i < This->desc->func_cnt; i++) { if(invoke_type == VBDISP_ANY) { if(!search_private && !This->desc->funcs[i].is_public) continue; - if(!i && !This->desc->funcs[0].name) /* default value may not exist */ - continue; }else { if(!This->desc->funcs[i].entries[invoke_type] || (!search_private && !This->desc->funcs[i].entries[invoke_type]->is_public)) continue; } - if(!wcsicmp(This->desc->funcs[i].name, name)) { + if(This->desc->funcs[i].name && !wcsicmp(This->desc->funcs[i].name, name)) { *id = i; return TRUE; } -- 2.26.2

1 0

[PATCH v2 1/2] vbscript: add is_default flag to struct _function_decl_t.
by Robert Wilhelm 12 Oct '20

12 Oct '20

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v2: unchanged --- dlls/vbscript/compile.c | 6 ++---- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 2e991b0c0ae..e9f6361aee9 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1468,7 +1468,6 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f case FUNC_PROPGET: case FUNC_PROPLET: case FUNC_PROPSET: - case FUNC_DEFGET: ctx->prop_end_label = alloc_label(ctx); if(!ctx->prop_end_label) return E_OUTOFMEMORY; @@ -1630,7 +1629,6 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_FUNCTION: case FUNC_SUB: case FUNC_PROPGET: - case FUNC_DEFGET: invoke_type = VBDISP_CALLGET; break; case FUNC_PROPLET: @@ -1696,7 +1694,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) + if(func_prop_decl->is_default) break; } if(!func_prop_decl) @@ -1710,7 +1708,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) { + if(func_prop_decl->is_default) { i--; break; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d58e89b7dba..a3bca804128 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -134,7 +134,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET ) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ab81bb3ae41..f5d8a616b9f 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -184,6 +184,7 @@ typedef struct _function_decl_t { const WCHAR *name; function_type_t type; BOOL is_public; + BOOL is_default; arg_decl_t *args; statement_t *body; struct _function_decl_t *next; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index cf94bdce464..7e6cc17efd6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -990,10 +990,11 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, unsigned storage_flags, arg_decl_t *arg_decl, statement_t *body) { function_decl_t *decl; + BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { if(type == FUNC_PROPGET) { - type = FUNC_DEFGET; + is_default = TRUE; }else { FIXME("Invalid default property\n"); ctx->hres = E_FAIL; @@ -1008,6 +1009,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->name = name; decl->type = type; decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); + decl->is_default = is_default; decl->args = arg_decl; decl->body = body; decl->next = NULL; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 36eba21e279..1ff1110e56b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -177,7 +177,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern switch(flags) { case DISPATCH_PROPERTYGET: func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + if(!func || func->type != FUNC_PROPGET) { WARN("no getter\n"); return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 869fb05b6ed..afcce5eb9b8 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -314,7 +314,6 @@ typedef enum { FUNC_PROPGET, FUNC_PROPLET, FUNC_PROPSET, - FUNC_DEFGET } function_type_t; typedef struct { -- 2.26.2

1 0

[PATCH] cmd: Set errorlevel to 0 when 'call' is invoked with an empty string.
by Aaron Hill 12 Oct '20

12 Oct '20

Previously, invoking 'call' with an empty string would leave errorlevel unchanged. Reset errorlevel to 0 to match the behavior of the Windows 'cmd.exe'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49982 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> --- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/wcmdmain.c | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 73b0917c275..c7418b759e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3149,6 +3149,9 @@ echo %ErrorLevel% should be 7 if errorlevel 7 echo setting var worked too well, bad call :setError 3 echo %ErrorLevel% should still be 7 +rem Verify that (call ) sets errorlevel to 0 +(call ) +if errorlevel 1 echo errorlevel should have been 0 echo ------------ Testing GOTO ------------ if a==a goto dest1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 47e43fcd675..78f07b1b7b4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1041,6 +1041,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR *lastSlash; WCHAR pathext[MAXSTRING]; WCHAR *firstParam; + DWORD firstParamLen; BOOL extensionsupplied = FALSE; BOOL explicit_path = FALSE; BOOL status; @@ -1053,6 +1054,13 @@ void WCMD_run_program (WCHAR *command, BOOL called) firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); if (!firstParam) return; + firstParamLen = lstrlenW(firstParam); + if (firstParamLen == 0) { + // Windows sets errorlevel to 0 when invoking 'call' on an empty string + errorlevel = 0; + return; + } + /* Calculate the search path and stem to search for */ if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'}; @@ -1063,7 +1071,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) lstrcpyW (pathtosearch, curDir); } if (wcschr(firstParam, '.') != NULL) extensionsupplied = TRUE; - if (lstrlenW(firstParam) >= MAX_PATH) + if (firstParamLen >= MAX_PATH) { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); return; -- 2.28.0

1 0

[PATCH] opcservices: Use wide-char string literals.
by Michael Stefaniuc 12 Oct '20

12 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opcservices/factory.c | 3 +-- dlls/opcservices/package.c | 54 +++++++++++++------------------------- dlls/opcservices/uri.c | 7 +++-- 3 files changed, 22 insertions(+), 42 deletions(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index ee155b3e714..7ee66676c9d 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -320,7 +320,6 @@ static HRESULT WINAPI opc_factory_CreatePackageRootUri(IOpcFactory *iface, IOpcU static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, IOpcPartUri **out) { - static const WCHAR rootW[] = {'/',0}; IUri *part_uri, *root_uri, *combined; HRESULT hr; @@ -337,7 +336,7 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, return hr; } - if (FAILED(hr = CreateUri(rootW, Uri_CREATE_ALLOW_RELATIVE, 0, &root_uri))) + if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &root_uri))) { WARN("Failed to create root uri, hr %#x.\n", hr); IUri_Release(part_uri); diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 6ed7f6bcd7c..df1a71e17e8 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1201,12 +1201,11 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W relationship->id = CoTaskMemAlloc(10 * sizeof(WCHAR)); if (relationship->id) { - static const WCHAR fmtW[] = {'R','%','0','8','X',0}; DWORD generated; /* FIXME: test that generated id is unique */ RtlGenRandom(&generated, sizeof(generated)); - swprintf(relationship->id, 10, fmtW, generated); + swprintf(relationship->id, 10, L"R%08X", generated); if (opc_relationshipset_get_rel(set, relationship->id)) { @@ -1733,31 +1732,18 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co static HRESULT opc_package_write_default_type(const WCHAR *ext, const WCHAR *type, IXmlWriter *writer) { - static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; - static const WCHAR extensionW[] = {'E','x','t','e','n','s','i','o','n',0}; - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; HRESULT hr; - hr = IXmlWriter_WriteStartElement(writer, NULL, defaultW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"Default", NULL); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, extensionW, NULL, ext); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"Extension", NULL, ext); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, type); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"ContentType", NULL, type); return hr; } static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_archive *archive, IXmlWriter *writer) { - static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', - 'p','a','c','k','a','g','e','/','2','0','0','6','/','c','o','n','t','e','n','t','-','t','y','p','e','s',0}; - static const WCHAR relstypeW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','v','n','d','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','-', - 'p','a','c','k','a','g','e','.','r','e','l','a','t','i','o','n','s','h','i','p','s','+','x','m','l',0}; - static const WCHAR contenttypesW[] = {'[','C','o','n','t','e','n','t','_','T','y','p','e','s',']','.','x','m','l',0}; - static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; - static const WCHAR overrideW[] = {'O','v','e','r','r','i','d','e',0}; - static const WCHAR partnameW[] = {'P','a','r','t','N','a','m','e',0}; - static const WCHAR typesW[] = {'T','y','p','e','s',0}; - static const WCHAR relsW[] = {'r','e','l','s',0}; struct content_type *content_type, *content_type2; struct content_types types; IStream *content = NULL; @@ -1774,11 +1760,13 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a if (SUCCEEDED(hr)) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, typesW, uriW); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"Types", + L"http://schemas.openxmlformats.org/package/2006/content-types"); if (SUCCEEDED(hr) && types.has_rels_part) { - hr = opc_package_write_default_type(relsW, relstypeW, writer); + hr = opc_package_write_default_type(L"rels", + L"application/vnd.openxmlformats-package.relationships+xml", writer); if (SUCCEEDED(hr)) hr = IXmlWriter_WriteEndElement(writer); } @@ -1799,17 +1787,17 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a BSTR name = NULL; if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, overrideW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"Override", NULL); if (SUCCEEDED(hr)) hr = IOpcPart_GetName(content_type->u.override.part, &uri); if (SUCCEEDED(hr)) hr = IOpcPartUri_GetRawUri(uri, &name); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, partnameW, NULL, name); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"PartName", NULL, name); if (SUCCEEDED(hr)) hr = IOpcPart_GetContentType(content_type->u.override.part, &type); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, type); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"ContentType", NULL, type); if (uri) IOpcPartUri_Release(uri); @@ -1831,7 +1819,7 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a hr = IXmlWriter_Flush(writer); if (SUCCEEDED(hr)) - hr = compress_add_file(archive, contenttypesW, content, OPC_COMPRESSION_NORMAL); + hr = compress_add_file(archive, L"[Content_Types].xml", content, OPC_COMPRESSION_NORMAL); if (content) IStream_Release(content); @@ -1841,16 +1829,12 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) { - static const WCHAR relationshipW[] = {'R','e','l','a','t','i','o','n','s','h','i','p',0}; - static const WCHAR targetW[] = {'T','a','r','g','e','t',0}; - static const WCHAR typeW[] = {'T','y','p','e',0}; - static const WCHAR idW[] = {'I','d',0}; BSTR target_uri; HRESULT hr; WCHAR *str; IUri *uri; - if (FAILED(hr = IXmlWriter_WriteStartElement(writer, NULL, relationshipW, NULL))) + if (FAILED(hr = IXmlWriter_WriteStartElement(writer, NULL, L"Relationship", NULL))) return hr; if (FAILED(hr = IOpcRelationship_GetTargetUri(rel, &uri))) @@ -1859,7 +1843,7 @@ static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) IUri_GetRawUri(uri, &target_uri); IUri_Release(uri); - hr = IXmlWriter_WriteAttributeString(writer, NULL, targetW, NULL, target_uri); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"Target", NULL, target_uri); SysFreeString(target_uri); if (FAILED(hr)) return hr; @@ -1867,7 +1851,7 @@ static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) if (FAILED(hr = IOpcRelationship_GetId(rel, &str))) return hr; - hr = IXmlWriter_WriteAttributeString(writer, NULL, idW, NULL, str); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"Id", NULL, str); CoTaskMemFree(str); if (FAILED(hr)) return hr; @@ -1875,7 +1859,7 @@ static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) if (FAILED(hr = IOpcRelationship_GetRelationshipType(rel, &str))) return hr; - hr = IXmlWriter_WriteAttributeString(writer, NULL, typeW, NULL, str); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"Type", NULL, str); CoTaskMemFree(str); if (FAILED(hr)) return hr; @@ -1886,9 +1870,6 @@ static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelationshipSet *rels, IOpcUri *uri, IXmlWriter *writer) { - static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', - 'p','a','c','k','a','g','e','/','2','0','0','6','/','r','e','l','a','t','i','o','n','s','h','i','p','s',0}; - static const WCHAR relationshipsW[] = {'R','e','l','a','t','i','o','n','s','h','i','p','s',0}; IOpcRelationshipEnumerator *enumerator; BSTR rels_part_uri = NULL; IOpcPartUri *rels_uri; @@ -1916,7 +1897,8 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations if (SUCCEEDED(hr)) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, relationshipsW, uriW); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"Relationships", + L"http://schemas.openxmlformats.org/package/2006/relationships"); while (has_next) { diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index db889f7144b..5cba14aa78b 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -449,8 +449,8 @@ static const IOpcPartUriVtbl opc_part_uri_vtbl = static IUri *opc_part_uri_get_rels_uri(IUri *uri) { - static const WCHAR relsdirW[] = {'/','_','r','e','l','s',0}; - static const WCHAR relsextW[] = {'.','r','e','l','s',0}; + static const WCHAR relsdirW[] = L"/_rels"; + static const WCHAR relsextW[] = L".rels"; WCHAR *start = NULL, *end, *ret; IUri *rels_uri; HRESULT hr; @@ -578,7 +578,6 @@ HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri * HRESULT opc_root_uri_create(IOpcUri **out) { - static const WCHAR rootW[] = {'/',0}; struct opc_uri *obj; HRESULT hr; IUri *uri; @@ -588,7 +587,7 @@ HRESULT opc_root_uri_create(IOpcUri **out) if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; - if (FAILED(hr = CreateUri(rootW, Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) + if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) { WARN("Failed to create rels uri, hr %#x.\n", hr); heap_free(obj); -- 2.26.2

1 0

[PATCH] iexplore: Use wide-char string literals.
by Michael Stefaniuc 12 Oct '20

12 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/iexplore/main.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 01ad9d02f5f..ade9f8c5226 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -35,28 +35,18 @@ static BOOL check_native_ie(void) void* buf; BOOL ret = TRUE; LPWORD translation; - - static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; - static const WCHAR wineW[] = {'W','i','n','e',0}; - static const WCHAR translationW[] = - {'\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n',0}; - static const WCHAR file_desc_fmtW[] = - {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x', - '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; WCHAR file_desc_strW[48]; - size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + size = GetFileVersionInfoSizeW(L"browseui.dll", &handle); if(!size) return TRUE; buf = HeapAlloc(GetProcessHeap(), 0, size); - GetFileVersionInfoW(browseui_dllW, 0, size,buf); - if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) + GetFileVersionInfoW(L"browseui.dll", 0, size,buf); + if (VerQueryValueW(buf, L"\\VarFileInfo\\Translation", (void **)&translation, &bytes)) { - wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, wineW); + wsprintfW(file_desc_strW, L"\\StringFileInfo\\%04x%04x\\FileDescription", translation[0], translation[1]); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, L"Wine"); } HeapFree(GetProcessHeap(), 0, buf); @@ -78,13 +68,10 @@ static DWORD register_iexplore(BOOL doregister) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) { - static const WCHAR regserverW[] = {'r','e','g','s','e','r','v','e','r',0}; - static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; - if(*cmdline == '-' || *cmdline == '/') { - if(!wcsicmp(cmdline+1, regserverW)) + if(!wcsicmp(cmdline+1, L"regserver")) return register_iexplore(TRUE); - if(!wcsicmp(cmdline+1, unregserverW)) + if(!wcsicmp(cmdline+1, L"unregserver")) return register_iexplore(FALSE); } -- 2.26.2

1 0

[PATCH v2] d3dcompiler: Fix a leak on error path (Coverity).
by Sven Baars 12 Oct '20

12 Oct '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- v2: Moved the alloc instead. dlls/d3dcompiler_43/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index df39716b495..21ad98f2b5c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1446,7 +1446,7 @@ static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsig struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { - struct hlsl_ir_assignment *assign = d3dcompiler_alloc(sizeof(*assign)); + struct hlsl_ir_assignment *assign; struct hlsl_type *lhs_type; DWORD writemask = 0; @@ -1459,6 +1459,7 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh return NULL; } + assign = d3dcompiler_alloc(sizeof(*assign)); if (!assign) { ERR("Out of memory\n"); -- 2.25.1

2 1

[PATCH] jscript: cc_parser_parse implement '&&' expression.
by Robert Wilhelm 12 Oct '20

12 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49450 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/tests/cc.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 4bc6260f194..dd72f61b03b 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -161,7 +161,7 @@ CCLogicalORExpression CCLogicalANDExpression : CCBitwiseORExpression { $$ = $1; } | CCBitwiseANDExpression tAND CCBitwiseORExpression - { FIXME("'&&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccbool($1) && get_ccbool($3)); } CCBitwiseORExpression : CCBitwiseXORExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 8f45a3dd331..2232d2fb689 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -180,6 +180,23 @@ expect(@test, true); @set @test = (1 >= true-1) expect(@test, true); +@set @test = (true && true) +expect(@test, true); + +@set @test = (false && true) +expect(@test, false); + +@set @test = (true && false) +expect(@test, false); + +@set @test = (false && false) +expect(@test, false); + +if(!isWin64) { +@set @test = (@_win32&&@_jscript_version>=5) +expect(@test, true); +} + @if (false) this wouldn not parse "@end -- 2.26.2

2 1

[PATCH 2/2] vbscript: support for class default sub.
by Robert Wilhelm 12 Oct '20

12 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 26 +++++++++++++++++++++----- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 2 +- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e9f6361aee9..2d75f4d4a5f 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1670,7 +1670,8 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) function_decl_t *func_decl, *func_prop_decl; class_desc_t *class_desc; dim_decl_t *prop_decl; - unsigned i; + unsigned i, def=0; + BOOL is_default; HRESULT hres; static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; @@ -1690,15 +1691,25 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) if(!class_desc->name) return E_OUTOFMEMORY; - class_desc->func_cnt = 1; /* always allocate slot for default getter */ + class_desc->func_cnt = 1; /* always allocate slot for default getter or method */ for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { + is_default = FALSE; + if (func_decl->is_default) is_default = TRUE; for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { if(func_prop_decl->is_default) + is_default = TRUE; break; } - if(!func_prop_decl) + if(!is_default) class_desc->func_cnt++; + else + def++; + } + + if(def > 1) { + FIXME("multiple default getters or methods\n"); + return E_FAIL; } class_desc->funcs = compiler_alloc(ctx->code, class_desc->func_cnt*sizeof(*class_desc->funcs)); @@ -1707,12 +1718,17 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) memset(class_desc->funcs, 0, class_desc->func_cnt*sizeof(*class_desc->funcs)); for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { + is_default = FALSE; + if (func_decl->is_default) is_default = TRUE; for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { if(func_prop_decl->is_default) { - i--; + is_default = TRUE; break; } } + if(is_default) { + i--; + } if(!wcsicmp(class_initializeW, func_decl->name)) { if(func_decl->type != FUNC_SUB) { @@ -1730,7 +1746,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->class_terminate_id = i; } - hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (func_prop_decl ? 0 : i)); + hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (is_default ? 0 : i)); if(FAILED(hres)) return hres; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7e6cc17efd6..942e76459c2 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -993,7 +993,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { - if(type == FUNC_PROPGET) { + if(type == FUNC_PROPGET || type == FUNC_FUNCTION || type == FUNC_SUB) { is_default = TRUE; }else { FIXME("Invalid default property\n"); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fc762450a3b..65f8a458cd7 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1750,6 +1750,36 @@ call ok(x.getprop.getprop().prop is obj, "x.getprop.getprop().prop is not obj (e ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) +funcCalled = "" +class DefaultSubTest1 + Public default Sub init(a) + funcCalled = "init" & a + end sub +end class + +Set obj = New DefaultSubTest1 +obj.init(1) +call ok(funcCalled = "init1","funcCalled=" & funcCalled) +funcCalled = "" +obj(2) +call ok(funcCalled = "init2","funcCalled=" & funcCalled) + +class DefaultSubTest2 + Public Default Function init + funcCalled = "init" + end function +end class + +Set obj = New DefaultSubTest2 +funcCalled = "" +obj.init() +call ok(funcCalled = "init","funcCalled=" & funcCalled) +funcCalled = "" +' todo this is not yet supported +'funcCalled = "" +'obj() +'call ok(funcCalled = "init","funcCalled=" & funcCalled) + with nothing end with diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1ff1110e56b..864c36681e3 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -38,7 +38,7 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t { unsigned i; - for(i = invoke_type == VBDISP_ANY ? 0 : 1; i < This->desc->func_cnt; i++) { + for(i = 0; i < This->desc->func_cnt; i++) { if(invoke_type == VBDISP_ANY) { if(!search_private && !This->desc->funcs[i].is_public) continue; -- 2.26.2

2 1

[PATCH 6/6] wineconsole: Reimplement as AllocConsole wrapper.
by Jacek Caban 12 Oct '20

12 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/Makefile.in | 5 +- programs/wineconsole/dialog.c | 872 -------------- programs/wineconsole/registry.c | 367 ------ programs/wineconsole/user.c | 1445 ------------------------ programs/wineconsole/winecon_private.h | 106 -- programs/wineconsole/winecon_user.h | 57 - programs/wineconsole/wineconsole.c | 879 +------------- programs/wineconsole/wineconsole.rc | 104 -- programs/wineconsole/wineconsole_res.h | 68 -- 9 files changed, 41 insertions(+), 3862 deletions(-) delete mode 100644 programs/wineconsole/dialog.c delete mode 100644 programs/wineconsole/registry.c delete mode 100644 programs/wineconsole/user.c delete mode 100644 programs/wineconsole/winecon_private.h delete mode 100644 programs/wineconsole/winecon_user.h

1 0

[PATCH 5/6] kernelbase: Use conhost in AllocConsole.
by Jacek Caban 12 Oct '20

12 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

1 0

[PATCH 4/6] conhost: Set console window title.
by Jacek Caban 12 Oct '20

12 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 3/6] conhost: Store title as zero terminated string.
by Jacek Caban 12 Oct '20

12 Oct '20

To make it usable for Windows functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 19 ++++++++++--------- programs/conhost/conhost.h | 1 - 2 files changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH 2/6] conhost: Import scrolling support from wineconsole.
by Jacek Caban 12 Oct '20

12 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+)

1 0

[PATCH 1/6] conhost: Support window resizing.
by Jacek Caban 12 Oct '20

12 Oct '20

Based on wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)

1 0

[PATCH 5/5] dssenh: Set last error in CPHashData.
by Hans Leidekker 12 Oct '20

12 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 8 ++++++-- dlls/dssenh/tests/dssenh.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index ce7b15f7a66..38f249ef04d 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -641,8 +641,12 @@ BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DW if (hash->magic != MAGIC_HASH) return FALSE; - if (hash->finished || BCryptHashData( hash->handle, (UCHAR *)data, len, 0 )) return FALSE; - return TRUE; + if (hash->finished) + { + SetLastError( NTE_BAD_HASH_STATE ); + return FALSE; + } + return !BCryptHashData( hash->handle, (UCHAR *)data, len, 0 ); } BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 704b3685c3f..6ad15225924 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1440,7 +1440,7 @@ static void test_duplicate_hash(void) SetLastError(0xdeadbeef); result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); ok(!result, "success\n"); - todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); result = CryptDuplicateHash(hhash, NULL, 0, &hhash2); ok(result, "got %08x\n", GetLastError()); @@ -1448,7 +1448,7 @@ static void test_duplicate_hash(void) SetLastError(0xdeadbeef); result = CryptHashData(hhash2, (const BYTE *)"winetest", sizeof("winetest"), 0); ok(!result, "success\n"); - todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); len = sizeof(buf); result = CryptGetHashParam(hhash2, HP_HASHVAL, buf, &len, 0); -- 2.28.0

1 0

[PATCH 4/5] dssenh: Implement CPGenRandom.
by Hans Leidekker 12 Oct '20

12 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index e74650c9bb7..eb9ef06337a 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -9,7 +9,7 @@ @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) @ stdcall CPGenKey(ptr long long ptr) -@ stub CPGenRandom +@ stdcall CPGenRandom(ptr long ptr) @ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam @ stdcall CPGetProvParam(ptr long ptr ptr long) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 38ee325b8ee..ce7b15f7a66 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -27,6 +27,7 @@ #include "bcrypt.h" #include "objbase.h" #include "rpcproxy.h" +#include "ntsecapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -498,6 +499,17 @@ BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, D return TRUE; } +BOOL WINAPI CPGenRandom( HCRYPTPROV hprov, DWORD len, BYTE *buffer ) +{ + struct container *container = (struct container *)hprov; + + TRACE( "%p, %u, %p\n", (void *)hprov, len, buffer ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + + return RtlGenRandom( buffer, len ); +} + static struct hash *create_hash( ALG_ID algid ) { struct hash *ret; -- 2.28.0

1 0

[PATCH 3/5] dssenh: Implement CPDuplicateKey.
by Hans Leidekker 12 Oct '20

12 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index a045a7e04ee..e74650c9bb7 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -5,7 +5,7 @@ @ stdcall CPDestroyHash(ptr ptr) @ stdcall CPDestroyKey(ptr ptr) @ stdcall CPDuplicateHash(ptr ptr ptr long ptr) -@ stub CPDuplicateKey +@ stdcall CPDuplicateKey(ptr ptr ptr long ptr) @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) @ stdcall CPGenKey(ptr long long ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index d40dedf41b2..38ee325b8ee 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -471,6 +471,33 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW return FALSE; } +static struct key *duplicate_key( const struct key *key ) +{ + struct key *ret; + + if (!(ret = create_key( key->algid, key->flags ))) return NULL; + + if (BCryptDuplicateKey( key->handle, &ret->handle, NULL, 0, 0 )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, DWORD flags, HCRYPTKEY *ret_key ) +{ + struct key *key = (struct key *)hkey, *ret; + + TRACE( "%p, %p, %p, %08x, %p\n", (void *)hprov, (void *)hkey, reserved, flags, ret_key ); + + if (key->magic != MAGIC_KEY) return FALSE; + + if (!(ret = duplicate_key( key ))) return FALSE; + *ret_key = (HCRYPTKEY)ret; + return TRUE; +} + static struct hash *create_hash( ALG_ID algid ) { struct hash *ret; -- 2.28.0

1 0

[PATCH 2/5] dssenh: Implement CPDuplicateHash.
by Hans Leidekker 12 Oct '20

12 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 31 ++++++++++++++++++++++ dlls/dssenh/tests/dssenh.c | 53 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index 2d93a98796a..a045a7e04ee 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -4,7 +4,7 @@ @ stdcall CPDeriveKey(ptr long ptr long ptr) @ stdcall CPDestroyHash(ptr ptr) @ stdcall CPDestroyKey(ptr ptr) -@ stub CPDuplicateHash +@ stdcall CPDuplicateHash(ptr ptr ptr long ptr) @ stub CPDuplicateKey @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index e9b676e7358..d40dedf41b2 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -563,6 +563,37 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) return TRUE; } +static struct hash *duplicate_hash( const struct hash *hash ) +{ + struct hash *ret; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + + ret->magic = hash->magic; + ret->len = hash->len; + if (BCryptDuplicateHash( hash->handle, &ret->handle, NULL, 0, 0 )) + { + heap_free( ret ); + return NULL; + } + memcpy( ret->value, hash->value, sizeof(hash->value) ); + ret->finished = hash->finished; + return ret; +} + +BOOL WINAPI CPDuplicateHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD *reserved, DWORD flags, HCRYPTHASH *ret_hash ) +{ + struct hash *hash = (struct hash *)hhash, *ret; + + TRACE( "%p, %p, %p, %08x, %p\n", (void *)hprov, (void *)hhash, reserved, flags, ret_hash ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + if (!(ret = duplicate_hash( hash ))) return FALSE; + *ret_hash = (HCRYPTHASH)ret; + return TRUE; +} + BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) { struct hash *hash = (struct hash *)hhash; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d4a231562e9..704b3685c3f 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1413,6 +1413,58 @@ static void test_key_exchange(void) ok(result, "Failed to release CSP provider.\n"); } +static void test_duplicate_hash(void) +{ + static const char expected[] = + {0xb9,0x7b,0xed,0xd4,0x7b,0xd8,0xa0,0xcd,0x6c,0xba,0xce,0xe9,0xb1,0x36,0xbb,0x00,0x27,0xe3,0x95,0x21}; + HCRYPTPROV hprov; + HCRYPTHASH hhash, hhash2; + BYTE buf[20]; + DWORD len; + BOOL result; + + result = CryptAcquireContextA(&hprov, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); + ok(result, "got %08x\n", GetLastError()); + + result = CryptCreateHash(hprov, CALG_SHA, 0, 0, &hhash); + ok(result, "got %08x\n", GetLastError()); + + result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(result, "got %08x\n", GetLastError()); + + len = sizeof(buf); + result = CryptGetHashParam(hhash, HP_HASHVAL, buf, &len, 0); + ok(result, "got %08x\n", GetLastError()); + ok(!memcmp(buf, expected, sizeof(expected)), "wrong data\n"); + + SetLastError(0xdeadbeef); + result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(!result, "success\n"); + todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + + result = CryptDuplicateHash(hhash, NULL, 0, &hhash2); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptHashData(hhash2, (const BYTE *)"winetest", sizeof("winetest"), 0); + ok(!result, "success\n"); + todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + + len = sizeof(buf); + result = CryptGetHashParam(hhash2, HP_HASHVAL, buf, &len, 0); + ok(result, "got %08x\n", GetLastError()); + ok(!memcmp(buf, expected, sizeof(expected)), "wrong data\n"); + + result = CryptDestroyHash(hhash2); + ok(result, "got %08x\n", GetLastError()); + + result = CryptDestroyHash(hhash); + ok(result, "got %08x\n", GetLastError()); + + result = CryptReleaseContext(hprov, 0); + ok(result, "got %08x\n", GetLastError()); +} + START_TEST(dssenh) { test_acquire_context(); @@ -1422,4 +1474,5 @@ START_TEST(dssenh) test_cipher_modes(ciphermode_data, ARRAY_SIZE(ciphermode_data)); test_verify_signature(); test_key_exchange(); + test_duplicate_hash(); } -- 2.28.0

1 0

[PATCH 1/5] dssenh: Don't store the algorithm handle for hashes.
by Hans Leidekker 12 Oct '20

12 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index f02e04585ac..e9b676e7358 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -59,7 +59,6 @@ struct container struct hash { DWORD magic; - BCRYPT_ALG_HANDLE alg_handle; BCRYPT_HASH_HANDLE handle; DWORD len; UCHAR value[64]; @@ -475,6 +474,7 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW static struct hash *create_hash( ALG_ID algid ) { struct hash *ret; + BCRYPT_ALG_HANDLE alg_handle; const WCHAR *alg; DWORD len; @@ -492,24 +492,26 @@ static struct hash *create_hash( ALG_ID algid ) default: FIXME( "unhandled algorithm %u\n", algid ); - return 0; + return NULL; } - if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return 0; + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; ret->magic = MAGIC_HASH; ret->len = len; - if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + if (BCryptOpenAlgorithmProvider( &alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) { heap_free( ret ); - return 0; + return NULL; } - if (BCryptCreateHash( ret->alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) + if (BCryptCreateHash( alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) { - BCryptCloseAlgorithmProvider( ret->alg_handle, 0 ); + BCryptCloseAlgorithmProvider( alg_handle, 0 ); heap_free( ret ); - return 0; + return NULL; } + + BCryptCloseAlgorithmProvider( alg_handle, 0 ); return ret; } @@ -537,6 +539,14 @@ BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD return TRUE; } +static void destroy_hash( struct hash *hash ) +{ + if (!hash) return; + BCryptDestroyHash( hash->handle ); + hash->magic = 0; + heap_free( hash ); +} + BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) { struct hash *hash = (struct hash *)hhash; @@ -549,11 +559,7 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) return FALSE; } - BCryptDestroyHash( hash->handle ); - BCryptCloseAlgorithmProvider( hash->alg_handle, 0 ); - - hash->magic = 0; - heap_free( hash ); + destroy_hash( hash ); return TRUE; } -- 2.28.0

1 0

[PATCH] wined3d: Make adapter_vk_clear_uav() static.
by Henri Verbeet 12 Oct '20

12 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 64850944040..beda271c32d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1722,7 +1722,7 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, context_release(&context_vk->c); } -void adapter_vk_clear_uav(struct wined3d_context *context, +static void adapter_vk_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); -- 2.20.1

1 0

[PATCH] wined3d: Clean up swapchain state on wined3d_swapchain_init() failure paths.
by Zhiyi Zhang 12 Oct '20

12 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 8 +++++--- dlls/wined3d/wined3d_main.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f8214379971..aa56634f3f3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -34,7 +34,7 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); - wined3d_swapchain_state_unregister(&swapchain->state); + wined3d_swapchain_state_cleanup(&swapchain->state); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -1359,7 +1359,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); - goto err; + wined3d_mutex_unlock(); + return hr; } swapchain->swapchain_ops = swapchain_ops; @@ -1565,6 +1566,7 @@ err: wined3d_texture_decref(swapchain->front_buffer); } + wined3d_swapchain_state_cleanup(&swapchain->state); wined3d_mutex_unlock(); return hr; @@ -2290,7 +2292,7 @@ BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_st void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { - wined3d_swapchain_state_unregister(state); + wined3d_swapchain_state_cleanup(state); heap_free(state); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 001b7dd1255..7e96f874682 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -817,7 +817,7 @@ void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, wined3d_wndproc_mutex_unlock(); } -void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) +static void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) { struct wined3d_registered_swapchain_state *state_entry, *last_state_entry; struct wined3d_window_hook *hook, *last_hook; @@ -850,6 +850,11 @@ void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) wined3d_wndproc_mutex_unlock(); } +void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) +{ + wined3d_swapchain_state_unregister(state); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c2204cd86e..901c809d875 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5083,13 +5083,13 @@ struct wined3d_swapchain_state HWND device_window; }; +void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, struct wined3d *wined3d) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; -void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops { -- 2.25.1

2 1

[PATCH 1/6] mfplat/mediatype: Enable IMFVideoMediaType based on major type.
by Nikolay Sivov 12 Oct '20

12 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 108 +++++++++++++++++-------------------- dlls/mfplat/tests/mfplat.c | 53 +++++++++++++++++- 2 files changed, 101 insertions(+), 60 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 5eaa4fdd08d..0c0d9620321 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -96,20 +96,32 @@ static struct presentation_desc *impl_from_IMFPresentationDescriptor(IMFPresenta static HRESULT WINAPI mediatype_QueryInterface(IMFMediaType *iface, REFIID riid, void **out) { + struct media_type *media_type = impl_from_IMFMediaType(iface); + GUID major = { 0 }; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualIID(riid, &IID_IMFMediaType) || + attributes_GetGUID(&media_type->attributes, &MF_MT_MAJOR_TYPE, &major); + + if (IsEqualGUID(&major, &MFMediaType_Video) && IsEqualIID(riid, &IID_IMFVideoMediaType)) + { + *out = &media_type->IMFVideoMediaType_iface; + } + else if (IsEqualIID(riid, &IID_IMFMediaType) || IsEqualIID(riid, &IID_IMFAttributes) || IsEqualIID(riid, &IID_IUnknown)) { - *out = iface; - IMFMediaType_AddRef(iface); - return S_OK; + *out = &media_type->IMFMediaType_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface) @@ -613,48 +625,20 @@ static const IMFMediaTypeVtbl mediatypevtbl = static HRESULT WINAPI video_mediatype_QueryInterface(IMFVideoMediaType *iface, REFIID riid, void **out) { - TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - - if (IsEqualIID(riid, &IID_IMFVideoMediaType) || - IsEqualIID(riid, &IID_IMFMediaType) || - IsEqualIID(riid, &IID_IMFAttributes) || - IsEqualIID(riid, &IID_IUnknown)) - { - *out = iface; - IMFVideoMediaType_AddRef(iface); - return S_OK; - } - - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + return IMFMediaType_QueryInterface(&media_type->IMFMediaType_iface, riid, out); } static ULONG WINAPI video_mediatype_AddRef(IMFVideoMediaType *iface) { struct media_type *media_type = impl_from_IMFVideoMediaType(iface); - ULONG refcount = InterlockedIncrement(&media_type->attributes.ref); - - TRACE("%p, refcount %u.\n", iface, refcount); - - return refcount; + return IMFMediaType_AddRef(&media_type->IMFMediaType_iface); } static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) { struct media_type *media_type = impl_from_IMFVideoMediaType(iface); - ULONG refcount = InterlockedDecrement(&media_type->attributes.ref); - - TRACE("%p, refcount %u.\n", iface, refcount); - - if (!refcount) - { - clear_attributes_object(&media_type->attributes); - CoTaskMemFree(media_type->video_format); - heap_free(media_type); - } - - return refcount; + return IMFMediaType_Release(&media_type->IMFMediaType_iface); } static HRESULT WINAPI video_mediatype_GetItem(IMFVideoMediaType *iface, REFGUID key, PROPVARIANT *value) @@ -1039,6 +1023,28 @@ static const IMFVideoMediaTypeVtbl videomediatypevtbl = video_mediatype_GetVideoRepresentation, }; +static HRESULT create_media_type(struct media_type **ret) +{ + struct media_type *object; + HRESULT hr; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + object->IMFMediaType_iface.lpVtbl = &mediatypevtbl; + object->IMFVideoMediaType_iface.lpVtbl = &videomediatypevtbl; + + *ret = object; + + return S_OK; +} + /*********************************************************************** * MFCreateMediaType (mfplat.@) */ @@ -1052,16 +1058,8 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **media_type) if (!media_type) return E_INVALIDARG; - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = init_attributes_object(&object->attributes, 0))) - { - heap_free(object); + if (FAILED(hr = create_media_type(&object))) return hr; - } - object->IMFMediaType_iface.lpVtbl = &mediatypevtbl; *media_type = &object->IMFMediaType_iface; @@ -2633,19 +2631,11 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe if (!media_type) return E_INVALIDARG; - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = init_attributes_object(&object->attributes, 0))) - { - heap_free(object); + if (FAILED(hr = create_media_type(&object))) return hr; - } - object->IMFVideoMediaType_iface.lpVtbl = &videomediatypevtbl; - IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); - IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_SUBTYPE, subtype); + IMFMediaType_SetGUID(&object->IMFMediaType_iface, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + IMFMediaType_SetGUID(&object->IMFMediaType_iface, &MF_MT_SUBTYPE, subtype); *media_type = &object->IMFVideoMediaType_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 309f7b669a4..c3558106548 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -763,8 +763,10 @@ static void init_functions(void) static void test_media_type(void) { IMFMediaType *mediatype, *mediatype2; + IMFVideoMediaType *video_type; + IUnknown *unk, *unk2; + DWORD count, flags; BOOL compressed; - DWORD flags; HRESULT hr; GUID guid; @@ -862,6 +864,55 @@ if(0) IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); + + /* IMFVideoMediaType */ + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_QueryInterface(mediatype, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_QueryInterface(mediatype, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk == (IUnknown *)mediatype, "Unexpected pointer.\n"); + IUnknown_Release(unk); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set GUID value, hr %#x.\n", hr); + + hr = IMFMediaType_QueryInterface(mediatype, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk2 == (IUnknown *)mediatype, "Unexpected pointer.\n"); + IUnknown_Release(unk2); + IUnknown_Release(unk); + + hr = MFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB555, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + /* Major and subtype are set on creation. */ + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(count == 2, "Unexpected attribute count %#x.\n", hr); + + hr = IMFVideoMediaType_DeleteAllItems(video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(!count, "Unexpected attribute count %#x.\n", hr); + + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + IMFVideoMediaType_Release(video_type); + + IMFMediaType_Release(mediatype); } static void test_MFCreateMediaEvent(void) -- 2.28.0

2 8

[PATCH 5/5] riched20: Use ME_Paragraph ptrs in InternalDeleteText().
by Huw Davies 12 Oct '20

12 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index bd533f91baf..69963e66910 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -308,13 +308,13 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nOfs = ME_GetCursorOfs(start), text_len = ME_GetTextLength( editor ); int shift = 0; int totalChars = nChars; - ME_DisplayItem *start_para; + ME_Paragraph *start_para; BOOL delete_all = FALSE; /* Prevent deletion past last end of paragraph run. */ nChars = min(nChars, text_len - nOfs); if (nChars == text_len) delete_all = TRUE; - start_para = c.pPara; + start_para = &c.pPara->member.para; if (!bForce) { @@ -349,19 +349,19 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, run->nCharOfs); if (!editor->bEmulateVersion10) /* v4.1 */ { - ME_DisplayItem *next_para = ME_FindItemFwd(c.pRun, diParagraphOrEnd); - ME_DisplayItem *this_para = next_para->member.para.prev_para; + ME_Paragraph *this_para = run->para; + ME_Paragraph *next_para = para_next( this_para ); /* The end of paragraph before a table row is only deleted if there * is nothing else on the line before it. */ - if (this_para == start_para && - next_para->member.para.nFlags & MEPF_ROWSTART) + if (this_para == start_para && next_para->nFlags & MEPF_ROWSTART) { /* If the paragraph will be empty, then it should be deleted, however * it still might have text right now which would inherit the * MEPF_STARTROW property if we joined it right now. * Instead we will delete it after the preceding text is deleted. */ - if (nOfs > this_para->member.para.nCharOfs) { + if (nOfs > this_para->nCharOfs) + { /* Skip this end of line. */ nChars -= (eollen < nChars) ? eollen : nChars; continue; @@ -383,7 +383,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, c.nOffset -= nCharsToDelete; - para_mark_rewrap( editor, &ME_FindItemBack( c.pRun, diParagraph )->member.para ); + para_mark_rewrap( editor, c.pRun->member.run.para ); cursor = c; /* nChars is the number of characters that should be deleted from the @@ -447,7 +447,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, continue; } } - if (delete_all) ME_SetDefaultParaFormat( editor, &start_para->member.para.fmt ); + if (delete_all) ME_SetDefaultParaFormat( editor, &start_para->fmt ); return TRUE; } -- 2.23.0

1 0

[PATCH 4/5] riched20: Use ME_Paragraph and ME_Run ptrs in GetCursorCoordinates().
by Huw Davies 12 Oct '20

12 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e9ea64ed1bc..bd533f91baf 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -222,49 +222,38 @@ void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { ME_DisplayItem *row; - ME_DisplayItem *run = pCursor->pRun; - ME_DisplayItem *para = pCursor->pPara; - ME_DisplayItem *pSizeRun = run; + ME_Run *run = &pCursor->pRun->member.run; + ME_Paragraph *para = &pCursor->pPara->member.para; + ME_Run *size_run = run, *prev; ME_Context c; int run_x; assert(height && x && y); - assert(~para->member.para.nFlags & MEPF_REWRAP); - assert(run && run->type == diRun); - assert(para && para->type == diParagraph); + assert(~para->nFlags & MEPF_REWRAP); - row = ME_FindItemBack(run, diStartRowOrParagraph); + row = ME_FindItemBack( run_get_di( run ), diStartRowOrParagraph ); assert(row && row->type == diStartRow); ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - if (!pCursor->nOffset) - { - ME_DisplayItem *prev = ME_FindItemBack(run, diRunOrParagraph); - assert(prev); - if (prev->type == diRun) - pSizeRun = prev; - } + if (!pCursor->nOffset && (prev = run_prev( run ))) size_run = prev; + if (editor->bCaretAtEnd && !pCursor->nOffset && - run == ME_FindItemFwd(row, diRun)) + run == &ME_FindItemFwd( row, diRun )->member.run) { ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph); - assert(tmp); if (tmp->type == diRun) { row = ME_FindItemBack(tmp, diStartRow); - pSizeRun = run = tmp; - assert(run); - assert(run->type == diRun); + size_run = run = &tmp->member.run; } } - run_x = ME_PointFromCharContext( &c, &run->member.run, pCursor->nOffset, TRUE ); + run_x = ME_PointFromCharContext( &c, run, pCursor->nOffset, TRUE ); - *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; - *x = c.rcView.left + run->member.run.pt.x + run_x - editor->horz_si.nPos; - *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline - + run->member.run.pt.y - pSizeRun->member.run.nAscent - - editor->vert_si.nPos; + *height = size_run->nAscent + size_run->nDescent; + *x = c.rcView.left + run->pt.x + run_x - editor->horz_si.nPos; + *y = c.rcView.top + para->pt.y + row->member.row.nBaseline + + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); return; } -- 2.23.0

1 0

[PATCH 3/5] riched20: Use the table_row_start/end() helpers.
by Huw Davies 12 Oct '20

12 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 90835905a0c..c7b99f5ee24 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -919,7 +919,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran if (para->nFlags & MEPF_ROWSTART) { ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); - ME_DisplayItem *endRowPara; + ME_Paragraph *end_row_para = table_row_end( para ); int borderWidth = 0; cell->member.cell.pt = c->pt; /* Offset the text by the largest top border width. */ @@ -928,8 +928,6 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran borderWidth = max(borderWidth, cell->member.cell.border.top.width); cell = cell->member.cell.next_cell; } - endRowPara = ME_FindItemFwd(cell, diParagraph); - assert(endRowPara->member.para.nFlags & MEPF_ROWEND); if (borderWidth > 0) { borderWidth = max(ME_twips2pointsY(c, borderWidth), 1); @@ -940,22 +938,21 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } c->pt.y += borderWidth; } - if (endRowPara->member.para.fmt.dxStartIndent > 0) + if (end_row_para->fmt.dxStartIndent > 0) { - int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; cell = ME_FindItemFwd( para_get_di( para ), diCell); - cell->member.cell.pt.x += ME_twips2pointsX(c, dxStartIndent); + cell->member.cell.pt.x += ME_twips2pointsX( c, end_row_para->fmt.dxStartIndent ); c->pt.x = cell->member.cell.pt.x; } } else if (para->nFlags & MEPF_ROWEND) { /* Set all the cells to the height of the largest cell */ - ME_DisplayItem *startRowPara; + ME_Paragraph *start_row_para = table_row_start( para ); int prevHeight, nHeight, bottomBorder = 0; ME_DisplayItem *cell = ME_FindItemBack( para_get_di( para ), diCell ); para->nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; - if (!(para->next_para->member.para.nFlags & MEPF_ROWSTART)) + if (!(para_next( para )->nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ cell = cell->member.cell.prev_cell; @@ -979,9 +976,8 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran cell->member.cell.nHeight = nHeight; } /* Also set the height of the start row paragraph */ - startRowPara = ME_FindItemBack(cell, diParagraph); - startRowPara->member.para.nHeight = nHeight; - c->pt.x = startRowPara->member.para.pt.x; + start_row_para->nHeight = nHeight; + c->pt.x = start_row_para->pt.x; c->pt.y = cell->member.cell.pt.y + nHeight; if (prevHeight < nHeight) { @@ -996,7 +992,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } } } - else if (para->pCell && para->pCell != para->next_para->member.para.pCell) + else if (para->pCell && para->pCell != para_next( para )->pCell) { /* The next paragraph is in the next cell in the table row. */ ME_Cell *cell = &para->pCell->member.cell; -- 2.23.0

1 0

[PATCH 2/5] riched20: Use ME_Paragraph ptrs for the update range.
by Huw Davies 12 Oct '20

12 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 2 +- dlls/riched20/wrap.c | 41 ++++++++++++++++++++--------------------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 910a87c33c4..6c45a3c6b54 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -189,7 +189,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; /* wrap.c */ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) DECLSPEC_HIDDEN; +void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; /* para.c */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 53583de21ce..6187fb74f1b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1356,7 +1356,7 @@ ME_InvalidateSelection(ME_TextEditor *editor) } if (repaint_start) - ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); + para_range_invalidate( editor, &repaint_start->member.para, &repaint_end->member.para ); /* remember the last invalidated position */ ME_GetSelectionOfs(editor, &editor->nLastSelStart, &editor->nLastSelEnd); ME_GetSelectionParas(editor, &editor->pLastSelStartPara, &editor->pLastSelEndPara); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index f864d97a0eb..90835905a0c 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -905,10 +905,10 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag struct repaint_range { - ME_DisplayItem *start, *end; + ME_Paragraph *start, *end; }; -static void update_repaint( ME_DisplayItem *para, struct repaint_range *repaint ) +static void update_repaint( ME_Paragraph *para, struct repaint_range *repaint ) { if (!repaint->start) repaint->start = para; repaint->end = para; @@ -987,11 +987,11 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - update_repaint( para_get_di( para ), repaint ); + update_repaint( para, repaint ); cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { - update_repaint( ME_FindItemBack(cell, diParagraph), repaint ); + update_repaint( &ME_FindItemBack(cell, diParagraph)->member.para, repaint ); cell = cell->member.cell.prev_cell; } } @@ -1054,22 +1054,22 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) totalWidth = max(totalWidth, para->nWidth); if (!para->nCharOfs) - update_repaint( para->prev_para, &repaint ); - update_repaint( para_get_di( para ), &repaint ); + update_repaint( para_prev( para ), &repaint ); + update_repaint( para, &repaint ); adjust_para_y( para, &c, &repaint ); - if (para->next_para) + if (para_next( para )) { - if (c.pt.y != para->next_para->member.para.pt.y) + if (c.pt.y != para_next( para )->pt.y) { next = para; - while (next->next_para && &next->marked_entry != next_entry && + while (para_next( next ) && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { - update_repaint( next->next_para, &repaint ); - next->next_para->member.para.pt.y = c.pt.y; - adjust_para_y( &next->next_para->member.para, &c, &repaint ); - next = &next->next_para->member.para; + update_repaint( para_next( next ), &repaint ); + para_next( next )->pt.y = c.pt.y; + adjust_para_y( para_next( next ), &c, &repaint ); + next = para_next( next ); } } } @@ -1086,13 +1086,12 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) - ME_InvalidateParagraphRange(editor, repaint.start, repaint.end); + para_range_invalidate( editor, repaint.start, repaint.end); return !!repaint.start; } -void ME_InvalidateParagraphRange(ME_TextEditor *editor, - ME_DisplayItem *start_para, - ME_DisplayItem *last_para) +void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, + ME_Paragraph *last_para ) { RECT rc; int ofs; @@ -1102,16 +1101,16 @@ void ME_InvalidateParagraphRange(ME_TextEditor *editor, if (start_para) { - start_para = para_get_di( table_outer_para( &start_para->member.para ) ); - last_para = para_get_di( table_outer_para( &last_para->member.para ) ); - rc.top += start_para->member.para.pt.y - ofs; + start_para = table_outer_para( start_para ); + last_para = table_outer_para( last_para ); + rc.top += start_para->pt.y - ofs; } else { rc.top += editor->nTotalLength - ofs; } if (editor->nTotalLength < editor->nLastTotalLength) rc.bottom = editor->rcFormat.top + editor->nLastTotalLength - ofs; else - rc.bottom = editor->rcFormat.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; + rc.bottom = editor->rcFormat.top + last_para->pt.y + last_para->nHeight - ofs; ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); } -- 2.23.0

1 0

[PATCH 1/5] riched20: Use a structure to hold the repaint range.
by Huw Davies 12 Oct '20

12 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a84f738e925..f864d97a0eb 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -903,16 +903,18 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag editor->total_rows += wc.nRow; } -static void ME_MarkRepaintEnd(ME_DisplayItem *para, - ME_DisplayItem **repaint_start, - ME_DisplayItem **repaint_end) +struct repaint_range { - if (!*repaint_start) - *repaint_start = para; - *repaint_end = para; + ME_DisplayItem *start, *end; +}; + +static void update_repaint( ME_DisplayItem *para, struct repaint_range *repaint ) +{ + if (!repaint->start) repaint->start = para; + repaint->end = para; } -static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_range *repaint ) { if (para->nFlags & MEPF_ROWSTART) { @@ -985,11 +987,11 @@ static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *rep { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - ME_MarkRepaintEnd( para_get_di( para ) , &repaint_start, &repaint_end ); + update_repaint( para_get_di( para ), repaint ); cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { - ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); + update_repaint( ME_FindItemBack(cell, diParagraph), repaint ); cell = cell->member.cell.prev_cell; } } @@ -1031,7 +1033,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) struct wine_rb_entry *entry, *next_entry; ME_Context c; int totalWidth = editor->nTotalWidth, prev_width; - ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; + struct repaint_range repaint = { NULL, NULL }; if (!editor->marked_paras.root) return FALSE; @@ -1052,9 +1054,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) totalWidth = max(totalWidth, para->nWidth); if (!para->nCharOfs) - ME_MarkRepaintEnd( para->prev_para, &repaint_start, &repaint_end ); - ME_MarkRepaintEnd( para_get_di( para ), &repaint_start, &repaint_end ); - adjust_para_y( para, &c, repaint_start, repaint_end ); + update_repaint( para->prev_para, &repaint ); + update_repaint( para_get_di( para ), &repaint ); + adjust_para_y( para, &c, &repaint ); if (para->next_para) { @@ -1064,9 +1066,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) while (next->next_para && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { - ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); + update_repaint( next->next_para, &repaint ); next->next_para->member.para.pt.y = c.pt.y; - adjust_para_y( &next->next_para->member.para, &c, repaint_start, repaint_end ); + adjust_para_y( &next->next_para->member.para, &c, &repaint ); next = &next->next_para->member.para; } } @@ -1083,9 +1085,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); - if (repaint_start || editor->nTotalLength < editor->nLastTotalLength) - ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); - return !!repaint_start; + if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) + ME_InvalidateParagraphRange(editor, repaint.start, repaint.end); + return !!repaint.start; } void ME_InvalidateParagraphRange(ME_TextEditor *editor, -- 2.23.0

1 0

[PATCH 01/16] ncrypt: Implement NCryptEnumStorageProviders
by abdaandroid＠gmail.com 12 Oct '20

12 Oct '20

From: Ariel Darshan <abdaandroid(a)gmail.com> Signed-off-by: Ariel Darshan <abdaandroid(a)gmail.com> --- dlls/ncrypt/Makefile.in | 2 + dlls/ncrypt/main.c | 127 +++++++++++++++++++++++++++++++++++++++- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 7 +++ 4 files changed, 135 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index c387c35d854..dc9d3fbdc28 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,5 +1,7 @@ MODULE = ncrypt.dll +IMPORTS = advapi32 + EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c0cc05c43ca..86bc9190717 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -23,7 +23,9 @@ #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "winreg.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -89,6 +91,123 @@ SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR * return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptEnumStorageProviders(DWORD *providerCount, NCryptProviderName **providerList, DWORD flags) +{ + HKEY hKey; + HKEY hSubKey; + SECURITY_STATUS ret; + LSTATUS status; + DWORD maxKeyLen; + DWORD i; + WCHAR providerName[MAX_PATH]; + WCHAR providerKSReg[MAX_PATH]; + DWORD providerNameLength; + NCryptProviderName *outList; + DWORD outCount; + DWORD numKeys; + void *allocBuffer; + void *reAllocBuffer; + DWORD allocSize; + DWORD totalNamesSize; + + TRACE("(%p, %p, 0x%08x)\n", providerCount, providerList, flags); + + if (flags) + { + FIXME("Ignoring flags: 0x%08x - Not implemented\n", flags); + } + + ret = ERROR_SUCCESS; + outList = NULL; + outCount = 0; + allocSize = 0; + + status = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Cryptography\\Providers", 0, KEY_READ, &hKey); + if (status != ERROR_SUCCESS) + { + ERR("Failed to open 'HKLM\\SYSTEM\\CurrentControlSet\\Control\\Cryptography\\Providers' error code: 0x%08x\n", status); + return NTE_NOT_SUPPORTED; /* FIXME: what should be returned here? */ + } + + status = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &numKeys, &maxKeyLen, NULL, NULL, NULL, NULL, NULL, NULL); + if (status != ERROR_SUCCESS) + { + ERR("Failed to query info on 'HKLM\\SYSTEM\\CurrentControlSet\\Control\\Cryptography\\Providers' error code: 0x%08x\n", status); + ret = NTE_NOT_SUPPORTED; /* FIXME: what should be returned here? */ + goto cleanup; + } + + + for (i = 0; i < numKeys; ++i) + { + providerNameLength = MAX_PATH; + status = RegEnumKeyExW(hKey, i, providerName, &providerNameLength, NULL, NULL, NULL, NULL); + if (status != ERROR_SUCCESS) + { + ERR("Failed to enumerate sub keys of 'HKLM\\SYSTEM\\CurrentControlSet\\Control\\Cryptography\\Providers' error code: 0x%08x\n", status); + ret = NTE_NOT_SUPPORTED; /* FIXME: what should be returned here? */ + goto cleanup; + } + + + /* This registry key should exist if the provider supports key storage */ + swprintf(providerKSReg, MAX_PATH - 1, L"%s\\UM\\00010001", providerName); + status = RegOpenKeyExW(hKey, providerKSReg, 0, KEY_READ, &hSubKey); + if (status != ERROR_SUCCESS) + { + /* Provider doesn't support key storage, skip it */ + continue; + } + RegCloseKey(hSubKey); + + allocSize += sizeof(NCryptProviderName) + (providerNameLength + 1) * sizeof(WCHAR); + if (!outCount++) + { + allocBuffer = heap_alloc(allocSize); + if (!allocBuffer) + { + ERR("Out of memory!\n"); + ret = NTE_NO_MEMORY; + goto cleanup; + } + totalNamesSize = 0; + } + else + { + reAllocBuffer = heap_realloc(allocBuffer, allocSize); + if (!reAllocBuffer) + { + ERR("Out of memory during realloc!\n"); + heap_free(allocBuffer); + ret = NTE_NO_MEMORY; + goto cleanup; + } + /* Shift the wstrings that contain the names over by the size of one struct */ + memmove((BYTE*)allocBuffer + outCount * sizeof(NCryptProviderName), (BYTE*)allocBuffer + (outCount - 1) * sizeof(NCryptProviderName), totalNamesSize); + } + + + + outList = allocBuffer; + outList[outCount - 1].pszName = (WCHAR*)((BYTE*)allocBuffer + outCount * sizeof(NCryptProviderName) + totalNamesSize); + outList[outCount - 1].pszComment = NULL; + + wcscpy(outList[outCount - 1].pszName, providerName); + totalNamesSize += (providerNameLength + 1) * sizeof(WCHAR); + } + + +cleanup: + if (ret == ERROR_SUCCESS) + { + *providerCount = outCount; + *providerList = outList; + } + + RegCloseKey(hKey); + return ret; +} + SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { FIXME("(0x%lx, 0x%08x): stub\n", key, flags); @@ -97,8 +216,12 @@ SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) { - FIXME("(%p): stub\n", buf); - return NTE_NOT_SUPPORTED; + /* FIXME: How do we tell which provider should be called? + How do we update refCounts of referenced objects? */ + FIXME("(%p): semi-stub\n", buf); + + heap_free(buf); + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 2b5a4fca420..2e6765c91ff 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -69,7 +69,7 @@ @ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long) @ stdcall NCryptEnumAlgorithms(long long ptr ptr long) @ stdcall NCryptEnumKeys(long wstr ptr ptr long) -@ stub NCryptEnumStorageProviders +@ stdcall NCryptEnumStorageProviders(ptr ptr long) @ stub NCryptExportKey @ stdcall NCryptFinalizeKey(long long) @ stdcall NCryptFreeBuffer(ptr) diff --git a/include/ncrypt.h b/include/ncrypt.h index 111693f1d49..9110c1ef6a4 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -58,6 +58,11 @@ typedef struct NCryptKeyName { DWORD dwFlags; } NCryptKeyName; +typedef struct _NCryptProviderName { + LPWSTR pszName; + LPWSTR pszComment; +} NCryptProviderName; + typedef ULONG_PTR NCRYPT_HANDLE; typedef ULONG_PTR NCRYPT_PROV_HANDLE; typedef ULONG_PTR NCRYPT_KEY_HANDLE; @@ -72,7 +77,9 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); +SECURITY_STATUS WINAPI NCryptEnumStorageProviders(DWORD *, NCryptProviderName **, DWORD); SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE, DWORD); +SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID); SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); -- 2.28.0

2 16

Re: TestBot job 80271 results: [PATCH 1/6] mfplat/mediatype: Enable IMFVideoMediaType based on major type.
by Nikolay Sivov 12 Oct '20

12 Oct '20

Win10 failures are from unrelated tests.

1 0

[PATCH] dxva2/tests: Add a test for GetVideoProcessorDeviceGuids().
by Nikolay Sivov 12 Oct '20

12 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/tests/dxva2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index f5b28ed3f8d..9dcd3e5bf4e 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -92,6 +92,7 @@ static void test_device_manager(void) UINT token, count; IDirect3D9 *d3d; HWND window; + GUID *guids; HRESULT hr; RECT rect; @@ -309,6 +310,11 @@ static void test_device_manager(void) video_desc.SampleHeight = 64; video_desc.Format = D3DFMT_A8R8G8B8; + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count, "Unexpected format count %u.\n", count); + CoTaskMemFree(guids); + count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); -- 2.28.0

1 0

[website] German translation for release 5.19
by Julian Rüger 12 Oct '20

12 Oct '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.18
by Julian Rüger 12 Oct '20

12 Oct '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for vkd3d 1.2
by Julian Rüger 12 Oct '20

12 Oct '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.17
by Julian Rüger 12 Oct '20

12 Oct '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.16
by Julian Rüger 12 Oct '20

12 Oct '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] include: Add interface IGetDataSource
by Alistair Leslie-Hughes 12 Oct '20

12 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 13 +++++++++++++ include/getdts.idl | 34 ++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 48 insertions(+) create mode 100644 include/getdts.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 43e3aaeaa1a..2fe4e60b68b 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1576,3 +1576,16 @@ HRESULT __RPC_STUB IColumnsInfo_MapColumnIDs_Stub(IColumnsInfo* This, DBORDINAL FIXME("(%p)->(%lu %p %p %p): stub\n", This, column_ids, dbids, columns, error); return E_NOTIMPL; } + +HRESULT CALLBACK IGetDataSource_GetDataSource_Proxy(IGetDataSource* This, REFIID riid, IUnknown **datasource) +{ + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), datasource); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFIID riid, IUnknown **datasource, + IErrorInfo **error) +{ + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), datasource, error); + return E_NOTIMPL; +} diff --git a/include/getdts.idl b/include/getdts.idl new file mode 100644 index 00000000000..40991070cc1 --- /dev/null +++ b/include/getdts.idl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a75-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IGetDataSource : IUnknown +{ + [local] + HRESULT GetDataSource([in] REFIID riid, [out, iid_is(riid)] IUnknown **datasource); + + [call_as(GetDataSource)] + HRESULT RemoteGetDataSource([in] REFIID riid, [out, iid_is(riid)] IUnknown **datasource, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 537bb211cc5..1ffbefa9ffd 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -69,6 +69,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "binres.idl" #include "crtrow.idl" #include "errrec.idl" +#include "getdts.idl" cpp_quote("#include <accctrl.h>") -- 2.28.0

1 0

[PATCH] kernelbase: Add a name for codepage 708.
by Nikolay Sivov 12 Oct '20

12 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2cec5f7637a..9cfb9f129ee 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -106,6 +106,7 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 424, L"IBM EBCDIC Hebrew" }, { 437, L"OEM United States" }, { 500, L"IBM EBCDIC International" }, + { 708, L"Arabic ASMO" }, { 737, L"OEM Greek 437G" }, { 775, L"OEM Baltic" }, { 850, L"OEM Multilingual Latin 1" }, -- 2.28.0

1 0

[PATCH] qmgr: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qmgr/file.c | 6 ++---- dlls/qmgr/service.c | 3 +-- dlls/qmgr/tests/enum_files.c | 18 ++++++------------ dlls/qmgr/tests/enum_jobs.c | 12 ++++-------- dlls/qmgr/tests/file.c | 11 ++++------- dlls/qmgr/tests/job.c | 24 +++++++++--------------- dlls/qmgr/tests/qmgr.c | 17 ++++------------- 7 files changed, 30 insertions(+), 61 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index e0aeebf7cec..befd38b416b 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -452,14 +452,13 @@ static DWORD CALLBACK progress_callback_local(LARGE_INTEGER totalSize, LARGE_INT static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpname) { - static const WCHAR fileW[] = {'f','i','l','e',':','/','/',0}; BackgroundCopyJobImpl *job = file->owner; const WCHAR *ptr; BOOL ret; transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING); - if (lstrlenW(file->info.RemoteName) > 7 && !wcsnicmp(file->info.RemoteName, fileW, 7)) + if (lstrlenW(file->info.RemoteName) > 7 && !wcsnicmp(file->info.RemoteName, L"file://", 7)) ptr = file->info.RemoteName + 7; else ptr = file->info.RemoteName; @@ -476,7 +475,6 @@ static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpna BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { - static const WCHAR prefix[] = {'B','I','T', 0}; WCHAR tmpDir[MAX_PATH], tmpName[MAX_PATH]; WCHAR host[MAX_PATH]; URL_COMPONENTSW uc; @@ -490,7 +488,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) return FALSE; } - if (!GetTempFileNameW(tmpDir, prefix, 0, tmpName)) + if (!GetTempFileNameW(tmpDir, L"BIT", 0, tmpName)) { ERR("Couldn't create temp file: %d\n", GetLastError()); /* Guessing on what state this should give us */ diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index e856408d8c4..521cb74eb8b 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -105,7 +105,6 @@ VOID WINAPI ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) { HANDLE fileTxThread; - static const WCHAR qmgr_nameW[] = {'B','I','T','S',0}; DWORD threadId; TRACE("\n"); @@ -115,7 +114,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) return; } - status_handle = RegisterServiceCtrlHandlerExW(qmgr_nameW, ServiceHandler, NULL); + status_handle = RegisterServiceCtrlHandlerExW(L"BITS", ServiceHandler, NULL); if (!status_handle) { ERR("failed to register handler: %u\n", GetLastError()); return; diff --git a/dlls/qmgr/tests/enum_files.c b/dlls/qmgr/tests/enum_files.c index 9564d7c1adb..9e1a665ac53 100644 --- a/dlls/qmgr/tests/enum_files.c +++ b/dlls/qmgr/tests/enum_files.c @@ -29,11 +29,6 @@ /* Globals used by many tests */ #define NUM_FILES 2 /* At least two. */ -static const WCHAR test_remoteNameA[] = {'r','e','m','o','t','e','A', 0}; -static const WCHAR test_localNameA[] = {'l','o','c','a','l','A', 0}; -static const WCHAR test_remoteNameB[] = {'r','e','m','o','t','e','B', 0}; -static const WCHAR test_localNameB[] = {'l','o','c','a','l','B', 0}; -static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; static const ULONG test_fileCount = NUM_FILES; static IBackgroundCopyJob *test_job; static IBackgroundCopyManager *test_manager; @@ -79,10 +74,10 @@ static HRESULT test_create_manager(void) IBackgroundCopyJob *job; GUID jobId; - hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, BG_JOB_TYPE_DOWNLOAD, &jobId, &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &jobId, &job); if (hres == S_OK) { - hres = addFileHelper(job, test_localNameA, test_remoteNameA); + hres = addFileHelper(job, L"localA", L"remoteA"); if (hres != S_OK) win_skip("AddFile() with file:// protocol failed. Tests will be skipped.\n"); IBackgroundCopyJob_Release(job); @@ -105,17 +100,16 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, - BG_JOB_TYPE_DOWNLOAD, &test_jobId, - &test_job); + hres = IBackgroundCopyManager_CreateJob(test_manager, L"Test", BG_JOB_TYPE_DOWNLOAD, + &test_jobId, &test_job); if(hres != S_OK) { IBackgroundCopyManager_Release(test_manager); return FALSE; } - if (addFileHelper(test_job, test_localNameA, test_remoteNameA) != S_OK - || addFileHelper(test_job, test_localNameB, test_remoteNameB) != S_OK + if (addFileHelper(test_job, L"localA", L"remoteA") != S_OK + || addFileHelper(test_job, L"localB", L"remoteB") != S_OK || IBackgroundCopyJob_EnumFiles(test_job, &test_enumFiles) != S_OK) { IBackgroundCopyJob_Release(test_job); diff --git a/dlls/qmgr/tests/enum_jobs.c b/dlls/qmgr/tests/enum_jobs.c index 6a1a9688388..81df72e2e69 100644 --- a/dlls/qmgr/tests/enum_jobs.c +++ b/dlls/qmgr/tests/enum_jobs.c @@ -26,8 +26,6 @@ #include "bits.h" /* Globals used by many tests */ -static const WCHAR test_displayNameA[] = {'T','e','s','t','A', 0}; -static const WCHAR test_displayNameB[] = {'T','e','s','t','B', 0}; static IBackgroundCopyManager *test_manager; static IBackgroundCopyJob *test_jobA; static IBackgroundCopyJob *test_jobB; @@ -54,9 +52,8 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayNameA, - BG_JOB_TYPE_DOWNLOAD, &test_jobIdA, - &test_jobA); + hres = IBackgroundCopyManager_CreateJob(test_manager, L"TestA", BG_JOB_TYPE_DOWNLOAD, + &test_jobIdA, &test_jobA); if(hres != S_OK) return FALSE; @@ -64,9 +61,8 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayNameB, - BG_JOB_TYPE_DOWNLOAD, &test_jobIdB, - &test_jobB); + hres = IBackgroundCopyManager_CreateJob(test_manager, L"TestB", BG_JOB_TYPE_DOWNLOAD, + &test_jobIdB, &test_jobB); if(hres != S_OK) return FALSE; diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index 9fdf08c98a8..cb5ba5fbe37 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -28,11 +28,8 @@ #include "bits.h" /* Globals used by many tests */ -static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; -static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; static WCHAR test_localFile[MAX_PATH]; static WCHAR test_remoteUrl[MAX_PATH]; -static const WCHAR test_displayName[] = {'T','e','s','t', 0}; static IBackgroundCopyJob *test_job; static IBackgroundCopyManager *test_manager; static IEnumBackgroundCopyFiles *test_enumFiles; @@ -76,10 +73,10 @@ static HRESULT test_create_manager(void) IBackgroundCopyJob *job; GUID jobId; - hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, BG_JOB_TYPE_DOWNLOAD, &jobId, &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &jobId, &job); if (hres == S_OK) { - hres = addFileHelper(job, test_localName, test_remoteName); + hres = addFileHelper(job, L"local", L"remote"); if (hres != S_OK) win_skip("AddFile() with file:// protocol failed. Tests will be skipped.\n"); IBackgroundCopyJob_Release(job); @@ -106,7 +103,7 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, + hres = IBackgroundCopyManager_CreateJob(test_manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &test_jobId, &test_job); if(hres != S_OK) { @@ -114,7 +111,7 @@ static BOOL setup(void) return FALSE; } - if (addFileHelper(test_job, test_localName, test_remoteName) != S_OK + if (addFileHelper(test_job, L"local", L"remote") != S_OK || IBackgroundCopyJob_EnumFiles(test_job, &test_enumFiles) != S_OK) { IBackgroundCopyJob_Release(test_job); diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 8bc82dd172f..53b724eadbf 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -29,7 +29,6 @@ #include "bits2_5.h" /* Globals used by many tests */ -static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; static WCHAR test_remotePathA[MAX_PATH]; static WCHAR test_remotePathB[MAX_PATH]; static WCHAR test_localPathA[MAX_PATH]; @@ -62,7 +61,7 @@ static HRESULT test_create_manager(void) static void init_paths(void) { WCHAR tmpDir[MAX_PATH]; - WCHAR prefix[] = {'q', 'm', 'g', 'r', 0}; + WCHAR prefix[] = L"qmgr"; GetTempPathW(MAX_PATH, tmpDir); @@ -89,8 +88,7 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, - test_type, &test_jobId, &test_job); + hres = IBackgroundCopyManager_CreateJob(test_manager, L"Test", test_type, &test_jobId, &test_job); if(hres != S_OK) { IBackgroundCopyManager_Release(test_manager); @@ -119,7 +117,7 @@ static BOOL check_bits20(void) (void **)&manager); if (hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, test_type, &test_jobId, &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", test_type, &test_jobId, &job); if (hres != S_OK) { IBackgroundCopyManager_Release(manager); @@ -152,7 +150,7 @@ static BOOL check_bits25(void) (void **)&manager); if (hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, test_type, &test_jobId, &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", test_type, &test_jobId, &job); if (hres != S_OK) { IBackgroundCopyManager_Release(manager); @@ -203,7 +201,7 @@ static void test_GetName(void) hres = IBackgroundCopyJob_GetDisplayName(test_job, &displayName); ok(hres == S_OK, "GetName failed: %08x\n", hres); - ok(lstrcmpW(displayName, test_displayName) == 0, "Got incorrect type\n"); + ok(lstrcmpW(displayName, L"Test") == 0, "Got incorrect type\n"); CoTaskMemFree(displayName); } @@ -390,7 +388,6 @@ static void test_CompleteLocal(void) /* Test a complete transfer for local files */ static void test_CompleteLocalURL(void) { - static const WCHAR prot[] = {'f','i','l','e',':','/','/', 0}; static const int timeout_sec = 30; WCHAR *urlA, *urlB; HRESULT hres; @@ -414,9 +411,9 @@ static void test_CompleteLocalURL(void) return; } - lstrcpyW(urlA, prot); + lstrcpyW(urlA, L"file://"); lstrcatW(urlA, test_remotePathA); - lstrcpyW(urlB, prot); + lstrcpyW(urlB, L"file://"); lstrcatW(urlB, test_remotePathB); hres = IBackgroundCopyJob_AddFile(test_job, urlA, test_localPathA); @@ -506,10 +503,7 @@ static void test_Cancel(void) static void test_HttpOptions(void) { - static const WCHAR urlW[] = - {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/',0}; - static const WCHAR winetestW[] = - {'W','i','n','e',':',' ','t','e','s','t','\r','\n',0}; + static const WCHAR winetestW[] = L"Wine: test\r\n"; static const unsigned int timeout = 30; HRESULT hr; IBackgroundCopyJobHttpOptions *options; @@ -520,7 +514,7 @@ static void test_HttpOptions(void) ULONG flags, orig_flags; DeleteFileW(test_localPathA); - hr = IBackgroundCopyJob_AddFile(test_job, urlW, test_localPathA); + hr = IBackgroundCopyJob_AddFile(test_job, L"http://test.winehq.org/", test_localPathA); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IBackgroundCopyJob_QueryInterface(test_job, &IID_IBackgroundCopyJobHttpOptions, (void **)&options); diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index d000fd6f36d..bb238150aca 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -50,7 +50,6 @@ static HRESULT test_create_manager(void) static void test_CreateJob(void) { /* Job information */ - static const WCHAR copyNameW[] = {'T', 'e', 's', 't', 0}; IBackgroundCopyJob* job = NULL; GUID tmpId; HRESULT hres; @@ -64,9 +63,7 @@ static void test_CreateJob(void) ok(hres == S_OK, "got 0x%08x\n", hres); /* Create bits job */ - hres = IBackgroundCopyManager_CreateJob(manager, copyNameW, - BG_JOB_TYPE_DOWNLOAD, &tmpId, - &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &tmpId, &job); ok(hres == S_OK, "CreateJob failed: %08x\n", hres); res = IBackgroundCopyJob_Release(job); @@ -78,8 +75,6 @@ static void test_EnumJobs(void) { /* Job Enumerator */ IEnumBackgroundCopyJobs* enumJobs; - - static const WCHAR copyNameW[] = {'T', 'e', 's', 't', 0}; IBackgroundCopyManager *manager = NULL; IBackgroundCopyJob *job = NULL; HRESULT hres; @@ -91,9 +86,7 @@ static void test_EnumJobs(void) (void **) &manager); ok(hres == S_OK, "got 0x%08x\n", hres); - hres = IBackgroundCopyManager_CreateJob(manager, copyNameW, - BG_JOB_TYPE_DOWNLOAD, &tmpId, - &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &tmpId, &job); ok(hres == S_OK, "got 0x%08x\n", hres); hres = IBackgroundCopyManager_EnumJobs(manager, 0, &enumJobs); @@ -107,7 +100,6 @@ static void test_EnumJobs(void) static void run_child(WCHAR *secret) { - static const WCHAR format[] = {'%','s',' ','q','m','g','r',' ','%','s', 0}; WCHAR cmdline[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOW startup; @@ -115,7 +107,7 @@ static void run_child(WCHAR *secret) memset(&startup, 0, sizeof startup); startup.cb = sizeof startup; - wsprintfW(cmdline, format, progname, secret); + wsprintfW(cmdline, L"%s qmgr %s", progname, secret); ok(CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); wait_child_process(info.hProcess); ok(CloseHandle(info.hProcess), "CloseHandle\n"); @@ -144,7 +136,6 @@ static void do_child(const char *secretA) static void test_globalness(void) { - static const WCHAR format[] = {'t','e','s','t','_','%','u', 0}; WCHAR secretName[MAX_PATH]; IEnumBackgroundCopyJobs* enumJobs; IBackgroundCopyManager *manager = NULL; @@ -154,7 +145,7 @@ static void test_globalness(void) (void **) &manager); ok(hres == S_OK, "got 0x%08x\n", hres); - wsprintfW(secretName, format, GetTickCount()); + wsprintfW(secretName, L"test_%u", GetTickCount()); run_child(secretName); hres = IBackgroundCopyManager_EnumJobs(manager, 0, &enumJobs); -- 2.26.2

2 2

[PATCH] winmgmt: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winmgmt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winmgmt/main.c b/programs/winmgmt/main.c index 8b262d00f3b..bc7150a08ca 100644 --- a/programs/winmgmt/main.c +++ b/programs/winmgmt/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmgmt); -static WCHAR winmgmtW[] = {'W','i','n','m','g','m','t',0}; +static WCHAR winmgmtW[] = L"Winmgmt"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] termsv: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/termsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/termsv/main.c b/programs/termsv/main.c index eb79d17f005..2ca6d0809df 100644 --- a/programs/termsv/main.c +++ b/programs/termsv/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(termsv); -static WCHAR termserviceW[] = {'T','e','r','m','S','e','r','v','i','c','e',0}; +static WCHAR termserviceW[] = L"TermService"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] spoolsv: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/spoolsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c index 8fe37f2354f..2893fa614a1 100644 --- a/programs/spoolsv/main.c +++ b/programs/spoolsv/main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); -static WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; +static WCHAR spoolerW[] = L"Spooler"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] presentationfontcache: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/presentationfontcache/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c index 694ad792dbf..ab2d0e21061 100644 --- a/programs/presentationfontcache/main.c +++ b/programs/presentationfontcache/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(fontcache); -static WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e','3','.','0','.','0','.','0',0}; +static WCHAR fontcacheW[] = L"FontCache3.0.0.0"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] plugplay: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Annoyingly the string in SERVICE_TABLE_ENTRYW is not const. Inlining the string would produce a warning. Same for the other patches. programs/plugplay/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 8e007048422..2c4054de3e4 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -static WCHAR plugplayW[] = {'P','l','u','g','P','l','a','y',0}; +static WCHAR plugplayW[] = L"PlugPlay"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] write: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/write/write.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/write/write.c b/programs/write/write.c index 4039af4398f..1481e900f75 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -25,17 +25,15 @@ #include <windows.h> #include "resources.h" -static const WCHAR SZ_WORDPAD[] = {'\\','w','o','r','d','p','a','d','.','e','x','e',0}; - int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) { WCHAR path[MAX_PATH]; STARTUPINFOW stinf; PROCESS_INFORMATION info; - if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) + if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(L"\\wordpad.exe"))) goto failed; - lstrcatW(path, SZ_WORDPAD); + lstrcatW(path, L"\\wordpad.exe"); stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf); -- 2.26.2

1 0

[PATCH 1/2] vbscript: add is_default flag to struct _function_decl_t.
by Robert Wilhelm 11 Oct '20

11 Oct '20

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 6 ++---- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 2e991b0c0ae..e9f6361aee9 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1468,7 +1468,6 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f case FUNC_PROPGET: case FUNC_PROPLET: case FUNC_PROPSET: - case FUNC_DEFGET: ctx->prop_end_label = alloc_label(ctx); if(!ctx->prop_end_label) return E_OUTOFMEMORY; @@ -1630,7 +1629,6 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_FUNCTION: case FUNC_SUB: case FUNC_PROPGET: - case FUNC_DEFGET: invoke_type = VBDISP_CALLGET; break; case FUNC_PROPLET: @@ -1696,7 +1694,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) + if(func_prop_decl->is_default) break; } if(!func_prop_decl) @@ -1710,7 +1708,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) { + if(func_prop_decl->is_default) { i--; break; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d58e89b7dba..a3bca804128 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -134,7 +134,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET ) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ab81bb3ae41..f5d8a616b9f 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -184,6 +184,7 @@ typedef struct _function_decl_t { const WCHAR *name; function_type_t type; BOOL is_public; + BOOL is_default; arg_decl_t *args; statement_t *body; struct _function_decl_t *next; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index cf94bdce464..7e6cc17efd6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -990,10 +990,11 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, unsigned storage_flags, arg_decl_t *arg_decl, statement_t *body) { function_decl_t *decl; + BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { if(type == FUNC_PROPGET) { - type = FUNC_DEFGET; + is_default = TRUE; }else { FIXME("Invalid default property\n"); ctx->hres = E_FAIL; @@ -1008,6 +1009,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->name = name; decl->type = type; decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); + decl->is_default = is_default; decl->args = arg_decl; decl->body = body; decl->next = NULL; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 36eba21e279..1ff1110e56b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -177,7 +177,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern switch(flags) { case DISPATCH_PROPERTYGET: func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + if(!func || func->type != FUNC_PROPGET) { WARN("no getter\n"); return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 869fb05b6ed..afcce5eb9b8 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -314,7 +314,6 @@ typedef enum { FUNC_PROPGET, FUNC_PROPLET, FUNC_PROPSET, - FUNC_DEFGET } function_type_t; typedef struct { -- 2.26.2

1 0

[PATCH] ntdsapi: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdsapi/ntdsapi.c | 3 +-- dlls/ntdsapi/tests/ntdsapi.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 8966a679acf..929b9944846 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -130,10 +130,9 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, if (inst_port) { - static const WCHAR percentU[] = {'%','u',0}; *p = ':'; p++; - wsprintfW(p, percentU, inst_port); + wsprintfW(p, L"%u", inst_port); p += lstrlenW(p); } diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c index b6dc1856a40..77dd675fc97 100644 --- a/dlls/ntdsapi/tests/ntdsapi.c +++ b/dlls/ntdsapi/tests/ntdsapi.c @@ -33,15 +33,15 @@ static void test_DsMakeSpn(void) DWORD ret; WCHAR spn[256]; DWORD spn_length; - static const WCHAR wszServiceClass[] = {'c','l','a','s','s',0}; - static const WCHAR wszServiceHost[] = {'h','o','s','t',0}; - static const WCHAR wszInstanceName[] = {'i','n','s','t','a','n','c','e',0}; - static const WCHAR wszReferrer[] = {'r','e','f','e','r','r','e','r',0}; - static const WCHAR wszSpn1[] = {'c','l','a','s','s','/','h','o','s','t',0}; - static const WCHAR wszSpn2[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e','/','h','o','s','t',0}; - static const WCHAR wszSpn3[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e',':','5','5','5','/','h','o','s','t',0}; - static const WCHAR wszSpn4[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e',':','5','5','5','/','h','o','s','t',0}; - static const WCHAR wszSpn5[] = {'c','l','a','s','s','/','h','o','s','t',':','5','5','5',0}; + static const WCHAR wszServiceClass[] = L"class"; + static const WCHAR wszServiceHost[] = L"host"; + static const WCHAR wszInstanceName[] = L"instance"; + static const WCHAR wszReferrer[] = L"referrer"; + static const WCHAR wszSpn1[] = L"class/host"; + static const WCHAR wszSpn2[] = L"class/instance/host"; + static const WCHAR wszSpn3[] = L"class/instance:555/host"; + static const WCHAR wszSpn4[] = L"class/instance:555/host"; + static const WCHAR wszSpn5[] = L"class/host:555"; spn[0] = '\0'; @@ -86,9 +86,9 @@ static void test_DsMakeSpn(void) static void test_DsClientMakeSpnForTargetServer(void) { - static const WCHAR classW[] = {'c','l','a','s','s',0}; - static const WCHAR hostW[] = {'h','o','s','t','.','d','o','m','a','i','n',0}; - static const WCHAR resultW[] = {'c','l','a','s','s','/','h','o','s','t','.','d','o','m','a','i','n',0}; + static const WCHAR classW[] = L"class"; + static const WCHAR hostW[] = L"host.domain"; + static const WCHAR resultW[] = L"class/host.domain"; DWORD ret, len; WCHAR buf[256]; -- 2.26.2

1 0

[PATCH] documentation: Update Japanese translation.
by Akihiro Sagawa 11 Oct '20

11 Oct '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- documentation/README.ja | 8 ++++++++ 1 file changed, 8 insertions(+)

1 0

[PATCH] evr/tests: Fix a test failure on Windows 7.
by Sven Baars 11 Oct '20

11 Oct '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/evr/tests/evr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 175c30e8188..871073474d6 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1073,7 +1073,9 @@ static void test_default_presenter(void) ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); ok(present_params.Windowed, "Unexpected windowed mode.\n"); ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); - ok(present_params.Flags == D3DPRESENTFLAG_VIDEO, "Unexpected flags.\n"); + ok(present_params.Flags == D3DPRESENTFLAG_VIDEO || + broken(present_params.Flags == D3DPRESENTFLAG_VIDEO | D3DPRESENTFLAG_LOCKABLE_BACKBUFFER) /* win7 */, + "Unexpected flags %#x.\n", present_params.Flags); ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); IDirect3DDevice9_Release(d3d_device); -- 2.25.1

2 1

[PATCH] dbgeng/tests: Use different flags for unsupported options.
by Nikolay Sivov 11 Oct '20

11 Oct '20

Fixes test failures on recent Windows 10 builds, where 0x00800000 option is acceptable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/tests/dbgeng.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 572d96e405b..62797175193 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -50,7 +50,7 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->AddEngineOptions(control, 0x00800000); + hr = control->lpVtbl->AddEngineOptions(control, 0x01000000); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); options = 0; @@ -58,7 +58,7 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->RemoveEngineOptions(control, 0x00800000); + hr = control->lpVtbl->RemoveEngineOptions(control, 0x01000000); ok(hr == S_OK, "Failed to remove options, hr %#x.\n", hr); hr = control->lpVtbl->AddEngineOptions(control, DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); @@ -86,10 +86,10 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->SetEngineOptions(control, 0x00800000); + hr = control->lpVtbl->SetEngineOptions(control, 0x01000000); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = control->lpVtbl->SetEngineOptions(control, 0x00800000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); + hr = control->lpVtbl->SetEngineOptions(control, 0x01000000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); options = 0; -- 2.28.0

1 0

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-devel