July 2018 - Wine-Commits - list.winehq.org

Jason Edmeades : cmd: Fix statements after 'else' inside for loops.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 6cb520476a79fd7ff5a67c1a1064de9c267fdbc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb520476a79fd7ff5a67c1a… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:29 2018 +0100 cmd: Fix statements after 'else' inside for loops. When inside a for loop, an 'if' statement is processed and the true part taken. Once all the commands in the true are processed, the else part is parsed, and a flag set to skip all commands in the else part. Unfortunately this flag is left on even when the if statement ends, meaning subsequent commands are also skipped. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 18 +++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 34 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 +++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1ee4fcc..088632f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1571,10 +1571,12 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, /* execute all appropriate commands */ curPosition = *cmdList; - WINE_TRACE("Processing cmdList(%p) - delim(%d) bd(%d / %d)\n", + WINE_TRACE("Processing cmdList(%p) - delim(%d) bd(%d / %d) processThese(%d)\n", *cmdList, (*cmdList)->prevDelim, - (*cmdList)->bracketDepth, myDepth); + (*cmdList)->bracketDepth, + myDepth, + processThese); /* Execute any statements appended to the line */ /* FIXME: Only if previous call worked for && or failed for || */ @@ -1613,6 +1615,18 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, if (*cmd) { WCMD_execute (cmd, (*cmdList)->redirects, cmdList, FALSE); } + } else { + /* Loop skipping all commands until we get back to the current + depth, including skipping commands and their subsequent + pipes (eg cmd | prog) */ + do { + *cmdList = (*cmdList)->nextcommand; + } while (*cmdList && + ((*cmdList)->bracketDepth > myDepth || + (*cmdList)->prevDelim)); + + /* After the else is complete, we need to now process subsequent commands */ + processThese = TRUE; } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; } else if (!processThese) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5ca2427..b9e9b25 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -418,6 +418,7 @@ if 1==1 (echo n1) else echo n2|echo n3 if 1==1 (echo o1) else echo o2&&echo o3 if 1==1 (echo p1) else echo p2||echo p3 if 1==1 (echo q1) else echo q2&echo q3 +echo --- echo --- chain else (if false) if 1==0 echo a1 else echo a2 if 1==0 echo b1|echo b2 else echo b3 @@ -1371,6 +1372,39 @@ for /L %%i in (2,2,1) do ( echo %%i echo FAILED ) +echo --- ifs inside for loops +for %%i in (test) do ( + echo a1 + if 1==1 ( + echo b1 + ) else ( + echo c1 + ) + echo d1 +) +for %%i in (test) do ( + echo a2 + if 1==1 ( + echo b2 + ) else echo c2 + echo d2 +) +for %%i in (test) do ( + echo a3 + if 1==0 ( + echo b3 + ) else echo c3 + echo d3 +) +for %%i in (test) do ( + echo a4 + if 1==0 ( + echo b4 + ) else ( + echo c4 + ) + echo d4 +) echo --- set /a goto :testseta diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0a7c75a..3118359 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -428,6 +428,7 @@ n1 o1 p1 q1 +(a)todo_wine@--- --- chain else (if false) @todo_wine(a)j3 --- @@ -982,6 +983,19 @@ ErrorLevel 0 -1 1 3 +--- ifs inside for loops +a1 +b1 +d1 +a2 +b2 +d2 +a3 +c3 +d3 +a4 +c4 +d4 --- set /a ------ individual operations WINE_foo correctly 3

1 0

