Ros-diffs October 2019

ros-diffs@reactos.org

23 participants
180 discussions

[reactos] 01/01: [COMPSTUI] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce73ea1e08984aa5bfe29… commit ce73ea1e08984aa5bfe29c3efd13def761dbfc5d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 22:52:52 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 22:52:52 2019 +0100 [COMPSTUI] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/compstui/compstui_main.c | 1 - media/doc/README.WINE | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/compstui/compstui_main.c b/dll/win32/compstui/compstui_main.c index 0225036108d..e05acdc0fad 100644 --- a/dll/win32/compstui/compstui_main.c +++ b/dll/win32/compstui/compstui_main.c @@ -27,7 +27,6 @@ #include "winuser.h" #include "ddk/compstui.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(compstui); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f61a9b89eed..0359c978b45 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -57,7 +57,7 @@ dll/win32/clusapi # Synced to WineStaging-3.3 dll/win32/comcat # Synced to WineStaging-3.3 dll/win32/comctl32 # Synced to WineStaging-3.3 dll/win32/comdlg32 # Synced to WineStaging-4.18 -dll/win32/compstui # Synced to WineStaging-3.3 +dll/win32/compstui # Synced to WineStaging-4.18 dll/win32/credui # Synced to WineStaging-4.0 dll/win32/crypt32 # Synced to WineStaging-4.0 dll/win32/cryptdlg # Synced to WineStaging-3.3

4 years, 10 months

