wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Nikolay Sivov : kernel32: Support FileBasicInfo case in SetFileInformationByHandle().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: fdf8d7176f59043999b34ff4facdcbee14a7d6aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdf8d7176f59043999b34ff4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 12:19:28 2019 +0300 kernel32: Support FileBasicInfo case in SetFileInformationByHandle(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 4 +++- dlls/kernel32/tests/file.c | 23 ++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 30c8dbd..bd10260 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1095,7 +1095,6 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c switch (class) { - case FileBasicInfo: case FileNameInfo: case FileRenameInfo: case FileAllocationInfo: @@ -1114,6 +1113,9 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileBasicInfo: + status = NtSetInformationFile( file, &io, info, size, FileBasicInformation ); + break; case FileDispositionInfo: status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation ); break; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b22ae19..63a67ca 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4973,8 +4973,10 @@ static void test_SetFileInformationByHandle(void) FILE_COMPRESSION_INFO compressinfo; FILE_DISPOSITION_INFO dispinfo; DECLSPEC_ALIGN(8) FILE_IO_PRIORITY_HINT_INFO hintinfo; + FILE_BASIC_INFO basicinfo = { {{0}} }; char tempFileName[MAX_PATH]; char tempPath[MAX_PATH]; + LARGE_INTEGER atime; HANDLE file; BOOL ret; @@ -4991,7 +4993,7 @@ static void test_SetFileInformationByHandle(void) ret = GetTempFileNameA(tempPath, "abc", 0, tempFileName); ok(ret, "GetTempFileNameA failed, got error %u.\n", GetLastError()); - file = CreateFileA(tempFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + file = CreateFileA(tempFileName, GENERIC_READ | FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); ok(file != INVALID_HANDLE_VALUE, "failed to open the temp file, error %u.\n", GetLastError()); @@ -5044,6 +5046,25 @@ static void test_SetFileInformationByHandle(void) todo_wine ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, 0); +todo_wine + ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); + + memset(&basicinfo, 0, sizeof(basicinfo)); + ret = pGetFileInformationByHandleEx(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); + ok(ret, "Failed to get basic info, error %d.\n", GetLastError()); + atime = basicinfo.LastAccessTime; + + basicinfo.LastAccessTime.QuadPart++; + ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); + ok(ret, "Failed to set basic info, error %d.\n", GetLastError()); + + memset(&basicinfo, 0, sizeof(basicinfo)); + ret = pGetFileInformationByHandleEx(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); + ok(ret, "Failed to get basic info, error %d.\n", GetLastError()); + ok(atime.QuadPart + 1 == basicinfo.LastAccessTime.QuadPart, "Unexpected access time.\n"); + dispinfo.DeleteFile = TRUE; ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, sizeof(dispinfo)); ok(ret, "setting FileDispositionInfo failed, error %d\n", GetLastError());

1 0

Nikolay Sivov : kernel32/nls: Add locale data for positive and negative infinity.
by Alexandre Julliard 31 Jul '19

31 Jul '19

1 0

Nikolay Sivov : kernel32/nls: Add percent formatting values.
by Alexandre Julliard 31 Jul '19

31 Jul '19

1 0

Nikolay Sivov : kernel32/nls: Add LOCALE_SPERMILLE data.
by Alexandre Julliard 31 Jul '19

31 Jul '19

1 0

Nikolay Sivov : kernel32/nls: Add LOCALE_SPERCENT locale data.
by Alexandre Julliard 31 Jul '19

31 Jul '19

1 0

Austin English : shell32: Add SHMultiFileProperties stub.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 442960818901e63066c47fd62609f63a9f1111f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=442960818901e63066c47fd6… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 9 01:07:21 2019 -0500 shell32: Add SHMultiFileProperties stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47411 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shlfileop.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 7ed7bb5..5331fff 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -409,6 +409,7 @@ @ stdcall SHIsFileAvailableOffline(wstr ptr) @ stdcall SHLoadInProc(ptr) @ stdcall SHLoadNonloadedIconOverlayIdentifiers() +@ stdcall SHMultiFileProperties(ptr long) @ stdcall SHOpenFolderAndSelectItems(ptr long ptr long) @ stdcall SHOpenWithDialog(long ptr) @ stdcall SHParseDisplayName(wstr ptr ptr long ptr) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 1515ad3..b941db3 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1799,3 +1799,13 @@ HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path else return HRESULT_FROM_WIN32(ERROR_DIRECTORY); } + +/************************************************************************* + * SHMultiFileProperties [SHELL32.@] + */ + +HRESULT WINAPI SHMultiFileProperties(IDataObject *pdtobj, DWORD flags) +{ + FIXME("stub: %p %u\n", pdtobj, flags); + return E_NOTIMPL; +}

1 0

