March 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : usp10: Avoid LPOUTLINETEXTMETRICW.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: ba66b626ebb1b626f0ce32ef31f5b6e1f02af146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba66b626ebb1b626f0ce32ef3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:47 2017 +0100 usp10: Avoid LPOUTLINETEXTMETRICW. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 51 ++++++++++++++++++++++++++++----------------- dlls/usp10/shape.c | 8 ++++--- dlls/usp10/usp10_internal.h | 4 +++- 3 files changed, 40 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba66b626ebb1b626f0ce3…

1 0

Piotr Caban : msvcrt: Optimize Concurrency::event implementation.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 41dd0eb457c26ff956c247bcc8493dd4ad0fb34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41dd0eb457c26ff956c247bcc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 20 10:42:38 2017 +0100 msvcrt: Optimize Concurrency::event implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 60 +++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 8ae9511..edfefdb 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -584,24 +584,19 @@ static inline PLARGE_INTEGER evt_timeout(PLARGE_INTEGER pTime, unsigned int time static void evt_add_queue(thread_wait_entry **head, thread_wait_entry *entry) { - if(*head) { - entry->next = *head; - entry->prev = (*head)->prev; - (*head)->prev->next = entry; - (*head)->prev = entry; - } else { - entry->next = entry; - entry->prev = entry; - *head = entry; - } + entry->next = *head; + entry->prev = NULL; + if(*head) (*head)->prev = entry; + *head = entry; } -static void evt_remove(thread_wait_entry **head, thread_wait_entry *entry) +static void evt_remove_queue(thread_wait_entry **head, thread_wait_entry *entry) { - entry->next->prev = entry->prev; - entry->prev->next = entry->next; - if(*head == entry) - *head = entry->next == entry ? NULL : entry->next; + if(entry == *head) + *head = entry->next; + else if(entry->prev) + entry->prev->next = entry->next; + if(entry->next) entry->next->prev = entry->prev; } static MSVCRT_size_t evt_end_wait(thread_wait *wait, event **events, int count) @@ -611,7 +606,7 @@ static MSVCRT_size_t evt_end_wait(thread_wait *wait, event **events, int count) for(i = 0; i < count; i++) { critical_section_lock(&events[i]->cs); if(events[i] == wait->signaled) ret = i; - evt_remove(&events[i]->waiters, &wait->entries[i]); + evt_remove_queue(&events[i]->waiters, &wait->entries[i]); critical_section_unlock(&events[i]->cs); } @@ -698,13 +693,8 @@ void __thiscall event_reset(event *this) critical_section_lock(&this->cs); if(this->signaled) { this->signaled = FALSE; - if(this->waiters) { - entry = this->waiters; - do { - InterlockedIncrement(&entry->wait->pending_waits); - entry = entry->next; - } while (entry != this->waiters); - } + for(entry=this->waiters; entry; entry = entry->next) + InterlockedIncrement(&entry->wait->pending_waits); } critical_section_unlock(&this->cs); } @@ -714,25 +704,31 @@ void __thiscall event_reset(event *this) DEFINE_THISCALL_WRAPPER(event_set, 4) void __thiscall event_set(event *this) { - thread_wait_entry *entry; + thread_wait_entry *wakeup = NULL; + thread_wait_entry *entry, *next; TRACE("(%p)\n", this); critical_section_lock(&this->cs); if(!this->signaled) { this->signaled = TRUE; - if(this->waiters) { - entry = this->waiters; - do { - if(!InterlockedDecrement(&entry->wait->pending_waits)) { - if(InterlockedExchangePointer(&entry->wait->signaled, this) == EVT_WAITING) - NtReleaseKeyedEvent(keyed_event, entry->wait, 0, NULL); + for(entry=this->waiters; entry; entry=next) { + next = entry->next; + if(!InterlockedDecrement(&entry->wait->pending_waits)) { + if(InterlockedExchangePointer(&entry->wait->signaled, this) == EVT_WAITING) { + evt_remove_queue(&this->waiters, entry); + evt_add_queue(&wakeup, entry); } - entry = entry->next; - } while (entry != this->waiters); + } } } critical_section_unlock(&this->cs); + + for(entry=wakeup; entry; entry=next) { + next = entry->next; + entry->next = entry->prev = NULL; + NtReleaseKeyedEvent(keyed_event, entry->wait, 0, NULL); + } } /* ?wait(a)event@Concurrency@@QAEII(a)Z */

1 0

Jacek Caban : xmllite: Return WC_E_SYNTAX if there is unexpected data in the end of the stream.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 68aeee4d79ea88b0d36cd76aa301d83516b8421b URL: http://source.winehq.org/git/wine.git/?a=commit;h=68aeee4d79ea88b0d36cd76aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 20 14:01:00 2017 +0100 xmllite: Return WC_E_SYNTAX if there is unexpected data in the end of the stream. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 13 ++++++++----- dlls/xmllite/tests/reader.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b28a4b1..7c9f76a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2610,14 +2610,17 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) return reader_parse_content(reader); case XmlReadInState_MiscEnd: hr = reader_parse_misc(reader); - if (FAILED(hr)) return hr; + if (hr != S_FALSE) return hr; - if (hr == S_FALSE) + if (*reader_get_ptr(reader)) { - reader->instate = XmlReadInState_Eof; - reader->state = XmlReadState_EndOfFile; - reader->nodetype = XmlNodeType_None; + WARN("found garbage in the end of XML\n"); + return WC_E_SYNTAX; } + + reader->instate = XmlReadInState_Eof; + reader->state = XmlReadState_EndOfFile; + reader->nodetype = XmlNodeType_None; return hr; case XmlReadInState_Eof: return S_FALSE; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index b2fa65b..c710894 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2354,6 +2354,7 @@ static void test_eof_state(IXmlReader *reader, BOOL eof) static void test_endoffile(void) { static const char *xml = "<a/>"; + static const char *xml_garbageend = "<a/>text"; IXmlReader *reader; XmlNodeType type; IStream *stream; @@ -2393,6 +2394,33 @@ static void test_endoffile(void) IStream_Release(stream); IXmlReader_Release(reader); + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(xml_garbageend, strlen(xml_garbageend)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %#x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected type %d\n", type); + + test_eof_state(reader, FALSE); + + type = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &type); + ok(hr == WC_E_SYNTAX, "got %#x\n", hr); + ok(type == XmlNodeType_None, "Unexpected type %d\n", type); + + test_eof_state(reader, FALSE); + + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + IXmlReader_Release(reader); } static void test_max_element_depth(void)

1 0

Henri Verbeet : usp10/tests: Explicitly skip tests when required fonts are not available.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 6e2161670d36e03753bf1211d9875b9456e3b8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2161670d36e03753bf1211d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:43 2017 +0100 usp10/tests: Explicitly skip tests when required fonts are not available. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e8a72cb..1b2ba6f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1264,6 +1264,8 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co rc = 1; } } + if (!rc) + winetest_skip("Font %s is not available.\n", recommended); } if (!*hfont)

