wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

André Hentschel : winmm: Remove dead initialization ( clang).
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: e70de44edf80e685b65044d87438447bbadb81ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70de44edf80e685b65044d87… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 5 21:37:32 2011 +0200 winmm: Remove dead initialization (clang). --- dlls/winmm/mci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 10dd76a..15ff6ed 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1870,7 +1870,7 @@ static DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr) static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParms) { DWORD ret = MCIERR_INVALID_DEVICE_ID, cnt = 0; - WCHAR buf[2048], *s = buf, *p; + WCHAR buf[2048], *s, *p; LPWINE_MCIDRIVER wmd; HKEY hKey;

1 0

André Hentschel : winefile: Remove dead initialization (clang).
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 16955095adc1ca0473db45197e69688e3f2c7840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16955095adc1ca0473db45197… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 5 21:37:27 2011 +0200 winefile: Remove dead initialization (clang). --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 1b56308..c74c21e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1178,7 +1178,7 @@ static int (*sortFunctions[])(const void* arg1, const void* arg2) = { static void SortDirectory(Entry* dir, SORT_ORDER sortOrder) { - Entry* entry = dir->down; + Entry* entry; Entry** array, **p; int len;

1 0

Lucas Fialho Zawacki : include: Corrected the value of the DIEDFL_ATTACHEDONLY flag.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 513c9c2f2bf781396c3b6a639af699556a087c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513c9c2f2bf781396c3b6a639… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Wed Jul 6 01:25:39 2011 -0300 include: Corrected the value of the DIEDFL_ATTACHEDONLY flag. --- include/dinput.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index 754b2c4..dc82622 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -186,7 +186,7 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DIENUM_CONTINUE 1 #define DIEDFL_ALLDEVICES 0x00000000 -#define DIEDFL_ATTACHEDONLY 0x00000000 +#define DIEDFL_ATTACHEDONLY 0x00000001 #define DIEDFL_FORCEFEEDBACK 0x00000100 #define DIEDFL_INCLUDEALIASES 0x00010000 #define DIEDFL_INCLUDEPHANTOMS 0x00020000

1 0

Detlef Riekenberg : include: Add definitions and declarations for SRW lock.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 3fc84d486235470bcafc502db48507aa85824e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc84d486235470bcafc502db… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 6 01:10:22 2011 +0200 include: Add definitions and declarations for SRW lock. --- include/winbase.h | 10 ++++++++++ include/winnt.h | 6 ++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index adf7341..a37d073 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -58,6 +58,9 @@ typedef PRTL_CRITICAL_SECTION_DEBUG LPCRITICAL_SECTION_DEBUG; #define CRITICAL_SECTION_NO_DEBUG_INFO RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO +typedef RTL_SRWLOCK SRWLOCK; +typedef PRTL_SRWLOCK PSRWLOCK; + typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK; #define EXCEPTION_DEBUG_EVENT 1 @@ -1326,6 +1329,8 @@ WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPST WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); #define AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm) WINADVAPI BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); +WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK); +WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK); WINADVAPI BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); WINADVAPI BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *); WINADVAPI BOOL WINAPI AllocateLocallyUniqueId(PLUID); @@ -1860,6 +1865,7 @@ WINBASEAPI BOOL WINAPI InitializeCriticalSectionEx(CRITICAL_SECTION *,DWO WINADVAPI BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); WINADVAPI BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); WINBASEAPI VOID WINAPI InitializeSListHead(PSLIST_HEADER); +WINBASEAPI VOID WINAPI InitializeSRWLock(PSRWLOCK); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); @@ -2034,6 +2040,8 @@ WINBASEAPI HANDLE WINAPI RegisterWaitForSingleObjectEx(HANDLE,WAITORTIMERCA WINBASEAPI VOID WINAPI ReleaseActCtx(HANDLE); WINBASEAPI BOOL WINAPI ReleaseMutex(HANDLE); WINBASEAPI BOOL WINAPI ReleaseSemaphore(HANDLE,LONG,LPLONG); +WINBASEAPI VOID WINAPI ReleaseSRWLockExclusive(PSRWLOCK); +WINBASEAPI VOID WINAPI ReleaseSRWLockShared(PSRWLOCK); WINBASEAPI ULONG WINAPI RemoveVectoredExceptionHandler(PVOID); WINBASEAPI BOOL WINAPI ReplaceFileA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPVOID,LPVOID); WINBASEAPI BOOL WINAPI ReplaceFileW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPVOID,LPVOID); @@ -2154,6 +2162,8 @@ WINBASEAPI LPVOID WINAPI TlsGetValue(DWORD); WINBASEAPI BOOL WINAPI TlsSetValue(DWORD,LPVOID); WINBASEAPI BOOL WINAPI TransactNamedPipe(HANDLE,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI TransmitCommChar(HANDLE,CHAR); +WINBASEAPI BOOL WINAPI TryAcquireSRWLockExclusive(PSRWLOCK); +WINBASEAPI BOOL WINAPI TryAcquireSRWLockShared(PSRWLOCK); WINBASEAPI BOOL WINAPI TryEnterCriticalSection(CRITICAL_SECTION *lpCrit); WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); WINBASEAPI LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS); diff --git a/include/winnt.h b/include/winnt.h index 11f1ea2..73a2ae8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5354,6 +5354,12 @@ typedef struct _RTL_CRITICAL_SECTION { #define RTL_CRITICAL_SECTION_ALL_FLAG_BITS 0xFF000000 #define RTL_CRITICAL_SECTION_FLAG_RESERVED (RTL_CRITICAL_SECTION_ALL_FLAG_BITS & ~0x7000000) +typedef struct _RTL_SRWLOCK { + PVOID Ptr; +} RTL_SRWLOCK, *PRTL_SRWLOCK; + +#define RTL_SRWLOCK_INIT {0} + typedef VOID (NTAPI * WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); typedef VOID (NTAPI * PFLS_CALLBACK_FUNCTION) ( PVOID );

1 0

Henri Verbeet : wined3d: Pass a state pointer instead of a device pointer to device_get_draw_rect() .
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: c0aa053a879980ffedbd049c27dd2ca37136b890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0aa053a879980ffedbd049c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 5 22:30:57 2011 +0200 wined3d: Pass a state pointer instead of a device pointer to device_get_draw_rect(). --- dlls/wined3d/device.c | 15 +-------------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/utils.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9b41d0..a7e578a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -557,19 +557,6 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context device->contexts = new_array; } -void device_get_draw_rect(struct wined3d_device *device, RECT *rect) -{ - struct wined3d_stateblock *stateblock = device->stateBlock; - WINED3DVIEWPORT *vp = &stateblock->state.viewport; - - SetRect(rect, vp->X, vp->Y, vp->X + vp->Width, vp->Y + vp->Height); - - if (stateblock->state.render_states[WINED3DRS_SCISSORTESTENABLE]) - { - IntersectRect(rect, rect, &stateblock->state.scissor_rect); - } -} - /* Do not call while under the GL lock. */ void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) @@ -4040,7 +4027,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } } - device_get_draw_rect(device, &draw_rect); + wined3d_get_draw_rect(&device->stateBlock->state, &draw_rect); return device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, &device->fb, rect_count, rects, diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3d86782..58babb4 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -639,7 +639,7 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId else SetRectEmpty(&current_rect); - device_get_draw_rect(device, &draw_rect); + wined3d_get_draw_rect(state, &draw_rect); IntersectRect(&r, &draw_rect, &current_rect); if (!EqualRect(&r, &draw_rect)) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9a76f00..4d9a9a3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3246,3 +3246,13 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g return NULL; } + +void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) +{ + const WINED3DVIEWPORT *vp = &state->viewport; + + SetRect(rect, vp->X, vp->Y, vp->X + vp->Width, vp->Y + vp->Height); + + if (state->render_states[WINED3DRS_SCISSORTESTENABLE]) + IntersectRect(rect, rect, &state->scissor_rect); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4984d16..4000ed2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1596,6 +1596,7 @@ void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_s const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN; void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; +void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) DECLSPEC_HIDDEN; struct wined3d { @@ -1749,7 +1750,6 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count const WINED3DCOLORVALUE *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void device_get_draw_rect(struct wined3d_device *device, RECT *rect) DECLSPEC_HIDDEN; HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Remove the unused currentPatch field from struct wined3d_device.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: a7120866be753d2350c0c97b8133875597a76c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7120866be753d2350c0c97b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 5 22:30:56 2011 +0200 wined3d: Remove the unused currentPatch field from struct wined3d_device. --- dlls/wined3d/device.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7d9dd9f..f9b41d0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4943,12 +4943,10 @@ HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT } } - device->currentPatch = patch; old_primitive_type = device->stateBlock->state.gl_primitive_type; device->stateBlock->state.gl_primitive_type = GL_TRIANGLES; wined3d_device_draw_primitive_strided(device, patch->numSegs[0] * patch->numSegs[1] * 2 * 3, &patch->strided); device->stateBlock->state.gl_primitive_type = old_primitive_type; - device->currentPatch = NULL; /* Destroy uncached patches */ if (!handle) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea5aa50..4984d16 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1742,7 +1742,6 @@ struct wined3d_device #define PATCHMAP_SIZE 43 #define PATCHMAP_HASHFUNC(x) ((x) % PATCHMAP_SIZE) /* Primitive and simple function */ struct list patches[PATCHMAP_SIZE]; - struct WineD3DRectPatch *currentPatch; }; HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb,

1 0

Henri Verbeet : wined3d: Explicitly pass device and state to gen_ffp_frag_op().
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 0df3db37ac2fb3814f0793833c52e52a1feabdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df3db37ac2fb3814f0793833… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 5 22:30:55 2011 +0200 wined3d: Explicitly pass device and state to gen_ffp_frag_op(). --- dlls/wined3d/arb_program_shader.c | 8 +++-- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/utils.c | 62 +++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0df3db37ac2fb3814f079…

1 0

Henri Verbeet : wined3d: Rename "flag" to "location" in surface_load_location().
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 3ccf12a77c166b2bbbffd14d70546f05b11f0201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccf12a77c166b2bbbffd14d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 5 22:30:54 2011 +0200 wined3d: Rename "flag" to "location" in surface_load_location(). This makes much more sense. --- dlls/wined3d/surface.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 46d2b84..439cb2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6149,18 +6149,18 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, return WINED3D_OK; } -HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const RECT *rect) +HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, const RECT *rect) { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL in_fbo = FALSE; HRESULT hr; - TRACE("surface %p, location %s, rect %s.\n", surface, debug_surflocation(flag), wine_dbgstr_rect(rect)); + TRACE("surface %p, location %s, rect %s.\n", surface, debug_surflocation(location), wine_dbgstr_rect(rect)); if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (flag == SFLAG_INTEXTURE) + if (location == SFLAG_INTEXTURE) { struct wined3d_context *context = context_acquire(device, NULL); surface_load_ds_location(surface, context, SFLAG_DS_OFFSCREEN); @@ -6169,7 +6169,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const } else { - FIXME("Unimplemented location %s for depth/stencil buffers.\n", debug_surflocation(flag)); + FIXME("Unimplemented location %s for depth/stencil buffers.\n", debug_surflocation(location)); return WINED3DERR_INVALIDCALL; } } @@ -6178,9 +6178,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const { if (surface_is_offscreen(surface)) { - /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. - * Prefer SFLAG_INTEXTURE. */ - if (flag == SFLAG_INDRAWABLE) flag = SFLAG_INTEXTURE; + /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same + * for offscreen targets. Prefer SFLAG_INTEXTURE. */ + if (location == SFLAG_INDRAWABLE) + location = SFLAG_INTEXTURE; in_fbo = TRUE; } else @@ -6189,20 +6190,18 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const } } - if (flag == SFLAG_INSRGBTEX && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - { - flag = SFLAG_INTEXTURE; - } + if (location == SFLAG_INSRGBTEX && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + location = SFLAG_INTEXTURE; - if (surface->flags & flag) + if (surface->flags & location) { - TRACE("Location already up to date\n"); + TRACE("Location already up to date.\n"); return WINED3D_OK; } if (WARN_ON(d3d_surface)) { - DWORD required_access = resource_access_from_location(flag); + DWORD required_access = resource_access_from_location(location); if ((surface->resource.access_flags & required_access) != required_access) WARN("Operation requires %#x access, but surface only has %#x.\n", required_access, surface->resource.access_flags); @@ -6215,7 +6214,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const return WINED3DERR_DEVICELOST; } - switch (flag) + switch (location) { case SFLAG_INSYSMEM: surface_load_sysmem(surface, gl_info, rect); @@ -6228,20 +6227,20 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const case SFLAG_INTEXTURE: case SFLAG_INSRGBTEX: - if (FAILED(hr = surface_load_texture(surface, gl_info, rect, flag == SFLAG_INSRGBTEX))) + if (FAILED(hr = surface_load_texture(surface, gl_info, rect, location == SFLAG_INSRGBTEX))) return hr; break; default: - ERR("Don't know how to handle location %#x.\n", flag); + ERR("Don't know how to handle location %#x.\n", location); break; } if (!rect) { - surface->flags |= flag; + surface->flags |= location; - if (flag != SFLAG_INSYSMEM && (surface->flags & SFLAG_INSYSMEM)) + if (location != SFLAG_INSYSMEM && (surface->flags & SFLAG_INSYSMEM)) surface_evict_sysmem(surface); }

1 0

Henri Verbeet : wined3d: Make context_create() work if the window is already destroyed.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 590505c0a472badcecc1767d3be11eededa3651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=590505c0a472badcecc1767d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 5 22:30:53 2011 +0200 wined3d: Make context_create() work if the window is already destroyed. --- dlls/wined3d/context.c | 61 ++++++++++++++------------------------- dlls/wined3d/swapchain.c | 25 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7895156..9329977 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -713,58 +713,36 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) { + HDC dc; + WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", ctx->glCtx, ctx->hdc, GetLastError()); ctx->valid = 0; WARN("Trying fallback to the backup window.\n"); - if (!swapchain->backup_dc) + if (!(dc = swapchain_get_backup_dc(swapchain))) { - TRACE("Creating the backup window for swapchain %p.\n", swapchain); - swapchain->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", - WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); - if (!swapchain->backup_wnd) - { - ERR("Failed to create a window.\n"); - goto fail; - } - swapchain->backup_dc = GetDC(swapchain->backup_wnd); - if (!swapchain->backup_dc) - { - ERR("Failed to get a DC.\n"); - goto fail; - } - if (!context_set_pixel_format(ctx->gl_info, swapchain->backup_dc, ctx->pixel_format)) - { - ERR("Failed to set pixel format %d on device context %p.\n", - ctx->pixel_format, swapchain->backup_dc); - goto fail; - } + context_set_current(NULL); + return FALSE; + } + + if (!context_set_pixel_format(ctx->gl_info, dc, ctx->pixel_format)) + { + ERR("Failed to set pixel format %d on device context %p.\n", + ctx->pixel_format, dc); + context_set_current(NULL); + return FALSE; } - if (!pwglMakeCurrent(swapchain->backup_dc, ctx->glCtx)) + if (!pwglMakeCurrent(dc, ctx->glCtx)) { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - swapchain->backup_dc, GetLastError()); + dc, GetLastError()); context_set_current(NULL); return FALSE; } } return TRUE; - -fail: - if (swapchain->backup_dc) - { - ReleaseDC(swapchain->backup_wnd, swapchain->backup_dc); - swapchain->backup_dc = NULL; - } - if (swapchain->backup_wnd) - { - DestroyWindow(swapchain->backup_wnd); - swapchain->backup_wnd = NULL; - } - context_set_current(NULL); - return FALSE; } static void context_restore_gl_context(HDC dc, HGLRC gl_ctx) @@ -1272,8 +1250,13 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!(hdc = GetDC(swapchain->win_handle))) { - ERR("Failed to retrieve a device context.\n"); - goto out; + WARN("Failed to retireve device context, trying swapchain backup.\n"); + + if (!(hdc = swapchain_get_backup_dc(swapchain))) + { + ERR("Failed to retrieve a device context.\n"); + goto out; + } } color_format = target->resource.format; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dc1800a..5848f37 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1197,3 +1197,28 @@ void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, U *width = context->current_rt->resource.width; *height = context->current_rt->resource.height; } + +HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) +{ + if (!swapchain->backup_dc) + { + TRACE("Creating the backup window for swapchain %p.\n", swapchain); + + if (!(swapchain->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL))) + { + ERR("Failed to create a window.\n"); + return NULL; + } + + if (!(swapchain->backup_dc = GetDC(swapchain->backup_wnd))) + { + ERR("Failed to get a DC.\n"); + DestroyWindow(swapchain->backup_wnd); + swapchain->backup_wnd = NULL; + return NULL; + } + } + + return swapchain->backup_dc; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1fedc9c..7025faa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2455,6 +2455,7 @@ void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) D struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0

1 0

Andrew Nguyen : dinput8/tests: Replicate the IDirectInput tests for IDirectInput8.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: c8c6aa0c2c4528cb3088c224dd2e1042bbca3009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c6aa0c2c4528cb3088c224d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:19:31 2011 -0500 dinput8/tests: Replicate the IDirectInput tests for IDirectInput8. --- dlls/dinput8/tests/dinput.c | 408 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 408 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8c6aa0c2c4528cb3088c…

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011