wine-commits September 2013

2 participants
645 discussions

Daniel Jelinski : include: Define ERROR_REQUEST_PAUSED.

by Alexandre Julliard

Module: wine Branch: master Commit: d15416a563c77e76ca483893e0bc8e8e1ab61793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15416a563c77e76ca483893e… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Sep 20 22:46:59 2013 +0200 include: Define ERROR_REQUEST_PAUSED. --- include/winerror.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index edd8af0..9d988fb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1147,6 +1147,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_PRINTER_NOT_FOUND 3012 #define ERROR_PRINTER_DRIVER_WARNED 3013 #define ERROR_PRINTER_DRIVER_BLOCKED 3014 +#define ERROR_REQUEST_PAUSED 3050 #define ERROR_WINS_INTERNAL 4000 #define ERROR_CAN_NOT_DEL_LOCAL_WINS 4001 #define ERROR_STATIC_INIT 4002

10 years, 7 months

Frédéric Delanoy : wrc: Use BOOL type where appropriate.

by Alexandre Julliard

Module: wine Branch: master Commit: 5f607a95dfd2d207141da03e5413246ce1fa6216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f607a95dfd2d207141da03e5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 28 08:44:59 2013 +0200 wrc: Use BOOL type where appropriate. --- tools/wrc/po.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 5d4f485..d6ea262 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -54,17 +54,17 @@ struct mo_file /* ... rest of file data here */ }; -static int is_english( const language_t *lan ) +static BOOL is_english( const language_t *lan ) { return lan->id == LANG_ENGLISH && lan->sub == SUBLANG_DEFAULT; } -static int is_rtl_language( const language_t *lan ) +static BOOL is_rtl_language( const language_t *lan ) { return lan->id == LANG_ARABIC || lan->id == LANG_HEBREW || lan->id == LANG_PERSIAN; } -static int uses_larger_font( const language_t *lan ) +static BOOL uses_larger_font( const language_t *lan ) { return lan->id == LANG_CHINESE || lan->id == LANG_JAPANESE || lan->id == LANG_KOREAN; } @@ -810,7 +810,7 @@ static void add_po_menu( const resource_t *english, const resource_t *res ) add_po_menu_items( po, english_items, items, res->res.men->lvc.language ); } -static int string_has_context( const string_t *str ) +static BOOL string_has_context( const string_t *str ) { char *id, *id_buffer, *context;

10 years, 7 months

Frédéric Delanoy : wmc: Use BOOL type where appropriate.

by Alexandre Julliard

Module: wine Branch: master Commit: bf36cf284eb97e19f8e271b3bd8e66fdab11b8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf36cf284eb97e19f8e271b3b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 28 08:44:58 2013 +0200 wmc: Use BOOL type where appropriate. --- tools/wmc/po.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index de15e24..489c7d4 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -297,7 +297,7 @@ static void po_xerror2( int severity, po_message_t message1, static const struct po_xerror_handler po_xerror_handler = { po_xerror, po_xerror2 }; -static int is_english( int lan ) +static BOOL is_english( int lan ) { return lan == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); }

10 years, 7 months

Frédéric Delanoy : winemac.drv: Use BOOL type where appropriate.

by Alexandre Julliard

Module: wine Branch: master Commit: 66a95f6d4520b22cc8569ecc96beb8d383964b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a95f6d4520b22cc8569ecc9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 28 08:44:57 2013 +0200 winemac.drv: Use BOOL type where appropriate. --- dlls/winemac.drv/image.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index a39564a..4090350 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -58,7 +58,8 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol unsigned char *mask_bits, int mask_size, int width, int height, int istep) { - int i, has_alpha = FALSE; + int i; + BOOL has_alpha = FALSE; DWORD *ptr; CGBitmapInfo alpha_format; CGColorSpaceRef colorspace;

10 years, 7 months

Qian Hong : atl80: Add a WinSxS manifest resource.

by Alexandre Julliard

Module: wine Branch: master Commit: 55f31701ab975d51351051b197a5d847c872ba47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f31701ab975d51351051b19… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Sep 28 06:11:24 2013 +0800 atl80: Add a WinSxS manifest resource. --- dlls/atl80/Makefile.in | 2 ++ dlls/atl80/atl80.manifest | 5 +++++ dlls/atl80/atl80.rc | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 5cf626e..74ee460 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -6,4 +6,6 @@ EXTRADEFS = -D_ATL_VER=_ATL_VER_80 C_SRCS = atl80.c +RC_SRCS = atl80.rc + @MAKE_DLL_RULES@ diff --git a/dlls/atl80/atl80.manifest b/dlls/atl80/atl80.manifest new file mode 100644 index 0000000..039a3d6 --- /dev/null +++ b/dlls/atl80/atl80.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC80.ATL" version="8.0.50727.4053" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="atl80.dll"/> +</assembly> diff --git a/dlls/atl80/atl80.rc b/dlls/atl80/atl80.rc new file mode 100644 index 0000000..b6ea3d4 --- /dev/null +++ b/dlls/atl80/atl80.rc @@ -0,0 +1,22 @@ +/* + * Resource file for atl80 + * + * Copyright 2011 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: atl80.manifest */ +WINE_MANIFEST 24 atl80.manifest

10 years, 7 months

Alexandre Julliard : wineconsole: Run a command shell by default.

by Alexandre Julliard

Module: wine Branch: master Commit: 761301b6696d856acd4bc602e097b160b46b5338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761301b6696d856acd4bc602e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 30 14:31:23 2013 +0200 wineconsole: Run a command shell by default. --- programs/wineconsole/wineconsole.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d298705..7698521 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -780,6 +780,9 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) else return IDS_CMD_INVALID_BACKEND; } + else if (!strncmp(wci->ptr, "--help", 6) && + (!wci->ptr[6] || wci->ptr[6] == ' ' || wci->ptr[6] == '\t')) + return IDS_CMD_ABOUT|WINECON_CMD_SHOW_USAGE; else return IDS_CMD_INVALID_OPTION|WINECON_CMD_SHOW_USAGE; } @@ -788,8 +791,7 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) return 0; while (*wci->ptr == ' ' || *wci->ptr == '\t') wci->ptr++; - if (*wci->ptr == 0) - return IDS_CMD_ABOUT|WINECON_CMD_SHOW_USAGE; + if (*wci->ptr == 0) wci->ptr = "cmd"; return 0; }