Jason Edmeades : cmd: Handle special case tokens=* in for /f.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 4030a952095398e5a42f0a74213f6a1e9186c4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4030a952095398e5a42f0a74… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:27 2018 +0100 cmd: Handle special case tokens=* in for /f. for /f allows a special syntax of tokens=* (rather than tokens=1* for example) which just means put the whole line into the next variable). Note the handling of the 'next variable' was wrong in the case of it being 'A' or 'a' as the wrap calculation was wrong, but this only affected using this new syntax. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 28 ++++++++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ff58484..1ee4fcc 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1831,6 +1831,14 @@ static int WCMD_for_nexttoken(int lasttoken, WCHAR *tokenstr, int nextnumber1, nextnumber2 = -1; WCHAR *nextchar; + /* It is valid syntax tokens=* which just means get whole line */ + if (*pos == '*') { + if (doall) *doall = TRUE; + if (totalfound) (*totalfound)++; + nexttoken = 0; + break; + } + /* Get the next number */ nextnumber1 = strtoulW(pos, &nextchar, 10); @@ -1959,22 +1967,22 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, */ lasttoken = -1; nexttoken = WCMD_for_nexttoken(lasttoken, forf_tokens, &totalfound, - NULL, &thisduplicate); + &starfound, &thisduplicate); varidx = FOR_VAR_IDX(variable); /* Empty out variables */ for (varoffset=0; - varidx >= 0 && varoffset<totalfound && ((varidx+varoffset)%26); + varidx >= 0 && varoffset<totalfound && (((varidx%26) + varoffset) < 26); varoffset++) { forloopcontext.variable[varidx + varoffset] = (WCHAR *)nullW; - /* Stop if we walk beyond z or Z */ - if (((varidx+varoffset) % 26) == 0) break; } - /* Loop extracting the tokens */ + /* Loop extracting the tokens + Note: nexttoken of 0 means there were no tokens requested, to handle + the special case of tokens=* */ varoffset = 0; WINE_TRACE("Parsing buffer into tokens: '%s'\n", wine_dbgstr_w(buffer)); - while (varidx >= 0 && (nexttoken > lasttoken)) { + while (varidx >= 0 && (nexttoken > 0 && (nexttoken > lasttoken))) { anyduplicates |= thisduplicate; /* Extract the token number requested and set into the next variable context */ @@ -1982,9 +1990,9 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, WINE_TRACE("Parsed token %d(%d) as parameter %s\n", nexttoken, varidx + varoffset, wine_dbgstr_w(parm)); if (varidx >=0) { - forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); + if (parm) forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); varoffset++; - if (((varidx + varoffset) %26) == 0) break; + if (((varidx%26)+varoffset) >= 26) break; } /* Find the next token */ @@ -1995,12 +2003,12 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, /* If all the rest of the tokens were requested, and there is still space in the variable range, write them now */ - if (!anyduplicates && starfound && varidx >= 0 && ((varidx+varoffset) % 26)) { + if (!anyduplicates && starfound && varidx >= 0 && (((varidx%26) + varoffset) < 26)) { nexttoken++; WCMD_parameter_with_delims(buffer, (nexttoken-1), &parm, FALSE, FALSE, forf_delims); WINE_TRACE("Parsed allremaining tokens (%d) as parameter %s\n", varidx + varoffset, wine_dbgstr_w(parm)); - forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); + if (parm) forloopcontext.variable[varidx + varoffset] = heap_strdupW(parm); } /* Execute the body of the foor loop with these values */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0a8122c..5ca2427 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1744,6 +1744,12 @@ for /f "tokens=1,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k for /f "tokens=1,1,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o for /f "tokens=2,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o for /f "tokens=3,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o +rem Special case tokens=* +echo 3.14>testfile +FOR /F "tokens=*" %%A IN (testfile) DO @echo 1:%%A,%%B +FOR /F "tokens=1*" %%A IN (testfile) DO @echo 2:%%A,%%B +FOR /F "tokens=2*" %%A IN (testfile) DO @echo 3:%%A,%%B +del testfile cd .. rd /s/q foobar echo ------ parameter splitting @@ -1756,6 +1762,12 @@ goto :forFParameterSplittingEnd echo %~0 %~1 %~2 %~3 %~4 %~5 goto :eof :forFParameterSplittingEnd +echo 3.14>testfile +FOR /F "delims=. tokens=*" %%A IN (testfile) DO @echo 4:%%A,%%B +FOR /F "delims=. tokens=1*" %%A IN (testfile) DO @echo 5:%%A,%%B +FOR /F "delims=. tokens=2*" %%A IN (testfile) DO @echo 6:%%A,%%B +FOR /F "delims=. tokens=3*" %%A IN (testfile) DO @echo 7:%%A,%%B +del testfile echo ------------ Testing del ------------ echo abc > file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7f4f724..0a7c75a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1234,9 +1234,14 @@ h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o(a)or_broken@h=%h i=a j=b k=c l=d e f g m h=%h i=a j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=a j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o +1:3.14,%B +2:3.14, ------ parameter splitting :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ :forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ +4:3.14,%B +5:3,14 +6:14, ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

1 0

Hugh McMaster : regedit: Don't check if heap_xalloc() succeeded in the caller.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 1291c6ded4d49c3ed44f19352c506ea7fd53580c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1291c6ded4d49c3ed44f1935… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:45 2018 +0000 regedit: Don't check if heap_xalloc() succeeded in the caller. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 3e5b9dd..00dcbec 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -157,14 +157,9 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); pData = heap_xalloc(cbData); - if (pData) - { - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); - lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - heap_free(pData); - } - else - lRet = ERROR_OUTOFMEMORY; + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); + lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); + heap_free(pData); if (lRet == ERROR_SUCCESS) EndDialog(hwndDlg, 1);

1 0

