December 2009 - Wine-commits

Alexandre Julliard : gdi32: Avoid calling get_dc_ptr on a null handle.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: cc973b0cdc9168dbcfdfd87d5e2b3d5d71b38fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc973b0cdc9168dbcfdfd87d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 14:38:21 2009 +0100 gdi32: Avoid calling get_dc_ptr on a null handle. --- dlls/gdi32/dc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c4c5a13..2aeeec2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -750,8 +750,9 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) GDI_CheckNotLock(); - if ((origDC = get_dc_ptr( hdc ))) + if (hdc) { + if (!(origDC = get_dc_ptr( hdc ))) return 0; if (GetObjectType( hdc ) == OBJ_DC) { funcs = origDC->funcs; @@ -760,7 +761,6 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) release_dc_ptr( origDC ); if (funcs) funcs = DRIVER_get_driver( funcs ); } - else if (hdc) return 0; if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0;

1 0

Maarten Lankhorst : ntdll: Silence a common warning.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 58c7aa46914b21c3bb2300e4bd9c0369bbf3685d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c7aa46914b21c3bb2300e4b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 30 18:18:58 2009 +0100 ntdll: Silence a common warning. --- dlls/ntdll/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index a09aab1..40cc455 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2412,7 +2412,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI if (status != STATUS_SUCCESS) { /* couldn't find it at all, fail */ - WARN( "%s not found in %s\n", debugstr_w(name), unix_name ); + TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); RtlFreeHeap( GetProcessHeap(), 0, unix_name ); return status; }

1 0

Rob Shearman : oleaut32: Remove LPVOID variables in olefont tests and pass IFont pointers into OleCreateFontIndirect directly .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: f7624cbfbc868601719722d6aa94621af0f98f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7624cbfbc868601719722d6a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:13:40 2009 +0000 oleaut32: Remove LPVOID variables in olefont tests and pass IFont pointers into OleCreateFontIndirect directly. In many places the assignment of the LPVOID variable into the corresponding IFont * variable has been forgotten. --- dlls/oleaut32/tests/olefont.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index b457f36..55e0e58 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -491,8 +491,6 @@ static void test_Invoke(void) static void test_IsEqual(void) { FONTDESC fd; - LPVOID pvObj = NULL; - LPVOID pvObj2 = NULL; IFont* ifnt = NULL; IFont* ifnt2 = NULL; HRESULT hres; @@ -509,12 +507,10 @@ static void test_IsEqual(void) fd.fStrikethrough = 0; /* Create font */ - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj); - ifnt = pvObj; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt); /* Test equal fonts */ - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_OK, "IFont_IsEqual: (EQUAL) Expected S_OK but got 0x%08x\n",hres); @@ -527,7 +523,7 @@ static void test_IsEqual(void) /* Test strName */ fd.lpstrName = arial_font; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08x\n",hres); @@ -536,8 +532,7 @@ static void test_IsEqual(void) /* Test lo font size */ S(fd.cySize).Lo = 10000; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Lo font size) Expected S_FALSE but got 0x%08x\n",hres); @@ -546,8 +541,7 @@ static void test_IsEqual(void) /* Test hi font size */ S(fd.cySize).Hi = 10000; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Hi font size) Expected S_FALSE but got 0x%08x\n",hres); @@ -556,8 +550,7 @@ static void test_IsEqual(void) /* Test font weight */ fd.sWeight = 100; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Weight) Expected S_FALSE but got 0x%08x\n",hres); @@ -566,7 +559,7 @@ static void test_IsEqual(void) /* Test charset */ fd.sCharset = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Charset) Expected S_FALSE but got 0x%08x\n",hres); @@ -575,7 +568,7 @@ static void test_IsEqual(void) /* Test italic setting */ fd.fItalic = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08x\n",hres); @@ -584,7 +577,7 @@ static void test_IsEqual(void) /* Test underline setting */ fd.fUnderline = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08x\n",hres); @@ -593,7 +586,7 @@ static void test_IsEqual(void) /* Test strikethrough setting */ fd.fStrikethrough = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08x\n",hres);

1 0

