wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Henri Verbeet : wined3d: Use dst_param.reg.idx to index reg_maps-> texcoord_mask.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 02a0614aa1fb4805ee95e2378fd028750dba770d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a0614aa1fb4805ee95e2378… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 30 10:58:14 2009 +0200 wined3d: Use dst_param.reg.idx to index reg_maps->texcoord_mask. --- dlls/wined3d/baseshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0ff0b18..ebd0688 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -613,7 +613,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 * shaders because TECRDOUT isn't used in them, but future register types might cause issues */ if (!pshader && shader_version.major < 3 && dst_param.reg.type == WINED3DSPR_TEXCRDOUT) { - reg_maps->texcoord_mask[dst_param.reg.type] |= dst_param.write_mask; + reg_maps->texcoord_mask[dst_param.reg.idx] |= dst_param.write_mask; } else {

1 0

Henri Verbeet : wined3d: Remove some redundant pshader checks.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 03702e1de36705857ba8c515afba67ea4ecb85c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03702e1de36705857ba8c515a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 30 10:58:13 2009 +0200 wined3d: Remove some redundant pshader checks. --- dlls/wined3d/baseshader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 246b0ba..0ff0b18 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -627,7 +627,6 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 /* Declare 1.X samplers implicitly, based on the destination reg. number */ if (shader_version.major == 1 - && pshader /* Filter different instructions with the same enum values in VS */ && (ins.handler_idx == WINED3DSIH_TEX || ins.handler_idx == WINED3DSIH_TEXBEM || ins.handler_idx == WINED3DSIH_TEXBEML @@ -657,11 +656,11 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } } } - else if (pshader && ins.handler_idx == WINED3DSIH_BEM) + else if (ins.handler_idx == WINED3DSIH_BEM) { reg_maps->bumpmat[dst_param.reg.idx] = TRUE; } - else if(pshader && ins.handler_idx == WINED3DSIH_MOV) + else if (ins.handler_idx == WINED3DSIH_MOV) { /* Many 2.0 and 3.0 pixel shaders end with a MOV from a temp register to * COLOROUT 0. If we know this in advance, the ARB shader backend can skip

1 0

Henri Verbeet : wined3d: Pass the shader type to shader_record_register_usage().
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 592361be385c48df94cc65bafb18d63375986ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=592361be385c48df94cc65baf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 30 12:18:26 2009 +0200 wined3d: Pass the shader type to shader_record_register_usage(). --- dlls/wined3d/baseshader.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 20eeeea..246b0ba 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -241,12 +241,12 @@ static inline void set_bitmap_bit(DWORD *bitmap, DWORD bit) } static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct shader_reg_maps *reg_maps, - const struct wined3d_shader_register *reg, BOOL pshader) + const struct wined3d_shader_register *reg, enum wined3d_shader_type shader_type) { switch (reg->type) { case WINED3DSPR_TEXTURE: /* WINED3DSPR_ADDR */ - if (pshader) reg_maps->texcoord[reg->idx] = 1; + if (shader_type == WINED3D_SHADER_TYPE_PIXEL) reg_maps->texcoord[reg->idx] = 1; else reg_maps->address[reg->idx] = 1; break; @@ -255,8 +255,7 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh break; case WINED3DSPR_INPUT: - if (!pshader) reg_maps->input_registers |= 1 << reg->idx; - else + if (shader_type == WINED3D_SHADER_TYPE_PIXEL) { if (reg->rel_addr) { @@ -274,6 +273,7 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh ((IWineD3DPixelShaderImpl *)This)->input_reg_used[reg->idx] = TRUE; } } + else reg_maps->input_registers |= 1 << reg->idx; break; case WINED3DSPR_RASTOUT: @@ -281,14 +281,17 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh break; case WINED3DSPR_MISCTYPE: - if (pshader && reg->idx == 0) reg_maps->vpos = 1; - if (pshader && reg->idx == 1) reg_maps->usesfacing = 1; + if (shader_type == WINED3D_SHADER_TYPE_PIXEL) + { + if (reg->idx == 0) reg_maps->vpos = 1; + else if (reg->idx == 1) reg_maps->usesfacing = 1; + } break; case WINED3DSPR_CONST: if (reg->rel_addr) { - if (!pshader) + if (shader_type != WINED3D_SHADER_TYPE_PIXEL) { if (reg->idx <= ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) ((IWineD3DVertexShaderImpl *)This)->min_rel_offset = reg->idx; @@ -619,7 +622,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) This; ps->color0_mov = FALSE; } - shader_record_register_usage(This, reg_maps, &dst_param.reg, pshader); + shader_record_register_usage(This, reg_maps, &dst_param.reg, shader_version.type); } /* Declare 1.X samplers implicitly, based on the destination reg. number */ @@ -718,11 +721,11 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 fe->shader_read_src_param(fe_data, &pToken, &src_param, &src_rel_addr); count = get_instr_extra_regcount(ins.handler_idx, i); - shader_record_register_usage(This, reg_maps, &src_param.reg, pshader); + shader_record_register_usage(This, reg_maps, &src_param.reg, shader_version.type); while (count) { ++src_param.reg.idx; - shader_record_register_usage(This, reg_maps, &src_param.reg, pshader); + shader_record_register_usage(This, reg_maps, &src_param.reg, shader_version.type); --count; }

