July 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Implement RtlActivateActivationContextEx().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: c71da19d24a5d6f01e65b3b3691a9d7dd17a2278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71da19d24a5d6f01e65b3b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:37:29 2020 +0200 ntdll: Implement RtlActivateActivationContextEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 13 +++++++++++-- dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f64cb31a1f..625cffcca8 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5156,16 +5156,25 @@ NTSTATUS WINAPI RtlZombifyActivationContext( HANDLE handle ) * RtlActivateActivationContext (NTDLL.@) */ NTSTATUS WINAPI RtlActivateActivationContext( ULONG unknown, HANDLE handle, PULONG_PTR cookie ) +{ + return RtlActivateActivationContextEx( 0, NtCurrentTeb(), handle, cookie ); +} + + +/****************************************************************** + * RtlActivateActivationContextEx (NTDLL.@) + */ +NTSTATUS WINAPI RtlActivateActivationContextEx( ULONG flags, TEB *teb, HANDLE handle, ULONG_PTR *cookie ) { RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; if (!(frame = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*frame) ))) return STATUS_NO_MEMORY; - frame->Previous = NtCurrentTeb()->ActivationContextStack.ActiveFrame; + frame->Previous = teb->ActivationContextStack.ActiveFrame; frame->ActivationContext = handle; frame->Flags = 0; - NtCurrentTeb()->ActivationContextStack.ActiveFrame = frame; + teb->ActivationContextStack.ActiveFrame = frame; RtlAddRefActivationContext( handle ); *cookie = (ULONG_PTR)frame; diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd41da37af..7e2b6dd12f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -446,7 +446,7 @@ @ stdcall RtlAcquireSRWLockExclusive(ptr) @ stdcall RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) -@ stub RtlActivateActivationContextEx +@ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) @ stub RtlActivateActivationContextUnsafeFast @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) diff --git a/include/winternl.h b/include/winternl.h index 10d109fede..b3fbb90fef 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2944,6 +2944,7 @@ NTSYSAPI BYTE WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK,BYTE); NTSYSAPI void WINAPI RtlAcquireSRWLockExclusive(RTL_SRWLOCK*); NTSYSAPI void WINAPI RtlAcquireSRWLockShared(RTL_SRWLOCK*); NTSYSAPI NTSTATUS WINAPI RtlActivateActivationContext(DWORD,HANDLE,ULONG_PTR*); +NTSYSAPI NTSTATUS WINAPI RtlActivateActivationContextEx(ULONG,TEB*,HANDLE,ULONG_PTR*); NTSYSAPI NTSTATUS WINAPI RtlAddAce(PACL,DWORD,DWORD,PACE_HEADER,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);

1 0

