November 2011 - Wine-Commits

André Hentschel : po: Update German translation.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: dd55f15b56437868b43254638ab3491f440877fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd55f15b56437868b43254638… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 21 20:15:48 2011 +0100 po: Update German translation. --- po/de.po | 128 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 56 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd55f15b56437868b4325…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DGAMMARAMP typedef.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 2e1c0d83c14c57331ef103478ad28b82148d81db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1c0d83c14c57331ef103478… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:41 2011 +0100 wined3d: Get rid of the WINED3DGAMMARAMP typedef. --- dlls/d3d8/device.c | 8 ++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/surface.c | 9 +++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 12 ++++++------ 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 049c4e0..869da69 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -661,9 +661,9 @@ static void WINAPI IDirect3DDevice8Impl_SetGammaRamp(IDirect3DDevice8 *iface, DW TRACE("iface %p, flags %#x, ramp %p.\n", iface, Flags, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_set_gamma_ramp(This->wined3d_device, 0, Flags, (const WINED3DGAMMARAMP *)pRamp); + wined3d_device_set_gamma_ramp(This->wined3d_device, 0, Flags, (const struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } @@ -673,9 +673,9 @@ static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(IDirect3DDevice8 *iface, D3 TRACE("iface %p, ramp %p.\n", iface, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_get_gamma_ramp(This->wined3d_device, 0, (WINED3DGAMMARAMP *)pRamp); + wined3d_device_get_gamma_ramp(This->wined3d_device, 0, (struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 29dd180..2b47eb4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -668,9 +668,9 @@ static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(IDirect3DDevice9Ex *iface, TRACE("iface %p, swapchain %u, flags %#x, ramp %p.\n", iface, iSwapChain, Flags, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_set_gamma_ramp(This->wined3d_device, iSwapChain, Flags, (const WINED3DGAMMARAMP *)pRamp); + wined3d_device_set_gamma_ramp(This->wined3d_device, iSwapChain, Flags, (const struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } @@ -681,9 +681,9 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(IDirect3DDevice9Ex *iface, TRACE("iface %p, swapchain %u, ramp %p.\n", iface, iSwapChain, pRamp); - /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ + /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ wined3d_mutex_lock(); - wined3d_device_get_gamma_ramp(This->wined3d_device, iSwapChain, (WINED3DGAMMARAMP *)pRamp); + wined3d_device_get_gamma_ramp(This->wined3d_device, iSwapChain, (struct wined3d_gamma_ramp *)pRamp); wined3d_mutex_unlock(); } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 864b3ba..c7f92fd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4502,8 +4502,8 @@ static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl * wined3d_mutex_lock(); if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP. */ - wined3d_device_get_gamma_ramp(surface->ddraw->wined3d_device, 0, (WINED3DGAMMARAMP *)gamma_ramp); + /* Note: DDGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ + wined3d_device_get_gamma_ramp(surface->ddraw->wined3d_device, 0, (struct wined3d_gamma_ramp *)gamma_ramp); } else { @@ -4544,8 +4544,9 @@ static HRESULT WINAPI ddraw_gamma_control_SetGammaRamp(IDirectDrawGammaControl * wined3d_mutex_lock(); if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP */ - wined3d_device_set_gamma_ramp(surface->ddraw->wined3d_device, 0, flags, (WINED3DGAMMARAMP *)gamma_ramp); + /* Note: DDGAMMARAMP is compatible with struct wined3d_gamma_ramp. */ + wined3d_device_set_gamma_ramp(surface->ddraw->wined3d_device, + 0, flags, (struct wined3d_gamma_ramp *)gamma_ramp); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ab205d..7e70841 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5713,7 +5713,7 @@ HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device } void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp) + UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp) { struct wined3d_swapchain *swapchain; @@ -5728,7 +5728,7 @@ void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, } void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DGAMMARAMP *ramp) + UINT swapchain_idx, struct wined3d_gamma_ramp *ramp) { struct wined3d_swapchain *swapchain; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d09c9d0..fbf19d9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -254,7 +254,7 @@ HRESULT CDECL wined3d_swapchain_get_present_parameters(const struct wined3d_swap } HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, - DWORD flags, const WINED3DGAMMARAMP *ramp) + DWORD flags, const struct wined3d_gamma_ramp *ramp) { HDC dc; @@ -271,7 +271,7 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s } HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, - WINED3DGAMMARAMP *ramp) + struct wined3d_gamma_ramp *ramp) { HDC dc; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a43830e..9e44f69 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2444,7 +2444,7 @@ struct wined3d_swapchain WINED3DPRESENT_PARAMETERS presentParms; DWORD orig_width, orig_height; enum wined3d_format_id orig_fmt; - WINED3DGAMMARAMP orig_gamma; + struct wined3d_gamma_ramp orig_gamma; BOOL render_to_fbo; const struct wined3d_format *ds_format; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abf2c61..f228e44 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1583,12 +1583,12 @@ struct wined3d_viewport float max_z; }; -typedef struct _WINED3DGAMMARAMP +struct wined3d_gamma_ramp { WORD red[256]; WORD green[256]; WORD blue[256]; -} WINED3DGAMMARAMP; +}; typedef struct _WINED3DLINEPATTERN { @@ -2211,7 +2211,7 @@ HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *dev HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DGAMMARAMP *ramp); + UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, struct wined3d_buffer **index_buffer); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, @@ -2290,7 +2290,7 @@ HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device HRESULT __cdecl wined3d_device_set_display_mode(struct wined3d_device *device, UINT swapchain_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, - UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp); + UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device, @@ -2457,7 +2457,7 @@ HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchai HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_surface *dst_surface); HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, - WINED3DGAMMARAMP *ramp); + struct wined3d_gamma_ramp *ramp); void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_present_parameters(const struct wined3d_swapchain *swapchain, WINED3DPRESENT_PARAMETERS *present_parameters); @@ -2468,7 +2468,7 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, - DWORD flags, const WINED3DGAMMARAMP *ramp); + DWORD flags, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVIEWPORT typedef.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: be8917cd914b2d10972da945d21d3092996d5817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8917cd914b2d10972da945d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:40 2011 +0100 wined3d: Get rid of the WINED3DVIEWPORT typedef. --- dlls/d3d8/device.c | 8 +++--- dlls/d3d9/device.c | 8 +++--- dlls/ddraw/device.c | 8 +++--- dlls/wined3d/device.c | 42 ++++++++++++++++++++-------------------- dlls/wined3d/state.c | 34 ++++++++++++++++---------------- dlls/wined3d/stateblock.c | 12 +++++----- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 6 ++-- include/wine/wined3d.h | 20 +++++++++--------- 9 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be8917cd914b2d10972da…

