Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [JSCRIPT] import wine commits "stub + implement Enumerator()"
by Andreas Maier 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83dcae1e0f7f602a2e978… commit 83dcae1e0f7f602a2e978a5308cc9437d4127855 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Fri Apr 19 21:00:27 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 16:37:32 2019 +0200 [JSCRIPT] import wine commits "stub + implement Enumerator()" https://source.winehq.org/git/wine.git/commit/6630bc4096870d1586e6d431b93dd… https://source.winehq.org/git/wine.git/commit/a015c626438dc8cba445242c68d41… CORE-13810 --- dll/win32/jscript/CMakeLists.txt | 1 + dll/win32/jscript/enumerator.c | 348 +++++++++++++++++++++++++++++++++++++++ dll/win32/jscript/global.c | 17 +- dll/win32/jscript/jscript.h | 4 + dll/win32/jscript/object.c | 2 +- dll/win32/jscript/resource.h | 1 + 6 files changed, 364 insertions(+), 9 deletions(-) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index cb4041f0020..826800bacf9 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE decode.c dispex.c engine.c + enumerator.c error.c function.c global.c diff --git a/dll/win32/jscript/enumerator.c b/dll/win32/jscript/enumerator.c new file mode 100644 index 00000000000..5c06efd1f9b --- /dev/null +++ b/dll/win32/jscript/enumerator.c @@ -0,0 +1,348 @@ +/* + * Copyright 2019 Andreas Maier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + jsdisp_t dispex; + /* IEnumVARIANT returned by _NewEnum */ + IEnumVARIANT *enumvar; + /* current item */ + jsval_t item; + BOOL atend; +} EnumeratorInstance; + +static const WCHAR atEndW[] = {'a','t','E','n','d',0}; +static const WCHAR itemW[] = {'i','t','e','m',0}; +static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; +static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; + +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis) +{ + return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL; +} + +static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) +{ + HRESULT hres; + VARIANT nextitem; + + if (This->atend) + return S_OK; + + /* dont leak pervious value */ + jsval_release(This->item); + + /* not at end ... get next item */ + VariantInit(&nextitem); + hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL); + if (hres == S_OK) + { + hres = variant_to_jsval(&nextitem, &This->item); + VariantClear(&nextitem); + if (FAILED(hres)) + { + WARN("failed to convert jsval to variant!"); + This->item = jsval_undefined(); + return hres; + } + } + else + { + This->item = jsval_undefined(); + This->atend = TRUE; + } + + return S_OK; +} + +static void Enumerator_destructor(jsdisp_t *dispex) +{ + EnumeratorInstance *This = enumerator_from_jsdisp(dispex); + + TRACE("\n"); + + jsval_release(This->item); + heap_free(dispex); +} + +static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + TRACE("%d\n", This->atend); + + if (r) + *r = jsval_bool(This->atend); + return S_OK; +} + +static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + return r ? jsval_copy(This->item, r) : S_OK; +} + +static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + HRESULT hres = S_OK; + + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (This->enumvar) + { + hres = IEnumVARIANT_Reset(This->enumvar); + if (FAILED(hres)) + return hres; + + This->atend = FALSE; + hres = enumvar_get_next_item(This); + if(FAILED(hres)) + return hres; + } + + if (r) + *r = jsval_undefined(); + return S_OK; +} + +static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + HRESULT hres = S_OK; + + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (This->enumvar) + { + hres = enumvar_get_next_item(This); + if (FAILED(hres)) + return hres; + } + + if (r) + *r = jsval_undefined(); + return S_OK; +} + +static const builtin_prop_t Enumerator_props[] = { + {atEndW, Enumerator_atEnd, PROPF_METHOD}, + {itemW, Enumerator_item, PROPF_METHOD}, + {moveFirstW, Enumerator_moveFirst, PROPF_METHOD}, + {moveNextW, Enumerator_moveNext, PROPF_METHOD}, +}; + +static const builtin_info_t Enumerator_info = { + JSCLASS_ENUMERATOR, + {NULL, NULL, 0}, + ARRAY_SIZE(Enumerator_props), + Enumerator_props, + NULL, + NULL +}; + +static const builtin_info_t EnumeratorInst_info = { + JSCLASS_ENUMERATOR, + {NULL, NULL, 0, NULL}, + 0, + NULL, + Enumerator_destructor, + NULL +}; + +static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, EnumeratorInstance **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + enumerator = heap_alloc_zero(sizeof(EnumeratorInstance)); + if(!enumerator) + return E_OUTOFMEMORY; + + if(object_prototype) + hres = init_dispex(&enumerator->dispex, ctx, &Enumerator_info, object_prototype); + else + hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, + ctx->enumerator_constr); + + if(FAILED(hres)) + { + heap_free(enumerator); + return hres; + } + + *ret = enumerator; + return S_OK; +} + +static HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + IDispatch *obj; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + IEnumVARIANT *enumvar = NULL; + + if (argv) + { + VARIANT varresult; + + if (!is_object_instance(*argv)) + { + FIXME("I don't know how to handle this type!\n"); + return E_NOTIMPL; + } + + obj = get_object(*argv); + + /* Try to get a IEnumVARIANT by _NewEnum */ + VariantInit(&varresult); + hres = IDispatch_Invoke(obj, DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, &varresult, NULL, NULL); + if (FAILED(hres)) + { + WARN("Enumerator: no DISPID_NEWENUM.\n"); + return E_INVALIDARG; + } + + if ((V_VT(&varresult) == VT_DISPATCH) || (V_VT(&varresult) == VT_UNKNOWN)) + { + hres = IUnknown_QueryInterface(V_UNKNOWN(&varresult), + &IID_IEnumVARIANT, (void**)&enumvar); + } + else + { + FIXME("Enumerator: NewEnum unexpected type of varresult (%d).\n", V_VT(&varresult)); + hres = E_INVALIDARG; + } + VariantClear(&varresult); + if (FAILED(hres)) + return hres; + } + + hres = alloc_enumerator(ctx, NULL, &enumerator); + if (FAILED(hres)) + { + if (enumvar) + IEnumVARIANT_Release(enumvar); + return hres; + } + + enumerator->enumvar = enumvar; + enumerator->atend = !enumvar; + hres = enumvar_get_next_item(enumerator); + if (FAILED(hres)) + { + jsdisp_release(&enumerator->dispex); + return hres; + } + + *ret = &enumerator->dispex; + return S_OK; +} + +static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsdisp_t *obj; + HRESULT hres; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + if (argc > 1) + return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); + + hres = create_enumerator(ctx, (argc == 1) ? &argv[0] : 0, &obj); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(obj); + break; + } + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static const builtin_info_t EnumeratorConstr_info = { + JSCLASS_FUNCTION, + DEFAULT_FUNCTION_VALUE, + 0, + NULL, + NULL, + NULL +}; + +HRESULT create_enumerator_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; + + hres = alloc_enumerator(ctx, object_prototype, &enumerator); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, EnumeratorConstr_value, + EnumeratorW, &EnumeratorConstr_info, + PROPF_CONSTR|7, &enumerator->dispex, ret); + jsdisp_release(&enumerator->dispex); + + return hres; +} diff --git a/dll/win32/jscript/global.c b/dll/win32/jscript/global.c index 33de6414833..92b146c83ac 100644 --- a/dll/win32/jscript/global.c +++ b/dll/win32/jscript/global.c @@ -113,13 +113,6 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -942,7 +935,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, @@ -1019,6 +1011,15 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = create_enumerator_constr(ctx, object_prototype, &ctx->enumerator_constr); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, EnumeratorW, PROPF_WRITABLE, + jsval_obj(ctx->enumerator_constr)); + if(FAILED(hres)) + return hres; + hres = init_error_constr(ctx, object_prototype); if(FAILED(hres)) return hres; diff --git a/dll/win32/jscript/jscript.h b/dll/win32/jscript/jscript.h index 475ca4ad5a3..5149d0d4a3f 100644 --- a/dll/win32/jscript/jscript.h +++ b/dll/win32/jscript/jscript.h @@ -118,6 +118,7 @@ typedef enum { JSCLASS_ARRAY, JSCLASS_BOOLEAN, JSCLASS_DATE, + JSCLASS_ENUMERATOR, JSCLASS_ERROR, JSCLASS_FUNCTION, JSCLASS_GLOBAL, @@ -438,6 +439,7 @@ struct _script_ctx_t { jsdisp_t *array_constr; jsdisp_t *bool_constr; jsdisp_t *date_constr; + jsdisp_t *enumerator_constr; jsdisp_t *error_constr; jsdisp_t *eval_error_constr; jsdisp_t *range_error_constr; @@ -470,6 +472,7 @@ HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_date_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_error_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT create_enumerator_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; @@ -560,6 +563,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) #define JS_E_VBARRAY_EXPECTED MAKE_JSERROR(IDS_NOT_VBARRAY) #define JS_E_INVALID_DELETE MAKE_JSERROR(IDS_INVALID_DELETE) #define JS_E_JSCRIPT_EXPECTED MAKE_JSERROR(IDS_JSCRIPT_EXPECTED) +#define JS_E_ENUMERATOR_EXPECTED MAKE_JSERROR(IDS_NOT_ENUMERATOR) #define JS_E_REGEXP_SYNTAX MAKE_JSERROR(IDS_REGEXP_SYNTAX_ERROR) #define JS_E_INVALID_URI_CODING MAKE_JSERROR(IDS_URI_INVALID_CODING) #define JS_E_INVALID_URI_CHAR MAKE_JSERROR(IDS_URI_INVALID_CHAR) diff --git a/dll/win32/jscript/object.c b/dll/win32/jscript/object.c index 487eb5f14bd..6ba99db108b 100644 --- a/dll/win32/jscript/object.c +++ b/dll/win32/jscript/object.c @@ -66,7 +66,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, + static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, objectW, errorW, functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW, objectW}; TRACE("\n"); diff --git a/dll/win32/jscript/resource.h b/dll/win32/jscript/resource.h index dde1b13c59a..de5d40513b4 100644 --- a/dll/win32/jscript/resource.h +++ b/dll/win32/jscript/resource.h @@ -58,6 +58,7 @@ #define IDS_INVALID_DELETE 0x1394 #define IDS_NOT_VBARRAY 0x1395 #define IDS_JSCRIPT_EXPECTED 0x1396 +#define IDS_NOT_ENUMERATOR 0x1397 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 #define IDS_URI_INVALID_CHAR 0x13A0 #define IDS_URI_INVALID_CODING 0x13A1