Alexandre Julliard : ntdll: Move the activation context initialization out of NtCreateThreadEx().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: fdb09f452376ead1fceeb04dc5407095467418c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb09f452376ead1fceeb04d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:38:10 2020 +0200 ntdll: Move the activation context initialization out of NtCreateThreadEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 31 +++++++++++++++++++++++++------ dlls/ntdll/unix/thread.c | 12 ------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 02dddfacb5..76e314841b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -190,26 +190,45 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, HANDLE *handle_ptr, CLIENT_ID *id ) { ULONG flags = suspended ? THREAD_CREATE_FLAGS_CREATE_SUSPENDED : 0; - HANDLE handle; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[2] ) / sizeof(ULONG_PTR)]; + PS_ATTRIBUTE_LIST *attr_list = (PS_ATTRIBUTE_LIST *)buffer; + HANDLE handle, actctx; + TEB *teb; + ULONG ret; NTSTATUS status; CLIENT_ID client_id; OBJECT_ATTRIBUTES attr; - PS_ATTRIBUTE_LIST attr_list = { sizeof(attr_list) }; - attr_list.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; - attr_list.Attributes[0].Size = sizeof(client_id); - attr_list.Attributes[0].ValuePtr = &client_id; + attr_list->TotalLength = sizeof(buffer); + attr_list->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr_list->Attributes[0].Size = sizeof(client_id); + attr_list->Attributes[0].ValuePtr = &client_id; + attr_list->Attributes[0].ReturnLength = NULL; + attr_list->Attributes[1].Attribute = PS_ATTRIBUTE_TEB_ADDRESS; + attr_list->Attributes[1].Size = sizeof(teb); + attr_list->Attributes[1].ValuePtr = &teb; + attr_list->Attributes[1].ReturnLength = NULL; InitializeObjectAttributes( &attr, NULL, 0, NULL, descr ); + RtlGetActiveActivationContext( &actctx ); + if (actctx) flags |= THREAD_CREATE_FLAGS_CREATE_SUSPENDED; + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, start, param, - flags, 0, stack_commit, stack_reserve, &attr_list ); + flags, 0, stack_commit, stack_reserve, attr_list ); if (!status) { + if (actctx) + { + ULONG_PTR cookie; + RtlActivateActivationContextEx( 0, teb, actctx, &cookie ); + if (!suspended) NtResumeThread( handle, &ret ); + } if (id) *id = client_id; if (handle_ptr) *handle_ptr = handle; else NtClose( handle ); } + if (actctx) RtlReleaseActivationContext( actctx ); return status; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 6c64eecf1f..3b451a2257 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -88,7 +88,6 @@ struct startup_info { PRTL_THREAD_START_ROUTINE entry; void *arg; - HANDLE actctx; }; /*********************************************************************** @@ -102,18 +101,12 @@ static void start_thread( TEB *teb ) struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; struct debug_info debug_info; BOOL suspend; - ULONG_PTR cookie; debug_info.str_pos = debug_info.out_pos = 0; thread_data->debug_info = &debug_info; thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); server_init_thread( info->entry, &suspend ); - if (info->actctx) - { - RtlActivateActivationContext( 0, info->actctx, &cookie ); - RtlReleaseActivationContext( info->actctx ); - } signal_start_thread( info->entry, info->arg, suspend, pRtlUserThreadStart, teb ); } @@ -164,7 +157,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT int request_pipe[2]; SIZE_T extra_stack = PTHREAD_STACK_MIN; CLIENT_ID client_id; - HANDLE actctx; TEB *teb; INITIAL_TEB stack; NTSTATUS status; @@ -230,8 +222,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT return status; } - RtlGetActiveActivationContext( &actctx ); - pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset ); if ((status = virtual_alloc_teb( &teb ))) goto done; @@ -249,7 +239,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT info = (struct startup_info *)(teb + 1); info->entry = start; info->arg = param; - info->actctx = actctx; teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; @@ -278,7 +267,6 @@ done: if (status) { NtClose( *handle ); - RtlReleaseActivationContext( actctx ); close( request_pipe[1] ); return status; }

1 0

Alexandre Julliard : ntdll: Use a pthread mutex for the CD-ROM cache section.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 992bdd77a05755ccbde22bf244a41ab3c50086db URL: https://source.winehq.org/git/wine.git/?a=commit;h=992bdd77a05755ccbde22bf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:43:56 2020 +0200 ntdll: Use a pthread mutex for the CD-ROM cache section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index b60a01df8f..0d8b624308 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -298,14 +298,7 @@ struct cdrom_cache { #define MAX_CACHE_ENTRIES 5 static struct cdrom_cache cdrom_cache[MAX_CACHE_ENTRIES]; -static RTL_CRITICAL_SECTION cache_section; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cache_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cache_section") } -}; -static RTL_CRITICAL_SECTION cache_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t cache_mutex = PTHREAD_MUTEX_INITIALIZER; /* Proposed media change function: not really needed at this time */ /* This is a 1 or 0 type of function */ @@ -566,9 +559,9 @@ static NTSTATUS CDROM_SyncCache(int dev, int fd) static void CDROM_ClearCacheEntry(int dev) { - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); cdrom_cache[dev].toc_good = 0; - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); } @@ -674,7 +667,7 @@ static NTSTATUS CDROM_Open(int fd, int* dev) if (fstat(fd, &st) == -1) return errno_to_status( errno ); - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); for (*dev = 0; *dev < MAX_CACHE_ENTRIES; (*dev)++) { if (empty == -1 && @@ -695,7 +688,7 @@ static NTSTATUS CDROM_Open(int fd, int* dev) cdrom_cache[*dev].inode = st.st_ino; } } - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); TRACE("%d, %d\n", *dev, fd); return ret; @@ -847,13 +840,13 @@ static NTSTATUS CDROM_ReadTOC(int dev, int fd, CDROM_TOC* toc) if (dev < 0 || dev >= MAX_CACHE_ENTRIES) return STATUS_INVALID_PARAMETER; - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); if (cdrom_cache[dev].toc_good || !(ret = CDROM_SyncCache(dev, fd))) { *toc = cdrom_cache[dev].toc; ret = STATUS_SUCCESS; } - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); return ret; } @@ -933,7 +926,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; data->CurrentPosition.Control = sc.cdsc_ctrl; @@ -958,7 +951,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA cdrom_cache[dev].CurrentPosition.Header = *hdr; /* Preserve header info */ data->CurrentPosition = cdrom_cache[dev].CurrentPosition; } - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); break; case IOCTL_CDROM_MEDIA_CATALOG: data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; @@ -1044,7 +1037,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; data->CurrentPosition.Control = sc.what.position.control; @@ -1066,7 +1059,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA cdrom_cache[dev].CurrentPosition.Header = *hdr; /* Preserve header info */ data->CurrentPosition = cdrom_cache[dev].CurrentPosition; } - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); break; case IOCTL_CDROM_MEDIA_CATALOG: data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; @@ -1255,7 +1248,7 @@ static NTSTATUS CDROM_SeekAudioMSF(int dev, int fd, const CDROM_SEEK_AUDIO_MSF* if (i <= toc.FirstTrack || i > toc.LastTrack+1) return STATUS_INVALID_PARAMETER; i--; - RtlEnterCriticalSection( &cache_section ); + pthread_mutex_lock( &cache_mutex ); cp = &cdrom_cache[dev].CurrentPosition; cp->FormatCode = IOCTL_CDROM_CURRENT_POSITION; cp->Control = toc.TrackData[i-toc.FirstTrack].Control; @@ -1269,7 +1262,7 @@ static NTSTATUS CDROM_SeekAudioMSF(int dev, int fd, const CDROM_SEEK_AUDIO_MSF* frame -= FRAME_OF_TOC(toc,i); cp->TrackRelativeAddress[0] = 0; MSF_OF_FRAME(cp->TrackRelativeAddress[1], frame); - RtlLeaveCriticalSection( &cache_section ); + pthread_mutex_unlock( &cache_mutex ); /* If playing, then issue a seek command, otherwise do nothing */ #ifdef linux

1 0

Alexandre Julliard : ntdll: Use a pthread mutex for the timezone section.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 99520e1997b92155b9e389513960b0bdacfab9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99520e1997b92155b9e38951… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:44:02 2020 +0200 ntdll: Use a pthread mutex for the timezone section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c3dca7ffe2..3557df6108 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1876,17 +1876,9 @@ static time_t find_dst_change(unsigned long min, unsigned long max, int *is_dst) return min; } -static RTL_CRITICAL_SECTION TIME_tz_section; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &TIME_tz_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": TIME_tz_section") } -}; -static RTL_CRITICAL_SECTION TIME_tz_section = { &critsect_debug, -1, 0, 0, 0, 0 }; - static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) { + static pthread_mutex_t tz_mutex = PTHREAD_MUTEX_INITIALIZER; static RTL_DYNAMIC_TIME_ZONE_INFORMATION cached_tzi; static int current_year = -1, current_bias = 65535; struct tm *tm; @@ -1894,7 +1886,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) time_t year_start, year_end, tmp, dlt = 0, std = 0; int is_dst, bias; - RtlEnterCriticalSection( &TIME_tz_section ); + pthread_mutex_lock( &tz_mutex ); year_start = time(NULL); tm = gmtime(&year_start); @@ -1904,7 +1896,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) if (current_year == tm->tm_year && current_bias == bias) { *tzi = cached_tzi; - RtlLeaveCriticalSection( &TIME_tz_section ); + pthread_mutex_unlock( &tz_mutex ); return; } @@ -1997,7 +1989,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) find_reg_tz_info(tzi, tz_name, current_year + 1900); cached_tzi = *tzi; - RtlLeaveCriticalSection( &TIME_tz_section ); + pthread_mutex_unlock( &tz_mutex ); }