Rob Shearman : ws2_32: Initialise buffer eventually passed into send to zero in test_write_events .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 0d10ddd4d54e5094d9fddce90b937a72a7b04078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d10ddd4d54e5094d9fddce90… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:14:06 2009 +0000 ws2_32: Initialise buffer eventually passed into send to zero in test_write_events. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c17b894..fbe55f6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2589,7 +2589,7 @@ static void test_write_events(void) goto end; } - buffer = HeapAlloc(GetProcessHeap(), 0, bufferSize); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufferSize); if (buffer == NULL) { ok(0, "could not allocate memory for test\n");

1 0

Rob Shearman : winex11.drv: Make sure that the selectionAcquired flag has been set before returning from X11DRV_AcquireClipboard .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: b894925b0ef54007957e21dcfa7df01307a75285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b894925b0ef54007957e21dcf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:16:20 2009 +0000 winex11.drv: Make sure that the selectionAcquired flag has been set before returning from X11DRV_AcquireClipboard. X11DRV_CLIPBOARD_UpdateCache depends on selectionAcquired being set if the current process is the selection owner, otherwise it will defer to getting the clipformats from X, manufacturing extra formats that the app may not be expecting, having just set the formats itself. Worse still, since selectionAcquired is set in another thread this behaviour is not predicatable and it may sometimes use the clipformats already set and other times defer to X. --- dlls/winex11.drv/clipboard.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2740264..3d9c153 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2653,9 +2653,14 @@ static void selection_acquire(void) } } -static DWORD WINAPI selection_thread_proc(LPVOID unused) +static DWORD WINAPI selection_thread_proc(LPVOID p) { + HANDLE event = p; + + TRACE("\n"); + selection_acquire(); + SetEvent(event); while (selectionAcquired) { @@ -2705,7 +2710,8 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) } else { - selectionThread = CreateThread(NULL, 0, &selection_thread_proc, NULL, 0, NULL); + HANDLE event = CreateEventW(NULL, FALSE, FALSE, NULL); + selectionThread = CreateThread(NULL, 0, &selection_thread_proc, event, 0, NULL); if (!selectionThread) { @@ -2713,6 +2719,8 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) return 0; } + WaitForSingleObject(event, INFINITE); + CloseHandle(event); CloseHandle(selectionThread); }

1 0

Rob Shearman : ole32: Fix test failure on win2000+.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 552c91106d1fcec438224643dffc433228f9f821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552c91106d1fcec438224643d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:14:33 2009 +0000 ole32: Fix test failure on win2000+. These OSs have different behaviour w.r.t. quotes in path names and don't ignore the rest of the path outside of the quotes. --- dlls/ole32/tests/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 1ef9790..20b0d8b 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2293,7 +2293,7 @@ static void reg_unreg_wine_test_class(BOOL Register) { error = RegCreateKeyEx(HKEY_CLASSES_ROOT, buffer, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, &dwDisposition); ok(error == ERROR_SUCCESS, "RegCreateKeyEx failed with error %d\n", error); - error = RegSetValueEx(hkey, NULL, 0, REG_SZ, (const unsigned char *)"\"ole32.dll\" \"a\"", strlen("\"ole32.dll\" \"a\"") + 1); + error = RegSetValueEx(hkey, NULL, 0, REG_SZ, (const unsigned char *)"\"ole32.dll\"", strlen("\"ole32.dll\"") + 1); ok(error == ERROR_SUCCESS, "RegSetValueEx failed with error %d\n", error); RegCloseKey(hkey); }

1 0

