January 2014 - Wine-commits

Stefan Dösinger : wined3d: Re-enable mapping into the DIB.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: d0823eb4f0a2dca9cc54843dd9d5e0ba128f5899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0823eb4f0a2dca9cc54843dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:25 2014 +0100 wined3d: Re-enable mapping into the DIB. --- dlls/wined3d/surface.c | 59 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f59efb2..d70f605 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -579,6 +579,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win if (!(surface->flags & SFLAG_CLIENT)) wined3d_resource_free_sysmem(&surface->resource); surface->flags |= SFLAG_PBO; + surface->map_binding = SFLAG_INSYSMEM; context_release(context); } @@ -820,6 +821,9 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR case SFLAG_INUSERMEM: return surface->user_memory; + case SFLAG_INDIB: + return surface->dib.bitmap_data; + case SFLAG_INSYSMEM: if (surface->flags & SFLAG_PBO) { @@ -866,6 +870,9 @@ static void surface_unmap(struct wined3d_surface *surface) case SFLAG_INUSERMEM: break; + case SFLAG_INDIB: + break; + case SFLAG_INSYSMEM: if (surface->flags & SFLAG_PBO) { @@ -1297,16 +1304,33 @@ HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *sur /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { - if (!surface->resource.heap_memory) - wined3d_resource_allocate_sysmem(&surface->resource); - else if (!(surface->flags & SFLAG_CLIENT)) - ERR("Surface %p has heap_memory %p and flags %#x.\n", - surface, surface->resource.heap_memory, surface->flags); + void *dst; + + if (surface->flags & SFLAG_DIBSECTION) + { + surface->map_binding = SFLAG_INDIB; + dst = surface->dib.bitmap_data; + if (surface->flags & SFLAG_INSYSMEM) + { + surface_invalidate_location(surface, SFLAG_INSYSMEM); + surface_validate_location(surface, SFLAG_INDIB); + } + } + else + { + if (!surface->resource.heap_memory) + wined3d_resource_allocate_sysmem(&surface->resource); + else if (!(surface->flags & SFLAG_CLIENT)) + ERR("Surface %p has heap_memory %p and flags %#x.\n", + surface, surface->resource.heap_memory, surface->flags); + + dst = surface->resource.heap_memory; + } GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB(GL_PIXEL_UNPACK_BUFFER, surface->pbo)"); GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, - surface->resource.size, surface->resource.heap_memory)); + surface->resource.size, dst)); checkGLcall("glGetBufferSubDataARB"); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); checkGLcall("glDeleteBuffersARB"); @@ -1455,6 +1479,7 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) hr = surface_create_dib_section(surface); if (FAILED(hr)) return hr; + surface->map_binding = SFLAG_INDIB; /* We don't mind the nonpow2 stuff in GDI. */ surface->pow2Width = surface->resource.width; @@ -1505,6 +1530,9 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, case SFLAG_INUSERMEM: return surface->user_memory; + case SFLAG_INDIB: + return surface->dib.bitmap_data; + case SFLAG_INSYSMEM: return surface->resource.heap_memory; @@ -3242,6 +3270,9 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) hr = surface_create_dib_section(surface); if (FAILED(hr)) return WINED3DERR_INVALIDCALL; + if (!(surface->map_binding == SFLAG_INUSERMEM + || surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + surface->map_binding = SFLAG_INDIB; } surface_load_location(surface, SFLAG_INDIB); @@ -6427,6 +6458,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text if (lockable && (desc->usage & WINED3DUSAGE_RENDERTARGET)) surface->flags |= SFLAG_DYNLOCK; + surface->map_binding = SFLAG_INSYSMEM; + /* Call the private setup routine */ hr = surface->surface_ops->surface_private_setup(surface); if (FAILED(hr)) @@ -6437,7 +6470,19 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text return hr; } - surface->map_binding = SFLAG_INSYSMEM; + /* Similar to lockable rendertargets above, creating the DIB section + * during surface initialization prevents the sysmem pointer from changing + * after a wined3d_surface_getdc() call. */ + if ((desc->usage & WINED3DUSAGE_OWNDC) && !surface->hDC + && SUCCEEDED(surface_create_dib_section(surface))) + surface->map_binding = SFLAG_INDIB; + + if (surface->map_binding == SFLAG_INDIB) + { + wined3d_resource_free_sysmem(&surface->resource); + surface_validate_location(surface, SFLAG_INDIB); + surface_invalidate_location(surface, SFLAG_INSYSMEM); + } return hr; }

1 0

Nikolay Sivov : oleaut32/tests: Test Invoke() arguments in *FromDisp() tests.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: bb711b6133a46839e5ee94af4a2a4d119ae87e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb711b6133a46839e5ee94af4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 14 13:25:06 2014 +0400 oleaut32/tests: Test Invoke() arguments in *FromDisp() tests. --- dlls/oleaut32/tests/vartype.c | 161 ++++++++++++++++++++++++++++++----------- 1 file changed, 119 insertions(+), 42 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d100ad1..bc74e2e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -19,10 +19,12 @@ */ #define CONST_VTABLE +#define COBJMACROS #include "wine/test.h" #include "oleauto.h" #include <math.h> +#include <stdio.h> /* Some Visual C++ versions choke on __uint64 to float conversions. * To fix this you need either VC++ 6.0 plus the processor pack @@ -245,6 +247,32 @@ static BOOL has_locales; BADVAR(VT_CLSID); \ BADVAR(VT_BSTR_BLOB) +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(dispatch_invoke); + /* Early versions of oleaut32 are missing many functions */ static HRESULT (WINAPI *pVarI1FromUI1)(BYTE,signed char*); static HRESULT (WINAPI *pVarI1FromI2)(SHORT,signed char*); @@ -482,6 +510,18 @@ static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + /* Internal representation of a BSTR */ typedef struct tagINTERNAL_BSTR { @@ -504,66 +544,85 @@ static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); } -static ULONG WINAPI DummyDispatch_AddRef(LPDISPATCH iface) +static ULONG WINAPI DummyDispatch_AddRef(IDispatch *iface) { DummyDispatch *This = impl_from_IDispatch(iface); - - trace("AddRef(%p)\n", iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DummyDispatch_Release(LPDISPATCH iface) +static ULONG WINAPI DummyDispatch_Release(IDispatch *iface) { DummyDispatch *This = impl_from_IDispatch(iface); - - trace("Release(%p)\n", iface); return InterlockedDecrement(&This->ref); } -static HRESULT WINAPI DummyDispatch_QueryInterface(LPDISPATCH iface, +static HRESULT WINAPI DummyDispatch_QueryInterface(IDispatch *iface, REFIID riid, void** ppvObject) { - trace("QueryInterface(%p)\n", iface); - if (ppvObject) + *ppvObject = NULL; + + if (IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IUnknown)) { - *ppvObject = NULL; - if (IsEqualIID(riid, &IID_IDispatch)) - { - trace("Asked for IID_IDispatch\n"); *ppvObject = iface; - } - else if (IsEqualIID(riid, &IID_IUnknown)) - { - trace("Asked for IID_IUnknown\n"); - *ppvObject = iface; - } - if (*ppvObject) - { - DummyDispatch_AddRef(*ppvObject); - return S_OK; - } + IDispatch_AddRef(iface); } - return E_NOINTERFACE; + + return *ppvObject ? S_OK : E_NOINTERFACE; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; } -static HRESULT WINAPI DummyDispatch_Invoke(LPDISPATCH iface, - DISPID dispIdMember, REFIID riid, +static HRESULT WINAPI DummyDispatch_GetTypeInfo(IDispatch *iface, UINT tinfo, LCID lcid, ITypeInfo **ti) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, + UINT cnames, LCID lcid, DISPID *dispid) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, + DISPID dispid, REFIID riid, LCID lcid, WORD wFlags, - DISPPARAMS *pDispParams, - VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, - UINT *puArgErr) + DISPPARAMS *params, + VARIANT *res, + EXCEPINFO *ei, + UINT *arg_err) { - trace("Invoke(%p)\n", iface); + CHECK_EXPECT(dispatch_invoke); + + ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", debugstr_guid(riid)); ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); - ok(pDispParams->cArgs == 0, "Property get has args\n"); + + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); + ok(params->cArgs == 0, "got %d\n", params->cArgs); + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); + + ok(res != NULL, "got %p\n", res); + ok(ei == NULL, "got %p\n", ei); + ok(arg_err == NULL, "got %p\n", arg_err); if (dispatch.bFailInvoke) return E_OUTOFMEMORY; - memset(pVarResult, 0, sizeof(*pVarResult)); - V_VT(pVarResult) = dispatch.vt; + V_VT(res) = dispatch.vt; + if (dispatch.vt == VT_UI1) + V_UI1(res) = 1; + else + memset(res, 0, sizeof(*res)); + return S_OK; } @@ -572,9 +631,9 @@ static const IDispatchVtbl DummyDispatch_VTable = DummyDispatch_QueryInterface, DummyDispatch_AddRef, DummyDispatch_Release, - NULL, - NULL, - NULL, + DummyDispatch_GetTypeInfoCount, + DummyDispatch_GetTypeInfo, + DummyDispatch_GetIDsOfNames, DummyDispatch_Invoke }; @@ -1079,19 +1138,37 @@ static void test_VarUI1FromDisp(void) dispatch.vt = VT_UI1; dispatch.bFailInvoke = FALSE; + SET_EXPECT(dispatch_invoke); + out = 10; hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); - trace("0x%08x\n", hres); + ok(broken(hres == DISP_E_BADVARTYPE) || hres == S_OK, "got 0x%08x\n", hres); + ok(broken(out == 10) || out == 1, "got %d\n", out); + CHECK_CALLED(dispatch_invoke); + SET_EXPECT(dispatch_invoke); + V_VT(&vDst) = VT_EMPTY; + V_UI1(&vDst) = 0; hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); - trace("0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&vDst) == VT_UI1, "got %d\n", V_VT(&vDst)); + ok(V_UI1(&vDst) == 1, "got %d\n", V_UI1(&vDst)); + CHECK_CALLED(dispatch_invoke); dispatch.bFailInvoke = TRUE; + SET_EXPECT(dispatch_invoke); + out = 10; hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); - trace("0x%08x\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); + ok(out == 10, "got %d\n", out); + CHECK_CALLED(dispatch_invoke); + SET_EXPECT(dispatch_invoke); + V_VT(&vDst) = VT_EMPTY; hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); - trace("0x%08x\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); + ok(V_VT(&vDst) == VT_EMPTY, "got %d\n", V_VT(&vDst)); + CHECK_CALLED(dispatch_invoke); } static void test_VarUI1Copy(void)

1 0

Sebastian Lackner : kernel32/tests: Add basic tests for SRWLock commands.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: d7ff42a09199fa9e752b0573e3e8e30d44783371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ff42a09199fa9e752b0573e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jan 10 23:02:52 2014 +0100 kernel32/tests: Add basic tests for SRWLock commands. --- dlls/kernel32/tests/sync.c | 260 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7ff42a09199fa9e752b0…

1 0

Sebastian Lackner : kernel32/tests: Add a SRWLock test to simulate a typical use case.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 0c77f89f61bda08e70ba9bd87beba6f7f9c990dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c77f89f61bda08e70ba9bd87… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 11 02:23:12 2014 +0100 kernel32/tests: Add a SRWLock test to simulate a typical use case. --- dlls/kernel32/tests/sync.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 94ee200..6431df0 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1919,6 +1919,90 @@ static void test_srwlock_base(void) } } +static SRWLOCK srwlock_example; +static LONG srwlock_protected_value = 0; +static LONG srwlock_example_errors = 0, srwlock_inside = 0, srwlock_cnt = 0; +static BOOL srwlock_stop = FALSE; + +static DWORD WINAPI srwlock_example_thread(LPVOID x) { + DWORD *cnt = x; + LONG old; + + while (!srwlock_stop) + { + + /* periodically request exclusive access */ + if (InterlockedIncrement(&srwlock_cnt) % 13 == 0) + { + pAcquireSRWLockExclusive(&srwlock_example); + if (InterlockedIncrement(&srwlock_inside) != 1) + InterlockedIncrement(&srwlock_example_errors); + + InterlockedIncrement(&srwlock_protected_value); + Sleep(1); + + if (InterlockedDecrement(&srwlock_inside) != 0) + InterlockedIncrement(&srwlock_example_errors); + pReleaseSRWLockExclusive(&srwlock_example); + } + + /* request shared access */ + pAcquireSRWLockShared(&srwlock_example); + InterlockedIncrement(&srwlock_inside); + old = srwlock_protected_value; + + (*cnt)++; + Sleep(1); + + if (old != srwlock_protected_value) + InterlockedIncrement(&srwlock_example_errors); + InterlockedDecrement(&srwlock_inside); + pReleaseSRWLockShared(&srwlock_example); + } + + return 0; +} + +static void test_srwlock_example(void) +{ + HANDLE h1, h2, h3; + DWORD dummy; + DWORD cnt1, cnt2, cnt3; + + if (!pInitializeSRWLock) { + /* function is not yet in XP, only in newer Windows */ + win_skip("no srw lock support.\n"); + return; + } + + pInitializeSRWLock(&srwlock_example); + + cnt1 = cnt2 = cnt3 = 0; + + h1 = CreateThread(NULL, 0, srwlock_example_thread, &cnt1, 0, &dummy); + h2 = CreateThread(NULL, 0, srwlock_example_thread, &cnt2, 0, &dummy); + h3 = CreateThread(NULL, 0, srwlock_example_thread, &cnt3, 0, &dummy); + + /* limit run to 1 second. */ + Sleep(1000); + + /* tear down start */ + srwlock_stop = TRUE; + + WaitForSingleObject(h1, 1000); + WaitForSingleObject(h2, 1000); + WaitForSingleObject(h3, 1000); + + ok(!srwlock_inside, "threads didn't terminate properly, srwlock_inside is %d.\n", srwlock_inside); + + todo_wine + ok(!srwlock_example_errors, "errors occured while running SRWLock example test (number of errors: %d)\n", + srwlock_example_errors); + + trace("number of shared accesses per thread are c1 %d, c2 %d, c3 %d\n", cnt1, cnt2, cnt3); + trace("number of total exclusive accesses is %d\n", srwlock_protected_value); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandleA("kernel32.dll"); @@ -1959,4 +2043,5 @@ START_TEST(sync) test_condvars_base(); test_condvars_consumer_producer(); test_srwlock_base(); + test_srwlock_example(); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 993fb8636c9d7ebb9369af5e1b2a36673e6d708a URL: http://source.winehq.org/git/wine.git/?a=commit;h=993fb8636c9d7ebb9369af5e1… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 13 18:01:47 2014 +0100 po: Update German translation. --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index c48a8b8..e6e9286 100644 --- a/po/de.po +++ b/po/de.po @@ -10149,7 +10149,7 @@ msgstr "Wine Befehlsprozessor" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10219,10 +10219,8 @@ msgid "Wine Explorer" msgstr "Wine Explorer" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Autostart" +msgstr "Start" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Frédéric Delanoy : winedump: Use BOOL type where appropriate.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 1bd7405193ca841a940cbf80386cd4fbe74f0b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd7405193ca841a940cbf803… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jan 13 21:44:00 2014 +0100 winedump: Use BOOL type where appropriate. --- tools/winedump/dump.c | 2 +- tools/winedump/main.c | 9 +++------ tools/winedump/msmangle.c | 34 +++++++++++++++++----------------- tools/winedump/winedump.h | 2 +- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f263390..7ca4dc0 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -154,7 +154,7 @@ const char* get_symbol_str(const char* symname) parsed_symbol symbol; symbol_init(&symbol, symname); - if (symbol_demangle(&symbol) == -1) + if (!symbol_demangle(&symbol)) ret = symname; else if (symbol.flags & SYM_DATA) { diff --git a/tools/winedump/main.c b/tools/winedump/main.c index ca2047b..dfd15b0 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -444,17 +444,14 @@ int main (int argc, char *argv[]) if (globals.do_code && symbol_searched(count, symbol.symbol)) { /* Attempt to get information about the symbol */ - int result = symbol_demangle (&symbol); + BOOL result = symbol_demangle (&symbol) || symbol_search(&symbol); - if (result) - result = !symbol_search (&symbol); - - if (!result && symbol.function_name) + if (result && symbol.function_name) /* Clean up the prototype */ symbol_clean_string (symbol.function_name); if (NORMAL) - puts (result ? "[Not Found]" : "[OK]"); + puts (result ? "[OK]" : "[Not Found]"); } else if (NORMAL) puts ("[Ignoring]"); diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index a0d9f92..39e4f3a 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -63,7 +63,7 @@ static char *get_pointer_type_string (compound_type *ct, * * Demangle a C++ linker symbol into a C prototype */ -int symbol_demangle (parsed_symbol *sym) +BOOL symbol_demangle (parsed_symbol *sym) { compound_type ct; BOOL is_static = FALSE; @@ -83,7 +83,7 @@ int symbol_demangle (parsed_symbol *sym) /* MS mangled names always begin with '?' */ name = sym->symbol; if (*name++ != '?') - return -1; + return FALSE; if (VERBOSE) puts ("Attempting to demangle symbol"); @@ -162,12 +162,12 @@ int symbol_demangle (parsed_symbol *sym) case 'X': function_name = strdup ("placement_new_closure"); break; case 'Y': function_name = strdup ("placement_delete_closure"); break; default: - return -1; + return FALSE; } break; default: /* FIXME: Other operators */ - return -1; + return FALSE; } name++; } @@ -177,7 +177,7 @@ int symbol_demangle (parsed_symbol *sym) function_name = name; while (*name && *name++ != '@') ; if (!*name) - return -1; + return FALSE; function_name = str_substring (function_name, name - 1); } @@ -194,7 +194,7 @@ int symbol_demangle (parsed_symbol *sym) while (*name && *name++ != '@') ; if (*name++ != '@') { free (function_name); - return -1; + return FALSE; } class_name = str_substring (class_name, name - 2); /* Allocates a new string */ } @@ -220,7 +220,7 @@ int symbol_demangle (parsed_symbol *sym) printf ("/*FIXME: %s: unknown data*/\n", sym->symbol); free (function_name); free (class_name); - return -1; + return FALSE; } sym->flags |= SYM_DATA; sym->argc = 1; @@ -230,7 +230,7 @@ int symbol_demangle (parsed_symbol *sym) FREE_CT (ct); free (function_name); free (class_name); - return 0; + return TRUE; case '6' : /* compiler generated static */ case '7' : /* compiler generated static */ @@ -246,11 +246,11 @@ int symbol_demangle (parsed_symbol *sym) puts ("Demangled symbol OK [vtable]"); free (function_name); free (class_name); - return 0; + return TRUE; } free (function_name); free (class_name); - return -1; + return FALSE; /* Functions */ @@ -295,7 +295,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } /* If there is an implicit this pointer, const status follows */ @@ -310,7 +310,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } } @@ -342,7 +342,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } /* Return type, or @ if 'void' */ @@ -358,7 +358,7 @@ int symbol_demangle (parsed_symbol *sym) if (!demangle_datatype (&name, &ct, sym)) { free (function_name); free (class_name); - return -1; + return FALSE; } sym->return_text = ct.expression; sym->return_type = get_type_constant(ct.dest_type, ct.flags); @@ -376,7 +376,7 @@ int symbol_demangle (parsed_symbol *sym) if (!demangle_datatype(&name, &ct, sym)) { free (function_name); free (class_name); - return -1; + return FALSE; } if (strcmp (ct.expression, "void")) @@ -405,7 +405,7 @@ int symbol_demangle (parsed_symbol *sym) if (*name != 'Z') { free (function_name); free (class_name); - return -1; + return FALSE; } /* Note: '()' after 'Z' means 'throws', but we don't care here */ @@ -433,7 +433,7 @@ int symbol_demangle (parsed_symbol *sym) if (VERBOSE) puts ("Demangled symbol OK"); - return 0; + return TRUE; } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 754a7d2..88fa0e7 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -164,7 +164,7 @@ BOOL dll_next_symbol (parsed_symbol * sym); /* Symbol functions */ void symbol_init(parsed_symbol* symbol, const char* name); -int symbol_demangle (parsed_symbol *symbol); +BOOL symbol_demangle (parsed_symbol *symbol); BOOL symbol_search (parsed_symbol *symbol);

1 0

Michael Stefaniuc : dmscript: Return CLASS_E_CLASSNOTAVAILABLE for classes not implemented.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 1643038eca27f31c4c10487268107946483550cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1643038eca27f31c4c1048726… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 13 21:53:11 2014 +0100 dmscript: Return CLASS_E_CLASSNOTAVAILABLE for classes not implemented. --- dlls/dmscript/dmscript_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index e3dc8b7..6caf158 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -37,7 +37,7 @@ static HRESULT WINAPI create_unimpl_instance(REFIID riid, void **ppv, IUnknown * { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Ken Thomases : winemac: When clearing the OpenGL context, disassociate it from its view.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 18963963306cbb75d409189da8ec2df219850d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18963963306cbb75d409189da… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:24:57 2014 -0600 winemac: When clearing the OpenGL context, disassociate it from its view. --- dlls/winemac.drv/cocoa_opengl.m | 41 +++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index f546be5..0b67ed1 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -90,6 +90,23 @@ } } + - (void) removeFromViews:(BOOL)removeViews + { + if ([self view]) + { + macdrv_remove_view_opengl_context((macdrv_view)[self view], (macdrv_opengl_context)self); + if (removeViews) + [self clearDrawableLeavingSurfaceOnScreen]; + } + if ([self latentView]) + { + macdrv_remove_view_opengl_context((macdrv_view)[self latentView], (macdrv_opengl_context)self); + if (removeViews) + [self setLatentView:nil]; + } + needsUpdate = FALSE; + } + @end @@ -122,11 +139,7 @@ void macdrv_dispose_opengl_context(macdrv_opengl_context c) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineOpenGLContext *context = (WineOpenGLContext*)c; - if ([context view]) - macdrv_remove_view_opengl_context((macdrv_view)[context view], c); - if ([context latentView]) - macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - [context clearDrawableLeavingSurfaceOnScreen]; + [context removeFromViews:YES]; [context release]; [pool release]; @@ -143,11 +156,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) if (context) { - if ([context view]) - macdrv_remove_view_opengl_context((macdrv_view)[context view], c); - if ([context latentView]) - macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - context.needsUpdate = FALSE; + [context removeFromViews:NO]; if (view) { macdrv_add_view_opengl_context(v, c); @@ -169,11 +178,19 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) else { [WineOpenGLContext clearCurrentContext]; - [context clearDrawableLeavingSurfaceOnScreen]; + [context removeFromViews:YES]; } } else - [WineOpenGLContext clearCurrentContext]; + { + WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext]; + + if ([currentContext isKindOfClass:[WineOpenGLContext class]]) + { + [WineOpenGLContext clearCurrentContext]; + [currentContext removeFromViews:YES]; + } + } [pool release]; }