1 0

Huw Davies : kernel32/tests: Always retrieve the output mode.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: bdf50d883da4c7bf73712921c6ad3fbfcb998583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf50d883da4c7bf73712921c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 21:40:10 2017 +0000 kernel32/tests: Always retrieve the output mode. Fixes a compiler warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 68d6b64..04feb71 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1520,8 +1520,8 @@ static void test_Console(void) startup.hStdError = startup.hStdOutput; ok(GetConsoleScreenBufferInfo(startup.hStdOutput, &sbi), "Getting sb info\n"); - ok(GetConsoleMode(startup.hStdInput, &modeIn) && - GetConsoleMode(startup.hStdOutput, &modeOut), "Getting console modes\n"); + ok(GetConsoleMode(startup.hStdInput, &modeIn), "Getting console in mode\n"); + ok(GetConsoleMode(startup.hStdOutput, &modeOut), "Getting console out mode\n"); cpIn = GetConsoleCP(); cpOut = GetConsoleOutputCP(); @@ -1536,8 +1536,8 @@ static void test_Console(void) /* now get the modification the child has made, and resets parents expected values */ ok(GetConsoleScreenBufferInfo(startup.hStdOutput, &sbiC), "Getting sb info\n"); - ok(GetConsoleMode(startup.hStdInput, &modeInC) && - GetConsoleMode(startup.hStdOutput, &modeOutC), "Getting console modes\n"); + ok(GetConsoleMode(startup.hStdInput, &modeInC), "Getting console in mode\n"); + ok(GetConsoleMode(startup.hStdOutput, &modeOutC), "Getting console out mode\n"); SetConsoleMode(startup.hStdInput, modeIn); SetConsoleMode(startup.hStdOutput, modeOut);