Jeff Smith : d3drm: Correct parameter count of several interface defines.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: b5b1f11f171bd962cab5ce0f6a4588c76193b60e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b1f11f171bd962cab5ce0f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 14:40:23 2019 -0500 d3drm: Correct parameter count of several interface defines. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3drm.h | 16 ++++++++-------- include/d3drmobj.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index 126695c..c10b9ed 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -322,7 +322,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_EnumerateObjects(p,a,b) (p)->EnumerateObjects(a,b) #define IDirect3DRM2_Load(p,a,b,c,d,e,f,g,h,i,j) (p)->Load(a,b,c,d,e,f,g,h,i,j) #define IDirect3DRM2_Tick(p,a) (p)->Tick(a) -#define IDirect3DRM2_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(p,a) +#define IDirect3DRM2_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(a) #endif /***************************************************************************** @@ -434,7 +434,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->lpVtbl->CreateProgressiveMesh(p,a) #define IDirect3DRM3_RegisterClient(p,a,b) (p)->lpVtbl->RegisterClient(p,a,b) #define IDirect3DRM3_UnregisterClient(p,a) (p)->lpVtbl->UnregisterClient(p,a) -#define IDirect3DRM3_CreateClippedVisual(p,ab) (p)->lpVtbl->CreateClippedVisual(p,a,b) +#define IDirect3DRM3_CreateClippedVisual(p,a,b) (p)->lpVtbl->CreateClippedVisual(p,a,b) #define IDirect3DRM3_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) #define IDirect3DRM3_GetOptions(p,a) (p)->lpVtbl->GetOptions(p,a) #else @@ -475,12 +475,12 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_EnumerateObjects(p,a,b) (p)->EnumerateObjects(a,b) #define IDirect3DRM3_Load(p,a,b,c,d,e,f,g,h,i,j) (p)->Load(a,b,c,d,e,f,g,h,i,j) #define IDirect3DRM3_Tick(p,a) (p)->Tick(a) -#define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(p,a) -#define IDirect3DRM3_RegisterClient(p,a,b) (p)->RegisterClient(p,a,b) -#define IDirect3DRM3_UnregisterClient(p,a) (p)->UnregisterClient(p,a) -#define IDirect3DRM3_CreateClippedVisual(p,ab) (p)->CreateClippedVisual(p,a,b) -#define IDirect3DRM3_SetOptions(p,a) (p)->SetOptions(p,a) -#define IDirect3DRM3_GetOptions(p,a) (p)->GetOptions(p,a) +#define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(a) +#define IDirect3DRM3_RegisterClient(p,a,b) (p)->RegisterClient(a,b) +#define IDirect3DRM3_UnregisterClient(p,a) (p)->UnregisterClient(a) +#define IDirect3DRM3_CreateClippedVisual(p,a,b) (p)->CreateClippedVisual(a,b) +#define IDirect3DRM3_SetOptions(p,a) (p)->SetOptions(a) +#define IDirect3DRM3_GetOptions(p,a) (p)->GetOptions(a) #endif #define D3DRM_OK DD_OK diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5ff33fe..7e48d98 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3616,9 +3616,9 @@ DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject) #define IDirect3DRMWrap_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMWrap_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMWrap methods ***/ -#define IDirect3DRMWrap_Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) -#define IDirect3DRMWrap_Apply(p,a) (p)->Apply(p,a) -#define IDirect3DRMWrap_ApplyRelative(p,a,b) (p)->ApplyRelative(p,a,b) +#define IDirect3DRMWrap_Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->Init(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) +#define IDirect3DRMWrap_Apply(p,a) (p)->Apply(a) +#define IDirect3DRMWrap_ApplyRelative(p,a,b) (p)->ApplyRelative(a,b) #endif /*****************************************************************************

1 0

