Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [OLEAUT32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d506c2af65ee33ce0483f… commit d506c2af65ee33ce0483f17ff7866dc400ec36b8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 4 13:14:52 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 4 13:14:52 2018 +0100 [OLEAUT32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/oleaut32/connpt.c | 17 ++- dll/win32/oleaut32/dispatch.c | 18 ++- dll/win32/oleaut32/hash.c | 10 +- dll/win32/oleaut32/oleaut.c | 23 +++- dll/win32/oleaut32/olefont.c | 24 +++- dll/win32/oleaut32/olepicture.c | 28 +++- dll/win32/oleaut32/olepropframe.c | 21 ++- dll/win32/oleaut32/precomp.h | 3 +- dll/win32/oleaut32/recinfo.c | 15 ++- dll/win32/oleaut32/resource.h | 3 +- dll/win32/oleaut32/safearray.c | 14 +- dll/win32/oleaut32/tmarshal.c | 29 +++- dll/win32/oleaut32/typelib.c | 275 ++++++++++++++++++++++++++++++++++---- dll/win32/oleaut32/typelib.h | 26 +--- dll/win32/oleaut32/usrmarshal.c | 18 ++- dll/win32/oleaut32/varformat.c | 14 +- dll/win32/oleaut32/variant.c | 32 +++-- dll/win32/oleaut32/variant.h | 4 + dll/win32/oleaut32/vartype.c | 14 +- media/doc/README.WINE | 2 +- 20 files changed, 499 insertions(+), 91 deletions(-) diff --git a/dll/win32/oleaut32/connpt.c b/dll/win32/oleaut32/connpt.c index d16dd16dba..0405d3857c 100644 --- a/dll/win32/oleaut32/connpt.c +++ b/dll/win32/oleaut32/connpt.c @@ -22,9 +22,22 @@ * comments just above that function for information. */ -#include "precomp.h" - #include <assert.h> +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ole2.h" +#include "olectl.h" +#include "connpt.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dll/win32/oleaut32/dispatch.c b/dll/win32/oleaut32/dispatch.c index 1331d1c447..a666d3dba1 100644 --- a/dll/win32/oleaut32/dispatch.c +++ b/dll/win32/oleaut32/dispatch.c @@ -19,7 +19,23 @@ * */ -#include "precomp.h" +#include "config.h" + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <ctype.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "oleauto.h" +#include "winerror.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dll/win32/oleaut32/hash.c b/dll/win32/oleaut32/hash.c index 9099948d80..43043980ad 100644 --- a/dll/win32/oleaut32/hash.c +++ b/dll/win32/oleaut32/hash.c @@ -18,8 +18,14 @@ * 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 "precomp.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "objbase.h" +#include "oaidl.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dll/win32/oleaut32/oleaut.c b/dll/win32/oleaut32/oleaut.c index 349a64da61..ee3ff27336 100644 --- a/dll/win32/oleaut32/oleaut.c +++ b/dll/win32/oleaut32/oleaut.c @@ -18,12 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" -#include <initguid.h> -#include <oleaut32_oaidl.h> +#include <stdarg.h> +#include <string.h> +#include <limits.h> +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" + +#include "ole2.h" +#include "olectl.h" +#include "oleauto.h" +#include "initguid.h" #include "typelib.h" +#include "oleaut32_oaidl.h" + +#include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(heap); diff --git a/dll/win32/oleaut32/olefont.c b/dll/win32/oleaut32/olefont.c index abb48d93a3..c20093c702 100644 --- a/dll/win32/oleaut32/olefont.c +++ b/dll/win32/oleaut32/olefont.c @@ -21,8 +21,28 @@ * 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 "precomp.h" +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/list.h" +#include "wine/unicode.h" +#include "objbase.h" +#include "oleauto.h" /* for SysAllocString(....) */ +#include "ole2.h" +#include "olectl.h" +#include "wine/debug.h" +#include "connpt.h" /* for CreateConnectionPoint */ +#include "oaidl.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dll/win32/oleaut32/olepicture.c b/dll/win32/oleaut32/olepicture.c index 878fd18292..96304e0644 100644 --- a/dll/win32/oleaut32/olepicture.c +++ b/dll/win32/oleaut32/olepicture.c @@ -36,14 +36,34 @@ * */ -#include "precomp.h" +#include "config.h" +#include "wine/port.h" #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - -#include <initguid.h> -#include <wincodec.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ole2.h" +#include "olectl.h" +#include "oleauto.h" +#include "connpt.h" +#include "urlmon.h" +#include "initguid.h" +#include "wincodec.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(olepicture); diff --git a/dll/win32/oleaut32/olepropframe.c b/dll/win32/oleaut32/olepropframe.c index 5cb83e40ec..ecffdc9218 100644 --- a/dll/win32/oleaut32/olepropframe.c +++ b/dll/win32/oleaut32/olepropframe.c @@ -19,9 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> -#include <oledlg.h> +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "ole2.h" +#include "olectl.h" +#include "oledlg.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -177,7 +186,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) lpParams->lplpUnk, lpParams->cPages, lpParams->lpPages, lpParams->lcid, lpParams->dispidInitialProperty); - if(!lpParams->lplpUnk || !lpParams->lpPages) + if(!lpParams->lpPages) return E_POINTER; if(lpParams->cbStructSize != sizeof(OCPFIPARAMS)) { @@ -279,7 +288,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) res = IPropertyPage_SetObjects(property_page[i], lpParams->cObjects, lpParams->lplpUnk); if(FAILED(res)) - continue; + WARN("SetObjects() failed, hr %#x.\n", res); res = IPropertyPage_GetPageInfo(property_page[i], &page_info); if(FAILED(res)) @@ -299,10 +308,8 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) PropertySheetW(&property_sheet); for(i=0; i<lpParams->cPages; i++) { - if(property_page[i]) { - IPropertyPage_SetPageSite(property_page[i], NULL); + if(property_page[i]) IPropertyPage_Release(property_page[i]); - } } HeapFree(GetProcessHeap(), 0, dialogs); diff --git a/dll/win32/oleaut32/precomp.h b/dll/win32/oleaut32/precomp.h index cc22ae2745..c5d3cb15e1 100644 --- a/dll/win32/oleaut32/precomp.h +++ b/dll/win32/oleaut32/precomp.h @@ -1,3 +1,4 @@ + #ifndef _OLEAUT32_PCH_ #define _OLEAUT32_PCH_ @@ -28,4 +29,4 @@ #include "variant.h" #include "resource.h" -#endif /* _OLEAUT32_PCH_ */ +#endif /* !_OLEAUT32_PCH_ */ diff --git a/dll/win32/oleaut32/recinfo.c b/dll/win32/oleaut32/recinfo.c index 46fa3d1e38..ec65a523e3 100644 --- a/dll/win32/oleaut32/recinfo.c +++ b/dll/win32/oleaut32/recinfo.c @@ -16,7 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "oaidl.h" +#include "oleauto.h" +#include "variant.h" + +#include "wine/unicode.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dll/win32/oleaut32/resource.h b/dll/win32/oleaut32/resource.h index daf3a4b3a4..550170afc6 100644 --- a/dll/win32/oleaut32/resource.h +++ b/dll/win32/oleaut32/resource.h @@ -17,10 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #ifndef WINE_OLEAUT32_RESOURCE_H #define WINE_OLEAUT32_RESOURCE_H +#include <windef.h> + /* Localised boolean text */ #define IDS_TRUE 100 #define IDS_FALSE 101 diff --git a/dll/win32/oleaut32/safearray.c b/dll/win32/oleaut32/safearray.c index 1a9109170a..01dbfc3417 100644 --- a/dll/win32/oleaut32/safearray.c +++ b/dll/win32/oleaut32/safearray.c @@ -31,7 +31,19 @@ * 0x10: SAFEARRAYBOUNDS[0...] */ -#include "precomp.h" +#include "config.h" + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winerror.h" +#include "winbase.h" +#include "variant.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); diff --git a/dll/win32/oleaut32/tmarshal.c b/dll/win32/oleaut32/tmarshal.c index 7a085f1fa2..7530f66c9b 100644 --- a/dll/win32/oleaut32/tmarshal.c +++ b/dll/win32/oleaut32/tmarshal.c @@ -21,11 +21,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" - +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <ctype.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "winuser.h" + +#include "ole2.h" +#include "propidl.h" /* for LPSAFEARRAY_User* functions */ #include "typelib.h" - -#include <wine/exception.h> +#include "variant.h" +#include "wine/debug.h" +#include "wine/exception.h" static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; diff --git a/dll/win32/oleaut32/typelib.c b/dll/win32/oleaut32/typelib.c index 4f2fa47924..4a609d7050 100644 --- a/dll/win32/oleaut32/typelib.c +++ b/dll/win32/oleaut32/typelib.c @@ -47,12 +47,34 @@ * */ -#include "precomp.h" - -#include <winternl.h> -#include <lzexpand.h> - +#include "config.h" +#include "wine/port.h" + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <ctype.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "winuser.h" +#include "winternl.h" +#include "lzexpand.h" + +#include "wine/unicode.h" +#include "objbase.h" #include "typelib.h" +#include "wine/debug.h" +#include "variant.h" +#include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(typelib); @@ -2415,7 +2437,7 @@ MSFT_DoFuncs(TLBContext* pcx, ptfd->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; ptfd->funcdesc.cParams = pFuncRec->nrargs ; ptfd->funcdesc.cParamsOpt = pFuncRec->nroargs ; - ptfd->funcdesc.oVft = pFuncRec->VtableOffset & ~1; + ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; /* nameoffset is sometimes -1 on the second half of a propget/propput @@ -3501,10 +3523,6 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) /* name, eventually add to a hash table */ pTypeLibImpl->Name = MSFT_ReadName(&cx, tlbHeader.NameOffset); - TRACE("%s, syskind %d, version %d.%d, flags %04x\n", - debugstr_w(pTypeLibImpl->Name->str), pTypeLibImpl->syskind, - pTypeLibImpl->ver_major, pTypeLibImpl->ver_minor, pTypeLibImpl->libflags); - /* help info */ pTypeLibImpl->DocString = MSFT_ReadString(&cx, tlbHeader.helpstring); pTypeLibImpl->HelpFile = MSFT_ReadString(&cx, tlbHeader.helpfile); @@ -4241,7 +4259,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, pFuncDesc->funcdesc.callconv = pFunc->nacc & 0x7; pFuncDesc->funcdesc.cParams = pFunc->nacc >> 3; pFuncDesc->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; - pFuncDesc->funcdesc.oVft = pFunc->vtblpos & ~1; + pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; if (pFunc->helpstring != 0xffff) pFuncDesc->HelpString = decode_string(hlp_strings, pBlk + pFunc->helpstring, pNameTable - pBlk, pTI->pTypeLib); @@ -6531,6 +6549,44 @@ DWORD _invoke(FARPROC func, CALLCONV callconv, int nrargs, DWORD_PTR *args) return res; } +#elif defined(__arm__) + +extern LONGLONG CDECL call_method( void *func, int nb_stk_args, const DWORD *stk_args, const DWORD *reg_args ); +__ASM_GLOBAL_FUNC( call_method, + /* r0 = *func + * r1 = nb_stk_args + * r2 = *stk_args (pointer to 'nb_stk_args' DWORD values to push on stack) + * r3 = *reg_args (pointer to 8, 64-bit d0-d7 (double) values OR as 16, 32-bit s0-s15 (float) values, followed by 4, 32-bit (DWORD) r0-r3 values) + */ + + "push {fp, lr}\n\t" /* Save frame pointer and return address (stack still aligned to 8 bytes) */ + "mov fp, sp\n\t" /* Save stack pointer as our frame for cleaning the stack on return */ + + "lsls r1, r1, #2\n\t" /* r1 = nb_stk_args * sizeof(DWORD) */ + "beq 1f\n\t" /* Skip allocation if no stack args */ + "add r2, r2, r1\n" /* Calculate ending address of incoming stack data */ + "2:\tldr ip, [r2, #-4]!\n\t" /* Get next value */ + "str ip, [sp, #-4]!\n\t" /* Push it on the stack */ + "subs r1, r1, #4\n\t" /* Decrement count */ + "bgt 2b\n\t" /* Loop till done */ + + "1:\n\t" +#ifndef __SOFTFP__ + "vldm r3!, {s0-s15}\n\t" /* Load the s0-s15/d0-d7 arguments */ +#endif + "mov ip, r0\n\t" /* Save the function call address to ip before we nuke r0 with arguments to pass */ + "ldm r3, {r0-r3}\n\t" /* Load the r0-r3 arguments */ + + "blx ip\n\t" /* Call the target function */ + + "mov sp, fp\n\t" /* Clean the stack using fp */ + "pop {fp, pc}\n\t" /* Restore fp and return */ + ) + +/* same function but returning single/double floating point */ +static float (CDECL * const call_float_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method; +static double (CDECL * const call_double_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method; + #endif /* __x86_64__ */ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) @@ -6562,7 +6618,6 @@ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, break; case TKIND_ALIAS: - tdesc = &tattr->tdescAlias; hr = typedescvt_to_variantvt(tinfo2, &tattr->tdescAlias, vt); break; @@ -6956,6 +7011,182 @@ DispCallFunc( TRACE("retval: %s\n", debugstr_variant(pvargResult)); return S_OK; +#elif defined(__arm__) + int argspos; + void *func; + UINT i; + DWORD *args; + struct { +#ifndef __SOFTFP__ + union { + float s[16]; + double d[8]; + } sd; +#endif + DWORD r[4]; + } regs; + int rcount; /* 32-bit register index count */ +#ifndef __SOFTFP__ + int scount = 0; /* single-precision float register index count */ + int dcount = 0; /* double-precision float register index count */ +#endif + + TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); + + if (cc != CC_STDCALL && cc != CC_CDECL) + { + FIXME("unsupported calling convention %d\n",cc); + return E_INVALIDARG; + } + + argspos = 0; + rcount = 0; + + /* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */ + /* first as it will need to be in the 'r' registers: */ + switch (vtReturn) + { + case VT_DECIMAL: + case VT_VARIANT: + regs.r[rcount++] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ + break; + case VT_HRESULT: + WARN("invalid return type %u\n", vtReturn); + return E_INVALIDARG; + default: /* And all others are in 'r', 's', or 'd' registers or have no return value */ + break; + } + + if (pvInstance) + { + const FARPROC *vtable = *(FARPROC **)pvInstance; + func = vtable[oVft/sizeof(void *)]; + regs.r[rcount++] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ + } + else func = (void *)oVft; + + /* maximum size for an argument is sizeof(VARIANT). Also allow for return pointer and stack alignment. */ + args = heap_alloc( sizeof(VARIANT) * cActuals + sizeof(DWORD) * 4 ); + + for (i = 0; i < cActuals; i++) + { + VARIANT *arg = prgpvarg[i]; + DWORD *pdwarg = (DWORD *)(arg); /* a reinterpret_cast of the variant, used for copying structures when they are split between registers and stack */ + int ntemp; /* Used for counting words split between registers and stack */ + + switch (prgvt[i]) + { + case VT_EMPTY: + break; + case VT_R8: /* these must be 8-byte aligned, and put in 'd' regs or stack, as they are double-floats */ + case VT_DATE: +#ifndef __SOFTFP__ + dcount = max( (scount + 1) / 2, dcount ); + if (dcount < 8) + { + regs.sd.d[dcount++] = V_R8(arg); + } + else + { + argspos += (argspos % 2); /* align argspos to 8-bytes */ + memcpy( &args[argspos], &V_R8(arg), sizeof(V_R8(arg)) ); + argspos += sizeof(V_R8(arg)) / sizeof(DWORD); + } + break; +#endif + case VT_I8: /* these must be 8-byte aligned, and put in 'r' regs or stack, as they are long-longs */ + case VT_UI8: + case VT_CY: + if (rcount < 3) + { + rcount += (rcount % 2); /* align rcount to 8-byte register pair */ + memcpy( &regs.r[rcount], &V_UI8(arg), sizeof(V_UI8(arg)) ); + rcount += sizeof(V_UI8(arg)) / sizeof(DWORD); + } + else + { + rcount = 4; /* Make sure we flag that all 'r' regs are full */ + argspos += (argspos % 2); /* align argspos to 8-bytes */ + memcpy( &args[argspos], &V_UI8(arg), sizeof(V_UI8(arg)) ); + argspos += sizeof(V_UI8(arg)) / sizeof(DWORD); + } + break; + case VT_DECIMAL: /* these structures are 8-byte aligned, and put in 'r' regs or stack, can be split between the two */ + case VT_VARIANT: + /* 8-byte align 'r' and/or stack: */ + if (rcount < 3) + rcount += (rcount % 2); + else + { + rcount = 4; + argspos += (argspos % 2); + } + ntemp = sizeof(*arg) / sizeof(DWORD); + while (ntemp > 0) + { + if (rcount < 4) + regs.r[rcount++] = *pdwarg++; + else + args[argspos++] = *pdwarg++; + --ntemp; + } + break; + case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ + if (rcount < 4) + regs.r[rcount++] = V_BOOL(arg); + else + args[argspos++] = V_BOOL(arg); + break; + case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ +#ifndef __SOFTFP__ + if (!(scount % 2)) scount = max( scount, dcount * 2 ); + if (scount < 16) + regs.sd.s[scount++] = V_R4(arg); + else + args[argspos++] = V_UI4(arg); + break; +#endif + default: + if (rcount < 4) + regs.r[rcount++] = V_UI4(arg); + else + args[argspos++] = V_UI4(arg); + break; + } + TRACE("arg %u: type %s %s\n", i, debugstr_vt(prgvt[i]), debugstr_variant(arg)); + } + + argspos += (argspos % 2); /* Make sure stack function alignment is 8-byte */ + + switch (vtReturn) + { + case VT_EMPTY: /* EMPTY = no return value */ + case VT_DECIMAL: /* DECIMAL and VARIANT already have a pointer argument passed (see above) */ + case VT_VARIANT: + call_method( func, argspos, args, (DWORD*)&regs ); + break; + case VT_R4: + V_R4(pvargResult) = call_float_method( func, argspos, args, (DWORD*)&regs ); + break; + case VT_R8: + case VT_DATE: + V_R8(pvargResult) = call_double_method( func, argspos, args, (DWORD*)&regs ); + break; + case VT_I8: + case VT_UI8: + case VT_CY: + V_UI8(pvargResult) = call_method( func, argspos, args, (DWORD*)&regs ); + break; + default: + V_UI4(pvargResult) = call_method( func, argspos, args, (DWORD*)&regs ); + break; + } + heap_free( args ); + if (vtReturn != VT_VARIANT) V_VT(pvargResult) = vtReturn; + TRACE("retval: %s\n", debugstr_variant(pvargResult)); + return S_OK; + #else FIXME( "(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d)): not implemented for this CPU\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); @@ -7049,7 +7280,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( UINT cNamedArgs = pDispParams->cNamedArgs; DISPID *rgdispidNamedArgs = pDispParams->rgdispidNamedArgs; UINT vargs_converted=0; - ULONG_PTR offset; hres = S_OK; @@ -7298,11 +7528,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - if (FAILED(hres)) - { - ERR("failed: %08x\n", hres); - goto func_fail; /* FIXME: we don't free changed types here */ - } + if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ /* VT_VOID is a special case for return types, so it is not * handled in the general function */ @@ -7315,16 +7541,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ } - offset = func_desc->oVft & 0xFFFC; -#ifdef _WIN64 - if (This->pTypeLib->syskind == SYS_WIN32) - { - offset *= 2; - TRACE("extended offset to %#lx for SYS_WIN32\n", offset); - } -#endif - TRACE("func_desc->oVft %#x, offset %#lx\n", func_desc->oVft, offset); - hres = DispCallFunc(pIUnk, offset, func_desc->callconv, + hres = DispCallFunc(pIUnk, func_desc->oVft & 0xFFFC, func_desc->callconv, V_VT(&varresult), func_desc->cParams, rgvt, prgpvarg, &varresult); @@ -7451,7 +7668,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( * pointer to be valid */ VariantInit(pVarResult); hres = IDispatch_Invoke(pDispatch, DISPID_VALUE, &IID_NULL, - GetSystemDefaultLCID(), INVOKE_PROPERTYGET, + GetSystemDefaultLCID(), wFlags, pDispParams, pVarResult, pExcepInfo, pArgErr); IDispatch_Release(pDispatch); } diff --git a/dll/win32/oleaut32/typelib.h b/dll/win32/oleaut32/typelib.h index 100e15a145..bfea174bc0 100644 --- a/dll/win32/oleaut32/typelib.h +++ b/dll/win32/oleaut32/typelib.h @@ -21,6 +21,12 @@ #ifndef _WINE_TYPELIB_H #define _WINE_TYPELIB_H +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "oleauto.h" + #define HELPDLLFLAG (0x0100) #define DO_NOT_SEEK (-1) @@ -590,26 +596,6 @@ WORD typeofarray #include "poppack.h" -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, size ); -} - -static inline BOOL heap_free( LPVOID mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN; extern DWORD _invoke(FARPROC func, CALLCONV callconv, int nrargs, DWORD_PTR *args) DECLSPEC_HIDDEN; diff --git a/dll/win32/oleaut32/usrmarshal.c b/dll/win32/oleaut32/usrmarshal.c index e42518a0dc..da524c85eb 100644 --- a/dll/win32/oleaut32/usrmarshal.c +++ b/dll/win32/oleaut32/usrmarshal.c @@ -19,7 +19,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" + +#include "ole2.h" +#include "oleauto.h" +#include "typelib.h" +#include "ocidl.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dll/win32/oleaut32/varformat.c b/dll/win32/oleaut32/varformat.c index f701bfbf7d..696763e7ed 100644 --- a/dll/win32/oleaut32/varformat.c +++ b/dll/win32/oleaut32/varformat.c @@ -25,7 +25,19 @@ * Please submit a test case if you find a difference. */ -#include "precomp.h" +#include "config.h" + +#include <string.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/unicode.h" +#include "winerror.h" +#include "variant.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); diff --git a/dll/win32/oleaut32/variant.c b/dll/win32/oleaut32/variant.c index 05818bcfd6..b9cf4b0a00 100644 --- a/dll/win32/oleaut32/variant.c +++ b/dll/win32/oleaut32/variant.c @@ -25,7 +25,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" + +#include <string.h> +#include <stdlib.h> +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "wine/unicode.h" +#include "winerror.h" +#include "variant.h" +#include "resource.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); @@ -2145,7 +2161,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, multiplier10, divisor10); if (dwVtBits & (INTEGER_VTBITS|VTBIT_DECIMAL) && - (!fractionalDigits || !(dwVtBits & (REAL_VTBITS|VTBIT_CY|VTBIT_DECIMAL)))) + (!fractionalDigits || !(dwVtBits & (REAL_VTBITS|VTBIT_DECIMAL)))) { /* We have one or more integer output choices, and either: * 1) An integer input value, or @@ -2259,7 +2275,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, V_I8(pVarDst) = -ul64; return S_OK; } - else if ((dwVtBits & REAL_VTBITS) == VTBIT_DECIMAL) + else if ((dwVtBits & (REAL_VTBITS|VTBIT_DECIMAL)) == VTBIT_DECIMAL) { /* Decimal is only output choice left - fast path */ V_VT(pVarDst) = VT_DECIMAL; @@ -2321,7 +2337,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, V_UI8(pVarDst) = ul64; return S_OK; } - else if ((dwVtBits & REAL_VTBITS) == VTBIT_DECIMAL) + else if ((dwVtBits & (REAL_VTBITS|VTBIT_DECIMAL)) == VTBIT_DECIMAL) { /* Decimal is only output choice left - fast path */ V_VT(pVarDst) = VT_DECIMAL; @@ -2376,8 +2392,8 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, { if (whole < dblMinimums[10] && whole != 0) { - dwVtBits &= ~(VTBIT_R4|VTBIT_R8|VTBIT_CY); /* Underflow */ - bOverflow = TRUE; + whole = 0; /* ignore underflow */ + divisor10 = 0; break; } whole = whole / dblMultipliers[10]; @@ -2387,8 +2403,8 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, { if (whole < dblMinimums[divisor10] && whole != 0) { - dwVtBits &= ~(VTBIT_R4|VTBIT_R8|VTBIT_CY); /* Underflow */ - bOverflow = TRUE; + whole = 0; /* ignore underflow */ + divisor10 = 0; } else whole = whole / dblMultipliers[divisor10]; diff --git a/dll/win32/oleaut32/variant.h b/dll/win32/oleaut32/variant.h index d895a46012..df69c60ca6 100644 --- a/dll/win32/oleaut32/variant.h +++ b/dll/win32/oleaut32/variant.h @@ -20,6 +20,10 @@ #pragma once +#include "windef.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" #include <math.h> /* Get just the type from a variant pointer */ diff --git a/dll/win32/oleaut32/vartype.c b/dll/win32/oleaut32/vartype.c index 3d07a277a4..eeef9922f2 100644 --- a/dll/win32/oleaut32/vartype.c +++ b/dll/win32/oleaut32/vartype.c @@ -18,7 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "winbase.h" +#include "winuser.h" +#include "winnt.h" +#include "variant.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); @@ -5362,7 +5372,7 @@ static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, BOOL isDoub end of the bit representation, down to the precision guaranteed by the floating point number. */ if (isDouble) { - while (exponent10 < 0 && (val->bitsnum[2] != 0 || (val->bitsnum[2] == 0 && (val->bitsnum[1] & 0xFFE00000) != 0))) { + while (exponent10 < 0 && (val->bitsnum[2] != 0 || (val->bitsnum[1] & 0xFFE00000) != 0)) { int rem10; rem10 = VARIANT_int_divbychar(val->bitsnum, 3, 10); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 7f2e9e6af6..d31a67f70f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -141,7 +141,7 @@ reactos/dll/win32/odbc32 # Synced to WineStaging-2.9. Depends on po reactos/dll/win32/odbccp32 # Synced to WineStaging-2.9 reactos/dll/win32/ole32 # Synced to Wine-3.0 reactos/dll/win32/oleacc # Synced to WineStaging-2.9 -reactos/dll/win32/oleaut32 # Synced to WineStaging-2.16 +reactos/dll/win32/oleaut32 # Synced to WineStaging-3.3 reactos/dll/win32/olecli32 # Synced to WineStaging-2.9 reactos/dll/win32/oledlg # Synced to WineStaging-2.9 reactos/dll/win32/olepro32 # Synced to WineStaging-2.9

6 years, 9 months

01/01: [INCLUDE/WINE] Import heap.h from Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=004d830fe974f3ade31bb… commit 004d830fe974f3ade31bb3fe31d5ec186f7486d9 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 4 13:10:02 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 4 13:10:02 2018 +0100 [INCLUDE/WINE] Import heap.h from Wine Staging 3.3. CORE-14434 --- sdk/include/reactos/wine/heap.h | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/sdk/include/reactos/wine/heap.h b/sdk/include/reactos/wine/heap.h new file mode 100644 index 0000000000..97d3a5662b --- /dev/null +++ b/sdk/include/reactos/wine/heap.h @@ -0,0 +1,58 @@ +/* + * Wine heap memory allocation wrappers + * + * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2013, 2018 Michael Stefaniuc + * + * 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 + */ + +#ifndef __WINE_WINE_HEAP_H +#define __WINE_WINE_HEAP_H + +#include <winbase.h> + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, SIZE_T len) +{ + if (!mem) + return HeapAlloc(GetProcessHeap(), 0, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +static inline void *heap_calloc(SIZE_T count, SIZE_T size) +{ + SIZE_T len = count * size; + + if (size && len / size != count) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +#endif /* __WINE_WINE_HEAP_H */

6 years, 9 months

01/01: [TRANSLATION][SUBST] Update Simplified Chinese translation. (#414)

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=767e2419e936275e5bf58… commit 767e2419e936275e5bf580db7b6af719068f22fb Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Sun Mar 4 10:37:20 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 4 03:37:20 2018 +0100 [TRANSLATION][SUBST] Update Simplified Chinese translation. (#414) --- base/system/subst/lang/zh-CN.rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/base/system/subst/lang/zh-CN.rc b/base/system/subst/lang/zh-CN.rc index b758f6a15e..972c9582db 100644 --- a/base/system/subst/lang/zh-CN.rc +++ b/base/system/subst/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 */ +/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) 2018 */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -7,8 +8,8 @@ BEGIN IDS_INCORRECT_PARAMETER_COUNT "参数个数不正确 - %s\n" IDS_INVALID_PARAMETER "参数个数不正确 - %s\n" IDS_INVALID_PARAMETER2 "无效参数 - %s\n" - IDS_PATH_NOT_FOUND "Path not found - %s\n" - IDS_ACCESS_DENIED "Access denied - %s\n" + IDS_PATH_NOT_FOUND "找不到文件夹 - %s\n" + IDS_ACCESS_DENIED "拒绝访问 - %s\n" IDS_DRIVE_ALREADY_SUBSTED "驱动器已经运行过 SUBST\n" IDS_FAILED_WITH_ERRORCODE "操作失败！错误码 0x%x：%s\n" IDS_USAGE "将一个路径用驱动器号关联。\n\n\

6 years, 9 months

01/01: [TRANSLATION] Polish translation update (#413)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fd9d3f59b2adeb6e4e76… commit 8fd9d3f59b2adeb6e4e76cbb34ed7064d4a06ade Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Sat Mar 3 21:24:46 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 3 21:24:46 2018 +0100 [TRANSLATION] Polish translation update (#413) Translation update for sndvol32, shell32 (right click drag menu), rapps and ks.inf. --- base/applications/rapps/lang/pl-PL.rc | 4 ++-- base/applications/sndvol32/lang/pl-PL.rc | 20 ++++++++++---------- dll/win32/shell32/lang/pl-PL.rc | 8 ++++---- media/inf/ks.inf | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 54549b0589..787e8e8375 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -211,7 +211,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Nie można pobrać pakietu! Sprawdź połączenie z siecią!" IDS_UNABLE_TO_REMOVE "Nie można było usunąć wpisu z rejestru!" IDS_UNABLE_TO_INSTALL "Nie można uruchomić instalatora!" - IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" + IDS_UNABLE_TO_QUERY_CERT "Nie można odnaleźć informacji o certyfikacie.\n\nCzy chcesz mimo to kontynuować?" IDS_INTEG_CHECK_TITLE "Weryfikowanie integralności pakietu…" IDS_INTEG_CHECK_FAIL "Pakiet nie przeszedł kontroli integralności, mógł zostać uszkodzony lub naruszony podczas pobierania. Uruchamianie tego programu nie jest zalecane." IDS_INTERRUPTED_DOWNLOAD "Pobieranie zostało przerwane. Sprawdź połączenie z siecią" @@ -219,7 +219,7 @@ BEGIN IDS_SELECT_ALL "Zaznacz/Odznacz Wszystko" IDS_INSTALL_SELECTED "Instaluj Zaznaczone" IDS_SELECTEDFORINST "Wybrane do instalacji" - IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_MISMATCH_CERT_INFO "Użyty certyfikat jest nieznany:\nSubject: %s\nIssuer: %s\nCzy chcesz mimo to kontynuować?" END STRINGTABLE diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index 40610bbfe7..c2c09123bc 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -36,12 +36,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS CAPTION "Właściwości" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Urządzenie &miksujące", -1, 7, 8, 48, 9 - COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP + LTEXT "Urządzenie &miksujące:", -1, 7, 8, 98, 9 + COMBOBOX IDC_MIXERDEVICE, 85, 8, 133, 80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Ustawianie głośności", -1, 7, 25, 211, 77 - PUSHBUTTON "&Odtwarzanie", IDC_PLAYBACK, 13, 43, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Nagrywanie", IDC_RECORDING, 13, 61, 47, 8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Inne:", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED + PUSHBUTTON "&Odtwarzanie", IDC_PLAYBACK, 13, 43, 67, 8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Nagrywanie", IDC_RECORDING, 13, 61, 67, 8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Inne", IDC_OTHER, 13, 80, 42, 8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55, 80, 155, 50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Pokaż następujące kontrolki głośności:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 @@ -53,13 +53,13 @@ IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kanał główny", IDC_LINE_NAME, 4, 7, 100, 15 + LTEXT "Kanał główny", IDC_LINE_NAME, 4, 6, 150, 21 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Balans", -1, 4, 35, 80, 42 - LTEXT "Głośność", -1, 4, 100, 77, 108 - CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + LTEXT "Balans:", -1, 4, 35, 80, 42 + LTEXT "Głośność:", -1, 4, 90, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 55, 85, 30 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 - CHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 16, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index a91fb1d82c..52bc43e65b 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -84,11 +84,11 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Copy here", IDM_COPYHERE - MENUITEM "&Move here", IDM_MOVEHERE - MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM "&Kopiuj tutaj", IDM_COPYHERE + MENUITEM "&Przenieś tutaj", IDM_MOVEHERE + MENUITEM "Utwórz &skróty tutaj", IDM_LINKHERE MENUITEM SEPARATOR - MENUITEM "Cancel", 0 + MENUITEM "Anuluj", 0 END END diff --git a/media/inf/ks.inf b/media/inf/ks.inf index 7954347933..910e59c107 100644 --- a/media/inf/ks.inf +++ b/media/inf/ks.inf @@ -1145,7 +1145,7 @@ Node.Tone="Ton" Node.Equalizer="Korektor" Node.AGC="AGC" Node.Delay="Opóźnienie" -Node.Loudness="Pogłośnienei" +Node.Loudness="Pogłośnienie" Node.ProLogicDecode="Dekoder Dolby ProLogic" Node.StereoWide="Poszerzone Stereo" Node.StereoEnhance="Wzmocnienie Stereo" @@ -1153,7 +1153,7 @@ Node.Reverb="Pogłos" Node.Chorus="Chorus" Node.3DEffects="Efekty 3D" Node.AEC="Wygaszanie Echa" -Node.DevSpecific="Własny urządzenia" +Node.DevSpecific="Własne urządzenia" Pin.Microphone="Mikrofon" Pin.DesktopMicrophone="Mikrofon stacjonarny" @@ -1229,7 +1229,7 @@ AudFName.MicInVol="Głośność Mikrofony" AudFName.WaveInVol="Głośność dźwięku" AudFName.VolControl="Kontrola głośności" AudFName.MIDI="MIDI" -AudFName.LineIn="Żródło dźwięku" +AudFName.LineIn="Źródło dźwięku" AudFName.RecControl="Kontrola nagrywania" AudFName.CDAudio="CD Audio" AudFName.AuxVolume="Głośność Aux"

6 years, 9 months

03/03: [WIN32K:NTUSER] Handle IntGetSystemMenu failure cases. CORE-12180

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56fdb7adde655af240dc7… commit 56fdb7adde655af240dc7958f1a9f687093badc7 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 3 11:10:37 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 3 17:19:26 2018 +0100 [WIN32K:NTUSER] Handle IntGetSystemMenu failure cases. CORE-12180 --- win32ss/user/ntuser/nonclient.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 1b67b36c77..8c30fa6900 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -737,7 +737,7 @@ UserDrawCaptionButton(PWND pWnd, LPRECT Rect, DWORD Style, DWORD ExStyle, HDC hD case DFCS_CAPTIONCLOSE: { PMENU pSysMenu = IntGetSystemMenu(pWnd, FALSE); - UINT MenuState = IntGetMenuState(UserHMGetHandle(pSysMenu), SC_CLOSE, MF_BYCOMMAND); /* in case of error MenuState==0xFFFFFFFF */ + UINT MenuState = IntGetMenuState(pSysMenu ? UserHMGetHandle(pSysMenu) : NULL, SC_CLOSE, MF_BYCOMMAND); /* in case of error MenuState==0xFFFFFFFF */ /* A tool window has a smaller Close button */ if (ExStyle & WS_EX_TOOLWINDOW) @@ -1380,7 +1380,7 @@ NC_DoButton(PWND pWnd, WPARAM wParam, LPARAM lParam) { case HTCLOSE: SysMenu = IntGetSystemMenu(pWnd, FALSE); - MenuState = IntGetMenuState(UserHMGetHandle(SysMenu), SC_CLOSE, MF_BYCOMMAND); /* in case of error MenuState==0xFFFFFFFF */ + MenuState = IntGetMenuState(SysMenu ? UserHMGetHandle(SysMenu) : NULL, SC_CLOSE, MF_BYCOMMAND); /* in case of error MenuState==0xFFFFFFFF */ if (!(Style & WS_SYSMENU) || (MenuState & (MF_GRAYED|MF_DISABLED)) || (pWnd->style & CS_NOCLOSE)) return; ButtonType = DFCS_CAPTIONCLOSE; @@ -1554,7 +1554,7 @@ NC_HandleNCLButtonDblClk(PWND pWnd, WPARAM wParam, LPARAM lParam) case HTSYSMENU: { PMENU SysMenu = IntGetSystemMenu(pWnd, FALSE); - UINT state = IntGetMenuState(UserHMGetHandle(SysMenu), SC_CLOSE, MF_BYCOMMAND); + UINT state = IntGetMenuState(SysMenu ? UserHMGetHandle(SysMenu) : NULL, SC_CLOSE, MF_BYCOMMAND); /* If the close item of the sysmenu is disabled or not present do nothing */ if ((state & (MF_DISABLED | MF_GRAYED)) || (state == 0xFFFFFFFF))

6 years, 9 months

02/03: [WIN32K:NTUSER] Correctly delete menus in failure cases in MENU_GetSystemMenu. CORE-12180

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7aa1e3122baf4c9a6907… commit b7aa1e3122baf4c9a6907c1a733508b4e1a2a800 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 3 08:19:48 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 3 17:19:16 2018 +0100 [WIN32K:NTUSER] Correctly delete menus in failure cases in MENU_GetSystemMenu. CORE-12180 --- win32ss/user/ntuser/menu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index dc6656ffb3..ccaed593df 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -5092,15 +5092,13 @@ PMENU FASTCALL MENU_GetSystemMenu(PWND Window, PMENU Popup) if (!hNewMenu) { ERR("No Menu!!\n"); - IntReleaseMenuObject(SysMenu); - UserDestroyMenu(hSysMenu); + IntDestroyMenuObject(SysMenu, FALSE); return NULL; } Menu = UserGetMenuObject(hNewMenu); if (!Menu) { - IntReleaseMenuObject(SysMenu); - UserDestroyMenu(hSysMenu); + IntDestroyMenuObject(SysMenu, FALSE); return NULL; }

6 years, 9 months

01/03: [WIN32K:NTUSER] Handle IntCloneMenu failure in MENU_GetSystemMenu. CORE-12180

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89217e3df563a4e843b18… commit 89217e3df563a4e843b18a4c6deca83994834e8e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 3 08:19:13 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 3 17:18:55 2018 +0100 [WIN32K:NTUSER] Handle IntCloneMenu failure in MENU_GetSystemMenu. CORE-12180 --- win32ss/user/ntuser/menu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 888b4ea696..dc6656ffb3 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -5120,6 +5120,12 @@ PMENU FASTCALL MENU_GetSystemMenu(PWND Window, PMENU Popup) IntMenuItemInfo(Menu, SC_MINIMIZE, FALSE, &ItemInfoSet, TRUE, NULL); NewMenu = IntCloneMenu(Menu); + if (NewMenu == NULL) + { + IntDestroyMenuObject(Menu, FALSE); + IntDestroyMenuObject(SysMenu, FALSE); + return NULL; + } IntReleaseMenuObject(NewMenu); UserSetMenuDefaultItem(NewMenu, SC_CLOSE, FALSE);

6 years, 9 months

01/01: [EXPLORER] Remove SetBandSiteInfo hack. CORE-9809

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ede8794c4bb2b9a931d19… commit ede8794c4bb2b9a931d19e45b40541315d46c132 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 3 08:18:34 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 3 17:17:13 2018 +0100 [EXPLORER] Remove SetBandSiteInfo hack. CORE-9809 --- base/shell/explorer/tbsite.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/base/shell/explorer/tbsite.cpp b/base/shell/explorer/tbsite.cpp index aa2f4e6985..5ab31c7647 100644 --- a/base/shell/explorer/tbsite.cpp +++ b/base/shell/explorer/tbsite.cpp @@ -329,13 +329,6 @@ public: bsi.dwStyle = (Locked ? BSIS_LOCKED | BSIS_NOGRIPPER : BSIS_AUTOGRIPPER); hRet = m_BandSite->SetBandSiteInfo(&bsi); - - /* HACK for CORE-9809 ! */ - if (hRet == E_NOTIMPL) - hRet = S_OK; - else - ERR("HACK for CORE-9809 no longer needed!\n"); - if (SUCCEEDED(hRet)) { hRet = Update();

6 years, 9 months

01/01: [STORPORT][DDK] Add the StorPortExtendedFunction stub - Add the StorPortExtendedFunction stub to the storport driver. - Add the declaration of StorPortExtendedFunction to the ddk.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca22dc9bb5054c6d63655… commit ca22dc9bb5054c6d6365574c5c519901b5ae1036 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 3 14:19:33 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 3 14:19:33 2018 +0100 [STORPORT][DDK] Add the StorPortExtendedFunction stub - Add the StorPortExtendedFunction stub to the storport driver. - Add the declaration of StorPortExtendedFunction to the ddk. CORE-12695 --- drivers/storage/port/storport/storport.c | 17 ++ drivers/storage/port/storport/storport.spec | 2 +- sdk/include/ddk/storport.h | 335 ++++++++++++++++++++++++++++ 3 files changed, 353 insertions(+), 1 deletion(-) diff --git a/drivers/storage/port/storport/storport.c b/drivers/storage/port/storport/storport.c index 61982fcb77..a9fd3d07f8 100644 --- a/drivers/storage/port/storport/storport.c +++ b/drivers/storage/port/storport/storport.c @@ -518,6 +518,23 @@ StorPortDeviceReady( } +/* + * @unimplemented + */ +STORPORT_API +ULONG +StorPortExtendedFunction( + _In_ STORPORT_FUNCTION_CODE FunctionCode, + _In_ PVOID HwDeviceExtension, + ...) +{ + DPRINT1("StorPortExtendedFunction(%d %p ...)\n", + FunctionCode, HwDeviceExtension); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + /* * @implemented */ diff --git a/drivers/storage/port/storport/storport.spec b/drivers/storage/port/storport/storport.spec index 7bfe160a4c..310e201f9e 100644 --- a/drivers/storage/port/storport/storport.spec +++ b/drivers/storage/port/storport/storport.spec @@ -9,7 +9,7 @@ @ cdecl StorPortDebugPrint() @ stdcall StorPortDeviceBusy(ptr long long long long) @ stdcall StorPortDeviceReady(ptr long long long) -# StorPortExtendedFunction +@ cdecl StorPortExtendedFunction() @ stdcall StorPortFreeDeviceBase(ptr ptr) @ stdcall StorPortFreeRegistryBuffer(ptr ptr) @ stdcall StorPortGetBusData(ptr long long long ptr long) diff --git a/sdk/include/ddk/storport.h b/sdk/include/ddk/storport.h index b08a156e94..64a6e1059d 100644 --- a/sdk/include/ddk/storport.h +++ b/sdk/include/ddk/storport.h @@ -523,6 +523,46 @@ typedef enum _VPD_IDENTIFIER_TYPE VpdIdentifierTypeSCSINameString = 8 } VPD_IDENTIFIER_TYPE, *PVPD_IDENTIFIER_TYPE; +typedef enum _STORPORT_FUNCTION_CODE +{ + ExtFunctionAllocatePool, + ExtFunctionFreePool, + ExtFunctionAllocateMdl, + ExtFunctionFreeMdl, + ExtFunctionBuildMdlForNonPagedPool, + ExtFunctionGetSystemAddress, + ExtFunctionGetOriginalMdl, + ExtFunctionCompleteServiceIrp, + ExtFunctionGetDeviceObjects, + ExtFunctionBuildScatterGatherList, + ExtFunctionPutScatterGatherList, + ExtFunctionAcquireMSISpinLock, + ExtFunctionReleaseMSISpinLock, + ExtFunctionGetMessageInterruptInformation, + ExtFunctionInitializePerformanceOptimizations, + ExtFunctionGetStartIoPerformanceParameters, + ExtFunctionLogSystemEvent, +#if (NTDDI_VERSION >= NTDDI_WIN7) + ExtFunctionGetCurrentProcessorNumber, + ExtFunctionGetActiveGroupCount, + ExtFunctionGetGroupAffinity, + ExtFunctionGetActiveNodeCount, + ExtFunctionGetNodeAffinity, + ExtFunctionGetHighestNodeNumber, + ExtFunctionGetLogicalProcessorRelationship, + ExtFunctionAllocateContiguousMemorySpecifyCacheNode, + ExtFunctionFreeContiguousMemorySpecifyCache +#endif +} STORPORT_FUNCTION_CODE, *PSTORPORT_FUNCTION_CODE; + +typedef enum _STOR_EVENT_ASSOCIATION_ENUM +{ + StorEventAdapterAssociation = 0, + StorEventLunAssociation, + StorEventTargetAssociation, + StorEventInvalidAssociation +} STOR_EVENT_ASSOCIATION_ENUM; + typedef struct _SCSI_REQUEST_BLOCK { USHORT Length; @@ -2003,6 +2043,54 @@ typedef struct _STOR_LOCK_HANDLE } Context; } STOR_LOCK_HANDLE, *PSTOR_LOCK_HANDLE; +typedef struct _STOR_LOG_EVENT_DETAILS +{ + ULONG InterfaceRevision; + ULONG Size; + ULONG Flags; + STOR_EVENT_ASSOCIATION_ENUM EventAssociation; + ULONG PathId; + ULONG TargetId; + ULONG LunId; + BOOLEAN StorportSpecificErrorCode; + ULONG ErrorCode; + ULONG UniqueId; + ULONG DumpDataSize; + PVOID DumpData; + ULONG StringCount; + PWSTR *StringList; +} STOR_LOG_EVENT_DETAILS, *PSTOR_LOG_EVENT_DETAILS; + +typedef struct _PERF_CONFIGURATION_DATA +{ + ULONG Version; + ULONG Size; + ULONG Flags; + ULONG ConcurrentChannels; + ULONG FirstRedirectionMessageNumber, LastRedirectionMessageNumber; + ULONG DeviceNode; + ULONG Reserved; + PGROUP_AFFINITY MessageTargets; +} PERF_CONFIGURATION_DATA, *PPERF_CONFIGURATION_DATA; + +typedef struct _STARTIO_PERFORMANCE_PARAMETERS +{ + ULONG Version; + ULONG Size; + ULONG MessageNumber; + ULONG ChannelNumber; +} STARTIO_PERFORMANCE_PARAMETERS, *PSTARTIO_PERFORMANCE_PARAMETERS; + +typedef struct _MESSAGE_INTERRUPT_INFORMATION +{ + ULONG MessageId; + ULONG MessageData; + STOR_PHYSICAL_ADDRESS MessageAddress; + ULONG InterruptVector; + ULONG InterruptLevel; + KINTERRUPT_MODE InterruptMode; +} MESSAGE_INTERRUPT_INFORMATION, *PMESSAGE_INTERRUPT_INFORMATION; + typedef BOOLEAN (NTAPI *PHW_INITIALIZE)( @@ -2086,6 +2174,14 @@ BOOLEAN typedef STOR_SYNCHRONIZED_ACCESS *PSTOR_SYNCHRONIZED_ACCESS; +typedef +VOID +(NTAPI *PpostScaterGatherExecute)( + _In_ PVOID *DeviceObject, + _In_ PVOID *Irp, + _In_ PSTOR_SCATTER_GATHER_LIST ScatterGather, + _In_ PVOID Context); + typedef struct _HW_INITIALIZATION_DATA { ULONG HwInitializationDataSize; @@ -2721,6 +2817,245 @@ StorPortReleaseSpinLock( LockHandle); } +STORPORT_API +ULONG +StorPortExtendedFunction( + _In_ STORPORT_FUNCTION_CODE FunctionCode, + _In_ PVOID HwDeviceExtension, + ...); + +FORCEINLINE +ULONG +StorPortAllocatePool( + _In_ PVOID HwDeviceExtension, + _In_ ULONG NumberOfBytes, + _In_ ULONG Tag, + _Out_ PVOID *BufferPointer + ) +{ + return StorPortExtendedFunction(ExtFunctionAllocatePool, + HwDeviceExtension, + NumberOfBytes, + Tag, + BufferPointer); +} + +FORCEINLINE +ULONG +StorPortFreePool( + _In_ PVOID HwDeviceExtension, + _In_ PVOID BufferPointer) +{ + return StorPortExtendedFunction(ExtFunctionFreePool, + HwDeviceExtension, + BufferPointer); +} + +FORCEINLINE +ULONG +StorPortAllocateMdl( + _In_ PVOID HwDeviceExtension, + _In_ PVOID BufferPointer, + _In_ ULONG NumberOfBytes, + _Out_ PVOID *Mdl) +{ + return StorPortExtendedFunction(ExtFunctionAllocateMdl, + HwDeviceExtension, + BufferPointer, + NumberOfBytes, + Mdl); +} + +FORCEINLINE +ULONG +StorPortFreeMdl( + _In_ PVOID HwDeviceExtension, + _In_ PVOID Mdl) +{ + return StorPortExtendedFunction(ExtFunctionFreeMdl, + HwDeviceExtension, + Mdl); +} + +FORCEINLINE +ULONG +StorPortBuildMdlForNonPagedPool( + _In_ PVOID HwDeviceExtension, + _Inout_ PVOID Mdl) +{ + return StorPortExtendedFunction(ExtFunctionBuildMdlForNonPagedPool, + HwDeviceExtension, + Mdl); +} + +FORCEINLINE +ULONG +StorPortGetSystemAddress( + _In_ PVOID HwDeviceExtension, + _In_ PSCSI_REQUEST_BLOCK Srb, + _Out_ PVOID *SystemAddress) +{ + return StorPortExtendedFunction(ExtFunctionGetSystemAddress, + HwDeviceExtension, + Srb, + SystemAddress); +} + +FORCEINLINE +ULONG +StorPortGetOriginalMdl( + _In_ PVOID HwDeviceExtension, + _In_ PSCSI_REQUEST_BLOCK Srb, + _Out_ PVOID *Mdl) +{ + return StorPortExtendedFunction(ExtFunctionGetOriginalMdl, + HwDeviceExtension, + Srb, + Mdl); +} + +FORCEINLINE +ULONG +StorPortCompleteServiceIrp( + _In_ PVOID HwDeviceExtension, + _In_ PVOID Irp) +{ + return StorPortExtendedFunction(ExtFunctionCompleteServiceIrp, + HwDeviceExtension, + Irp); +} + +FORCEINLINE +ULONG +StorPortGetDeviceObjects( + _In_ PVOID HwDeviceExtension, + _Out_ PVOID *AdapterDeviceObject, + _Out_ PVOID *PhysicalDeviceObject, + _Out_ PVOID *LowerDeviceObject) +{ + return StorPortExtendedFunction(ExtFunctionGetDeviceObjects, + HwDeviceExtension, + AdapterDeviceObject, + PhysicalDeviceObject, + LowerDeviceObject); +} + +FORCEINLINE +ULONG +StorPortBuildScatterGatherList( + _In_ PVOID HwDeviceExtension, + _In_ PVOID Mdl, + _In_ PVOID CurrentVa, + _In_ ULONG Length, + _In_ PpostScaterGatherExecute ExecutionRoutine, + _In_ PVOID Context, + _In_ BOOLEAN WriteToDevice, + _Inout_ PVOID ScatterGatherBuffer, + _In_ ULONG ScatterGatherBufferLength) +{ + return StorPortExtendedFunction(ExtFunctionBuildScatterGatherList, + HwDeviceExtension, + Mdl, + CurrentVa, + Length, + ExecutionRoutine, + Context, + WriteToDevice, + ScatterGatherBuffer, + ScatterGatherBufferLength); +} + +FORCEINLINE +ULONG +StorPortPutScatterGatherList( + _In_ PVOID HwDeviceExtension, + _In_ PSTOR_SCATTER_GATHER_LIST ScatterGatherList, + _In_ BOOLEAN WriteToDevice) +{ + return StorPortExtendedFunction(ExtFunctionPutScatterGatherList, + HwDeviceExtension, + ScatterGatherList, + WriteToDevice); +} + +FORCEINLINE +ULONG +StorPortAcquireMSISpinLock( + _In_ PVOID HwDeviceExtension, + _In_ ULONG MessageId, + _In_ PULONG OldIrql) +{ + return StorPortExtendedFunction(ExtFunctionAcquireMSISpinLock, + HwDeviceExtension, + MessageId, + OldIrql); +} + +FORCEINLINE +ULONG +StorPortReleaseMSISpinLock( + _In_ PVOID HwDeviceExtension, + _In_ ULONG MessageId, + _In_ ULONG OldIrql) +{ + return StorPortExtendedFunction(ExtFunctionReleaseMSISpinLock, + HwDeviceExtension, + MessageId, + OldIrql); +} + +FORCEINLINE +ULONG +StorPortGetMSIInfo( + _In_ PVOID HwDeviceExtension, + _In_ ULONG MessageId, + _Out_ PMESSAGE_INTERRUPT_INFORMATION InterruptInfo) +{ + return StorPortExtendedFunction(ExtFunctionGetMessageInterruptInformation, + HwDeviceExtension, + MessageId, + InterruptInfo); +} + +FORCEINLINE +ULONG +StorPortInitializePerfOpts( + _In_ PVOID HwDeviceExtension, + _In_ BOOLEAN Query, + _Inout_ PPERF_CONFIGURATION_DATA PerfConfigData) +{ + return StorPortExtendedFunction(ExtFunctionInitializePerformanceOptimizations, + HwDeviceExtension, + Query, + PerfConfigData); +} + +FORCEINLINE +ULONG +StorPortGetStartIoPerfParams( + _In_ PVOID HwDeviceExtension, + _In_ PSCSI_REQUEST_BLOCK Srb, + _Inout_ PSTARTIO_PERFORMANCE_PARAMETERS StartIoPerfParams) +{ + return StorPortExtendedFunction(ExtFunctionGetStartIoPerformanceParameters, + HwDeviceExtension, + Srb, + StartIoPerfParams); +} + +FORCEINLINE +ULONG +StorPortLogSystemEvent( + _In_ PVOID HwDeviceExtension, + _Inout_ PSTOR_LOG_EVENT_DETAILS LogDetails, + _Inout_ PULONG MaximumSize) +{ + return StorPortExtendedFunction(ExtFunctionLogSystemEvent, + HwDeviceExtension, + LogDetails, + MaximumSize); +} + #if DBG #define DebugPrint(x) StorPortDebugPrint x #else

6 years, 9 months

01/01: [TRANSLATION] Some translations update

by Sergey Stopkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c957755eda52d4ebf560… commit 0c957755eda52d4ebf5604e3edbaeab1090f7421 Author: Sergey Stopkin <stopkin.sergey(a)gmail.com> AuthorDate: Fri Mar 2 21:23:30 2018 +0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 2 18:23:30 2018 +0100 [TRANSLATION] Some translations update --- dll/cpl/input/lang/bg-BG.rc | 2 +- dll/cpl/input/lang/ru-RU.rc | 2 +- dll/cpl/input/lang/uk-UA.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index 97e73c536d..ff4765ffc9 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -106,7 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ляв Alt+Shift" IDS_SWITCH_BET_INLANG "Превключване на езиците за въвеждане" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW, "Рестартирай сега?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index ffd6e37c80..bf4b21ad87 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -106,7 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt слева+Shift" IDS_SWITCH_BET_INLANG "Переключение между языками ввода" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW, "Перезагрузить сейчас?" END STRINGTABLE diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index bea4493668..56c55d5190 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -114,7 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt зліва+Shift" IDS_SWITCH_BET_INLANG "Перемикання мов вводу" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW, "Перезавантажити зараз?" END STRINGTABLE

6 years, 9 months

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 March 2018