Ros-diffs September 2018

ros-diffs@reactos.org

24 participants
223 discussions

01/01: [WSCRIPT_WINETEST] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2df3bf079777d3ac3728… commit f2df3bf079777d3ac372834ca854730938cee011 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:13:11 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:13:11 2018 +0100 [WSCRIPT_WINETEST] Sync with Wine Staging 3.17. CORE-15127 --- modules/rostests/winetests/wscript/run.c | 6 +++--- modules/rostests/winetests/wscript/run.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/wscript/run.c b/modules/rostests/winetests/wscript/run.c index 770fd8fd28..16d14ff79f 100644 --- a/modules/rostests/winetests/wscript/run.c +++ b/modules/rostests/winetests/wscript/run.c @@ -77,7 +77,7 @@ static HANDLE wscript_process; static int strcmp_wa(LPCWSTR strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -220,7 +220,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullName, sizeof(fullName)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullName, ARRAY_SIZE(fullName)); if(res == 0) return E_FAIL; if(!(V_BSTR(pVarResult) = SysAllocString(fullName))) @@ -237,7 +237,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullPath, ARRAY_SIZE(fullPath)); if(res == 0) return E_FAIL; pos = mystrrchr(fullPath, '\\'); diff --git a/modules/rostests/winetests/wscript/run.js b/modules/rostests/winetests/wscript/run.js index 5a5539b173..a812a85c9e 100644 --- a/modules/rostests/winetests/wscript/run.js +++ b/modules/rostests/winetests/wscript/run.js @@ -27,7 +27,7 @@ ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); -ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuildVersion) = " + typeof(WScript.BuildVersion)); ok(WScript.FullName.toUpperCase() === winetest.wscriptFullName.toUpperCase(), "WScript.FullName = " + WScript.FullName); ok(WScript.Path.toUpperCase() === winetest.wscriptPath.toUpperCase(), "WScript.Path = " + WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName);

1 0