[reactos] 01/01: [COMDLG32] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5981ef3eccee8a94f76ef… commit 5981ef3eccee8a94f76ef3b71d64c459569e4ee5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 22:52:27 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 22:52:27 2019 +0100 [COMDLG32] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/comdlg32/filedlg.c | 50 ++++++++++++++++++++---------------------- dll/win32/comdlg32/filedlg31.c | 35 ++++++++++++++--------------- dll/win32/comdlg32/fontdlg.c | 5 ++--- dll/win32/comdlg32/itemdlg.c | 2 +- dll/win32/comdlg32/printdlg.c | 23 ++++++++++--------- media/doc/README.WINE | 2 +- 6 files changed, 56 insertions(+), 61 deletions(-) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 4afdae19af3..d82cdf3daf6 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -45,9 +45,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <ctype.h> #include <stdlib.h> #include <stdarg.h> @@ -78,7 +75,6 @@ #include "filedlgbrowser.h" #include "shlwapi.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -324,7 +320,7 @@ static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos) HRESULT hr; WCHAR *str; - sprintfW(nameW, placeW, i); + swprintf(nameW, placeW, i); if (get_config_key_dword(hkey, nameW, &value)) { hr = SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); @@ -1032,13 +1028,13 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID result COMDLG32_GetDisplayNameOf( fodInfos->ShellInfos.pidlAbsCurrent, buffer ); if (len) { - p = buffer + strlenW(buffer); + p = buffer + lstrlenW(buffer); *p++ = '\\'; SendMessageW( fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, len + 1, (LPARAM)p ); } if (fodInfos->unicode) { - total = strlenW( buffer) + 1; + total = lstrlenW( buffer) + 1; if (result) lstrcpynW( result, buffer, size ); TRACE( "CDM_GETFILEPATH: returning %u %s\n", total, debugstr_w(result)); } @@ -1690,7 +1686,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) { /* 1. If win2000 or higher and filename contains a path, use it in preference over the lpstrInitialDir */ - if (win2000plus && *fodInfos->filename && strpbrkW(fodInfos->filename, szwSlash)) { + if (win2000plus && *fodInfos->filename && wcspbrk(fodInfos->filename, szwSlash)) { WCHAR tmpBuf[MAX_PATH]; WCHAR *nameBit; DWORD result; @@ -1783,7 +1779,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* 3. All except w2k+: if filename contains a path use it */ if (!win2000plus && fodInfos->filename && *fodInfos->filename && - strpbrkW(fodInfos->filename, szwSlash)) { + wcspbrk(fodInfos->filename, szwSlash)) { WCHAR tmpBuf[MAX_PATH]; WCHAR *nameBit; DWORD result; @@ -2346,7 +2342,7 @@ static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHK continue; } - if(!strcmpiW(module_name, value_data)){ + if(!wcsicmp(module_name, value_data)){ if(!hkey_ret) RegCloseKey(*hkey); if(stored_path) @@ -2384,7 +2380,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) WARN("GotModuleFileName failed: %d\n", GetLastError()); return; } - module_name = strrchrW(module_path, '\\'); + module_name = wcsrchr(module_path, '\\'); if(!module_name) module_name = module_path; else @@ -2400,7 +2396,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) DWORD path_len, final_len; /* use only the path segment of `filename' */ - path_ends = strrchrW(filename, '\\'); + path_ends = wcsrchr(filename, '\\'); path_len = path_ends - filename; final_len = path_len + lstrlenW(module_name) + 2; @@ -2472,7 +2468,7 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path) WARN("GotModuleFileName failed: %d\n", GetLastError()); return; } - module_name = strrchrW(module_path, '\\'); + module_name = wcsrchr(module_path, '\\'); if(!module_name) module_name = module_path; else @@ -2482,6 +2478,7 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path) TRACE("got MRU path: %s\n", wine_dbgstr_w(stored_path)); } #ifdef __REACTOS__ + static const WCHAR s_subkey[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', @@ -2699,7 +2696,8 @@ static void FILEDLG95_MRU_save_ext(LPCWSTR filename) RegCloseKey(hOpenSaveMRT); } } -#endif + +#endif /* __REACTOS__ */ void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) { @@ -2722,7 +2720,7 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, static const WCHAR szwInvalid[] = { '/',':','<','>','|', 0}; /* check for invalid chars */ - if((strpbrkW(lpstrPathAndFile+3, szwInvalid) != NULL) && !(flags & OFN_NOVALIDATE)) + if((wcspbrk(lpstrPathAndFile+3, szwInvalid) != NULL) && !(flags & OFN_NOVALIDATE)) { FILEDLG95_OnOpenMessage(hwnd, IDS_INVALID_FILENAME_TITLE, IDS_INVALID_FILENAME); return FALSE; @@ -2751,7 +2749,7 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, { static const WCHAR wszWild[] = { '*', '?', 0 }; /* if the last element is a wildcard do a search */ - if(strpbrkW(lpszTemp1, wszWild) != NULL) + if(wcspbrk(lpszTemp1, wszWild) != NULL) { nOpenAction = ONOPEN_SEARCH; break; @@ -2799,7 +2797,7 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, else if (!(flags & OFN_NOVALIDATE)) { if(*lpszTemp || /* points to trailing null for last path element */ - (lpwstrTemp[strlenW(lpwstrTemp)-1] == '\\')) /* or if last element ends in '\' */ + (lpwstrTemp[lstrlenW(lpwstrTemp)-1] == '\\')) /* or if last element ends in '\' */ { if(flags & OFN_PATHMUSTEXIST) { @@ -3080,7 +3078,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* update dialog data */ SetWindowTextW(fodInfos->DlgInfos.hwndFileName, PathFindFileNameW(lpstrPathAndFile)); -#else +#else /* __REACTOS__ */ if (! *ext && fodInfos->defext) { /* if no extension is specified with file name, then */ @@ -3099,12 +3097,12 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) { WCHAR* filterSearchIndex; filterExt = heap_alloc((lstrlenW(lpstrFilter) + 1) * sizeof(WCHAR)); - strcpyW(filterExt, lpstrFilter); + lstrcpyW(filterExt, lpstrFilter); /* if a semicolon-separated list of file extensions was given, do not include the semicolon or anything after it in the extension. example: if filterExt was "*.abc;*.def", it will become "*.abc" */ - filterSearchIndex = strchrW(filterExt, ';'); + filterSearchIndex = wcschr(filterExt, ';'); if (filterSearchIndex) { filterSearchIndex[0] = '\0'; @@ -3113,10 +3111,10 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* find the file extension by searching for the first dot in filterExt */ /* strip the * or anything else from the extension, "*.abc" becomes "abc" */ /* if the extension is invalid or contains a glob, ignore it */ - filterSearchIndex = strchrW(filterExt, '.'); - if (filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) + filterSearchIndex = wcschr(filterExt, '.'); + if (filterSearchIndex++ && !wcschr(filterSearchIndex, '*') && !wcschr(filterSearchIndex, '?')) { - strcpyW(filterExt, filterSearchIndex); + lstrcpyW(filterExt, filterSearchIndex); } else { @@ -3129,7 +3127,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) { /* use the default file extension */ filterExt = heap_alloc((lstrlenW(fodInfos->defext) + 1) * sizeof(WCHAR)); - strcpyW(filterExt, fodInfos->defext); + lstrcpyW(filterExt, fodInfos->defext); } if (*filterExt) /* ignore filterExt="" */ @@ -3154,7 +3152,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; } -#endif +#endif /* __REACTOS__ */ /* In Save dialog: check if the file already exists */ if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG @@ -4695,7 +4693,7 @@ short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) if (len == 0) return -1; - if(strpbrkW(lpFile, brkpoint)) + if(wcspbrk(lpFile, brkpoint)) return -1; len--; diff --git a/dll/win32/comdlg32/filedlg31.c b/dll/win32/comdlg32/filedlg31.c index 76ac503014e..53ef3eeb481 100644 --- a/dll/win32/comdlg32/filedlg31.c +++ b/dll/win32/comdlg32/filedlg31.c @@ -28,7 +28,6 @@ #include "winnls.h" #include "wingdi.h" #include "winuser.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" #include "winreg.h" @@ -107,13 +106,13 @@ static void FD31_StripEditControl(HWND hwnd) WCHAR temp[BUFFILE], *cp; GetDlgItemTextW( hwnd, edt1, temp, ARRAY_SIZE(temp)); - cp = strrchrW(temp, '\\'); + cp = wcsrchr(temp, '\\'); if (cp != NULL) { - strcpyW(temp, cp+1); + lstrcpyW(temp, cp+1); } - cp = strrchrW(temp, ':'); + cp = wcsrchr(temp, ':'); if (cp != NULL) { - strcpyW(temp, cp+1); + lstrcpyW(temp, cp+1); } /* FIXME: shouldn't we do something with the result here? ;-) */ } @@ -200,7 +199,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) TRACE("Using filter %s\n", debugstr_w(filter)); SendMessageW(hdlg, LB_RESETCONTENT, 0, 0); while (filter) { - scptr = strchrW(filter, ';'); + scptr = wcschr(filter, ';'); if (scptr) *scptr = 0; while (*filter == ' ') filter++; TRACE("Using file spec %s\n", debugstr_w(filter)); @@ -211,7 +210,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) } /* list of directories */ - strcpyW(buffer, FILE_star); + lstrcpyW(buffer, FILE_star); if (GetDlgItem(hWnd, lst2) != 0) { lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); @@ -342,7 +341,7 @@ static void FD31_UpdateResult(const FD31_DATA *lfs, const WCHAR *tmpstr) tmpstr2[0] = '\0'; else GetCurrentDirectoryW(BUFFILE, tmpstr2); - lenstr2 = strlenW(tmpstr2); + lenstr2 = lstrlenW(tmpstr2); if (lenstr2 > 3) tmpstr2[lenstr2++]='\\'; lstrcpynW(tmpstr2+lenstr2, tmpstr, BUFFILE-lenstr2); @@ -422,15 +421,15 @@ static LRESULT FD31_DirListDblClick( const FD31_DATA *lfs ) pstr = heap_alloc(BUFFILEALLOC); SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet, (LPARAM)pstr); - strcpyW( tmpstr, pstr ); + lstrcpyW( tmpstr, pstr ); heap_free(pstr); /* get the selected directory in tmpstr */ if (tmpstr[0] == '[') { tmpstr[lstrlenW(tmpstr) - 1] = 0; - strcpyW(tmpstr,tmpstr+1); + lstrcpyW(tmpstr,tmpstr+1); } - strcatW(tmpstr, FILE_bslash); + lstrcatW(tmpstr, FILE_bslash); FD31_ScanDir(lfs->ofnW, hWnd, tmpstr); /* notify the app */ @@ -486,11 +485,11 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) LPWSTR pBeginFileName, pstr2; WCHAR tmpstr2[BUFFILE]; - pBeginFileName = strrchrW(path, '\\'); + pBeginFileName = wcsrchr(path, '\\'); if (pBeginFileName == NULL) - pBeginFileName = strrchrW(path, ':'); + pBeginFileName = wcsrchr(path, ':'); - if (strchrW(path,'*') != NULL || strchrW(path,'?') != NULL) + if (wcschr(path,'*') != NULL || wcschr(path,'?') != NULL) { /* edit control contains wildcards */ if (pBeginFileName != NULL) @@ -500,7 +499,7 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) } else { - strcpyW(tmpstr2, path); + lstrcpyW(tmpstr2, path); if(!(lfs->ofnW->Flags & OFN_NOVALIDATE)) *path = 0; } @@ -516,7 +515,7 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) pstr2 = path + lstrlenW(path); if (pBeginFileName == NULL || *(pBeginFileName + 1) != 0) - strcatW(path, FILE_bslash); + lstrcatW(path, FILE_bslash); /* if ScanDir succeeds, we have changed the directory */ if (FD31_ScanDir(lfs->ofnW, hWnd, path)) @@ -538,7 +537,7 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) { return FALSE; } - strcpyW(path, tmpstr2); + lstrcpyW(path, tmpstr2); } else SetDlgItemTextW( hWnd, edt1, path ); @@ -602,7 +601,7 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, if (ofnW->lpstrFile) { LPWSTR str = ofnW->lpstrFile; - LPWSTR ptr = strrchrW(str, '\\'); + LPWSTR ptr = wcsrchr(str, '\\'); str[lstrlenW(str) + 1] = '\0'; *ptr = 0; } diff --git a/dll/win32/comdlg32/fontdlg.c b/dll/win32/comdlg32/fontdlg.c index 9f9f48aeea2..ecb6ce0e33a 100644 --- a/dll/win32/comdlg32/fontdlg.c +++ b/dll/win32/comdlg32/fontdlg.c @@ -33,7 +33,6 @@ #include "dlgs.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "cderr.h" #include "cdlg.h" @@ -423,7 +422,7 @@ static BOOL AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf) if ( (!(lpcf->Flags & CF_LIMITSIZE)) || ((lpcf->Flags & CF_LIMITSIZE) && (h >= lpcf->nSizeMin) && (h <= lpcf->nSizeMax))) { - sprintfW(buffer, fontsizefmtW, h); + swprintf(buffer, fontsizefmtW, h); j=SendMessageW(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer); if (j==CB_ERR) { @@ -905,7 +904,7 @@ static INT get_dialog_font_point_size(HWND hDlg, CHOOSEFONTW *cf) WCHAR buffW[8], *endptrW; GetDlgItemTextW(hDlg, cmb3, buffW, ARRAY_SIZE(buffW)); - size = strtolW(buffW, &endptrW, 10); + size = wcstol(buffW, &endptrW, 10); invalid_size = size == 0 && *endptrW; if (size == 0) diff --git a/dll/win32/comdlg32/itemdlg.c b/dll/win32/comdlg32/itemdlg.c index 09f5be5d501..9655f968163 100644 --- a/dll/win32/comdlg32/itemdlg.c +++ b/dll/win32/comdlg32/itemdlg.c @@ -1286,7 +1286,7 @@ static UINT ctrl_container_resize(FileDialogImpl *This, UINT container_width) /* Move the controls to their final destination */ - cur_col_pos = 0, cur_row_pos = 0; + cur_col_pos = 0; cur_row_pos = 0; LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) { if(ctrl->cdcstate & CDCS_VISIBLE) diff --git a/dll/win32/comdlg32/printdlg.c b/dll/win32/comdlg32/printdlg.c index 69e9aeb08da..0da728b1247 100644 --- a/dll/win32/comdlg32/printdlg.c +++ b/dll/win32/comdlg32/printdlg.c @@ -40,7 +40,6 @@ #include "objbase.h" #include "commdlg.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dlgs.h" @@ -157,7 +156,7 @@ static LPWSTR strdupW(LPCWSTR p) DWORD len; if(!p) return NULL; - len = (strlenW(p) + 1) * sizeof(WCHAR); + len = (lstrlenW(p) + 1) * sizeof(WCHAR); ret = HeapAlloc(GetProcessHeap(), 0, len); memcpy(ret, p, len); return ret; @@ -527,7 +526,7 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName, DWORD dwBufLen = ARRAY_SIZE(bufW); const WCHAR *p; - p = strrchrW( DeviceDriverName, '\\' ); + p = wcsrchr( DeviceDriverName, '\\' ); if (p) DeviceDriverName = p + 1; size = sizeof(WCHAR)*lstrlenW(DeviceDriverName) + 2 @@ -2818,9 +2817,9 @@ static void pagesetup_set_devnames(pagesetup_data *data, LPCWSTR drv, LPCWSTR de if(data->unicode) { - drv_len = (strlenW(drv) + 1) * sizeof(WCHAR); - dev_len = (strlenW(devname) + 1) * sizeof(WCHAR); - port_len = (strlenW(port) + 1) * sizeof(WCHAR); + drv_len = (lstrlenW(drv) + 1) * sizeof(WCHAR); + dev_len = (lstrlenW(devname) + 1) * sizeof(WCHAR); + port_len = (lstrlenW(port) + 1) * sizeof(WCHAR); } else { @@ -2842,15 +2841,15 @@ static void pagesetup_set_devnames(pagesetup_data *data, LPCWSTR drv, LPCWSTR de WCHAR *ptr = (WCHAR *)(dn + 1); len = sizeof(DEVNAMES) / sizeof(WCHAR); dn->wDriverOffset = len; - strcpyW(ptr, drv); + lstrcpyW(ptr, drv); ptr += drv_len / sizeof(WCHAR); len += drv_len / sizeof(WCHAR); dn->wDeviceOffset = len; - strcpyW(ptr, devname); + lstrcpyW(ptr, devname); ptr += dev_len / sizeof(WCHAR); len += dev_len / sizeof(WCHAR); dn->wOutputOffset = len; - strcpyW(ptr, port); + lstrcpyW(ptr, port); } else { @@ -3248,7 +3247,7 @@ static void margin_edit_notification(HWND hDlg, const pagesetup_data *data, WORD WCHAR *end; WCHAR decimal = get_decimal_sep(); - val = strtolW(buf, &end, 10); + val = wcstol(buf, &end, 10); if(end != buf || *end == decimal) { int mult = is_metric(data) ? 100 : 1000; @@ -3259,7 +3258,7 @@ static void margin_edit_notification(HWND hDlg, const pagesetup_data *data, WORD { end++; mult /= 10; - if(isdigitW(*end)) + if(iswdigit(*end)) val += (*end - '0') * mult; else break; @@ -3640,7 +3639,7 @@ static LRESULT CALLBACK pagesetup_margin_editproc(HWND hwnd, UINT msg, WPARAM wp { WCHAR decimal = get_decimal_sep(); WCHAR wc = (WCHAR)wparam; - if(!isdigitW(wc) && wc != decimal && wc != VK_BACK) return 0; + if(!iswdigit(wc) && wc != decimal && wc != VK_BACK) return 0; } return CallWindowProcW(edit_wndproc, hwnd, msg, wparam, lparam); } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index e1d75bff533..f61a9b89eed 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -56,7 +56,7 @@ dll/win32/cabinet # Synced to WineStaging-4.18 dll/win32/clusapi # Synced to WineStaging-3.3 dll/win32/comcat # Synced to WineStaging-3.3 dll/win32/comctl32 # Synced to WineStaging-3.3 -dll/win32/comdlg32 # Synced to WineStaging-4.0 +dll/win32/comdlg32 # Synced to WineStaging-4.18 dll/win32/compstui # Synced to WineStaging-3.3 dll/win32/credui # Synced to WineStaging-4.0 dll/win32/crypt32 # Synced to WineStaging-4.0