Hugh McMaster : regedit: Replace Hungarian notation used with struct edit_params members.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a131cff7a88e85575b71c15fbb31aa5c861cc839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a131cff7a88e85575b71c15f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:49 2018 +0000 regedit: Replace Hungarian notation used with struct edit_params members. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 63cb869..de96ded 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -38,10 +38,10 @@ static BOOL isDecimal; struct edit_params { - HKEY hKey; - LPCWSTR lpszValueName; - void *pData; - LONG cbData; + HKEY hkey; + const WCHAR *value_name; + void *data; + DWORD size; }; static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_list va_args) @@ -136,31 +136,31 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { struct edit_params *params; - LPBYTE pData; - LONG cbData; + BYTE *data; + LONG size; LONG lRet; switch(uMsg) { case WM_INITDIALOG: params = (struct edit_params *)lParam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - if (params->lpszValueName) - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->lpszValueName); + if (params->value_name) + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->value_name); else SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->size, (LPARAM)params->data); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); - cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); - pData = heap_xalloc(cbData); + size = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); + data = heap_xalloc(size); - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); - lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - heap_free(pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); + lRet = RegSetValueExW(params->hkey, params->value_name, 0, REG_BINARY, data, size); + heap_free(data); if (lRet == ERROR_SUCCESS) EndDialog(hwndDlg, 1); @@ -349,10 +349,10 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { struct edit_params params; - params.hKey = hKey; - params.lpszValueName = valueName; - params.pData = stringValueData; - params.cbData = len; + params.hkey = hKey; + params.value_name = valueName; + params.data = stringValueData; + params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); }

1 0

Alexandre Julliard : user32: Retrieve the screen metrics from the monitor information.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 56dfe6708b4ed7fea06f3fd69756e7795be0a4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=56dfe6708b4ed7fea06f3fd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 15:06:38 2018 +0200 user32: Retrieve the screen metrics from the monitor information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 50 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6a22f95..5f08640 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -458,20 +458,26 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A struct monitor_info { int count; + RECT primary_rect; RECT virtual_rect; }; static BOOL CALLBACK monitor_info_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { + MONITORINFO mi; struct monitor_info *info = (struct monitor_info *)lp; info->count++; UnionRect( &info->virtual_rect, &info->virtual_rect, rect ); + mi.cbSize = sizeof(mi); + if (GetMonitorInfoW( monitor, &mi ) && (mi.dwFlags & MONITORINFOF_PRIMARY)) + info->primary_rect = mi.rcMonitor; return TRUE; } static void get_monitors_info( struct monitor_info *info ) { info->count = 0; + SetRectEmpty( &info->primary_rect ); SetRectEmpty( &info->virtual_rect ); EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info ); } @@ -2527,6 +2533,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, */ INT WINAPI GetSystemMetrics( INT index ) { + struct monitor_info info; NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; ICONMETRICSW im; @@ -2536,16 +2543,6 @@ INT WINAPI GetSystemMetrics( INT index ) /* some metrics are dynamic */ switch (index) { - case SM_CXSCREEN: - hdc = get_display_dc(); - ret = GetDeviceCaps( hdc, HORZRES ); - release_display_dc( hdc ); - return ret; - case SM_CYSCREEN: - hdc = get_display_dc(); - ret = GetDeviceCaps( hdc, VERTRES ); - release_display_dc( hdc ); - return ret; case SM_CXVSCROLL: case SM_CYHSCROLL: ncm.cbSize = sizeof(ncm); @@ -2749,32 +2746,27 @@ INT WINAPI GetSystemMetrics( INT index ) return 0; /* FIXME */ case SM_MOUSEWHEELPRESENT: return 1; + case SM_CXSCREEN: + get_monitors_info( &info ); + return info.primary_rect.right - info.primary_rect.left; + case SM_CYSCREEN: + get_monitors_info( &info ); + return info.primary_rect.bottom - info.primary_rect.top; case SM_XVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.left; - } + get_monitors_info( &info ); + return info.virtual_rect.left; case SM_YVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.top; - } + get_monitors_info( &info ); + return info.virtual_rect.top; case SM_CXVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.right - rect.left; - } + get_monitors_info( &info ); + return info.virtual_rect.right - info.virtual_rect.left; case SM_CYVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.bottom - rect.top; - } + get_monitors_info( &info ); + return info.virtual_rect.bottom - info.virtual_rect.top; case SM_CMONITORS: - { - struct monitor_info info; get_monitors_info( &info ); return info.count; - } case SM_SAMEDISPLAYFORMAT: return 1; case SM_IMMENABLED:

1 0