1 0

Henri Verbeet : wined3d: Remove shader_is_version_token().
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 5b6877ee621463b3fd23725d0fed850c7fcb887e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6877ee621463b3fd23725d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 30 10:58:11 2009 +0200 wined3d: Remove shader_is_version_token(). --- dlls/wined3d/baseshader.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c5aafbf..20eeeea 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -138,11 +138,6 @@ const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token } } -static inline BOOL shader_is_version_token(DWORD token) { - return shader_is_pshader_version(token) || - shader_is_vshader_version(token); -} - void shader_buffer_init(struct SHADER_BUFFER *buffer) { buffer->buffer = HeapAlloc(GetProcessHeap(), 0, SHADER_PGMSIZE);

1 0

Alexandre Julliard : winebuild: Don' t try to output 32-bit resources when building a 16-bit wrapper dll.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 7798aed2cfe4e2e275d5e3cd05ee26ec6ce90fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7798aed2cfe4e2e275d5e3cd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 12:44:59 2009 +0200 winebuild: Don't try to output 32-bit resources when building a 16-bit wrapper dll. --- tools/winebuild/spec16.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 4bccd0c..679c4de 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -887,7 +887,6 @@ void output_spec16_file( DLLSPEC *spec16 ) output_stubs( spec16 ); output_exports( spec32 ); output_imports( spec16 ); - output_resources( spec16 ); if (spec16->main_module) { output( "\n\t%s\n", get_asm_string_section() );

1 0

Francois Gouget : windowscodecs: Add a trailing '\n' to FIXME() traces.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 66a04a83a131494f23ca24509d05e20b486ce6cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a04a83a131494f23ca24509… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:23:11 2009 +0200 windowscodecs: Add a trailing '\n' to FIXME() traces. --- dlls/windowscodecs/imgfactory.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 5856661..2edcdcd 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -147,49 +147,49 @@ static HRESULT WINAPI ImagingFactory_CreatePalette(IWICImagingFactory *iface, static HRESULT WINAPI ImagingFactory_CreateFormatConverter(IWICImagingFactory *iface, IWICFormatConverter **ppIFormatConverter) { - FIXME("(%p,%p): stub", iface, ppIFormatConverter); + FIXME("(%p,%p): stub\n", iface, ppIFormatConverter); return E_NOTIMPL; } static HRESULT WINAPI ImagingFactory_CreateBitmapScaler(IWICImagingFactory *iface, IWICBitmapScaler **ppIBitmapScaler) { - FIXME("(%p,%p): stub", iface, ppIBitmapScaler); + FIXME("(%p,%p): stub\n", iface, ppIBitmapScaler); return E_NOTIMPL; } static HRESULT WINAPI ImagingFactory_CreateBitmapClipper(IWICImagingFactory *iface, IWICBitmapClipper **ppIBitmapClipper) { - FIXME("(%p,%p): stub", iface, ppIBitmapClipper); + FIXME("(%p,%p): stub\n", iface, ppIBitmapClipper); return E_NOTIMPL; } static HRESULT WINAPI ImagingFactory_CreateBitmapFlipRotator(IWICImagingFactory *iface, IWICBitmapFlipRotator **ppIBitmapFlipRotator) { - FIXME("(%p,%p): stub", iface, ppIBitmapFlipRotator); + FIXME("(%p,%p): stub\n", iface, ppIBitmapFlipRotator); return E_NOTIMPL; } static HRESULT WINAPI ImagingFactory_CreateStream(IWICImagingFactory *iface, IWICStream **ppIWICStream) { - FIXME("(%p,%p): stub", iface, ppIWICStream); + FIXME("(%p,%p): stub\n", iface, ppIWICStream); return E_NOTIMPL; } static HRESULT WINAPI ImagingFactory_CreateColorContext(IWICImagingFactory *iface, IWICColorContext **ppIColorContext) { - FIXME("(%p,%p): stub", iface, ppIColorContext); + FIXME("(%p,%p): stub\n", iface, ppIColorContext); return E_NOTIMPL; } static HRESULT WINAPI ImagingFactory_CreateColorTransformer(IWICImagingFactory *iface, IWICColorTransform **ppIColorTransform) { - FIXME("(%p,%p): stub", iface, ppIColorTransform); + FIXME("(%p,%p): stub\n", iface, ppIColorTransform); return E_NOTIMPL; }

1 0

Francois Gouget : taskmgr: Remove spaces before '\n's.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 7f046f5139c9bd49762e07d86667e51364886043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f046f5139c9bd49762e07d86… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:26:58 2009 +0200 taskmgr: Remove spaces before '\n's. --- programs/taskmgr/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index 4759f0a..390371b 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -545,7 +545,7 @@ BEGIN IDS_TERMINATE_MESSAGE "��: ��μ�� ߴܽ�Ű�� Ÿ �սǰ�\n\ �ý�� Ҿ�� ؼ� �ٶ�� \n\ �ֽ��ϴ�. �� μ�� ͳ� ��¸� �� ȸ��\n\ - �־�� Դϴ�. \n\ + �־�� Դϴ�.\n\ �� ߴܽ�Ű�ڽ��ϱ�?" IDS_TERMINATE_UNABLE2TERMINATE "��μ�� ߴܽ�ų �� ϴ�" IDS_DEBUG_MESSAGE "��: ��μ�� ϴ� �� ս�� ֽ��ϴ�.\n\

1 0

Francois Gouget : crosstest: Fix the crosstest dependencies.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 7bb43a359f6ce06fcbb311cd7de3fcff64653357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb43a359f6ce06fcbb311cd7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:25:19 2009 +0200 crosstest: Fix the crosstest dependencies. --- Make.rules.in | 2 +- dlls/Maketest.rules.in | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c01a2b7..7f72099 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -229,7 +229,7 @@ $(SUBDIRS:%=%/__depend__): dummy @cd `dirname $@` && $(MAKE) depend depend: $(SUBDIRS:%=%/__depend__) dummy - $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS) + $(MAKEDEP) $(MAKEDEPFLAGS) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS) .PHONY: depend $(SUBDIRS:%=%/__depend__) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index b112c45..aff002c 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -24,6 +24,7 @@ EXTRA_OBJS = testlist.o CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe CROSSCC = @CROSSCC@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) +MAKEDEPFLAGS = -xo -xcross.o @MAKE_RULES@

1 0

Francois Gouget : makedep: Add support for multiple object file extensions.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 73b0f6517700cc846507fe3986c4e96ffe7df6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b0f6517700cc846507fe398… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:25:05 2009 +0200 makedep: Add support for multiple object file extensions. --- tools/makedep.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4194073..e2ca5ad 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -53,6 +53,14 @@ typedef struct _INCL_FILE static struct list sources = LIST_INIT(sources); static struct list includes = LIST_INIT(includes); +typedef struct _OBJECT_EXTENSION +{ + struct list entry; + const char *extension; +} OBJECT_EXTENSION; + +static struct list object_extensions = LIST_INIT(object_extensions); + typedef struct _INCL_PATH { struct list entry; @@ -218,6 +226,18 @@ static char *get_line( FILE *file ) } /******************************************************************* + * add_object_extension + * + * Add an extension for object files. + */ +static void add_object_extension( const char *ext ) +{ + OBJECT_EXTENSION *object_extension = xmalloc( sizeof(*object_extension) ); + list_add_tail( &object_extensions, &object_extension->entry ); + object_extension->extension = ext; +} + +/******************************************************************* * add_include_path * * Add a directory to the include path. @@ -857,7 +877,10 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) } else { - *column += fprintf( file, "%s.o: %s", obj, pFile->filename ); + OBJECT_EXTENSION *ext; + LIST_FOR_EACH_ENTRY( ext, &object_extensions, OBJECT_EXTENSION, entry ) + *column += fprintf( file, "%s.%s ", obj, ext->extension ); + *column += fprintf( file, ": %s", pFile->filename ); } } free( obj ); @@ -973,6 +996,9 @@ static void parse_option( const char *opt ) if (opt[2]) Separator = opt + 2; else Separator = NULL; break; + case 'x': + if (opt[2]) add_object_extension( opt + 2 ); + break; default: fprintf( stderr, "Unknown option '%s'\n", opt ); fprintf( stderr, Usage, ProgramName ); @@ -1008,6 +1034,10 @@ int main( int argc, char *argv[] ) if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; + /* set the default extension list for object files */ + if (list_empty( &object_extensions )) + add_object_extension( "o" ); + /* get rid of absolute paths that don't point into the source dir */ LIST_FOR_EACH_ENTRY_SAFE( path, next, &paths, INCL_PATH, entry ) {

1 0

Francois Gouget : advapi32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: d475279149a0140c716fd6c0b29fd482fab72158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d475279149a0140c716fd6c0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:23:04 2009 +0200 advapi32/tests: Add a trailing '\n' to ok() calls. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index de794de..4479ddf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3199,10 +3199,10 @@ static void test_GetSidSubAuthority(void) ok(*pGetSidSubAuthorityCount(psid) == 4,"GetSidSubAuthorityCount gave %d expected 4\n",*pGetSidSubAuthorityCount(psid)); ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); SetLastError(0xbebecaca); - ok(*pGetSidSubAuthority(psid,0) == 21,"GetSidSubAuthority gave %d expected 21",*pGetSidSubAuthority(psid,0)); + ok(*pGetSidSubAuthority(psid,0) == 21,"GetSidSubAuthority gave %d expected 21\n",*pGetSidSubAuthority(psid,0)); ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); SetLastError(0xbebecaca); - ok(*pGetSidSubAuthority(psid,1) == 93476,"GetSidSubAuthority gave %d expected 93476",*pGetSidSubAuthority(psid,1)); + ok(*pGetSidSubAuthority(psid,1) == 93476,"GetSidSubAuthority gave %d expected 93476\n",*pGetSidSubAuthority(psid,1)); ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); SetLastError(0xbebecaca); todo_wine ok(*pGetSidSubAuthority(psid,4) == 0,"GetSidSubAuthority gave %d,expected 0\n",*pGetSidSubAuthority(psid,4));

1 0

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 June 2009