1 0

Józef Kucia : wined3d: Make wined3d samplers usable when ARB_sampler_objects is not available.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 993bcc3e1385190cddc9cff4e26e558e73ee0ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=993bcc3e1385190cddc9cff4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:03 2017 +0100 wined3d: Make wined3d samplers usable when ARB_sampler_objects is not available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 72574db..a987a35 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -39,10 +39,13 @@ static void wined3d_sampler_destroy_object(void *object) const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - context = context_acquire(sampler->device, NULL, 0); - gl_info = context->gl_info; - GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); - context_release(context); + if (sampler->name) + { + context = context_acquire(sampler->device, NULL, 0); + gl_info = context->gl_info; + GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); + context_release(context); + } HeapFree(GetProcessHeap(), 0, sampler); } @@ -115,7 +118,9 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d sampler->device = device; sampler->parent = parent; sampler->desc = *desc; - wined3d_cs_init_object(device->cs, wined3d_sampler_cs_init, sampler); + + if (device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) + wined3d_cs_init_object(device->cs, wined3d_sampler_cs_init, sampler); } HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, @@ -125,9 +130,6 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct TRACE("device %p, desc %p, parent %p, sampler %p.\n", device, desc, parent, sampler); - if (!device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) - return WINED3DERR_INVALIDCALL; - if (desc->address_u < WINED3D_TADDRESS_WRAP || desc->address_u > WINED3D_TADDRESS_MIRROR_ONCE || desc->address_v < WINED3D_TADDRESS_WRAP || desc->address_v > WINED3D_TADDRESS_MIRROR_ONCE || desc->address_w < WINED3D_TADDRESS_WRAP || desc->address_w > WINED3D_TADDRESS_MIRROR_ONCE)

1 0

