September 2015 - Wine-Commits

Iván Matellanes : msvcirt: Add stub of class strstreambuf.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 37de5343526320e04dba9117547ed254986b1922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37de5343526320e04dba91175… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:46 2015 +0200 msvcirt: Add stub of class strstreambuf. --- dlls/msvcirt/msvcirt.c | 214 ++++++++++++++++++++++++++++++++++++++++---- dlls/msvcirt/msvcirt.h | 2 + dlls/msvcirt/msvcirt.spec | 70 +++++++-------- dlls/msvcrt20/msvcrt20.spec | 62 ++++++------- dlls/msvcrt40/msvcrt40.spec | 62 ++++++------- 5 files changed, 298 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37de5343526320e04dba9…

1 0

Ken Thomases : dbghelp: On Mac, get the wineloader path from the target or our own process before resorting to guessing.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: f458cd844a59ee98c09712be7590e0331459e080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f458cd844a59ee98c09712be7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 17 21:26:36 2015 -0500 dbghelp: On Mac, get the wineloader path from the target or our own process before resorting to guessing. This makes backtraces more reliably complete when WINELOADER isn't set and the loader isn't in a typical location. --- dlls/dbghelp/macho_module.c | 159 ++++++++++++++++++++++++++++++-------------- 1 file changed, 110 insertions(+), 49 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 8d7091d..205c0c0 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -58,6 +58,7 @@ #include <mach-o/fat.h> #include <mach-o/loader.h> #include <mach-o/nlist.h> +#include <mach-o/dyld.h> #ifdef HAVE_MACH_O_DYLD_IMAGES_H #include <mach-o/dyld_images.h> @@ -1301,6 +1302,57 @@ static void macho_module_remove(struct process* pcs, struct module_format* modfm HeapFree(GetProcessHeap(), 0, modfmt); } + +/****************************************************************** + * get_dyld_image_info_address + */ +static ULONG_PTR get_dyld_image_info_address(struct process* pcs) +{ + NTSTATUS status; + PROCESS_BASIC_INFORMATION pbi; + ULONG_PTR dyld_image_info_address = 0; + + /* Get address of PEB */ + status = NtQueryInformationProcess(pcs->handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); + if (status == STATUS_SUCCESS) + { + /* Read dyld image info address from PEB */ + if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], + &dyld_image_info_address, sizeof(dyld_image_info_address), NULL)) + { + TRACE("got dyld_image_info_address 0x%08lx from PEB %p MacDyldImageInfo %p\n", + (unsigned long)dyld_image_info_address, pbi.PebBaseAddress, &pbi.PebBaseAddress->Reserved); + } + } + +#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ + if (!dyld_image_info_address) + { + static void* dyld_all_image_infos_addr; + + /* Our next best guess is that dyld was loaded at its base address + and we can find the dyld image infos address by looking up its symbol. */ + if (!dyld_all_image_infos_addr) + { + struct nlist nl[2]; + memset(nl, 0, sizeof(nl)); + nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; + if (!nlist("/usr/lib/dyld", nl)) + dyld_all_image_infos_addr = (void*)nl[0].n_value; + } + + if (dyld_all_image_infos_addr) + { + TRACE("got dyld_image_info_address %p from /usr/lib/dyld symbol table\n", + dyld_all_image_infos_addr); + dyld_image_info_address = (ULONG_PTR)dyld_all_image_infos_addr; + } + } +#endif + + return dyld_image_info_address; +} + /****************************************************************** * macho_load_file * @@ -1328,54 +1380,8 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, */ if (macho_info->flags & MACHO_INFO_DEBUG_HEADER) { - PROCESS_BASIC_INFORMATION pbi; - NTSTATUS status; - - ret = FALSE; - - /* Get address of PEB */ - status = NtQueryInformationProcess(pcs->handle, ProcessBasicInformation, - &pbi, sizeof(pbi), NULL); - if (status == STATUS_SUCCESS) - { - ULONG_PTR dyld_image_info; - - /* Read dyld image info address from PEB */ - if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], - &dyld_image_info, sizeof(dyld_image_info), NULL)) - { - TRACE("got dyld_image_info 0x%08lx from PEB %p MacDyldImageInfo %p\n", - (unsigned long)dyld_image_info, pbi.PebBaseAddress, &pbi.PebBaseAddress->Reserved); - macho_info->dbg_hdr_addr = dyld_image_info; - ret = TRUE; - } - } - -#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ - if (!ret) - { - static void* dyld_all_image_infos_addr; - - /* Our next best guess is that dyld was loaded at its base address - and we can find the dyld image infos address by looking up its symbol. */ - if (!dyld_all_image_infos_addr) - { - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; - if (!nlist("/usr/lib/dyld", nl)) - dyld_all_image_infos_addr = (void*)nl[0].n_value; - } - - if (dyld_all_image_infos_addr) - { - TRACE("got dyld_image_info %p from /usr/lib/dyld symbol table\n", - dyld_all_image_infos_addr); - macho_info->dbg_hdr_addr = (unsigned long)dyld_all_image_infos_addr; - ret = TRUE; - } - } -#endif + macho_info->dbg_hdr_addr = (unsigned long)get_dyld_image_info_address(pcs); + ret = TRUE; } if (macho_info->flags & MACHO_INFO_MODULE) @@ -1695,7 +1701,62 @@ BOOL macho_synchronize_module_list(struct process* pcs) */ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_info) { - return macho_search_and_load_file(pcs, get_wine_loader_name(), 0, macho_info); + BOOL ret = FALSE; + ULONG_PTR dyld_image_info_address; + struct dyld_all_image_infos image_infos; + struct dyld_image_info image_info; + uint32_t len; + char path[PATH_MAX]; + BOOL got_path = FALSE; + + dyld_image_info_address = get_dyld_image_info_address(pcs); + if (dyld_image_info_address && + ReadProcessMemory(pcs->handle, (void*)dyld_image_info_address, &image_infos, sizeof(image_infos), NULL) && + image_infos.infoArray && image_infos.infoArrayCount && + ReadProcessMemory(pcs->handle, image_infos.infoArray, &image_info, sizeof(image_info), NULL) && + image_info.imageFilePath) + { + for (len = sizeof(path); len > 0; len /= 2) + { + if (ReadProcessMemory(pcs->handle, image_info.imageFilePath, path, len, NULL)) + { + path[len - 1] = 0; + got_path = TRUE; + TRACE("got executable path from target's dyld image info: %s\n", debugstr_a(path)); + break; + } + } + } + + /* If we couldn't get the executable path from the target process, try our + own. It will almost always be the same. */ + if (!got_path) + { + len = sizeof(path); + if (!_NSGetExecutablePath(path, &len)) + { + got_path = TRUE; + TRACE("using own executable path: %s\n", debugstr_a(path)); + } + } + + if (got_path) + { + WCHAR* pathW; + + len = MultiByteToWideChar(CP_UNIXCP, 0, path, -1, NULL, 0); + pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (pathW) + { + MultiByteToWideChar(CP_UNIXCP, 0, path, -1, pathW, len); + ret = macho_load_file(pcs, pathW, 0, macho_info); + HeapFree(GetProcessHeap(), 0, pathW); + } + } + + if (!ret) + ret = macho_search_and_load_file(pcs, get_wine_loader_name(), 0, macho_info); + return ret; } /******************************************************************

