- wine-devel - winehq.org

[PATCH] inetcpl.cpl: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Jul '18

20 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 9 ++++----- dlls/inetcpl.cpl/general.c | 4 ++-- dlls/inetcpl.cpl/security.c | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 707fb3c4f7..648cd3d002 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -273,13 +273,12 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) } TRACE("ProxyEnable set to %x\n", use_proxy); - proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, - proxy, sizeof(proxy)/sizeof(proxy[0])); + proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, proxy, ARRAY_SIZE(proxy)); if(proxy_len) { proxy[proxy_len++] = ':'; - port_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, - proxy+proxy_len, sizeof(proxy)/sizeof(proxy[0])-proxy_len); + port_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, proxy+proxy_len, + ARRAY_SIZE(proxy)-proxy_len); if(!port_len) { proxy[proxy_len++] = '8'; @@ -305,7 +304,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) use_pac_script = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT); pac_script_len = GetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, - pac_script, sizeof(pac_script)/sizeof(pac_script[0])); + pac_script, ARRAY_SIZE(pac_script)); if(!pac_script_len) use_pac_script = FALSE; if(use_pac_script) { diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index e0f473caf7..b9fbf1eb0a 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -263,10 +263,10 @@ static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) if (psn->hdr.code == PSN_APPLY) { *buffer = 0; - GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, sizeof(buffer)/sizeof(WCHAR)); + GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, ARRAY_SIZE(buffer)); TRACE("EDITTEXT has %s\n", debugstr_w(buffer)); - res = parse_url_from_outside(buffer, parsed, sizeof(parsed)/sizeof(WCHAR)); + res = parse_url_from_outside(buffer, parsed, ARRAY_SIZE(parsed)); TRACE("got %d with %s\n", res, debugstr_w(parsed)); if (res) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 543ada433d..e11caf1fc3 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -73,7 +73,7 @@ static DWORD url_templates[] = {URLTEMPLATE_CUSTOM, static DWORD index_from_urltemplate(URLTEMPLATE value) { - DWORD index = sizeof(url_templates) / sizeof(url_templates[0]); + DWORD index = ARRAY_SIZE(url_templates); while((index > 0) && (url_templates[index-1] != value)) index--; @@ -105,12 +105,12 @@ static void update_security_level(secdlg_data *sd, DWORD lv_index, DWORD tb_inde current_index = (tb_index > 0) ? tb_index : index_from_urltemplate(sd->levels[lv_index]); name[0] = 0; - LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, sizeof(name)/sizeof(name[0])); + LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, ARRAY_SIZE(name)); TRACE("new level #%d: %s\n", current_index, debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL), name); name[0] = 0; - LoadStringW(hcpl, IDS_SEC_LEVEL0_INFO + (current_index * 0x10), name, sizeof(name)/sizeof(name[0])); + LoadStringW(hcpl, IDS_SEC_LEVEL0_INFO + (current_index * 0x10), name, ARRAY_SIZE(name)); TRACE("new level info: %s\n", debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL_INFO), name); @@ -134,8 +134,8 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index) SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription); - len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); - lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1); + len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, ARRAY_SIZE(name)); + lstrcpynW(&name[len], za->szDisplayName, ARRAY_SIZE(name) - len - 1); TRACE("new title: %s\n", debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_GROUP), name); -- 2.14.4

1 0

[PATCH] krnl386.exe16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Jul '18

20 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/int21.c | 6 +++--- dlls/krnl386.exe16/interrupts.c | 4 ++-- dlls/krnl386.exe16/relay.c | 4 ++-- dlls/krnl386.exe16/snoop.c | 4 ++-- dlls/krnl386.exe16/vxd.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index f32b1a767c..f5b257b6d7 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -814,8 +814,8 @@ static HANDLE INT21_CreateMagicDeviceHandle( LPCWSTR name ) return 0; } memcpy( nameW.Buffer, prefixW, sizeof(prefixW) ); - MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + sizeof(prefixW)/sizeof(WCHAR), len ); - len += sizeof(prefixW) / sizeof(WCHAR); + MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + ARRAY_SIZE(prefixW), len ); + len += ARRAY_SIZE(prefixW); nameW.Buffer[len-1] = '/'; strcpyW( nameW.Buffer + len, name ); @@ -3264,7 +3264,7 @@ static BOOL INT21_NetworkFunc (CONTEXT *context) case 0x00: /* Get machine name. */ { WCHAR dstW[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD s = sizeof(dstW) / sizeof(WCHAR); + DWORD s = ARRAY_SIZE(dstW); int len; char *dst = CTX_SEG_OFF_TO_LIN (context,context->SegDs,context->Edx); diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index e1b01b7b3d..c4448c6d00 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -103,7 +103,7 @@ static void WINAPI DOSVM_DefaultHandler( CONTEXT *context ) */ static INTPROC DOSVM_GetBuiltinHandler( BYTE intnum ) { - if (intnum < sizeof(DOSVM_VectorsBuiltin)/sizeof(INTPROC)) { + if (intnum < ARRAY_SIZE(DOSVM_VectorsBuiltin)) { INTPROC proc = DOSVM_VectorsBuiltin[intnum]; if (proc) return proc; @@ -274,7 +274,7 @@ BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum ) else if (wine_ldt_is_system(context->SegCs)) { INTPROC proc; - if (intnum >= sizeof(DOSVM_VectorsBuiltin)/sizeof(INTPROC)) return FALSE; + if (intnum >= ARRAY_SIZE(DOSVM_VectorsBuiltin)) return FALSE; if (!(proc = DOSVM_VectorsBuiltin[intnum])) return FALSE; proc( context ); } diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index f1fbc57a0f..264ba2c589 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -345,7 +345,7 @@ static int relay_call_from_16_no_debug( void *entry_point, unsigned char *args16 int args32[20]; /* look for the ret instruction */ - for (j = 0; j < sizeof(call->ret)/sizeof(call->ret[0]); j++) + for (j = 0; j < ARRAY_SIZE(call->ret); j++) if (call->ret[j] == 0xca66 || call->ret[j] == 0xcb66) break; if (call->ret[j] == 0xcb66) /* cdecl */ @@ -449,7 +449,7 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte TRACE( "\1Call %s.%d: %s(", module, ordinal, func ); /* look for the ret instruction */ - for (j = 0; j < sizeof(call->ret)/sizeof(call->ret[0]); j++) + for (j = 0; j < ARRAY_SIZE(call->ret); j++) if (call->ret[j] == 0xca66 || call->ret[j] == 0xcb66) break; if (call->ret[j] == 0xcb66) /* cdecl */ diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 95a5154a4b..4496080dad 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -262,10 +262,10 @@ static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT *context) { return; /* oops */ } while (*rets) { - for (i=0;i<sizeof((*rets)->entry)/sizeof((*rets)->entry[0]);i++) + for (i=0;i<ARRAY_SIZE((*rets)->entry);i++) if (!(*rets)->entry[i].origreturn) break; - if (i!=sizeof((*rets)->entry)/sizeof((*rets)->entry[0])) + if (i!=ARRAY_SIZE((*rets)->entry)) break; rets = &((*rets)->next); } diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index dc14600f5d..e103b96bb9 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -129,8 +129,8 @@ static HANDLE open_vxd_handle( LPCWSTR name ) return 0; } memcpy( nameW.Buffer, prefixW, sizeof(prefixW) ); - MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + sizeof(prefixW)/sizeof(WCHAR), len ); - len += sizeof(prefixW) / sizeof(WCHAR); + MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + ARRAY_SIZE(prefixW), len ); + len += ARRAY_SIZE(prefixW); nameW.Buffer[len-1] = '/'; strcpyW( nameW.Buffer + len, name ); @@ -201,7 +201,7 @@ HANDLE __wine_vxd_open( LPCWSTR filenameW, DWORD access, SECURITY_ATTRIBUTES *sa /* normalize the filename */ - if (strlenW( filenameW ) >= sizeof(name)/sizeof(WCHAR) - 4 || + if (strlenW( filenameW ) >= ARRAY_SIZE(name) - 4 || strchrW( filenameW, '/' ) || strchrW( filenameW, '\\' )) { SetLastError( ERROR_FILE_NOT_FOUND ); -- 2.14.4

1 0

[PATCH] mapi32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Jul '18

20 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mapi32/sendmail.c | 8 ++++---- dlls/mapi32/util.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 9ebb220c03..407dd13041 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -542,8 +542,8 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, } /* Display an error message since we apparently have no mail clients */ - LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); - LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR)); + LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, ARRAY_SIZE(error_msg)); + LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, ARRAY_SIZE(msg_title)); MessageBoxW((HWND) uiparam, error_msg, msg_title, MB_ICONEXCLAMATION); @@ -701,8 +701,8 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, } /* Display an error message since we apparently have no mail clients */ - LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); - LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR)); + LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, ARRAY_SIZE(error_msg)); + LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, ARRAY_SIZE(msg_title)); MessageBoxW((HWND) uiparam, error_msg, msg_title, MB_ICONEXCLAMATION); diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 13e4affc39..9c3b01944a 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -903,7 +903,7 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path char lcid_ver[20]; UINT i; - for (i = 0; i < sizeof(fmt)/sizeof(fmt[0]); i++) + for (i = 0; i < ARRAY_SIZE(fmt); i++) { /* FIXME: what's the correct behaviour here? */ if (!qualifier || qualifier == lcid_ver) -- 2.14.4

1 0

[PATCH] hnetcfg/tests: Pass correct parameter to WNetGetUniversalNameW
by Fabian Maurer 20 Jul '18

20 Jul '18

Currently a pointer to a local variable is passed, that causes severe stack corruption. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 4e90ceb8fd..208f5838b5 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -144,7 +144,7 @@ static void test_NetFwAuthorizedApplication(void) info = (UNIVERSAL_NAME_INFOW *)&netpath; sz = sizeof(netpath); - hr = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, &info, &sz); + hr = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, info, &sz); if (hr != NO_ERROR) { info->lpUniversalName = netpath + sizeof(*info)/sizeof(WCHAR); -- 2.18.0

1 1

[PATCH v2] cmd: Change parsing of the if command to avoid parsing the operators.
by Bernhard Übelacker 20 Jul '18

20 Jul '18

Found while trying to look into #44236. A batch script is executed containing a line like this: if (%1)==(p) start /W " " "%SFDIR%WSFplot" wr2300.t35 3 This returns an error like this: Syntax error Can't recognize 'p' as an internal or external command, or batch script. It looks like native does handle the brackets differently when contained inside the condition part of the if command. Therefore this patch tries to skip the parsing in WCMD_ReadAndParseLine of that part. Therefore it moves most of the content of WCMD_if into a helper and calls that to estimate how long the condition part is. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44338 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- History: v0: Some comments in bug tracker by Vijay Kamuju. v1: https://www.winehq.org/pipermail/wine-devel/2018-January/121764.html (Received no comments.) v2: * Rebased to wine 3.13. * Removed --- in commit message making patchwatcher ignoring Signed-off-by line. --- programs/cmd/builtins.c | 79 ++++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 20 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++ programs/cmd/wcmd.h | 2 + programs/cmd/wcmdmain.c | 30 +++++++-- 5 files changed, 98 insertions(+), 37 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 088632f214..4dcf48fa3e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2824,25 +2824,9 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato return -1; } -/**************************************************************************** - * WCMD_if - * - * Batch file conditional. - * - * On entry, cmdlist will point to command containing the IF, and optionally - * the first command to execute (if brackets not found) - * If &&'s were found, this may be followed by a record flagged as isAmpersand - * If ('s were found, execute all within that bracket - * Command may optionally be followed by an ELSE - need to skip instructions - * in the else using the same logic - * - * FIXME: Much more syntax checking needed! - */ -void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) { - int negate; /* Negate condition */ - int test; /* Condition evaluation result */ - WCHAR condition[MAX_PATH], *command; + WCHAR condition[MAX_PATH]; static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; static const WCHAR existW[] = {'e','x','i','s','t','\0'}; @@ -2850,36 +2834,36 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) static const WCHAR parmI[] = {'/','I','\0'}; int caseInsensitive = (strstrW(quals, parmI) != NULL); - negate = !lstrcmpiW(param1,notW); - strcpyW(condition, (negate ? param2 : param1)); + *negate = !lstrcmpiW(param1,notW); + strcpyW(condition, (*negate ? param2 : param1)); WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE); + WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); WCHAR *endptr; long int param_int = strtolW(param, &endptr, 10); if (*endptr) goto syntax_err; - test = ((long int)errorlevel >= param_int); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + *test = ((long int)errorlevel >= param_int); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW (condition, existW)) { WIN32_FIND_DATAW fd; - HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd); - test = (hff != INVALID_HANDLE_VALUE ); - if (test) FindClose(hff); + HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE), &fd); + *test = (hff != INVALID_HANDLE_VALUE ); + if (*test) FindClose(hff); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW (condition, defdW)) { - test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), + *test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE), NULL, 0) > 0); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else { /* comparison operation */ WCHAR leftOperand[MAXSTRING], rightOperand[MAXSTRING], operator[MAXSTRING]; WCHAR *paramStart; - strcpyW(leftOperand, WCMD_parameter(p, negate+caseInsensitive, &paramStart, TRUE, FALSE)); + strcpyW(leftOperand, WCMD_parameter(p, (*negate)+caseInsensitive, &paramStart, TRUE, FALSE)); if (!*leftOperand) goto syntax_err; @@ -2900,14 +2884,43 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) if (!*rightOperand) goto syntax_err; - test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); - if (test == -1) + *test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); + if (*test == -1) goto syntax_err; p = paramStart + strlenW(rightOperand); - WCMD_parameter(p, 0, &command, FALSE, FALSE); + WCMD_parameter(p, 0, command, FALSE, FALSE); } + return 1; + +syntax_err: + return -1; +} + +/**************************************************************************** + * WCMD_if + * + * Batch file conditional. + * + * On entry, cmdlist will point to command containing the IF, and optionally + * the first command to execute (if brackets not found) + * If &&'s were found, this may be followed by a record flagged as isAmpersand + * If ('s were found, execute all within that bracket + * Command may optionally be followed by an ELSE - need to skip instructions + * in the else using the same logic + * + * FIXME: Much more syntax checking needed! + */ +void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +{ + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ + WCHAR *command; + + if (evaluate_if_condition(p, &command, &test, &negate) == -1) + goto syntax_err; + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b9e9b259a9..2b6e3f16d7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -908,6 +908,26 @@ if %elseIF% == 1 ( ) else ( echo else if seems to be broken ) +if ()==() ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if 1(==1( ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if )==) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if /i not (a)==(b) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3118359265..70dc81631c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -658,6 +658,10 @@ if seems not to detect /c as parameter else if seems to work else if seems to work else if seems to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8d6eb6b48e..619f65df92 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -154,6 +154,8 @@ static inline BOOL ends_with_backslash( const WCHAR *path ) return path[0] && path[strlenW(path) - 1] == '\\'; } +int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate); + /* Data structure to hold context when executing batch files */ typedef struct _BATCH_CONTEXT { diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8fe2d574e5..d137b152d5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1921,13 +1921,35 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* If command starts with 'if ' or 'else ', handle ('s mid line. We should ensure this is only true in the command portion of the IF statement, but this - should suffice for now - FIXME: Silly syntax like "if 1(==1( ( - echo they equal - )" will be parsed wrong */ + should suffice for now. + To be able to handle ('s in the condition part take as much as evaluate_if_condition + would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, sizeof(ifCmd)/sizeof(ifCmd[0]), curPos)) { + static const WCHAR parmI[] = {'/','I','\0'}; + static const WCHAR notW[] = {'n','o','t','\0'}; + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ + WCHAR *p, *command; + inIf = TRUE; + p = curPos+(sizeof(ifCmd)/sizeof(*ifCmd)); + while (*p == ' ' || *p == '\t') { + p++; + if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) + p += strlenW(notW); + if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) + p += strlenW(parmI); + } + + if (evaluate_if_condition(p, &command, &test, &negate) != -1) + { + int if_condition_len = command - curPos; + memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); + (*curLen)+=if_condition_len; + curPos+=if_condition_len; + } + } else if (WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), curPos)) { const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; inElse = TRUE; -- 2.18.0

1 0

[PATCH] wrc: Don't crash when parsing COMBOBOX element without style
by Fabian Maurer 20 Jul '18

20 Jul '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- tools/wrc/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 0f73f906b6..8196e9f7fa 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -1969,7 +1969,7 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control defaultstyle |= LBS_NOTIFY | WS_BORDER; break; case CT_COMBOBOX: - if (!(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) + if (!ctrl->gotstyle || !(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) defaultstyle |= CBS_SIMPLE; break; case CT_STATIC: -- 2.18.0

1 0

[PATCH vkd3d 7/8] libs/vkd3d: Implement d3d12_device_CreateHeap().
by Józef Kucia 20 Jul '18

20 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 15 +++- libs/vkd3d/resource.c | 204 +++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 16 +++- 3 files changed, 230 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 176b0d452979..6fa001779180 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1853,12 +1853,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Devi } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, - const D3D12_HEAP_DESC *desc, REFIID riid, void **heap) + const D3D12_HEAP_DESC *desc, REFIID iid, void **heap) { - FIXME("iface %p, desc %p, riid %s, heap %p stub!\n", - iface, desc, debugstr_guid(riid), heap); + struct d3d12_device *device = impl_from_ID3D12Device(iface); + struct d3d12_heap *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, iid %s, heap %p.\n", + iface, desc, debugstr_guid(iid), heap); + + if (FAILED(hr = d3d12_heap_create(device, desc, &object))) + return hr; + + return return_interface(&object->ID3D12Heap_iface, &IID_ID3D12Heap, iid, heap); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 9fa98b085271..1456c4b925e7 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -18,6 +18,210 @@ #include "vkd3d_private.h" +/* ID3D12Heap */ +static inline struct d3d12_heap *impl_from_ID3D12Heap(ID3D12Heap *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_heap, ID3D12Heap_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_QueryInterface(ID3D12Heap *iface, + REFIID iid, void **object) +{ + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (IsEqualGUID(iid, &IID_ID3D12Heap) + || IsEqualGUID(iid, &IID_ID3D12Pageable) + || IsEqualGUID(iid, &IID_ID3D12DeviceChild) + || IsEqualGUID(iid, &IID_ID3D12Object) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID3D12Heap_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + ULONG refcount = InterlockedIncrement(&heap->refcount); + + TRACE("%p increasing refcount to %u.\n", heap, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + ULONG refcount = InterlockedDecrement(&heap->refcount); + + TRACE("%p decreasing refcount to %u.\n", heap, refcount); + + if (!refcount) + { + struct d3d12_device *device = heap->device; + + vkd3d_free(heap); + + ID3D12Device_Release(&device->ID3D12Device_iface); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_GetPrivateData(ID3D12Heap *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateData(ID3D12Heap *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateDataInterface(ID3D12Heap *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetName(ID3D12Heap *iface, const WCHAR *name) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_GetDevice(ID3D12Heap *iface, + REFIID riid, void **device) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + + return ID3D12Device_QueryInterface(&heap->device->ID3D12Device_iface, riid, device); +} + +static D3D12_HEAP_DESC * STDMETHODCALLTYPE d3d12_heap_GetDesc(ID3D12Heap *iface, + D3D12_HEAP_DESC *desc) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = heap->desc; + return desc; +} + +static const struct ID3D12HeapVtbl d3d12_heap_vtbl = +{ + /* IUnknown methods */ + d3d12_heap_QueryInterface, + d3d12_heap_AddRef, + d3d12_heap_Release, + /* ID3D12Object methods */ + d3d12_heap_GetPrivateData, + d3d12_heap_SetPrivateData, + d3d12_heap_SetPrivateDataInterface, + d3d12_heap_SetName, + /* ID3D12DeviceChild methods */ + d3d12_heap_GetDevice, + /* ID3D12Heap methods */ + d3d12_heap_GetDesc, +}; + +static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc) +{ + if (!desc->SizeInBytes) + { + WARN("Invalid size %"PRIu64".\n", desc->SizeInBytes); + return E_INVALIDARG; + } + + if (desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + && desc->Alignment != D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT) + { + WARN("Invalid alignment %"PRIu64".\n", desc->Alignment); + return E_INVALIDARG; + } + + if (desc->Flags & D3D12_HEAP_FLAG_ALLOW_DISPLAY) + { + WARN("D3D12_HEAP_FLAG_ALLOW_DISPLAY is only for committed resources.\n"); + return E_INVALIDARG; + } + + return S_OK; +} + +static HRESULT d3d12_heap_init(struct d3d12_heap *heap, + struct d3d12_device *device, const D3D12_HEAP_DESC *desc) +{ + HRESULT hr; + + heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; + heap->refcount = 1; + + heap->desc = *desc; + + if (!heap->desc.Properties.CreationNodeMask) + heap->desc.Properties.CreationNodeMask = 1; + if (!heap->desc.Properties.VisibleNodeMask) + heap->desc.Properties.VisibleNodeMask = 1; + + debug_ignored_node_mask(heap->desc.Properties.CreationNodeMask); + debug_ignored_node_mask(heap->desc.Properties.VisibleNodeMask); + + if (!heap->desc.Alignment) + heap->desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + + if (FAILED(hr = validate_heap_desc(&heap->desc))) + return hr; + + heap->device = device; + ID3D12Device_AddRef(&device->ID3D12Device_iface); + + return S_OK; +} + +HRESULT d3d12_heap_create(struct d3d12_device *device, + const D3D12_HEAP_DESC *desc, struct d3d12_heap **heap) +{ + struct d3d12_heap *object; + HRESULT hr; + + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d12_heap_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + + TRACE("Created heap %p.\n", object); + + *heap = object; + + return S_OK; +} + static VkImageType vk_image_type_from_d3d12_resource_dimension(D3D12_RESOURCE_DIMENSION dimension) { switch (dimension) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0adc2e4949cc..8efb9304a554 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -180,6 +180,20 @@ struct d3d12_fence HRESULT d3d12_fence_create(struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; +/* ID3D12Heap */ +struct d3d12_heap +{ + ID3D12Heap ID3D12Heap_iface; + LONG refcount; + + D3D12_HEAP_DESC desc; + + struct d3d12_device *device; +}; + +HRESULT d3d12_heap_create(struct d3d12_device *device, + const D3D12_HEAP_DESC *desc, struct d3d12_heap **heap) DECLSPEC_HIDDEN; + #define VKD3D_RESOURCE_PUBLIC_FLAGS \ (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) #define VKD3D_RESOURCE_EXTERNAL 0x00000004 @@ -766,7 +780,7 @@ bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDE bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -static inline bool is_cpu_accessible_heap(const struct D3D12_HEAP_PROPERTIES *properties) +static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *properties) { if (properties->Type == D3D12_HEAP_TYPE_DEFAULT) return false; -- 2.16.4

2 1

[PATCH vkd3d 6/8] libs/vkd3d: Factor out debug_ignored_node_mask().
by Józef Kucia 20 Jul '18

20 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 3 +-- libs/vkd3d/device.c | 7 +++++-- libs/vkd3d/vkd3d_private.h | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d29d18edb633..4db9967e08b5 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4045,8 +4045,7 @@ HRESULT d3d12_command_list_create(struct d3d12_device *device, return E_INVALIDARG; } - if (node_mask && node_mask != 1) - FIXME("Multi-adapter not supported.\n"); + debug_ignored_node_mask(node_mask); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5d2c91f4de34..176b0d452979 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1663,8 +1663,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device * TRACE("iface %p, node_mask 0x%08x, bytecode %p, bytecode_length %lu, riid %s, root_signature %p.\n", iface, node_mask, bytecode, bytecode_length, debugstr_guid(riid), root_signature); - if (node_mask && node_mask != 1) - FIXME("Ignoring node mask 0x%08x.\n", node_mask); + debug_ignored_node_mask(node_mask); if (FAILED(hr = d3d12_root_signature_create(device, bytecode, bytecode_length, &object))) return hr; @@ -1816,6 +1815,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour "resource_descs %p stub!\n", iface, allocation_info, visible_mask, resource_desc_count, resource_descs); + debug_ignored_node_mask(visible_mask); + return allocation_info; } @@ -1825,6 +1826,8 @@ static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapPrope FIXME("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n", iface, heap_properties, node_mask, heap_type); + debug_ignored_node_mask(node_mask); + return heap_properties; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e9ee06a223cc..0adc2e4949cc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -786,6 +786,12 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; +static inline void debug_ignored_node_mask(unsigned int mask) +{ + if (mask && mask != 1) + FIXME("Ignoring node mask 0x%08x.\n", mask); +} + HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; -- 2.16.4

