winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2013
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
736 discussions
Start a n
N
ew thread
Ludger Sprenker : windowscodecs: Implement ComponentFactory:: CreateEncoderPropertyBag.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: d4b1db7141070f0db63e6a7703334a32c5c7aa28 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d4b1db7141070f0db63e6a770…
Author: Ludger Sprenker <Ludger(a)Sprenker.net> Date: Tue Jan 29 19:50:36 2013 +0100 windowscodecs: Implement ComponentFactory::CreateEncoderPropertyBag. --- dlls/windowscodecs/bmpencode.c | 2 +- dlls/windowscodecs/icnsformat.c | 2 +- dlls/windowscodecs/imgfactory.c | 4 ++-- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/propertybag.c | 4 +++- dlls/windowscodecs/tests/propertybag.c | 2 -- dlls/windowscodecs/tiffformat.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 3 ++- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 27922e7..9bd2340 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -538,7 +538,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (!This->stream) return WINCODEC_ERR_NOTINITIALIZED; - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) return hr; encode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameEncode)); diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index c777581..254f81f 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -663,7 +663,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, goto end; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) goto end; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 3e574d5..7965c55 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -821,8 +821,8 @@ static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromBlockWriter(IWICComp static HRESULT WINAPI ComponentFactory_CreateEncoderPropertyBag(IWICComponentFactory *iface, PROPBAG2 *options, UINT count, IPropertyBag2 **property) { - FIXME("%p,%p,%u,%p: stub\n", iface, options, count, property); - return E_NOTIMPL; + TRACE("(%p,%p,%u,%p)\n", iface, options, count, property); + return CreatePropertyBag2(options, count, property); } static const IWICComponentFactoryVtbl ComponentFactory_Vtbl = { diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 6463de5..1aca6d1 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1389,7 +1389,7 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 4183d8e..e4236e2 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1615,7 +1615,7 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 3a85df0..1c90b15 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2013 Ludger Sprenker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -136,7 +137,8 @@ static const IPropertyBag2Vtbl PropertyBag_Vtbl = { PropertyBag_LoadObject }; -HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) +HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, + IPropertyBag2 **ppPropertyBag2) { PropertyBag *This; diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index b7e5153..d5ac809 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -234,7 +234,6 @@ static void test_empty_propertybag(void) hr = IWICComponentFactory_CreateEncoderPropertyBag(factory, NULL, 0, &property); -todo_wine ok(hr == S_OK, "Creating EncoderPropertyBag failed, hr=%x\n", hr); if (FAILED(hr)) return; @@ -265,7 +264,6 @@ static void test_filled_propertybag(void) hr = IWICComponentFactory_CreateEncoderPropertyBag(factory, opts, 2, &property); -todo_wine ok(hr == S_OK, "Creating EncoderPropertyBag failed, hr=%x\n", hr); if (FAILED(hr)) return; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index fcaa905..8cebb0c 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1883,7 +1883,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (SUCCEEDED(hr)) { - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); } if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index f8b7789..617db71 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -62,7 +62,8 @@ extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT heigh extern HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) DECLSPEC_HIDDEN; -extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) DECLSPEC_HIDDEN; +extern HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, + IPropertyBag2 **property) DECLSPEC_HIDDEN; extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN; extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) DECLSPEC_HIDDEN;
1
0
0
0
Erich Hoover : advapi32: Make an internal routine for [Get|Set] SecurityInfo file objects.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: d195bbeb69a6423125a28f5e4f8af1882a0bbe17 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d195bbeb69a6423125a28f5e4…
Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 18 10:59:01 2013 -0700 advapi32: Make an internal routine for [Get|Set]SecurityInfo file objects. --- dlls/advapi32/security.c | 80 ++++++++++++++++++++++------------------------ 1 files changed, 38 insertions(+), 42 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index fac6f39..d70fb63 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -401,6 +401,28 @@ static inline BOOL set_ntstatus( NTSTATUS status ) return !status; } +/* helper function for SE_FILE_OBJECT objects in [Get|Set]NamedSecurityInfo */ +static inline DWORD get_security_file( LPWSTR full_file_name, DWORD access, HANDLE *file ) +{ + UNICODE_STRING file_nameW; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + NTSTATUS status; + + if (!RtlDosPathNameToNtPathName_U( full_file_name, &file_nameW, NULL, NULL )) + return ERROR_PATH_NOT_FOUND; + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &file_nameW; + attr.SecurityDescriptor = NULL; + status = NtCreateFile( file, access, &attr, &io, NULL, FILE_FLAG_BACKUP_SEMANTICS, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, + FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); + RtlFreeUnicodeString( &file_nameW ); + return RtlNtStatusToDosError( status ); +} + #define WINE_SIZE_OF_WORLD_ACCESS_ACL (sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + sizeof(sidWorld) - sizeof(DWORD)) static void GetWorldAccessACL(PACL pACL) @@ -3964,12 +3986,9 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSID psidOwner, PSID psidGroup, PACL pDacl, PACL pSacl) { - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - IO_STATUS_BLOCK io; DWORD access = 0; - HANDLE hFile; - DWORD status; + HANDLE handle; + DWORD err; TRACE( "%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl); @@ -3980,8 +3999,6 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, } if (!pObjectName) return ERROR_INVALID_PARAMETER; - if (!RtlDosPathNameToNtPathName_U( pObjectName, &nameW, NULL, NULL )) - return ERROR_PATH_NOT_FOUND; if (SecurityInfo & (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION)) access |= WRITE_OWNER; @@ -3989,21 +4006,13 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, access |= WRITE_DAC; if (SecurityInfo & SACL_SECURITY_INFORMATION) access |= ACCESS_SYSTEM_SECURITY; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nameW; - attr.SecurityDescriptor = NULL; - status = NtCreateFile( &hFile, access, &attr, &io, NULL, FILE_FLAG_BACKUP_SEMANTICS, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, - FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); - RtlFreeUnicodeString( &nameW ); - if (status != STATUS_SUCCESS) - return RtlNtStatusToDosError( status ); - status = SetSecurityInfo( hFile, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); - CloseHandle( hFile ); - return status; + err = get_security_file( pObjectName, access, &handle ); + if (err != ERROR_SUCCESS) + return err; + err = SetSecurityInfo( handle, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); + CloseHandle( handle ); + return err; } /****************************************************************************** @@ -5520,12 +5529,9 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, SECURITY_INFORMATION info, PSID* owner, PSID* group, PACL* dacl, PACL* sacl, PSECURITY_DESCRIPTOR* descriptor ) { - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - IO_STATUS_BLOCK io; DWORD access = 0; - HANDLE hFile; - DWORD status; + HANDLE handle; + DWORD err; TRACE( "%s %d %d %p %p %p %p %p\n", debugstr_w(name), type, info, owner, group, dacl, sacl, descriptor ); @@ -5550,28 +5556,18 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, || ((info & DACL_SECURITY_INFORMATION) && !dacl) || ((info & SACL_SECURITY_INFORMATION) && !sacl) )) return ERROR_INVALID_PARAMETER; - if (!RtlDosPathNameToNtPathName_U( name, &nameW, NULL, NULL )) - return ERROR_PATH_NOT_FOUND; if (info & (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION)) access |= READ_CONTROL; if (info & SACL_SECURITY_INFORMATION) access |= ACCESS_SYSTEM_SECURITY; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nameW; - attr.SecurityDescriptor = NULL; - status = NtCreateFile( &hFile, access, &attr, &io, NULL, FILE_FLAG_BACKUP_SEMANTICS, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, - FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); - RtlFreeUnicodeString( &nameW ); - if (status != STATUS_SUCCESS) - return RtlNtStatusToDosError( status ); - status = GetSecurityInfo( hFile, type, info, owner, group, dacl, sacl, descriptor ); - CloseHandle( hFile ); - return status; + err = get_security_file( name, access, &handle); + if (err != ERROR_SUCCESS) + return err; + err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); + CloseHandle( handle ); + return err; } /******************************************************************************
1
0
0
0
Erich Hoover : advapi32: Support service objects in SetSecurityInfo.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: e4717c299efa4f7e281de9eb8782b632b5539df1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e4717c299efa4f7e281de9eb8…
Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 18 10:58:48 2013 -0700 advapi32: Support service objects in SetSecurityInfo. --- dlls/advapi32/security.c | 11 ++++++++++- dlls/advapi32/service.c | 3 +++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6da7331..fac6f39 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5680,7 +5680,16 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, if (SecurityInfo & SACL_SECURITY_INFORMATION) SetSecurityDescriptorSacl(&sd, TRUE, pSacl, FALSE); - status = NtSetSecurityObject(handle, SecurityInfo, &sd); + switch (ObjectType) + { + case SE_SERVICE: + FIXME("stub: Service objects are not supported at this time.\n"); + status = STATUS_SUCCESS; /* Implement SetServiceObjectSecurity */ + break; + default: + status = NtSetSecurityObject(handle, SecurityInfo, &sd); + break; + } return RtlNtStatusToDosError(status); } diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index fc98880..9a952e1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2196,6 +2196,9 @@ BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, /****************************************************************************** * SetServiceObjectSecurity [ADVAPI32.@] + * + * NOTES + * - SetSecurityInfo should be updated to call this function once it's implemented. */ BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation,
1
0
0
0
Alexandre Julliard : server: Use the monotonic time counter also on the server side.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: a74dc1a1195b38e0e04798799229a3aab8a021ef URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a74dc1a1195b38e0e04798799…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 30 12:49:33 2013 +0100 server: Use the monotonic time counter also on the server side. --- server/Makefile.in | 6 +++--- server/request.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index a2f1a52..2e9bba1 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -1,5 +1,5 @@ DEFS = -D__WINESRC__ -EXTRALIBS = @LIBPOLL@ +EXTRALIBS = @LIBPOLL@ @LIBRT@ C_SRCS = \ async.c \ @@ -62,10 +62,10 @@ all: $(PROGRAMS) @MAKE_RULES@ wineserver: $(OBJS) - $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS) $(LDRPATH_LOCAL) + $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(EXTRALIBS) $(LIBS) $(LDRPATH_LOCAL) wineserver-installed: $(OBJS) - $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS) $(LDRPATH_INSTALL) + $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(EXTRALIBS) $(LIBS) $(LDRPATH_INSTALL) install install-lib:: wineserver-installed $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver diff --git a/server/request.c b/server/request.c index 8d6a7f9..eeb3476 100644 --- a/server/request.c +++ b/server/request.c @@ -51,6 +51,9 @@ #ifdef HAVE_POLL_H #include <poll.h> #endif +#ifdef __APPLE__ +# include <mach/mach_time.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -486,6 +489,20 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) /* get current tick count to return to client */ unsigned int get_tick_count(void) { +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) + return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; +#endif + if (!clock_gettime( CLOCK_MONOTONIC, &ts )) + return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; +#elif defined(__APPLE__) + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; +#endif return (current_time - server_start_time) / 10000; }
1
0
0
0
Piotr Caban : msvcrt: Use temporary buffers to speed up operations on stdout and stderr.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: a8df9b14ada72409625dead81936c7b2c0fcec64 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a8df9b14ada72409625dead81…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 29 13:21:27 2013 +0100 msvcrt: Use temporary buffers to speed up operations on stdout and stderr. --- dlls/msvcrt/file.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8e2a067..fc4154c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -595,6 +595,29 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) return TRUE; } +/* INTERNAL: Allocate temporary buffer for stdout and stderr */ +static BOOL add_std_buffer(MSVCRT_FILE *file) +{ + static char buffers[2][MSVCRT_BUFSIZ]; + + if((file->_file!=MSVCRT_STDOUT_FILENO && file->_file!=MSVCRT_STDERR_FILENO) + || !MSVCRT__isatty(file->_file) || file->_bufsiz) + return FALSE; + + file->_ptr = file->_base = buffers[file->_file == MSVCRT_STDOUT_FILENO ? 0 : 1]; + file->_bufsiz = file->_cnt = MSVCRT_BUFSIZ; + return TRUE; +} + +/* INTERNAL: Removes temporary buffer from stdout or stderr */ +/* Only call this function when add_std_buffer returned TRUE */ +static void remove_std_buffer(MSVCRT_FILE *file) +{ + msvcrt_flush_buffer(file); + file->_ptr = file->_base = NULL; + file->_bufsiz = file->_cnt = 0; +} + /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ static int msvcrt_int_to_base32(int num, char *str) { @@ -3911,6 +3934,7 @@ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) { MSVCRT_size_t i, len = strlenW(s); + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); @@ -3919,13 +3943,17 @@ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) MSVCRT__unlock_file(file); return ret; } + + tmp_buf = add_std_buffer(file); for (i=0; i<len; i++) { if(MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return MSVCRT_WEOF; } } + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return 0; } @@ -4271,10 +4299,13 @@ static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) */ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4285,12 +4316,15 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va */ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4301,10 +4335,13 @@ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list */ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4315,12 +4352,15 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms */ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4332,12 +4372,15 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { + BOOL tmp_buf; int ret; if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret;
1
0
0
0
Piotr Caban : msvcrt: Don' t make stdout and stderr bufferred when writing to console.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: 2ee5323a91025b914c6c3c5b0c6ec87cfeb6448b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2ee5323a91025b914c6c3c5b0…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 29 13:21:08 2013 +0100 msvcrt: Don't make stdout and stderr bufferred when writing to console. --- dlls/msvcrt/file.c | 67 ++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d9b0e19..8e2a067 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -560,20 +560,39 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) return 0; } +/********************************************************************* + * _isatty (MSVCRT.@) + */ +int CDECL MSVCRT__isatty(int fd) +{ + HANDLE hand = msvcrt_fdtoh(fd); + + TRACE(":fd (%d) handle (%p)\n",fd,hand); + if (hand == INVALID_HANDLE_VALUE) + return 0; + + return GetFileType(hand) == FILE_TYPE_CHAR? 1 : 0; +} + /* INTERNAL: Allocate stdio file buffer */ -static void msvcrt_alloc_buffer(MSVCRT_FILE* file) +static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) { - file->_base = MSVCRT_calloc(MSVCRT_BUFSIZ,1); - if(file->_base) { - file->_bufsiz = MSVCRT_BUFSIZ; - file->_flag |= MSVCRT__IOMYBUF; - } else { - file->_base = (char*)(&file->_charbuf); - /* put here 2 ??? */ - file->_bufsiz = sizeof(file->_charbuf); - } - file->_ptr = file->_base; - file->_cnt = 0; + if((file->_file==MSVCRT_STDOUT_FILENO || file->_file==MSVCRT_STDERR_FILENO) + && MSVCRT__isatty(file->_file)) + return FALSE; + + file->_base = MSVCRT_calloc(MSVCRT_BUFSIZ,1); + if(file->_base) { + file->_bufsiz = MSVCRT_BUFSIZ; + file->_flag |= MSVCRT__IOMYBUF; + } else { + file->_base = (char*)(&file->_charbuf); + /* put here 2 ??? */ + file->_bufsiz = sizeof(file->_charbuf); + } + file->_ptr = file->_base; + file->_cnt = 0; + return TRUE; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ @@ -1619,20 +1638,6 @@ MSVCRT_intptr_t CDECL MSVCRT__get_osfhandle(int fd) } /********************************************************************* - * _isatty (MSVCRT.@) - */ -int CDECL MSVCRT__isatty(int fd) -{ - HANDLE hand = msvcrt_fdtoh(fd); - - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return 0; - - return GetFileType(hand) == FILE_TYPE_CHAR? 1 : 0; -} - -/********************************************************************* * _mktemp (MSVCRT.@) */ char * CDECL MSVCRT__mktemp(char *pattern) @@ -3661,10 +3666,8 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm /* Fill the buffer on small reads. * TODO: Use a better buffering strategy. */ - if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF)) { - if (file->_bufsiz == 0) { - msvcrt_alloc_buffer(file); - } + if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF) + && (file->_bufsiz != 0 || msvcrt_alloc_buffer(file))) { file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; i = (file->_cnt<rcnt) ? file->_cnt : rcnt; @@ -4472,10 +4475,8 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) return MSVCRT_EOF; MSVCRT__lock_file(file); - if(file->_bufsiz == 0) { - msvcrt_alloc_buffer(file); + if(file->_bufsiz == 0 && msvcrt_alloc_buffer(file)) file->_ptr++; - } if(file->_ptr>file->_base) { file->_ptr--; *file->_ptr=c;
1
0
0
0
Jacek Caban : wininet: Get rid of WORKREQ* types.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: f824e20010a4bc23bd54a6489e1e64c6e5019a2b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f824e20010a4bc23bd54a6489…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:39:34 2013 +0100 wininet: Get rid of WORKREQ* types. --- dlls/wininet/ftp.c | 4 ++-- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 6 +++--- dlls/wininet/internet.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 152e336..f0a6257 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1248,9 +1248,9 @@ static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) sizeof(INTERNET_ASYNC_RESULT)); } -static void FTPFILE_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) +static void FTPFILE_AsyncQueryDataAvailableProc(task_header_t *task) { - ftp_file_t *file = (ftp_file_t*)workRequest->hdr; + ftp_file_t *file = (ftp_file_t*)task->hdr; FTP_ReceiveRequestData(file, FALSE); } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8d8ffec..d4c822d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2993,9 +2993,9 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s return res; } -static void AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) +static void AsyncQueryDataAvailableProc(task_header_t *task) { - http_request_t *req = (http_request_t*)workRequest->hdr; + http_request_t *req = (http_request_t*)task->hdr; HTTP_ReceiveRequestData(req, FALSE); } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dff24d9..384516c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3715,16 +3715,16 @@ void *alloc_async_task(object_header_t *hdr, async_task_proc_t proc, size_t size * RETURNS * */ -DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) +DWORD INTERNET_AsyncCall(task_header_t *task) { BOOL bSuccess; TRACE("\n"); - bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, lpWorkRequest, WT_EXECUTELONGFUNCTION); + bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, task, WT_EXECUTELONGFUNCTION); if (!bSuccess) { - heap_free(lpWorkRequest); + heap_free(task); return ERROR_INTERNET_ASYNC_THREAD_FAILED; } return ERROR_SUCCESS; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index bcb7fe6..6d08db1 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -354,14 +354,14 @@ typedef struct netconn_stream_t netconn_stream; } http_request_t; -typedef struct WORKREQ task_header_t; +typedef struct task_header_t task_header_t; typedef void (*async_task_proc_t)(task_header_t*); -typedef struct WORKREQ +struct task_header_t { async_task_proc_t proc; object_header_t *hdr; -} WORKREQUEST, *LPWORKREQUEST; +}; void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN; @@ -393,7 +393,7 @@ BOOL set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HI void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN; -DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) DECLSPEC_HIDDEN; +DWORD INTERNET_AsyncCall(task_header_t*) DECLSPEC_HIDDEN; LPSTR INTERNET_GetResponseBuffer(void) DECLSPEC_HIDDEN; LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) DECLSPEC_HIDDEN;
1
0
0
0
Jacek Caban : wininet: Moved WORKREQ_FTPDELETEFILEW out of WORKREQUEST.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: 302fd67e61dbfba205b0afd496667416fbde5b8a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=302fd67e61dbfba205b0afd49…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:39:23 2013 +0100 wininet: Moved WORKREQ_FTPDELETEFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 25 ++++++++++++++----------- dlls/wininet/internet.h | 10 ---------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f3764ed..152e336 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1786,15 +1786,20 @@ BOOL WINAPI FtpDeleteFileA(HINTERNET hFtpSession, LPCSTR lpszFileName) return ret; } -static void AsyncFtpDeleteFileProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WCHAR *file_name; +} delete_file_task_t; + +static void AsyncFtpDeleteFileProc(task_header_t *hdr) { - struct WORKREQ_FTPDELETEFILEW const *req = &workRequest->u.FtpDeleteFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + delete_file_task_t *task = (delete_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpDeleteFileW(lpwfs, req->lpszFilename); - heap_free(req->lpszFilename); + FTP_FtpDeleteFileW(session, task->file_name); + heap_free(task->file_name); } /*********************************************************************** @@ -1841,14 +1846,12 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName) hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPDELETEFILEW *req; + delete_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpDeleteFileProc, sizeof(*task)); - req = &task->u.FtpDeleteFileW; - req->lpszFilename = heap_strdupW(lpszFileName); + task->file_name = heap_strdupW(lpszFileName); - r = res_to_le(INTERNET_AsyncCall(task)); + r = res_to_le(INTERNET_AsyncCall(&task->hdr)); } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 82a15ae..bcb7fe6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -354,12 +354,6 @@ typedef struct netconn_stream_t netconn_stream; } http_request_t; - -struct WORKREQ_FTPDELETEFILEW -{ - LPWSTR lpszFilename; -}; - typedef struct WORKREQ task_header_t; typedef void (*async_task_proc_t)(task_header_t*); @@ -367,10 +361,6 @@ typedef struct WORKREQ { async_task_proc_t proc; object_header_t *hdr; - - union { - struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; - } u; } WORKREQUEST, *LPWORKREQUEST; void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN;
1
0
0
0
Jacek Caban : wininet: Moved WORKREQ_FTPFINDNEXTW out of WORKREQUEST.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: a489677fb55b7831a17dee27b77da4df8777d2ed URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a489677fb55b7831a17dee27b…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 12:56:44 2013 +0100 wininet: Moved WORKREQ_FTPFINDNEXTW out of WORKREQUEST. --- dlls/wininet/ftp.c | 22 ++++++++++++---------- dlls/wininet/internet.h | 6 ------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index d7c439b..f3764ed 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2138,7 +2138,7 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - rename_file_t *task; + rename_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpRenameFileProc, sizeof(*task)); task->src_file = heap_strdupW(lpszSrc); @@ -3430,11 +3430,16 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data return res; } -static void FTPFINDNEXT_AsyncFindNextFileProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WIN32_FIND_DATAW *find_data; +} find_next_task_t; + +static void FTPFINDNEXT_AsyncFindNextFileProc(task_header_t *hdr) { - struct WORKREQ_FTPFINDNEXTW *req = &workRequest->u.FtpFindNextW; + find_next_task_t *task = (find_next_task_t*)hdr; - FTPFINDNEXT_FindNextFileProc((WININETFTPFINDNEXTW*)workRequest->hdr, req->lpFindFileData); + FTPFINDNEXT_FindNextFileProc((WININETFTPFINDNEXTW*)task->hdr.hdr, task->find_data); } static DWORD FTPFINDNEXT_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) @@ -3460,15 +3465,12 @@ static DWORD FTPFINDNEXT_FindNextFileW(object_header_t *hdr, void *data) if (find->lpFtpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPFINDNEXTW *req; + find_next_task_t *task; task = alloc_async_task(&find->hdr, FTPFINDNEXT_AsyncFindNextFileProc, sizeof(*task)); - req = &task->u.FtpFindNextW; - req->lpFindFileData = data; - - INTERNET_AsyncCall(task); + task->find_data = data; + INTERNET_AsyncCall(&task->hdr); return ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 26dc286..82a15ae 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -360,11 +360,6 @@ struct WORKREQ_FTPDELETEFILEW LPWSTR lpszFilename; }; -struct WORKREQ_FTPFINDNEXTW -{ - LPWIN32_FIND_DATAW lpFindFileData; -}; - typedef struct WORKREQ task_header_t; typedef void (*async_task_proc_t)(task_header_t*); @@ -375,7 +370,6 @@ typedef struct WORKREQ union { struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; - struct WORKREQ_FTPFINDNEXTW FtpFindNextW; } u; } WORKREQUEST, *LPWORKREQUEST;
1
0
0
0
Jacek Caban : wininet: Moved WORKREQ_FTPRENAMEFILEW out of WORKREQUEST.
by Alexandre Julliard
30 Jan '13
30 Jan '13
Module: wine Branch: master Commit: d5c0b17ae7d952440d9c7cec3e4b4320e75c9fa1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d5c0b17ae7d952440d9c7cec3…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:38:59 2013 +0100 wininet: Moved WORKREQ_FTPRENAMEFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 30 +++++++++++++++++------------- dlls/wininet/internet.h | 7 ------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ba7d5c3..d7c439b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2076,16 +2076,22 @@ BOOL WINAPI FtpRenameFileA(HINTERNET hFtpSession, LPCSTR lpszSrc, LPCSTR lpszDes return ret; } -static void AsyncFtpRenameFileProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WCHAR *src_file; + WCHAR *dst_file; +} rename_file_task_t; + +static void AsyncFtpRenameFileProc(task_header_t *hdr) { - struct WORKREQ_FTPRENAMEFILEW const *req = &workRequest->u.FtpRenameFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + rename_file_task_t *task = (rename_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpRenameFileW(lpwfs, req->lpszSrcFile, req->lpszDestFile); - heap_free(req->lpszSrcFile); - heap_free(req->lpszDestFile); + FTP_FtpRenameFileW(session, task->src_file, task->dst_file); + heap_free(task->src_file); + heap_free(task->dst_file); } /*********************************************************************** @@ -2132,15 +2138,13 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPRENAMEFILEW *req; + rename_file_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpRenameFileProc, sizeof(*task)); - req = &task->u.FtpRenameFileW; - req->lpszSrcFile = heap_strdupW(lpszSrc); - req->lpszDestFile = heap_strdupW(lpszDest); + task->src_file = heap_strdupW(lpszSrc); + task->dst_file = heap_strdupW(lpszDest); - r = res_to_le(INTERNET_AsyncCall(task)); + r = res_to_le(INTERNET_AsyncCall(&task->hdr)); } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index efb6ef5..26dc286 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -360,12 +360,6 @@ struct WORKREQ_FTPDELETEFILEW LPWSTR lpszFilename; }; -struct WORKREQ_FTPRENAMEFILEW -{ - LPWSTR lpszSrcFile; - LPWSTR lpszDestFile; -}; - struct WORKREQ_FTPFINDNEXTW { LPWIN32_FIND_DATAW lpFindFileData; @@ -381,7 +375,6 @@ typedef struct WORKREQ union { struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; - struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW; } u; } WORKREQUEST, *LPWORKREQUEST;
1
0
0
0
← Newer
1
2
3
4
5
6
7
...
74
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
Results per page:
10
25
50
100
200