Marcus Meissner : cryptnet: Added a potentially missing NULL ptr check ( Coverity).
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 28c6c44df4ff07ec23bac00ac8f4c4b581b224ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c6c44df4ff07ec23bac00ac… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 1 10:26:48 2009 +0100 cryptnet: Added a potentially missing NULL ptr check (Coverity). --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index afae942..34bbc58 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1616,7 +1616,8 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, NULL); if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; - if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG && + if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && + pRevPara && pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout) + sizeof(DWORD)) {

1 0

Marcus Meissner : dbghelp: Check wImageName for NULL (Coverity).
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: d6f78e4014a8a493e9e8cd488cd05d86d3b2abc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f78e4014a8a493e9e8cd488… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 1 10:48:56 2009 +0100 dbghelp: Check wImageName for NULL (Coverity). --- dlls/dbghelp/module.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index a6778e7..1920dca 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -534,6 +534,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & SLMFLAG_VIRTUAL) { + if (!wImageName) return FALSE; module = module_new(pcs, wImageName, module_get_type_by_name(wImageName), TRUE, (DWORD)BaseOfDll, SizeOfDll, 0, 0); if (!module) return FALSE; @@ -594,7 +595,8 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam */ if (wModuleName) module_set_module(module, wModuleName); - lstrcpynW(module->module.ImageName, wImageName, + if (wImageName) + lstrcpynW(module->module.ImageName, wImageName, sizeof(module->module.ImageName) / sizeof(WCHAR)); return module->module.BaseOfImage;

1 0

Henri Verbeet : ntdll: Fix the FileAllInformation info size.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: c99abc651b1b3628106f065fc3363a2e3babee7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99abc651b1b3628106f065fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:27:44 2009 +0100 ntdll: Fix the FileAllInformation info size. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 32e5f93..71c8cba 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1679,7 +1679,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_FULL_EA_INFORMATION), /* FileFullEaInformation */ sizeof(FILE_MODE_INFORMATION), /* FileModeInformation */ sizeof(FILE_ALIGNMENT_INFORMATION), /* FileAlignmentInformation */ - sizeof(FILE_ALL_INFORMATION)-sizeof(WCHAR), /* FileAllInformation */ + sizeof(FILE_ALL_INFORMATION), /* FileAllInformation */ sizeof(FILE_ALLOCATION_INFORMATION), /* FileAllocationInformation */ sizeof(FILE_END_OF_FILE_INFORMATION), /* FileEndOfFileInformation */ 0, /* FileAlternateNameInformation */

1 0

Henri Verbeet : ntdll: Also return name information for FileAllInformation.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 0eac2ce19b2c281a5439a9ce8983f425150091cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eac2ce19b2c281a5439a9ce8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:27:45 2009 +0100 ntdll: Also return name information for FileAllInformation. --- dlls/ntdll/file.c | 64 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 71c8cba..a43291e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1639,6 +1639,33 @@ static NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) return ret; } +static NTSTATUS fill_name_info( const ANSI_STRING *unix_name, FILE_NAME_INFORMATION *info, LONG *name_len ) +{ + UNICODE_STRING nt_name; + NTSTATUS status; + + if (!(status = wine_unix_to_nt_file_name( unix_name, &nt_name ))) + { + const WCHAR *ptr = nt_name.Buffer; + const WCHAR *end = ptr + (nt_name.Length / sizeof(WCHAR)); + + /* Skip the volume mount point. */ + while (ptr != end && *ptr == '\\') ++ptr; + while (ptr != end && *ptr != '\\') ++ptr; + while (ptr != end && *ptr == '\\') ++ptr; + while (ptr != end && *ptr != '\\') ++ptr; + + info->FileNameLength = (end - ptr) * sizeof(WCHAR); + if (*name_len < info->FileNameLength) status = STATUS_BUFFER_OVERFLOW; + else *name_len = info->FileNameLength; + + memcpy( info->FileName, ptr, *name_len ); + RtlFreeUnicodeString( &nt_name ); + } + + return status; +} + /****************************************************************************** * NtQueryInformationFile [NTDLL.@] * ZwQueryInformationFile [NTDLL.@] @@ -1788,12 +1815,15 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, case FileAllInformation: { FILE_ALL_INFORMATION *info = ptr; + ANSI_STRING unix_name; if (fstat( fd, &st ) == -1) io->u.Status = FILE_GetNtStatus(); else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) io->u.Status = STATUS_INVALID_INFO_CLASS; - else + else if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) { + LONG name_len = len - FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName); + fill_stat_info( &st, info, FileAllInformation ); info->StandardInformation.DeletePending = FALSE; /* FIXME */ info->EaInformation.EaSize = 0; @@ -1801,8 +1831,10 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, info->PositionInformation.CurrentByteOffset.QuadPart = lseek( fd, 0, SEEK_CUR ); info->ModeInformation.Mode = 0; /* FIXME */ info->AlignmentInformation.AlignmentRequirement = 1; /* FIXME */ - info->NameInformation.FileNameLength = 0; - io->Information = sizeof(*info) - sizeof(WCHAR); + + io->u.Status = fill_name_info( &unix_name, &info->NameInformation, &name_len ); + RtlFreeAnsiString( &unix_name ); + io->Information = FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + name_len; } } break; @@ -1879,31 +1911,9 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) { LONG name_len = len - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); - UNICODE_STRING nt_name; - - io->u.Status = wine_unix_to_nt_file_name( &unix_name, &nt_name ); + io->u.Status = fill_name_info( &unix_name, info, &name_len ); RtlFreeAnsiString( &unix_name ); - - if (!io->u.Status) - { - const WCHAR *ptr = nt_name.Buffer; - const WCHAR *end = ptr + (nt_name.Length / sizeof(WCHAR)); - - /* Skip the volume mount point. */ - while (ptr != end && *ptr == '\\') ++ptr; - while (ptr != end && *ptr != '\\') ++ptr; - while (ptr != end && *ptr == '\\') ++ptr; - while (ptr != end && *ptr != '\\') ++ptr; - - info->FileNameLength = (end - ptr) * sizeof(WCHAR); - if (name_len < info->FileNameLength) io->u.Status = STATUS_BUFFER_OVERFLOW; - else name_len = info->FileNameLength; - - memcpy( info->FileName, ptr, name_len ); - RtlFreeUnicodeString( &nt_name ); - - io->Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + name_len; - } + io->Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + name_len; } } break;

1 0