1 0

Bruno Jesus : mciavi32: Start playing from frame 0 instead of 1.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: ab4460a382d002342e7a2e9f1432e53321e1ccf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4460a382d002342e7a2e9f1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 17 15:58:39 2015 +0800 mciavi32: Start playing from frame 0 instead of 1. --- dlls/mciavi32/mciavi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index b1c89f0..843fe2c 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -393,8 +393,8 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP { while(next_frame_us <= tc && wma->dwCurrVideoFrame < wma->dwToVideoFrame){ double dur; - ++wma->dwCurrVideoFrame; dur = MCIAVI_PaintFrame(wma, hDC); + ++wma->dwCurrVideoFrame; if(!dur) break; next_frame_us += dur;

1 0

Józef Kucia : dxgi: Add locking around remaining wined3d calls.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 2a1186db19f20e3bfc065905dc49fa87e480675c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1186db19f20e3bfc065905d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 17 01:10:14 2015 +0200 dxgi: Add locking around remaining wined3d calls. --- dlls/dxgi/device.c | 12 ++++++++++-- dlls/dxgi/factory.c | 2 ++ dlls/dxgi/surface.c | 2 ++ dlls/dxgi/swapchain.c | 18 +++++++++++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index a6c4589..ae07bac 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -194,6 +194,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac surface_desc.depth = 1; surface_desc.size = 0; + wined3d_mutex_lock(); memset(surface, 0, surface_count * sizeof(*surface)); for (i = 0; i < surface_count; ++i) { @@ -218,11 +219,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac TRACE("Created IDXGISurface %p (%u/%u)\n", surface[i], i + 1, surface_count); } + wined3d_mutex_unlock(); IWineDXGIDeviceParent_Release(dxgi_device_parent); return S_OK; fail: + wined3d_mutex_unlock(); for (j = 0; j < i; ++j) { IDXGISurface_Release(surface[i]); @@ -364,6 +367,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; device->refcount = 1; + wined3d_mutex_lock(); wined3d_private_store_init(&device->private_store); layer_base = device + 1; @@ -373,6 +377,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l { WARN("Failed to create device, returning %#x.\n", hr); wined3d_private_store_cleanup(&device->private_store); + wined3d_mutex_unlock(); return hr; } @@ -382,6 +387,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l ERR("DXGI device should implement IWineD3DDeviceParent.\n"); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); + wined3d_mutex_unlock(); return hr; } wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); @@ -397,18 +403,18 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l hr = E_FAIL; IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); + wined3d_mutex_unlock(); return hr; } - wined3d_mutex_lock(); hr = wined3d_device_create(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device); - wined3d_mutex_unlock(); if (FAILED(hr)) { WARN("Failed to create a wined3d device, returning %#x.\n", hr); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); + wined3d_mutex_unlock(); return hr; } @@ -422,8 +428,10 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l wined3d_device_decref(device->wined3d_device); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); + wined3d_mutex_unlock(); return hr; } + wined3d_mutex_unlock(); device->factory = &dxgi_factory->IDXGIFactory1_iface; IDXGIFactory1_AddRef(device->factory); diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index fb8b7ce..2e0d5ab 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -253,7 +253,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa return hr; } + wined3d_mutex_lock(); *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + wined3d_mutex_unlock(); return S_OK; } diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 221a80d..4ce9130 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -168,7 +168,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_ TRACE("iface %p, desc %p.\n", iface, desc); + wined3d_mutex_lock(); wined3d_resource_get_desc(surface->wined3d_resource, &wined3d_desc); + wined3d_mutex_unlock(); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; desc->Format = dxgi_format_from_wined3dformat(wined3d_desc.format); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 53d2b7f..f1495cb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -59,7 +59,11 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface) TRACE("%p increasing refcount to %u\n", This, refcount); if (refcount == 1) + { + wined3d_mutex_lock(); wined3d_swapchain_incref(This->wined3d_swapchain); + wined3d_mutex_unlock(); + } return refcount; } @@ -72,7 +76,11 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) + { + wined3d_mutex_lock(); wined3d_swapchain_decref(This->wined3d_swapchain); + wined3d_mutex_unlock(); + } return refcount; } @@ -130,13 +138,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDevice(IDXGISwapChain *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, UINT sync_interval, UINT flags) { struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); + HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x\n", iface, sync_interval, flags); if (sync_interval) FIXME("Unimplemented sync interval %u\n", sync_interval); if (flags) FIXME("Unimplemented flags %#x\n", flags); - return wined3d_swapchain_present(This->wined3d_swapchain, NULL, NULL, NULL, NULL, 0); + wined3d_mutex_lock(); + hr = wined3d_swapchain_present(This->wined3d_swapchain, NULL, NULL, NULL, NULL, 0); + wined3d_mutex_unlock(); + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, @@ -327,6 +340,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; + wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, @@ -334,8 +348,10 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); wined3d_private_store_cleanup(&swapchain->private_store); + wined3d_mutex_unlock(); return hr; } + wined3d_mutex_unlock(); return S_OK; }

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: setbuf.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 675ad97a69bac725fb92b362a6d79c4fb1ae7679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=675ad97a69bac725fb92b362a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:51 2015 +0200 msvcirt: Implement strstreambuf::setbuf. --- dlls/msvcirt/msvcirt.c | 6 ++++-- dlls/msvcirt/tests/msvcirt.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index d2c39eb..0ea4030 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1350,8 +1350,10 @@ streampos __thiscall strstreambuf_seekoff(strstreambuf *this, streamoff offset, DEFINE_THISCALL_WRAPPER(strstreambuf_setbuf, 12) streambuf* __thiscall strstreambuf_setbuf(strstreambuf *this, char *buffer, int length) { - FIXME("(%p %p %d) stub\n", this, buffer, length); - return NULL; + TRACE("(%p %p %d)\n", this, buffer, length); + if (length) + this->increase = length; + return &this->base; } /* ?str(a)strstreambuf@@QAEPADXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index c7398d6..978665f 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -195,6 +195,7 @@ static strstreambuf* (*__thiscall p_strstreambuf_ctor)(strstreambuf*); static void (*__thiscall p_strstreambuf_dtor)(strstreambuf*); static int (*__thiscall p_strstreambuf_doallocate)(strstreambuf*); static void (*__thiscall p_strstreambuf_freeze)(strstreambuf*, int); +static streambuf* (*__thiscall p_strstreambuf_setbuf)(strstreambuf*, char*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -349,6 +350,7 @@ static BOOL init(void) SET(p_strstreambuf_dtor, "??1strstreambuf@@UEAA(a)XZ"); SET(p_strstreambuf_doallocate, "?doallocate(a)strstreambuf@@MEAAHXZ"); SET(p_strstreambuf_freeze, "?freeze(a)strstreambuf@@QEAAXH(a)Z"); + SET(p_strstreambuf_setbuf, "?setbuf(a)strstreambuf@@UEAAPEAVstreambuf@@PEADH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -423,6 +425,7 @@ static BOOL init(void) SET(p_strstreambuf_dtor, "??1strstreambuf@@UAE(a)XZ"); SET(p_strstreambuf_doallocate, "?doallocate(a)strstreambuf@@MAEHXZ"); SET(p_strstreambuf_freeze, "?freeze(a)strstreambuf@@QAEXH(a)Z"); + SET(p_strstreambuf_setbuf, "?setbuf(a)strstreambuf@@UAEPAVstreambuf@@PADH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)XZ"); @@ -1422,6 +1425,7 @@ static void test_filebuf(void) static void test_strstreambuf(void) { strstreambuf ssb1, ssb2; + streambuf *pret; char buffer[64]; int ret; @@ -1577,6 +1581,21 @@ static void test_strstreambuf(void) ok(!strncmp(ssb2.base.base, "Check", 5), "strings are not equal\n"); ssb2.dynamic = 1; + /* setbuf */ + pret = (streambuf*) call_func3(p_strstreambuf_setbuf, &ssb1, buffer + 16, 16); + ok(pret == &ssb1.base, "expected %p got %p\n", &ssb1.base, pret); + ok(ssb1.base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, ssb1.base.base); + ok(ssb1.increase == 16, "expected 16, got %d\n", ssb1.increase); + pret = (streambuf*) call_func3(p_strstreambuf_setbuf, &ssb2, NULL, 2); + ok(pret == &ssb2.base, "expected %p got %p\n", &ssb2.base, pret); + ok(ssb2.increase == 2, "expected 2, got %d\n", ssb2.increase); + pret = (streambuf*) call_func3(p_strstreambuf_setbuf, &ssb2, buffer, 0); + ok(pret == &ssb2.base, "expected %p got %p\n", &ssb2.base, pret); + ok(ssb2.increase == 2, "expected 2, got %d\n", ssb2.increase); + pret = (streambuf*) call_func3(p_strstreambuf_setbuf, &ssb2, NULL, -2); + ok(pret == &ssb2.base, "expected %p got %p\n", &ssb2.base, pret); + ok(ssb2.increase == -2, "expected -2, got %d\n", ssb2.increase); + call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_dtor, &ssb2); }