2 1

[PATCH vkd3d 5/8] include: Add ID3D12Heap.
by Józef Kucia 20 Jul '18

20 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 34e86975052d..4b967d489b77 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1605,6 +1605,17 @@ interface ID3D12Pageable : ID3D12DeviceChild { } +[ + uuid(6b3b2502-6e51-45b3-90ee-9884265e8df3), + object, + local, + pointer_default(unique) +] +interface ID3D12Heap : ID3D12Pageable +{ + D3D12_HEAP_DESC GetDesc(); +} + [ uuid(696442be-a72e-4059-bc79-5b5c98040fad), object, -- 2.16.4

2 1

[PATCH vkd3d 4/8] include: Add more alignment constants.
by Józef Kucia 20 Jul '18

20 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index a0c09ef8aa74..34e86975052d 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -53,9 +53,15 @@ const UINT D3D12_REQ_TEXTURECUBE_DIMENSION = 16384; const UINT D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES = 0xffffffff; const UINT D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; +const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; +const UINT D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; +const UINT D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 65536; +const UINT D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 4096; +const UINT D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; const UINT D3D12_TEXTURE_DATA_PITCH_ALIGNMENT = 256; const UINT D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT = 512; +const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; -- 2.16.4

2 1

[PATCH vkd3d 3/8] libs/vkd3d: Introduce d3d12_resource_validate_desc().
by Józef Kucia 20 Jul '18

20 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Share D3D12_RESOURCE_DESC validation code between CreateCommittedResource() and GetCopyableFootprints(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 34 +++++------------------------ libs/vkd3d/resource.c | 53 +++++++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index aaa47465b07e..5d2c91f4de34 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1964,7 +1964,8 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i UINT64 base_offset, D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, UINT *row_counts, UINT64 *row_sizes, UINT64 *total_bytes) { - static const struct vkd3d_format vkd3d_format_unknown = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; + static const struct vkd3d_format vkd3d_format_unknown + = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int width, height, depth, array_size; @@ -1995,35 +1996,10 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - /* FIXME: We should probably share D3D12_RESOURCE_DESC validation with CreateCommittedResource(). */ - switch (desc->Dimension) + if (FAILED(d3d12_resource_validate_desc(desc))) { - case D3D12_RESOURCE_DIMENSION_BUFFER: - if (desc->Format != DXGI_FORMAT_UNKNOWN || desc->Layout != D3D12_TEXTURE_LAYOUT_ROW_MAJOR - || desc->Height != 1 || desc->DepthOrArraySize != 1 || desc->MipLevels != 1 - || desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality != 0 - || (desc->Alignment != 0 && desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)) - { - WARN("Invalid parameters for a buffer resource.\n"); - return; - } - break; - - case D3D12_RESOURCE_DIMENSION_TEXTURE1D: - if (desc->Height != 1) - { - WARN("1D texture with a height of %u.\n", desc->Height); - return; - } - break; - - case D3D12_RESOURCE_DIMENSION_TEXTURE2D: - case D3D12_RESOURCE_DIMENSION_TEXTURE3D: - break; - - default: - WARN("Invalid resource dimension %#x.\n", desc->Dimension); - return; + WARN("Invalid resource desc.\n"); + return; } array_size = d3d12_resource_desc_get_layer_count(desc); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index fb84e4b13a08..9fa98b085271 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -648,21 +648,43 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) return impl_from_ID3D12Resource(iface); } -static HRESULT validate_buffer_desc(const D3D12_RESOURCE_DESC *desc) +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) { - if (desc->MipLevels != 1) + switch (desc->Dimension) { - WARN("Invalid miplevel count %u for buffer.\n", desc->MipLevels); - return E_INVALIDARG; - } + case D3D12_RESOURCE_DIMENSION_BUFFER: + if (desc->MipLevels != 1) + { + WARN("Invalid miplevel count %u for buffer.\n", desc->MipLevels); + return E_INVALIDARG; + } - return S_OK; -} + if (desc->Format != DXGI_FORMAT_UNKNOWN || desc->Layout != D3D12_TEXTURE_LAYOUT_ROW_MAJOR + || desc->Height != 1 || desc->DepthOrArraySize != 1 + || desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality != 0 + || (desc->Alignment != 0 && desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)) + { + WARN("Invalid parameters for a buffer resource.\n"); + return E_INVALIDARG; + } + break; -static HRESULT validate_texture_desc(D3D12_RESOURCE_DESC *desc) -{ - if (!desc->MipLevels) - desc->MipLevels = max_miplevel_count(desc); + case D3D12_RESOURCE_DIMENSION_TEXTURE1D: + if (desc->Height != 1) + { + WARN("1D texture with a height of %u.\n", desc->Height); + return E_INVALIDARG; + } + break; + + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: + case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + break; + + default: + WARN("Invalid resource dimension %#x.\n", desc->Dimension); + return E_INVALIDARG; + } return S_OK; } @@ -717,11 +739,12 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st resource->gpu_address = 0; resource->flags = 0; + if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) + return hr; + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: - if (FAILED(hr = validate_buffer_desc(&resource->desc))) - return hr; if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, &resource->desc, &resource->u.vk_buffer))) return hr; @@ -743,8 +766,8 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st case D3D12_RESOURCE_DIMENSION_TEXTURE1D: case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: - if (FAILED(hr = validate_texture_desc(&resource->desc))) - return hr; + if (!resource->desc.MipLevels) + resource->desc.MipLevels = max_miplevel_count(desc); resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags))) return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2c224675cab4..e9ee06a223cc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -223,6 +223,8 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER; } +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN; + HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, -- 2.16.4

2 1

[PATCH vkd3d 2/8] tests: Add more tests for D3D12CreateDevice() with device set to NULL.
by Józef Kucia 20 Jul '18

20 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e2337c4427ab..83dc8f903c81 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1082,6 +1082,10 @@ static void test_create_device(void) hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, NULL, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12DeviceChild, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_1, &IID_ID3D12Device, (void **)&device); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); -- 2.16.4

2 1

[PATCH vkd3d 1/8] libs/vkd3d: Change return_interface() iface parameter type to void pointer.
by Józef Kucia 20 Jul '18