Hugh McMaster : regedit: Always display DWORD values in hexadecimal when initializing the editor dialog.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 32f487bdb2483f96864411f948d35c8f0eaa8bdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f487bdb2483f96864411f9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:48 2018 +0000 regedit: Always display DWORD values in hexadecimal when initializing the editor dialog. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 00dcbec..63cb869 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -106,7 +106,8 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L case WM_INITDIALOG: SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); - CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, isDecimal ? IDC_DWORD_DEC : IDC_DWORD_HEX); + CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, IDC_DWORD_HEX); + isDecimal = FALSE; return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -280,9 +281,8 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } } else if ( type == REG_DWORD ) { - const WCHAR u[] = {'%','u',0}; - const WCHAR x[] = {'%','x',0}; - wsprintfW(stringValueData, isDecimal ? u : x, *((DWORD*)stringValueData)); + static const WCHAR x[] = {'%','x',0}; + wsprintfW(stringValueData, x, *((DWORD*)stringValueData)); if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData);

1 0

Hugh McMaster : regedit: Free allocated memory after calling GetValueName( ).
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a7a08e2927ec5b99b2f97fe2acffca4cdf0ef8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a08e2927ec5b99b2f97fe2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:46 2018 +0000 regedit: Free allocated memory after calling GetValueName(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 5 +++-- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index ed0c5bb..4d828c0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -853,10 +853,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_MODIFY: case ID_EDIT_MODIFY_BIN: { - LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); - WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + WCHAR *valueName = GetValueName(g_pChildWnd->hListWnd); + WCHAR *keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); ModifyValue(hWnd, hKeyRoot, keyPath, valueName); heap_free(keyPath); + heap_free(valueName); break; } case ID_EDIT_FIND: diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index f42f9c2..7584828 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -63,7 +63,7 @@ LPWSTR GetItemText(HWND hwndLV, UINT item) return NULL; } -LPCWSTR GetValueName(HWND hwndLV) +WCHAR *GetValueName(HWND hwndLV) { INT item; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index edcc901..ae03440 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -150,7 +150,7 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); HWND StartValueRename(HWND hwndLV); LPWSTR GetItemText(HWND hwndLV, UINT item); -LPCWSTR GetValueName(HWND hwndLV); +WCHAR *GetValueName(HWND hwndLV); BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); BOOL IsDefaultValue(HWND hwndLV, int i);

1 0

Jason Edmeades : cmd: Expand the storage space for qualifiers.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: dce5f89e48cc63668b90fbf2a435cbb54bcf4571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dce5f89e48cc63668b90fbf2… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:28 2018 +0100 cmd: Expand the storage space for qualifiers. When parsing a command, after the first '/' we store the characters away in quals. The command itself can be MAXSTRING in bytes, but the quals was limited to MAX_PATH. This is incorrect, as you can provide very long qualifiers as well. Expand the space to allow the maximum size possible. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d4d97a0..8d6eb6b 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -204,7 +204,7 @@ typedef struct _FOR_CONTEXT { * (uppercased and concatenated) and parameters entered, with environment * variables and batch parameters substitution already done. */ -extern WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +extern WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING]; extern DWORD errorlevel; extern BATCH_CONTEXT *context; extern FOR_CONTEXT forloopcontext; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0d02f1f..8fe2d57 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -38,7 +38,7 @@ extern struct env_stack *pushd_directories; BATCH_CONTEXT *context = NULL; DWORD errorlevel; -WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING]; BOOL interactive; FOR_CONTEXT forloopcontext; /* The 'for' loop context */ BOOL delayedsubst = FALSE; /* The current delayed substitution setting */

1 0

Hugh McMaster : regedit: Remove array already present in main.h.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 2686166cc1e07ab65749b21dfaa2734b200deb0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2686166cc1e07ab65749b21d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:44 2018 +0000 regedit: Remove array already present in main.h. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b938b61..4ef99ec 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); #define REG_VAL_BUF_SIZE 4096 -extern const WCHAR* reg_class_namesW[]; - static HKEY reg_class_keys[] = { HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA

1 0

Alex Henrie : winevulkan: Correct spelling of "of" in a comment.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a8df2c61d8d4541b7b55f50d86b59a12da2d1768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8df2c61d8d4541b7b55f50d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 15 23:28:40 2018 -0600 winevulkan: Correct spelling of "of" in a comment. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a06cfa1..34ef457 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); /* For now default to 4 as it felt like a reasonable version feature wise to support. * Don't support the optional vk_icdGetPhysicalDeviceProcAddr introduced in this version * as it is unlikely we will implement physical device extensions, which the loader is not - * aware off. Version 5 adds more extensive version checks. Something to tackle later. + * aware of. Version 5 adds more extensive version checks. Something to tackle later. */ #define WINE_VULKAN_ICD_VERSION 4

1 0