1 0

[reactos] 01/01: [W32TIME] The interval is specified in seconds, but we need milliseconds
by Mark Jansen 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcb9378e01c555975433c… commit fcb9378e01c555975433c8bd4239da8e8e1c87a4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Aug 16 16:29:20 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 16:29:20 2019 +0200 [W32TIME] The interval is specified in seconds, but we need milliseconds --- base/services/w32time/w32time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/services/w32time/w32time.c b/base/services/w32time/w32time.c index 590396fc771..abc58a5e151 100644 --- a/base/services/w32time/w32time.c +++ b/base/services/w32time/w32time.c @@ -297,7 +297,7 @@ ServiceMain(DWORD argc, LPWSTR *argv) */ } - if (WaitForSingleObject(hStopEvent, dwInterval) == WAIT_OBJECT_0) + if (WaitForSingleObject(hStopEvent, dwInterval * 1000) == WAIT_OBJECT_0) { CloseHandle(hStopEvent); hStopEvent = NULL;

1 0

[reactos] 02/02: [COMCTL32] Checking size grip bounds in x-axis only
by Waritnan Sookbuntherng 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76dfa2b284b03e276b917… commit 76dfa2b284b03e276b91782eff69fcecdd72210c Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> AuthorDate: Tue Dec 11 22:25:16 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 16:22:24 2019 +0200 [COMCTL32] Checking size grip bounds in x-axis only --- dll/win32/comctl32/status.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dll/win32/comctl32/status.c b/dll/win32/comctl32/status.c index dd39f13f082..6ef04a66282 100644 --- a/dll/win32/comctl32/status.c +++ b/dll/win32/comctl32/status.c @@ -1023,10 +1023,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) pt.y = y; ScreenToClient (infoPtr->Self, &pt); - rect.left = rect.right - 13; - rect.top += 2; - - if (PtInRect (&rect, pt)) + if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)) { if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT; else return HTBOTTOMRIGHT;

1 0

[reactos] 01/02: [COMCTL32] Hide size grip when the parent window is maximized
by Waritnan Sookbuntherng 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9ddad0bbb2cf7f9501b4… commit b9ddad0bbb2cf7f9501b401d84b6847f695b1ddf Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> AuthorDate: Tue Dec 11 22:22:47 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 16:22:24 2019 +0200 [COMCTL32] Hide size grip when the parent window is maximized --- dll/win32/comctl32/status.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/status.c b/dll/win32/comctl32/status.c index 26e9d3a1c6f..dd39f13f082 100644 --- a/dll/win32/comctl32/status.c +++ b/dll/win32/comctl32/status.c @@ -298,7 +298,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -1011,7 +1012,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt;

1 0

[reactos] 01/01: [NETSTAT] '-p UDP' depends on '-a'
by Serge Gautherie 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af0d1d2f98749ed382ab7… commit af0d1d2f98749ed382ab7e718b91a9f11fd8a073 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jun 29 15:14:39 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 16 14:46:45 2019 +0200 [NETSTAT] '-p UDP' depends on '-a' --- base/applications/network/netstat/netstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index 6dcc174215d..97a843b143d 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -212,7 +212,7 @@ BOOL DisplayOutput(VOID) ShowUdpStatistics(); ConResPuts(StdOut, IDS_ACTIVE_CONNECT); DisplayTableHeader(); - return ShowUdpTable(); + return (bDoShowAllCons ? ShowUdpTable() : TRUE); default: break; }