20 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 28 +++++++++++++--------------- libs/vkd3d/utils.c | 13 +++++++------ libs/vkd3d/vkd3d_main.c | 5 ++--- libs/vkd3d/vkd3d_private.h | 4 ++-- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5f3161d0a7da..aaa47465b07e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1158,7 +1158,8 @@ static int vkd3d_gpu_va_allocation_compare(const void *k, const void *e) return 0; } -void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) +void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, + D3D12_GPU_VIRTUAL_ADDRESS address) { struct vkd3d_gpu_va_allocation *allocation; int rc; @@ -1345,7 +1346,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandQueue(ID3D12Device *i if (FAILED(hr = d3d12_command_queue_create(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12CommandQueue_iface, &IID_ID3D12CommandQueue, + return return_interface(&object->ID3D12CommandQueue_iface, &IID_ID3D12CommandQueue, riid, command_queue); } @@ -1362,7 +1363,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandAllocator(ID3D12Devic if (FAILED(hr = d3d12_command_allocator_create(device, type, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12CommandAllocator_iface, &IID_ID3D12CommandAllocator, + return return_interface(&object->ID3D12CommandAllocator_iface, &IID_ID3D12CommandAllocator, riid, command_allocator); } @@ -1379,7 +1380,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateGraphicsPipelineState(ID3D12 if (FAILED(hr = d3d12_pipeline_state_create_graphics(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12PipelineState_iface, + return return_interface(&object->ID3D12PipelineState_iface, &IID_ID3D12PipelineState, riid, pipeline_state); } @@ -1396,7 +1397,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateComputePipelineState(ID3D12D if (FAILED(hr = d3d12_pipeline_state_create_compute(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12PipelineState_iface, + return return_interface(&object->ID3D12PipelineState_iface, &IID_ID3D12PipelineState, riid, pipeline_state); } @@ -1417,7 +1418,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if initial_pipeline_state, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12GraphicsCommandList_iface, + return return_interface(&object->ID3D12GraphicsCommandList_iface, &IID_ID3D12GraphicsCommandList, riid, command_list); } @@ -1624,7 +1625,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateDescriptorHeap(ID3D12Device if (FAILED(hr = d3d12_descriptor_heap_create(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12DescriptorHeap_iface, + return return_interface(&object->ID3D12DescriptorHeap_iface, &IID_ID3D12DescriptorHeap, riid, descriptor_heap); } @@ -1668,7 +1669,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device * if (FAILED(hr = d3d12_root_signature_create(device, bytecode, bytecode_length, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12RootSignature_iface, + return return_interface(&object->ID3D12RootSignature_iface, &IID_ID3D12RootSignature, riid, root_signature); } @@ -1845,8 +1846,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Devi desc, initial_state, optimized_clear_value, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12Resource_iface, &IID_ID3D12Resource, - riid, resource); + return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, riid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, @@ -1947,8 +1947,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device *iface, if (FAILED(hr = d3d12_fence_create(device, initial_value, flags, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12Fence_iface, &IID_ID3D12Fence, - riid, fence); + return return_interface(&object->ID3D12Fence_iface, &IID_ID3D12Fence, riid, fence); } static HRESULT STDMETHODCALLTYPE d3d12_device_GetDeviceRemovedReason(ID3D12Device *iface) @@ -2096,8 +2095,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateQueryHeap(ID3D12Device *ifac if (FAILED(hr = d3d12_query_heap_create(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12QueryHeap_iface, - &IID_ID3D12QueryHeap, iid, heap); + return return_interface(&object->ID3D12QueryHeap_iface, &IID_ID3D12QueryHeap, iid, heap); } static HRESULT STDMETHODCALLTYPE d3d12_device_SetStablePowerState(ID3D12Device *iface, BOOL enable) @@ -2121,7 +2119,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandSignature(ID3D12Devic if (FAILED(hr = d3d12_command_signature_create(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12CommandSignature_iface, + return return_interface(&object->ID3D12CommandSignature_iface, &IID_ID3D12CommandSignature, iid, command_signature); } diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 43c8356203f5..87688f7752ad 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -256,19 +256,20 @@ bool is_valid_resource_state(D3D12_RESOURCE_STATES state) return true; } -HRESULT return_interface(IUnknown *iface, REFIID iface_riid, - REFIID requested_riid, void **object) +HRESULT return_interface(void *iface, REFIID iface_iid, + REFIID requested_iid, void **object) { + IUnknown *unknown = iface; HRESULT hr; - if (IsEqualGUID(iface_riid, requested_riid)) + if (IsEqualGUID(iface_iid, requested_iid)) { - *object = iface; + *object = unknown; return S_OK; } - hr = IUnknown_QueryInterface(iface, requested_riid, object); - IUnknown_Release(iface); + hr = IUnknown_QueryInterface(unknown, requested_iid, object); + IUnknown_Release(unknown); return hr; } diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 0e2d422d216b..063a4ca1c9ea 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -82,8 +82,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, return S_FALSE; } - return return_interface((IUnknown *)&object->ID3D12Device_iface, &IID_ID3D12Device, - iid, device); + return return_interface(&object->ID3D12Device_iface, &IID_ID3D12Device, iid, device); } /* ID3D12RootSignatureDeserializer */ @@ -208,7 +207,7 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s return hr; } - return return_interface((IUnknown *)&object->ID3D12RootSignatureDeserializer_iface, + return return_interface(&object->ID3D12RootSignatureDeserializer_iface, &IID_ID3D12RootSignatureDeserializer, iid, deserializer); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 685825955a7f..2c224675cab4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -776,8 +776,8 @@ static inline bool is_cpu_accessible_heap(const struct D3D12_HEAP_PROPERTIES *pr return true; } -HRESULT return_interface(IUnknown *iface, REFIID iface_riid, - REFIID requested_riid, void **object) DECLSPEC_HIDDEN; +HRESULT return_interface(void *iface, REFIID iface_iid, + REFIID requested_iid, void **object) DECLSPEC_HIDDEN; const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; -- 2.16.4

2 1

[PATCH vkd3d 8/8] tests: Add test for creating heaps.
by Józef Kucia 20 Jul '18

20 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 83dc8f903c81..9e4070e0d71e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -157,6 +157,53 @@ static void check_interface_(unsigned int line, IUnknown *iface, REFIID riid, bo IUnknown_Release(unk); } +#define check_heap_properties(a, b) check_heap_properties_(__LINE__, a, b) +static void check_heap_properties_(unsigned int line, + const D3D12_HEAP_PROPERTIES *properties, const D3D12_HEAP_PROPERTIES *expected_properties) +{ + D3D12_HEAP_PROPERTIES expected = *expected_properties; + + if (!expected.CreationNodeMask) + expected.CreationNodeMask = 0x1; + if (!expected.VisibleNodeMask) + expected.VisibleNodeMask = 0x1; + + ok(properties->Type == expected.Type, + "Got type %#x, expected %#x.\n", properties->Type, expected.Type); + ok(properties->CPUPageProperty == expected.CPUPageProperty, + "Got CPU page properties %#x, expected %#x.\n", + properties->CPUPageProperty, expected.CPUPageProperty); + ok(properties->MemoryPoolPreference == expected.MemoryPoolPreference, + "Got memory pool %#x, expected %#x.\n", + properties->MemoryPoolPreference, expected.MemoryPoolPreference); + ok(properties->CreationNodeMask == expected.CreationNodeMask, + "Got creation node mask %#x, expected %#x.\n", + properties->CreationNodeMask, expected.CreationNodeMask); + ok(properties->VisibleNodeMask == expected.VisibleNodeMask, + "Got visible node mask %#x, expected %#x.\n", + properties->VisibleNodeMask, expected.VisibleNodeMask); +} + +#define check_heap_desc(a, b) check_heap_desc_(__LINE__, a, b) +static void check_heap_desc_(unsigned int line, const D3D12_HEAP_DESC *desc, + const D3D12_HEAP_DESC *expected_desc) +{ + D3D12_HEAP_DESC expected = *expected_desc; + + if (!expected.Alignment) + expected.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + + ok(desc->SizeInBytes == expected.SizeInBytes, + "Got size %"PRIu64", expected %"PRIu64".\n", + desc->SizeInBytes, expected.SizeInBytes); + check_heap_properties_(line, &desc->Properties, &expected.Properties); + ok(desc->Alignment == expected.Alignment, + "Got alignment %"PRIu64", expected %"PRIu64".\n", + desc->Alignment, expected.Alignment); + ok(desc->Flags == expected.Flags, + "Got flags %#x, expected %#x.\n", desc->Flags, expected.Flags); +} + static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resource) { D3D12_RESOURCE_BARRIER barrier; @@ -1731,6 +1778,131 @@ static void test_create_committed_resource(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_heap(void) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + D3D12_HEAP_DESC desc, result_desc; + ID3D12Device *device, *tmp_device; + unsigned int i, j; + ID3D12Heap *heap; + ULONG refcount; + HRESULT hr; + + static const struct + { + UINT64 alignment; + HRESULT expected_hr; + } + tests[] = + { + {D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, S_OK}, + {D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, S_OK}, + {2 * D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG}, + {2 * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG}, + {D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG}, + }; + static const struct + { + D3D12_HEAP_FLAGS flags; + const char *name; + } + heap_flags[] = + { + {D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS, "buffers"}, + {D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES, "textures"}, + {D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES, "rt_ds_textures"}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&desc.Properties, 0, sizeof(desc.Properties)); + desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + desc.Alignment = 0; + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); + hr = ID3D12Heap_GetDevice(heap, &IID_ID3D12Device, (void **)&tmp_device); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(tmp_device); + ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + check_interface(heap, &IID_ID3D12Object, TRUE); + check_interface(heap, &IID_ID3D12DeviceChild, TRUE); + check_interface(heap, &IID_ID3D12Pageable, TRUE); + check_interface(heap, &IID_ID3D12Heap, TRUE); + + result_desc = ID3D12Heap_GetDesc(heap); + check_heap_desc(&result_desc, &desc); + + refcount = ID3D12Heap_Release(heap); + ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); + + desc.SizeInBytes = 0; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + for (j = 0; j < ARRAY_SIZE(heap_flags); ++j) + { + desc.SizeInBytes = 10 * tests[i].alignment; + desc.Alignment = tests[i].alignment; + desc.Flags = heap_flags[j].flags; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == tests[i].expected_hr, "Test %u, %s: Got hr %#x, expected %#x.\n", + i, heap_flags[j].name, hr, tests[i].expected_hr); + if (FAILED(hr)) + continue; + + result_desc = ID3D12Heap_GetDesc(heap); + check_heap_desc(&result_desc, &desc); + + refcount = ID3D12Heap_Release(heap); + ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); + } + } + + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); + if (options.ResourceHeapTier < D3D12_RESOURCE_HEAP_TIER_2) + { + skip("Resource heap tier %u.\n", options.ResourceHeapTier); + goto done; + } + + desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ALL_BUFFERS_AND_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + result_desc = ID3D12Heap_GetDesc(heap); + check_heap_desc(&result_desc, &desc); + refcount = ID3D12Heap_Release(heap); + ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); + +done: + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_descriptor_heap(void) { D3D12_DESCRIPTOR_HEAP_DESC heap_desc; @@ -17652,6 +17824,7 @@ START_TEST(d3d12) run_test(test_create_command_list); run_test(test_create_command_queue); run_test(test_create_committed_resource); + run_test(test_create_heap); run_test(test_create_descriptor_heap); run_test(test_create_sampler); run_test(test_create_unordered_access_view); -- 2.16.4

2 1

[PATCH v2] user32/menu: Inside HiliteMenuItem free menu earlier to avoid crash
by Fabian Maurer 20 Jul '18

20 Jul '18

MENU_SelectItem sends a message, and we must not hold the lock when that happens Fixes bug 45457. v2: Don't access menu after releasing it Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/menu.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bae45002b7..3b1e3f25f4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3859,17 +3859,23 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, { POPUPMENU *menu; UINT pos; + HMENU handle_menu; + UINT focused_item; TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite); if (!(menu = find_menu_item(hMenu, wItemID, wHilite, &pos))) return FALSE; - if (menu->FocusedItem != pos) + handle_menu = menu->obj.handle; + focused_item = menu->FocusedItem; + release_menu_ptr(menu); + + if (focused_item != pos) { - MENU_HideSubPopups( hWnd, menu->obj.handle, FALSE, 0 ); - MENU_SelectItem( hWnd, menu->obj.handle, pos, TRUE, 0 ); + MENU_HideSubPopups( hWnd, handle_menu, FALSE, 0 ); + MENU_SelectItem( hWnd, handle_menu, pos, TRUE, 0 ); } - release_menu_ptr(menu); + return TRUE; } -- 2.18.0

1 0

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 20 Jul '18

20 Jul '18

From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 80 ++++++++++------------------------------------------- 1 file changed, 15 insertions(+), 65 deletions(-)

1 0

[PATCH] user32/menu: Inside HiliteMenuItem free menu earlier to avoid crash
by Fabian Maurer 20 Jul '18

20 Jul '18

MENU_SelectItem sends a message, and we must not hold the lock when that happens Fixes bug 45457. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/menu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bae45002b7..cd6e9fff2a 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3859,17 +3859,21 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, { POPUPMENU *menu; UINT pos; + HMENU handle_menu; TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite); if (!(menu = find_menu_item(hMenu, wItemID, wHilite, &pos))) return FALSE; + handle_menu = menu->obj.handle; + release_menu_ptr(menu); + if (menu->FocusedItem != pos) { - MENU_HideSubPopups( hWnd, menu->obj.handle, FALSE, 0 ); - MENU_SelectItem( hWnd, menu->obj.handle, pos, TRUE, 0 ); + MENU_HideSubPopups( hWnd, handle_menu, FALSE, 0 ); + MENU_SelectItem( hWnd, handle_menu, pos, TRUE, 0 ); } - release_menu_ptr(menu); + return TRUE; } -- 2.18.0

2 3

RE: [PATCH] odbc32: Hide SQL functions to avoid conflicts with certain drivers.
by Daniel Lehman 20 Jul '18

20 Jul '18

> All the functions that you hiding should be exported for linking. it linked and ran for me with a simple winelib app. the windows-facing functions are still exported - the intent was to hide at the linux-facing level (visibility("hidden")) I can send a version where wine's functions are prefixed with ODBC32_ or something, instead. that also works for me > Can you please explain what drivers are causing the issue? https://urldefense.proofpoint.com/v2/url?u=https-3A__docs.microsoft.com_en-… it causes a crash: Backtrace: =>0 0x00007fe48afbec89 in libodbc.so.2 (+0x6c89) (0x0000000000000001) 1 0x00007fe48b908edf SQLAllocEnv+0x6e() in odbc32 (0x0000000000000001) <----- Wine's SQLAllocEnv 2 0x00007fe48a85fda5 _Z12GetDMversionv+0xf4() in libmsodbcsql-17.2.so.0.1 (0x000000000023cad0) 3 0x00007fe48a861315 _ZN9ExportImp14SQLGetDiagRecWEsPvsPwPiS1_sPs+0xa4() in libmsodbcsql-17.2.so.0.1 (0x000000000023cad0) 4 0x00007fe48afcbfa1 SQLDriverConnect+0x1540() in libodbc.so.2 (0x0000000000000000) 5 0x00007fe48b912c4a SQLDriverConnect+0xb9() in odbc32 (0x000000007c8fd0e0) 6 0x0000000140001132 in sample-crash17 (+0x1131) (0x00007ffc9a54c0b0) <----- calls SQLAllocEnv ... In frame 6, it calls into SQLDriverConnect. the driver calls back into Wine's version of SQLAllocEnv in frame 1, which I'm sure was not intended seems like they dynamically load odbc functions and they pick up wine's version of SQLAllocEnv first instead of libodbc.so.2 mssql 13.1 versions works and so do other drivers for other databases we support. it's just the 17 version that fails thanks daniel

1 0

[PATCH 2/8] comctl32/taskdialog: Add support for navigating page.
by Zhiyi Zhang 20 Jul '18

20 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 30 +++++++++++++++++ dlls/comctl32/tests/taskdialog.c | 58 ++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 5ffa4dc6fd..0f947a8098 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -1145,8 +1145,29 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_layout(dialog_info); } +static void takdialog_destroy_control(HWND hwnd) +{ + if(!hwnd) return; + DestroyWindow(hwnd); +} + static void taskdialog_destroy(struct taskdialog_info *dialog_info) { + INT i; + + takdialog_destroy_control(dialog_info->main_icon); + takdialog_destroy_control(dialog_info->main_instruction); + takdialog_destroy_control(dialog_info->content); + takdialog_destroy_control(dialog_info->progress_bar); + takdialog_destroy_control(dialog_info->expanded_info); + takdialog_destroy_control(dialog_info->expando_button); + takdialog_destroy_control(dialog_info->verification_box); + takdialog_destroy_control(dialog_info->footer_icon); + takdialog_destroy_control(dialog_info->footer_text); + for (i = 0; i < dialog_info->button_count; i++) takdialog_destroy_control(dialog_info->buttons[i]); + for (i = 0; i < dialog_info->radio_button_count; i++) takdialog_destroy_control(dialog_info->radio_buttons[i]); + for (i = 0; i < dialog_info->command_link_count; i++) takdialog_destroy_control(dialog_info->command_links[i]); + if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); if (dialog_info->font) DeleteObject(dialog_info->font); if (dialog_info->main_instruction_font) DeleteObject(dialog_info->main_instruction_font); @@ -1170,6 +1191,15 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR switch (msg) { + case TDM_NAVIGATE_PAGE: + dialog_info->taskconfig = (const TASKDIALOGCONFIG *)lParam; + taskdialog_destroy(dialog_info); + taskdialog_init(dialog_info, hwnd); + taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); + /* Default radio button click notification is sent before TDN_NAVIGATED */ + taskdialog_check_default_radio_buttons(dialog_info); + taskdialog_notify(dialog_info, TDN_NAVIGATED, 0, 0); + break; case TDM_CLICK_BUTTON: taskdialog_click_button(dialog_info, wParam); break; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8d60fb2eb8..9468573edd 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -271,6 +271,25 @@ static const struct message_info msg_return_verification_checked[] = { 0 } }; +static TASKDIALOGCONFIG navigated_info = {0}; + +static const struct message_info msg_send_navigate[] = +{ + { TDM_NAVIGATE_PAGE, 0, (LPARAM)&navigated_info, 0}, + { 0 } +}; + +static const struct message_info msg_return_navigated_page[] = +{ + { TDN_CREATED, 0, 0, S_OK, NULL }, + { TDN_RADIO_BUTTON_CLICKED, ID_START_RADIO_BUTTON, 0, S_OK, msg_send_navigate }, + { TDN_DIALOG_CONSTRUCTED, 0, 0, S_OK, NULL }, + { TDN_RADIO_BUTTON_CLICKED, ID_START_RADIO_BUTTON, 0, S_OK, NULL }, + { TDN_NAVIGATED, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -682,6 +701,44 @@ static void test_verification_box(void) "default verification box: default unchecked and then checked"); } +static void test_navigate_page(void) +{ + TASKDIALOGCONFIG info = {0}; + static const WCHAR textW[] = {'t', 'e', 'x', 't', 0}; + TASKDIALOG_BUTTON radio_buttons[TEST_NUM_RADIO_BUTTONS]; + const WCHAR button_format[] = {'%', '0', '2', 'd', 0}; + WCHAR radio_button_titles[TEST_NUM_BUTTONS * 3]; + int i; + + /* Init radio buttons */ + for (i = 0; i < TEST_NUM_RADIO_BUTTONS; i++) + { + WCHAR *text = &radio_button_titles[i * 3]; + wsprintfW(text, button_format, i); + + radio_buttons[i].pszButtonText = text; + radio_buttons[i].nButtonID = ID_START_RADIO_BUTTON + i; + } + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + info.dwCommonButtons = TDCBF_OK_BUTTON; + info.cRadioButtons = TEST_NUM_RADIO_BUTTONS; + info.pRadioButtons = radio_buttons; + + navigated_info = info; + navigated_info.pszVerificationText = textW; + navigated_info.dwFlags = TDF_VERIFICATION_FLAG_CHECKED; + + run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: default"); + + /* TDM_NAVIGATE_PAGE doesn't check cbSize. + * And null taskconfig pointer crash applicatioin, thus doesn't check pointer either */ + navigated_info.cbSize = 0; + run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: invalid taskconfig cbSize"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -722,6 +779,7 @@ START_TEST(taskdialog) test_timer(); test_progress_bar(); test_verification_box(); + test_navigate_page(); unload_v6_module(ctx_cookie, hCtx); } -- 2.18.0

2 1

[PATCH 1/8] comctl32/taskdialog: Update vertical layout only when expando button clicked.
by Zhiyi Zhang 20 Jul '18

20 Jul '18

Update vertical layout only to improve efficiency. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 60 +++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 457a5ff9d0..5ffa4dc6fd 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -232,11 +232,69 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } +static void taskdialog_move_controls_vertically(HWND parent, HWND *controls, INT count, INT offset) +{ + RECT rect; + POINT pt; + INT i; + + for (i = 0; i < count; i++) + { + if (!controls[i]) continue; + + GetWindowRect(controls[i], &rect); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(HWND_DESKTOP, parent, &pt, 1); + SetWindowPos(controls[i], 0, pt.x, pt.y + offset, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + } +} + static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_info) { + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + const WCHAR *text; + HWND after_expanded_info_hwnds[5] = {0}; + RECT info_rect, rect; + INT height, offset, i = 0; + dialog_info->expanded = !dialog_info->expanded; + text = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + SendMessageW(dialog_info->expando_button, WM_SETTEXT, 0, (LPARAM)text); ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); - taskdialog_layout(dialog_info); + + GetWindowRect(dialog_info->expanded_info, &info_rect); + /* If expanded information starts up not expanded, call taskdialog_layout() + * to to set size for expanded information control at least once */ + if (IsRectEmpty(&info_rect)) + { + taskdialog_layout(dialog_info); + return; + } + height = info_rect.bottom - info_rect.top + dialog_info->m.v_spacing; + offset = dialog_info->expanded ? height : -height; + + /* Update vertical layout, move all controls after expanded information */ + /* Move dialog */ + GetWindowRect(dialog_info->hwnd, &rect); + SetWindowPos(dialog_info->hwnd, 0, 0, 0, rect.right - rect.left, rect.bottom - rect.top + offset, + SWP_NOMOVE | SWP_NOZORDER); + /* Move controls */ + if (!(taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA)) + { + after_expanded_info_hwnds[i++] = dialog_info->progress_bar; + after_expanded_info_hwnds[i++] = dialog_info->expando_button; + after_expanded_info_hwnds[i++] = dialog_info->verification_box; + after_expanded_info_hwnds[i++] = dialog_info->footer_icon; + after_expanded_info_hwnds[i] = dialog_info->footer_text; + taskdialog_move_controls_vertically(dialog_info->hwnd, after_expanded_info_hwnds, + ARRAY_SIZE(after_expanded_info_hwnds), offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->buttons, dialog_info->button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->radio_buttons, + dialog_info->radio_button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->command_links, + dialog_info->command_link_count, offset); + } } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) -- 2.18.0

2 1

[PATCH 1/3] msvcp140: Implement _Temp_get (v2).
by Stefan Dösinger 20 Jul '18

20 Jul '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- This is a resend of the patch from months ago with a tautological check removed. I tried to test what happens if the temp path is longer than MAX_PATH characters, but I could not get Windows to accept a long temp path. If %TMP% is longer than 100 characters (or somewhere in that area, I did not test the precise limit) it falls back to %TEMP%, %USERPROFILE% and finally "C:\Windows". I assume msvcp does not clear the extra bytes like GetTempPathW either because it doesn't call GetTempPath and implements the logic itself or because it writes to a temp buffer and copies the data. --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 6 ++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e705e1eb84..57d02776c3 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3718,7 +3718,7 @@ @ stub _Strxfrm @ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get -@ stub _Temp_get +@ cdecl _Temp_get(ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 06ea11d55b..b1a5bfc9cf 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -178,6 +178,7 @@ static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); +static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); @@ -260,6 +261,7 @@ static BOOL init(void) SET(p_Remove_dir, "_Remove_dir"); SET(p_Stat, "_Stat"); SET(p_Symlink, "_Symlink"); + SET(p_Temp_get, "_Temp_get"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); SET(p_Unlink, "_Unlink"); @@ -1060,6 +1062,29 @@ static void test_Unlink(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +static void test_Temp_get(void) +{ + WCHAR path[MAX_PATH + 1], temp_path[MAX_PATH]; + WCHAR *retval; + DWORD len; + + GetTempPathW(sizeof(temp_path)/sizeof(*temp_path), temp_path); + + /* This crashes on Windows, the input pointer is not validated. */ + if (0) + { + retval = p_Temp_get(NULL); + ok(!retval, "_Temp_get(): Got %p\n", retval); + } + + memset(path, 0xaa, sizeof(path)); + retval = p_Temp_get(path); + ok(retval == path, "_Temp_get(): Got %p, expected %p\n", retval, path); + ok(!wcscmp(path, temp_path), "Expected path %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(path)); + len = wcslen(path); + todo_wine ok(path[len + 1] == 0xaaaa, "Too many bytes were zeroed - %x\n", path[len + 1]); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1078,5 +1103,6 @@ START_TEST(msvcp140) test_Stat(); test_dir_operation(); test_Unlink(); + test_Temp_get(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3f859979cb..ab9d7a44a4 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15745,6 +15745,12 @@ enum file_type __cdecl _Lstat(WCHAR const* path, int* permissions) return _Stat(path, permissions); } +WCHAR * __cdecl _Temp_get(WCHAR *dst) +{ + GetTempPathW(MAX_PATH, dst); + return dst; +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4) -- 2.16.4

3 6

[PATCH] msvcp140: Implement _Temp_get (v3).
by Stefan Dösinger 20 Jul '18

20 Jul '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- v3: Use ARRAY_SIZE. This is a resend of the patch from months ago with a tautological check removed. I tried to test what happens if the temp path is longer than MAX_PATH characters, but I could not get Windows to accept a long temp path. If %TMP% is longer than 100 characters (or somewhere in that area, I did not test the precise limit) it falls back to %TEMP%, %USERPROFILE% and finally "C:\Windows". I assume msvcp does not clear the extra bytes like GetTempPathW either because it doesn't call GetTempPath and implements the logic itself or because it writes to a temp buffer and copies the data. --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 6 ++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e705e1eb84..57d02776c3 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3718,7 +3718,7 @@ @ stub _Strxfrm @ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get -@ stub _Temp_get +@ cdecl _Temp_get(ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 06ea11d55b..fdec4298db 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -178,6 +178,7 @@ static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); +static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); @@ -260,6 +261,7 @@ static BOOL init(void) SET(p_Remove_dir, "_Remove_dir"); SET(p_Stat, "_Stat"); SET(p_Symlink, "_Symlink"); + SET(p_Temp_get, "_Temp_get"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); SET(p_Unlink, "_Unlink"); @@ -1060,6 +1062,29 @@ static void test_Unlink(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +static void test_Temp_get(void) +{ + WCHAR path[MAX_PATH + 1], temp_path[MAX_PATH]; + WCHAR *retval; + DWORD len; + + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + + /* This crashes on Windows, the input pointer is not validated. */ + if (0) + { + retval = p_Temp_get(NULL); + ok(!retval, "_Temp_get(): Got %p\n", retval); + } + + memset(path, 0xaa, sizeof(path)); + retval = p_Temp_get(path); + ok(retval == path, "_Temp_get(): Got %p, expected %p\n", retval, path); + ok(!wcscmp(path, temp_path), "Expected path %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(path)); + len = wcslen(path); + todo_wine ok(path[len + 1] == 0xaaaa, "Too many bytes were zeroed - %x\n", path[len + 1]); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1078,5 +1103,6 @@ START_TEST(msvcp140) test_Stat(); test_dir_operation(); test_Unlink(); + test_Temp_get(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fb9d6687ca..1e7c4813f9 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15734,6 +15734,12 @@ enum file_type __cdecl _Lstat(WCHAR const* path, int* permissions) return _Stat(path, permissions); } +WCHAR * __cdecl _Temp_get(WCHAR *dst) +{ + GetTempPathW(MAX_PATH, dst); + return dst; +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4) -- 2.16.4

2 1

[PATCH 2/2] bcrypt: Move the ASN1 buffer functions to gnutls.c.
by Hans Leidekker 20 Jul '18

20 Jul '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 12 ----- dlls/bcrypt/bcrypt_main.c | 97 --------------------------------------- dlls/bcrypt/gnutls.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 109 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 11c8b30416..a40f9d1a4b 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -105,18 +105,6 @@ VOID WINAPI A_SHAInit(SHA_CTX *ctx); VOID WINAPI A_SHAUpdate(SHA_CTX *ctx, const UCHAR *buffer, UINT size); VOID WINAPI A_SHAFinal(SHA_CTX *ctx, PULONG result); -struct buffer -{ - BYTE *buffer; - DWORD length; - DWORD pos; - BOOL error; -}; - -void buffer_init( struct buffer * ) DECLSPEC_HIDDEN; -void buffer_free( struct buffer * ) DECLSPEC_HIDDEN; -void buffer_append_asn1_r_s( struct buffer *, BYTE *, DWORD, BYTE *, DWORD ) DECLSPEC_HIDDEN; - #define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') #define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') #define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 4edfbdd663..2b9ae0b766 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -718,103 +718,6 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) -void buffer_init( struct buffer *buffer ) -{ - buffer->buffer = NULL; - buffer->length = 0; - buffer->pos = 0; - buffer->error = FALSE; -} - -void buffer_free( struct buffer *buffer ) -{ - heap_free( buffer->buffer ); -} - -static void buffer_append( struct buffer *buffer, BYTE *data, DWORD len ) -{ - if (!len) return; - - if (buffer->pos + len > buffer->length) - { - DWORD new_length = max( max( buffer->pos + len, buffer->length * 2 ), 64 ); - BYTE *new_buffer; - - if (!(new_buffer = heap_realloc( buffer->buffer, new_length ))) - { - ERR( "out of memory\n" ); - buffer->error = TRUE; - return; - } - - buffer->buffer = new_buffer; - buffer->length = new_length; - } - - memcpy( &buffer->buffer[buffer->pos], data, len ); - buffer->pos += len; -} - -static void buffer_append_byte( struct buffer *buffer, BYTE value ) -{ - buffer_append( buffer, &value, sizeof(value) ); -} - -static void buffer_append_asn1_length( struct buffer *buffer, DWORD length ) -{ - DWORD num_bytes; - - if (length < 128) - { - buffer_append_byte( buffer, length ); - return; - } - - if (length <= 0xff) num_bytes = 1; - else if (length <= 0xffff) num_bytes = 2; - else if (length <= 0xffffff) num_bytes = 3; - else num_bytes = 4; - - buffer_append_byte( buffer, 0x80 | num_bytes ); - while (num_bytes--) buffer_append_byte( buffer, length >> (num_bytes * 8) ); -} - -static void buffer_append_asn1_integer( struct buffer *buffer, BYTE *data, DWORD len ) -{ - DWORD leading_zero = (*data & 0x80) != 0; - - buffer_append_byte( buffer, 0x02 ); /* tag */ - buffer_append_asn1_length( buffer, len + leading_zero ); - if (leading_zero) buffer_append_byte( buffer, 0 ); - buffer_append( buffer, data, len ); -} - -static void buffer_append_asn1_sequence( struct buffer *buffer, struct buffer *content ) -{ - if (content->error) - { - buffer->error = TRUE; - return; - } - - buffer_append_byte( buffer, 0x30 ); /* tag */ - buffer_append_asn1_length( buffer, content->pos ); - buffer_append( buffer, content->buffer, content->pos ); -} - -void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *s, DWORD s_len ) -{ - struct buffer value; - - buffer_init( &value ); - buffer_append_asn1_integer( &value, r, r_len ); - buffer_append_asn1_integer( &value, s, s_len ); - buffer_append_asn1_sequence( buffer, &value ); - buffer_free( &value ); -} -#endif - #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 BOOL key_is_symmetric( struct key *key ) { diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index f5bc0e5896..69276be925 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -215,6 +215,109 @@ void gnutls_uninitialize(void) libgnutls_handle = NULL; } +struct buffer +{ + BYTE *buffer; + DWORD length; + DWORD pos; + BOOL error; +}; + +static void buffer_init( struct buffer *buffer ) +{ + buffer->buffer = NULL; + buffer->length = 0; + buffer->pos = 0; + buffer->error = FALSE; +} + +static void buffer_free( struct buffer *buffer ) +{ + heap_free( buffer->buffer ); +} + +static void buffer_append( struct buffer *buffer, BYTE *data, DWORD len ) +{ + if (!len) return; + + if (buffer->pos + len > buffer->length) + { + DWORD new_length = max( max( buffer->pos + len, buffer->length * 2 ), 64 ); + BYTE *new_buffer; + + if (!(new_buffer = heap_realloc( buffer->buffer, new_length ))) + { + ERR( "out of memory\n" ); + buffer->error = TRUE; + return; + } + + buffer->buffer = new_buffer; + buffer->length = new_length; + } + + memcpy( &buffer->buffer[buffer->pos], data, len ); + buffer->pos += len; +} + +static void buffer_append_byte( struct buffer *buffer, BYTE value ) +{ + buffer_append( buffer, &value, sizeof(value) ); +} + +static void buffer_append_asn1_length( struct buffer *buffer, DWORD length ) +{ + DWORD num_bytes; + + if (length < 128) + { + buffer_append_byte( buffer, length ); + return; + } + + if (length <= 0xff) num_bytes = 1; + else if (length <= 0xffff) num_bytes = 2; + else if (length <= 0xffffff) num_bytes = 3; + else num_bytes = 4; + + buffer_append_byte( buffer, 0x80 | num_bytes ); + while (num_bytes--) buffer_append_byte( buffer, length >> (num_bytes * 8) ); +} + +static void buffer_append_asn1_integer( struct buffer *buffer, BYTE *data, DWORD len ) +{ + DWORD leading_zero = (*data & 0x80) != 0; + + buffer_append_byte( buffer, 0x02 ); /* tag */ + buffer_append_asn1_length( buffer, len + leading_zero ); + if (leading_zero) buffer_append_byte( buffer, 0 ); + buffer_append( buffer, data, len ); +} + +static void buffer_append_asn1_sequence( struct buffer *buffer, struct buffer *content ) +{ + if (content->error) + { + buffer->error = TRUE; + return; + } + + buffer_append_byte( buffer, 0x30 ); /* tag */ + buffer_append_asn1_length( buffer, content->pos ); + buffer_append( buffer, content->buffer, content->pos ); +} + +static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *s, DWORD s_len ) +{ + struct buffer value; + + buffer_init( &value ); + buffer_append_asn1_integer( &value, r, r_len ); + buffer_append_asn1_integer( &value, s, s_len ); + buffer_append_asn1_sequence( buffer, &value ); + buffer_free( &value ); +} + NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) -- 2.11.0

1 0

[PATCH 1/2] bcrypt: Default to building with GnuTLS support on macOS, if present.
by Hans Leidekker 20 Jul '18

20 Jul '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 5 ++--- dlls/bcrypt/gnutls.c | 2 +- dlls/bcrypt/macos.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 851767de5e..4edfbdd663 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -815,7 +815,6 @@ void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE * } #endif - #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 BOOL key_is_symmetric( struct key *key ) { @@ -1421,14 +1420,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst ); -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT gnutls_initialize(); #endif break; case DLL_PROCESS_DETACH: if (reserved) break; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT gnutls_uninitialize(); #endif break; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index f191d2c8dd..f5bc0e5896 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -42,7 +42,7 @@ #include "wine/library.h" #include "wine/unicode.h" -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); WINE_DECLARE_DEBUG_CHANNEL(winediag); diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 94d5dbd0d3..a6eaee8b1d 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -41,7 +41,7 @@ #include "wine/library.h" #include "wine/unicode.h" -#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 && !defined(HAVE_GNUTLS_CIPHER_INIT) WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -- 2.11.0

1 0

[PATCH] winegcc: Allow specifying 32-bit libdir via configure script.
by Jacek Caban 20 Jul '18

20 Jul '18

64-bit Wine build has no informations about 32-bit configuration. We have some heuristics in winegcc to find 32-bit libraries, but it may not be enough. 32-bit libraries can be in an arbitrary place in 32-bit build if it's using --libdir. This patch makes it possible to instruct 64-bit build where to find 32-bit libraries, so that winegcc -m32 can work correctly in such config. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Makefile.in | 1 + configure.ac | 11 +++++++++++ tools/winegcc/Makefile.in | 1 + tools/winegcc/winegcc.c | 6 +++++- 4 files changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH] wine/vulkan.h: Properly declare enum values that use value attribute in spec.
by Jacek Caban 20 Jul '18

20 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 12 +++++++----- include/wine/vulkan.h | 5 ++--- 2 files changed, 9 insertions(+), 8 deletions(-)

2 1

[PATCH] vbscript: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Jul '18

20 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 2 +- dlls/vbscript/vbdisp.c | 4 ++-- dlls/vbscript/vbscript_main.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a5df54acad..87adeca9bc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -334,7 +334,7 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR o return E_OUTOFMEMORY; memcpy(title_buf, vbscriptW, sizeof(vbscriptW)); - ptr = title_buf + sizeof(vbscriptW)/sizeof(WCHAR)-1; + ptr = title_buf + ARRAY_SIZE(vbscriptW)-1; *ptr++ = ':'; *ptr++ = ' '; @@ -2446,7 +2446,7 @@ HRESULT init_global(script_ctx_t *ctx) HRESULT hres; ctx->global_desc.ctx = ctx; - ctx->global_desc.builtin_prop_cnt = sizeof(global_props)/sizeof(*global_props); + ctx->global_desc.builtin_prop_cnt = ARRAY_SIZE(global_props); ctx->global_desc.builtin_props = global_props; hres = get_typeinfo(GlobalObj_tid, &ctx->global_desc.typeinfo); @@ -2462,7 +2462,7 @@ HRESULT init_global(script_ctx_t *ctx) return hres; ctx->err_desc.ctx = ctx; - ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); + ctx->err_desc.builtin_prop_cnt = ARRAY_SIZE(err_props); ctx->err_desc.builtin_props = err_props; hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index b0fac48cad..571854db58 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -179,7 +179,7 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) static int check_keywords(parser_ctx_t *ctx) { - int min = 0, max = sizeof(keywords)/sizeof(keywords[0])-1, r, i; + int min = 0, max = ARRAY_SIZE(keywords)-1, r, i; while(min <= max) { i = (min+max)/2; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 9c0c4c1d9a..e72eadf13d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -236,7 +236,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_FAIL; } - assert(argn < sizeof(args)/sizeof(*args)); + assert(argn < ARRAY_SIZE(args)); for(i=0; i < argn; i++) { if(V_VT(dp->rgvarg+dp->cArgs-i-1) == (VT_BYREF|VT_VARIANT)) @@ -647,7 +647,7 @@ HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **re return E_OUTOFMEMORY; desc->ctx = ctx; - desc->builtin_prop_cnt = sizeof(procedure_props)/sizeof(*procedure_props); + desc->builtin_prop_cnt = ARRAY_SIZE(procedure_props); desc->builtin_props = procedure_props; desc->value_func = &code->main_code; diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 7b7161c21e..786b7fb898 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -87,7 +87,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) { + for(i = 0; i < ARRAY_SIZE(typeinfos); i++) { if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); } -- 2.14.4

2 1

[PATCH] kernel32: Don't clear WINEDEBUG in the debugger process.
by Zebediah Figura 20 Jul '18

20 Jul '18

While this does avoid usually undesired debug output, it also makes debugging winedbg.exe itself practically impossible. --- dlls/kernel32/except.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bff8ce2..03fb46d 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -173,7 +173,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - char *cmdline, *env, *p; + char *cmdline; HANDLE hDbgConf; DWORD bAuto = TRUE; PROCESS_INFORMATION info; @@ -287,27 +287,12 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) } } - /* make WINEDEBUG empty in the environment */ - env = GetEnvironmentStringsA(); - for (p = env; *p; p += strlen(p) + 1) - { - if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) - { - char *next = p + strlen(p); - char *end = next + 1; - while (*end) end += strlen(end) + 1; - memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); - break; - } - } - TRACE("Starting debugger %s\n", debugstr_a(cmdline)); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info); - FreeEnvironmentStringsA( env ); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info); if (ret) { -- 2.7.4

1 0

[PATCH] user32: Create a mask from alpha channel when loading a 32 bpp icon. (v2)
by Dmitry Timoshkov 20 Jul '18

20 Jul '18

This patch fixes an application that draws 32 bpp icons manually. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/cursoricon.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73bf56..62576a341a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1296,6 +1296,36 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } + else + { + if (bmi_has_alpha( bmi, color_bits )) + { + unsigned char *alpha_mask_bits = HeapAlloc( GetProcessHeap(), 0, bmi_width * bmi_height * 4 ); + if (alpha_mask_bits) + { + const unsigned char *src; + unsigned char *dst; + LONG i; + + for (i = 0, src = color_bits, dst = alpha_mask_bits; i < bmi_width * bmi_height; i++, src += 4, dst += 4) + { + if (src[3] == 0xff) + dst[0] = dst[1] = dst[2] = 0; + else + dst[0] = dst[1] = dst[2] = 0xff; + + dst[3] = 0; + } + + SelectObject( hdc, mask ); + StretchDIBits( hdc, 0, 0, width, height, + 0, 0, bmi_width, bmi_height, + alpha_mask_bits, bmi, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, alpha_mask_bits ); + } + } + } ret = TRUE; done: -- 2.17.1

1 0

[PATCH] user32: Create a mask from alpha channel when loading a 32 bpp icon.
by Dmitry Timoshkov 20 Jul '18

20 Jul '18

This patch fixes an application that draws user32 icons manually: hicon = LoadImage(NULL, "oic_ques.ico", IMAGE_ICON, 256, 256, LR_LOADFROMFILE); GetIconInfo(hicon, &info); GetObject(info.hbmMask, sizeof(bm), &bm); hMemDC = CreateCompatibleDC(hdc); SelectObject(hMemDC, info.hbmColor); StretchBlt(hdc, 200, 0, 200, 200, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, info.hbmMask); StretchBlt(hdc, 400, 0, 200, 200, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCAND); SelectObject(hMemDC, info.hbmColor); StretchBlt(hdc, 400, 0, 200, 200, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCINVERT); For testing purposes I edited dlls/user32/resources/oic_ques.ico and removed everything except the 256x256 32 bpp PNG image. Then I created a test app that draws separately mask and color bitmaps from the icon info and then draws an icon using the code above. With this patch under Wine the mask and the final icon visually look similar to what I see under Windows. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/cursoricon.c | 97 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73bf56..c561c70364 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1131,6 +1131,93 @@ done: return alpha; } +static HBITMAP create_alpha_mask( HBITMAP color ) +{ + HBITMAP alpha; + char info_buf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)info_buf; + BITMAP bm; + HDC hdc; + void *bits; + unsigned char *ptr; + int i; + + if (!GetObjectW( color, sizeof(bm), &bm )) return 0; + if (bm.bmBitsPixel != 32) return 0; + + if (!(hdc = CreateCompatibleDC( 0 ))) return 0; + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = bm.bmWidth; + info->bmiHeader.biHeight = -bm.bmHeight; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(alpha = CreateDIBSection( hdc, info, DIB_RGB_COLORS, &bits, NULL, 0 ))) goto done; + + GetDIBits( hdc, color, 0, bm.bmHeight, bits, info, DIB_RGB_COLORS ); + if (!bmi_has_alpha( info, bits )) + { + DeleteObject( alpha ); + alpha = 0; + goto done; + } + + for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + { + if (ptr[3] == 0xff) + ptr[0] = ptr[1] = ptr[2] = 0; + else + ptr[0] = ptr[1] = ptr[2] = 0xff; + + ptr[3] = 0; + } + +done: + DeleteDC( hdc ); + return alpha; +} + +static HBITMAP create_mask_from_alpha( HBITMAP color ) +{ + BITMAP bm; + HBITMAP alpha, mask; + HDC hdc_dst, hdc_src; + + alpha = create_alpha_mask( color ); + if (!alpha) return 0; + + GetObjectW( alpha, sizeof(bm), &bm ); + + mask = CreateBitmap( bm.bmWidth, bm.bmHeight, 1, 1, NULL ); + if (!mask) return 0; + + hdc_src = CreateCompatibleDC( 0 ); + hdc_dst = CreateCompatibleDC( 0 ); + if (hdc_src && hdc_dst) + { + SelectObject( hdc_src, alpha ); + SelectObject( hdc_dst, mask ); + BitBlt( hdc_dst, 0, 0, bm.bmWidth, bm.bmHeight, hdc_src, 0, 0, SRCCOPY ); + } + else + { + DeleteObject( mask ); + mask = 0; + } + + DeleteDC( hdc_src ); + DeleteDC( hdc_dst ); + DeleteObject( alpha ); + + return mask; +} + /*********************************************************************** * create_icon_from_bmi @@ -1296,6 +1383,16 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } + else + { + HBITMAP alpha_mask = create_mask_from_alpha( color ); + + if (alpha_mask) + { + DeleteObject( mask ); + mask = alpha_mask; + } + } ret = TRUE; done: -- 2.17.1

2 1

[PATCH 1/2] testbot/WineSendLog: Replace completed with a more explicit status.
by Francois Gouget 20 Jul '18

20 Jul '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 8885e20f3..537778a20 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -258,17 +258,18 @@ MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline -VM Status Number of test failures +VM Status Number of test failures EOF foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); + my $TestFailures = $StepTask->TestFailures; - if (! defined($TestFailures)) - { - $TestFailures = ""; - } - printf $Sendmail "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status, + $TestFailures = "" if (!defined $TestFailures); + my $Status = $StepTask->Status; + $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed"); + + printf $Sendmail "%-20s %-8s %s\n", $StepTask->VM->Name, $Status, $TestFailures; } -- 2.18.0

1 1

[PATCH] testbot/WineSendLog: Sort the tasks in numeric order.
by Francois Gouget 20 Jul '18

20 Jul '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index e2c823a91..8885e20f3 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -214,7 +214,7 @@ sub SendLog($) } my $StepsTasks = CreateStepsTasks(undef, $Job); - my @SortedKeys = sort @{$StepsTasks->GetKeys()}; + my @SortedKeys = sort { $a <=> $b } @{$StepsTasks->GetKeys()}; my $JobURL = ($UseSSL ? "https://" : "http://") . "$WebHostName/JobDetails.pl?Key=". $Job->GetKey(); -- 2.18.0

1 0

[PATCH] po: Update Russian translation.
by Nikolay Sivov 20 Jul '18

20 Jul '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5f9e85c44b..ad07594730 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-12 16:25+0300\n" +"PO-Revision-Date: 2018-07-20 09:26+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.8\n" +"X-Generator: Poedit 2.0.9\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -406,16 +406,12 @@ msgid "&Retry" msgstr "По&втор" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Скрыть &вкладки" +msgstr "Скрыть подробности" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Подробности" +msgstr "Показать подробности" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 -- 2.18.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 20 Jul '18

20 Jul '18

1 0

[PATCH] kerberos: SpInstanceInit() doesn't need a special implementation.
by Dmitry Timoshkov 20 Jul '18

20 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 7d532e5e58..70895c999a 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1331,7 +1331,7 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) { - FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + TRACE("%#x,%p,%p\n", version, dll_function_table, user_functions); return STATUS_SUCCESS; } -- 2.17.1

1 0

[PATCH 8/8] comctl32/taskdialog: Fix center positioning.
by Zhiyi Zhang 20 Jul '18

20 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4f478d3eec..97ad825a0d 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -2,6 +2,7 @@ * Task dialog control * * Copyright 2017 Fabian Maurer + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1104,8 +1105,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) if (first_time) { - x = (ref_rect.left + ref_rect.right + dialog_width) / 2; - y = (ref_rect.top + ref_rect.bottom + dialog_height) / 2; + x = (ref_rect.left + ref_rect.right - dialog_width) / 2; + y = (ref_rect.top + ref_rect.bottom - dialog_height) / 2; SetWindowPos(dialog_info->hwnd, 0, x, y, dialog_width, dialog_height, SWP_NOZORDER); first_time = FALSE; } -- 2.18.0

1 0

[PATCH 7/8] comctl32/taskdialog: Add vertical spacing for radio buttons.
by Zhiyi Zhang 20 Jul '18

20 Jul '18

Add vertical spacing to make dialog look nicer. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index e3de3eef05..4f478d3eec 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -942,7 +942,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) for (i = 0; i < dialog_info->radio_button_count; i++) { x = main_icon_right + h_spacing; - y = dialog_height; + y = dialog_height + v_spacing; taskdialog_get_radio_button_size(dialog_info, dialog_info->radio_buttons[i], dialog_width - x - h_spacing, &size); size.cx = dialog_width - x - h_spacing; SetWindowPos(dialog_info->radio_buttons[i], 0, x, y, size.cx, size.cy, SWP_NOZORDER); -- 2.18.0

1 0

[PATCH 6/8] comctl32/taskdialog: Add support for TDM_UPDATE_ICON.
by Zhiyi Zhang 20 Jul '18

20 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4016e9e2e8..e3de3eef05 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -1322,6 +1322,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE: taskdialog_button_set_shield(dialog_info, wParam, lParam); break; + case TDM_UPDATE_ICON: + taskdialog_set_icon(dialog_info, wParam, (HICON)lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; -- 2.18.0

1 0

[PATCH 5/8] comctl32/taskdialog: Add support for TDF_SIZE_TO_CONTENT.
by Zhiyi Zhang 20 Jul '18

20 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index b35cfd0f07..4016e9e2e8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -831,6 +831,36 @@ static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info) dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); } +static LONG taskdialog_get_dialog_width(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + BOOL syslink = taskdialog_hyperlink_enabled(dialog_info); + LONG max_width, main_icon_width, screen_width; + RECT rect; + SIZE size; + + screen_width = taskdialog_get_reference_rect(taskconfig, &rect); + if ((taskconfig->dwFlags & TDF_SIZE_TO_CONTENT) && !taskconfig->cxWidth) + { + max_width = DIALOG_MIN_WIDTH; + taskdialog_du_to_px(dialog_info, &max_width, NULL); + main_icon_width = dialog_info->m.h_spacing; + if (dialog_info->main_icon) main_icon_width += GetSystemMetrics(SM_CXICON); + if (dialog_info->content) + { + taskdialog_get_label_size(dialog_info, dialog_info->content, 0, &size, syslink); + max_width = max(max_width, size.cx + main_icon_width + dialog_info->m.h_spacing * 2); + } + } + else + { + max_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); + taskdialog_du_to_px(dialog_info, &max_width, NULL); + } + max_width = min(max_width, screen_width); + return max_width; +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -853,7 +883,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) BOOL syslink = taskdialog_hyperlink_enabled(dialog_info); static BOOL first_time = TRUE; RECT ref_rect; - LONG screen_width, dialog_width, dialog_height = 0; + LONG dialog_width, dialog_height = 0; LONG h_spacing, v_spacing; LONG main_icon_right, main_icon_bottom; LONG expando_right, expando_bottom; @@ -865,10 +895,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) SIZE size; INT i; - screen_width = taskdialog_get_reference_rect(dialog_info->taskconfig, &ref_rect); - dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); - taskdialog_du_to_px(dialog_info, &dialog_width, 0); - dialog_width = min(dialog_width, screen_width); + taskdialog_get_reference_rect(dialog_info->taskconfig, &ref_rect); + dialog_width = taskdialog_get_dialog_width(dialog_info); h_spacing = dialog_info->m.h_spacing; v_spacing = dialog_info->m.v_spacing; -- 2.18.0

1 0

[PATCH 4/8] comctl32/taskdialog: Add support for TDM_{SET,UPDATE}_ELEMENT_TEXT.
by Zhiyi Zhang 20 Jul '18

20 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 74b379b358..b35cfd0f07 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -545,6 +545,28 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element SendMessageW(dialog_info->footer_icon, STM_SETICON, (WPARAM)hicon, 0); } +static void taskdialog_set_element_text(struct taskdialog_info *dialog_info, TASKDIALOG_ELEMENTS element, + const WCHAR *text) +{ + HWND hwnd = NULL; + WCHAR *textW; + + if (element == TDE_CONTENT) + hwnd = dialog_info->content; + else if (element == TDE_EXPANDED_INFORMATION) + hwnd = dialog_info->expanded_info; + else if (element == TDE_FOOTER) + hwnd = dialog_info->footer_text; + else if (element == TDE_MAIN_INSTRUCTION) + hwnd = dialog_info->main_instruction; + + if (!hwnd) return; + + textW = taskdialog_gettext(dialog_info, TRUE, text); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW); + Free(textW); +} + static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialog_info) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; @@ -1243,6 +1265,13 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_SET_PROGRESS_BAR_MARQUEE: SendMessageW(dialog_info->progress_bar, PBM_SETMARQUEE, wParam, lParam); break; + case TDM_SET_ELEMENT_TEXT: + taskdialog_set_element_text(dialog_info, wParam, (const WCHAR *)lParam); + taskdialog_layout(dialog_info); + break; + case TDM_UPDATE_ELEMENT_TEXT: + taskdialog_set_element_text(dialog_info, wParam, (const WCHAR *)lParam); + break; case TDM_CLICK_RADIO_BUTTON: taskdialog_click_radio_button(dialog_info, wParam); break; -- 2.18.0

1 0

[PATCH 3/8] comctl32/taskdialog: Add support for TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE.
by Zhiyi Zhang 20 Jul '18

20 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 0f947a8098..74b379b358 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -212,6 +212,13 @@ static void taskdialog_click_button(struct taskdialog_info *dialog_info, INT id) if (hwnd) taskdialog_on_button_click(dialog_info, hwnd); } +static void taskdialog_button_set_shield(const struct taskdialog_info *dialog_info, INT id, BOOL elevate) +{ + HWND hwnd = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, id); + if (!hwnd) hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); + if (hwnd) SendMessageW(hwnd, BCM_SETSHIELD, 0, elevate); +} + static void taskdialog_enable_radio_button(const struct taskdialog_info *dialog_info, INT id, BOOL enable) { HWND hwnd = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, id); @@ -1255,6 +1262,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } break; } + case TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE: + taskdialog_button_set_shield(dialog_info, wParam, lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; -- 2.18.0

1 0

Re: [PATCH] wininet: Fix an MSVC warning about status_string.
by Serge Gautherie 19 Jul '18

19 Jul '18

On 18/07/2018 21:58, Marvin wrote: > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Rejected". > You should have received a mail explaining why it was rejected. Not really. > are simply not sure how to proceed next Then, what is the plan wrt this warning(s)? --

2 1

[PATCH] shell32: Don't use Carbon on Mac OS to find the Trash.
by Chip Davis 19 Jul '18

19 Jul '18

Due to a weird interaction between Wine and (what I believe to be) os_log/os_signpost, we can't use FSPathMakeRef() (nor any other function that calls that) from a Wine process. We also can't use the NSSearchPathForDirectoriesInDomains() function. Setting aside the fact that it's Objective-C (something we can work around, given that NS and CF types are toll-free bridged), a) support for getting the Trash folder was only added in 10.8 (when FSFindFolder() was deprecated), and b) it doesn't even support volume-specific Trash folders. For now, just hardcode the paths to the Trash folder. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Resending from my work email... --- dlls/shell32/trash.c | 130 ++++++++++++++++++++++++++++--------------- 1 file changed, 86 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 7bc035fd5387..858304e08a2e 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -22,24 +22,18 @@ #include "config.h" -#ifdef HAVE_CORESERVICES_CORESERVICES_H -#define GetCurrentThread MacGetCurrentThread -#define LoadResource MacLoadResource -#include <CoreServices/CoreServices.h> -#undef GetCurrentThread -#undef LoadResource -#undef DPRINTF -#endif - #include <stdarg.h> #include <stdio.h> #include <fcntl.h> #include <errno.h> #include <time.h> +#include <sys/types.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#include <sys/types.h> +#ifdef HAVE_SYS_MOUNT_H +# include <sys/mount.h> +#endif #include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -47,6 +41,9 @@ #ifdef HAVE_DIRENT_H # include <dirent.h> #endif +#ifdef HAVE_PWD_H +# include <pwd.h> +#endif #include "windef.h" #include "winbase.h" @@ -109,44 +106,98 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) return S_OK; } -#ifdef HAVE_CORESERVICES_CORESERVICES_H +#ifdef __APPLE__ + +static char *TRASH_GetTrashPath(const char *unix_path, const char **base_name) +{ + struct statfs stfs, home_stfs; + struct passwd *user = getpwuid(geteuid()); + char *trash_path; + size_t name_size; + + if (statfs(unix_path, &stfs) == -1) + return NULL; + if (statfs(user->pw_dir, &home_stfs) == -1) + return NULL; + + *base_name = strrchr(unix_path, '/'); + if (!*base_name) + *base_name = unix_path; + else + ++*base_name; + name_size = lstrlenA(*base_name); + + /* If the file exists on the same volume as the user's home directory, + * we can use the User domain Trash folder. Otherwise, we have to use + * <volume>/.Trashes/<uid>. + */ + if (memcmp(&stfs.f_fsid, &home_stfs.f_fsid, sizeof(fsid_t)) == 0) + { + size_t home_size = lstrlenA(user->pw_dir); + trash_path = heap_alloc(home_size + sizeof("/.Trash/") + name_size); + if (!trash_path) + return NULL; + memcpy(trash_path, user->pw_dir, home_size); + memcpy(trash_path+home_size, "/.Trash", sizeof("/.Trash")); + } + else + { + size_t vol_size = lstrlenA(stfs.f_mntonname); + /* 10 for the maximum length of a 32-bit integer + 1 for the \0 */ + size_t trash_size = vol_size + sizeof("/.Trashes/") + 10 + 1 + name_size + 1; + trash_path = heap_alloc(trash_size); + if (!trash_path) + return NULL; + snprintf(trash_path, trash_size, "%s/.Trashes/%u", stfs.f_mntonname, geteuid()); + } + return trash_path; +} BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { - char *unix_path; - OSStatus status; - FSRef ref; - FSCatalogInfo catalogInfo; + char *unix_path, *trash_path; + const char *base_name; + BOOL can_trash; + struct stat st; TRACE("(%s)\n", debugstr_w(wszPath)); + if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; - - status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); + if (!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + { + heap_free(unix_path); + return FALSE; + } + can_trash = stat(trash_path, &st) == 0; heap_free(unix_path); - if (status == noErr) - status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalogInfo, NULL, - NULL, NULL); - if (status == noErr) - status = FSFindFolder(catalogInfo.volume, kTrashFolderType, - kCreateFolder, &ref); - - return (status == noErr); + heap_free(trash_path); + return can_trash; } BOOL TRASH_TrashFile(LPCWSTR wszPath) { - char *unix_path; - OSStatus status; + char *unix_path, *trash_path; + const char *base_name; + int res; TRACE("(%s)\n", debugstr_w(wszPath)); if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; + if (!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + { + heap_free(unix_path); + return FALSE; + } - status = FSPathMoveObjectToTrashSync(unix_path, NULL, kFSFileOperationSkipPreflight); + lstrcatA(trash_path, "/"); + lstrcatA(trash_path, base_name); + + res = rename(unix_path, trash_path); heap_free(unix_path); - return (status == noErr); + heap_free(trash_path); + return (res != -1); } /* TODO: @@ -186,10 +237,8 @@ HRESULT TRASH_GetDetails(const char *trash_path, const char *name, WIN32_FIND_DA HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { WCHAR volume_path[MAX_PATH]; - char *unix_path, trash_path[MAX_PATH]; - FSCatalogInfo catalog_info; - OSStatus status; - FSRef ref; + char *unix_path, *trash_path; + const char *base_name; struct dirent *entry; DIR *dir; LPITEMIDLIST *ret; @@ -211,15 +260,8 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) if(!(unix_path = wine_get_unix_file_name(volume_path))) return E_OUTOFMEMORY; - status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); - heap_free(unix_path); - if(status != noErr) return E_FAIL; - status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalog_info, NULL, NULL, NULL); - if(status != noErr) return E_FAIL; - status = FSFindFolder(catalog_info.volume, kTrashFolderType, kCreateFolder, &ref); - if(status != noErr) return E_FAIL; - status = FSRefMakePath(&ref, (UInt8*)trash_path, MAX_PATH); - if(status != noErr) return E_FAIL; + if(!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + return E_OUTOFMEMORY; if(!(dir = opendir(trash_path))) return E_FAIL; ret = heap_alloc(ret_size * sizeof(*ret)); @@ -282,7 +324,7 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) return E_NOTIMPL; } -#else /* HAVE_CORESERVICES_CORESERVICES_H */ +#else /* __APPLE__ */ static CRITICAL_SECTION TRASH_Creating; static CRITICAL_SECTION_DEBUG TRASH_Creating_Debug = @@ -790,4 +832,4 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) return S_OK; } -#endif /* HAVE_CORESERVICES_CORESERVICES_H */ +#endif /* __APPLE__ */ -- 2.18.0

2 3

[PATCH] shell32: Don't use Carbon on Mac OS to find the Trash.
by Chip Davis 19 Jul '18

19 Jul '18

Due to a weird interaction between Wine and (what I believe to be) os_log/os_signpost, we can't use FSPathMakeRef() (nor any other function that calls that) from a Wine process. We also can't use the NSSearchPathForDirectoriesInDomains() function. Setting aside the fact that it's Objective-C (something we can work around, given that NS and CF types are toll-free bridged), a) support for getting the Trash folder was only added in 10.8 (when FSFindFolder() was deprecated), and b) it doesn't even support volume-specific Trash folders. For now, just hardcode the paths to the Trash folder. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: Try 2: Create the trash folder if it doesn't exist. dlls/shell32/trash.c | 148 ++++++++++++++++++++++++++++++------------- 1 file changed, 104 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 7bc035fd5387..fc75c17dd28d 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -22,24 +22,18 @@ #include "config.h" -#ifdef HAVE_CORESERVICES_CORESERVICES_H -#define GetCurrentThread MacGetCurrentThread -#define LoadResource MacLoadResource -#include <CoreServices/CoreServices.h> -#undef GetCurrentThread -#undef LoadResource -#undef DPRINTF -#endif - #include <stdarg.h> #include <stdio.h> #include <fcntl.h> #include <errno.h> #include <time.h> +#include <sys/types.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#include <sys/types.h> +#ifdef HAVE_SYS_MOUNT_H +# include <sys/mount.h> +#endif #include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -47,6 +41,9 @@ #ifdef HAVE_DIRENT_H # include <dirent.h> #endif +#ifdef HAVE_PWD_H +# include <pwd.h> +#endif #include "windef.h" #include "winbase.h" @@ -109,44 +106,116 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) return S_OK; } -#ifdef HAVE_CORESERVICES_CORESERVICES_H +#ifdef __APPLE__ + +static char *TRASH_GetTrashPath(const char *unix_path, const char **base_name) +{ + struct statfs stfs, home_stfs; + struct passwd *user = getpwuid(geteuid()); + char *trash_path; + size_t name_size; + + if (statfs(unix_path, &stfs) == -1) + return NULL; + if (statfs(user->pw_dir, &home_stfs) == -1) + return NULL; + + *base_name = strrchr(unix_path, '/'); + if (!*base_name) + *base_name = unix_path; + else + ++*base_name; + name_size = lstrlenA(*base_name); + + /* If the file exists on the same volume as the user's home directory, + * we can use the User domain Trash folder. Otherwise, we have to use + * <volume>/.Trashes/<uid>. + */ + if (memcmp(&stfs.f_fsid, &home_stfs.f_fsid, sizeof(fsid_t)) == 0) + { + size_t home_size = lstrlenA(user->pw_dir); + trash_path = heap_alloc(home_size + sizeof("/.Trash/") + name_size); + if (!trash_path) + return NULL; + memcpy(trash_path, user->pw_dir, home_size); + memcpy(trash_path+home_size, "/.Trash", sizeof("/.Trash")); + } + else + { + size_t vol_size = lstrlenA(stfs.f_mntonname); + /* 10 for the maximum length of a 32-bit integer + 1 for the \0 */ + size_t trash_size = vol_size + sizeof("/.Trashes/") + 10 + 1 + name_size + 1; + trash_path = heap_alloc(trash_size); + if (!trash_path) + return NULL; + snprintf(trash_path, trash_size, "%s/.Trashes/%u", stfs.f_mntonname, geteuid()); + } + return trash_path; +} BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { - char *unix_path; - OSStatus status; - FSRef ref; - FSCatalogInfo catalogInfo; + char *unix_path, *trash_path; + const char *base_name; + BOOL can_trash; + struct stat st; TRACE("(%s)\n", debugstr_w(wszPath)); + if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; - - status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); + if (!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + { + heap_free(unix_path); + return FALSE; + } + can_trash = stat(trash_path, &st) == 0; + if (!can_trash && errno == ENOENT) + { + /* Recursively create the Trash folder. */ + char *p = trash_path; + if (*p == '/') ++p; + while ((p = strchr(p, '/')) != NULL) + { + *p = '\0'; + if (mkdir(trash_path, 0755) == -1 && errno != EEXIST) + { + heap_free(unix_path); + heap_free(trash_path); + return FALSE; + } + *p++ = '/'; + } + can_trash = TRUE; + } heap_free(unix_path); - if (status == noErr) - status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalogInfo, NULL, - NULL, NULL); - if (status == noErr) - status = FSFindFolder(catalogInfo.volume, kTrashFolderType, - kCreateFolder, &ref); - - return (status == noErr); + heap_free(trash_path); + return can_trash; } BOOL TRASH_TrashFile(LPCWSTR wszPath) { - char *unix_path; - OSStatus status; + char *unix_path, *trash_path; + const char *base_name; + int res; TRACE("(%s)\n", debugstr_w(wszPath)); if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; + if (!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + { + heap_free(unix_path); + return FALSE; + } - status = FSPathMoveObjectToTrashSync(unix_path, NULL, kFSFileOperationSkipPreflight); + lstrcatA(trash_path, "/"); + lstrcatA(trash_path, base_name); + + res = rename(unix_path, trash_path); heap_free(unix_path); - return (status == noErr); + heap_free(trash_path); + return (res != -1); } /* TODO: @@ -186,10 +255,8 @@ HRESULT TRASH_GetDetails(const char *trash_path, const char *name, WIN32_FIND_DA HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { WCHAR volume_path[MAX_PATH]; - char *unix_path, trash_path[MAX_PATH]; - FSCatalogInfo catalog_info; - OSStatus status; - FSRef ref; + char *unix_path, *trash_path; + const char *base_name; struct dirent *entry; DIR *dir; LPITEMIDLIST *ret; @@ -211,15 +278,8 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) if(!(unix_path = wine_get_unix_file_name(volume_path))) return E_OUTOFMEMORY; - status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); - heap_free(unix_path); - if(status != noErr) return E_FAIL; - status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalog_info, NULL, NULL, NULL); - if(status != noErr) return E_FAIL; - status = FSFindFolder(catalog_info.volume, kTrashFolderType, kCreateFolder, &ref); - if(status != noErr) return E_FAIL; - status = FSRefMakePath(&ref, (UInt8*)trash_path, MAX_PATH); - if(status != noErr) return E_FAIL; + if(!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + return E_OUTOFMEMORY; if(!(dir = opendir(trash_path))) return E_FAIL; ret = heap_alloc(ret_size * sizeof(*ret)); @@ -282,7 +342,7 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) return E_NOTIMPL; } -#else /* HAVE_CORESERVICES_CORESERVICES_H */ +#else /* __APPLE__ */ static CRITICAL_SECTION TRASH_Creating; static CRITICAL_SECTION_DEBUG TRASH_Creating_Debug = @@ -790,4 +850,4 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) return S_OK; } -#endif /* HAVE_CORESERVICES_CORESERVICES_H */ +#endif /* __APPLE__ */ -- 2.18.0

2 1

[PATCH] shell32: Fix 2 MSVC warnings about flags.
by Serge Gautherie 19 Jul '18

19 Jul '18

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- - "...\ebrowser.c(1188) : warning C4133: 'function' : incompatible types - from 'DWORD *' to 'EXPLORER_BROWSER_OPTIONS *'" - "...\ebrowser.c(1198) : warning C4133: 'function' : incompatible types - from 'DWORD *' to 'EXPLORER_BROWSER_OPTIONS *'" ReactOS-Bug: https://jira.reactos.org/browse/CORE-7538 --- dlls/shell32/tests/ebrowser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 3e89b90..7691508 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1102,7 +1102,7 @@ static void test_basics(void) IShellBrowser *psb; FOLDERSETTINGS fs; ULONG lres; - DWORD flags; + EXPLORER_BROWSER_OPTIONS flags; HDWP hdwp; RECT rc; HRESULT hr; @@ -1187,7 +1187,7 @@ static void test_basics(void) hr = IExplorerBrowser_GetOptions(peb, &flags); ok(hr == S_OK, "got (0x%08x)\n", hr); - ok(flags == 0, "got (0x%08x)\n", flags); + ok(flags == 0, "got (0x%08x)\n", (int)flags); /* Settings preserved through Initialize. */ hr = IExplorerBrowser_SetOptions(peb, 0xDEADBEEF); @@ -1196,8 +1196,8 @@ static void test_basics(void) ebrowser_initialize(peb); hr = IExplorerBrowser_GetOptions(peb, &flags); - ok(flags == 0xDEADBEEF, "got (0x%08x)\n", flags); ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(flags == 0xDEADBEEF, "got (0x%08x)\n", (int)flags); IExplorerBrowser_Destroy(peb); IExplorerBrowser_Release(peb); -- 2.10.0.windows.1

1 0

[PATCH] shell32: Don't use Carbon on Mac OS to find the Trash.
by Charles Davis 19 Jul '18

19 Jul '18

Due to a weird interaction between Wine and (what I believe to be) os_log/os_signpost, we can't use FSPathMakeRef() (nor any other function that calls that) from a Wine process. We also can't use the NSSearchPathForDirectoriesInDomains() function. Setting aside the fact that it's Objective-C (something we can work around, given that NS and CF types are toll-free bridged), a) support for getting the Trash folder was only added in 10.8 (when FSFindFolder() was deprecated), and b) it doesn't even support volume-specific Trash folders. For now, just hardcode the paths to the Trash folder. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- dlls/shell32/trash.c | 130 ++++++++++++++++++++++++++++--------------- 1 file changed, 86 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 7bc035fd5387..858304e08a2e 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -22,24 +22,18 @@ #include "config.h" -#ifdef HAVE_CORESERVICES_CORESERVICES_H -#define GetCurrentThread MacGetCurrentThread -#define LoadResource MacLoadResource -#include <CoreServices/CoreServices.h> -#undef GetCurrentThread -#undef LoadResource -#undef DPRINTF -#endif - #include <stdarg.h> #include <stdio.h> #include <fcntl.h> #include <errno.h> #include <time.h> +#include <sys/types.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#include <sys/types.h> +#ifdef HAVE_SYS_MOUNT_H +# include <sys/mount.h> +#endif #include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -47,6 +41,9 @@ #ifdef HAVE_DIRENT_H # include <dirent.h> #endif +#ifdef HAVE_PWD_H +# include <pwd.h> +#endif #include "windef.h" #include "winbase.h" @@ -109,44 +106,98 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) return S_OK; } -#ifdef HAVE_CORESERVICES_CORESERVICES_H +#ifdef __APPLE__ + +static char *TRASH_GetTrashPath(const char *unix_path, const char **base_name) +{ + struct statfs stfs, home_stfs; + struct passwd *user = getpwuid(geteuid()); + char *trash_path; + size_t name_size; + + if (statfs(unix_path, &stfs) == -1) + return NULL; + if (statfs(user->pw_dir, &home_stfs) == -1) + return NULL; + + *base_name = strrchr(unix_path, '/'); + if (!*base_name) + *base_name = unix_path; + else + ++*base_name; + name_size = lstrlenA(*base_name); + + /* If the file exists on the same volume as the user's home directory, + * we can use the User domain Trash folder. Otherwise, we have to use + * <volume>/.Trashes/<uid>. + */ + if (memcmp(&stfs.f_fsid, &home_stfs.f_fsid, sizeof(fsid_t)) == 0) + { + size_t home_size = lstrlenA(user->pw_dir); + trash_path = heap_alloc(home_size + sizeof("/.Trash/") + name_size); + if (!trash_path) + return NULL; + memcpy(trash_path, user->pw_dir, home_size); + memcpy(trash_path+home_size, "/.Trash", sizeof("/.Trash")); + } + else + { + size_t vol_size = lstrlenA(stfs.f_mntonname); + /* 10 for the maximum length of a 32-bit integer + 1 for the \0 */ + size_t trash_size = vol_size + sizeof("/.Trashes/") + 10 + 1 + name_size + 1; + trash_path = heap_alloc(trash_size); + if (!trash_path) + return NULL; + snprintf(trash_path, trash_size, "%s/.Trashes/%u", stfs.f_mntonname, geteuid()); + } + return trash_path; +} BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { - char *unix_path; - OSStatus status; - FSRef ref; - FSCatalogInfo catalogInfo; + char *unix_path, *trash_path; + const char *base_name; + BOOL can_trash; + struct stat st; TRACE("(%s)\n", debugstr_w(wszPath)); + if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; - - status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); + if (!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + { + heap_free(unix_path); + return FALSE; + } + can_trash = stat(trash_path, &st) == 0; heap_free(unix_path); - if (status == noErr) - status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalogInfo, NULL, - NULL, NULL); - if (status == noErr) - status = FSFindFolder(catalogInfo.volume, kTrashFolderType, - kCreateFolder, &ref); - - return (status == noErr); + heap_free(trash_path); + return can_trash; } BOOL TRASH_TrashFile(LPCWSTR wszPath) { - char *unix_path; - OSStatus status; + char *unix_path, *trash_path; + const char *base_name; + int res; TRACE("(%s)\n", debugstr_w(wszPath)); if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; + if (!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + { + heap_free(unix_path); + return FALSE; + } - status = FSPathMoveObjectToTrashSync(unix_path, NULL, kFSFileOperationSkipPreflight); + lstrcatA(trash_path, "/"); + lstrcatA(trash_path, base_name); + + res = rename(unix_path, trash_path); heap_free(unix_path); - return (status == noErr); + heap_free(trash_path); + return (res != -1); } /* TODO: @@ -186,10 +237,8 @@ HRESULT TRASH_GetDetails(const char *trash_path, const char *name, WIN32_FIND_DA HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { WCHAR volume_path[MAX_PATH]; - char *unix_path, trash_path[MAX_PATH]; - FSCatalogInfo catalog_info; - OSStatus status; - FSRef ref; + char *unix_path, *trash_path; + const char *base_name; struct dirent *entry; DIR *dir; LPITEMIDLIST *ret; @@ -211,15 +260,8 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) if(!(unix_path = wine_get_unix_file_name(volume_path))) return E_OUTOFMEMORY; - status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); - heap_free(unix_path); - if(status != noErr) return E_FAIL; - status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalog_info, NULL, NULL, NULL); - if(status != noErr) return E_FAIL; - status = FSFindFolder(catalog_info.volume, kTrashFolderType, kCreateFolder, &ref); - if(status != noErr) return E_FAIL; - status = FSRefMakePath(&ref, (UInt8*)trash_path, MAX_PATH); - if(status != noErr) return E_FAIL; + if(!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + return E_OUTOFMEMORY; if(!(dir = opendir(trash_path))) return E_FAIL; ret = heap_alloc(ret_size * sizeof(*ret)); @@ -282,7 +324,7 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) return E_NOTIMPL; } -#else /* HAVE_CORESERVICES_CORESERVICES_H */ +#else /* __APPLE__ */ static CRITICAL_SECTION TRASH_Creating; static CRITICAL_SECTION_DEBUG TRASH_Creating_Debug = @@ -790,4 +832,4 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) return S_OK; } -#endif /* HAVE_CORESERVICES_CORESERVICES_H */ +#endif /* __APPLE__ */ -- 2.18.0

1 0

[PATCH v2 6/6] comctl32/taskdialog: Add support for footer text.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 3508dbc0cb..457a5ff9d0 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -68,6 +68,7 @@ struct taskdialog_info HWND expando_button; HWND verification_box; HWND footer_icon; + HWND footer_text; HWND *buttons; INT button_count; HWND default_button; @@ -737,6 +738,12 @@ static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); } +static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info) +{ + dialog_info->footer_text = taskdialog_create_label(dialog_info, dialog_info->taskconfig->pszFooter, + dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -766,6 +773,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) struct button_layout_info *button_layout_infos; LONG button_min_width, button_height; LONG *line_widths, line_count, align; + LONG footer_icon_right, footer_icon_bottom; LONG x, y; SIZE size; INT i; @@ -952,6 +960,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(line_widths); /* Footer icon */ + footer_icon_right = 0; + footer_icon_bottom = dialog_height; if (dialog_info->footer_icon) { x = h_spacing; @@ -959,9 +969,15 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) size.cx = GetSystemMetrics(SM_CXSMICON); size.cy = GetSystemMetrics(SM_CYSMICON); SetWindowPos(dialog_info->footer_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); - dialog_height = y + size.cy; + footer_icon_right = x + size.cx; + footer_icon_bottom = y + size.cy; } + /* Footer text */ + taskdialog_label_layout(dialog_info, dialog_info->footer_text, footer_icon_right, dialog_width, &dialog_height, + syslink); + dialog_height = max(dialog_height, footer_icon_bottom); + /* Expanded information */ if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); @@ -1058,6 +1074,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); taskdialog_add_footer_icon(dialog_info); + taskdialog_add_footer_text(dialog_info); /* Set default button */ if (!dialog_info->default_button && dialog_info->command_links) @@ -1184,7 +1201,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR PNMLINK pnmLink = (PNMLINK)lParam; HWND hwndFrom = pnmLink->hdr.hwndFrom; if ((taskdialog_hyperlink_enabled(dialog_info)) - && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info) + && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info + || hwndFrom == dialog_info->footer_text) && (pnmLink->hdr.code == NM_CLICK || pnmLink->hdr.code == NM_RETURN)) { taskdialog_notify(dialog_info, TDN_HYPERLINK_CLICKED, 0, (LPARAM)pnmLink->item.szUrl); -- 2.18.0

2 1

[PATCH v2 5/6] comctl32/taskdialog: Add support for footer icon.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 411b8e9212..3508dbc0cb 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -67,6 +67,7 @@ struct taskdialog_info HWND expanded_info; HWND expando_button; HWND verification_box; + HWND footer_icon; HWND *buttons; INT button_count; HWND default_button; @@ -446,17 +447,24 @@ static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon) static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element, HICON icon) { DWORD flags = dialog_info->taskconfig->dwFlags; + INT cx = 0, cy = 0; HICON hicon; if (!icon) return; - if ((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + if (((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + || ((flags & TDF_USE_HICON_FOOTER) && element == TDIE_ICON_FOOTER)) hicon = icon; else { - hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + if (element == TDIE_ICON_FOOTER) + { + cx = GetSystemMetrics(SM_CXSMICON); + cy = GetSystemMetrics(SM_CYSMICON); + } + hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, cx, cy, LR_SHARED | LR_DEFAULTSIZE); if (!hicon) - hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, 0, 0, + hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, cx, cy, LR_SHARED | LR_DEFAULTSIZE); } @@ -467,6 +475,8 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element SendMessageW(dialog_info->hwnd, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hicon); SendMessageW(dialog_info->main_icon, STM_SETICON, (WPARAM)hicon, 0); } + else if (element == TDIE_ICON_FOOTER) + SendMessageW(dialog_info->footer_icon, STM_SETICON, (WPARAM)hicon, 0); } static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialog_info) @@ -718,6 +728,15 @@ static void taskdialog_add_buttons(struct taskdialog_info *dialog_info) dialog_info->button_count = count; } +static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) +{ + if (!dialog_info->taskconfig->u2.hFooterIcon) return; + + dialog_info->footer_icon = + CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, 0); + taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -932,6 +951,17 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(button_layout_infos); Free(line_widths); + /* Footer icon */ + if (dialog_info->footer_icon) + { + x = h_spacing; + y = dialog_height + v_spacing; + size.cx = GetSystemMetrics(SM_CXSMICON); + size.cy = GetSystemMetrics(SM_CYSMICON); + SetWindowPos(dialog_info->footer_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + dialog_height = y + size.cy; + } + /* Expanded information */ if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); @@ -1027,6 +1057,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_expando_button(dialog_info); taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); + taskdialog_add_footer_icon(dialog_info); /* Set default button */ if (!dialog_info->default_button && dialog_info->command_links) -- 2.18.0