1 0

Alexandre Julliard : ntdll: Use a pthread mutex for the mount info section.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 3b745f17b5553f88011a50a7b355f0eb3f5084b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b745f17b5553f88011a50a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:44:47 2020 +0200 ntdll: Use a pthread mutex for the mount info section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 3368d2105c..c5ffd0166d 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -249,6 +249,7 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION dir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t mnt_mutex = PTHREAD_MUTEX_INITIALIZER; /* check if a given Unicode char is OK in a DOS short name */ static inline BOOL is_invalid_dos_char( WCHAR ch ) @@ -567,7 +568,7 @@ static inline char *get_field( char **str ) * * getmntent replacement for Android. * - * NB returned static buffer is not thread safe; protect with dir_section. + * NB returned static buffer is not thread safe; protect with mnt_mutex. */ static struct mntent *getmntent_replacement( FILE *f ) { @@ -775,7 +776,7 @@ static char *get_default_drive_device( const char *root ) if (res == -1) res = stat( root, &st ); if (res == -1) return NULL; - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &mnt_mutex ); #ifdef __ANDROID__ if ((f = fopen( "/proc/mounts", "r" ))) @@ -801,7 +802,7 @@ static char *get_default_drive_device( const char *root ) ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(device) + 1 ); if (ret) strcpy( ret, device ); } - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &mnt_mutex ); #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) || defined(__DragonFly__) char *device = NULL; @@ -818,7 +819,7 @@ static char *get_default_drive_device( const char *root ) if (res == -1) res = stat( root, &st ); if (res == -1) return NULL; - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &mnt_mutex ); /* The FreeBSD parse_mount_entries doesn't require a file argument, so just * pass NULL. Leave the argument in for symmetry. @@ -829,7 +830,7 @@ static char *get_default_drive_device( const char *root ) ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(device) + 1 ); if (ret) strcpy( ret, device ); } - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &mnt_mutex ); #elif defined( sun ) FILE *f; @@ -847,7 +848,7 @@ static char *get_default_drive_device( const char *root ) if (res == -1) res = stat( root, &st ); if (res == -1) return NULL; - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &mnt_mutex ); if ((f = fopen( "/etc/mnttab", "r" ))) { @@ -865,7 +866,7 @@ static char *get_default_drive_device( const char *root ) ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(device) + 1 ); if (ret) strcpy( ret, device ); } - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &mnt_mutex ); #elif defined(__APPLE__) struct statfs *mntStat; @@ -883,7 +884,7 @@ static char *get_default_drive_device( const char *root ) dev = st.st_dev; ino = st.st_ino; - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &mnt_mutex ); mntSize = getmntinfo(&mntStat, MNT_NOWAIT); @@ -904,7 +905,7 @@ static char *get_default_drive_device( const char *root ) } } } - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &mnt_mutex ); #else static int warned; if (!warned++) FIXME( "auto detection of DOS devices not supported on this platform\n" ); @@ -925,7 +926,7 @@ static char *get_device_mount_point( dev_t dev ) #ifdef linux FILE *f; - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &mnt_mutex ); #ifdef __ANDROID__ if ((f = fopen( "/proc/mounts", "r" ))) @@ -973,13 +974,13 @@ static char *get_device_mount_point( dev_t dev ) } fclose( f ); } - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &mnt_mutex ); #elif defined(__APPLE__) struct statfs *entry; struct stat st; int i, size; - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &mnt_mutex ); size = getmntinfo( &entry, MNT_NOWAIT ); for (i = 0; i < size; i++) @@ -992,7 +993,7 @@ static char *get_device_mount_point( dev_t dev ) break; } } - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &mnt_mutex ); #else static int warned; if (!warned++) FIXME( "unmounting devices not supported on this platform\n" );