Daniel Lehman : msvcrt: Implement Concurrency::event.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: dfd28affe34f8a87e251fdd02e590c425b90ca6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd28affe34f8a87e251fdd02… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Dec 12 16:44:44 2016 -0800 msvcrt: Implement Concurrency::event. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 15 ++++ 2 files changed, 193 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index d9fe05d..8ae9511 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -550,19 +550,128 @@ unsigned int __cdecl _GetConcurrency(void) return val; } +#define EVT_RUNNING (void*)1 +#define EVT_WAITING NULL + +struct thread_wait; +typedef struct thread_wait_entry +{ + struct thread_wait *wait; + struct thread_wait_entry *next; + struct thread_wait_entry *prev; +} thread_wait_entry; + +typedef struct thread_wait +{ + void *signaled; + int pending_waits; + thread_wait_entry entries[1]; +} thread_wait; + typedef struct { - volatile void *wait; - void *reset; + thread_wait_entry *waiters; + INT_PTR signaled; critical_section cs; } event; +static inline PLARGE_INTEGER evt_timeout(PLARGE_INTEGER pTime, unsigned int timeout) +{ + if(timeout == COOPERATIVE_TIMEOUT_INFINITE) return NULL; + pTime->QuadPart = (ULONGLONG)timeout * -10000; + return pTime; +} + +static void evt_add_queue(thread_wait_entry **head, thread_wait_entry *entry) +{ + if(*head) { + entry->next = *head; + entry->prev = (*head)->prev; + (*head)->prev->next = entry; + (*head)->prev = entry; + } else { + entry->next = entry; + entry->prev = entry; + *head = entry; + } +} + +static void evt_remove(thread_wait_entry **head, thread_wait_entry *entry) +{ + entry->next->prev = entry->prev; + entry->prev->next = entry->next; + if(*head == entry) + *head = entry->next == entry ? NULL : entry->next; +} + +static MSVCRT_size_t evt_end_wait(thread_wait *wait, event **events, int count) +{ + MSVCRT_size_t i, ret = COOPERATIVE_WAIT_TIMEOUT; + + for(i = 0; i < count; i++) { + critical_section_lock(&events[i]->cs); + if(events[i] == wait->signaled) ret = i; + evt_remove(&events[i]->waiters, &wait->entries[i]); + critical_section_unlock(&events[i]->cs); + } + + return ret; +} + +static inline int evt_transition(void **state, void *from, void *to) +{ + return InterlockedCompareExchangePointer(state, to, from) == from; +} + +static MSVCRT_size_t evt_wait(thread_wait *wait, event **events, int count, MSVCRT_bool wait_all, unsigned int timeout) +{ + int i; + NTSTATUS status; + LARGE_INTEGER ntto; + + wait->signaled = EVT_RUNNING; + wait->pending_waits = wait_all ? count : 1; + for(i = 0; i < count; i++) { + wait->entries[i].wait = wait; + + critical_section_lock(&events[i]->cs); + evt_add_queue(&events[i]->waiters, &wait->entries[i]); + if(events[i]->signaled) { + if(!InterlockedDecrement(&wait->pending_waits)) { + wait->signaled = events[i]; + critical_section_unlock(&events[i]->cs); + + return evt_end_wait(wait, events, i+1); + } + } + critical_section_unlock(&events[i]->cs); + } + + if(!timeout) + return evt_end_wait(wait, events, count); + + if(!evt_transition(&wait->signaled, EVT_RUNNING, EVT_WAITING)) + return evt_end_wait(wait, events, count); + + status = NtWaitForKeyedEvent(keyed_event, wait, 0, evt_timeout(&ntto, timeout)); + + if(status && !evt_transition(&wait->signaled, EVT_WAITING, EVT_RUNNING)) + NtWaitForKeyedEvent(keyed_event, wait, 0, NULL); + + return evt_end_wait(wait, events, count); +} + /* ??0event(a)Concurrency@@QAE(a)XZ */ /* ??0event(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(event_ctor, 4) event* __thiscall event_ctor(event *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + this->waiters = NULL; + this->signaled = FALSE; + critical_section_ctor(&this->cs); + return this; } @@ -571,7 +680,10 @@ event* __thiscall event_ctor(event *this) DEFINE_THISCALL_WRAPPER(event_dtor, 4) void __thiscall event_dtor(event *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + critical_section_dtor(&this->cs); + if(this->waiters) + ERR("there's a wait on destroyed event\n"); } /* ?reset(a)event@Concurrency@@QAEXXZ */ @@ -579,7 +691,22 @@ void __thiscall event_dtor(event *this) DEFINE_THISCALL_WRAPPER(event_reset, 4) void __thiscall event_reset(event *this) { - FIXME("(%p) stub\n", this); + thread_wait_entry *entry; + + TRACE("(%p)\n", this); + + critical_section_lock(&this->cs); + if(this->signaled) { + this->signaled = FALSE; + if(this->waiters) { + entry = this->waiters; + do { + InterlockedIncrement(&entry->wait->pending_waits); + entry = entry->next; + } while (entry != this->waiters); + } + } + critical_section_unlock(&this->cs); } /* ?set(a)event@Concurrency@@QAEXXZ */ @@ -587,26 +714,65 @@ void __thiscall event_reset(event *this) DEFINE_THISCALL_WRAPPER(event_set, 4) void __thiscall event_set(event *this) { - FIXME("(%p) stub\n", this); + thread_wait_entry *entry; + + TRACE("(%p)\n", this); + + critical_section_lock(&this->cs); + if(!this->signaled) { + this->signaled = TRUE; + if(this->waiters) { + entry = this->waiters; + do { + if(!InterlockedDecrement(&entry->wait->pending_waits)) { + if(InterlockedExchangePointer(&entry->wait->signaled, this) == EVT_WAITING) + NtReleaseKeyedEvent(keyed_event, entry->wait, 0, NULL); + } + entry = entry->next; + } while (entry != this->waiters); + } + } + critical_section_unlock(&this->cs); } /* ?wait(a)event@Concurrency@@QAEII(a)Z */ /* ?wait(a)event@Concurrency@@QEAA_KI(a)Z */ DEFINE_THISCALL_WRAPPER(event_wait, 8) -size_t __thiscall event_wait(event *this, unsigned int timeout) +MSVCRT_size_t __thiscall event_wait(event *this, unsigned int timeout) { - FIXME("(%p %u) stub\n", this, timeout); - return COOPERATIVE_WAIT_TIMEOUT; + thread_wait wait; + MSVCRT_size_t signaled; + + TRACE("(%p %u)\n", this, timeout); + + critical_section_lock(&this->cs); + signaled = this->signaled; + critical_section_unlock(&this->cs); + + if(!timeout) return signaled ? 0 : COOPERATIVE_WAIT_TIMEOUT; + return signaled ? 0 : evt_wait(&wait, &this, 1, FALSE, timeout); } /* ?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z */ /* ?wait_for_multiple(a)event@Concurrency@@SA_KPEAPEAV12(a)_K_NI@Z */ int __cdecl event_wait_for_multiple(event **events, MSVCRT_size_t count, MSVCRT_bool wait_all, unsigned int timeout) { - FIXME("(%p %ld %d %u) stub\n", events, count, wait_all, timeout); - return COOPERATIVE_WAIT_TIMEOUT; -} + thread_wait *wait; + MSVCRT_size_t ret; + + TRACE("(%p %ld %d %u)\n", events, count, wait_all, timeout); + + if(count == 0) + return 0; + wait = heap_alloc(FIELD_OFFSET(thread_wait, entries[count])); + if(!wait) + throw_bad_alloc("bad allocation"); + ret = evt_wait(wait, events, count, wait_all, timeout); + heap_free(wait); + + return ret; +} #endif #if _MSVCR_VER >= 110 diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3caa43c..cee8113 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1181,6 +1181,7 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_SCANF_MASK (0x0007) +#define COOPERATIVE_TIMEOUT_INFINITE ((unsigned int)-1) #define COOPERATIVE_WAIT_TIMEOUT ~0 typedef enum { @@ -1380,4 +1381,18 @@ typedef struct { _FPIEEE_VALUE Result; } _FPIEEE_RECORD, *_PFPIEEE_RECORD; +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} #endif /* __WINE_MSVCRT_H */

