June 2023 - Wine-Commits - list.winehq.org

Alex Henrie : wbemprox: Fix memory leak on error path in create_view (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: ea58ec849ff270feee0577d2c4ffd593f3eea25c URL: https://gitlab.winehq.org/wine/wine/-/commit/ea58ec849ff270feee0577d2c4ffd5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 23:19:33 2023 -0600 wbemprox: Fix memory leak on error path in create_view (scan-build). --- dlls/wbemprox/query.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1b79523d66f..1087e271837 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -62,7 +62,11 @@ HRESULT create_view( enum view_type type, enum wbm_namespace ns, const WCHAR *pa free( view ); return hr; } - else if (!table && ns == WBEMPROX_NAMESPACE_LAST) return WBEM_E_INVALID_CLASS; + else if (!table && ns == WBEMPROX_NAMESPACE_LAST) + { + free( view ); + return WBEM_E_INVALID_CLASS; + } view->proplist = proplist; view->cond = cond; break;

1 0

Alex Henrie : msi: Fix memory leak in ready_media (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: c39f785b34692ee994b2449cc17a96815517e9bf URL: https://gitlab.winehq.org/wine/wine/-/commit/c39f785b34692ee994b2449cc17a96… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 23:00:19 2023 -0600 msi: Fix memory leak in ready_media (scan-build). base_url was never freed, and can simply be enlarged instead of copying it to a new buffer. --- dlls/msi/media.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 513e04b1b7e..50673f99cae 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -855,11 +855,11 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) WCHAR temppath[MAX_PATH], *p, *url; free( cabinet_file ); - if (!(url = malloc( (wcslen( base_url ) + wcslen( mi->cabinet ) + 1) * sizeof(WCHAR) ))) + if (!(url = realloc( base_url, (wcslen( base_url ) + wcslen( mi->cabinet ) + 1) * sizeof(WCHAR) ))) { + free( base_url ); return ERROR_OUTOFMEMORY; } - lstrcpyW( url, base_url ); lstrcatW( url, mi->cabinet ); if ((rc = msi_download_file( url, temppath )) != ERROR_SUCCESS) {

1 0

Alex Henrie : mscms: Fix double free on error path in EnumColorProfilesA (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: abfc151e0b1e0a8361514a71d8d288fbd5160673 URL: https://gitlab.winehq.org/wine/wine/-/commit/abfc151e0b1e0a8361514a71d8d288… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 21:59:31 2023 -0600 mscms: Fix double free on error path in EnumColorProfilesA (scan-build). If fileW is not null, it is freed at the end of the function. --- dlls/mscms/profile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 9c4b6be8342..5ecd5f83273 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -810,6 +810,7 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, if (!(ret = header_from_file( fileW, &header ))) { free( fileW ); + fileW = NULL; continue; }

1 0

Alex Henrie : wusa: Fix double free on error path in read_update_package (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 935626b48809b26ab4a215992bf5169af0a28153 URL: https://gitlab.winehq.org/wine/wine/-/commit/935626b48809b26ab4a215992bf516… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 21:57:49 2023 -0600 wusa: Fix double free on error path in read_update_package (scan-build). If read_identity returns FALSE, it has already called clear_identity. --- programs/wusa/manifest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index 620da4fc63b..83d4125133f 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -587,7 +587,7 @@ static BOOL read_update_package(IXMLDOMElement *child, WCHAR *tagname, void *con list_add_tail(update_list, &entry->entry); return TRUE; } - free_dependency(entry); + free(entry); } return FALSE;

1 0

Alex Henrie : msi: Return ERROR_OUTOFMEMORY if calloc fails in TransformView_Create (scan-build).
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: daa20d9d636057d7009ff3652a8577b423d23fcf URL: https://gitlab.winehq.org/wine/wine/-/commit/daa20d9d636057d7009ff3652a8577… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 22:15:35 2023 -0600 msi: Return ERROR_OUTOFMEMORY if calloc fails in TransformView_Create (scan-build). Instead of ERROR_SUCCESS. --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index f65250766a4..e83c076ab23 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2856,7 +2856,7 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV MSI_ViewClose( q ); msiobj_release( &q->hdr ); free( tv ); - return r; + return ERROR_OUTOFMEMORY; } while (MSI_ViewFetch( q, &rec ) == ERROR_SUCCESS)

1 0

Piotr Caban : msvcr100: Use Context blocking functions in critical_section class.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 7e060adfccb8789d5b9b25792e2de9395fb60012 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e060adfccb8789d5b9b25792e2de9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 3 19:42:06 2023 +0200 msvcr100: Use Context blocking functions in critical_section class. --- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcrt/concurrency.c | 65 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index cfeb03fa235..5b77a8164e8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -47,7 +47,7 @@ typedef struct cs_queue { void *ctx; struct cs_queue *next; - BOOL free; + LONG status; int unknown; } cs_queue; diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 598444f3a53..d41832f6763 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -214,12 +214,14 @@ struct scheduled_chore { }; /* keep in sync with msvcp90/msvcp90.h */ +#define CS_UNLOCK 1 +#define CS_TIMEOUT 2 typedef struct cs_queue { Context *ctx; struct cs_queue *next; #if _MSVCR_VER >= 110 - LONG free; + LONG status; int unknown; #endif } cs_queue; @@ -2417,14 +2419,6 @@ critical_section* __thiscall critical_section_ctor(critical_section *this) { TRACE("(%p)\n", this); - if(!keyed_event) { - HANDLE event; - - NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); - if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) - NtClose(event); - } - this->unk_active.ctx = NULL; this->head = this->tail = NULL; return this; @@ -2474,10 +2468,11 @@ static inline void cs_lock(critical_section *cs, cs_queue *q) } memset(q, 0, sizeof(*q)); + q->ctx = get_current_context(); last = InterlockedExchangePointer(&cs->tail, q); if(last) { last->next = q; - NtWaitForKeyedEvent(keyed_event, q, 0, NULL); + call_Context_Block(q->ctx); } cs_set_head(cs, q); @@ -2539,7 +2534,7 @@ void __thiscall critical_section_unlock(critical_section *this) while(1) { cs_queue *next; - if(!InterlockedExchange(&this->unk_active.next->free, TRUE)) + if(!InterlockedCompareExchange(&this->unk_active.next->status, CS_UNLOCK, 0)) break; next = this->unk_active.next; @@ -2554,7 +2549,7 @@ void __thiscall critical_section_unlock(critical_section *this) } #endif - NtReleaseKeyedEvent(keyed_event, this->unk_active.next, 0, NULL); + call_Context_Unblock(this->unk_active.next->ctx); } /* ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ */ @@ -2567,17 +2562,26 @@ critical_section* __thiscall critical_section_native_handle(critical_section *th } #if _MSVCR_VER >= 110 +static void WINAPI timeout_unlock(TP_CALLBACK_INSTANCE *instance, void *ctx, TP_TIMER *timer) +{ + cs_queue *q = ctx; + + if(!InterlockedCompareExchange(&q->status, CS_TIMEOUT, 0)) + call_Context_Unblock(q->ctx); +} + /* ?try_lock_for(a)critical_section@Concurrency@@QAE_NI(a)Z */ /* ?try_lock_for(a)critical_section@Concurrency@@QEAA_NI(a)Z */ DEFINE_THISCALL_WRAPPER(critical_section_try_lock_for, 8) bool __thiscall critical_section_try_lock_for( critical_section *this, unsigned int timeout) { + Context *ctx = get_current_context(); cs_queue *q, *last; TRACE("(%p %d)\n", this, timeout); - if(this->unk_active.ctx == get_current_context()) { + if(this->unk_active.ctx == ctx) { improper_lock e; improper_lock_ctor_str(&e, "Already locked"); _CxxThrowException(&e, &improper_lock_exception_type); @@ -2585,25 +2589,36 @@ bool __thiscall critical_section_try_lock_for( if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q)))) return critical_section_try_lock(this); + q->ctx = ctx; last = InterlockedExchangePointer(&this->tail, q); if(last) { + TP_TIMER *tp_timer; LARGE_INTEGER to; - NTSTATUS status; FILETIME ft; last->next = q; GetSystemTimeAsFileTime(&ft); to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; - status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); - if(status == STATUS_TIMEOUT) { - if(!InterlockedExchange(&q->free, TRUE)) - return FALSE; - /* A thread has signaled the event and is block waiting. */ - /* We need to catch the event to wake the thread. */ - NtWaitForKeyedEvent(keyed_event, q, 0, NULL); + ft.dwHighDateTime = to.QuadPart >> 32; + ft.dwLowDateTime = to.QuadPart; + + tp_timer = CreateThreadpoolTimer(timeout_unlock, q, NULL); + if(!tp_timer) { + FIXME("throw exception?\n"); + return FALSE; } + SetThreadpoolTimer(tp_timer, &ft, 0, 0); + + call_Context_Block(q->ctx); + + SetThreadpoolTimer(tp_timer, NULL, 0, 0); + WaitForThreadpoolTimerCallbacks(tp_timer, TRUE); + CloseThreadpoolTimer(tp_timer); + + if(q->status == CS_TIMEOUT) + return FALSE; } cs_set_head(this, q); @@ -2863,6 +2878,14 @@ event* __thiscall event_ctor(event *this) { TRACE("(%p)\n", this); + if(!keyed_event) { + HANDLE event; + + NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); + if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) + NtClose(event); + } + this->waiters = NULL; this->signaled = FALSE; critical_section_ctor(&this->cs);

1 0

Piotr Caban : msvcr100: Use Context to store critical_section owner.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 51388af06fc6a6fbd9ee78a762aa2b15924d00cb URL: https://gitlab.winehq.org/wine/wine/-/commit/51388af06fc6a6fbd9ee78a762aa2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 31 22:17:52 2023 +0200 msvcr100: Use Context to store critical_section owner. --- dlls/msvcp140/tests/msvcp140.c | 2 +- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcr120/tests/msvcr120.c | 2 +- dlls/msvcrt/concurrency.c | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 640e44e5b7c..6affa2f9c29 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -150,6 +150,7 @@ typedef struct typedef struct cs_queue { + void *ctx; struct cs_queue *next; BOOL free; int unknown; @@ -157,7 +158,6 @@ typedef struct cs_queue typedef struct { - ULONG_PTR unk_thread_id; cs_queue unk_active; void *unknown[2]; cs_queue *head; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b996ae84a46..cfeb03fa235 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -45,6 +45,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); /* keep in sync with msvcrt/lock.c */ typedef struct cs_queue { + void *ctx; struct cs_queue *next; BOOL free; int unknown; @@ -52,7 +53,6 @@ typedef struct cs_queue typedef struct { - ULONG_PTR unk_thread_id; cs_queue unk_active; void *unknown[2]; cs_queue *head; diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index fd8e42fd35d..e5a5ff0435d 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -90,6 +90,7 @@ typedef unsigned char MSVCRT_bool; typedef struct cs_queue { + void *ctx; struct cs_queue *next; BOOL free; int unknown; @@ -97,7 +98,6 @@ typedef struct cs_queue typedef struct { - ULONG_PTR unk_thread_id; cs_queue unk_active; void *unknown[2]; cs_queue *head; diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 84ee0f1817a..598444f3a53 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -216,6 +216,7 @@ struct scheduled_chore { /* keep in sync with msvcp90/msvcp90.h */ typedef struct cs_queue { + Context *ctx; struct cs_queue *next; #if _MSVCR_VER >= 110 LONG free; @@ -225,7 +226,6 @@ typedef struct cs_queue typedef struct { - ULONG_PTR unk_thread_id; cs_queue unk_active; #if _MSVCR_VER >= 110 void *unknown[2]; @@ -2425,7 +2425,7 @@ critical_section* __thiscall critical_section_ctor(critical_section *this) NtClose(event); } - this->unk_thread_id = 0; + this->unk_active.ctx = NULL; this->head = this->tail = NULL; return this; } @@ -2458,7 +2458,7 @@ static inline void spin_wait_for_next_cs(cs_queue *q) static inline void cs_set_head(critical_section *cs, cs_queue *q) { - cs->unk_thread_id = GetCurrentThreadId(); + cs->unk_active.ctx = get_current_context(); cs->unk_active.next = q->next; cs->head = &cs->unk_active; } @@ -2467,7 +2467,7 @@ static inline void cs_lock(critical_section *cs, cs_queue *q) { cs_queue *last; - if(cs->unk_thread_id == GetCurrentThreadId()) { + if(cs->unk_active.ctx == get_current_context()) { improper_lock e; improper_lock_ctor_str(&e, "Already locked"); _CxxThrowException(&e, &improper_lock_exception_type); @@ -2507,7 +2507,7 @@ bool __thiscall critical_section_try_lock(critical_section *this) TRACE("(%p)\n", this); - if(this->unk_thread_id == GetCurrentThreadId()) + if(this->unk_active.ctx == get_current_context()) return FALSE; memset(&q, 0, sizeof(q)); @@ -2529,7 +2529,7 @@ void __thiscall critical_section_unlock(critical_section *this) { TRACE("(%p)\n", this); - this->unk_thread_id = 0; + this->unk_active.ctx = NULL; this->head = NULL; if(InterlockedCompareExchangePointer(&this->tail, NULL, &this->unk_active) == &this->unk_active) return; @@ -2577,7 +2577,7 @@ bool __thiscall critical_section_try_lock_for( TRACE("(%p %d)\n", this, timeout); - if(this->unk_thread_id == GetCurrentThreadId()) { + if(this->unk_active.ctx == get_current_context()) { improper_lock e; improper_lock_ctor_str(&e, "Already locked"); _CxxThrowException(&e, &improper_lock_exception_type);

1 0

Rémi Bernon : kernelbase: Comment out DECLSPEC_HOTPATCH for ConvertThreadToFiber.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 6e2381425332bade9e298a6c8b41cc06b8f5fc49 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e2381425332bade9e298a6c8b41cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 2 21:45:34 2023 +0200 kernelbase: Comment out DECLSPEC_HOTPATCH for ConvertThreadToFiber. --- dlls/kernelbase/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f6eb6b0e51e..721d61f60f5 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1035,7 +1035,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ConvertFiberToThread(void) /*********************************************************************** * ConvertThreadToFiber (kernelbase.@) */ -LPVOID WINAPI DECLSPEC_HOTPATCH ConvertThreadToFiber( LPVOID param ) +LPVOID WINAPI /* DECLSPEC_HOTPATCH */ ConvertThreadToFiber( LPVOID param ) { return ConvertThreadToFiberEx( param, 0 ); }

1 0

Zebediah Figura : ntdll: Simplify critical section timeout logic.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: ead421b744fd311be9b0c3e7c388e89fe377773f URL: https://gitlab.winehq.org/wine/wine/-/commit/ead421b744fd311be9b0c3e7c388e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 25 17:30:13 2023 -0500 ntdll: Simplify critical section timeout logic. Make it more consistent, as well. Currently we alternate between 5 seconds and 60; instead just make it a consistent 60 after the first wait. When +relay is on, always wait for 300 seconds, instead of alternating between 60 and 300. --- dlls/ntdll/sync.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 9e4aa38ff2b..fa64917029a 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -299,6 +299,8 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) */ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { + unsigned int timeout = 5; + /* Don't allow blocking on a critical section during process termination */ if (RtlDllShutdownInProgress()) { @@ -309,24 +311,14 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) for (;;) { - NTSTATUS status = wait_semaphore( crit, 5 ); + NTSTATUS status = wait_semaphore( crit, timeout ); - if ( status == STATUS_TIMEOUT ) - { - const char *name = crit_section_get_name( crit ); + if (status == STATUS_WAIT_0) break; - ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n", - crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = wait_semaphore( crit, 60 ); + timeout = (TRACE_ON(relay) ? 300 : 60); - if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) - { - ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n", - crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = wait_semaphore( crit, 300 ); - } - } - if (status == STATUS_WAIT_0) break; + ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (%u sec)\n", + crit, debugstr_a(crit_section_get_name(crit)), GetCurrentThreadId(), HandleToULong(crit->OwningThread), timeout ); } if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS;

1 0

Zebediah Figura : wow32: Use spec file imports.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 47c8dcc96a68c29e54885d4a0b464f665fc766b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/47c8dcc96a68c29e54885d4a0b464f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 30 23:21:43 2023 -0500 wow32: Use spec file imports. --- dlls/wow32/Makefile.in | 2 - dlls/wow32/wow32.spec | 34 +++++----- dlls/wow32/wow_main.c | 180 ------------------------------------------------- 3 files changed, 17 insertions(+), 199 deletions(-) diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in index 5f0e13a7fb6..9b29b00dfb7 100644 --- a/dlls/wow32/Makefile.in +++ b/dlls/wow32/Makefile.in @@ -1,5 +1,3 @@ MODULE = wow32.dll IMPORTLIB = wow32 IMPORTS = kernel - -C_SRCS = wow_main.c diff --git a/dlls/wow32/wow32.spec b/dlls/wow32/wow32.spec index 5459685b487..6065a059b29 100644 --- a/dlls/wow32/wow32.spec +++ b/dlls/wow32/wow32.spec @@ -1,19 +1,19 @@ # ordinal exports -1 stdcall WOWGetDescriptor(long ptr) +1 stdcall -import WOWGetDescriptor(long ptr) K32WOWGetDescriptor -@ stdcall WOWCallback16(long long) -@ stdcall WOWCallback16Ex(long long long ptr ptr) -@ stdcall WOWDirectedYield16(long) -@ stdcall WOWGetVDMPointer(long long long) -@ stdcall WOWGetVDMPointerFix(long long long) -@ stdcall WOWGetVDMPointerUnfix(long) -@ stdcall WOWGlobalAlloc16(long long) -@ stdcall WOWGlobalAllocLock16(long long ptr) -@ stdcall WOWGlobalFree16(long) -@ stdcall WOWGlobalLock16(long) -@ stdcall WOWGlobalLockSize16(long ptr) -@ stdcall WOWGlobalUnlock16(long) -@ stdcall WOWGlobalUnlockFree16(long) -@ stdcall WOWHandle16(long long) -@ stdcall WOWHandle32(long long) -@ stdcall WOWYield16() +@ stdcall -import WOWCallback16(long long) K32WOWCallback16 +@ stdcall -import WOWCallback16Ex(long long long ptr ptr) K32WOWCallback16Ex +@ stdcall -import WOWDirectedYield16(long) K32WOWDirectedYield16 +@ stdcall -import WOWGetVDMPointer(long long long) K32WOWGetVDMPointer +@ stdcall -import WOWGetVDMPointerFix(long long long) K32WOWGetVDMPointerFix +@ stdcall -import WOWGetVDMPointerUnfix(long) K32WOWGetVDMPointerUnfix +@ stdcall -import WOWGlobalAlloc16(long long) K32WOWGlobalAlloc16 +@ stdcall -import WOWGlobalAllocLock16(long long ptr) K32WOWGlobalAllocLock16 +@ stdcall -import WOWGlobalFree16(long) K32WOWGlobalFree16 +@ stdcall -import WOWGlobalLock16(long) K32WOWGlobalLock16 +@ stdcall -import WOWGlobalLockSize16(long ptr) K32WOWGlobalLockSize16 +@ stdcall -import WOWGlobalUnlock16(long) K32WOWGlobalUnlock16 +@ stdcall -import WOWGlobalUnlockFree16(long) K32WOWGlobalUnlockFree16 +@ stdcall -import WOWHandle16(long long) K32WOWHandle16 +@ stdcall -import WOWHandle32(long long) K32WOWHandle32 +@ stdcall -import WOWYield16() K32WOWYield16 diff --git a/dlls/wow32/wow_main.c b/dlls/wow32/wow_main.c deleted file mode 100644 index e2795830d37..00000000000 --- a/dlls/wow32/wow_main.c +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Win32 Windows-on-Windows support - * - * Copyright 2005 Alexandre Julliard - * - * 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 - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wownt32.h" - -#undef WOWCallback16 -#undef WOWCallback16Ex -#undef WOWDirectedYield16 -#undef WOWGetVDMPointer -#undef WOWGetVDMPointerFix -#undef WOWGetVDMPointerUnfix -#undef WOWGlobalAlloc16 -#undef WOWGlobalAllocLock16 -#undef WOWGlobalFree16 -#undef WOWGlobalLock16 -#undef WOWGlobalLockSize16 -#undef WOWGlobalUnlock16 -#undef WOWGlobalUnlockFree16 -#undef WOWHandle16 -#undef WOWHandle32 -#undef WOWYield16 - -BOOL WINAPI K32WOWGetDescriptor(DWORD,LPLDT_ENTRY); - -/********************************************************************** - * WOWGetDescriptor (WOW32.1) - */ -BOOL WINAPI WOWGetDescriptor( DWORD segptr, LPLDT_ENTRY ldtent ) -{ - return K32WOWGetDescriptor( segptr, ldtent ); -} - -/********************************************************************** - * WOWGetVDMPointer (WOW32.@) - */ -LPVOID WINAPI WOWGetVDMPointer( DWORD vp, DWORD dwBytes, BOOL fProtectedMode ) -{ - return K32WOWGetVDMPointer( vp, dwBytes, fProtectedMode ); -} - -/********************************************************************** - * WOWGetVDMPointerFix (WOW32.@) - */ -LPVOID WINAPI WOWGetVDMPointerFix( DWORD vp, DWORD dwBytes, BOOL fProtectedMode ) -{ - return K32WOWGetVDMPointerFix( vp, dwBytes, fProtectedMode ); -} - -/********************************************************************** - * WOWGetVDMPointerUnfix (WOW32.@) - */ -void WINAPI WOWGetVDMPointerUnfix( DWORD vp ) -{ - K32WOWGetVDMPointerUnfix( vp ); -} - -/********************************************************************** - * WOWGlobalAlloc16 (WOW32.@) - */ -WORD WINAPI WOWGlobalAlloc16( WORD wFlags, DWORD cb ) -{ - return K32WOWGlobalAlloc16( wFlags, cb ); -} - -/********************************************************************** - * WOWGlobalFree16 (WOW32.@) - */ -WORD WINAPI WOWGlobalFree16( WORD hMem ) -{ - return K32WOWGlobalFree16( hMem ); -} - -/********************************************************************** - * WOWGlobalLock16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalLock16( WORD hMem ) -{ - return K32WOWGlobalLock16( hMem ); -} - -/********************************************************************** - * WOWGlobalUnlock16 (WOW32.@) - */ -BOOL WINAPI WOWGlobalUnlock16( WORD hMem ) -{ - return K32WOWGlobalUnlock16( hMem ); -} - -/********************************************************************** - * WOWGlobalAllocLock16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalAllocLock16( WORD wFlags, DWORD cb, WORD *phMem ) -{ - return K32WOWGlobalAllocLock16( wFlags, cb, phMem ); -} - -/********************************************************************** - * WOWGlobalLockSize16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalLockSize16( WORD hMem, PDWORD pcb ) -{ - return K32WOWGlobalLockSize16( hMem, pcb ); -} - -/********************************************************************** - * WOWGlobalUnlockFree16 (WOW32.@) - */ -WORD WINAPI WOWGlobalUnlockFree16( DWORD vpMem ) -{ - return K32WOWGlobalUnlockFree16( vpMem ); -} - -/********************************************************************** - * WOWYield16 (WOW32.@) - */ -void WINAPI WOWYield16(void) -{ - K32WOWYield16(); -} - -/********************************************************************** - * WOWDirectedYield16 (WOW32.@) - */ -void WINAPI WOWDirectedYield16( WORD htask16 ) -{ - K32WOWDirectedYield16( htask16 ); -} - -/*********************************************************************** - * WOWHandle32 (WOW32.@) - */ -HANDLE WINAPI WOWHandle32( WORD handle, WOW_HANDLE_TYPE type ) -{ - return K32WOWHandle32( handle, type ); -} - -/*********************************************************************** - * WOWHandle16 (WOW32.@) - */ -WORD WINAPI WOWHandle16( HANDLE handle, WOW_HANDLE_TYPE type ) -{ - return K32WOWHandle16( handle, type ); -} - -/********************************************************************** - * WOWCallback16Ex (WOW32.@) - */ -BOOL WINAPI WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, - DWORD cbArgs, PVOID pArgs, PDWORD pdwRetCode ) -{ - return K32WOWCallback16Ex( vpfn16, dwFlags, cbArgs, pArgs, pdwRetCode ); -} - -/********************************************************************** - * WOWCallback16 (WOW32.@) - */ -DWORD WINAPI WOWCallback16( DWORD vpfn16, DWORD dwParam ) -{ - return K32WOWCallback16( vpfn16, dwParam ); -}

1 0