4 years, 10 months

[reactos] 01/01: [PSDK] Update commctrl.h. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ddec3d9449425abdc846… commit 5ddec3d9449425abdc846fb6c44caf9f038b163e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 22:51:35 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 22:51:35 2019 +0100 [PSDK] Update commctrl.h. CORE-16441 --- sdk/include/psdk/commctrl.h | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/commctrl.h b/sdk/include/psdk/commctrl.h index 9c997410838..942d07c0883 100644 --- a/sdk/include/psdk/commctrl.h +++ b/sdk/include/psdk/commctrl.h @@ -242,9 +242,20 @@ extern "C" { #define WMN_LAST (0U-1200U) #endif +#define BCSIF_GLYPH 0x00000001 +#define BCSIF_IMAGE 0x00000002 +#define BCSIF_STYLE 0x00000004 +#define BCSIF_SIZE 0x00000008 + +#define BCSS_STRETCH 0x00000002 +#define BCSS_IMAGE 0x00000008 + #define BCN_FIRST (0U-1250U) #define BCN_LAST (0U-1350U) +#define BCN_HOTITEMCHANGE (BCN_FIRST + 1) +#define BCN_DROPDOWN (BCN_FIRST + 2) + #define MSGF_COMMCTRL_BEGINDRAG 0x4200 #define MSGF_COMMCTRL_SIZEHEADER 0x4201 #define MSGF_COMMCTRL_DRAGSELECT 0x4202 @@ -910,6 +921,19 @@ extern "C" { #endif /* !NOHEADER */ +typedef struct tagBUTTON_SPLITINFO { + UINT mask; + HIMAGELIST himlGlyph; + UINT uSplitStyle; + SIZE size; +} BUTTON_SPLITINFO, *PBUTTON_SPLITINFO; + +typedef struct tagNMBCDROPDOWN { + NMHDR hdr; + RECT rcButton; +} NMBCDROPDOWN; + + #ifndef NOTOOLBAR #define TOOLBARCLASSNAMEW L"ToolbarWindow32" @@ -4625,6 +4649,9 @@ typedef struct { #define BCM_SETSHIELD (BCM_FIRST+0xC) #define Button_SetElevationRequiredState(hwnd,frequired) (BOOL)SNDMSG((hwnd),BCM_SETSHIELD,0,(LPARAM)(frequired)) +#define BCM_SETDROPDOWNSTATE (BCM_FIRST + 6) +#define BCM_SETSPLITINFO (BCM_FIRST + 7) +#define BCM_GETSPLITINFO (BCM_FIRST + 8) #define BCM_SETNOTE (BCM_FIRST + 9) #define BCM_GETNOTE (BCM_FIRST + 10) #define BCM_GETNOTELENGTH (BCM_FIRST + 11) @@ -4634,8 +4661,6 @@ typedef struct { DWORD dwFlags; } NMBCHOTITEM,*LPNMBCHOTITEM; -#define BCN_HOTITEMCHANGE (BCN_FIRST+0x1) - #define BST_HOT 0x200 #define BS_SPLITBUTTON 0x0000000C

4 years, 10 months

[reactos] 01/01: [COMCTL32] Sync listview.c and progress.c with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00f14ee1f22a1c2854624… commit 00f14ee1f22a1c285462459f859fa17c90ccc19f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 22:51:10 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 22:51:10 2019 +0100 [COMCTL32] Sync listview.c and progress.c with Wine Staging 4.18. CORE-16441 --- dll/win32/comctl32/listview.c | 154 ++++++++++++++++++++++++++---------------- dll/win32/comctl32/progress.c | 31 +++++---- 2 files changed, 112 insertions(+), 73 deletions(-) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index fb40d227df5..764a127f78b 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -124,9 +124,6 @@ * -- LVGroupComparE */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <ctype.h> #include <string.h> @@ -145,7 +142,6 @@ #include "uxtheme.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(listview); @@ -211,6 +207,13 @@ typedef struct tagDELAYED_ITEM_EDIT INT iItem; } DELAYED_ITEM_EDIT; +enum notification_mask +{ + NOTIFY_MASK_ITEM_CHANGE = 0x1, + NOTIFY_MASK_END_LABEL_EDIT = 0x2, + NOTIFY_MASK_UNMASK_ALL = 0xffffffff +}; + typedef struct tagLISTVIEW_INFO { /* control window */ @@ -225,7 +228,7 @@ typedef struct tagLISTVIEW_INFO /* notification window */ SHORT notifyFormat; HWND hwndNotify; - BOOL bDoChangeNotify; /* send change notification messages? */ + DWORD notify_mask; UINT uCallbackMask; /* tooltips */ @@ -993,7 +996,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP } else if (return_unicode && (pdi->hdr.code == LVN_GETDISPINFOW)) { - strcpyW(ret_text, pdi->item.pszText); + lstrcpyW(ret_text, pdi->item.pszText); } else if (return_ansi) /* note : pointer can be changed by app ! */ { @@ -1311,21 +1314,19 @@ static inline void iterator_destroy(const ITERATOR *i) /*** * Create an empty iterator. */ -static inline BOOL iterator_empty(ITERATOR* i) +static inline void iterator_empty(ITERATOR* i) { ZeroMemory(i, sizeof(*i)); i->nItem = i->nSpecial = i->range.lower = i->range.upper = -1; - return TRUE; } /*** * Create an iterator over a range. */ -static inline BOOL iterator_rangeitems(ITERATOR* i, RANGE range) +static inline void iterator_rangeitems(ITERATOR* i, RANGE range) { iterator_empty(i); i->range = range; - return TRUE; } /*** @@ -1333,11 +1334,10 @@ static inline BOOL iterator_rangeitems(ITERATOR* i, RANGE range) * Please note that the iterator will take ownership of the ranges, * and will free them upon destruction. */ -static inline BOOL iterator_rangesitems(ITERATOR* i, RANGES ranges) +static inline void iterator_rangesitems(ITERATOR* i, RANGES ranges) { iterator_empty(i); i->ranges = ranges; - return TRUE; } /*** @@ -1347,12 +1347,16 @@ static inline BOOL iterator_rangesitems(ITERATOR* i, RANGES ranges) static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* infoPtr, const RECT *frame) { RECT rcItem, rcTemp; - - /* in case we fail, we want to return an empty iterator */ - if (!iterator_empty(i)) return FALSE; + RANGES ranges; TRACE("(frame=%s)\n", wine_dbgstr_rect(frame)); + /* in case we fail, we want to return an empty iterator */ + iterator_empty(i); + + if (infoPtr->nItemCount == 0) + return TRUE; + if (infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON) { INT nItem; @@ -1363,7 +1367,8 @@ static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* info if (IntersectRect(&rcTemp, &rcItem, frame)) i->nSpecial = infoPtr->nFocusedItem; } - if (!(iterator_rangesitems(i, ranges_create(50)))) return FALSE; + if (!(ranges = ranges_create(50))) return FALSE; + iterator_rangesitems(i, ranges); /* to do better here, we need to have PosX, and PosY sorted */ TRACE("building icon ranges:\n"); for (nItem = 0; nItem < infoPtr->nItemCount; nItem++) @@ -1387,7 +1392,7 @@ static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* info range.lower = max(frame->top / infoPtr->nItemHeight, 0); range.upper = min((frame->bottom - 1) / infoPtr->nItemHeight, infoPtr->nItemCount - 1) + 1; if (range.upper <= range.lower) return TRUE; - if (!iterator_rangeitems(i, range)) return FALSE; + iterator_rangeitems(i, range); TRACE(" report=%s\n", debugrange(&i->range)); } else @@ -1419,7 +1424,8 @@ static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* info if (nLastCol < nFirstCol || nLastRow < nFirstRow) return TRUE; - if (!(iterator_rangesitems(i, ranges_create(nLastCol - nFirstCol + 1)))) return FALSE; + if (!(ranges = ranges_create(nLastCol - nFirstCol + 1))) return FALSE; + iterator_rangesitems(i, ranges); TRACE("building list ranges:\n"); for (nCol = nFirstCol; nCol <= nLastCol; nCol++) { @@ -1460,7 +1466,11 @@ static BOOL iterator_visibleitems(ITERATOR *i, const LISTVIEW_INFO *infoPtr, HDC INT rgntype; rgntype = GetClipBox(hdc, &rcClip); - if (rgntype == NULLREGION) return iterator_empty(i); + if (rgntype == NULLREGION) + { + iterator_empty(i); + return TRUE; + } if (!iterator_frameditems(i, infoPtr, &rcClip)) return FALSE; if (rgntype == SIMPLEREGION) return TRUE; @@ -1746,7 +1756,9 @@ static inline void LISTVIEW_InvalidateItem(const LISTVIEW_INFO *infoPtr, INT nIt { RECT rcBox; - if(!is_redrawing(infoPtr)) return; + if (!is_redrawing(infoPtr) || nItem < 0 || nItem >= infoPtr->nItemCount) + return; + LISTVIEW_GetItemBox(infoPtr, nItem, &rcBox); LISTVIEW_InvalidateRect(infoPtr, &rcBox); } @@ -1763,7 +1775,7 @@ static inline void LISTVIEW_InvalidateSubItem(const LISTVIEW_INFO *infoPtr, INT LISTVIEW_GetHeaderRect(infoPtr, nSubItem, &rcBox); rcBox.top = 0; rcBox.bottom = infoPtr->nItemHeight; - OffsetRect(&rcBox, Origin.x + Position.x, Origin.y + Position.y); + OffsetRect(&rcBox, Origin.x, Origin.y + Position.y); LISTVIEW_InvalidateRect(infoPtr, &rcBox); } @@ -1815,7 +1827,7 @@ static inline INT LISTVIEW_GetCountPerColumn(const LISTVIEW_INFO *infoPtr) { INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top; - return max(nListHeight / infoPtr->nItemHeight, 1); + return infoPtr->nItemHeight ? max(nListHeight / infoPtr->nItemHeight, 1) : 0; } @@ -1873,7 +1885,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L if (!charCode || !keyData || infoPtr->nItemCount == 0) return 0; /* only allow the valid WM_CHARs through */ - if (!isalnumW(charCode) && + if (!iswalnum(charCode) && charCode != '.' && charCode != '`' && charCode != '!' && charCode != '@' && charCode != '#' && charCode != '$' && charCode != '%' && charCode != '^' && charCode != '&' && @@ -3524,13 +3536,13 @@ Parameters: */ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction) { - BOOL old_change = infoPtr->bDoChangeNotify; + DWORD old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; focus = shift_item(infoPtr, focus, item, direction); if (focus != infoPtr->nFocusedItem) LISTVIEW_SetItemFocus(infoPtr, focus); - infoPtr->bDoChangeNotify = old_change; + infoPtr->notify_mask |= old_mask; } /** @@ -3573,8 +3585,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) INT nLast = max(infoPtr->nSelectionMark, nItem); HWND hwndSelf = infoPtr->hwndSelf; NMLVODSTATECHANGE nmlv; + DWORD old_mask; LVITEMW item; - BOOL bOldChange; INT i; /* Temporarily disable change notification @@ -3582,8 +3594,9 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) * only one LVN_ODSTATECHANGED notification. * See MSDN documentation for LVN_ITEMCHANGED. */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; if (nFirst == -1) nFirst = nItem; @@ -3602,7 +3615,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= old_mask; return TRUE; } @@ -3621,9 +3634,9 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) { RANGES selection; + DWORD old_mask; LVITEMW item; ITERATOR i; - BOOL bOldChange; if (!(selection = ranges_create(100))) return; @@ -3673,8 +3686,9 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* disable per item notifications on LVS_OWNERDATA style FIXME: single LVN_ODSTATECHANGED should be used */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); @@ -3685,8 +3699,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* this will also destroy the selection */ iterator_destroy(&i); - infoPtr->bDoChangeNotify = bOldChange; - + infoPtr->notify_mask |= old_mask; LISTVIEW_SetItemFocus(infoPtr, nItem); } @@ -4265,8 +4278,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = lpLVItem->iItem; - nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); - nmlv.uOldState = item.state; + if (lpLVItem->mask & LVIF_STATE) + { + nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); + nmlv.uOldState = item.state; + } nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; @@ -4274,7 +4290,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if(lpItem && !isNew && infoPtr->bDoChangeNotify) + if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4367,7 +4383,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + if (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE) + notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); return TRUE; } @@ -5265,11 +5282,15 @@ enddraw: /* Draw marquee rectangle if appropriate */ if (infoPtr->bMarqueeSelect) +#ifdef __REACTOS__ { SetBkColor(hdc, RGB(255, 255, 255)); SetTextColor(hdc, RGB(0, 0, 0)); DrawFocusRect(hdc, &infoPtr->marqueeDrawRect); } +#else + DrawFocusRect(hdc, &infoPtr->marqueeDrawRect); +#endif if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); @@ -5938,9 +5959,13 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL dispInfo.item.pszText = same ? NULL : pszText; dispInfo.item.cchTextMax = textlenT(dispInfo.item.pszText, isW); + infoPtr->notify_mask &= ~NOTIFY_MASK_END_LABEL_EDIT; + /* Do we need to update the Item Text */ res = notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW); + infoPtr->notify_mask |= NOTIFY_MASK_END_LABEL_EDIT; + infoPtr->nEditLabelItem = -1; infoPtr->hwndEdit = 0; @@ -6409,7 +6434,7 @@ again: { if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) { - WCHAR *p = strstrW(lvItem.pszText, lpFindInfo->psz); + WCHAR *p = wcsstr(lvItem.pszText, lpFindInfo->psz); if (!p || p != lvItem.pszText) continue; } else @@ -9000,7 +9025,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE if (nItem == -1) { UINT oldstate = 0; - BOOL notify; + DWORD old_mask; /* special case optimization for recurring attempt to deselect all */ if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr)) @@ -9013,10 +9038,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE /* focus all isn't allowed */ if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; - notify = infoPtr->bDoChangeNotify; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) { - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; if (!(lvItem.state & LVIS_SELECTED) && LISTVIEW_GetSelectedCount(infoPtr)) oldstate |= LVIS_SELECTED; if (infoPtr->nFocusedItem != -1) oldstate |= LVIS_FOCUSED; @@ -9030,7 +9055,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { NMLISTVIEW nmlv; - infoPtr->bDoChangeNotify = notify; + infoPtr->notify_mask |= old_mask; nmlv.iItem = -1; nmlv.iSubItem = 0; @@ -9514,7 +9539,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->nHotItem = -1; infoPtr->redraw = TRUE; infoPtr->bNoItemMetrics = TRUE; - infoPtr->bDoChangeNotify = TRUE; + infoPtr->notify_mask = NOTIFY_MASK_UNMASK_ALL; infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); @@ -9909,7 +9934,7 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, /* carry on only if it really changed */ if (nNewScrollPos == nOldScrollPos) return 0; - if (infoPtr->hwndHeader) LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos); + LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos); /* now adjust to client coordinates */ nScrollDiff = nOldScrollPos - nNewScrollPos; @@ -9923,7 +9948,7 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; TRACE("(wheelDelta=%d)\n", wheelDelta); @@ -9952,8 +9977,8 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { int cLineScroll; pulScrollLines = min((UINT)LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); - cLineScroll = pulScrollLines * (float)infoPtr->cWheelRemainder / WHEEL_DELTA; - infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + cLineScroll = pulScrollLines * infoPtr->cWheelRemainder / WHEEL_DELTA; + infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / pulScrollLines; LISTVIEW_VScroll(infoPtr, SB_INTERNAL, -cLineScroll); } break; @@ -10248,7 +10273,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN { if ((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && (lvHitTestInfo.flags & LVHT_ONITEMSTATEICON)) { + notify_click(infoPtr, NM_CLICK, &lvHitTestInfo); toggle_checkbox_state(infoPtr, nItem); + infoPtr->bLButtonDown = FALSE; return 0; } @@ -11099,13 +11126,21 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); } - /* if control created invisible header isn't created */ + /* When ListView control is created invisible, header isn't created right away. */ if (infoPtr->hwndHeader) { - HDLAYOUT hl; - WINDOWPOS wp; + POINT origin; + WINDOWPOS wp; + HDLAYOUT hl; + RECT rect; + + LISTVIEW_GetOrigin(infoPtr, &origin); - hl.prc = &infoPtr->rcList; + rect = infoPtr->rcList; + rect.left += origin.x; + rect.top += origin.y; + + hl.prc = &rect; hl.pwpos = &wp; SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); @@ -11145,14 +11180,13 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - UINT uNewView = lpss->styleNew & LVS_TYPEMASK; - UINT uOldView = lpss->styleOld & LVS_TYPEMASK; + UINT uNewView, uOldView; UINT style; TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); - if (wStyleType != GWL_STYLE) return 0; + if (wStyleType != GWL_STYLE || lpss->styleNew == infoPtr->dwStyle) return 0; infoPtr->dwStyle = lpss->styleNew; @@ -11164,6 +11198,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, ((lpss->styleNew & WS_VSCROLL) == 0)) ShowScrollBar(infoPtr->hwndSelf, SB_VERT, FALSE); + uNewView = lpss->styleNew & LVS_TYPEMASK; + uOldView = lpss->styleOld & LVS_TYPEMASK; + if (uNewView != uOldView) { HIMAGELIST himl; @@ -11949,8 +11986,9 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP } case EN_KILLFOCUS: { - LISTVIEW_CancelEditLabel(infoPtr); - break; + if (infoPtr->notify_mask & NOTIFY_MASK_END_LABEL_EDIT) + LISTVIEW_CancelEditLabel(infoPtr); + break; } default: diff --git a/dll/win32/comctl32/progress.c b/dll/win32/comctl32/progress.c index 28d9fd2fd37..268bdac5da2 100644 --- a/dll/win32/comctl32/progress.c +++ b/dll/win32/comctl32/progress.c @@ -652,23 +652,24 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case PBM_STEPIT: { - INT oldVal; - oldVal = infoPtr->CurVal; - infoPtr->CurVal += infoPtr->Step; - if (infoPtr->CurVal > infoPtr->MaxVal) - { - infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MinVal; - } - if (infoPtr->CurVal < infoPtr->MinVal) + int oldVal = infoPtr->CurVal; + + if (infoPtr->MinVal != infoPtr->MaxVal) { - infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MaxVal; + infoPtr->CurVal += infoPtr->Step; + if (infoPtr->CurVal > infoPtr->MaxVal) + infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MinVal; + if (infoPtr->CurVal < infoPtr->MinVal) + infoPtr->CurVal = (infoPtr->CurVal - infoPtr->MinVal) % (infoPtr->MaxVal - infoPtr->MinVal) + infoPtr->MaxVal; + + if (oldVal != infoPtr->CurVal) + { + TRACE("PBM_STEPIT: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); + PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow( infoPtr->Self ); + } } - if(oldVal != infoPtr->CurVal) - { - TRACE("PBM_STEPIT: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); - PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); - UpdateWindow( infoPtr->Self ); - } + return oldVal; }

4 years, 10 months

[reactos] 01/01: [CABINET_WINETEST] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22c0673bd9043da34c1da… commit 22c0673bd9043da34c1da1c5d7fdb9b80e147b0e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 22:50:44 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 22:50:44 2019 +0100 [CABINET_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/cabinet/fdi.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/rostests/winetests/cabinet/fdi.c b/modules/rostests/winetests/cabinet/fdi.c index 80f6a3c5716..732f816bda3 100644 --- a/modules/rostests/winetests/cabinet/fdi.c +++ b/modules/rostests/winetests/cabinet/fdi.c @@ -20,6 +20,8 @@ */ #include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> #include <windows.h> #include "fci.h" #include "fdi.h" @@ -31,16 +33,6 @@ static CHAR CURR_DIR[MAX_PATH]; -/* avoid including CRT headers */ -#ifndef _O_BINARY -# define _O_BINARY 0x8000 -#endif - -#ifndef _S_IREAD -# define _S_IREAD 0x0100 -# define _S_IWRITE 0x0080 -#endif - #include <pshpack1.h> struct CFHEADER @@ -784,7 +776,7 @@ static UINT CDECL fdi_mem_read(INT_PTR hf, void *pv, UINT cb) static UINT CDECL fdi_mem_write(INT_PTR hf, void *pv, UINT cb) { - static const char expected[12] = "Hello World!"; + static const char expected[] = "Hello World!"; trace("mem_write(%#lx,%p,%u)\n", hf, pv, cb);

4 years, 10 months

[reactos] 01/01: [CABINET] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e4180451f32526433151… commit 0e4180451f3252643315118d552d6d2f569a53c1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 22:50:17 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 22:50:17 2019 +0100 [CABINET] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/cabinet/fci.c | 14 +++++++------- media/doc/README.WINE | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/cabinet/fci.c b/dll/win32/cabinet/fci.c index 167ca747d03..2f6ded6845a 100644 --- a/dll/win32/cabinet/fci.c +++ b/dll/win32/cabinet/fci.c @@ -174,7 +174,7 @@ typedef struct FCI_Int cab_UWORD cFolders; cab_UWORD cFiles; cab_ULONG cDataBlocks; - cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ + cab_ULONG cbFileRemainder; /* uncompressed, yet to be written data */ /* of spanned file of a spanning folder of a spanning cabinet */ struct temp_file data; BOOL fNewPrevious; @@ -839,7 +839,7 @@ static BOOL add_data_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG * static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG payload ) { cab_ULONG sizeOfFiles = 0, sizeOfFilesPrev; - cab_ULONG cbFileRemainer = 0; + cab_ULONG cbFileRemainder = 0; struct file *file, *next; LIST_FOR_EACH_ENTRY_SAFE( file, next, &fci->files_list, struct file, entry ) @@ -852,10 +852,10 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG sizeOfFilesPrev = sizeOfFiles; /* set complete size of all processed files */ - if (file->folder == cffileCONTINUED_FROM_PREV && fci->cbFileRemainer != 0) + if (file->folder == cffileCONTINUED_FROM_PREV && fci->cbFileRemainder != 0) { - sizeOfFiles += fci->cbFileRemainer; - fci->cbFileRemainer = 0; + sizeOfFiles += fci->cbFileRemainder; + fci->cbFileRemainder = 0; } else sizeOfFiles += file->size; @@ -888,7 +888,7 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG { /* The size of the uncompressed, data of a spanning file in a */ /* spanning data */ - cbFileRemainer = sizeOfFiles - payload; + cbFileRemainder = sizeOfFiles - payload; } file->folder = cffileCONTINUED_FROM_PREV; } @@ -899,7 +899,7 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG fci->files_size -= size; } } - fci->cbFileRemainer = cbFileRemainer; + fci->cbFileRemainder = cbFileRemainder; return TRUE; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index ae8472fc556..e1d75bff533 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -52,7 +52,7 @@ dll/win32/atl100 # Synced to WineStaging-3.3 dll/win32/avifil32 # Synced to WineStaging-4.18 dll/win32/bcrypt # Synced to WineStaging-1.9.23 dll/win32/browseui # Out of sync -dll/win32/cabinet # Synced to WineStaging-3.3 +dll/win32/cabinet # Synced to WineStaging-4.18 dll/win32/clusapi # Synced to WineStaging-3.3 dll/win32/comcat # Synced to WineStaging-3.3 dll/win32/comctl32 # Synced to WineStaging-3.3