1 0

Daniel Lehman : msvcrt: Add _Trace_ppl_function stub.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 4db4d61bbb1a89b5f87ecb8efe32b3c31b863e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db4d61bbb1a89b5f87ecb8ef… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 29 16:57:04 2016 -0700 msvcrt: Add _Trace_ppl_function stub. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 21 +++++++++++++++++++++ 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 855e366..e6ebe4e 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -456,8 +456,8 @@ @ stub -arch=i386 ?_Stop(a)_Timer@details(a)Concurrency@@IAEXXZ @ stub -arch=win64 ?_Stop(a)_Timer@details(a)Concurrency@@IEAAXXZ @ stub -arch=win64 ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ -@ stub ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ @ thiscall -arch=i386 ?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d60c2c2..303e1b7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -386,8 +386,8 @@ @ stub -arch=win64 ?_Stop(a)_Timer@details(a)Concurrency@@IEAAXXZ @ stub -arch=win32 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ stub -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ thiscall -arch=win32 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=win32 ?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f9b6613..8aa390e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -658,8 +658,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ -@ stub -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 48129f6..7a3a831 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -640,8 +640,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ -@ stub -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 7242cb9..62926d4 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -636,8 +636,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ -@ stub -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index daf7aee..a86048a 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1700,3 +1700,24 @@ MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti) return hash; } #endif + +#if _MSVCR_VER >= 100 +enum ConcRT_EventType +{ + CONCRT_EVENT_GENERIC, + CONCRT_EVENT_START, + CONCRT_EVENT_END, + CONCRT_EVENT_BLOCK, + CONCRT_EVENT_UNBLOCK, + CONCRT_EVENT_YIELD, + CONCRT_EVENT_ATTACH, + CONCRT_EVENT_DETACH +}; + +/* ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z */ +/* ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z */ +void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char level, enum ConcRT_EventType type) +{ + FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); +} +#endif