01/01: [CSCRIPT][WSCRIPT] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd8ec79fd18919b88b2db… commit fd8ec79fd18919b88b2db5398e82b0fe2ed5db91 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:11:58 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:11:58 2018 +0100 [CSCRIPT][WSCRIPT] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/cscript/CMakeLists.txt | 2 +- base/applications/cmdutils/wscript/CMakeLists.txt | 2 ++ base/applications/cmdutils/wscript/host.c | 6 +++--- base/applications/cmdutils/wscript/main.c | 8 ++++---- media/doc/README.WINE | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/base/applications/cmdutils/cscript/CMakeLists.txt b/base/applications/cmdutils/cscript/CMakeLists.txt index 472f94b622..5e0b98d08c 100644 --- a/base/applications/cmdutils/cscript/CMakeLists.txt +++ b/base/applications/cmdutils/cscript/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-DCSCRIPT_BUILD) +add_definitions(-DCSCRIPT_BUILD -D__WINESRC__) set(wscript_folder ${REACTOS_SOURCE_DIR}/base/applications/cmdutils/wscript) include_directories(${wscript_folder}) diff --git a/base/applications/cmdutils/wscript/CMakeLists.txt b/base/applications/cmdutils/wscript/CMakeLists.txt index ef489fd10a..a574ff5fb5 100644 --- a/base/applications/cmdutils/wscript/CMakeLists.txt +++ b/base/applications/cmdutils/wscript/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(-D__WINESRC__) + list(APPEND SOURCE arguments.c host.c diff --git a/base/applications/cmdutils/wscript/host.c b/base/applications/cmdutils/wscript/host.c index 68013f8017..c6bc31c8bd 100644 --- a/base/applications/cmdutils/wscript/host.c +++ b/base/applications/cmdutils/wscript/host.c @@ -84,7 +84,7 @@ static void print_string(const WCHAR *string) ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); if(ret) { static const WCHAR crnlW[] = {'\r','\n'}; - WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, sizeof(crnlW)/sizeof(*crnlW), &count, NULL); + WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, ARRAY_SIZE(crnlW), &count, NULL); return; } @@ -183,7 +183,7 @@ static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) WINE_TRACE("(%p)\n", out_Path); - if(GetModuleFileNameW(NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)) == 0) + if(GetModuleFileNameW(NULL, fullPath, ARRAY_SIZE(fullPath)) == 0) return E_FAIL; if(!(*out_Path = SysAllocString(fullPath))) return E_OUTOFMEMORY; @@ -198,7 +198,7 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) WINE_TRACE("(%p)\n", out_Path); - if(GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(WCHAR)) == 0) + if(GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)) == 0) return E_FAIL; pos = strrchrW(path, '\\'); howMany = pos - path; diff --git a/base/applications/cmdutils/wscript/main.c b/base/applications/cmdutils/wscript/main.c index 0191b5ac28..e3ffe35ca3 100644 --- a/base/applications/cmdutils/wscript/main.c +++ b/base/applications/cmdutils/wscript/main.c @@ -256,7 +256,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) if(res != ERROR_SUCCESS) return FALSE; - size = sizeof(fileid)/sizeof(WCHAR); + size = ARRAY_SIZE(fileid); res = RegQueryValueW(hkey, NULL, fileid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) @@ -269,7 +269,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) if(res != ERROR_SUCCESS) return FALSE; - size = sizeof(progid)/sizeof(WCHAR); + size = ARRAY_SIZE(progid); res = RegQueryValueW(hkey, NULL, progid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) @@ -449,8 +449,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("No file name specified\n"); return 1; } - res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); - if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) + res = GetFullPathNameW(filename, ARRAY_SIZE(scriptFullName), scriptFullName, &filepart); + if(!res || res > ARRAY_SIZE(scriptFullName)) return 1; ext = strrchrW(filepart, '.'); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c71caf4196..63027239d4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -226,12 +226,12 @@ reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (kno ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.9 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-3.3

1 0

01/01: [XDK][PSDK][WINE] Unify ARRAY_SIZE definition for Wine modules. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82faa151e52e235dc0beb… commit 82faa151e52e235dc0bebea2ecd49ef6b46847ad Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Sep 30 23:57:08 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Sep 30 23:57:08 2018 +0100 [XDK][PSDK][WINE] Unify ARRAY_SIZE definition for Wine modules. CORE-15127 --- dll/directx/wine/d3d9/d3d9_private.h | 2 -- dll/directx/wine/d3dx9_36/d3dx9_private.h | 2 -- dll/directx/wine/ddraw/ddraw_private.h | 2 -- dll/win32/avifil32/avifile_private.h | 2 -- dll/win32/comctl32/comctl32.h | 2 -- dll/win32/comdlg32/cdlg.h | 2 -- dll/win32/gdiplus/gdiplus_private.h | 2 -- dll/win32/msi/tokenize.c | 2 -- dll/win32/msxml3/msxml_private.h | 2 -- dll/win32/scrrun/scrrun_private.h | 2 -- dll/win32/wshom.ocx/wshom_private.h | 2 -- dll/win32/xmllite/xmllite_private.h | 2 -- sdk/include/xdk/winnt_old.h | 4 ++++ 13 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dll/directx/wine/d3d9/d3d9_private.h b/dll/directx/wine/d3d9/d3d9_private.h index c50aabf593..408661306a 100644 --- a/dll/directx/wine/d3d9/d3d9_private.h +++ b/dll/directx/wine/d3d9/d3d9_private.h @@ -47,8 +47,6 @@ #define D3D9_TEXTURE_MIPMAP_DIRTY 0x1 -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops DECLSPEC_HIDDEN; HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h b/dll/directx/wine/d3dx9_36/d3dx9_private.h index f5b2b4109c..7a4d882a8b 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_private.h +++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h @@ -32,8 +32,6 @@ #define ULONG64_MAX (~(ULONG64)0) -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) - struct vec4 { float x, y, z, w; diff --git a/dll/directx/wine/ddraw/ddraw_private.h b/dll/directx/wine/ddraw/ddraw_private.h index 9757008e92..1bba80cf26 100644 --- a/dll/directx/wine/ddraw/ddraw_private.h +++ b/dll/directx/wine/ddraw/ddraw_private.h @@ -39,8 +39,6 @@ #include "wine/list.h" #include "wine/wined3d.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; extern DWORD force_refresh_rate DECLSPEC_HIDDEN; diff --git a/dll/win32/avifil32/avifile_private.h b/dll/win32/avifil32/avifile_private.h index 83e87ea989..4bf11f42a8 100644 --- a/dll/win32/avifil32/avifile_private.h +++ b/dll/win32/avifil32/avifile_private.h @@ -22,8 +22,6 @@ #include <windef.h> #include <winuser.h> -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - #ifndef MAX_AVISTREAMS #define MAX_AVISTREAMS 8 #endif diff --git a/dll/win32/comctl32/comctl32.h b/dll/win32/comctl32/comctl32.h index c529a96bb1..ee47772658 100644 --- a/dll/win32/comctl32/comctl32.h +++ b/dll/win32/comctl32/comctl32.h @@ -38,8 +38,6 @@ extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - /* Property sheet / Wizard */ #define IDD_PROPSHEET 1006 #define IDD_WIZARD 1020 diff --git a/dll/win32/comdlg32/cdlg.h b/dll/win32/comdlg32/cdlg.h index eebf1a9b2b..28bb7e7526 100644 --- a/dll/win32/comdlg32/cdlg.h +++ b/dll/win32/comdlg32/cdlg.h @@ -23,8 +23,6 @@ #include "dlgs.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - /* Common dialogs implementation globals */ #define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ diff --git a/dll/win32/gdiplus/gdiplus_private.h b/dll/win32/gdiplus/gdiplus_private.h index 25b269ba35..b2e4f1e93f 100644 --- a/dll/win32/gdiplus/gdiplus_private.h +++ b/dll/win32/gdiplus/gdiplus_private.h @@ -35,8 +35,6 @@ #include "gdiplus.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) #define MAX_DASHLEN (16) /* this is a limitation of gdi */ diff --git a/dll/win32/msi/tokenize.c b/dll/win32/msi/tokenize.c index 1656fd8c3d..d1c2da9743 100644 --- a/dll/win32/msi/tokenize.c +++ b/dll/win32/msi/tokenize.c @@ -77,8 +77,6 @@ static const WCHAR updateW[] = {'U','P','D','A','T','E'}; static const WCHAR valuesW[] = {'V','A','L','U','E','S'}; static const WCHAR whereW[] = {'W','H','E','R','E'}; -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - /* ** These are the keywords ** They MUST be in alphabetical order diff --git a/dll/win32/msxml3/msxml_private.h b/dll/win32/msxml3/msxml_private.h index d7039275ce..94ef66b23d 100644 --- a/dll/win32/msxml3/msxml_private.h +++ b/dll/win32/msxml3/msxml_private.h @@ -31,8 +31,6 @@ # error You must include config.h to use this header #endif -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - typedef enum { MSXML_DEFAULT = 0, MSXML2 = 20, diff --git a/dll/win32/scrrun/scrrun_private.h b/dll/win32/scrrun/scrrun_private.h index d9ff2416a5..5083d30a8e 100644 --- a/dll/win32/scrrun/scrrun_private.h +++ b/dll/win32/scrrun/scrrun_private.h @@ -18,8 +18,6 @@ #ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dll/win32/wshom.ocx/wshom_private.h b/dll/win32/wshom.ocx/wshom_private.h index a3fa3b0f88..951599fbdb 100644 --- a/dll/win32/wshom.ocx/wshom_private.h +++ b/dll/win32/wshom.ocx/wshom_private.h @@ -27,8 +27,6 @@ #include "ole2.h" #include "olectl.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - /* typelibs */ typedef enum tid_t { NULL_tid, diff --git a/dll/win32/xmllite/xmllite_private.h b/dll/win32/xmllite/xmllite_private.h index 381dec496c..7884e27453 100644 --- a/dll/win32/xmllite/xmllite_private.h +++ b/dll/win32/xmllite/xmllite_private.h @@ -23,8 +23,6 @@ #include "wine/heap.h" -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - static inline void *m_alloc(IMalloc *imalloc, size_t len) { if (imalloc) diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 59076df80d..07c811837f 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -4308,6 +4308,10 @@ typedef struct _TP_CALLBACK_ENVIRON_V1 { } TP_CALLBACK_ENVIRON_V1, TP_CALLBACK_ENVIRON, *PTP_CALLBACK_ENVIRON; #endif /* (_WIN32_WINNT >= _WIN32_WINNT_WIN7) */ +#ifdef __WINESRC__ +# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif + #ifdef _MSC_VER #pragma warning(pop) #endif

1 0

02/02: [SHELL32] Fixes and improvements for PickIconDlg().
by Hermès Bélusca-Maïto 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccde12483fdfc1e6909ae… commit ccde12483fdfc1e6909aec14fb865c2df35b3804 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 30 21:22:50 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 30 21:48:34 2018 +0200 [SHELL32] Fixes and improvements for PickIconDlg(). - Deal with expanded paths only when loading icons. If the user specifies an unexpanded path to a module containing icons, this unexpanded path is returned to the caller! - Perform the dialog cleanup in WM_DESTROY message handler. - When pressing ENTER/OK in the dialog box, retrieve the selected icon and close the dialog *ONLY WHEN* the user actually has selected an icon. If the user modified manually the module path, pressing ENTER/OK instead reloads the icons list. --- dll/win32/shell32/dialogs/dialogs.cpp | 77 ++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 2d939ee11b..47b6f04d5a 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -48,7 +48,6 @@ typedef struct HMODULE hLibrary; HWND hDlgCtrl; WCHAR szPath[MAX_PATH]; - WCHAR szExpandedPath[MAX_PATH]; INT Index; INT nIcons; HICON *phIcons; @@ -90,19 +89,21 @@ DestroyIconList(HWND hDlgCtrl, PPICK_ICON_CONTEXT pIconContext) } static BOOL -DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) +DoLoadIcons(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext, LPCWSTR pszFile) { + WCHAR szExpandedPath[MAX_PATH]; + // Destroy previous icons DestroyIconList(pIconContext->hDlgCtrl, pIconContext); SendMessageW(pIconContext->hDlgCtrl, LB_RESETCONTENT, 0, 0); delete[] pIconContext->phIcons; - // Store the paths + // Store the path StringCchCopyW(pIconContext->szPath, _countof(pIconContext->szPath), pszFile); - ExpandEnvironmentStringsW(pszFile, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); + ExpandEnvironmentStringsW(pszFile, szExpandedPath, _countof(szExpandedPath)); // Load the module if possible - HMODULE hLibrary = LoadLibraryExW(pIconContext->szExpandedPath, NULL, LOAD_LIBRARY_AS_DATAFILE); + HMODULE hLibrary = LoadLibraryExW(szExpandedPath, NULL, LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) FreeLibrary(pIconContext->hLibrary); pIconContext->hLibrary = hLibrary; @@ -110,10 +111,10 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) if (pIconContext->hLibrary) { // Load the icons from the module - pIconContext->nIcons = ExtractIconExW(pIconContext->szExpandedPath, -1, NULL, NULL, 0); + pIconContext->nIcons = ExtractIconExW(szExpandedPath, -1, NULL, NULL, 0); pIconContext->phIcons = new HICON[pIconContext->nIcons]; - if (ExtractIconExW(pIconContext->szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) + if (ExtractIconExW(szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) { EnumResourceNamesW(pIconContext->hLibrary, RT_GROUP_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); } @@ -128,7 +129,7 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) pIconContext->nIcons = 1; pIconContext->phIcons = new HICON[1]; - if (ExtractIconExW(pIconContext->szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) + if (ExtractIconExW(szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) { SendMessageW(pIconContext->hDlgCtrl, LB_ADDSTRING, 0, 0); } @@ -138,8 +139,9 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) } } - // Set the text + // Set the text and reset the edit control's modification flag SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath); + SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_SETMODIFY, FALSE, 0); if (pIconContext->nIcons == 0) { @@ -147,12 +149,12 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) pIconContext->phIcons = NULL; } - return pIconContext->nIcons > 0; + return (pIconContext->nIcons > 0); } static const LPCWSTR s_pszDefaultPath = L"%SystemRoot%\\system32\\shell32.dll"; -static void NoIconsInFile(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext) +static void NoIconsInFile(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext) { // Show an error message CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); @@ -221,22 +223,45 @@ INT_PTR CALLBACK PickIconProc( return TRUE; } + case WM_DESTROY: + { + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; + + if (pIconContext->hLibrary) + FreeLibrary(pIconContext->hLibrary); + break; + } + case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: - index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - pIconContext->Index = index; + { + /* Check whether the path edit control has been modified; if so load the icons instead of validating */ + if (SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_GETMODIFY, 0, 0)) + { + /* Reset the edit control's modification flag and retrieve the text */ + SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_SETMODIFY, FALSE, 0); + GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText, _countof(szText)); + + // Load the icons + if (!DoLoadIcons(hwndDlg, pIconContext, szText)) + NoIconsInFile(hwndDlg, pIconContext); + + // Set the selection + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + break; + } + + /* The path edit control has not been modified, return the selection */ + pIconContext->Index = (INT)SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath, _countof(pIconContext->szPath)); - ExpandEnvironmentStringsW(pIconContext->szPath, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); - DestroyIconList(pIconContext->hDlgCtrl, pIconContext); - delete[] pIconContext->phIcons; EndDialog(hwndDlg, 1); break; + } case IDCANCEL: - DestroyIconList(pIconContext->hDlgCtrl, pIconContext); - delete[] pIconContext->phIcons; EndDialog(hwndDlg, 0); break; @@ -293,9 +318,7 @@ INT_PTR CALLBACK PickIconProc( { lpdis = (LPDRAWITEMSTRUCT)lParam; if (lpdis->itemID == (UINT)-1) - { break; - } switch (lpdis->itemAction) { case ODA_SELECT: @@ -331,17 +354,18 @@ BOOL WINAPI PickIconDlg( INT* lpdwIconIndex) { int res; + WCHAR szExpandedPath[MAX_PATH]; // Initialize the dialog PICK_ICON_CONTEXT IconContext = { NULL }; IconContext.Index = *lpdwIconIndex; StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), lpstrFile); - ExpandEnvironmentStringsW(lpstrFile, IconContext.szExpandedPath, _countof(IconContext.szExpandedPath)); + ExpandEnvironmentStringsW(lpstrFile, szExpandedPath, _countof(szExpandedPath)); - if (!IconContext.szExpandedPath[0] || - GetFileAttributesW(IconContext.szExpandedPath) == INVALID_FILE_ATTRIBUTES) + if (!szExpandedPath[0] || + GetFileAttributesW(szExpandedPath) == INVALID_FILE_ATTRIBUTES) { - if (IconContext.szExpandedPath[0]) + if (szExpandedPath[0]) { // No such file CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); @@ -351,7 +375,6 @@ BOOL WINAPI PickIconDlg( // Set the default value StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), s_pszDefaultPath); - ExpandEnvironmentStringsW(s_pszDefaultPath, IconContext.szPath, _countof(IconContext.szPath)); } // Show the dialog @@ -359,12 +382,10 @@ BOOL WINAPI PickIconDlg( if (res) { // Store the selected icon - StringCchCopyW(lpstrFile, nMaxFile, IconContext.szExpandedPath); + StringCchCopyW(lpstrFile, nMaxFile, IconContext.szPath); *lpdwIconIndex = IconContext.Index; } - if (IconContext.hLibrary) - FreeLibrary(IconContext.hLibrary); return res; }

1 0

01/02: [SHELL32] Code formatting only.
by Hermès Bélusca-Maïto 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae9ec94240962893ce88e… commit ae9ec94240962893ce88e9e85d29e141afa1f4ae Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 30 20:07:29 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 30 21:48:31 2018 +0200 [SHELL32] Code formatting only. --- dll/win32/shell32/CShellLink.cpp | 28 ++--- dll/win32/shell32/dialogs/dialogs.cpp | 200 +++++++++++++++++----------------- 2 files changed, 112 insertions(+), 116 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 5afc4b715e..d6d12efe0a 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -1200,7 +1200,6 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetArguments(LPCSTR pszArgs) if (!m_sArgs) return E_OUTOFMEMORY; } - m_bDirty = TRUE; return S_OK; @@ -1399,7 +1398,6 @@ HRESULT STDMETHODCALLTYPE CShellLink::Resolve(HWND hwnd, DWORD fFlags) /* Clear the cached path */ HeapFree(GetProcessHeap(), 0, m_sPath); - m_sPath = NULL; m_sPath = shelllink_get_msi_component_path(component); if (!m_sPath) return E_FAIL; @@ -1553,15 +1551,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetDescription(LPCWSTR pszName) TRACE("(%p)->(desc=%s)\n", this, debugstr_w(pszName)); HeapFree(GetProcessHeap(), 0, m_sDescription); + m_sDescription = NULL; + if (pszName) { m_sDescription = strdupW(pszName); if (!m_sDescription) return E_OUTOFMEMORY; } - else - m_sDescription = NULL; - m_bDirty = TRUE; return S_OK; @@ -1585,15 +1582,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetWorkingDirectory(LPCWSTR pszDir) TRACE("(%p)->(dir=%s)\n", this, debugstr_w(pszDir)); HeapFree(GetProcessHeap(), 0, m_sWorkDir); + m_sWorkDir = NULL; + if (pszDir) { m_sWorkDir = strdupW(pszDir); if (!m_sWorkDir) return E_OUTOFMEMORY; } - else - m_sWorkDir = NULL; - m_bDirty = TRUE; return S_OK; @@ -1617,15 +1613,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetArguments(LPCWSTR pszArgs) TRACE("(%p)->(args=%s)\n", this, debugstr_w(pszArgs)); HeapFree(GetProcessHeap(), 0, m_sArgs); + m_sArgs = NULL; + if (pszArgs) { m_sArgs = strdupW(pszArgs); if (!m_sArgs) return E_OUTOFMEMORY; } - else - m_sArgs = NULL; - m_bDirty = TRUE; return S_OK; @@ -1650,11 +1645,10 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(LPWSTR pszIconPath, INT cc pInfo = (LPEXP_SZ_LINK)SHFindDataBlock(m_pDBList, EXP_SZ_ICON_SIG); if (pInfo && (pInfo->cbSize == sizeof(*pInfo))) { + SHExpandEnvironmentStringsW(pInfo->szwTarget, szPath, _countof(szPath)); + m_Header.dwFlags &= ~SLDF_HAS_ICONLOCATION; HeapFree(GetProcessHeap(), 0, m_sIcoPath); - m_sIcoPath = NULL; - - SHExpandEnvironmentStringsW(pInfo->szwTarget, szPath, _countof(szPath)); m_sIcoPath = strdupW(szPath); if (!m_sIcoPath) @@ -1931,7 +1925,6 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i { m_Header.dwFlags &= ~SLDF_HAS_ICONLOCATION; HeapFree(GetProcessHeap(), 0, m_sIcoPath); - m_sIcoPath = NULL; m_sIcoPath = strdupW(pszIconPath); if (!m_sIcoPath) @@ -1953,15 +1946,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD TRACE("(%p)->(path=%s %x)\n", this, debugstr_w(pszPathRel), dwReserved); HeapFree(GetProcessHeap(), 0, m_sPathRel); + m_sPathRel = NULL; + if (pszPathRel) { m_sPathRel = strdupW(pszPathRel); if (!m_sPathRel) return E_OUTOFMEMORY; } - else - m_sPathRel = NULL; - m_bDirty = TRUE; return ShellLink_UpdatePath(m_sPathRel, m_sPath, m_sWorkDir, &m_sPath); diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 77c1bdf5cc..2d939ee11b 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -92,17 +92,16 @@ DestroyIconList(HWND hDlgCtrl, PPICK_ICON_CONTEXT pIconContext) static BOOL DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) { - // destroy previous + // Destroy previous icons DestroyIconList(pIconContext->hDlgCtrl, pIconContext); SendMessageW(pIconContext->hDlgCtrl, LB_RESETCONTENT, 0, 0); delete[] pIconContext->phIcons; - // store paths - if (pIconContext->szPath != pszFile) - StringCchCopyW(pIconContext->szPath, _countof(pIconContext->szPath), pszFile); + // Store the paths + StringCchCopyW(pIconContext->szPath, _countof(pIconContext->szPath), pszFile); ExpandEnvironmentStringsW(pszFile, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); - // load DLL if possible + // Load the module if possible HMODULE hLibrary = LoadLibraryExW(pIconContext->szExpandedPath, NULL, LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) FreeLibrary(pIconContext->hLibrary); @@ -110,7 +109,7 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) if (pIconContext->hLibrary) { - // load icons from DLL + // Load the icons from the module pIconContext->nIcons = ExtractIconExW(pIconContext->szExpandedPath, -1, NULL, NULL, 0); pIconContext->phIcons = new HICON[pIconContext->nIcons]; @@ -125,7 +124,7 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) } else { - // *.ico + // .ico file pIconContext->nIcons = 1; pIconContext->phIcons = new HICON[1]; @@ -139,7 +138,7 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) } } - // set text + // Set the text SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath); if (pIconContext->nIcons == 0) @@ -155,28 +154,28 @@ static const LPCWSTR s_pszDefaultPath = L"%SystemRoot%\\system32\\shell32.dll"; static void NoIconsInFile(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext) { - // show message + // Show an error message CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); strText.Format(IDS_NO_ICONS, pIconContext->szPath); MessageBoxW(hwndDlg, strText, strTitle, MB_ICONWARNING); - // load default icons + // Load the default icons DoLoadIcons(hwndDlg, pIconContext, s_pszDefaultPath); } -// icon size +// Icon size #define CX_ICON GetSystemMetrics(SM_CXICON) #define CY_ICON GetSystemMetrics(SM_CYICON) -// item size +// Item size #define CX_ITEM (CX_ICON + 4) #define CY_ITEM (CY_ICON + 12) -INT_PTR CALLBACK PickIconProc(HWND hwndDlg, +INT_PTR CALLBACK PickIconProc( + HWND hwndDlg, UINT uMsg, WPARAM wParam, - LPARAM lParam -) + LPARAM lParam) { LPMEASUREITEMSTRUCT lpmis; LPDRAWITEMSTRUCT lpdis; @@ -190,105 +189,109 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, switch(uMsg) { - case WM_INITDIALOG: - pIconContext = (PPICK_ICON_CONTEXT)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); - pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); + case WM_INITDIALOG: + { + pIconContext = (PPICK_ICON_CONTEXT)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); + pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); - SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, CX_ITEM, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, CX_ITEM, 0); - // load icons - if (!DoLoadIcons(hwndDlg, pIconContext, pIconContext->szPath)) - { - NoIconsInFile(hwndDlg, pIconContext); - } + // Load the icons + if (!DoLoadIcons(hwndDlg, pIconContext, pIconContext->szPath)) + NoIconsInFile(hwndDlg, pIconContext); - // set selection - count = SendMessageW(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); - if (count != LB_ERR) - { - if (pIconContext->Index < 0) + // Set the selection + count = SendMessageW(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); + if (count != LB_ERR) { - // A negative value will be interpreted as a negated resource ID. - LPARAM lParam = -pIconContext->Index; - pIconContext->Index = (INT)SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRINGEXACT, -1, lParam); - } + if (pIconContext->Index < 0) + { + // A negative value will be interpreted as a negated resource ID. + LPARAM lParam = -pIconContext->Index; + pIconContext->Index = (INT)SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRINGEXACT, -1, lParam); + } - if (pIconContext->Index < 0 || count <= pIconContext->Index) - pIconContext->Index = 0; + if (pIconContext->Index < 0 || count <= pIconContext->Index) + pIconContext->Index = 0; - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); - SendMessageW(pIconContext->hDlgCtrl, LB_SETTOPINDEX, pIconContext->Index, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETTOPINDEX, pIconContext->Index, 0); + } + return TRUE; } - return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDOK: - index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - pIconContext->Index = index; - GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath, MAX_PATH); - ExpandEnvironmentStringsW(pIconContext->szPath, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); - DestroyIconList(pIconContext->hDlgCtrl, pIconContext); - delete[] pIconContext->phIcons; - EndDialog(hwndDlg, 1); - break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); + pIconContext->Index = index; + GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath, _countof(pIconContext->szPath)); + ExpandEnvironmentStringsW(pIconContext->szPath, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; + EndDialog(hwndDlg, 1); + break; - case IDCANCEL: - DestroyIconList(pIconContext->hDlgCtrl, pIconContext); - delete[] pIconContext->phIcons; - EndDialog(hwndDlg, 0); - break; + case IDCANCEL: + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; + EndDialog(hwndDlg, 0); + break; + + case IDC_PICKICON_LIST: + switch (HIWORD(wParam)) + { + case LBN_SELCHANGE: + InvalidateRect((HWND)lParam, NULL, TRUE); + break; - case IDC_PICKICON_LIST: - switch (HIWORD(wParam)) + case LBN_DBLCLK: + SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDOK, 0), 0); + break; + } + break; + + case IDC_BUTTON_PATH: { - case LBN_SELCHANGE: - InvalidateRect((HWND)lParam, NULL, TRUE); + // Choose the module path + szText[0] = 0; + szFilter[0] = 0; + ZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hwndDlg; + ofn.lpstrFile = szText; + ofn.nMaxFile = _countof(szText); + strTitle.LoadString(IDS_PICK_ICON_TITLE); + ofn.lpstrTitle = strTitle; + LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, _countof(szFilter)); + ofn.lpstrFilter = szFilter; + if (!GetOpenFileNameW(&ofn)) break; - case LBN_DBLCLK: - SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDOK, 0), 0); - break; - } - break; + // Load the icons + if (!DoLoadIcons(hwndDlg, pIconContext, szText)) + NoIconsInFile(hwndDlg, pIconContext); - case IDC_BUTTON_PATH: - // choose DLL path - szText[0] = 0; - szFilter[0] = 0; - ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); - ofn.hwndOwner = hwndDlg; - ofn.lpstrFile = szText; - ofn.nMaxFile = MAX_PATH; - strTitle.LoadString(IDS_PICK_ICON_TITLE); - ofn.lpstrTitle = strTitle; - LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, _countof(szFilter)); - ofn.lpstrFilter = szFilter; - if (!GetOpenFileNameW(&ofn)) + // Set the selection + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); break; - - // load icons - if (!DoLoadIcons(hwndDlg, pIconContext, szText)) - { - NoIconsInFile(hwndDlg, pIconContext); } - // set selection - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + default: + break; + } break; - } - break; case WM_MEASUREITEM: - lpmis = (LPMEASUREITEMSTRUCT) lParam; + lpmis = (LPMEASUREITEMSTRUCT)lParam; lpmis->itemHeight = CY_ITEM; return TRUE; case WM_DRAWITEM: - lpdis = (LPDRAWITEMSTRUCT) lParam; + { + lpdis = (LPDRAWITEMSTRUCT)lParam; if (lpdis->itemID == (UINT)-1) { break; @@ -306,7 +309,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, else FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_WINDOW + 1)); - // centering + // Centering INT x = lpdis->rcItem.left + (CX_ITEM - CX_ICON) / 2; INT y = lpdis->rcItem.top + (CY_ITEM - CY_ICON) / 2; @@ -315,6 +318,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, } } return TRUE; + } } return FALSE; @@ -328,7 +332,7 @@ BOOL WINAPI PickIconDlg( { int res; - // initialize + // Initialize the dialog PICK_ICON_CONTEXT IconContext = { NULL }; IconContext.Index = *lpdwIconIndex; StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), lpstrFile); @@ -339,22 +343,22 @@ BOOL WINAPI PickIconDlg( { if (IconContext.szExpandedPath[0]) { - // no such file + // No such file CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); strText.Format(IDS_FILE_NOT_FOUND, lpstrFile); MessageBoxW(hWndOwner, strText, strTitle, MB_ICONWARNING); } - // set default value + // Set the default value StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), s_pszDefaultPath); ExpandEnvironmentStringsW(s_pszDefaultPath, IconContext.szPath, _countof(IconContext.szPath)); } - // show dialog + // Show the dialog res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON), hWndOwner, PickIconProc, (LPARAM)&IconContext); if (res) { - // store + // Store the selected icon StringCchCopyW(lpstrFile, nMaxFile, IconContext.szExpandedPath); *lpdwIconIndex = IconContext.Index; } @@ -628,8 +632,8 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA WCHAR filter[MAX_PATH], szCaption[MAX_PATH]; OPENFILENAMEW ofn; - LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER, filter, MAX_PATH); - LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); + LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER, filter, _countof(filter)); + LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, _countof(szCaption)); ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn);

1 0

02/02: [BOOTDATA] Register the CriticalDeviceCoInstaller as a class co-installer for critical device classes
by Eric Kohl 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d3921bdd5c0cb5e63e87… commit 6d3921bdd5c0cb5e63e8779e4e6edda243a92c8f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 30 17:22:29 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 30 17:23:40 2018 +0200 [BOOTDATA] Register the CriticalDeviceCoInstaller as a class co-installer for critical device classes --- boot/bootdata/hivesys.inf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 1f58e5c939..6eedacffcf 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -386,7 +386,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955A ; Class Co-Installers HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E965-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E967-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96A-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96B-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96F-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E97B-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E97D-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" ; Default computer name settings

1 0

01/02: [SYSETUP] Implement the CriticalDeviceCoInstaller
by Eric Kohl 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4aa1bee7572664224a7f3… commit 4aa1bee7572664224a7f368dff0d56dfea922b1f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 30 17:18:28 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 30 17:23:38 2018 +0200 [SYSETUP] Implement the CriticalDeviceCoInstaller The CriticalDeviceCoInstaller adds devices of registered classes to the critical device database. --- dll/win32/syssetup/classinst.c | 206 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 5 deletions(-) diff --git a/dll/win32/syssetup/classinst.c b/dll/win32/syssetup/classinst.c index 6eb949e568..d7ea97e1d0 100644 --- a/dll/win32/syssetup/classinst.c +++ b/dll/win32/syssetup/classinst.c @@ -31,7 +31,7 @@ ComputerClassInstaller( /* - * @unimplemented + * @implemented */ DWORD WINAPI @@ -41,12 +41,208 @@ CriticalDeviceCoInstaller( IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN OUT PCOINSTALLER_CONTEXT_DATA Context) { - switch (InstallFunction) + WCHAR szDeviceId[256]; + WCHAR szServiceName[256]; + WCHAR szClassGUID[64]; + DWORD dwRequiredSize; + HKEY hDriverKey = NULL; + HKEY hDatabaseKey = NULL, hDeviceKey = NULL; + DWORD dwDisposition; + PWSTR Ptr; + DWORD dwError = ERROR_SUCCESS; + + DPRINT("CriticalDeviceCoInstaller(%lu %p %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData, Context); + + if (InstallFunction != DIF_INSTALLDEVICE) + return ERROR_SUCCESS; + + /* Get the MatchingDeviceId property */ + hDriverKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_READ); + if (hDriverKey == INVALID_HANDLE_VALUE) { - default: - DPRINT1("Install function %u ignored\n", InstallFunction); - return ERROR_SUCCESS; + if (Context->PostProcessing) + { + dwError = GetLastError(); + DPRINT1("Failed to open the driver key! (Error %lu)\n", dwError); + goto done; + } + else + { + DPRINT("Failed to open the driver key! Postprocessing required!\n"); + return ERROR_DI_POSTPROCESSING_REQUIRED; + } + } + + dwRequiredSize = sizeof(szDeviceId); + dwError = RegQueryValueExW(hDriverKey, + L"MatchingDeviceId", + NULL, + NULL, + (PBYTE)szDeviceId, + &dwRequiredSize); + RegCloseKey(hDriverKey); + if (dwError != ERROR_SUCCESS) + { + if (Context->PostProcessing) + { + dwError = GetLastError(); + DPRINT1("Failed to read the MatchingDeviceId value! (Error %lu)\n", dwError); + goto done; + } + else + { + DPRINT("Failed to read the MatchingDeviceId value! Postprocessing required!\n"); + return ERROR_DI_POSTPROCESSING_REQUIRED; + } + } + + DPRINT("MatchingDeviceId: %S\n", szDeviceId); + + /* Get the ClassGUID property */ + dwRequiredSize = 0; + if (!SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_CLASSGUID, + NULL, + (PBYTE)szClassGUID, + sizeof(szClassGUID), + &dwRequiredSize)) + { + if (Context->PostProcessing) + { + dwError = GetLastError(); + DPRINT1("Failed to read the ClassGUID! (Error %lu)\n", dwError); + goto done; + } + else + { + DPRINT("Failed to read the ClassGUID! Postprocessing required!\n"); + return ERROR_DI_POSTPROCESSING_REQUIRED; + } + } + + DPRINT("ClassGUID %S\n", szClassGUID); + + /* Get the Service property (optional) */ + dwRequiredSize = 0; + if (!SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_SERVICE, + NULL, + (PBYTE)szServiceName, + sizeof(szServiceName), + &dwRequiredSize)) + { + if (Context->PostProcessing) + { + dwError = GetLastError(); + if (dwError != ERROR_FILE_NOT_FOUND) + { + DPRINT1("Failed to read the Service name! (Error %lu)\n", dwError); + goto done; + } + else + { + szServiceName[0] = UNICODE_NULL; + dwError = ERROR_SUCCESS; + } + } + else + { + DPRINT("Failed to read the Service name! Postprocessing required!\n"); + return ERROR_DI_POSTPROCESSING_REQUIRED; + } + } + + DPRINT("Service %S\n", szServiceName); + + /* Replace the first backslash by a number sign */ + Ptr = wcschr(szDeviceId, L'\\'); + if (Ptr != NULL) + { + *Ptr = L'#'; + + /* Terminate the device id at the second backslash */ + Ptr = wcschr(Ptr, L'\\'); + if (Ptr != NULL) + *Ptr = UNICODE_NULL; + } + + DPRINT("DeviceId: %S\n", szDeviceId); + + /* Open the critical device database key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\CriticalDeviceDatabase", + 0, + KEY_WRITE, + &hDatabaseKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW failed (Error %lu)\n", dwError); + goto done; + } + + /* Create a new key for the device */ + dwError = RegCreateKeyExW(hDatabaseKey, + szDeviceId, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hDeviceKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegCreateKeyExW failed (Error %lu)\n", dwError); + goto done; } + + /* Set the ClassGUID value */ + dwError = RegSetValueExW(hDeviceKey, + L"ClassGUID", + 0, + REG_SZ, + (PBYTE)szClassGUID, + (wcslen(szClassGUID) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW failed (Error %lu)\n", dwError); + goto done; + } + + /* If available, set the Service value */ + if (szServiceName[0] != UNICODE_NULL) + { + dwError = RegSetValueExW(hDeviceKey, + L"Service", + 0, + REG_SZ, + (PBYTE)szServiceName, + (wcslen(szServiceName) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW failed (Error %lu)\n", dwError); + goto done; + } + } + +done: + if (hDeviceKey != NULL) + RegCloseKey(hDeviceKey); + + if (hDatabaseKey != NULL) + RegCloseKey(hDatabaseKey); + + DPRINT("CriticalDeviceCoInstaller() done (Error %lu)\n", dwError); + + return dwError; }

1 0

01/01: [BTRFS] Fix IRP leak.
by Thomas Faber 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7af85b64bbe62035370d… commit c7af85b64bbe62035370de2937b777406ac59b87 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 16 15:25:27 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 30 16:11:42 2018 +0200 [BTRFS] Fix IRP leak. This leaked at least one IRP for every write, making it the largest leak when running with BTRFS as the system volume. Thanks to Victor Perevertkin. Submitted upstream thanks to Pierre: https://github.com/maharmstone/btrfs/pull/106 --- drivers/filesystems/btrfs/write.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/filesystems/btrfs/write.c b/drivers/filesystems/btrfs/write.c index 7ede09ee6a..6292d7efb0 100644 --- a/drivers/filesystems/btrfs/write.c +++ b/drivers/filesystems/btrfs/write.c @@ -2333,6 +2333,10 @@ void free_write_data_stripes(write_data_context* wtc) { last_mdl = stripe->mdl; +#ifdef __REACTOS__ + if (stripe->Irp) + IoFreeIrp(stripe->Irp); +#endif le = le->Flink; }

1 0

03/03: [NPFS] Magic--;
by Pierre Schweitzer 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=257923cad10b1afbb12ca… commit 257923cad10b1afbb12cad1d9bec47daf3cefa3c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 30 10:55:07 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 30 10:55:44 2018 +0200 [NPFS] Magic--; --- drivers/filesystems/npfs/create.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/npfs/create.c b/drivers/filesystems/npfs/create.c index da2f967faf..8efcd77870 100644 --- a/drivers/filesystems/npfs/create.c +++ b/drivers/filesystems/npfs/create.c @@ -562,7 +562,7 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, if (AccessGranted) { AccessState->PreviouslyGrantedAccess |= GrantedAccess; - AccessState->RemainingDesiredAccess &= ~(GrantedAccess | 0x2000000); + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | MAXIMUM_ALLOWED); } ObjectTypeName.Buffer = L"NamedPipe";

1 0

02/03: [NTOSKRNL] Fix remaining access computation on open
by Pierre Schweitzer 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=890a2936838b3aa4d0bba… commit 890a2936838b3aa4d0bba6ab4fac960f572fa0b4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 30 10:53:12 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 30 10:55:44 2018 +0200 [NTOSKRNL] Fix remaining access computation on open --- ntoskrnl/io/iomgr/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index cdc4aaaa3e..1768bc29ca 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -7,6 +7,7 @@ * Gunnar Dalsnes * Eric Kohl * Filip Navara (navaraf(a)reactos.org) + * Pierre Schweitzer */ /* INCLUDES *****************************************************************/ @@ -431,7 +432,7 @@ IopParseDevice(IN PVOID ParseObject, { /* Update access state */ AccessState->PreviouslyGrantedAccess |= GrantedAccess; - AccessState->RemainingDesiredAccess &= ~(GrantedAccess & + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | MAXIMUM_ALLOWED); OpenPacket->Override= TRUE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2018