4 years, 10 months

[reactos] 01/01: [AVIFIL32] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=854ed510356e31187ff01… commit 854ed510356e31187ff01521276658ad29d64a81 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 22:49:48 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 22:49:48 2019 +0100 [AVIFIL32] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/avifil32/api.c | 3 +- dll/win32/avifil32/avifile.c | 3 +- dll/win32/avifil32/avifile_ifaces.idl | 105 ---------------------------------- dll/win32/avifil32/wavfile.c | 3 +- media/doc/README.WINE | 2 +- 5 files changed, 4 insertions(+), 112 deletions(-) diff --git a/dll/win32/avifil32/api.c b/dll/win32/avifil32/api.c index 37fa94169a3..a7f84ba3bce 100644 --- a/dll/win32/avifil32/api.c +++ b/dll/win32/avifil32/api.c @@ -38,7 +38,6 @@ #include "avifile_private.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -155,7 +154,7 @@ static BOOL AVIFILE_GetFileHandlerByExtension(LPCWSTR szFile, LPCLSID lpclsid) { CHAR szRegKey[25]; CHAR szValue[100]; - LPWSTR szExt = strrchrW(szFile, '.'); + LPWSTR szExt = wcsrchr(szFile, '.'); LONG len = ARRAY_SIZE(szValue); if (szExt == NULL) diff --git a/dll/win32/avifil32/avifile.c b/dll/win32/avifil32/avifile.c index 33c28b145df..f3cf484d91f 100644 --- a/dll/win32/avifil32/avifile.c +++ b/dll/win32/avifil32/avifile.c @@ -46,7 +46,6 @@ #include "avifile_private.h" #include "extrachunk.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -625,7 +624,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p if (*ppszFileName == NULL) return AVIERR_MEMORY; - strcpyW(*ppszFileName, This->szFileName); + lstrcpyW(*ppszFileName, This->szFileName); } return AVIERR_OK; diff --git a/dll/win32/avifil32/avifile_ifaces.idl b/dll/win32/avifil32/avifile_ifaces.idl deleted file mode 100644 index f9280e57287..00000000000 --- a/dll/win32/avifil32/avifile_ifaces.idl +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Proxy support for avifil32 - * - * Copyright 2016 Dmitry Timoshkov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* - * These interface descriptions are supposed to be used for automatic proxy - * generation by an IDL compiler. - * - * While it's possible to convert include/vfw.h to an .idl, that's proved to - * be a major waste of an effort because the resulting interface descriptions - * can't be used for automatic proxy generation since they are not compatible - * with IDL compiler restrictions for proxies, and fixing them up would make - * generated vfw.h source incompatible with PSDK's equivalent. - */ - -import "wtypes.idl"; -import "unknwn.idl"; - -typedef struct _AVISTREAMINFOW -{ - DWORD fccType; - DWORD fccHandler; - DWORD dwFlags; - DWORD dwCaps; - WORD wPriority; - WORD wLanguage; - DWORD dwScale; - DWORD dwRate; - DWORD dwStart; - DWORD dwLength; - DWORD dwInitialFrames; - DWORD dwSuggestedBufferSize; - DWORD dwQuality; - DWORD dwSampleSize; - RECT rcFrame; - DWORD dwEditCount; - DWORD dwFormatChangeCount; - WCHAR szName[64]; -} AVISTREAMINFOW; - -[ - object, - uuid(00020021-0000-0000-c000-000000000046) -] -interface IAVIStream : IUnknown -{ - HRESULT Create(LPARAM lParam1, LPARAM lParam2); - HRESULT Info(AVISTREAMINFOW *psi, LONG lSize); - LONG FindSample(LONG lPos, LONG lFlags); - HRESULT ReadFormat(LONG lPos, [out,size_is(*lpcbFormat)] char *lpFormat, [in,out] LONG *lpcbFormat); - HRESULT SetFormat(LONG lPos, [in,size_is(cbFormat)] char *lpFormat, LONG cbFormat); - HRESULT Read(LONG lStart, LONG lSamples, [out,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples); - HRESULT Write(LONG lStart, LONG lSamples, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten); - HRESULT Delete(LONG lStart, LONG lSamples); - HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); - HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); - HRESULT SetInfo(AVISTREAMINFOW *plInfo, LONG cbInfo); -}; - -typedef struct _AVIFILEINFOW -{ - DWORD dwMaxBytesPerSec; - DWORD dwFlags; - DWORD dwCaps; - DWORD dwStreams; - DWORD dwSuggestedBufferSize; - DWORD dwWidth; - DWORD dwHeight; - DWORD dwScale; - DWORD dwRate; - DWORD dwLength; - DWORD dwEditCount; - WCHAR szFileType[64]; -} AVIFILEINFOW; - -[ - object, - uuid(00020020-0000-0000-c000-000000000046) -] -interface IAVIFile : IUnknown -{ - HRESULT Info(AVIFILEINFOW *pfi, LONG lSize); - HRESULT GetStream(IAVIStream **ppStream, DWORD fccType, LONG lParam); - HRESULT CreateStream(IAVIStream **ppStream, AVISTREAMINFOW *psi); - HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); - HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); - HRESULT EndRecord(void); - HRESULT DeleteStream(DWORD fccType, LONG lParam); -}; diff --git a/dll/win32/avifil32/wavfile.c b/dll/win32/avifil32/wavfile.c index 6294ecdc394..8581a51a7ef 100644 --- a/dll/win32/avifil32/wavfile.c +++ b/dll/win32/avifil32/wavfile.c @@ -33,7 +33,6 @@ #include "avifile_private.h" #include "extrachunk.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -575,7 +574,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p if (*ppszFileName == NULL) return AVIERR_MEMORY; - strcpyW(*ppszFileName, This->szFileName); + lstrcpyW(*ppszFileName, This->szFileName); } return AVIERR_OK; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 2cc7fd94823..ae8472fc556 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -49,7 +49,7 @@ dll/win32/advpack # Synced to WineStaging-4.18 dll/win32/atl # Synced to WineStaging-4.18 dll/win32/atl80 # Synced to WineStaging-4.18 dll/win32/atl100 # Synced to WineStaging-3.3 -dll/win32/avifil32 # Synced to WineStaging-4.0 +dll/win32/avifil32 # Synced to WineStaging-4.18 dll/win32/bcrypt # Synced to WineStaging-1.9.23 dll/win32/browseui # Out of sync dll/win32/cabinet # Synced to WineStaging-3.3