Alistair Leslie-Hughes : include: Add filter.idl.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: ec7a24bee4b68b8e2f2a08fbee78fff4bf46000c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec7a24bee4b68b8e2f2a08fb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:37 2019 +0000 include: Add filter.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/filter.idl | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7ca25e2..02ee45d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -268,6 +268,7 @@ SOURCES = \ fci.h \ fdi.h \ fileapi.h \ + filter.idl \ fltdefs.h \ fontsub.h \ fusion.idl \ diff --git a/include/filter.idl b/include/filter.idl new file mode 100644 index 0000000..f176ac3 --- /dev/null +++ b/include/filter.idl @@ -0,0 +1,101 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "propidl.idl"; + +typedef struct tagFULLPROPSPEC +{ + GUID guidPropSet; + PROPSPEC psProperty; +} FULLPROPSPEC; + +[ + object, + uuid(89bcb740-6119-101a-bcb7-00dd010655af), + pointer_default(unique) +] + +interface IFilter : IUnknown +{ + typedef enum tagIFILTER_INIT + { + IFILTER_INIT_CANON_PARAGRAPHS = 1, + IFILTER_INIT_HARD_LINE_BREAKS = 2, + IFILTER_INIT_CANON_HYPHENS = 4, + IFILTER_INIT_CANON_SPACES = 8, + IFILTER_INIT_APPLY_INDEX_ATTRIBUTES = 16, + IFILTER_INIT_APPLY_OTHER_ATTRIBUTES = 32, + IFILTER_INIT_INDEXING_ONLY = 64, + IFILTER_INIT_SEARCH_LINKS = 128, + IFILTER_INIT_APPLY_CRAWL_ATTRIBUTES = 256, + IFILTER_INIT_FILTER_OWNED_VALUE_OK = 512, + IFILTER_INIT_FILTER_AGGRESSIVE_BREAK = 1024, + IFILTER_INIT_DISABLE_EMBEDDED = 2048, + IFILTER_INIT_EMIT_FORMATTING = 4096 + } IFILTER_INIT; + + typedef enum tagIFILTER_FLAGS + { + IFILTER_FLAGS_OLE_PROPERTIES = 1 + } IFILTER_FLAGS; + + typedef enum tagCHUNKSTATE + { + CHUNK_TEXT = 0x1, + CHUNK_VALUE = 0x2, + CHUNK_FILTER_OWNED_VALUE = 0x4 + } CHUNKSTATE; + + typedef enum tagCHUNK_BREAKTYPE + { + CHUNK_NO_BREAK = 0, + CHUNK_EOW = 1, + CHUNK_EOS = 2, + CHUNK_EOP = 3, + CHUNK_EOC = 4 + } CHUNK_BREAKTYPE; + + typedef struct tagFILTERREGION + { + ULONG idChunk; + ULONG cwcStart; + ULONG cwcExtent; + } FILTERREGION; + + typedef struct tagSTAT_CHUNK + { + ULONG idChunk; + CHUNK_BREAKTYPE breakType; + CHUNKSTATE flags; + LCID locale; + FULLPROPSPEC attribute; + ULONG idChunkSource; + ULONG cwcStartSource; + ULONG cwcLenSource; + } STAT_CHUNK; + + SCODE Init([in] ULONG flags, [in] ULONG cnt, [in, size_is(cnt), unique] FULLPROPSPEC const *attributes, [out] ULONG *out_flags); + SCODE GetChunk([out] STAT_CHUNK *stat); + SCODE GetText([in, out] ULONG *cnt, [out, size_is(*cnt)] WCHAR *buffer); + SCODE GetValue([out] PROPVARIANT **value); + + [local] + SCODE BindRegion([in] FILTERREGION pos, [in] REFIID riid, [out] void **unk); +}

1 0

Alistair Leslie-Hughes : msvcrt: Add strupr_s declaration.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 2cdecca2103433276976bd54e5ba15c7ef88e658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cdecca2103433276976bd54… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:49 2019 +0000 msvcrt: Add strupr_s declaration. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/string.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 0b36d2c..39a0296 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -60,6 +60,7 @@ char* __cdecl _strnset(char*,int,size_t); char* __cdecl _strrev(char*); char* __cdecl _strset(char*,int); char* __cdecl _strupr(char*); +errno_t __cdecl _strupr_s(char *, size_t); void* __cdecl memmove(void*,const void*,size_t); errno_t __cdecl memmove_s(void*,size_t,const void*,size_t);

1 0

Alistair Leslie-Hughes : include: Add Network Address Control defines.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: b6aa3c525cdd590e039eb896e437a753da5b09cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6aa3c525cdd590e039eb896… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:48 2019 +0000 include: Add Network Address Control defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shellapi.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/shellapi.h b/include/shellapi.h index 0e7d64c..0f10690 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -497,6 +497,30 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR,LPSHQUERYRBINFO); #define SHQueryRecycleBin WINELIB_NAME_AW(SHQueryRecycleBin) /****************************************** + * Network Address Control + */ +typedef struct tagNC_ADDRESS +{ + struct NET_ADDRESS_INFO_ *pAddrInfo; + USHORT PortNumber; + BYTE PrefixLength; +} NC_ADDRESS, *PNC_ADDRESS; + +#define NCM_GETADDRESS (WM_USER+1) +#define NCM_SETALLOWTYPE (WM_USER+2) +#define NCM_GETALLOWTYPE (WM_USER+3) +#define NCM_DISPLAYERRORTIP (WM_USER+4) + +#define NetAddr_GetAddress(hwnd,addr) \ + (HRESULT)SNDMSG(hwnd,NCM_GETADDRESS,0,(LPARAM)addr) +#define NetAddr_SetAllowType(hwnd, mask) \ + (HRESULT)SNDMSG(hwnd,NCM_SETALLOWTYPE,(WPARAM)mask,0) +#define NetAddr_GetAllowType(hwnd) \ + (DWORD)SNDMSG(hwnd,NCM_GETALLOWTYPE,0,0) +#define NetAddr_DisplayErrorTip(hwnd) \ + (HRESULT)SNDMSG(hwnd,NCM_DISPLAYERRORTIP,0,0) + +/****************************************** * Misc */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019