1 0

Henri Verbeet : wined3d: Recognize the SM4 xor opcode.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 14cf780fde834cadee7fd0ca87b73345323572ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cf780fde834cadee7fd0ca8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:39 2011 +0100 wined3d: Recognize the SM4 xor opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 03b525f..451d34a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5130,6 +5130,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, + /* WINED3DSIH_XOR */ NULL, }; static BOOL get_bool_const(const struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b1c9b61..68e2f8f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5085,6 +5085,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, + /* WINED3DSIH_XOR */ NULL, }; static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5f2448c..d7ba818 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -141,6 +141,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", + /* WINED3DSIH_XOR */ "xor", }; static const char * const semantic_names[] = diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5c675c2..25bb72a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -97,6 +97,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, + WINED3D_SM4_OP_XOR = 0x57, }; enum wined3d_sm4_register_type @@ -185,6 +186,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, 1, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, + {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, 1, 2}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 72ffe73..ee29934 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_UDIV, WINED3DSIH_USHR, WINED3DSIH_UTOF, + WINED3DSIH_XOR, WINED3DSIH_TABLE_SIZE };

1 0

Alexandre Julliard : gdi32: Return a new path from PATH_FlattenPath instead of replacing the DC path.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: f388827c8df8a747cfb9bdf2e9f8ed3656763318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f388827c8df8a747cfb9bdf2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:41:33 2011 +0100 gdi32: Return a new path from PATH_FlattenPath instead of replacing the DC path. --- dlls/gdi32/path.c | 83 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index cb45f29..35069e1 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -349,31 +349,36 @@ static BOOL PATH_AddFlatBezier(GdiPath *pPath, POINT *pt, BOOL closed) * Replaces Beziers with line segments * */ -static BOOL PATH_FlattenPath(GdiPath *pPath) +static struct gdi_path *PATH_FlattenPath(const struct gdi_path *pPath) { - GdiPath newPath; + struct gdi_path *new_path; INT srcpt; - memset(&newPath, 0, sizeof(newPath)); - newPath.state = PATH_Open; + if (!(new_path = alloc_gdi_path())) return NULL; + for(srcpt = 0; srcpt < pPath->numEntriesUsed; srcpt++) { switch(pPath->pFlags[srcpt] & ~PT_CLOSEFIGURE) { case PT_MOVETO: case PT_LINETO: - PATH_AddEntry(&newPath, &pPath->pPoints[srcpt], - pPath->pFlags[srcpt]); + if (!PATH_AddEntry(new_path, &pPath->pPoints[srcpt], pPath->pFlags[srcpt])) + { + free_gdi_path( new_path ); + return NULL; + } break; case PT_BEZIERTO: - PATH_AddFlatBezier(&newPath, &pPath->pPoints[srcpt-1], - pPath->pFlags[srcpt+2] & PT_CLOSEFIGURE); + if (!PATH_AddFlatBezier(new_path, &pPath->pPoints[srcpt-1], + pPath->pFlags[srcpt+2] & PT_CLOSEFIGURE)) + { + free_gdi_path( new_path ); + return NULL; + } srcpt += 2; break; } } - newPath.state = PATH_Closed; - PATH_AssignGdiPath(pPath, &newPath); - PATH_DestroyGdiPath(&newPath); - return TRUE; + new_path->state = PATH_Closed; + return new_path; } /* PATH_PathToRegion @@ -381,37 +386,39 @@ static BOOL PATH_FlattenPath(GdiPath *pPath) * Creates a region from the specified path using the specified polygon * filling mode. The path is left unchanged. */ -static HRGN PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode) +static HRGN PATH_PathToRegion(const struct gdi_path *pPath, INT nPolyFillMode) { + struct gdi_path *rgn_path; int numStrokes, iStroke, i; INT *pNumPointsInStroke; HRGN hrgn; - PATH_FlattenPath(pPath); + if (!(rgn_path = PATH_FlattenPath( pPath ))) return 0; /* FIXME: What happens when number of points is zero? */ /* First pass: Find out how many strokes there are in the path */ /* FIXME: We could eliminate this with some bookkeeping in GdiPath */ numStrokes=0; - for(i=0; i<pPath->numEntriesUsed; i++) - if((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) + for(i=0; i<rgn_path->numEntriesUsed; i++) + if((rgn_path->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) numStrokes++; /* Allocate memory for number-of-points-in-stroke array */ pNumPointsInStroke=HeapAlloc( GetProcessHeap(), 0, sizeof(int) * numStrokes ); if(!pNumPointsInStroke) { + free_gdi_path( rgn_path ); SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } /* Second pass: remember number of points in each polygon */ iStroke=-1; /* Will get incremented to 0 at beginning of first stroke */ - for(i=0; i<pPath->numEntriesUsed; i++) + for(i=0; i<rgn_path->numEntriesUsed; i++) { /* Is this the beginning of a new stroke? */ - if((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) + if((rgn_path->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) { iStroke++; pNumPointsInStroke[iStroke]=0; @@ -421,10 +428,11 @@ static HRGN PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode) } /* Create a region from the strokes */ - hrgn=CreatePolyPolygonRgn(pPath->pPoints, pNumPointsInStroke, + hrgn=CreatePolyPolygonRgn(rgn_path->pPoints, pNumPointsInStroke, numStrokes, nPolyFillMode); HeapFree( GetProcessHeap(), 0, pNumPointsInStroke ); + free_gdi_path( rgn_path ); return hrgn; } @@ -1751,14 +1759,11 @@ static BOOL PATH_WidenPath(DC *dc) { INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; BOOL ret = FALSE; - GdiPath *pPath, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; + struct gdi_path *flat_path; + GdiPath *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; EXTLOGPEN *elp; DWORD obj_type, joint, endcap, penType; - pPath = &dc->path; - - PATH_FlattenPath(pPath); - size = GetObjectW( dc->hPen, 0, NULL ); if (!size) { SetLastError(ERROR_CAN_NOT_COMPLETE); @@ -1794,6 +1799,8 @@ static BOOL PATH_WidenPath(DC *dc) return FALSE; } + if (!(flat_path = PATH_FlattenPath( &dc->path ))) return FALSE; + penWidthIn = penWidth / 2; penWidthOut = penWidth / 2; if(penWidthIn + penWidthOut < penWidth) @@ -1801,16 +1808,17 @@ static BOOL PATH_WidenPath(DC *dc) numStrokes = 0; - for(i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++) { + for(i = 0, j = 0; i < flat_path->numEntriesUsed; i++, j++) { POINT point; - if((i == 0 || (pPath->pFlags[i-1] & PT_CLOSEFIGURE)) && - (pPath->pFlags[i] != PT_MOVETO)) { + if((i == 0 || (flat_path->pFlags[i-1] & PT_CLOSEFIGURE)) && + (flat_path->pFlags[i] != PT_MOVETO)) { ERR("Expected PT_MOVETO %s, got path flag %c\n", i == 0 ? "as first point" : "after PT_CLOSEFIGURE", - pPath->pFlags[i]); + flat_path->pFlags[i]); + free_gdi_path( flat_path ); return FALSE; } - switch(pPath->pFlags[i]) { + switch(flat_path->pFlags[i]) { case PT_MOVETO: if(numStrokes > 0) { pStrokes[numStrokes - 1]->state = PATH_Closed; @@ -1826,16 +1834,16 @@ static BOOL PATH_WidenPath(DC *dc) /* fall through */ case PT_LINETO: case (PT_LINETO | PT_CLOSEFIGURE): - point.x = pPath->pPoints[i].x; - point.y = pPath->pPoints[i].y; - PATH_AddEntry(pStrokes[numStrokes - 1], &point, pPath->pFlags[i]); + point.x = flat_path->pPoints[i].x; + point.y = flat_path->pPoints[i].y; + PATH_AddEntry(pStrokes[numStrokes - 1], &point, flat_path->pFlags[i]); break; case PT_BEZIERTO: /* should never happen because of the FlattenPath call */ ERR("Should never happen\n"); break; default: - ERR("Got path flag %c\n", pPath->pFlags[i]); + ERR("Got path flag %c\n", flat_path->pFlags[i]); return FALSE; } } @@ -2033,9 +2041,10 @@ static BOOL PATH_WidenPath(DC *dc) free_gdi_path( pDownPath ); } HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path( flat_path ); pNewPath->state = PATH_Closed; - if (!(ret = PATH_AssignGdiPath(pPath, pNewPath))) + if (!(ret = PATH_AssignGdiPath(&dc->path, pNewPath))) ERR("Assign path failed\n"); free_gdi_path( pNewPath ); return ret; @@ -2203,13 +2212,17 @@ BOOL nulldrv_StrokePath( PHYSDEV dev ) BOOL nulldrv_FlattenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); + struct gdi_path *path; if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - return PATH_FlattenPath( &dc->path ); + if (!(path = PATH_FlattenPath( &dc->path ))) return FALSE; + PATH_AssignGdiPath( &dc->path, path ); + free_gdi_path( path ); + return TRUE; } BOOL nulldrv_WidenPath( PHYSDEV dev )

1 0

Michael Stefaniuc : include: Make some more "long" numeric constants LP64/ LLP64 proof.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: ad0f8b6b66307520f8128e6931f697d5185f44ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0f8b6b66307520f8128e693… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 22 00:59:59 2011 +0100 include: Make some more "long" numeric constants LP64/LLP64 proof. --- include/commdlg.h | 46 +++++++++++++++++++++++----------------------- include/ddraw.h | 12 ++++++------ include/dxerr8.h | 2 +- include/dxerr9.h | 2 +- include/dxfile.h | 10 +++++----- include/fci.h | 2 +- include/fdi.h | 2 +- include/mciavi.h | 18 +++++++++--------- include/msi.h | 12 ++++++------ include/ntddstor.h | 6 +++--- include/ntsecapi.h | 34 +++++++++++++++++----------------- include/ole2.h | 16 ++++++++-------- include/olectl.h | 2 +- include/shlobj.h | 18 +++++++++--------- include/t2embapi.h | 4 ++-- include/wincrypt.h | 4 ++-- 16 files changed, 95 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad0f8b6b66307520f8128…

1 0

Francois Gouget : gphoto2.ds: Remove an unused and untranslatable listview label.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: cc1bfa79691fa0ccaf4c3ee2e531c98708eda222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1bfa79691fa0ccaf4c3ee2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 21 17:56:20 2011 +0100 gphoto2.ds: Remove an unused and untranslatable listview label. Spotted by Luca Bennati. --- dlls/gphoto2.ds/gphoto2_Da.rc | 2 +- dlls/gphoto2.ds/gphoto2_De.rc | 2 +- dlls/gphoto2.ds/gphoto2_En.rc | 2 +- dlls/gphoto2.ds/gphoto2_Es.rc | 2 +- dlls/gphoto2.ds/gphoto2_Fr.rc | 2 +- dlls/gphoto2.ds/gphoto2_He.rc | 2 +- dlls/gphoto2.ds/gphoto2_Hu.rc | 2 +- dlls/gphoto2.ds/gphoto2_It.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ja.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ko.rc | 2 +- dlls/gphoto2.ds/gphoto2_Lt.rc | 2 +- dlls/gphoto2.ds/gphoto2_Nl.rc | 2 +- dlls/gphoto2.ds/gphoto2_No.rc | 2 +- dlls/gphoto2.ds/gphoto2_Pl.rc | 2 +- dlls/gphoto2.ds/gphoto2_Pt.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ro.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ru.rc | 2 +- dlls/gphoto2.ds/gphoto2_Si.rc | 2 +- dlls/gphoto2.ds/gphoto2_Sr.rc | 2 +- dlls/gphoto2.ds/gphoto2_Sv.rc | 2 +- dlls/gphoto2.ds/gphoto2_Uk.rc | 2 +- dlls/gphoto2.ds/gphoto2_Zh.rc | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc1bfa79691fa0ccaf4c3…

1 0

Henri Verbeet : wined3d: Recognize the SM4 udiv opcode.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 9afff037e50a6c173287182cd5703a2f4bdb6d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afff037e50a6c173287182cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:37 2011 +0100 wined3d: Recognize the SM4 udiv opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 32197d5..5739733 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5127,6 +5127,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2AR */ pshader_hw_texreg2ar, /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, + /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9d88794..8e1724c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5082,6 +5082,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, + /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e182435..998b431 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -138,6 +138,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2AR */ "texreg2ar", /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", + /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_UTOF */ "utof", }; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 973d606..b78f03b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -94,6 +94,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, + WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -180,6 +181,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SAMPLE_GRAD,WINED3DSIH_SAMPLE_GRAD, 1, 5}, {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, + {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a22faf..7e77347 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2AR, WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, + WINED3DSIH_UDIV, WINED3DSIH_UTOF, WINED3DSIH_TABLE_SIZE };

1 0

Michael Stefaniuc : qedit/tests: Add SampleGrabber COM aggregation test.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 24da40fa8556e247bb2521ac4ad920ad51532883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24da40fa8556e247bb2521ac4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 21 14:46:57 2011 +0100 qedit/tests: Add SampleGrabber COM aggregation test. --- dlls/qedit/tests/mediadet.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index de9b3a4..1d9a2f1 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include "initguid.h" #include "ole2.h" @@ -28,6 +29,47 @@ #include "qedit.h" #include "rc.h" +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ppv); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + + static WCHAR test_avi_filename[MAX_PATH]; static WCHAR test_sound_avi_filename[MAX_PATH]; @@ -294,6 +336,31 @@ static void test_mediadet(void) DeleteFileW(test_sound_avi_filename); } +static void test_samplegrabber(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + ISampleGrabber *sg; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + todo_wine ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + if (hr != S_OK) return; + + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_ISampleGrabber, (void**)&sg); + ok(hr == S_OK, "QueryInterface for IID_ISampleGrabber failed: %08x\n", hr); + refcount = ISampleGrabber_AddRef(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + + IUnknown_Release(unk_obj.inner_unk); +} + START_TEST(mediadet) { if (!init_tests()) @@ -304,5 +371,6 @@ START_TEST(mediadet) CoInitialize(NULL); test_mediadet(); + test_samplegrabber(); CoUninitialize(); }

1 0

Jacek Caban : jscript: Use bytecode for unary '+' expression.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 35b9c42f530a9a338eaae928c96bd12c7a3514aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b9c42f530a9a338eaae928c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 21 15:35:41 2011 +0100 jscript: Use bytecode for unary '+' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 24 ++++++------------------ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8431b5c..1bc887c 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -115,6 +115,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); + case EXPR_PLUS: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); default: assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 17d8fa6..1f5863a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2532,32 +2532,20 @@ HRESULT minus_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag } /* ECMA-262 3rd Edition 11.4.6 */ -HRESULT plus_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_tonum(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - exprval_t exprval; - VARIANT val, num; + VARIANT *v, num; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, &val, ei, &num); - VariantClear(&val); + v = stack_pop(ctx); + hres = to_number(ctx->parser->script, v, &ctx->ei, &num); + VariantClear(v); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = num; - return S_OK; + return stack_push(ctx, &num); } /* ECMA-262 3rd Edition 11.3.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8692b0a..c004af3 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -46,6 +46,7 @@ typedef struct _func_stack { X(eq2, 1, 0) \ X(neg, 1, 0) \ X(neq2, 1, 0) \ + X(tonum, 1, 0) \ X(tree, 1, ARG_EXPR) \ X(ret, 0, 0) @@ -537,7 +538,6 @@ HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT void_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT minus_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT plus_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d580ec0..92c79fc 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1322,7 +1322,7 @@ static const expression_eval_t expression_eval_table[] = { void_expression_eval, typeof_expression_eval, minus_expression_eval, - plus_expression_eval, + compiled_expression_eval, post_increment_expression_eval, post_decrement_expression_eval, pre_increment_expression_eval,

1 0