4 years, 10 months

[reactos] 01/01: [ATL80] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac787511921e4b3dcb5ad… commit ac787511921e4b3dcb5ad8b5748c562b8f0ad806 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 22:49:13 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 22:49:13 2019 +0100 [ATL80] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/atl80/atl80.c | 1 - media/doc/README.WINE | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/atl80/atl80.c b/dll/win32/atl80/atl80.c index b524daf8d9e..f0b5f913f56 100644 --- a/dll/win32/atl80/atl80.c +++ b/dll/win32/atl80/atl80.c @@ -28,7 +28,6 @@ #include "wine/atlbase.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index aaf193814b9..2cc7fd94823 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -47,7 +47,7 @@ dll/win32/activeds # Synced to WineStaging-4.18 dll/win32/actxprxy # Synced to WineStaging-3.3 dll/win32/advpack # Synced to WineStaging-4.18 dll/win32/atl # Synced to WineStaging-4.18 -dll/win32/atl80 # Synced to WineStaging-3.3 +dll/win32/atl80 # Synced to WineStaging-4.18 dll/win32/atl100 # Synced to WineStaging-3.3 dll/win32/avifil32 # Synced to WineStaging-4.0 dll/win32/bcrypt # Synced to WineStaging-1.9.23

4 years, 10 months

