June 2013 - Wine-Commits - list.winehq.org

André Hentschel : oleaut32/tests: Get rid of IS_ANCIENT in vartest.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: ca77d6c1daaa33ae455f6d509b035edb2f6a65f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca77d6c1daaa33ae455f6d509… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 24 22:01:45 2013 +0200 oleaut32/tests: Get rid of IS_ANCIENT in vartest. --- dlls/oleaut32/tests/vartest.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 0d38b9d..247e08e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -61,8 +61,6 @@ static WCHAR sz12_true[32]; static int HAVE_OLEAUT32_RECORD = 0; /* Have I8/UI8 data type? */ static int HAVE_OLEAUT32_I8 = 0; -/* Is this an ancient version with support for only I2/I4/R4/R8/DATE? */ -static int IS_ANCIENT = 0; /* When comparing floating point values we cannot expect an exact match * because the rounding errors depend on the exact algorithm. @@ -130,7 +128,6 @@ static void init(void) skip("No support for I8 and UI8 data types\n"); HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo); - IS_ANCIENT = (!HAVE_FUNC(VarI1FromI2)); #undef HAVE_FUNC } @@ -470,8 +467,7 @@ static void test_VariantClear(void) V_VT(&v) = VT_UI4; V_UI4(&v) = ~0u; hres = VariantClear(&v); - ok((hres == S_OK && V_VT(&v) == VT_EMPTY) || - (IS_ANCIENT && hres == DISP_E_BADVARTYPE && V_VT(&v) == VT_UI4), + ok((hres == S_OK && V_VT(&v) == VT_EMPTY), "VariantClear: Type set to %d, res %08x\n", V_VT(&v), hres); ok(V_UI4(&v) == ~0u, "VariantClear: Overwrote value\n"); @@ -479,7 +475,7 @@ static void test_VariantClear(void) * Also demonstrates that null pointers in 'v' are not dereferenced. * Individual variant tests should test VariantClear() with non-NULL values. */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { VARTYPE vt; @@ -589,7 +585,7 @@ static void test_VariantCopy(void) */ /* vSrc == vDst */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { @@ -617,7 +613,7 @@ static void test_VariantCopy(void) memset(&vSrc, 0, sizeof(vSrc)); V_VT(&vSrc) = VT_UI1; - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { @@ -643,7 +639,7 @@ static void test_VariantCopy(void) } /* Test that VariantClear() checks vSrc for validity before copying */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { @@ -720,7 +716,7 @@ static void test_VariantCopyInd(void) memset(buffer, 0, sizeof(buffer)); /* vSrc == vDst */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { if (ExtraFlags[i] & VT_ARRAY) continue; /* Native crashes on NULL safearray */ @@ -771,7 +767,7 @@ static void test_VariantCopyInd(void) V_VT(&vSrc) = VT_UI1|VT_BYREF; V_BYREF(&vSrc) = &buffer; - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { @@ -797,7 +793,7 @@ static void test_VariantCopyInd(void) } /* bad src */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { if (ExtraFlags[i] & VT_ARRAY) continue; /* Native crashes on NULL safearray */

1 0

Marcus Meissner : ole32: LeaveCriticalSection in one exit case (Coverity).
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: 5ef6f99108874362857525eb5447d5e1cf77a609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef6f99108874362857525eb5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 25 09:59:34 2013 +0200 ole32: LeaveCriticalSection in one exit case (Coverity). --- dlls/ole32/ifs.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 8ec6bd8..35ed04b 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -217,13 +217,16 @@ static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { IMallocSpy_Release(Malloc32.pSpy); Malloc32.SpyReleasePending = FALSE; Malloc32.pSpy = NULL; + LeaveCriticalSection(&IMalloc32_SpyCS); } if (0==cb) { - /* PreRealloc can force Realloc to fail */ - LeaveCriticalSection(&IMalloc32_SpyCS); + /* PreRealloc can force Realloc to fail */ + if (Malloc32.pSpy) + LeaveCriticalSection(&IMalloc32_SpyCS); return NULL; } + pv = pRealMemory; }

1 0

Alexandre Julliard : clock: Don't offer vertical fonts in the font dialog.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: 2088c36c19f3a4e4fa7ea8612640e05e305a8089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2088c36c19f3a4e4fa7ea8612… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:39:22 2013 +0200 clock: Don't offer vertical fonts in the font dialog. --- programs/clock/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 048b1aa..04bfe64 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -144,7 +144,7 @@ static VOID CLOCK_ChooseFont(VOID) cf.lStructSize = sizeof(cf); cf.hwndOwner = Globals.hMainWnd; cf.lpLogFont = &lf; - cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT; + cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOVERTFONTS; if (ChooseFontW(&cf)) { Globals.logfont = lf; CLOCK_ResetFont();

1 0

Huw Davies : comdlg32: Don't call the callback if it's not set.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: ec37a87e95945451dde85be3622162db34ab6ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec37a87e95945451dde85be36… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 25 11:48:16 2013 +0100 comdlg32: Don't call the callback if it's not set. --- dlls/comdlg32/printdlg.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 3c3fab3..292f764 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3994,8 +3994,11 @@ static UINT_PTR CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM PRINTDLGW *pd = (PRINTDLGW *)lp; struct callback_data *cb = (struct callback_data *)pd->lCustData; - cb->callback->lpVtbl->SelectionChange(cb->callback); - cb->callback->lpVtbl->InitDone(cb->callback); + if (cb->callback) + { + cb->callback->lpVtbl->SelectionChange(cb->callback); + cb->callback->lpVtbl->InitDone(cb->callback); + } } else {

1 0

André Hentschel : winedev: Update architecture chapter .
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: docs Branch: master Commit: 03ae8589a037e30655a094f18534c3fa0a81f314 URL: http://source.winehq.org/git/docs.git/?a=commit;h=03ae8589a037e30655a094f18… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 22 14:21:13 2013 +0200 winedev: Update architecture chapter. --- en/winedev-architecture.sgml | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index bb8638b..d4bf8e1 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -218,8 +218,8 @@ exist, as Windows has support for different VDM (Virtual Dos Machines) in order to have Win16 processes running in different address spaces. Wine also uses the same architecture to run DOS - programs (in this case, the DOS emulation is provided by a Wine only - DLL called <filename>winedos</filename>. + programs (in this case, the DOS emulation is provided by + <filename>KRNL386.EXE</filename>). </para> </sect2> </sect1> @@ -368,7 +368,7 @@ +---------------------------------------+ +--------+ +---------------------------------------+ \ -| Wine executable (wine-?thread) | } unix executable +| Wine executable | } unix executable +---------------------------------------+ / +---------------------------------------------------+ \ | Wine drivers | } Wine specific DLLs @@ -418,7 +418,7 @@ provide a driver (in Windows sense) to a physical hardware device. This driver will be a proxy to the Unix driver (this is the case, for example, for the graphical part - with X11 or SDL drivers, audio with OSS or ALSA drivers...). + with X11 or Mac drivers, audio with OSS or ALSA drivers...). </para> <para> All DLLs provided by Wine try to stick as much as possible @@ -452,12 +452,7 @@ terminated). </para> <para> - In earlier versions of Wine the master socket mentioned - above was actually created in the configuration directory; - either your home directory's <filename>/wine</filename> - subdirectory or wherever the - <envar>WINEPREFIX</envar> environment variable points>. - Since that might not be possible the socket is actually + The master socket mentioned above is created within the <filename>/tmp</filename> directory with a name that reflects the configuration directory. This means that there can actually be several separate @@ -545,8 +540,7 @@ </para> <para> The DLL descriptor and entry point table is generated by - the <command>winebuild</command> tool (previously just - named <command>build</command>), taking DLL specification + the <command>winebuild</command> tool, taking DLL specification files with the extension <filename>.spec</filename> as input. Resources (after compilation by <command>wrc</command>) or message tables (after @@ -730,7 +724,7 @@ work much worse than the corresponding built-in one, if at all. For example, the native Windows <filename>GDI</filename> library must be paired with a Windows display driver, which - of course is not present under Intel Unix and Wine. + of course is not present under Unix and Wine. </para> <para> Finally, occasionally built-in Wine DLLs implement more

1 0

Alexandre Julliard : kernel32: FormatMessage precision arguments are integers.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: de03abd532e767e6b3aa8104286f85b65c4caa67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de03abd532e767e6b3aa81042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 23:10:04 2013 +0200 kernel32: FormatMessage precision arguments are integers. --- dlls/kernel32/format_msg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 7ce4f0a..37dcdb3 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -127,7 +127,7 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, DWORD flags, struct format_args *args, LPWSTR *result ) { - static const WCHAR fmt_lu[] = {'%','l','u',0}; + static const WCHAR fmt_u[] = {'%','u',0}; WCHAR *wstring = NULL, *p, fmt[256]; ULONG_PTR arg; int size; @@ -167,7 +167,7 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, { if (*format == '*') { - p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); + p += sprintfW( p, fmt_u, get_arg( insert, flags, args )); insert = -1; format++; } @@ -180,7 +180,7 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, *p++ = *format++; if (*format == '*') { - p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); + p += sprintfW( p, fmt_u, get_arg( insert, flags, args )); insert = -1; format++; }

1 0

Marcus Meissner : gdi32: Close handle in mfdrv (Coverity).
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: ff1bd6da35760cca1a23803bc7469f846f911a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1bd6da35760cca1a23803bc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 22 17:28:27 2013 +0200 gdi32: Close handle in mfdrv (Coverity). --- dlls/gdi32/mfdrv/init.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 03cd22c..8f312a1 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -338,6 +338,7 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), NULL, NULL )) { free_dc_ptr( dc ); + CloseHandle (hFile ); return 0; } physDev->hFile = hFile;

1 0

Marcus Meissner : dbghelp: Free root in error case (Coverity).
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: 7a406d0adf6852fa6c5b03b2f1f49af5488b9c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a406d0adf6852fa6c5b03b2f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 22 17:16:22 2013 +0200 dbghelp: Free root in error case (Coverity). --- dlls/dbghelp/msc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ddabd07..4978acf 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2528,6 +2528,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* if (pdb_lookup->kind != PDB_JG) { WARN("Found %s, but wrong PDB kind\n", pdb_lookup->filename); + pdb_free(root); return FALSE; } pdb_file->kind = PDB_JG;

1 0

Andrew Eikum : oleaut32: Use typelib's pointer size, not system's.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: d3b896358aae13c980467288a7b4edf1a818927a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b896358aae13c980467288a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 21 14:27:20 2013 -0500 oleaut32: Use typelib's pointer size, not system's. --- dlls/oleaut32/typelib.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 24d250c..2bd9437 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1005,6 +1005,7 @@ typedef struct tagITypeLibImpl TLBGuid *guid; LCID lcid; SYSKIND syskind; + int ptr_size; WORD ver_major; WORD ver_minor; WORD libflags; @@ -1246,6 +1247,20 @@ static inline const GUID *TLB_get_guid_null(const TLBGuid *guid) return guid != NULL ? &guid->guid : &GUID_NULL; } +static int get_ptr_size(SYSKIND syskind) +{ + switch(syskind){ + case SYS_WIN64: + return 8; + case SYS_WIN32: + case SYS_MAC: + case SYS_WIN16: + return 4; + } + WARN("Unhandled syskind: 0x%x\n", syskind); + return 4; +} + /* debug */ @@ -3340,6 +3355,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) pTypeLibImpl->guid = MSFT_ReadGuid(tlbHeader.posguid, &cx); pTypeLibImpl->syskind = tlbHeader.varflags & 0x0f; /* check the mask */ + pTypeLibImpl->ptr_size = get_ptr_size(pTypeLibImpl->syskind); pTypeLibImpl->ver_major = LOWORD(tlbHeader.version); pTypeLibImpl->ver_minor = HIWORD(tlbHeader.version); pTypeLibImpl->libflags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ @@ -3589,6 +3605,7 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) ptr += 4; pTypeLibImpl->syskind = *(WORD*)ptr; + pTypeLibImpl->ptr_size = get_ptr_size(pTypeLibImpl->syskind); ptr += 2; if(SUBLANGID(*(WORD*)ptr) == SUBLANG_NEUTRAL) @@ -4163,7 +4180,7 @@ static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI, /* this is necessary to cope with MSFT typelibs that set cFuncs to the number * of dispinterface functions including the IDispatch ones, so * ITypeInfo::GetFuncDesc takes the real value for cFuncs from cbSizeVft */ - pTI->cbSizeVft = pTI->cFuncs * sizeof(void *); + pTI->cbSizeVft = pTI->cFuncs * pTI->pTypeLib->ptr_size; heap_free(ref_lookup); if (TRACE_ON(typelib)) @@ -5518,7 +5535,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, if((*ppTypeAttr)->typekind == TKIND_DISPATCH) { /* This should include all the inherited funcs */ - (*ppTypeAttr)->cFuncs = (*ppTypeAttr)->cbSizeVft / sizeof(void *); + (*ppTypeAttr)->cFuncs = (*ppTypeAttr)->cbSizeVft / This->pTypeLib->ptr_size; /* This is always the size of IDispatch's vtbl */ (*ppTypeAttr)->cbSizeVft = sizeof(IDispatchVtbl); (*ppTypeAttr)->wTypeFlags &= ~TYPEFLAG_FOLEAUTOMATION; @@ -8378,6 +8395,7 @@ HRESULT WINAPI CreateTypeLib2(SYSKIND syskind, LPCOLESTR szFile, This->lcid = GetSystemDefaultLCID(); This->syskind = syskind; + This->ptr_size = get_ptr_size(syskind); This->path = heap_alloc((lstrlenW(szFile) + 1) * sizeof(WCHAR)); if (!This->path) { @@ -10601,7 +10619,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) ITypeInfo_Release(tinfo); return hres; } - This->cbSizeVft = attr->cbSizeVft * 4 / sizeof(void*); + This->cbSizeVft = attr->cbSizeVft; ITypeInfo_ReleaseTypeAttr(inh, attr); do{ @@ -10634,7 +10652,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) return hres; } } else if (This->typekind == TKIND_DISPATCH) - This->cbSizeVft = 7 * sizeof(void*); + This->cbSizeVft = 7 * This->pTypeLib->ptr_size; else This->cbSizeVft = 0; @@ -10647,7 +10665,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) if ((func_desc->funcdesc.oVft & 0xFFFC) > user_vft) user_vft = func_desc->funcdesc.oVft & 0xFFFC; - This->cbSizeVft += sizeof(void*); + This->cbSizeVft += This->pTypeLib->ptr_size; if (func_desc->funcdesc.memid == MEMBERID_NIL) { TLBFuncDesc *iter; @@ -10678,7 +10696,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } if (user_vft > This->cbSizeVft) - This->cbSizeVft = user_vft + sizeof(void*); + This->cbSizeVft = user_vft + This->pTypeLib->ptr_size; ITypeInfo_Release(tinfo); return hres;

1 0

Andrew Eikum : winbase.h: Add GetFileInformationByHandleEx.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: 1f508587d629ab2bbc6634cb629cab224c2d6f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f508587d629ab2bbc6634cb6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 21 14:27:00 2013 -0500 winbase.h: Add GetFileInformationByHandleEx. --- include/winbase.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 4e21049..88b5e4f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1746,6 +1746,7 @@ WINBASEAPI BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS WINBASEAPI BOOL WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVELS,LPVOID); #define GetFileAttributesEx WINELIB_NAME_AW(GetFileAttributesEx) WINBASEAPI BOOL WINAPI GetFileInformationByHandle(HANDLE,BY_HANDLE_FILE_INFORMATION*); +WINBASEAPI BOOL WINAPI GetFileInformationByHandleEx(HANDLE,FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD); WINADVAPI BOOL WINAPI GetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); WINADVAPI BOOL WINAPI GetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); #define GetFileSecurity WINELIB_NAME_AW(GetFileSecurity)

1 0