2 1

[PATCH v2 4/6] comctl32/taskdialog: Add support for verification box.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 58 ++++++++++++- dlls/comctl32/tests/taskdialog.c | 136 +++++++++++++++++++++++++------ 2 files changed, 166 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 54ad58b340..411b8e9212 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -66,6 +66,7 @@ struct taskdialog_info INT command_link_count; HWND expanded_info; HWND expando_button; + HWND verification_box; HWND *buttons; INT button_count; HWND default_button; @@ -78,6 +79,7 @@ struct taskdialog_info LONG v_spacing; } m; INT selected_radio_id; + BOOL verification_checked; BOOL expanded; WCHAR *expanded_text; WCHAR *collapsed_text; @@ -247,6 +249,13 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND return; } + if (hwnd == dialog_info->verification_box) + { + dialog_info->verification_checked = !dialog_info->verification_checked; + taskdialog_notify(dialog_info, TDN_VERIFICATION_CLICKED, dialog_info->verification_checked, 0); + return; + } + radio_button = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, command_id); if (radio_button) { @@ -636,6 +645,26 @@ static void taskdialog_add_expando_button(struct taskdialog_info *dialog_info) SendMessageW(dialog_info->expando_button, WM_SETFONT, (WPARAM)dialog_info->font, 0); } +static void taskdialog_add_verification_box(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + static const DWORD style = BS_AUTOCHECKBOX | BS_MULTILINE | BS_LEFT | BS_TOP | WS_CHILD | WS_VISIBLE | WS_TABSTOP; + WCHAR *textW; + + /* TDF_VERIFICATION_FLAG_CHECKED works even if pszVerificationText is not set */ + if (taskconfig->dwFlags & TDF_VERIFICATION_FLAG_CHECKED) dialog_info->verification_checked = TRUE; + + if (!taskconfig->pszVerificationText) return; + + textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pszVerificationText); + dialog_info->verification_box = CreateWindowW(WC_BUTTONW, textW, style, 0, 0, 0, 0, dialog_info->hwnd, 0, 0, 0); + SendMessageW(dialog_info->verification_box, WM_SETFONT, (WPARAM)dialog_info->font, 0); + Free(textW); + + if (taskconfig->dwFlags & TDF_VERIFICATION_FLAG_CHECKED) + SendMessageW(dialog_info->verification_box, BM_SETCHECK, BST_CHECKED, 0); +} + static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT_PTR id, const WCHAR *text, BOOL custom_button) { @@ -806,6 +835,19 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) expando_bottom = y + size.cy; } + /* Verification box */ + if (dialog_info->verification_box) + { + x = h_spacing; + y = expando_bottom + v_spacing; + size.cx = DIALOG_MIN_WIDTH / 2; + taskdialog_du_to_px(dialog_info, &size.cx, NULL); + taskdialog_get_radio_button_size(dialog_info, dialog_info->verification_box, size.cx, &size); + SetWindowPos(dialog_info->verification_box, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + expando_right = max(expando_right, x + size.cx); + expando_bottom = y + size.cy; + } + /* Common and custom buttons */ button_layout_infos = Alloc(dialog_info->button_count * sizeof(*button_layout_infos)); line_widths = Alloc(dialog_info->button_count * sizeof(*line_widths)); @@ -983,6 +1025,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_radio_buttons(dialog_info); taskdialog_add_command_links(dialog_info); taskdialog_add_expando_button(dialog_info); + taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); /* Set default button */ @@ -1063,6 +1106,19 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_ENABLE_RADIO_BUTTON: taskdialog_enable_radio_button(dialog_info, wParam, lParam); break; + case TDM_CLICK_VERIFICATION: + { + BOOL checked = (BOOL)wParam; + BOOL focused = (BOOL)lParam; + dialog_info->verification_checked = checked; + if (dialog_info->verification_box) + { + SendMessageW(dialog_info->verification_box, BM_SETCHECK, checked ? BST_CHECKED : BST_UNCHECKED, 0); + taskdialog_notify(dialog_info, TDN_VERIFICATION_CLICKED, checked, 0); + if (focused) SetFocus(dialog_info->verification_box); + } + break; + } case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; @@ -1151,7 +1207,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto if (button) *button = ret; if (radio_button) *radio_button = dialog_info.selected_radio_id; - if (verification_flag_checked) *verification_flag_checked = TRUE; + if (verification_flag_checked) *verification_flag_checked = dialog_info.verification_checked; return S_OK; } diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 7fb8f3dcfc..8d60fb2eb8 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -229,6 +229,48 @@ static const struct message_info msg_return_press_negative_id_radio_button[] = { 0 } }; +static const struct message_info msg_return_default_verification_unchecked[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_return_default_verification_checked[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_uncheck_verification[] = +{ + { TDM_CLICK_VERIFICATION, FALSE, 0 }, + { 0 } +}; + +static const struct message_info msg_return_verification_unchecked[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_uncheck_verification }, + { TDN_VERIFICATION_CLICKED, FALSE, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_check_verification[] = +{ + { TDM_CLICK_VERIFICATION, TRUE, 0 }, + { 0 } +}; + +static const struct message_info msg_return_verification_checked[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_check_verification }, + { TDN_VERIFICATION_CLICKED, TRUE, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -239,17 +281,18 @@ static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct msg->stage = 0; } -#define run_test(info, expect_button, expect_radio_button, seq, context) \ - run_test_(info, expect_button, expect_radio_button, seq, context, \ - ARRAY_SIZE(seq) - 1, __FILE__, __LINE__) +#define run_test(info, expect_button, expect_radio_button, verification_checked, seq, context) \ + run_test_(info, expect_button, expect_radio_button, verification_checked, seq, context, \ + ARRAY_SIZE(seq) - 1, __FILE__, __LINE__) -static void run_test_(TASKDIALOGCONFIG *info, int expect_button, int expect_radio_button, +static void run_test_(TASKDIALOGCONFIG *info, int expect_button, int expect_radio_button, BOOL verification_checked, const struct message_info *test_messages, const char *context, int test_messages_len, const char *file, int line) { struct message *msg, *msg_start; int ret_button = 0; int ret_radio = 0; + BOOL ret_verification = FALSE; HRESULT hr; int i; @@ -266,7 +309,7 @@ static void run_test_(TASKDIALOGCONFIG *info, int expect_button, int expect_radi current_message_info = test_messages; flush_sequences(sequences, NUM_MSG_SEQUENCES); - hr = pTaskDialogIndirect(info, &ret_button, &ret_radio, NULL); + hr = pTaskDialogIndirect(info, &ret_button, &ret_radio, &ret_verification); ok_(file, line)(hr == S_OK, "TaskDialogIndirect() failed, got %#x.\n", hr); ok_sequence_(sequences, TASKDIALOG_SEQ_INDEX, msg_start, context, FALSE, file, line); @@ -331,7 +374,7 @@ static void test_callback(void) info.pfCallback = taskdialog_callback_proc; info.lpCallbackData = test_ref_data; - run_test(&info, IDOK, 0, msg_return_press_ok, "Press VK_RETURN."); + run_test(&info, IDOK, 0, FALSE, msg_return_press_ok, "Press VK_RETURN."); } static void test_buttons(void) @@ -376,16 +419,16 @@ static void test_buttons(void) info.nDefaultButton = 0; /* Should default to first created button */ info.dwCommonButtons = TDCBF_OK_BUTTON | TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDOK, 0, msg_return_press_ok, "default button: unset default"); + run_test(&info, IDOK, 0, FALSE, msg_return_press_ok, "default button: unset default"); info.dwCommonButtons = TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDYES, 0, msg_return_press_yes, "default button: unset default"); + run_test(&info, IDYES, 0, FALSE, msg_return_press_yes, "default button: unset default"); info.dwCommonButtons = TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDNO, 0, msg_return_press_no, "default button: unset default"); + run_test(&info, IDNO, 0, FALSE, msg_return_press_no, "default button: unset default"); info.dwCommonButtons = TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDRETRY, 0, msg_return_press_retry, "default button: unset default"); + run_test(&info, IDRETRY, 0, FALSE, msg_return_press_retry, "default button: unset default"); info.dwCommonButtons = TDCBF_CANCEL_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDCANCEL, 0, msg_return_press_cancel, "default button: unset default"); + run_test(&info, IDCANCEL, 0, FALSE, msg_return_press_cancel, "default button: unset default"); /* Custom buttons could be command links */ for (i = 0; i < ARRAY_SIZE(command_link_flags); i++) @@ -396,30 +439,30 @@ static void test_buttons(void) info.nDefaultButton = 0xff; /* Random ID, should also default to first created button */ info.cButtons = TEST_NUM_BUTTONS; info.pButtons = custom_buttons; - run_test(&info, ID_START_BUTTON, 0, msg_return_press_custom1, + run_test(&info, ID_START_BUTTON, 0, FALSE, msg_return_press_custom1, "default button: invalid default, with common buttons - 1"); info.nDefaultButton = -1; /* Should work despite button ID -1 */ - run_test(&info, -1, 0, msg_return_press_custom10, "default button: invalid default, with common buttons - 2"); + run_test(&info, -1, 0, FALSE, msg_return_press_custom10, "default button: invalid default, with common buttons - 2"); info.nDefaultButton = -2; /* Should also default to first created button */ - run_test(&info, ID_START_BUTTON, 0, msg_return_press_custom1, + run_test(&info, ID_START_BUTTON, 0, FALSE, msg_return_press_custom1, "default button: invalid default, with common buttons - 3"); /* Test with only custom buttons and invalid default ID */ info.dwCommonButtons = 0; - run_test(&info, ID_START_BUTTON, 0, msg_return_press_custom1, + run_test(&info, ID_START_BUTTON, 0, FALSE, msg_return_press_custom1, "default button: invalid default, no common buttons"); /* Test with common and custom buttons and valid default ID */ info.dwCommonButtons = TDCBF_OK_BUTTON | TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; info.nDefaultButton = IDRETRY; - run_test(&info, IDRETRY, 0, msg_return_press_retry, "default button: valid default - 1"); + run_test(&info, IDRETRY, 0, FALSE, msg_return_press_retry, "default button: valid default - 1"); /* Test with common and custom buttons and valid default ID */ info.nDefaultButton = ID_START_BUTTON + 3; - run_test(&info, ID_START_BUTTON + 3, 0, msg_return_press_custom4, "default button: valid default - 2"); + run_test(&info, ID_START_BUTTON + 3, 0, FALSE, msg_return_press_custom4, "default button: valid default - 2"); } /* Test radio buttons */ @@ -431,44 +474,52 @@ static void test_buttons(void) info.pRadioButtons = radio_buttons; /* Test default first radio button */ - run_test(&info, IDOK, ID_START_RADIO_BUTTON, msg_return_default_radio_button_1, "default radio button: default first radio button"); + run_test(&info, IDOK, ID_START_RADIO_BUTTON, FALSE, msg_return_default_radio_button_1, + "default radio button: default first radio button"); /* Test default radio button */ info.nDefaultRadioButton = ID_START_RADIO_BUTTON + 1; - run_test(&info, IDOK, info.nDefaultRadioButton, msg_return_default_radio_button_2, "default radio button: default radio button"); + run_test(&info, IDOK, info.nDefaultRadioButton, FALSE, msg_return_default_radio_button_2, + "default radio button: default radio button"); /* Test default radio button with -2 */ info.nDefaultRadioButton = -2; - run_test(&info, IDOK, info.nDefaultRadioButton, msg_return_default_radio_button_3, "default radio button: default radio button with id -2"); + run_test(&info, IDOK, info.nDefaultRadioButton, FALSE, msg_return_default_radio_button_3, + "default radio button: default radio button with id -2"); /* Test default radio button after clicking the first, messages still work even radio button is disabled */ info.nDefaultRadioButton = ID_START_RADIO_BUTTON + 1; - run_test(&info, IDOK, ID_START_RADIO_BUTTON, msg_return_first_radio_button, "default radio button: radio button after clicking"); + run_test(&info, IDOK, ID_START_RADIO_BUTTON, FALSE, msg_return_first_radio_button, + "default radio button: radio button after clicking"); /* Test radio button after disabling and clicking the first */ info.nDefaultRadioButton = ID_START_RADIO_BUTTON + 1; - run_test(&info, IDOK, ID_START_RADIO_BUTTON, msg_return_default_radio_button_clicking_disabled, "default radio button: disable radio button before clicking"); + run_test(&info, IDOK, ID_START_RADIO_BUTTON, FALSE, msg_return_default_radio_button_clicking_disabled, + "default radio button: disable radio button before clicking"); /* Test no default radio button, TDF_NO_DEFAULT_RADIO_BUTTON is set, TDN_RADIO_BUTTON_CLICKED will still be received, just radio button not selected */ info.nDefaultRadioButton = ID_START_RADIO_BUTTON; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; - run_test(&info, IDOK, info.nDefaultRadioButton, msg_return_no_default_radio_button_flag, "default radio button: no default radio flag"); + run_test(&info, IDOK, info.nDefaultRadioButton, FALSE, msg_return_no_default_radio_button_flag, + "default radio button: no default radio flag"); /* Test no default radio button, TDF_NO_DEFAULT_RADIO_BUTTON is set and nDefaultRadioButton is 0. * TDN_RADIO_BUTTON_CLICKED will not be sent, and just radio button not selected */ info.nDefaultRadioButton = 0; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; - run_test(&info, IDOK, 0, msg_return_no_default_radio_button_id_and_flag, "default radio button: no default radio id and flag"); + run_test(&info, IDOK, 0, FALSE, msg_return_no_default_radio_button_id_and_flag, + "default radio button: no default radio id and flag"); /* Test no default radio button, TDF_NO_DEFAULT_RADIO_BUTTON is set and nDefaultRadioButton is invalid. * TDN_RADIO_BUTTON_CLICKED will not be sent, and just radio button not selected */ info.nDefaultRadioButton = 0xff; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; - run_test(&info, IDOK, 0, msg_return_no_default_radio_button_id_and_flag, "default radio button: no default flag, invalid id"); + run_test(&info, IDOK, 0, FALSE, msg_return_no_default_radio_button_id_and_flag, + "default radio button: no default flag, invalid id"); info.nDefaultRadioButton = 0; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; - run_test(&info, IDOK, -2, msg_return_press_negative_id_radio_button, + run_test(&info, IDOK, -2, FALSE, msg_return_press_negative_id_radio_button, "radio button: manually click radio button with negative id"); } @@ -481,7 +532,7 @@ static void test_help(void) info.lpCallbackData = test_ref_data; info.dwCommonButtons = TDCBF_OK_BUTTON; - run_test(&info, IDOK, 0, msg_got_tdn_help, "send f1"); + run_test(&info, IDOK, 0, FALSE, msg_got_tdn_help, "send f1"); } struct timer_notification_data @@ -601,6 +652,36 @@ static void test_progress_bar(void) pTaskDialogIndirect(&info, NULL, NULL, NULL); } +static void test_verification_box(void) +{ + TASKDIALOGCONFIG info = {0}; + WCHAR textW[] = {'t', 'e', 'x', 't', 0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + info.dwCommonButtons = TDCBF_OK_BUTTON; + + /* TDF_VERIFICATION_FLAG_CHECKED works even if pszVerificationText is not set */ + run_test(&info, IDOK, 0, FALSE, msg_return_default_verification_unchecked, "default verification box: unchecked"); + + info.dwFlags = TDF_VERIFICATION_FLAG_CHECKED; + run_test(&info, IDOK, 0, FALSE, msg_return_default_verification_checked, "default verification box: checked"); + + info.pszVerificationText = textW; + run_test(&info, IDOK, 0, FALSE, msg_return_default_verification_unchecked, "default verification box: unchecked"); + + info.dwFlags = TDF_VERIFICATION_FLAG_CHECKED; + run_test(&info, IDOK, 0, FALSE, msg_return_default_verification_checked, "default verification box: checked"); + + run_test(&info, IDOK, 0, FALSE, msg_return_verification_unchecked, + "default verification box: default checked and then unchecked"); + + info.dwFlags = 0; + run_test(&info, IDOK, 0, FALSE, msg_return_verification_checked, + "default verification box: default unchecked and then checked"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -640,6 +721,7 @@ START_TEST(taskdialog) test_help(); test_timer(); test_progress_bar(); + test_verification_box(); unload_v6_module(ctx_cookie, hCtx); } -- 2.18.0

2 1

[PATCH v2 3/6] comctl32/taskdialog: Add support for expando button.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/comctl32.h | 4 + dlls/comctl32/comctl32.rc | 6 ++ dlls/comctl32/taskdialog.c | 163 ++++++++++++++++++++++++++++++++++++- 3 files changed, 170 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index eef2072e18..67da0e1677 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -107,6 +107,10 @@ extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; #define IDS_BUTTON_CANCEL 3004 #define IDS_BUTTON_CLOSE 3005 +/* Task dialog expando control default text */ +#define IDS_TD_EXPANDED 3020 +#define IDS_TD_COLLAPSED 3021 + #define WM_SYSTIMER 0x0118 enum combobox_state_flags diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc index cea815a347..3f8e148bfa 100644 --- a/dlls/comctl32/comctl32.rc +++ b/dlls/comctl32/comctl32.rc @@ -56,6 +56,12 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } +STRINGTABLE +{ + IDS_TD_EXPANDED "Hide details" + IDS_TD_COLLAPSED "See details" +} + IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Properties for %s" diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index db278cac46..54ad58b340 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -42,6 +42,8 @@ static const UINT DIALOG_MIN_WIDTH = 240; static const UINT DIALOG_SPACING = 5; static const UINT DIALOG_BUTTON_WIDTH = 50; static const UINT DIALOG_BUTTON_HEIGHT = 14; +static const UINT DIALOG_EXPANDO_ICON_WIDTH = 10; +static const UINT DIALOG_EXPANDO_ICON_HEIGHT = 10; static const UINT DIALOG_TIMER_MS = 200; static const UINT ID_TIMER = 1; @@ -63,6 +65,7 @@ struct taskdialog_info HWND *command_links; INT command_link_count; HWND expanded_info; + HWND expando_button; HWND *buttons; INT button_count; HWND default_button; @@ -76,6 +79,8 @@ struct taskdialog_info } m; INT selected_radio_id; BOOL expanded; + WCHAR *expanded_text; + WCHAR *collapsed_text; }; struct button_layout_info @@ -85,6 +90,7 @@ struct button_layout_info }; static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd); +static void taskdialog_layout(struct taskdialog_info *dialog_info); static void taskdialog_du_to_px(struct taskdialog_info *dialog_info, LONG *width, LONG *height) { @@ -222,11 +228,25 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } +static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_info) +{ + dialog_info->expanded = !dialog_info->expanded; + ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); + taskdialog_layout(dialog_info); +} + static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) { INT command_id = GetWindowLongW(hwnd, GWLP_ID); HWND radio_button; + if (hwnd == dialog_info->expando_button) + { + taskdialog_toggle_expando_control(dialog_info); + taskdialog_notify(dialog_info, TDN_EXPANDO_BUTTON_CLICKED, dialog_info->expanded, 0); + return; + } + radio_button = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, command_id); if (radio_button) { @@ -357,6 +377,49 @@ static void taskdialog_get_radio_button_size(struct taskdialog_info *dialog_info ReleaseDC(hwnd, hdc); } +static void taskdialog_get_expando_size(struct taskdialog_info *dialog_info, HWND hwnd, SIZE *size) +{ + DWORD style = DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK; + HFONT hfont, old_hfont; + HDC hdc; + RECT rect = {0}; + LONG icon_width, icon_height, text_offset; + LONG max_width, max_text_height; + + hdc = GetDC(hwnd); + hfont = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + old_hfont = SelectObject(hdc, hfont); + + icon_width = DIALOG_EXPANDO_ICON_WIDTH; + icon_height = DIALOG_EXPANDO_ICON_HEIGHT; + taskdialog_du_to_px(dialog_info, &icon_width, &icon_height); + + GetCharWidthW(hdc, '0', '0', &text_offset); + text_offset /= 2; + + if (dialog_info->taskconfig->dwFlags & TDF_RTL_LAYOUT) + style |= DT_RIGHT | DT_RTLREADING; + else + style |= DT_LEFT; + + max_width = DIALOG_MIN_WIDTH / 2; + taskdialog_du_to_px(dialog_info, &max_width, NULL); + + rect.right = max_width - icon_width - text_offset; + max_text_height = DrawTextW(hdc, dialog_info->expanded_text, -1, &rect, style); + size->cy = max(max_text_height, icon_height); + size->cx = rect.right - rect.left; + + rect.right = max_width - icon_width - text_offset; + max_text_height = DrawTextW(hdc, dialog_info->collapsed_text, -1, &rect, style); + size->cy = max(size->cy, max_text_height); + size->cx = max(size->cx, rect.right - rect.left); + size->cx = min(size->cx, max_width); + + if (old_hfont) SelectObject(hdc, old_hfont); + ReleaseDC(hwnd, hdc); +} + static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon) { if (icon == TD_WARNING_ICON) @@ -544,6 +607,35 @@ static void taskdialog_add_expanded_info(struct taskdialog_info *dialog_info) ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); } +static void taskdialog_add_expando_button(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + const WCHAR *textW; + + if (!taskconfig->pszExpandedInformation) return; + + if (!taskconfig->pszCollapsedControlText && !taskconfig->pszExpandedControlText) + { + dialog_info->expanded_text = taskdialog_gettext(dialog_info, FALSE, MAKEINTRESOURCEW(IDS_TD_EXPANDED)); + dialog_info->collapsed_text = taskdialog_gettext(dialog_info, FALSE, MAKEINTRESOURCEW(IDS_TD_COLLAPSED)); + } + else + { + textW = taskconfig->pszExpandedControlText ? taskconfig->pszExpandedControlText + : taskconfig->pszCollapsedControlText; + dialog_info->expanded_text = taskdialog_gettext(dialog_info, TRUE, textW); + textW = taskconfig->pszCollapsedControlText ? taskconfig->pszCollapsedControlText + : taskconfig->pszExpandedControlText; + dialog_info->collapsed_text = taskdialog_gettext(dialog_info, TRUE, textW); + } + + textW = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + + dialog_info->expando_button = CreateWindowW(WC_BUTTONW, textW, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_OWNERDRAW, 0, + 0, 0, 0, dialog_info->hwnd, 0, 0, 0); + SendMessageW(dialog_info->expando_button, WM_SETFONT, (WPARAM)dialog_info->font, 0); +} + static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT_PTR id, const WCHAR *text, BOOL custom_button) { @@ -622,6 +714,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) LONG screen_width, dialog_width, dialog_height = 0; LONG h_spacing, v_spacing; LONG main_icon_right, main_icon_bottom; + LONG expando_right, expando_bottom; struct button_layout_info *button_layout_infos; LONG button_min_width, button_height; LONG *line_widths, line_count, align; @@ -700,6 +793,19 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) dialog_height = max(dialog_height, main_icon_bottom); + expando_right = 0; + expando_bottom = dialog_height; + /* Expando control */ + if (dialog_info->expando_button) + { + x = h_spacing; + y = dialog_height + v_spacing; + taskdialog_get_expando_size(dialog_info, dialog_info->expando_button, &size); + SetWindowPos(dialog_info->expando_button, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + expando_right = x + size.cx; + expando_bottom = y + size.cy; + } + /* Common and custom buttons */ button_layout_infos = Alloc(dialog_info->button_count * sizeof(*button_layout_infos)); line_widths = Alloc(dialog_info->button_count * sizeof(*line_widths)); @@ -709,12 +815,13 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) taskdialog_du_to_px(dialog_info, &button_min_width, &button_height); for (i = 0; i < dialog_info->button_count; i++) { - taskdialog_get_label_size(dialog_info, dialog_info->buttons[i], dialog_width - h_spacing * 2, &size, FALSE); + taskdialog_get_label_size(dialog_info, dialog_info->buttons[i], dialog_width - expando_right - h_spacing * 2, + &size, FALSE); button_layout_infos[i].width = max(size.cx, button_min_width); } /* Separate buttons into lines */ - x = h_spacing; + x = expando_right + h_spacing; for (i = 0, line_count = 0; i < dialog_info->button_count; i++) { button_layout_infos[i].line = line_count; @@ -723,7 +830,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) if ((i + 1 < dialog_info->button_count) && (x + button_layout_infos[i + 1].width + h_spacing >= dialog_width)) { - x = h_spacing; + x = expando_right + h_spacing; line_count++; } } @@ -778,6 +885,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) /* Add height for last row button and spacing */ dialog_height += size.cy + v_spacing; + dialog_height = max(dialog_height, expando_bottom); Free(button_layout_infos); Free(line_widths); @@ -802,6 +910,41 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) SetWindowPos(dialog_info->hwnd, 0, 0, 0, dialog_width, dialog_height, SWP_NOMOVE | SWP_NOZORDER); } +static void taskdialog_draw_expando_control(struct taskdialog_info *dialog_info, LPDRAWITEMSTRUCT dis) +{ + HWND hwnd; + HDC hdc; + RECT rect = {0}; + WCHAR *text; + LONG icon_width, icon_height, text_offset; + UINT style = DFCS_FLAT; + BOOL draw_focus; + + hdc = dis->hDC; + hwnd = dis->hwndItem; + + SendMessageW(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + + icon_width = DIALOG_EXPANDO_ICON_WIDTH; + icon_height = DIALOG_EXPANDO_ICON_HEIGHT; + taskdialog_du_to_px(dialog_info, &icon_width, &icon_height); + rect.right = icon_width; + rect.bottom = icon_height; + style |= dialog_info->expanded ? DFCS_SCROLLUP : DFCS_SCROLLDOWN; + DrawFrameControl(hdc, &rect, DFC_SCROLL, style); + + GetCharWidthW(hdc, '0', '0', &text_offset); + text_offset /= 2; + + rect = dis->rcItem; + rect.left += icon_width + text_offset; + text = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + DrawTextW(hdc, text, -1, &rect, DT_WORDBREAK | DT_END_ELLIPSIS | DT_EXPANDTABS); + + draw_focus = (dis->itemState & ODS_FOCUS) && !(dis->itemState & ODS_NOFOCUSRECT); + if(draw_focus) DrawFocusRect(hdc, &rect); +} + static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; @@ -839,6 +982,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_progress_bar(dialog_info); taskdialog_add_radio_buttons(dialog_info); taskdialog_add_command_links(dialog_info); + taskdialog_add_expando_button(dialog_info); taskdialog_add_buttons(dialog_info); /* Set default button */ @@ -860,6 +1004,8 @@ static void taskdialog_destroy(struct taskdialog_info *dialog_info) Free(dialog_info->buttons); Free(dialog_info->radio_buttons); Free(dialog_info->command_links); + Free(dialog_info->expanded_text); + Free(dialog_info->collapsed_text); } static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -959,6 +1105,17 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } return FALSE; } + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; + if (dis->hwndItem == dialog_info->expando_button) + { + taskdialog_draw_expando_control(dialog_info, dis); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, TRUE); + break; + } + return FALSE; + } case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); -- 2.18.0

2 1

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