1 0

[reactos] 01/01: [NTFS] Correctly find attributes stored in another file record in MFT (and referenced in data stream)
by Sylvain Deverre 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d3df0da50b99f8f86844… commit 4d3df0da50b99f8f868449d262b88ffe2ac1d789 Author: Sylvain Deverre <deverre.sylv(a)gmail.com> AuthorDate: Thu Aug 8 22:09:13 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Fri Aug 16 11:08:29 2019 +0200 [NTFS] Correctly find attributes stored in another file record in MFT (and referenced in data stream) --- drivers/filesystems/ntfs/attrib.c | 93 ++++++++++++++++++++++++++++----------- drivers/filesystems/ntfs/mft.c | 56 +++++++++++++++++++++++ drivers/filesystems/ntfs/ntfs.h | 25 ++++++++++- 3 files changed, 147 insertions(+), 27 deletions(-) diff --git a/drivers/filesystems/ntfs/attrib.c b/drivers/filesystems/ntfs/attrib.c index 1a04b763a2a..006465ce975 100644 --- a/drivers/filesystems/ntfs/attrib.c +++ b/drivers/filesystems/ntfs/attrib.c @@ -1258,7 +1258,74 @@ InternalReadNonResidentAttributes(PFIND_ATTR_CONTXT Context) } ReleaseAttributeContext(ListContext); - Context->NonResidentEnd = (PNTFS_ATTR_RECORD)((PCHAR)Context->NonResidentStart + ListSize); + Context->NonResidentEnd = (PNTFS_ATTRIBUTE_LIST_ITEM)((PCHAR)Context->NonResidentStart + ListSize); + return STATUS_SUCCESS; +} + +static +PNTFS_ATTRIBUTE_LIST_ITEM +InternalGetNextAttributeListItem(PFIND_ATTR_CONTXT Context) +{ + PNTFS_ATTRIBUTE_LIST_ITEM NextItem; + + if (Context->NonResidentCur == (PVOID)-1) + { + return NULL; + } + + if (Context->NonResidentCur == NULL || Context->NonResidentCur->Type == AttributeEnd) + { + Context->NonResidentCur = (PVOID)-1; + return NULL; + } + + if (Context->NonResidentCur->Length == 0) + { + DPRINT1("Broken length list entry length !"); + Context->NonResidentCur = (PVOID)-1; + return NULL; + } + + NextItem = (PNTFS_ATTRIBUTE_LIST_ITEM)((PCHAR)Context->NonResidentCur + Context->NonResidentCur->Length); + if (NextItem->Length == 0 || NextItem->Type == AttributeEnd) + { + Context->NonResidentCur = (PVOID)-1; + return NULL; + } + + if (NextItem < Context->NonResidentStart || NextItem > Context->NonResidentEnd) + { + Context->NonResidentCur = (PVOID)-1; + return NULL; + } + + Context->NonResidentCur = NextItem; + return NextItem; +} + +NTSTATUS +FindFirstAttributeListItem(PFIND_ATTR_CONTXT Context, + PNTFS_ATTRIBUTE_LIST_ITEM *Item) +{ + if (Context->NonResidentStart == NULL || Context->NonResidentStart->Type == AttributeEnd) + { + return STATUS_UNSUCCESSFUL; + } + + Context->NonResidentCur = Context->NonResidentStart; + *Item = Context->NonResidentCur; + return STATUS_SUCCESS; +} + +NTSTATUS +FindNextAttributeListItem(PFIND_ATTR_CONTXT Context, + PNTFS_ATTRIBUTE_LIST_ITEM *Item) +{ + *Item = InternalGetNextAttributeListItem(Context); + if (*Item == NULL) + { + return STATUS_UNSUCCESSFUL; + } return STATUS_SUCCESS; } @@ -1308,30 +1375,6 @@ InternalGetNextAttribute(PFIND_ATTR_CONTXT Context) return NULL; } - if (Context->CurrAttr < Context->NonResidentStart || - Context->CurrAttr >= Context->NonResidentEnd) - { - Context->CurrAttr = Context->NonResidentStart; - } - else if (Context->CurrAttr->Length != 0) - { - NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Context->CurrAttr + Context->CurrAttr->Length); - Context->Offset += ((ULONG_PTR)NextAttribute - (ULONG_PTR)Context->CurrAttr); - Context->CurrAttr = NextAttribute; - } - else - { - DPRINT1("Broken length!\n"); - Context->CurrAttr = (PVOID)-1; - return NULL; - } - - if (Context->CurrAttr < Context->NonResidentEnd && - Context->CurrAttr->Type != AttributeEnd) - { - return Context->CurrAttr; - } - Context->CurrAttr = (PVOID)-1; return NULL; } diff --git a/drivers/filesystems/ntfs/mft.c b/drivers/filesystems/ntfs/mft.c index f03074cdfda..e1411f0ac96 100644 --- a/drivers/filesystems/ntfs/mft.c +++ b/drivers/filesystems/ntfs/mft.c @@ -140,6 +140,7 @@ FindAttribute(PDEVICE_EXTENSION Vcb, NTSTATUS Status; FIND_ATTR_CONTXT Context; PNTFS_ATTR_RECORD Attribute; + PNTFS_ATTRIBUTE_LIST_ITEM AttrListItem; DPRINT("FindAttribute(%p, %p, 0x%x, %S, %lu, %p, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx, Offset); @@ -184,6 +185,61 @@ FindAttribute(PDEVICE_EXTENSION Vcb, Status = FindNextAttribute(&Context, &Attribute); } + /* No attribute found, check if it is referenced in another file record */ + Status = FindFirstAttributeListItem(&Context, &AttrListItem); + while (NT_SUCCESS(Status)) + { + if (AttrListItem->Type == Type && AttrListItem->NameLength == NameLength) + { + if (NameLength != 0) + { + PWCHAR AttrName; + + AttrName = (PWCHAR)((PCHAR)AttrListItem + AttrListItem->NameOffset); + DPRINT("%.*S, %.*S\n", AttrListItem->NameLength, AttrName, NameLength, Name); + if (RtlCompareMemory(AttrName, Name, NameLength * sizeof(WCHAR)) == (NameLength * sizeof(WCHAR))) + { + Found = TRUE; + } + } + else + { + Found = TRUE; + } + + if (Found == TRUE) + { + /* Get the MFT Index of attribute */ + ULONGLONG MftIndex; + PFILE_RECORD_HEADER RemoteHdr; + + MftIndex = AttrListItem->MFTIndex & NTFS_MFT_MASK; + RemoteHdr = ExAllocateFromNPagedLookasideList(&Vcb->FileRecLookasideList); + + if (RemoteHdr == NULL) + { + FindCloseAttribute(&Context); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Check we are not reading ourselves */ + if (MftRecord->MFTRecordNumber == MftIndex) + { + DPRINT1("Attribute list references missing attribute to this file entry !"); + ExFreeToNPagedLookasideList(&Vcb->FileRecLookasideList, RemoteHdr); + FindCloseAttribute(&Context); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + /* Read the new file record */ + ReadFileRecord(Vcb, MftIndex, RemoteHdr); + Status = FindAttribute(Vcb, RemoteHdr, Type, Name, NameLength, AttrCtx, Offset); + ExFreeToNPagedLookasideList(&Vcb->FileRecLookasideList, RemoteHdr); + FindCloseAttribute(&Context); + return Status; + } + } + Status = FindNextAttributeListItem(&Context, &AttrListItem); + } FindCloseAttribute(&Context); return STATUS_OBJECT_NAME_NOT_FOUND; } diff --git a/drivers/filesystems/ntfs/ntfs.h b/drivers/filesystems/ntfs/ntfs.h index c50a077e1c1..aa85b810883 100644 --- a/drivers/filesystems/ntfs/ntfs.h +++ b/drivers/filesystems/ntfs/ntfs.h @@ -300,6 +300,17 @@ typedef struct }; } NTFS_ATTR_RECORD, *PNTFS_ATTR_RECORD; +typedef struct +{ + ULONG Type; + USHORT Length; + UCHAR NameLength; + UCHAR NameOffset; + ULONGLONG StartingVCN; + ULONGLONG MFTIndex; + USHORT Instance; +} NTFS_ATTRIBUTE_LIST_ITEM, *PNTFS_ATTRIBUTE_LIST_ITEM; + // The beginning and length of an attribute record are always aligned to an 8-byte boundary, // relative to the beginning of the file record. #define ATTR_RECORD_ALIGNMENT 8 @@ -486,6 +497,7 @@ typedef struct _NTFS_ATTR_CONTEXT ULONGLONG CacheRunCurrentOffset; LARGE_MCB DataRunsMCB; ULONGLONG FileMFTIndex; + ULONGLONG FileOwnerMFTIndex; /* If attribute list attribute, reference the original file */ PNTFS_ATTR_RECORD pRecord; } NTFS_ATTR_CONTEXT, *PNTFS_ATTR_CONTEXT; @@ -534,8 +546,9 @@ typedef struct _FIND_ATTR_CONTXT PNTFS_ATTR_RECORD FirstAttr; PNTFS_ATTR_RECORD CurrAttr; PNTFS_ATTR_RECORD LastAttr; - PNTFS_ATTR_RECORD NonResidentStart; - PNTFS_ATTR_RECORD NonResidentEnd; + PNTFS_ATTRIBUTE_LIST_ITEM NonResidentStart; + PNTFS_ATTRIBUTE_LIST_ITEM NonResidentEnd; + PNTFS_ATTRIBUTE_LIST_ITEM NonResidentCur; ULONG Offset; } FIND_ATTR_CONTXT, *PFIND_ATTR_CONTXT; @@ -659,6 +672,14 @@ PFILENAME_ATTRIBUTE GetBestFileNameFromRecord(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER FileRecord); +NTSTATUS +FindFirstAttributeListItem(PFIND_ATTR_CONTXT Context, + PNTFS_ATTRIBUTE_LIST_ITEM *Item); + +NTSTATUS +FindNextAttributeListItem(PFIND_ATTR_CONTXT Context, + PNTFS_ATTRIBUTE_LIST_ITEM *Item); + NTSTATUS FindFirstAttribute(PFIND_ATTR_CONTXT Context, PDEVICE_EXTENSION Vcb,

1 0

[reactos] 01/01: Revert "[WININET_APITEST] Add Download testcase (#1832)" (#1839)
by Katayama Hirofumi MZ 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86b8aeb3f2b42ef4f23d7… commit 86b8aeb3f2b42ef4f23d7eecd2269e246ebde955 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 16 17:01:03 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 16 17:01:03 2019 +0900 Revert "[WININET_APITEST] Add Download testcase (#1832)" (#1839) This reverts commit 7464241adabfbdfec5a058697632a8d3938479fb. --- modules/rostests/apitests/wininet/CMakeLists.txt | 4 +- modules/rostests/apitests/wininet/Download.c | 83 ------------------------ modules/rostests/apitests/wininet/testlist.c | 2 - 3 files changed, 2 insertions(+), 87 deletions(-) diff --git a/modules/rostests/apitests/wininet/CMakeLists.txt b/modules/rostests/apitests/wininet/CMakeLists.txt index 45baa402dda..fb18c91ac17 100644 --- a/modules/rostests/apitests/wininet/CMakeLists.txt +++ b/modules/rostests/apitests/wininet/CMakeLists.txt @@ -1,7 +1,7 @@ -add_executable(wininet_apitest Download.c InternetOpen.c testlist.c) +add_executable(wininet_apitest InternetOpen.c testlist.c) target_link_libraries(wininet_apitest wine) set_module_type(wininet_apitest win32cui) #add_delay_importlibs(wininet_apitest wininet) -add_importlibs(wininet_apitest wininet msvcrt kernel32 ntdll) +add_importlibs(wininet_apitest msvcrt kernel32 ntdll) add_rostests_file(TARGET wininet_apitest) diff --git a/modules/rostests/apitests/wininet/Download.c b/modules/rostests/apitests/wininet/Download.c deleted file mode 100644 index 307f532f065..00000000000 --- a/modules/rostests/apitests/wininet/Download.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * PROJECT: ReactOS API Tests - * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) - * PURPOSE: wininet Download testcase - * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) - */ -#include <apitest.h> -#include <stdio.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <windef.h> -#include <wininet.h> - -#define FILENAME "download-testdata.txt" -#define TESTDATA "This is a test data.\r\n" - -static void DoDownload1(const char *url, const char *filename) -{ - HANDLE hFile; - HINTERNET hInternet, hConnect; - static const char s_header[] = "Accept: */" "*\r\n\r\n"; - BYTE buffer[256]; - DWORD cbRead; - BOOL ret; - - hFile = CreateFileA(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(hFile != INVALID_HANDLE_VALUE, "hFile was INVALID_HANDLE_VALUE.\n"); - - hInternet = InternetOpenA(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); - ok(hInternet != NULL, "hInternet was NULL.\n"); - - hConnect = InternetOpenUrlA(hInternet, url, s_header, lstrlenA(s_header), - INTERNET_FLAG_DONT_CACHE, 0); - ok(hConnect != NULL, "hConnect was NULL.\n"); - - for (;;) - { - Sleep(100); - - ret = InternetReadFile(hConnect, buffer, ARRAYSIZE(buffer), &cbRead); - if (!ret || !cbRead) - break; - - if (!WriteFile(hFile, buffer, cbRead, &cbRead, NULL)) - { - ok(0, "WriteFile returns FALSE.\n"); - break; - } - } - - ok_int(InternetCloseHandle(hConnect), TRUE); - ok_int(InternetCloseHandle(hInternet), TRUE); - CloseHandle(hFile); -} - -static void DoDownload2(const char *url, const char *filename) -{ - FILE *fp; - char buf[256]; - DoDownload1(url, filename); - ok_int(GetFileAttributesA(FILENAME) != INVALID_FILE_ATTRIBUTES, TRUE); - fp = fopen(FILENAME, "rb"); - ok(fp != NULL, "fp was NULL.\n"); - ok(fgets(buf, ARRAYSIZE(buf), fp) != NULL, "fgets failed.\n"); - ok_str(buf, TESTDATA); - fclose(fp); - DeleteFileA(FILENAME); -} - -START_TEST(Download) -{ - // https://tinyurl.com/y4cpy2fu - // --> - // https://raw.githubusercontent.com/katahiromz/downloads/master/download-test… - DoDownload2("https://tinyurl.com/y4cpy2fu", FILENAME); - - DoDownload2( - "https://raw.githubusercontent.com/katahiromz/downloads/master/download-test…", - FILENAME); -} diff --git a/modules/rostests/apitests/wininet/testlist.c b/modules/rostests/apitests/wininet/testlist.c index 801c8c4d42e..16c84d6f87f 100644 --- a/modules/rostests/apitests/wininet/testlist.c +++ b/modules/rostests/apitests/wininet/testlist.c @@ -3,12 +3,10 @@ #define STANDALONE #include <apitest.h> -extern void func_Download(void); extern void func_InternetOpen(void); const struct test winetest_testlist[] = { - { "Download", func_Download }, { "InternetOpen", func_InternetOpen }, { 0, 0 }

1 0

[reactos] 01/01: [ROSAPPS][NETREG] Fix build
by Katayama Hirofumi MZ 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c5b3e3265993372282ca… commit 2c5b3e3265993372282cafdc1f14a6a0319aa985 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 16 16:57:40 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Aug 16 16:57:40 2019 +0900 [ROSAPPS][NETREG] Fix build --- modules/rosapps/applications/net/netreg/netreg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/net/netreg/netreg.cpp b/modules/rosapps/applications/net/netreg/netreg.cpp index de836c972b1..f7f5105761e 100644 --- a/modules/rosapps/applications/net/netreg/netreg.cpp +++ b/modules/rosapps/applications/net/netreg/netreg.cpp @@ -417,7 +417,7 @@ SOCKET make_listening_socket( int port ) { fprintf( stderr, "Creating the listener\n" ); SOCKET l = socket( PF_INET, SOCK_STREAM, 0 ); - fprintf( stderr, "Socket %I64x\n", l ); + fprintf( stderr, "Socket %x\n", l ); if( l == INVALID_SOCKET ) return l; if( bind( l, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 ) {

1 0

[reactos] 01/01: Update Headers for Printing and Other
by James Tabor 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d48345a0ee1804cedb80a… commit d48345a0ee1804cedb80a817721a57ded39efd85 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Thu Aug 15 21:39:26 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Thu Aug 15 21:39:26 2019 -0500 Update Headers for Printing and Other Add missing flags and function types. Fix typos. --- sdk/include/psdk/wingdi.h | 7 +++++++ win32ss/gdi/eng/surface.h | 2 +- win32ss/include/ntgdihdl.h | 3 +++ win32ss/include/ntgdityp.h | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/wingdi.h b/sdk/include/psdk/wingdi.h index 537837813c6..bcaeb6c0e1b 100644 --- a/sdk/include/psdk/wingdi.h +++ b/sdk/include/psdk/wingdi.h @@ -1034,6 +1034,7 @@ extern "C" { #define SETALLJUSTVALUES 771 #define SETCHARSET 772 #define STRETCHBLT 2048 +#define METAFILE_DRIVER 2049 #define GETSETSCREENPARAMS 3072 #define QUERYDIBSUPPORT 3073 #define BEGIN_PATH 4096 @@ -1056,6 +1057,12 @@ extern "C" { #define CLOSECHANNEL 4112 #define POSTSCRIPT_PASSTHROUGH 4115 #define ENCAPSULATED_POSTSCRIPT 4116 +#define POSTSCRIPT_IDENTIFY 4117 +#define POSTSCRIPT_INJECTION 4118 +#define CHECKJPEGFORMAT 4119 +#define CHECKPNGFORMAT 4120 +#define GET_PS_FEATURESETTING 4121 +#define SPCLPASSTHROUGH2 4568 #define QDI_SETDIBITS 1 #define QDI_GETDIBITS 2 #define QDI_DIBTOSCREEN 4 diff --git a/win32ss/gdi/eng/surface.h b/win32ss/gdi/eng/surface.h index ee05847e99c..e65ff12a9e3 100644 --- a/win32ss/gdi/eng/surface.h +++ b/win32ss/gdi/eng/surface.h @@ -9,7 +9,7 @@ typedef struct _SURFACE //XDCOBJ * pdcoAA; FLONG flags; struct _PALETTE * const ppal; // Use SURFACE_vSetPalette to assign a palette - //UINT unk_050; + struct _EWNDOBJ *pWinObj; union { diff --git a/win32ss/include/ntgdihdl.h b/win32ss/include/ntgdihdl.h index 1cbb8545d45..1c0c230823b 100644 --- a/win32ss/include/ntgdihdl.h +++ b/win32ss/include/ntgdihdl.h @@ -173,11 +173,14 @@ #define LDC_INIT_DOCUMENT 0x00000040 #define LDC_INIT_PAGE 0x00000080 #define LDC_STARTPAGE 0x00000100 +#define LDC_NEXTBAND 0x00000200 #define LDC_CLOCKWISE 0x00002000 #define LDC_KILL_DOCUMENT 0x00010000 #define LDC_META_PRINT 0x00020000 #define LDC_DIRECT 0x00040000 #define LDC_RESET_BANDING 0x00080000 +#define LDC_RESETDC 0x00200000 +#define LDC_UFIMAP 0x00400000 #define LDC_INFODC 0x01000000 /* If CreateIC was passed. */ #define LDC_DEVCAPS 0x02000000 #define LDC_ATENDPAGE 0x10000000 diff --git a/win32ss/include/ntgdityp.h b/win32ss/include/ntgdityp.h index 3cce9e8afe0..748e4041034 100644 --- a/win32ss/include/ntgdityp.h +++ b/win32ss/include/ntgdityp.h @@ -572,7 +572,7 @@ typedef struct _DRIVER_FUNCTIONS PFN_DrvDisableSurface DisableSurface; PFN_DrvAssertMode AssertMode; PFN_DrvOffset Offset; - PFN_DrvResetDevice ResetPDEV; + PFN_DrvResetPDEV ResetPDEV; PFN_DrvDisableDriver DisableDriver; PVOID Unknown1; PFN_DrvCreateDeviceBitmap CreateDeviceBitmap;

1 0

[reactos] 02/02: [COMCTL32] Saturated images: Take mask-images in account.
by Andreas Maier 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4093681ad0f66fda0a9a6… commit 4093681ad0f66fda0a9a6d65a6a6af8fed1941b4 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sat Jun 1 19:09:44 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 21:11:45 2019 +0200 [COMCTL32] Saturated images: Take mask-images in account. This fixes CORE-14209 - Some icons not drawn in IDA Free --- dll/win32/comctl32/imagelist.c | 58 +++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/dll/win32/comctl32/imagelist.c b/dll/win32/comctl32/imagelist.c index c7c780bbee3..4b4b0647642 100644 --- a/dll/win32/comctl32/imagelist.c +++ b/dll/win32/comctl32/imagelist.c @@ -1281,7 +1281,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, } #ifdef __REACTOS__ -static BOOL alpha_blend_image( HIMAGELIST himl, HDC srce_dc, HDC dest_dc, int dest_x, int dest_y, +static BOOL alpha_blend_image( HIMAGELIST himl, HDC srce_dc, HDC srce_dcMask, HDC dest_dc, int dest_x, int dest_y, #else static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, #endif @@ -1316,7 +1316,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des #endif SelectObject( hdc, bmp ); #ifdef __REACTOS__ - if (!BitBlt( hdc, 0, 0, cx, cy, srce_dc, src_x, src_y, SRCCOPY )) + if (!BitBlt(hdc, 0, 0, cx, cy, srce_dc, src_x, src_y, SRCCOPY)) { TRACE("BitBlt failed\n"); goto done; @@ -1375,7 +1375,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des info->bmiColors[1].rgbGreen = 0xff; info->bmiColors[1].rgbBlue = 0xff; info->bmiColors[1].rgbReserved = 0; - if (!(mask = CreateDIBSection( himl->hdcMask, info, DIB_RGB_COLORS, &mask_bits, 0, 0 ))) + if (!(mask = CreateDIBSection( srce_dcMask, info, DIB_RGB_COLORS, &mask_bits, 0, 0))) { TRACE("CreateDIBSection failed %i\n", GetLastError()); goto done; @@ -1386,13 +1386,13 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des SelectObject(hdc, bmp); goto done; } - if (!BitBlt(hdc, 0, 0, cx, cy, himl->hdcMask, src_x, src_y, SRCCOPY)) + if (!BitBlt( hdc, 0, 0, cx, cy, srce_dcMask, src_x, src_y, SRCCOPY)) { TRACE("BitBlt failed %i\n", GetLastError()); SelectObject(hdc, bmp); goto done; } - if (SelectObject(hdc, bmp) == NULL) + if (SelectObject( hdc, bmp) == NULL) { TRACE("SelectObject failed %i\n", GetLastError()); goto done; @@ -1414,11 +1414,12 @@ done: } #ifdef __REACTOS__ -HDC saturate_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, - int src_x, int src_y, int cx, int cy, COLORREF rgbFg) +BOOL saturate_image(HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, + int src_x, int src_y, int cx, int cy, COLORREF rgbFg, + HDC *hdcImageListDC, HDC *hdcMaskListDC) { - HDC hdc = NULL; - HBITMAP bmp = 0; + HDC hdc = NULL, hdcMask = NULL; + HBITMAP bmp = 0, bmpMask = 0; BITMAPINFO *info; unsigned int *ptr; @@ -1470,16 +1471,37 @@ HDC saturate_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, *ptr = RGBA(mixed_color, mixed_color, mixed_color, GetAValue(orig_color)); } + if (himl->hdcMask) + { + hdcMask = CreateCompatibleDC(NULL); + bmpMask = CreateCompatibleBitmap(hdcMask, cx, cy); + + SelectObject(hdcMask, bmpMask); + + if (!BitBlt(hdcMask, 0, 0, cx, cy, himl->hdcMask, src_x, src_y, SRCCOPY)) + { + ERR("BitBlt failed %i\n", GetLastError()); + DeleteDC(hdcMask); + hdcMask = NULL; + goto done; + } + TRACE("mask ok\n"); + } + done: if (bmp) DeleteObject(bmp); + if (bmpMask) + DeleteObject(bmpMask); if (info) HeapFree(GetProcessHeap(), 0, info); /* return the handle to our desaturated dc, that will substitute its original counterpart in the next calls */ - return hdc; + *hdcMaskListDC = hdcMask; + *hdcImageListDC = hdc; + return (hdc != NULL); } #endif /* __REACTOS__ */ @@ -1511,7 +1533,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) POINT pt; BOOL has_alpha; #ifdef __REACTOS__ - HDC hdcSaturated = NULL; + HDC hdcSaturated = NULL, hdcSaturatedMask = NULL; #endif if (!pimldp || !(himl = pimldp->himl)) return FALSE; @@ -1569,12 +1591,12 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) */ if (fState & ILS_SATURATE) { - hdcSaturated = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, pimldp->rgbFg); - - if (hdcSaturated != NULL) + if (saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, pimldp->rgbFg, + &hdcSaturated, &hdcSaturatedMask)) { hImageListDC = hdcSaturated; + hMaskListDC = hdcSaturatedMask; /* shitty way of getting subroutines to blit at the right place (top left corner), as our modified imagelist only contains a single image for performance reasons */ pt.x = 0; @@ -1604,7 +1626,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (bIsTransparent) { #ifdef __REACTOS__ - bResult = alpha_blend_image( himl, hImageListDC, pimldp->hdcDst, pimldp->x, pimldp->y, + bResult = alpha_blend_image( himl, hImageListDC, hMaskListDC, pimldp->hdcDst, pimldp->x, pimldp->y, #else bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, #endif @@ -1618,7 +1640,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); #ifdef __REACTOS__ - alpha_blend_image( himl, hImageListDC, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); + alpha_blend_image( himl, hImageListDC, hMaskListDC, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); #else alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); #endif @@ -1748,6 +1770,8 @@ cleanup: #ifdef __REACTOS__ if (hdcSaturated) DeleteDC(hdcSaturated); + if (hdcSaturatedMask) + DeleteDC(hdcSaturatedMask); #endif DeleteObject(hBlendMaskBmp); DeleteObject(hImageBmp);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs