January 2014 - Wine-Commits

Stefan Dösinger : wined3d: Add a map_binding field to surfaces.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 1046551c347ceaf357a0fc2095d529dc4472b3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1046551c347ceaf357a0fc209… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:40 2014 +0100 wined3d: Add a map_binding field to surfaces. Buffers, heap memory, user memory and DIBs will have their own locations. This field specifies which location is used when the surface is mapped. --- dlls/wined3d/surface.c | 100 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 832caa5..b6dcb95 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -797,47 +797,55 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); surface_prepare_system_memory(surface); - surface_validate_location(surface, SFLAG_INSYSMEM); + surface_validate_location(surface, surface->map_binding); } else { if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~surface->map_binding); - if (surface->flags & SFLAG_PBO) + switch (surface->map_binding) { - BYTE *ret; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + case SFLAG_INSYSMEM: + if (surface->flags & SFLAG_PBO) + { + BYTE *ret; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; - context = context_acquire(device, NULL); - gl_info = context->gl_info; + context = context_acquire(device, NULL); + gl_info = context->gl_info; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + checkGLcall("glBindBufferARB"); - ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - checkGLcall("glMapBufferARB"); + ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + checkGLcall("glMapBufferARB"); - /* Make sure the PBO isn't set anymore in order not to break non-PBO - * calls. */ - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); + /* Make sure the PBO isn't set anymore in order not to break non-PBO + * calls. */ + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); - context_release(context); - return ret; - } + context_release(context); + return ret; + } - if (surface->user_memory) - return surface->user_memory; + if (surface->user_memory) + return surface->user_memory; + + return surface->resource.allocatedMemory; - return surface->resource.allocatedMemory; + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + return NULL; + } } static void surface_unmap(struct wined3d_surface *surface) @@ -848,21 +856,29 @@ static void surface_unmap(struct wined3d_surface *surface) memset(&surface->lockedRect, 0, sizeof(surface->lockedRect)); - if (surface->flags & SFLAG_PBO) + switch (surface->map_binding) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + case SFLAG_INSYSMEM: + if (surface->flags & SFLAG_PBO) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; - TRACE("Freeing PBO memory.\n"); + TRACE("Freeing PBO memory.\n"); - context = context_acquire(device, NULL); - gl_info = context->gl_info; + context = context_acquire(device, NULL); + gl_info = context->gl_info; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glUnmapBufferARB"); - context_release(context); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glUnmapBufferARB"); + context_release(context); + } + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); } TRACE("dirtyfied %u.\n", surface->flags & (SFLAG_INDRAWABLE | SFLAG_INTEXTURE) ? 0 : 1); @@ -1497,10 +1513,18 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - if (surface->user_memory) - return surface->user_memory; + switch (surface->map_binding) + { + case SFLAG_INSYSMEM: + if (surface->user_memory) + return surface->user_memory; - return surface->resource.allocatedMemory; + return surface->resource.allocatedMemory; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + return NULL; + } } static void gdi_surface_unmap(struct wined3d_surface *surface) @@ -6397,6 +6421,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->resource.allocatedMemory = surface->dib.bitmap_data; } + surface->map_binding = SFLAG_INSYSMEM; + return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b985745..3dc735d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2192,7 +2192,7 @@ struct wined3d_surface struct wined3d_texture *container; struct wined3d_swapchain *swapchain; struct wined3d_palette *palette; /* D3D7 style palette handling */ - DWORD draw_binding; + DWORD draw_binding, map_binding; void *user_memory; DWORD flags;

1 0

Dmitry Timoshkov : advapi32/tests: Add access tests for a file mapping.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 4229da7caecac5f906e13b1d472f0b77f10cedf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4229da7caecac5f906e13b1d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:11 2014 +0900 advapi32/tests: Add access tests for a file mapping. --- dlls/advapi32/tests/security.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 274aee7..e6ae638 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4898,6 +4898,58 @@ todo_wine CloseHandle(file); } +static void test_filemap_security(void) +{ + DWORD ret, i, access; + HANDLE mapping, dup; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | SECTION_QUERY | SECTION_MAP_READ }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, + { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } + }; + + SetLastError(0xdeadbeef); + mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); + if (mapping) + { + access = get_obj_access(mapping); +todo_wine + ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), + "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); + } + else /* win2k fails to create EXECUTE mapping using system page file */ + { + SetLastError(0xdeadbeef); + mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); + ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + + access = get_obj_access(mapping); + ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE), + "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, got %#x\n", access); + } + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), mapping, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(mapping); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4973,6 +5025,7 @@ static void test_kernel_objects_security(void) test_named_pipe_security(token); test_semaphore_security(token); test_file_security(token); + test_filemap_security(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Dmitry Timoshkov : advapi32/tests: Add a test for opening an event with access 0.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: b5c9bdaddba27c607c13d0d70e0777ecef4a46ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c9bdaddba27c607c13d0d70… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:02 2014 +0900 advapi32/tests: Add a test for opening an event with access 0. --- dlls/advapi32/tests/security.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 32aa395..df02d85 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4624,6 +4624,13 @@ todo_wine ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); + + SetLastError(0xdeadbeef); + dup = OpenEventA(0, FALSE, "WineTestEvent"); +todo_wine + ok(!dup, "OpenEvent should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); } test_default_handle_security(token, event, &mapping);

1 0

Michael Stefaniuc : dmime/tests: COM tests for the different DirectMusic*Tracks.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 13dfc393dee4f0feb412a5209e7282e6126ae915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13dfc393dee4f0feb412a5209… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:47:03 2014 +0100 dmime/tests: COM tests for the different DirectMusic*Tracks. --- dlls/dmime/tests/dmime.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index ab0b293..df11c0d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -23,6 +23,8 @@ #include <wine/test.h> #include <dmusici.h> +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + static BOOL missing_dmime(void) { IDirectMusicSegment8 *dms; @@ -130,6 +132,77 @@ static void test_COM_segmentstate(void) while (IDirectMusicSegmentState8_Release(dmss8)); } +static void test_COM_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + } class[] = { + { X(DirectMusicLyricsTrack) }, + { X(DirectMusicMarkerTrack) }, + { X(DirectMusicParamControlTrack) }, + { X(DirectMusicSegmentTriggerTrack) }, + { X(DirectMusicSeqTrack) }, + { X(DirectMusicSysExTrack) }, + { X(DirectMusicTempoTrack) }, + { X(DirectMusicTimeSigTrack) }, + { X(DirectMusicWaveTrack) } + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + /* COM aggregation */ + dmt8 = (IDirectMusicTrack8*)0xdeadbeef; + hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dmt8); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("%s not registered\n", class[i].name); + continue; + } + ok(hr == CLASS_E_NOAGGREGATION, + "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + ok(!dmt8, "dmt8 = %p\n", dmt8); + + /* Invalid RIID */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dmt8); + ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", + class[i].name, hr); + + /* Same refcount for all DirectMusicTrack interfaces */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + refcount = IDirectMusicTrack8_AddRef(dmt8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmime) { CoInitialize(NULL); @@ -142,6 +215,7 @@ START_TEST(dmime) } test_COM_segment(); test_COM_segmentstate(); + test_COM_track(); CoUninitialize(); }

1 0

Ken Thomases : winemac: Simplify display mode code.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: ce5a87b1efeab009b32f4ccdfcdec46118723f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5a87b1efeab009b32f4ccdf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:33 2014 -0600 winemac: Simplify display mode code. When originalDisplayModes has entries, the app is active. When the app is active, latentDisplayModes is empty. --- dlls/winemac.drv/cocoa_app.m | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 13d9c87..d499fd1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -709,7 +709,6 @@ int macdrv_err_on; - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID { BOOL ret = FALSE; - BOOL active = [NSApp isActive]; NSNumber* displayIDKey = [NSNumber numberWithUnsignedInt:displayID]; CGDisplayModeRef originalMode; @@ -719,39 +718,28 @@ int macdrv_err_on; { if ([originalDisplayModes count] == 1) // If this is the last changed display, do a blanket reset { - if (active) - { - CGRestorePermanentDisplayConfiguration(); - if (!displaysCapturedForFullscreen) - CGReleaseAllDisplays(); - } + CGRestorePermanentDisplayConfiguration(); + if (!displaysCapturedForFullscreen) + CGReleaseAllDisplays(); [originalDisplayModes removeAllObjects]; - [latentDisplayModes removeAllObjects]; ret = TRUE; } else // ... otherwise, try to restore just the one display { - if (active) + mode = [self modeMatchingMode:mode forDisplay:displayID]; + if (mode && CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) { - mode = [self modeMatchingMode:mode forDisplay:displayID]; - if (mode) - ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); - } - else - { - [latentDisplayModes removeObjectForKey:displayIDKey]; + [originalDisplayModes removeObjectForKey:displayIDKey]; ret = TRUE; } - if (ret) - [originalDisplayModes removeObjectForKey:displayIDKey]; } } else { - CGDisplayModeRef currentMode = NULL; + BOOL active = [NSApp isActive]; + CGDisplayModeRef currentMode; - if (!active) - currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); + currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); if (!currentMode) currentMode = CGDisplayCopyDisplayMode(displayID); if (!currentMode) // Invalid display ID @@ -790,7 +778,6 @@ int macdrv_err_on; else if (![originalDisplayModes count]) { CGRestorePermanentDisplayConfiguration(); - [latentDisplayModes removeAllObjects]; if (!displaysCapturedForFullscreen) CGReleaseAllDisplays(); }

1 0

Henri Verbeet : wined3d: Place the cursor texture in the default pool.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: f8e62bc5962bc71ed584fd35329aba180f5e9df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e62bc5962bc71ed584fd353… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:02 2014 +0100 wined3d: Place the cursor texture in the default pool. --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 925f879..40790c1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3809,8 +3809,8 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.format = WINED3DFMT_B8G8R8A8_UNORM; desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = 0; - desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.pool = WINED3D_POOL_DEFAULT; desc.width = cursor_image->resource.width; desc.height = cursor_image->resource.height; desc.depth = 1; @@ -3825,7 +3825,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined } surface = surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); - if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, 0))) + if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, WINED3D_MAP_DISCARD))) { ERR("Failed to map destination surface.\n"); wined3d_texture_decref(texture);

1 0

Henri Verbeet : wined3d: Place the logo texture in the default pool.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 06d6bdae4ae23ca47bf64c5252af1e393bb60eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d6bdae4ae23ca47bf64c525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:03 2014 +0100 wined3d: Place the logo texture in the default pool. --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 40790c1..ecad608 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -580,8 +580,8 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.format = WINED3DFMT_B5G6R5_UNORM; desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = 0; - desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.pool = WINED3D_POOL_DEFAULT; desc.width = bm.bmWidth; desc.height = bm.bmHeight; desc.depth = 1;

1 0

Henri Verbeet : wined3d: Make rebind_fbo in struct wined3d_context a bitfield.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 5dd286d05a6dcd3c58922b77a29ba21ddeeb4f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd286d05a6dcd3c58922b77a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:05 2014 +0100 wined3d: Make rebind_fbo in struct wined3d_context a bitfield. --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c10f120..b985745 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1083,7 +1083,8 @@ struct wined3d_context DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ - DWORD padding : 20; + DWORD rebind_fbo : 1; + DWORD padding : 19; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1116,7 +1117,6 @@ struct wined3d_context struct fbo_entry *current_fbo; GLuint fbo_read_binding; GLuint fbo_draw_binding; - BOOL rebind_fbo; struct wined3d_surface **blit_targets; GLenum *draw_buffers; DWORD draw_buffers_mask; /* Enabled draw buffers, 31 max. */

1 0

Michael Stefaniuc : dmime/tests: COM tests for DirectMusicGraph.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 0991d3a9bc2de01a011a5b36cd7b688e51ab2621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0991d3a9bc2de01a011a5b36c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 10:48:05 2014 +0100 dmime/tests: COM tests for DirectMusicGraph. --- dlls/dmime/tests/dmime.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index df11c0d..7c3500d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -39,6 +39,59 @@ static BOOL missing_dmime(void) return TRUE; } +static void test_COM_graph(void) +{ + IDirectMusicGraph *dmg = (IDirectMusicGraph*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown*)&dmg, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmg); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicGraph create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmg, "dmg = %p\n", dmg); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&dmg); + ok(hr == E_NOINTERFACE, "DirectMusicGraph create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicGraph interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicGraph, (void**)&dmg); + ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicGraph_AddRef(dmg); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IDirectMusicObject, (void**)&dmo); + if (hr == E_NOINTERFACE) { + win_skip("DirectMusicGraph without IDirectMusicObject\n"); + return; + } + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicGraph_Release(dmg)); +} + static void test_COM_segment(void) { IDirectMusicSegment8 *dms = (IDirectMusicSegment8*)0xdeadbeef; @@ -213,6 +266,7 @@ START_TEST(dmime) CoUninitialize(); return; } + test_COM_graph(); test_COM_segment(); test_COM_segmentstate(); test_COM_track();

1 0

Alexandre Julliard : makedep: Expand the script names into the generated rules.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: master Commit: 09a75310daf932663683d78ba3969884ca8adbfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a75310daf932663683d78ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 12:53:15 2014 +0100 makedep: Expand the script names into the generated rules. --- Make.vars.in | 3 --- tools/makedep.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index d704687..75cb1e6 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -50,9 +50,6 @@ CROSSTARGET = @CROSSTARGET@ LINGUAS = @LINGUAS@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) PORCFLAGS = @PORCFLAGS@ -BUILDIMAGE = $(top_srcdir)/tools/buildimage -C2MAN = $(top_srcdir)/tools/c2man.pl -RUNTEST = $(top_srcdir)/tools/runtest RUNTESTFLAGS = -q -P wine MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT) MAKEXFTMPL = $(TOOLSDIR)/tools/make_xftmpl$(TOOLSEXT) diff --git a/tools/makedep.c b/tools/makedep.c index c06f80c..c968187 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1585,8 +1585,8 @@ static struct strarray output_sources(void) if (convert && rsvg && icotool && !src_dir) { output( "%s.ico %s.bmp: %s\n", obj, obj, source->filename ); - output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" $(BUILDIMAGE) %s $@\n", - convert, icotool, rsvg, source->filename ); + output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", + convert, icotool, rsvg, top_dir_path( "tools/buildimage" ), source->filename ); } free( convert ); free( rsvg ); @@ -1631,7 +1631,8 @@ static struct strarray output_sources(void) { strarray_add( &test_files, source->name ); output( "%s.ok:\n", obj ); - output( "\t$(RUNTEST) $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", top_obj_dir, + output( "\t%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", + top_dir_path( "tools/runtest" ), top_obj_dir, testdll, replace_extension( testdll, ".dll", "_test.exe" ), dllext, obj ); } if (!strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED)) @@ -1784,25 +1785,25 @@ static struct strarray output_sources(void) char *manext = get_expanded_make_variable( "api_manext" ); output( "manpages::\n" ); - output( "\t$(C2MAN) -w %s -R%s", spec_file, top_obj_dir ); + output( "\t%s -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); output_filename( strmake( "-I%s", top_dir_path( "include" ))); output_filename( strmake( "-o %s/documentation/man%s", top_obj_dir, manext ? manext : "3w" )); output_filenames( c2man_files ); output( "\n" ); output( "htmlpages::\n" ); - output( "\t$(C2MAN) -Th -w %s -R%s", spec_file, top_obj_dir ); + output( "\t%s -Th -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); output_filename( strmake( "-I%s", top_dir_path( "include" ))); output_filename( strmake( "-o %s/documentation/html", top_obj_dir )); output_filenames( c2man_files ); output( "\n" ); output( "sgmlpages::\n" ); - output( "\t$(C2MAN) -Ts -w %s -R%s", spec_file, top_obj_dir ); + output( "\t%s -Ts -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); output_filename( strmake( "-I%s", top_dir_path( "include" ))); output_filename( strmake( "-o %s/documentation/api-guide", top_obj_dir )); output_filenames( c2man_files ); output( "\n" ); output( "xmlpages::\n" ); - output( "\t$(C2MAN) -Tx -w %s -R%s", spec_file, top_obj_dir ); + output( "\t%s -Tx -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); output_filename( strmake( "-I%s", top_dir_path( "include" ))); output_filename( strmake( "-o %s/documentation/api-guide-xml", top_obj_dir )); output_filenames( c2man_files );

1 0