[reactos] 01/01: [CMDUTILS] Add italian translation for mode command. (#1992)

by Carlo Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03bef6fcbf8a189ea818c… commit 03bef6fcbf8a189ea818ce3f74e9724f23c5af52 Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Sat Oct 26 22:17:48 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 26 22:17:48 2019 +0200 [CMDUTILS] Add italian translation for mode command. (#1992) --- base/applications/cmdutils/mode/lang/it-IT.rc | 71 +++++++++++++++++++++++++++ base/applications/cmdutils/mode/mode.rc | 3 ++ 2 files changed, 74 insertions(+) diff --git a/base/applications/cmdutils/mode/lang/it-IT.rc b/base/applications/cmdutils/mode/lang/it-IT.rc new file mode 100644 index 00000000000..77a7b6360a3 --- /dev/null +++ b/base/applications/cmdutils/mode/lang/it-IT.rc @@ -0,0 +1,71 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Configura i dispositivi di sistema.\n\n\ +Stato del dispositivo: MODE [dispositivo] [/STATUS]\n\ +Porta seriale: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\ + [to=on|off] [xon=on|off] [odsr=on|off]\n\ + [octs=on|off] [dtr=on|off|hs]\n\ + [rts=on|off|hs|tg] [idsr=on|off]\n\ +Reindirizzamento stampa: MODE LPTn[:]=COMm[:]\n\ +Selezione tabella codici: MODE CON[:] CP SELECT=yyy\n\ +Stato della tabella codici: MODE CON[:] CP [/STATUS]\n\ +Modalità di visualizzazione: MODE CON[:] [COLS=c] [LINES=n]\n\ +Frequenza di ripetizione tastiera: MODE CON[:] [RATE=r DELAY=d]\n" + + IDS_QUERY_SERIAL_FOUND "Trovata porta seriale - %s\n" + IDS_QUERY_PRINTER_FOUND "Trovata stampante - %s\n" + IDS_QUERY_PARALLEL_FOUND "Trovata porta parallela - %s\n" + IDS_QUERY_DOSDEV_FOUND "Trovata periferica DOS - %s\n" + // IDS_QUERY_MISC_FOUND "Trovato dispositivo generico - %s\n" + + // IDS_QUERY_DEVICE_FOUND "Trovato dispositivo %s - %s\n" + // IDS_SERIAL "seriale" + // IDS_PRINTER "parallelo" + // IDS_OTHER "generico" +END + +STRINGTABLE +BEGIN + IDS_DEVICE_STATUS_HEADER "Stato del dispositivo %s:" + + IDS_COM_STATUS_BAUD " Baud: %ld\n" + IDS_COM_STATUS_PARITY " Parità: %s\n" + IDS_COM_STATUS_DATA_BITS " Bit di dati: %d\n" + IDS_COM_STATUS_STOP_BITS " Bit di stop: %s\n" + IDS_COM_STATUS_TIMEOUT " Timeout: %s\n" + IDS_COM_STATUS_XON_XOFF " XON/XOFF: %s\n" + IDS_COM_STATUS_CTS_HANDSHAKING " Sincronismo CTS: %s\n" + IDS_COM_STATUS_DSR_HANDSHAKING " Sincronismo DSR: %s\n" + IDS_COM_STATUS_DSR_SENSITIVITY " Sensibilità DSR: %s\n" + IDS_COM_STATUS_DTR_CIRCUIT " Circuito DTR: %s\n" + IDS_COM_STATUS_RTS_CIRCUIT " Circuito RTS: %s\n" + + IDS_CONSOLE_STATUS_LINES " Linee: %d\n" + IDS_CONSOLE_STATUS_COLS " Colonne: %d\n" + IDS_CONSOLE_KBD_RATE " Velocità tastiera: %ld\n" + IDS_CONSOLE_KBD_DELAY " Ritardo tastiera: %ld\n" + IDS_CONSOLE_CODEPAGE " Tabella codici: %d\n" + + IDS_PRINTER_OUTPUT_NOT_REROUTED " La stampa non viene reindirizzata.\n" + IDS_PRINTER_OUTPUT_REROUTED_SERIAL " La stampa viene reindirizzata alla porta seriale %s.\n" +END + +STRINGTABLE +BEGIN + IDS_ERROR_QUERY_DEVICES "ERRORE: Impossibile ricercare i dispositivi DOS (0x%lx).\n" + IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) ha restituito un formato non riconosciuto %s.\n" + IDS_ERROR_SET_PARALLEL_STATE "ERRORE: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "Parametro non corretto - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "Nome dispositivo non valido - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "Il dispositivo %s non è attualmente disponibile.\n" + IDS_ERROR_STATUS_GET_DEVICE "Impossibile ottenere lo stato del dispositivo %s:\n" + IDS_ERROR_STATUS_SET_DEVICE "Impossibile impostare lo stato del dispositivo %s:\n" + IDS_ERROR_TIMEOUT_GET_DEVICE "Impossibile ottenere il timeout per il dispositivo %s:\n" + IDS_ERROR_TIMEOUT_SET_DEVICE "Impossibile impostare il timeout per il dispositivo %s:\n" + IDS_ERROR_INVALID_PARITY_BITS "ERRORE: valore non valido per i bit di parità %d:\n" + IDS_ERROR_INVALID_STOP_BITS "ERRORE: valore non valido per i bit di stop %d:\n" + IDS_ERROR_NO_MEMORY "ERRORE: memoria insufficiente.\n" + IDS_ERROR_SCREEN_LINES_COL "Lo schermo non può essere impostato con il numero di righe e colonne specificato.\n" +END diff --git a/base/applications/cmdutils/mode/mode.rc b/base/applications/cmdutils/mode/mode.rc index bb13a537ad0..96dbee58c9a 100644 --- a/base/applications/cmdutils/mode/mode.rc +++ b/base/applications/cmdutils/mode/mode.rc @@ -18,6 +18,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

4 years, 10 months

[reactos] 01/01: [BROWSEUI] Update French translation

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96ca9e39f8bc5e059afd9… commit 96ca9e39f8bc5e059afd9e5fa56b340c23027ac4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 26 22:09:31 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 26 22:11:18 2019 +0200 [BROWSEUI] Update French translation Addresses changes done in 103c87d CORE-16427 --- dll/win32/browseui/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index 2bb5d7f0ff4..2b0ceb3a74e 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -168,7 +168,7 @@ BEGIN DEFPUSHBUTTON "Che&rcher", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Arrêter", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - AUTOCHECKBOX "Search Hidden Files and Folders", + AUTOCHECKBOX "Inclure les dossiers et les fichiers cachés", IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8

4 years, 10 months

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2019