1 0

Gijs Vermeulen : msvcrt: Add stub for Concurrency::Free.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 9b6455359acc2b28a7a61afc67ab0990e5f55ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6455359acc2b28a7a61afc6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 18 00:12:16 2017 +0100 msvcrt: Add stub for Concurrency::Free. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/heap.c | 8 ++++++++ 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index d510a3b..855e366 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -239,8 +239,8 @@ @ stub -arch=win64 ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub -arch=win64 ?DisableTracing(a)Concurrency@@YAJXZ @ stub -arch=win64 ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPAX(a)Z +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub -arch=win64 ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3875304..d60c2c2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -258,8 +258,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4026b1b..f9b6613 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -418,8 +418,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 27c800b..48129f6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -416,8 +416,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dcb391c..7242cb9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -412,8 +412,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPAX(a)Z +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index f99f9c3..ba07bb0 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -873,3 +873,11 @@ void * CDECL Concurrency_Alloc(MSVCRT_size_t size) FIXME("(%ld) returning %p\n", size, p); return p; } + +/* ?Free(a)Concurrency@@YAXPAX(a)Z */ +/* ?Free(a)Concurrency@@YAXPEAX(a)Z */ +void CDECL Concurrency_Free(void* mem) +{ + FIXME("(%p) stub\n", mem); + MSVCRT_free(mem); +}

1 0

Gijs Vermeulen : msvcrt: Add stub for Concurrency::Alloc.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 32a4bec9099676ce1ade3fbd2871195f9596686c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a4bec9099676ce1ade3fbd2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 18 12:27:44 2017 +0100 msvcrt: Add stub for Concurrency::Alloc. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/heap.c | 9 +++++++++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index dd8d13a..d510a3b 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -217,8 +217,8 @@ @ stub -arch=i386 ??_F_Scheduler(a)details@Concurrency@@QAEXXZ @ stub -arch=win64 ??_F_Scheduler(a)details@Concurrency@@QEAAXXZ # extern ?AgentEventGuid(a)Concurrency@@3U_GUID@@B -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPAXI(a)Z +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub -arch=win64 ?Block(a)Context@Concurrency@@SAXXZ # extern ?ChoreEventGuid(a)Concurrency@@3U_GUID@@B # extern ?ConcRTEventGuid(a)Concurrency@@3U_GUID@@B diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 729d16f..3875304 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -242,8 +242,8 @@ @ cdecl -arch=win64 ??_U(a)YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg @ cdecl -arch=win32 ??_V(a)YAXPAX@Z(ptr) MSVCRT_operator_delete @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index fa3206d..4026b1b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -400,8 +400,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 84edf51..27c800b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -396,8 +396,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 46a76da..dcb391c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -393,8 +393,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) msvcr120.??_V(a)YAXPEAX@Z @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPAXI(a)Z +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 3ae2599..f99f9c3 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -864,3 +864,12 @@ void msvcrt_destroy_heap(void) if(sb_heap) HeapDestroy(sb_heap); } + +/* ?Alloc(a)Concurrency@@YAPAXI(a)Z */ +/* ?Alloc(a)Concurrency@@YAPEAX_K(a)Z */ +void * CDECL Concurrency_Alloc(MSVCRT_size_t size) +{ + void *p = MSVCRT_malloc(size); + FIXME("(%ld) returning %p\n", size, p); + return p; +}

1 0