1 0

Alexandre Julliard : ntdll: Use a pthread mutex for the drive info section.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: d7ef680e950431d868e6d52418513472af7edbb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ef680e950431d868e6d524… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:45:04 2020 +0200 ntdll: Use a pthread mutex for the drive info section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c5ffd0166d..c90fac156a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1871,13 +1871,14 @@ static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void * /* retrieve device/inode number for all the drives */ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) { + static pthread_mutex_t cache_mutex = PTHREAD_MUTEX_INITIALIZER; static struct file_identity cache[MAX_DOS_DRIVES]; static time_t last_update; static unsigned int nb_drives; unsigned int ret; time_t now = time(NULL); - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &cache_mutex ); if (now != last_update) { char *buffer, *p; @@ -1912,7 +1913,7 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) } memcpy( info, cache, sizeof(cache) ); ret = nb_drives; - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &cache_mutex ); return ret; }

1 0

Alexandre Julliard : ntdll: Use a pthread mutex for the current directory section.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 85db4f7ec28a5d68fecba624f518dc1d2a07e359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85db4f7ec28a5d68fecba624… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:45:15 2020 +0200 ntdll: Use a pthread mutex for the current directory section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c90fac156a..085052225d 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -240,15 +240,7 @@ static const BOOL is_case_sensitive = FALSE; static struct file_identity windir; -static RTL_CRITICAL_SECTION dir_section; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &dir_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": dir_section") } -}; -static RTL_CRITICAL_SECTION dir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; - +static pthread_mutex_t dir_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t mnt_mutex = PTHREAD_MUTEX_INITIALIZER; /* check if a given Unicode char is OK in a DOS short name */ @@ -2473,7 +2465,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTI io->Information = 0; - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &dir_mutex ); cwd = open( ".", O_RDONLY ); if (fchdir( fd ) != -1) @@ -2500,7 +2492,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTI } else status = STATUS_ACCESS_DENIED; - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &dir_mutex ); if (needs_close) close( fd ); if (cwd != -1) close( cwd ); @@ -3064,7 +3056,7 @@ static NTSTATUS file_id_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char * goto done; } - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &dir_mutex ); if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) { /* shortcut for ".." */ @@ -3085,7 +3077,7 @@ static NTSTATUS file_id_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char * if (fchdir( old_cwd ) == -1) chdir( "/" ); } else status = STATUS_ACCESS_DENIED; - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &dir_mutex ); if (old_cwd != -1) close( old_cwd ); done: @@ -3258,7 +3250,7 @@ static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char * } else { - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &dir_mutex ); if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) { status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, @@ -3266,7 +3258,7 @@ static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char * if (fchdir( old_cwd ) == -1) chdir( "/" ); } else status = STATUS_ACCESS_DENIED; - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &dir_mutex ); if (old_cwd != -1) close( old_cwd ); if (needs_close) close( root_fd ); }