10 years, 7 months

Alexandre Julliard : makefiles: Clean files from the top-level makefile where possible.

by Alexandre Julliard

Module: wine Branch: master Commit: 8355887560016be29258159bb828b2a668eae7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8355887560016be29258159bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 30 12:11:42 2013 +0200 makefiles: Clean files from the top-level makefile where possible. --- Make.rules.in | 3 +- aclocal.m4 | 76 ++++++++++-- configure | 319 +++++++++++++++++++++++++++++-------------------- configure.ac | 220 +++++++++++++++++----------------- libs/wine/Makefile.in | 3 +- tools/make_makefiles | 21 ++-- 6 files changed, 381 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8355887560016be292581…

10 years, 7 months

Henri Verbeet : d3dcompiler: Get rid of the BWRITER_COMPARISON_TYPE typedef .

by Alexandre Julliard

Module: wine Branch: master Commit: 1b6e9d245c2a76f158ff25b66fdde7d0eaf12232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b6e9d245c2a76f158ff25b66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 30 09:40:43 2013 +0200 d3dcompiler: Get rid of the BWRITER_COMPARISON_TYPE typedef. --- dlls/d3dcompiler_43/asmparser.c | 9 ++++----- dlls/d3dcompiler_43/asmshader.y | 2 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 13 +++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index c57343f..2d167de 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -501,11 +501,10 @@ static void asmparser_texreg2rgb(struct asm_parser *This, DWORD mod, DWORD shift * go through asmparser_instr). */ -static void asmparser_instr(struct asm_parser *This, DWORD opcode, - DWORD mod, DWORD shift, - BWRITER_COMPARISON_TYPE comp, - const struct shader_reg *dst, - const struct src_regs *srcs, int expectednsrcs) { +static void asmparser_instr(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, + enum bwriter_comparison_type comp, const struct shader_reg *dst, + const struct src_regs *srcs, int expectednsrcs) +{ struct instruction *instr; unsigned int i; BOOL firstreg = TRUE; diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 4109745..c0e0793 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -92,7 +92,7 @@ int asmshader_lex(void); DWORD mod; DWORD shift; } modshift; - BWRITER_COMPARISON_TYPE comptype; + enum bwriter_comparison_type comptype; struct { DWORD dclusage; unsigned int regnum; diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index d25b4e5..3489162 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -54,7 +54,8 @@ enum shader_type ST_PIXEL }; -typedef enum BWRITER_COMPARISON_TYPE { +enum bwriter_comparison_type +{ BWRITER_COMPARISON_NONE, BWRITER_COMPARISON_GT, BWRITER_COMPARISON_EQ, @@ -62,7 +63,7 @@ typedef enum BWRITER_COMPARISON_TYPE { BWRITER_COMPARISON_LT, BWRITER_COMPARISON_NE, BWRITER_COMPARISON_LE -} BWRITER_COMPARISON_TYPE; +}; struct constant { DWORD regnum; @@ -89,7 +90,7 @@ struct instruction { DWORD opcode; DWORD dstmod; DWORD shift; - BWRITER_COMPARISON_TYPE comptype; + enum bwriter_comparison_type comptype; BOOL has_dst; struct shader_reg dst; struct shader_reg *src; @@ -215,9 +216,9 @@ struct asmparser_backend { void (*end)(struct asm_parser *This); - void (*instr)(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, - BWRITER_COMPARISON_TYPE comp, const struct shader_reg *dst, - const struct src_regs *srcs, int expectednsrcs); + void (*instr)(struct asm_parser *parser, DWORD opcode, DWORD mod, DWORD shift, + enum bwriter_comparison_type comp, const struct shader_reg *dst, + const struct src_regs *srcs, int expectednsrcs); }; struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN;

10 years, 7 months

Henri Verbeet : d3dx9: Get rid of the SPRITE typedef.

by Alexandre Julliard

Module: wine Branch: master Commit: c174a993b06dd468a7782c9dae4f45f0672cdc34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c174a993b06dd468a7782c9da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 30 09:40:42 2013 +0200 d3dx9: Get rid of the SPRITE typedef. --- dlls/d3dx9_36/sprite.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 580289f..3c52c9f 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -32,7 +32,8 @@ struct sprite_vertex D3DXVECTOR2 tex; }; -typedef struct _SPRITE { +struct sprite +{ IDirect3DTexture9 *texture; UINT texw, texh; RECT rect; @@ -40,7 +41,7 @@ typedef struct _SPRITE { D3DXVECTOR3 pos; D3DCOLOR color; D3DXMATRIX transform; -} SPRITE; +}; struct d3dx9_sprite { @@ -60,7 +61,7 @@ struct d3dx9_sprite DWORD maxanisotropy; DWORD alphacmp_caps; - SPRITE *sprites; + struct sprite *sprites; int sprite_count; /* number of sprites to be drawn */ int allocated_sprites; /* number of (pre-)allocated sprites */ }; @@ -346,12 +347,16 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t if(texture==NULL) return D3DERR_INVALIDCALL; if(!This->ready) return D3DERR_INVALIDCALL; - if(This->allocated_sprites==0) { - This->sprites=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 32*sizeof(SPRITE)); - This->allocated_sprites=32; - } else if(This->allocated_sprites<=This->sprite_count) { - This->allocated_sprites=This->allocated_sprites*3/2; - This->sprites=HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->sprites, This->allocated_sprites*sizeof(SPRITE)); + if (!This->allocated_sprites) + { + This->sprites = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 32 * sizeof(*This->sprites)); + This->allocated_sprites = 32; + } + else if (This->allocated_sprites <= This->sprite_count) + { + This->allocated_sprites += This->allocated_sprites / 2; + This->sprites = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + This->sprites, This->allocated_sprites * sizeof(*This->sprites)); } This->sprites[This->sprite_count].texture=texture; if(!(This->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE))

10 years, 7 months

Henri Verbeet : wined3d: Send scissor rect updates through the command stream.

by Alexandre Julliard

Module: wine Branch: master Commit: 077606043930690172cba4c27959efba96c98487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=077606043930690172cba4c27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 30 09:40:41 2013 +0200 wined3d: Send scissor rect updates through the command stream. --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bf88f9f..b9f2929 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -29,6 +29,7 @@ enum wined3d_cs_op WINED3D_CS_OP_CLEAR, WINED3D_CS_OP_DRAW, WINED3D_CS_OP_SET_VIEWPORT, + WINED3D_CS_OP_SET_SCISSOR_RECT, }; struct wined3d_cs_present @@ -69,6 +70,12 @@ struct wined3d_cs_set_viewport const struct wined3d_viewport *viewport; }; +struct wined3d_cs_set_scissor_rect +{ + enum wined3d_cs_op opcode; + const RECT *rect; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -172,12 +179,32 @@ void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_vi cs->ops->submit(cs); } +static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_scissor_rect *op = data; + + cs->state.scissor_rect = *op->rect; + device_invalidate_state(cs->device, STATE_SCISSORRECT); +} + +void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) +{ + struct wined3d_cs_set_scissor_rect *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; + op->rect = rect; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, + /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d7ef129..5f4cafb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2060,7 +2060,7 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const return; } - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, rect); } void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) @@ -4021,7 +4021,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, state->scissor_rect.left = 0; state->scissor_rect.right = render_target->resource.width; state->scissor_rect.bottom = render_target->resource.height; - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } @@ -4728,7 +4728,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state->scissor_rect.left = 0; state->scissor_rect.right = rt->resource.width; state->scissor_rect.bottom = rt->resource.height; - device_invalidate_state(device, STATE_SCISSORRECT); + wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } swapchain_update_render_to_fbo(swapchain); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fd759a..f5665dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2486,6 +2486,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

10 years, 7 months

Jump to page:

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 September 2013