1 0

Ken Thomases : winemac: When setting a view for an OpenGL context and it is latent, clear any existing view.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: d57a99b48274e2020382465bccc69df5aa24630e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57a99b48274e2020382465bc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:01 2014 -0600 winemac: When setting a view for an OpenGL context and it is latent, clear any existing view. --- dlls/winemac.drv/cocoa_opengl.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 0b67ed1..752fb77 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -168,7 +168,11 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) [context setLatentView:nil]; } else + { + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; [context setLatentView:view]; + } [context makeCurrentContext];

1 0

Ken Thomases : winemac: Consolidate code paths for clearing the OpenGL context.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 2cc53379404bfb499461add373ddb42c77d224b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc53379404bfb499461add37… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:03 2014 -0600 winemac: Consolidate code paths for clearing the OpenGL context. We clear it if the context or the view is NULL. If the context is non-NULL, we want to disassociate the views of both the current and passed-in contexts, if they differ. --- dlls/winemac.drv/cocoa_opengl.m | 44 ++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 752fb77..196da46 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -154,36 +154,28 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) WineOpenGLContext *context = (WineOpenGLContext*)c; NSView* view = (NSView*)v; - if (context) + if (context && view) { [context removeFromViews:NO]; - if (view) - { - macdrv_add_view_opengl_context(v, c); - - if (context.needsUpdate) - { - context.needsUpdate = FALSE; - [context setView:view]; - [context setLatentView:nil]; - } - else - { - if ([context view]) - [context clearDrawableLeavingSurfaceOnScreen]; - [context setLatentView:view]; - } + macdrv_add_view_opengl_context(v, c); - [context makeCurrentContext]; - - if ([context view]) - [context clearToBlackIfNeeded]; + if (context.needsUpdate) + { + context.needsUpdate = FALSE; + [context setView:view]; + [context setLatentView:nil]; } else { - [WineOpenGLContext clearCurrentContext]; - [context removeFromViews:YES]; + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; + [context setLatentView:view]; } + + [context makeCurrentContext]; + + if ([context view]) + [context clearToBlackIfNeeded]; } else { @@ -192,8 +184,12 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) if ([currentContext isKindOfClass:[WineOpenGLContext class]]) { [WineOpenGLContext clearCurrentContext]; - [currentContext removeFromViews:YES]; + if (currentContext != context) + [currentContext removeFromViews:YES]; } + + if (context) + [context removeFromViews:YES]; } [pool release];

1 0