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

Piotr Caban : msvcrt: Add _wcstol_l implementation.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 679542419abb285afc615b5286fbbd25082d5c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=679542419abb285afc615b528… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 28 09:43:59 2013 +0200 msvcrt: Add _wcstol_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 18 ++++++++++++++++++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c71f7fa..9d4cc80 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1505,7 +1505,7 @@ @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l -@ stub _wcstol_l +@ cdecl _wcstol_l(wstr ptr long ptr) msvcrt._wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 40dd029..6e97edb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1868,7 +1868,7 @@ @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l -@ stub _wcstol_l +@ cdecl _wcstol_l(wstr ptr long ptr) msvcrt._wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 68530bf..8d91d66 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1183,7 +1183,7 @@ @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l -@ stub _wcstol_l +@ cdecl _wcstol_l(wstr ptr long ptr) msvcrt._wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6a1657f..9469587 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1159,7 +1159,7 @@ @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l -@ stub _wcstol_l +@ cdecl _wcstol_l(wstr ptr long ptr) msvcrt._wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6a812a9..975afe0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1123,7 +1123,7 @@ @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l -# stub _wcstol_l(wstr ptr long ptr) +@ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index dbb12dd..3df7c02 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1613,6 +1613,24 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, } /********************************************************************* + * _wcstol_l (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT__wcstol_l(const MSVCRT_wchar_t *s, + MSVCRT_wchar_t **end, int base, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoi64_l(s, end, base, locale); + + if(ret > MSVCRT_LONG_MAX) { + ret = MSVCRT_LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + }else if(ret < MSVCRT_LONG_MIN) { + ret = MSVCRT_LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* * _wtoi_l (MSVCRT.@) */ int __cdecl MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale)

1 0