1 0

Ken Thomases : dbghelp: Fix a comment to reflect what the code' s actually doing.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 8d6b34940933aa6551f50e7e218b400e86a27aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6b34940933aa6551f50e7e2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 17 21:26:37 2015 -0500 dbghelp: Fix a comment to reflect what the code's actually doing. --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 205c0c0..1352870 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1551,7 +1551,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam if (strstrW(filename, S_libstdcPPW)) return FALSE; /* We know we can't do it */ - /* If has no directories, try LD_LIBRARY_PATH first. */ + /* If has no directories, try PATH first. */ if (!strchrW(filename, '/')) { ret = macho_load_file_from_path(pcs, filename, load_addr,

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: str.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: 222cd629a384c84bbf7824f3ee828bb3523d5198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=222cd629a384c84bbf7824f3e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:49 2015 +0200 msvcirt: Implement strstreambuf::str. --- dlls/msvcirt/msvcirt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 4d0f4f6..4b826db 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1326,8 +1326,9 @@ streambuf* __thiscall strstreambuf_setbuf(strstreambuf *this, char *buffer, int DEFINE_THISCALL_WRAPPER(strstreambuf_str, 4) char* __thiscall strstreambuf_str(strstreambuf *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + strstreambuf_freeze(this, 1); + return this->base.base; } /* ?sync(a)strstreambuf@@UAEHXZ */

1 0

Ken Thomases : dbghelp: Provide a default value for DYLD_FALLBACK_LIBRARY_PATH, which is closer to how dyld behaves.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: d5739561d8b45fa5cc72e05b7786e581b80be668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5739561d8b45fa5cc72e05b7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 17 21:26:38 2015 -0500 dbghelp: Provide a default value for DYLD_FALLBACK_LIBRARY_PATH, which is closer to how dyld behaves. --- dlls/dbghelp/macho_module.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1352870..1f5d446 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1571,8 +1571,10 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam /* Try DYLD_FALLBACK_LIBRARY_PATH, with just the filename (no directories). */ if (!ret) { - ret = macho_load_file_from_path(pcs, p, load_addr, - getenv("DYLD_FALLBACK_LIBRARY_PATH"), macho_info); + const char* fallback = getenv("DYLD_FALLBACK_LIBRARY_PATH"); + if (!fallback) + fallback = "/usr/local/lib:/lib:/usr/lib"; + ret = macho_load_file_from_path(pcs, p, load_addr, fallback, macho_info); } if (!ret && !strchrW(filename, '/')) ret = macho_load_file_from_dll_path(pcs, filename, load_addr, macho_info);

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: freeze.
by Alexandre Julliard Sept. 18, 2015

Sept. 18, 2015

Module: wine Branch: master Commit: a8b26a96b4d6d57052515d149f9ea35952af1737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b26a96b4d6d57052515d149… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Sep 17 11:06:48 2015 +0200 msvcirt: Implement strstreambuf::freeze. --- dlls/msvcirt/msvcirt.c | 4 +++- dlls/msvcirt/tests/msvcirt.c | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index b50745c..4d0f4f6 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1289,7 +1289,9 @@ int __thiscall strstreambuf_doallocate(strstreambuf *this) DEFINE_THISCALL_WRAPPER(strstreambuf_freeze, 8) void __thiscall strstreambuf_freeze(strstreambuf *this, int frozen) { - FIXME("(%p %d) stub\n", this, frozen); + TRACE("(%p %d)\n", this, frozen); + if (!this->constant) + this->dynamic = !frozen; } /* ?overflow(a)strstreambuf@@UAEHH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 932e6fb..aaa9f1c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -193,6 +193,7 @@ static strstreambuf* (*__thiscall p_strstreambuf_buffer_ctor)(strstreambuf*, cha static strstreambuf* (*__thiscall p_strstreambuf_ubuffer_ctor)(strstreambuf*, unsigned char*, int, unsigned char*); static strstreambuf* (*__thiscall p_strstreambuf_ctor)(strstreambuf*); static void (*__thiscall p_strstreambuf_dtor)(strstreambuf*); +static void (*__thiscall p_strstreambuf_freeze)(strstreambuf*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -345,6 +346,7 @@ static BOOL init(void) SET(p_strstreambuf_ubuffer_ctor, "??0strstreambuf@@QEAA(a)PEAEH0@Z"); SET(p_strstreambuf_ctor, "??0strstreambuf@@QEAA(a)XZ"); SET(p_strstreambuf_dtor, "??1strstreambuf@@UEAA(a)XZ"); + SET(p_strstreambuf_freeze, "?freeze(a)strstreambuf@@QEAAXH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -417,6 +419,7 @@ static BOOL init(void) SET(p_strstreambuf_ubuffer_ctor, "??0strstreambuf@@QAE(a)PAEH0@Z"); SET(p_strstreambuf_ctor, "??0strstreambuf@@QAE(a)XZ"); SET(p_strstreambuf_dtor, "??1strstreambuf@@UAE(a)XZ"); + SET(p_strstreambuf_freeze, "?freeze(a)strstreambuf@@QAEXH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)XZ"); @@ -1518,7 +1521,6 @@ static void test_strstreambuf(void) "wrong put end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.epptr); ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); ok(ssb1.constant == 1, "expected 1, got %d\n", ssb1.constant); - call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_ctor, &ssb2); ok(ssb2.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", ssb2.base.allocated); ok(ssb2.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", ssb2.base.unbuffered); @@ -1527,6 +1529,22 @@ static void test_strstreambuf(void) ok(ssb2.constant == 0, "expected 0, got %d\n", ssb2.constant); ok(ssb2.f_alloc == NULL, "expected %p, got %p\n", NULL, ssb2.f_alloc); ok(ssb2.f_free == NULL, "expected %p, got %p\n", NULL, ssb2.f_free); + + /* freeze */ + call_func2(p_strstreambuf_freeze, &ssb1, 0); + ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); + ssb1.constant = 0; + call_func2(p_strstreambuf_freeze, &ssb1, 0); + ok(ssb1.dynamic == 1, "expected 1, got %d\n", ssb1.dynamic); + call_func2(p_strstreambuf_freeze, &ssb1, 3); + ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); + ssb1.constant = 1; + call_func2(p_strstreambuf_freeze, &ssb2, 5); + ok(ssb2.dynamic == 0, "expected 0, got %d\n", ssb2.dynamic); + call_func2(p_strstreambuf_freeze, &ssb2, 0); + ok(ssb2.dynamic == 1, "expected 1, got %d\n", ssb2.dynamic); + + call_func1(p_strstreambuf_dtor, &ssb1); call_func1(p_strstreambuf_dtor, &ssb2); }

