May 2010 - Wine-Commits - list.winehq.org

André Hentschel : msvidc32: Be less picky with formats .
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: f31e30d1be997b5716f318166a2a1d18b38fddfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31e30d1be997b5716f318166… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 20 19:55:06 2010 +0200 msvidc32: Be less picky with formats. --- dlls/msvidc32/msvideo1.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 71ed2d7..d01f07a 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -375,8 +375,8 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB info->mode_8bit = 0; else { - ERR("Bad output format\n"); - return ICERR_BADPARAM; + info->mode_8bit = 0; + FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount); } return ICERR_OK;

1 0

Michael Stefaniuc : winemp3.acm: Avoid using the long type.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 5b9fb3c5be6f0d182df6cd4b0145548701da0652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9fb3c5be6f0d182df6cd4b0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 21 12:13:36 2010 +0200 winemp3.acm: Avoid using the long type. --- dlls/winemp3.acm/mpegl3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 6074501..6a2dbee 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -298,7 +298,7 @@ typedef struct tagAcmMpeg3Data OSStatus lastError; } AcmMpeg3Data; -static inline const char* wine_dbgstr_fourcc(unsigned long fourcc) +static inline const char* wine_dbgstr_fourcc(ULONG fourcc) { char buf[4] = { (char) (fourcc >> 24), (char) (fourcc >> 16), (char) (fourcc >> 8), (char) fourcc };

1 0

Michael Stefaniuc : user32: Avoid using long.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: bf7241c12567c81ba4cc78b58c9550401cee95f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7241c12567c81ba4cc78b58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 21 12:12:47 2010 +0200 user32: Avoid using long. --- dlls/user32/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 79f5182..aac8a4d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1374,7 +1374,7 @@ UINT WINAPI GetDlgItemInt( HWND hwnd, INT id, BOOL *translated, { char str[30]; char * endptr; - long result = 0; + LONG_PTR result = 0; if (translated) *translated = FALSE; if (!SendDlgItemMessageA(hwnd, id, WM_GETTEXT, sizeof(str), (LPARAM)str))

1 0

Michael Stefaniuc : mciwave: Avoid using long.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: f9d2b85ea577ab0179794ac9c5b1a087e9e6dd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d2b85ea577ab0179794ac9c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 21 12:13:22 2010 +0200 mciwave: Avoid using long. --- dlls/mciwave/mciwave.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 6485288..67cf09a 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -277,7 +277,7 @@ static DWORD WAVE_ConvertTimeFormatToByte(WINE_MCIWAVE* wmw, DWORD val) static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) { MMCKINFO mmckInfo; - long r; + LONG r; LPWAVEFORMATEX pwfx; mmckInfo.ckid = mmioFOURCC('f', 'm', 't', ' '); @@ -300,7 +300,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) TRACE("nAvgBytesPerSec=%d\n", pwfx->nAvgBytesPerSec); TRACE("nBlockAlign=%d\n", pwfx->nBlockAlign); TRACE("wBitsPerSample=%u !\n", pwfx->wBitsPerSample); - if (r >= (long)sizeof(WAVEFORMATEX)) + if (r >= sizeof(WAVEFORMATEX)) TRACE("cbSize=%u !\n", pwfx->cbSize); if ((pwfx->wFormatTag != WAVE_FORMAT_PCM) && (r < sizeof(WAVEFORMATEX) || (r < sizeof(WAVEFORMATEX) + pwfx->cbSize))) {

1 0

Henri Verbeet : wined3d: Set the device.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 11b8c425e924be02f97340ccebfe95ae719bded8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b8c425e924be02f97340cce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 21 09:35:25 2010 +0200 wined3d: Set the device.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7a8b9da..7c06e6c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -34,7 +34,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) /* Define the default light parameters as specified by MSDN */ const WINED3DLIGHT WINED3D_default_light = { @@ -5232,6 +5232,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const struct wined3d_format_desc *src_format; const struct wined3d_format_desc *dst_format; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; const unsigned char *data; UINT update_w, update_h; @@ -5273,6 +5274,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, return IWineD3DSurface_BltFast(dst_surface, dst_x, dst_y, src_surface, src_rect, 0); context = context_acquire(This, NULL); + gl_info = context->gl_info; ENTER_GL(); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB));

1 0

Henri Verbeet : wined3d: Explicitly pass GL info to buffer_create_buffer_object().
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: e6473094026f9bb2953672afb407d529ca6db9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6473094026f9bb2953672afb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 21 09:35:23 2010 +0200 wined3d: Explicitly pass GL info to buffer_create_buffer_object(). --- dlls/wined3d/buffer.c | 9 ++++----- dlls/wined3d/device.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7d3d078..fbd39b9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -117,10 +117,9 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g } /* Context activation is done by the caller. */ -static void buffer_create_buffer_object(struct wined3d_buffer *This) +static void buffer_create_buffer_object(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { GLenum error, gl_usage; - const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; TRACE("Creating an OpenGL vertex buffer object for IWineD3DVertexBuffer %p Usage(%s)\n", This, debug_d3dusage(This->resource.usage)); @@ -613,7 +612,7 @@ static inline void fixup_transformed_pos(float *p) } /* Context activation is done by the caller. */ -const BYTE *buffer_get_memory(IWineD3DBuffer *iface, GLuint *buffer_object) +const BYTE *buffer_get_memory(IWineD3DBuffer *iface, const struct wined3d_gl_info *gl_info, GLuint *buffer_object) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -622,7 +621,7 @@ const BYTE *buffer_get_memory(IWineD3DBuffer *iface, GLuint *buffer_object) { if (This->flags & WINED3D_BUFFER_CREATEBO) { - buffer_create_buffer_object(This); + buffer_create_buffer_object(This, gl_info); This->flags &= ~WINED3D_BUFFER_CREATEBO; if (This->buffer_object) { @@ -946,7 +945,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) /* TODO: Make converting independent from VBOs */ if (This->flags & WINED3D_BUFFER_CREATEBO) { - buffer_create_buffer_object(This); + buffer_create_buffer_object(This, gl_info); This->flags &= ~WINED3D_BUFFER_CREATEBO; } else diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e73ecc9..fd8cd60 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -213,7 +213,8 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, else { TRACE("Stream %u isn't UP, %p\n", element->input_slot, This->stateBlock->streamSource[element->input_slot]); - data = buffer_get_memory(This->stateBlock->streamSource[element->input_slot], &buffer_object); + data = buffer_get_memory(This->stateBlock->streamSource[element->input_slot], + &This->adapter->gl_info, &buffer_object); /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e1f4282..947456a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2503,7 +2503,8 @@ struct wined3d_buffer UINT *conversion_shift; /* NULL if no shifted conversion */ }; -const BYTE *buffer_get_memory(IWineD3DBuffer *iface, GLuint *buffer_object) DECLSPEC_HIDDEN; +const BYTE *buffer_get_memory(IWineD3DBuffer *iface, const struct wined3d_gl_info *gl_info, + GLuint *buffer_object) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This) DECLSPEC_HIDDEN; HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, UINT size, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, GLenum bind_hint,

1 0

Henri Verbeet : wined3d: Explicitly pass GL info to buffer_get_sysmem().
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 5dff410254a3f2d1de5fe6f43aed6ebadd1d6935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dff410254a3f2d1de5fe6f43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 21 09:35:24 2010 +0200 wined3d: Explicitly pass GL info to buffer_get_sysmem(). --- dlls/wined3d/buffer.c | 12 ++++------ dlls/wined3d/device.c | 16 ++++++++------ dlls/wined3d/drawprim.c | 44 ++++++++++++++++++++------------------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 39 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5dff410254a3f2d1de5fe…

1 0

Henri Verbeet : wined3d: Set the buffer.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: e536f99871a8ca6bf8f02d18a438f52936eaddf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e536f99871a8ca6bf8f02d18a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 21 09:35:22 2010 +0200 wined3d: Set the buffer.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/buffer.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8372b7a..7d3d078 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->resource.device->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -98,7 +98,7 @@ static inline BOOL buffer_is_fully_dirty(struct wined3d_buffer *This) } /* Context activation is done by the caller */ -static void delete_gl_buffer(struct wined3d_buffer *This) +static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { if(!This->buffer_object) return; @@ -226,7 +226,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) fail: /* Clean up all vbo init, but continue because we can work without a vbo :-) */ ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur\n"); - delete_gl_buffer(This); + delete_gl_buffer(This, gl_info); buffer_clear_dirty_areas(This); } @@ -552,7 +552,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) } /* Context activation is done by the caller. */ -static void buffer_check_buffer_object_size(struct wined3d_buffer *This) +static void buffer_check_buffer_object_size(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { UINT size = This->conversion_stride ? This->conversion_stride * (This->resource.size / This->stride) : This->resource.size; @@ -675,6 +675,8 @@ static ULONG STDMETHODCALLTYPE buffer_AddRef(IWineD3DBuffer *iface) /* Context activation is done by the caller. */ BYTE *buffer_get_sysmem(struct wined3d_buffer *This) { + const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; + /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ if(This->resource.allocatedMemory) return This->resource.allocatedMemory; @@ -709,7 +711,7 @@ static void STDMETHODCALLTYPE buffer_UnLoad(IWineD3DBuffer *iface) This->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; } - delete_gl_buffer(This); + delete_gl_buffer(This, context->gl_info); This->flags |= WINED3D_BUFFER_CREATEBO; /* Recreate the buffer object next load */ buffer_clear_dirty_areas(This); @@ -926,6 +928,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) struct wined3d_buffer *This = (struct wined3d_buffer *)iface; IWineD3DDeviceImpl *device = This->resource.device; UINT start = 0, end = 0, len = 0, vertices; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL decl_changed = FALSE; unsigned int i, j; @@ -936,6 +939,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) This->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); context = context_acquire(device, NULL); + gl_info = context->gl_info; if (!This->buffer_object) { @@ -993,7 +997,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) IWineD3DDeviceImpl_MarkStateDirty(device, STATE_STREAMSRC); goto end; } - buffer_check_buffer_object_size(This); + buffer_check_buffer_object_size(This, gl_info); /* The declaration changed, reload the whole buffer */ WARN("Reloading buffer because of decl change\n");

1 0

Henri Verbeet : wined3d: Introduce a separate function for translating front buffer coordinates to GL coordinates .
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: db0784e1da50dec1be5d14f93cb9ff0b6c93a9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0784e1da50dec1be5d14f93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 21 09:35:21 2010 +0200 wined3d: Introduce a separate function for translating front buffer coordinates to GL coordinates. --- dlls/wined3d/arb_program_shader.c | 12 +-------- dlls/wined3d/device.c | 38 +++++++-------------------- dlls/wined3d/surface.c | 51 ++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 29 insertions(+), 73 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f62ff56..c0b3924 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7004,17 +7004,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ * whereas the real gl drawable size is the size of the window. */ dst_swapchain = (dst_surface->Flags & SFLAG_SWAPCHAIN) ? (IWineD3DSwapChainImpl *)dst_surface->container : NULL; if (dst_swapchain && dst_surface == dst_swapchain->front_buffer) - { - RECT windowsize; - POINT offset = {0,0}; - UINT h; - ClientToScreen(context->win_handle, &offset); - GetClientRect(context->win_handle, &windowsize); - h = windowsize.bottom - windowsize.top; - dst_rect.left -= offset.x; dst_rect.right -=offset.x; - dst_rect.top -= offset.y; dst_rect.bottom -=offset.y; - dst_rect.top += dst_surface->currentDesc.Height - h; dst_rect.bottom += dst_surface->currentDesc.Height - h; - } + surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); arbfp_blit_set((IWineD3DDevice *)device, src_surface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index feb3949..e73ecc9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5740,7 +5740,6 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa const struct wined3d_gl_info *gl_info; struct wined3d_context *context; GLenum gl_filter; - POINT offset = {0, 0}; RECT src_rect, dst_rect; TRACE("device %p, src_surface %p, src_rect_in %s, dst_surface %p, dst_rect_in %s, filter %s (0x%08x).\n", @@ -5788,19 +5787,11 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa TRACE("Source surface %p is onscreen\n", src_surface); - if(buffer == GL_FRONT) { - RECT windowsize; - UINT h; - ClientToScreen(context->win_handle, &offset); - GetClientRect(context->win_handle, &windowsize); - h = windowsize.bottom - windowsize.top; - src_rect.left -= offset.x; src_rect.right -=offset.x; - src_rect.top = offset.y + h - src_rect.top; - src_rect.bottom = offset.y + h - src_rect.bottom; - } else { - src_rect.top = src_surface->currentDesc.Height - src_rect.top; - src_rect.bottom = src_surface->currentDesc.Height - src_rect.bottom; - } + if (buffer == GL_FRONT) + surface_translate_frontbuffer_coords(src_surface, context->win_handle, &src_rect); + + src_rect.top = src_surface->currentDesc.Height - src_rect.top; + src_rect.bottom = src_surface->currentDesc.Height - src_rect.bottom; ENTER_GL(); context_bind_fbo(context, GL_READ_FRAMEBUFFER, NULL); @@ -5822,20 +5813,11 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa TRACE("Destination surface %p is onscreen\n", dst_surface); - if(buffer == GL_FRONT) { - RECT windowsize; - UINT h; - ClientToScreen(context->win_handle, &offset); - GetClientRect(context->win_handle, &windowsize); - h = windowsize.bottom - windowsize.top; - dst_rect.left -= offset.x; dst_rect.right -=offset.x; - dst_rect.top = offset.y + h - dst_rect.top; - dst_rect.bottom = offset.y + h - dst_rect.bottom; - } else { - /* Screen coords = window coords, surface height = window height */ - dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; - dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; - } + if (buffer == GL_FRONT) + surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); + + dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; + dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; ENTER_GL(); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9e1d434..ca796c5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3380,6 +3380,21 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format_desc *dst_format_desc); +/* Front buffer coordinates are always full screen coordinates, but our GL + * drawable is limited to the window's client area. The sysmem and texture + * copies do have the full screen size. Note that GL has a bottom-left + * origin, while D3D has a top-left origin. */ +void surface_translate_frontbuffer_coords(IWineD3DSurfaceImpl *surface, HWND window, RECT *rect) +{ + POINT offset = {0, surface->currentDesc.Height}; + RECT windowsize; + + GetClientRect(window, &windowsize); + offset.y -= windowsize.bottom - windowsize.top; + ScreenToClient(window, &offset); + OffsetRect(rect, offset.x, offset.y); +} + /* Not called from the VTable */ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, const RECT *DestRect, IWineD3DSurfaceImpl *src_surface, const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx, @@ -3674,25 +3689,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, context = context_acquire(device, dst_surface); context_apply_blit_state(context, device); - /* The coordinates of the ddraw front buffer are always fullscreen ('screen coordinates', - * while OpenGL coordinates are window relative. - * Also beware of the origin difference(top left vs bottom left). - * Also beware that the front buffer's surface size is screen width x screen height, - * whereas the real gl drawable size is the size of the window. - */ if (dstSwapchain && dst_surface == dstSwapchain->front_buffer) - { - RECT windowsize; - POINT offset = {0,0}; - UINT h; - ClientToScreen(context->win_handle, &offset); - GetClientRect(context->win_handle, &windowsize); - h = windowsize.bottom - windowsize.top; - dst_rect.left -= offset.x; dst_rect.right -=offset.x; - dst_rect.top -= offset.y; dst_rect.bottom -=offset.y; - dst_rect.top += dst_surface->currentDesc.Height - h; - dst_rect.bottom += dst_surface->currentDesc.Height - h; - } + surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); if (!device->blitter->blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, @@ -4351,22 +4349,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT } if ((This->Flags & SFLAG_SWAPCHAIN) && This == ((IWineD3DSwapChainImpl *)This->container)->front_buffer) - { - RECT windowsize; - POINT offset = {0, 0}; - UINT h; - - ClientToScreen(context->win_handle, &offset); - GetClientRect(context->win_handle, &windowsize); - h = windowsize.bottom - windowsize.top; - - dst_rect.left -= offset.x; - dst_rect.right -=offset.x; - dst_rect.top -= offset.y; - dst_rect.bottom -=offset.y; - dst_rect.top += This->currentDesc.Height - h; - dst_rect.bottom += This->currentDesc.Height - h; - } + surface_translate_frontbuffer_coords(This, context->win_handle, &dst_rect); device->blitter->set_shader((IWineD3DDevice *) device, This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0147c2f..e1f4282 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2101,6 +2101,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT width, UINT height, UINT level, BOOL lockable, BOOL discard, WINED3DMULTISAMPLE_TYPE multisample_type, UINT multisample_quality, IWineD3DDeviceImpl *device, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void surface_translate_frontbuffer_coords(IWineD3DSurfaceImpl *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; /* Predeclare the shared Surface functions */ HRESULT WINAPI IWineD3DBaseSurfaceImpl_QueryInterface(IWineD3DSurface *iface,

1 0

Juan Lang : crypt32: Implement wildcard domain name matching in subject alternative names.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: c79aad51cd21e1da941dcc003379957065253715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79aad51cd21e1da941dcc003… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 20 08:52:43 2010 -0700 crypt32: Implement wildcard domain name matching in subject alternative names. --- dlls/crypt32/chain.c | 26 +++++++++++++++++++++++++- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d324314..e951ef8 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3035,7 +3035,31 @@ static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, { TRACE_(chain)("dNSName: %s\n", debugstr_w( subjectName->rgAltEntry[i].u.pwszDNSName)); - if (!strcmpiW(server_name, + if (subjectName->rgAltEntry[i].u.pwszDNSName[0] == '*') + { + LPCWSTR server_name_dot; + + /* Matching a wildcard: a wildcard matches a single name + * component, which is terminated by a dot. RFC 1034 + * doesn't define whether multiple wildcards are allowed, + * but I will assume that they are not until proven + * otherwise. RFC 1034 also states that 'the "*" label + * always matches at least one whole label and sometimes + * more, but always whole labels.' Native crypt32 does not + * match more than one label with a wildcard, so I do the + * same here. Thus, a wildcard only accepts the first + * label, then requires an exact match of the remaining + * string. + */ + server_name_dot = strchrW(server_name, '.'); + if (server_name_dot) + { + if (!strcmpiW(server_name_dot, + subjectName->rgAltEntry[i].u.pwszDNSName + 1)) + matches = TRUE; + } + } + else if (!strcmpiW(server_name, subjectName->rgAltEntry[i].u.pwszDNSName)) matches = TRUE; } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 0484aa1..a59a95a 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3818,7 +3818,7 @@ static const ChainPolicyCheck opensslPolicyCheckWithoutMatchingName = { static const ChainPolicyCheck winehqPolicyCheckWithMatchingName = { { sizeof(chain29) / sizeof(chain29[0]), chain29 }, - { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR + { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck winehqPolicyCheckWithoutMatchingName = {

1 0