1 0

Alexandre Julliard : ntdll: Use a pthread mutex for the wait on address section.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 052e8dbf5985ffa5875067491b03a523257752f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=052e8dbf5985ffa587506749… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:48:21 2020 +0200 ntdll: Use a pthread mutex for the wait on address section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 8 ++++---- dlls/ntdll/unix/sync.c | 25 +++++++++---------------- dlls/ntdll/unix/unix_private.h | 2 +- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 9a593f7725..faca7da5c9 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -590,7 +590,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, CONTEXT *context, RTL_CRITICAL_SECTION *cs, + timeout_t abs_timeout, CONTEXT *context, pthread_mutex_t *mutex, user_apc_t *user_apc ) { unsigned int ret; @@ -649,10 +649,10 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT size = offsetof( select_op_t, signal_and_wait.signal ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); - if (cs) + if (mutex) { - RtlLeaveCriticalSection( cs ); - cs = NULL; + pthread_mutex_unlock( mutex ); + mutex = NULL; } if (ret != STATUS_PENDING) break; diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 5080caef52..69263efa0e 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -78,15 +78,7 @@ HANDLE keyed_event = 0; static const LARGE_INTEGER zero_timeout; -static RTL_CRITICAL_SECTION addr_section; -static RTL_CRITICAL_SECTION_DEBUG addr_section_debug = -{ - 0, 0, &addr_section, - { &addr_section_debug.ProcessLocksList, &addr_section_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": addr_section") } -}; -static RTL_CRITICAL_SECTION addr_section = { &addr_section_debug, -1, 0, 0, 0, 0 }; - +static pthread_mutex_t addr_mutex = PTHREAD_MUTEX_INITIALIZER; /* return a monotonic time counter, in Win32 ticks */ static inline ULONGLONG monotonic_counter(void) @@ -2253,10 +2245,10 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size if ((ret = fast_wait_addr( addr, cmp, size, timeout )) != STATUS_NOT_IMPLEMENTED) return ret; - RtlEnterCriticalSection( &addr_section ); + pthread_mutex_lock( &addr_mutex ); if (!compare_addr( addr, cmp, size )) { - RtlLeaveCriticalSection( &addr_section ); + pthread_mutex_unlock( &addr_mutex ); return STATUS_SUCCESS; } @@ -2272,7 +2264,8 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); select_op.keyed_event.key = wine_server_client_ptr( addr ); - return server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, &addr_section, NULL ); + return server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, + abs_timeout, NULL, &addr_mutex, NULL ); } /*********************************************************************** @@ -2282,9 +2275,9 @@ void WINAPI RtlWakeAddressAll( const void *addr ) { if (fast_wake_addr( addr ) != STATUS_NOT_IMPLEMENTED) return; - RtlEnterCriticalSection( &addr_section ); + pthread_mutex_lock( &addr_mutex ); while (NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ) == STATUS_SUCCESS) {} - RtlLeaveCriticalSection( &addr_section ); + pthread_mutex_unlock( &addr_mutex ); } /*********************************************************************** @@ -2294,7 +2287,7 @@ void WINAPI RtlWakeAddressSingle( const void *addr ) { if (fast_wake_addr( addr ) != STATUS_NOT_IMPLEMENTED) return; - RtlEnterCriticalSection( &addr_section ); + pthread_mutex_lock( &addr_mutex ); NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ); - RtlLeaveCriticalSection( &addr_section ); + pthread_mutex_unlock( &addr_mutex ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 2a73f17e10..3d56ea5d40 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -162,7 +162,7 @@ extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, CONTEXT *context, RTL_CRITICAL_SECTION *cs, + timeout_t abs_timeout, CONTEXT *context, pthread_mutex_t *mutex, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;

1 0

Ziqing Hui : windowscodecs: Remove header and header_dxt10 in struct DdsDecoder.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 43788707ce33235ae216407027c72ffdd275479b URL: https://source.winehq.org/git/wine.git/?a=commit;h=43788707ce33235ae2164070… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jul 10 17:08:18 2020 +0800 windowscodecs: Remove header and header_dxt10 in struct DdsDecoder. This make dds_info become the only dependence of implementation. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 43fb87dfb1..7a28b82e3d 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -103,6 +103,7 @@ typedef struct dds_info { UINT mip_levels; UINT array_size; UINT frame_count; + UINT data_offset; DXGI_FORMAT format; WICDdsDimension dimension; WICDdsAlphaMode alpha_mode; @@ -128,8 +129,6 @@ typedef struct DdsDecoder { BOOL initialized; IStream *stream; CRITICAL_SECTION lock; - DDS_HEADER header; - DDS_HEADER_DXT10 header_dxt10; dds_info info; } DdsDecoder; @@ -226,10 +225,12 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->format = header_dxt10->dxgiFormat; info->dimension = get_dimension(NULL, header_dxt10); info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; + info->data_offset = sizeof(DWORD) + sizeof(*header) + sizeof(*header_dxt10); } else { info->format = get_format_from_fourcc(header->ddspf.fourCC); info->dimension = get_dimension(header, NULL); info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); + info->data_offset = sizeof(DWORD) + sizeof(*header); } info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; @@ -614,6 +615,8 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p WICDecodeOptions cacheOptions) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + DDS_HEADER_DXT10 header_dxt10; + DDS_HEADER header; HRESULT hr; LARGE_INTEGER seek; DWORD magic; @@ -643,27 +646,27 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } - hr = IStream_Read(pIStream, &This->header, sizeof(This->header), &bytesread); + hr = IStream_Read(pIStream, &header, sizeof(header), &bytesread); if (FAILED(hr)) goto end; - if (bytesread != sizeof(This->header)) { + if (bytesread != sizeof(header)) { hr = WINCODEC_ERR_STREAMREAD; goto end; } - if (This->header.size != sizeof(This->header)) { + if (header.size != sizeof(header)) { hr = WINCODEC_ERR_BADHEADER; goto end; } - if (has_extended_header(&This->header)) { - hr = IStream_Read(pIStream, &This->header_dxt10, sizeof(This->header_dxt10), &bytesread); + if (has_extended_header(&header)) { + hr = IStream_Read(pIStream, &header_dxt10, sizeof(header_dxt10), &bytesread); if (FAILED(hr)) goto end; - if (bytesread != sizeof(This->header_dxt10)) { + if (bytesread != sizeof(header_dxt10)) { hr = WINCODEC_ERR_STREAMREAD; goto end; } } - get_dds_info(&This->info, &This->header, &This->header_dxt10); + get_dds_info(&This->info, &header, &header_dxt10); This->initialized = TRUE; This->stream = pIStream; @@ -888,8 +891,7 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, } bytes_per_block = get_bytes_per_block(This->info.format); - seek.QuadPart = sizeof(DWORD) + sizeof(DDS_HEADER); - if (has_extended_header(&This->header)) seek.QuadPart += sizeof(DDS_HEADER_DXT10); + seek.QuadPart = This->info.data_offset; width = This->info.width; height = This->info.height;

1 0

Ziqing Hui : windowscodecs: Add IWICWineDecoder stub for DDS decoder.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: d7ef1cd82c8892c530d375e59dbf6e1e4cd3e3c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ef1cd82c8892c530d375e5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jul 10 17:08:49 2020 +0800 windowscodecs: Add IWICWineDecoder stub for DDS decoder. Initializing cube map and uncompressed DDS is not supported in WIC. But we would like to use them in other part of wine. So we introduce a Wine-specific interface to initialize them. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 10 ++++++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 7a28b82e3d..295b935a26 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -125,6 +125,7 @@ typedef struct dds_frame_info { typedef struct DdsDecoder { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICDdsDecoder IWICDdsDecoder_iface; + IWICWineDecoder IWICWineDecoder_iface; LONG ref; BOOL initialized; IStream *stream; @@ -281,6 +282,11 @@ static inline DdsDecoder *impl_from_IWICDdsDecoder(IWICDdsDecoder *iface) return CONTAINING_RECORD(iface, DdsDecoder, IWICDdsDecoder_iface); } +static inline DdsDecoder *impl_from_IWICWineDecoder(IWICWineDecoder *iface) +{ + return CONTAINING_RECORD(iface, DdsDecoder, IWICWineDecoder_iface); +} + static inline DdsFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) { return CONTAINING_RECORD(iface, DdsFrameDecode, IWICBitmapFrameDecode_iface); @@ -566,6 +572,8 @@ static HRESULT WINAPI DdsDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID *ppv = &This->IWICBitmapDecoder_iface; } else if (IsEqualIID(&IID_IWICDdsDecoder, iid)) { *ppv = &This->IWICDdsDecoder_iface; + } else if (IsEqualIID(&IID_IWICWineDecoder, iid)) { + *ppv = &This->IWICWineDecoder_iface; } else { *ppv = NULL; return E_NOINTERFACE; @@ -959,6 +967,37 @@ static const IWICDdsDecoderVtbl DdsDecoder_Dds_Vtbl = { DdsDecoder_Dds_GetFrame }; +static HRESULT WINAPI DdsDecoder_Wine_QueryInterface(IWICWineDecoder *iface, REFIID iid, void **ppv) +{ + DdsDecoder *This = impl_from_IWICWineDecoder(iface); + return DdsDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); +} + +static ULONG WINAPI DdsDecoder_Wine_AddRef(IWICWineDecoder *iface) +{ + DdsDecoder *This = impl_from_IWICWineDecoder(iface); + return DdsDecoder_AddRef(&This->IWICBitmapDecoder_iface); +} + +static ULONG WINAPI DdsDecoder_Wine_Release(IWICWineDecoder *iface) +{ + DdsDecoder *This = impl_from_IWICWineDecoder(iface); + return DdsDecoder_Release(&This->IWICBitmapDecoder_iface); +} + +static HRESULT WINAPI DdsDecoder_Wine_Initialize(IWICWineDecoder *iface, IStream *stream, WICDecodeOptions options) +{ + FIXME("(This %p, stream %p, options %#x)\n", iface, stream, options); + return E_NOTIMPL; +} + +static const IWICWineDecoderVtbl DdsDecoder_Wine_Vtbl = { + DdsDecoder_Wine_QueryInterface, + DdsDecoder_Wine_AddRef, + DdsDecoder_Wine_Release, + DdsDecoder_Wine_Initialize +}; + HRESULT DdsDecoder_CreateInstance(REFIID iid, void** ppv) { DdsDecoder *This; @@ -973,6 +1012,7 @@ HRESULT DdsDecoder_CreateInstance(REFIID iid, void** ppv) This->IWICBitmapDecoder_iface.lpVtbl = &DdsDecoder_Vtbl; This->IWICDdsDecoder_iface.lpVtbl = &DdsDecoder_Dds_Vtbl; + This->IWICWineDecoder_iface.lpVtbl = &DdsDecoder_Wine_Vtbl; This->ref = 1; This->initialized = FALSE; This->stream = NULL; diff --git a/include/wincodec.idl b/include/wincodec.idl index e64d9ed3f1..88e183d579 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -1216,6 +1216,16 @@ interface IWICDdsFrameDecode : IUnknown [out, size_is(bufferSize)] BYTE *buffer); }; +[ + object, + uuid(b9bd430d-28a8-41d3-a1f5-f36ee02840bf) +] +interface IWICWineDecoder : IUnknown +{ + HRESULT Initialize( + [in] IStream *stream, + [in] WICDecodeOptions options); +}; cpp_quote("HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst);") cpp_quote("HRESULT WINAPI WICCreateBitmapFromSection(UINT width, UINT height, REFWICPixelFormatGUID format, HANDLE section, UINT stride, UINT offset, IWICBitmap **bitmap);")

1 0