1 0

Alistair Leslie-Hughes : d3dx10_43: Add ID3DX10ThreadPump interface.
by Alexandre Julliard Sept. 16, 2015

Sept. 16, 2015

Module: wine Branch: master Commit: 73d03f850ad2f624019847e54cf30addc241777e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d03f850ad2f624019847e54… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 15 13:37:50 2015 +1000 d3dx10_43: Add ID3DX10ThreadPump interface. --- include/Makefile.in | 1 + include/d3dx10core.idl | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b1104ee..84a6381 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -32,6 +32,7 @@ PUBLIC_IDL_H_SRCS = \ d3d11_1.idl \ d3d11sdklayers.idl \ d3dcommon.idl \ + d3dx10core.idl \ ddstream.idl \ devicetopology.idl \ dimm.idl \ diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl new file mode 100644 index 0000000..f0d8ff6 --- /dev/null +++ b/include/d3dx10core.idl @@ -0,0 +1,66 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgi.idl"; +import "d3dcommon.idl"; + +[ + object, + local, + pointer_default(unique) +] +interface ID3DX10DataLoader +{ + HRESULT Load(); + HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); + HRESULT Destroy(); +}; + +[ + object, + local, + pointer_default(unique) +] +interface ID3DX10DataProcessor +{ + HRESULT Process([in] void *data, [in] SIZE_T bytes); + HRESULT CreateDeviceObject([out] void **dataobject); + HRESULT Destroy(); +}; + + +[ + object, + local, + pointer_default(unique), + uuid(c93fecfa-6967-478a-abbc-402d90621fcb) +] +interface ID3DX10ThreadPump : IUnknown +{ + HRESULT AddWorkItem([in] ID3DX10DataLoader *loader, [in] ID3DX10DataProcessor *processor, + [in] HRESULT *result, [out] void **object); + UINT GetWorkItemCount(); + + HRESULT WaitForAllItems(); + HRESULT ProcessDeviceWorkItems([in] UINT count); + + HRESULT PurgeAllItems(); + HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); +};

1 0