Piotr Caban : oleaut32: Name names hash table segment in MSFT_SegDir struct .
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: f9e73f97a90ce68af04b23fcee8ce44ee846d30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e73f97a90ce68af04b23fce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 28 10:05:25 2013 +0200 oleaut32: Name names hash table segment in MSFT_SegDir struct. --- dlls/oleaut32/typelib.c | 4 ++-- dlls/oleaut32/typelib.h | 4 ++-- tools/widl/typelib_struct.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d2423a2..f566196 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9775,8 +9775,8 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) TRACE("impfiles at: 0x%x\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pImpFiles, &file.impfile_seg, &running_offset); - TRACE("res07 at: 0x%x\n", running_offset); - tmp_fill_segdir_seg(&file.segdir.res07, &file.namehash_seg, &running_offset); + TRACE("namehashtab at: 0x%x\n", running_offset); + tmp_fill_segdir_seg(&file.segdir.pNameHashTab, &file.namehash_seg, &running_offset); TRACE("nametab at: 0x%x\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pNametab, &file.name_seg, &running_offset); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 7277b58..f21acd5 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -104,8 +104,8 @@ typedef struct tagMSFT_SegDir { /* hash table w offsets to guid????? */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ -/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */ - /* purpose largely unknown */ +/*7*/MSFT_pSeg pNameHashTab; /* always created, always same size (0x200) */ + /* hash table with offsets to names */ /*8*/MSFT_pSeg pNametab; /* name tables */ /*9*/MSFT_pSeg pStringtab; /* string table */ /*A*/MSFT_pSeg pTypdescTab; /* table with type descriptors */ diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 79b86b9..8a005d3 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -101,8 +101,8 @@ typedef struct tagMSFT_SegDir { /* hash table w offsets to guid????? */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ -/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */ - /* purpose largely unknown */ +/*7*/MSFT_pSeg pNameHashTab; /* always created, always same size (0x200) */ + /* hash table with offsets to names */ /*8*/MSFT_pSeg pNametab; /* name tables */ /*9*/MSFT_pSeg pStringtab; /* string table */ /*A*/MSFT_pSeg pTypdescTab; /* table with type descriptors */

1 0

Piotr Caban : oleaut32: Fill names hash table while creating typelib.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: aada2c7b6f1bd29783506c1cfb2684b651dcf255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aada2c7b6f1bd29783506c1cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 28 10:05:09 2013 +0200 oleaut32: Fill names hash table while creating typelib. --- dlls/oleaut32/typelib.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 996886e..d2423a2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8620,7 +8620,7 @@ typedef struct tagWMSFT_TLBFile { WMSFT_SegContents ref_seg; WMSFT_SegContents lib_seg; WMSFT_SegContents guid_seg; - WMSFT_SegContents res07_seg; + WMSFT_SegContents namehash_seg; WMSFT_SegContents name_seg; WMSFT_SegContents string_seg; WMSFT_SegContents typdesc_seg; @@ -8725,7 +8725,7 @@ static HRESULT WMSFT_compile_names(ITypeLibImpl *This, last_offs = 0; LIST_FOR_EACH_ENTRY(str, &This->name_list, TLBString, entry) { - int size; + int size, hash; MSFT_NameIntro *intro = (MSFT_NameIntro*)data; size = WideCharToMultiByte(CP_ACP, 0, str->str, strlenW(str->str), @@ -8738,11 +8738,12 @@ static HRESULT WMSFT_compile_names(ITypeLibImpl *This, data[sizeof(MSFT_NameIntro) + size] = '\0'; intro->hreftype = -1; /* TODO? */ - intro->next_hash = -1; intro->namelen = size & 0xFF; /* TODO: namelen & 0xFF00 == ??? maybe HREF type indicator? */ - intro->namelen |= LHashValOfNameSysA(This->syskind, - This->lcid, data + sizeof(MSFT_NameIntro)) << 16; + hash = LHashValOfNameSysA(This->syskind, This->lcid, data + sizeof(MSFT_NameIntro)); + intro->namelen |= hash << 16; + intro->next_hash = ((DWORD*)file->namehash_seg.data)[hash & 0x7f]; + ((DWORD*)file->namehash_seg.data)[hash & 0x7f] = last_offs; memset(data + sizeof(MSFT_NameIntro) + size, 0x57, str->offset - size - sizeof(MSFT_NameIntro)); @@ -9587,17 +9588,11 @@ static void WMSFT_compile_lib(ITypeLibImpl *This, WMSFT_TLBFile *file) #endif } -static void WMSFT_compile_res07(ITypeLibImpl *This, WMSFT_TLBFile *file) +static void WMSFT_compile_namehash(ITypeLibImpl *This, WMSFT_TLBFile *file) { - /* TODO: What actually goes here? - * Wild speculation: - * It's something to do with the Name table (and string table?). When you - * add a new name, the offset to that name from within the Name table gets - * stuck somewhere in res07, apparently starting at the end of the segment - * then moving backwards at a rate of 3 bytes per char in the Name. */ - file->res07_seg.len = 0x200; - file->res07_seg.data = heap_alloc(file->res07_seg.len); - memset(file->res07_seg.data, 0xFF, file->res07_seg.len); + file->namehash_seg.len = 0x200; + file->namehash_seg.data = heap_alloc(file->namehash_seg.len); + memset(file->namehash_seg.data, 0xFF, file->namehash_seg.len); } static void tmp_fill_segdir_seg(MSFT_pSeg *segdir, WMSFT_SegContents *contents, DWORD *running_offset) @@ -9645,7 +9640,7 @@ static void WMSFT_free_file(WMSFT_TLBFile *file) HeapFree(GetProcessHeap(), 0, file->ref_seg.data); HeapFree(GetProcessHeap(), 0, file->impinfo_seg.data); HeapFree(GetProcessHeap(), 0, file->impfile_seg.data); - HeapFree(GetProcessHeap(), 0, file->res07_seg.data); + HeapFree(GetProcessHeap(), 0, file->namehash_seg.data); HeapFree(GetProcessHeap(), 0, file->name_seg.data); HeapFree(GetProcessHeap(), 0, file->string_seg.data); HeapFree(GetProcessHeap(), 0, file->typdesc_seg.data); @@ -9686,6 +9681,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) file.header.res48 = 0x80; file.header.dispatchpos = This->dispatch_href; + WMSFT_compile_namehash(This, &file); /* do name and string compilation to get offsets for other compilations */ hres = WMSFT_compile_names(This, &file); if (FAILED(hres)){ @@ -9749,7 +9745,6 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) WMSFT_compile_typeinfo_seg(This, &file, junk + junk_offs); WMSFT_compile_impinfo(This, &file); WMSFT_compile_lib(This, &file); - WMSFT_compile_res07(This, &file); running_offset = 0; @@ -9781,7 +9776,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) tmp_fill_segdir_seg(&file.segdir.pImpFiles, &file.impfile_seg, &running_offset); TRACE("res07 at: 0x%x\n", running_offset); - tmp_fill_segdir_seg(&file.segdir.res07, &file.res07_seg, &running_offset); + tmp_fill_segdir_seg(&file.segdir.res07, &file.namehash_seg, &running_offset); TRACE("nametab at: 0x%x\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pNametab, &file.name_seg, &running_offset); @@ -9848,7 +9843,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) WMSFT_write_segment(outfile, &file.ref_seg); WMSFT_write_segment(outfile, &file.impinfo_seg); WMSFT_write_segment(outfile, &file.impfile_seg); - WMSFT_write_segment(outfile, &file.res07_seg); + WMSFT_write_segment(outfile, &file.namehash_seg); WMSFT_write_segment(outfile, &file.name_seg); WMSFT_write_segment(outfile, &file.string_seg); WMSFT_write_segment(outfile, &file.typdesc_seg);

1 0

Bruno Jesus : kernel32/tests: Add tests for GetVolumePathNameA().
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 95d01f1751d893de7a8c681f724c972e11e69ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d01f1751d893de7a8c681f7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jul 28 15:01:32 2013 -0300 kernel32/tests: Add tests for GetVolumePathNameA(). --- dlls/kernel32/tests/volume.c | 80 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index f7879c8..e63a2ef 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -53,6 +53,7 @@ static BOOL (WINAPI *pFindVolumeClose)(HANDLE); static UINT (WINAPI *pGetLogicalDriveStringsA)(UINT,LPSTR); static UINT (WINAPI *pGetLogicalDriveStringsW)(UINT,LPWSTR); static BOOL (WINAPI *pGetVolumeInformationA)(LPCSTR, LPSTR, DWORD, LPDWORD, LPDWORD, LPDWORD, LPSTR, DWORD); +static BOOL (WINAPI *pGetVolumePathNameA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameA)(LPCSTR, LPSTR, DWORD, LPDWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameW)(LPCWSTR, LPWSTR, DWORD, LPDWORD); @@ -588,6 +589,83 @@ static void test_disk_extents(void) CloseHandle( handle ); } +static void test_GetVolumePathNameA(void) +{ + BOOL ret; + char volume[MAX_PATH]; + char expected[] = "C:\\", pathC1[] = "C:\\", pathC2[] = "C::"; + DWORD error; + + if (!pGetVolumePathNameA) + { + win_skip("required functions not found\n"); + return; + } + + SetLastError( 0xdeadbeef ); + ret = pGetVolumePathNameA(NULL, NULL, 0); + error = GetLastError(); + ok(!ret, "expected failure\n"); +todo_wine + ok(error == ERROR_INVALID_PARAMETER + || broken( error == 0xdeadbeef) /* <=XP */, + "expected ERROR_INVALID_PARAMETER got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = pGetVolumePathNameA("", NULL, 0); + error = GetLastError(); + ok(!ret, "expected failure\n"); +todo_wine + ok(error == ERROR_INVALID_PARAMETER + || broken( error == 0xdeadbeef) /* <=XP */, + "expected ERROR_INVALID_PARAMETER got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = pGetVolumePathNameA(pathC1, NULL, 0); + error = GetLastError(); + ok(!ret, "expected failure\n"); +todo_wine + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_FILENAME_EXCED_RANGE) /* <=XP */, + "expected ERROR_INVALID_PARAMETER got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = pGetVolumePathNameA(pathC1, volume, 0); + error = GetLastError(); + ok(!ret, "expected failure\n"); +todo_wine + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_FILENAME_EXCED_RANGE ) /* <=XP */, + "expected ERROR_INVALID_PARAMETER got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = pGetVolumePathNameA(pathC1, volume, 1); + error = GetLastError(); + ok(!ret, "expected failure\n"); +todo_wine + ok(error == ERROR_FILENAME_EXCED_RANGE, "expected ERROR_FILENAME_EXCED_RANGE got %u\n", error); + + volume[0] = '\0'; + ret = pGetVolumePathNameA(pathC1, volume, sizeof(volume)); + ok(ret, "expected success\n"); + ok(!strcmp(expected, volume), "expected name '%s', returned '%s'\n", pathC1, volume); + + pathC1[0] = tolower(pathC1[0]); + volume[0] = '\0'; + ret = pGetVolumePathNameA(pathC1, volume, sizeof(volume)); + ok(ret, "expected success\n"); +todo_wine + ok(!strcmp(expected, volume) || broken(!strcasecmp(expected, volume)) /* <=XP */, + "expected name '%s', returned '%s'\n", expected, volume); + + volume[0] = '\0'; + ret = pGetVolumePathNameA(pathC2, volume, sizeof(volume)); +todo_wine + ok(ret, "expected success\n"); +todo_wine + ok(!strcmp(expected, volume), "expected name '%s', returned '%s'\n", expected, volume); +} + static void test_GetVolumePathNamesForVolumeNameA(void) { BOOL ret; @@ -926,12 +1004,14 @@ START_TEST(volume) pGetLogicalDriveStringsA = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsA"); pGetLogicalDriveStringsW = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsW"); pGetVolumeInformationA = (void *) GetProcAddress(hdll, "GetVolumeInformationA"); + pGetVolumePathNameA = (void *) GetProcAddress(hdll, "GetVolumePathNameA"); pGetVolumePathNamesForVolumeNameA = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameA"); pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW"); test_query_dos_deviceA(); test_define_dos_deviceA(); test_FindFirstVolume(); + test_GetVolumePathNameA(); test_GetVolumeNameForVolumeMountPointA(); test_GetVolumeNameForVolumeMountPointW(); test_GetLogicalDriveStringsA();

1 0

Damjan Jovanovic : include/ddk: Add usbioctl.h.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: f5f04e8a2febd7cf2dfbbcfc0b362efb2d3dc84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f04e8a2febd7cf2dfbbcfc0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jul 22 19:10:39 2013 +0000 include/ddk: Add usbioctl.h. --- include/Makefile.in | 1 + include/ddk/usbioctl.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 46db2dc..cecc845 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -236,6 +236,7 @@ SRCDIR_INCLUDES = \ ddk/usb100.h \ ddk/usb200.h \ ddk/usbdlib.h \ + ddk/usbioctl.h \ ddk/usbiodef.h \ ddk/wdm.h \ ddk/winddiui.h \ diff --git a/include/ddk/usbioctl.h b/include/ddk/usbioctl.h new file mode 100644 index 0000000..003e2b6 --- /dev/null +++ b/include/ddk/usbioctl.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2013 Damjan Jovanovic + * + * 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 __DDK_USBIOCTL_H__ +#define __DDK_USBIOCTL_H__ + +#define IOCTL_INTERNAL_USB_SUBMIT_URB \ + CTL_CODE(FILE_DEVICE_USB, USB_SUBMIT_URB, METHOD_NEITHER, FILE_ANY_ACCESS) + +#endif /* __DDK_USBIOCTL_H__ */

1 0

Damjan Jovanovic : include/ddk: Add usbiodef.h.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: f7daa3f596cdcb6ff757b55e30af39b7bb62ee83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7daa3f596cdcb6ff757b55e3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jul 22 19:09:57 2013 +0000 include/ddk: Add usbiodef.h. --- include/Makefile.in | 1 + include/ddk/usbiodef.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index a56c6bd..46db2dc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -236,6 +236,7 @@ SRCDIR_INCLUDES = \ ddk/usb100.h \ ddk/usb200.h \ ddk/usbdlib.h \ + ddk/usbiodef.h \ ddk/wdm.h \ ddk/winddiui.h \ ddk/winsplp.h \ diff --git a/include/ddk/usbiodef.h b/include/ddk/usbiodef.h new file mode 100644 index 0000000..5f79810 --- /dev/null +++ b/include/ddk/usbiodef.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2013 Damjan Jovanovic + * + * 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 __DDK_USBIODEF_H__ +#define __DDK_USBIODEF_H__ + +#define USB_SUBMIT_URB 0 + +#define FILE_DEVICE_USB FILE_DEVICE_UNKNOWN + +#endif /* __DDK_USBIODEF_H__ */

1 0

Piotr Caban : scrrun/tests: Add IFileSystem3::GetFile tests.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 45b31a9f019c013e35fee0a50f976c2b1d57a8e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b31a9f019c013e35fee0a50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:13:46 2013 +0200 scrrun/tests: Add IFileSystem3::GetFile tests. --- dlls/scrrun/tests/filesystem.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 801e56f..101c396 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -461,6 +461,49 @@ static void test_GetAbsolutePathName(void) RemoveDirectoryW(dir2); } +static void test_GetFile(void) +{ + static const WCHAR get_file[] = {'g','e','t','_','f','i','l','e','.','t','s','t',0}; + + BSTR path = SysAllocString(get_file); + IFile *file; + HRESULT hr; + HANDLE hf; + + hr = IFileSystem3_GetFile(fs3, path, NULL); + ok(hr == E_POINTER, "GetFile returned %x, expected E_POINTER\n", hr); + hr = IFileSystem3_GetFile(fs3, NULL, &file); + ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); + + hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(hf != INVALID_HANDLE_VALUE) { + CloseHandle(hf); + skip("File already exists, skipping GetFile tests\n"); + SysFreeString(path); + return; + } + + file = (IFile*)0xdeadbeef; + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(!file, "file != NULL\n"); + ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + + hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if(hf == INVALID_HANDLE_VALUE) { + skip("Can't create temporary file\n"); + SysFreeString(path); + return; + } + CloseHandle(hf); + + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + IFile_Release(file); + + DeleteFileW(path); + SysFreeString(path); +} + START_TEST(filesystem) { HRESULT hr; @@ -482,6 +525,7 @@ START_TEST(filesystem) test_GetFileName(); test_GetBaseName(); test_GetAbsolutePathName(); + test_GetFile(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : scrrun/tests: Add IFileSystem3::GetAbsolutePathName tests.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: e7a415b3f81352e53318aee4b6b0cae7a6a5b190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a415b3f81352e53318aee4b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:13:26 2013 +0200 scrrun/tests: Add IFileSystem3::GetAbsolutePathName tests. --- dlls/scrrun/tests/filesystem.c | 71 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 4cd4e2d..801e56f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -391,6 +391,76 @@ static void test_GetBaseName(void) } } +static void test_GetAbsolutePathName(void) +{ + static const WCHAR dir1[] = {'t','e','s','t','_','d','i','r','1',0}; + static const WCHAR dir2[] = {'t','e','s','t','_','d','i','r','2',0}; + static const WCHAR dir_match1[] = {'t','e','s','t','_','d','i','r','*',0}; + static const WCHAR dir_match2[] = {'t','e','s','t','_','d','i','*',0}; + static const WCHAR cur_dir[] = {'.',0}; + + WIN32_FIND_DATAW fdata; + HANDLE find; + WCHAR buf[MAX_PATH]; + BSTR path, result; + HRESULT hr; + + hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, NULL); + ok(hr == E_POINTER, "GetAbsolutePathName returned %x, expected E_POINTER\n", hr); + + hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + GetFullPathNameW(cur_dir, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + SysFreeString(result); + + find = FindFirstFileW(dir_match2, &fdata); + if(find != INVALID_HANDLE_VALUE) { + skip("GetAbsolutePathName tests\n"); + FindClose(find); + return; + } + + path = SysAllocString(dir_match1); + hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + GetFullPathNameW(dir_match1, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + SysFreeString(result); + + ok(CreateDirectoryW(dir1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir1)); + hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + GetFullPathNameW(dir1, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + SysFreeString(result); + + ok(CreateDirectoryW(dir2, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir2)); + hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + if(!lstrcmpW(buf, result)) { + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + wine_dbgstr_w(result), wine_dbgstr_w(buf)); + }else { + GetFullPathNameW(dir2, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + wine_dbgstr_w(result), wine_dbgstr_w(buf)); + } + SysFreeString(result); + + SysFreeString(path); + path = SysAllocString(dir_match2); + hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + GetFullPathNameW(dir_match2, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + SysFreeString(result); + SysFreeString(path); + + RemoveDirectoryW(dir1); + RemoveDirectoryW(dir2); +} + START_TEST(filesystem) { HRESULT hr; @@ -411,6 +481,7 @@ START_TEST(filesystem) test_GetParentFolderName(); test_GetFileName(); test_GetBaseName(); + test_GetAbsolutePathName(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : winedump: Rename res07 typelib segment to NameHashTab.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 1121868e22d78eb4644d24bbceb31924ccc62d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1121868e22d78eb4644d24bbc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 28 10:06:17 2013 +0200 winedump: Rename res07 typelib segment to NameHashTab. --- tools/winedump/tlb.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index c487dde..ca72617 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -380,9 +380,9 @@ static int dump_msft_guidtab(seg_t *seg) return -1; } -static int dump_msft_res07(seg_t *seg) +static int dump_msft_namehashtab(seg_t *seg) { - print_begin_block("res07"); + print_begin_block("NameHashTab"); dump_binary(seg->length); /* FIXME */ @@ -661,7 +661,7 @@ seg_t segdir[] = { {"RefTab", dump_msft_reftabs, -1, -1}, {"LibTab", dump_msft_libtab, -1, -1}, {"GuidTab", dump_msft_guidtab, -1, -1}, - {"res07", dump_msft_res07, -1, -1}, + {"NameHashTab", dump_msft_namehashtab, -1, -1}, {"pNameTab", dump_msft_nametab, -1, -1}, {"pStringTab", dump_msft_stringtab, -1, -1}, {"TypedescTab", dump_msft_typedesctab, -1, -1},

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetTempName implementation.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: ac132599aa13c3392bd841a3d41822eb91c3d7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac132599aa13c3392bd841a3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:12:57 2013 +0200 scrrun: Add IFileSystem3::GetTempName implementation. --- dlls/scrrun/Makefile.in | 2 +- dlls/scrrun/filesystem.c | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index 4ceac05..cb5d981 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -1,5 +1,5 @@ MODULE = scrrun.dll -IMPORTS = uuid oleaut32 version +IMPORTS = uuid oleaut32 version advapi32 C_SRCS = \ dictionary.c \ diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 62bc676..8d0f5b1 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "olectl.h" #include "dispex.h" +#include "ntsecapi.h" #include "scrrun.h" #include "scrrun_private.h" @@ -868,9 +869,23 @@ static HRESULT WINAPI filesys_GetAbsolutePathName(IFileSystem3 *iface, BSTR Path static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *pbstrResult) { - FIXME("%p %p\n", iface, pbstrResult); + static const WCHAR fmt[] = {'r','a','d','%','0','5','X','.','t','x','t',0}; - return E_NOTIMPL; + DWORD random; + + TRACE("%p %p\n", iface, pbstrResult); + + if(!pbstrResult) + return E_POINTER; + + *pbstrResult = SysAllocStringLen(NULL, 12); + if(!*pbstrResult) + return E_OUTOFMEMORY; + + if(!RtlGenRandom(&random, sizeof(random))) + return E_FAIL; + sprintfW(*pbstrResult, fmt, random & 0xfffff); + return S_OK; } static HRESULT WINAPI filesys_DriveExists(IFileSystem3 *iface, BSTR DriveSpec,

1 0