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

Henri Verbeet : wined3d: Set the ati_fragment_shader. c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 11bda6e0ab4b58e1588fc41141096c189727624d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bda6e0ab4b58e1588fc4114… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 25 12:02:01 2010 +0200 wined3d: Set the ati_fragment_shader.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/ati_fragment_shader.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 62be40d..344daf6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d); +#define GLINFO_LOCATION (*gl_info) + /* GL locking for state handlers is done by the caller. */ /* Some private defines, Constant associations, etc. @@ -190,7 +192,6 @@ static const char *debug_mask(GLuint mask) { default: return "Unexpected writemask"; } } -#define GLINFO_LOCATION (*gl_info) static void wrap_op1(const struct wined3d_gl_info *gl_info, GLuint op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod) @@ -796,11 +797,10 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con checkGLcall("GL_EXTCALL(glEndFragmentShaderATI())"); return ret; } -#undef GLINFO_LOCATION -#define GLINFO_LOCATION stateblock->device->adapter->gl_info static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *This = stateblock->device; const struct atifs_ffp_desc *desc; struct ffp_frag_settings settings; @@ -818,14 +818,14 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, st return; } new_desc->num_textures_used = 0; - for (i = 0; i < context->gl_info->limits.texture_stages; ++i) + for (i = 0; i < gl_info->limits.texture_stages; ++i) { if(settings.op[i].cop == WINED3DTOP_DISABLE) break; new_desc->num_textures_used = i; } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); - new_desc->shader = gen_ati_shader(settings.op, context->gl_info); + new_desc->shader = gen_ati_shader(settings.op, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); desc = new_desc; @@ -849,6 +849,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, st static void state_texfactor_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; float col[4]; D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); @@ -859,6 +860,7 @@ static void state_texfactor_atifs(DWORD state, IWineD3DStateBlockImpl *statebloc static void set_bumpmat(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + const struct wined3d_gl_info *gl_info = context->gl_info; float mat[2][2]; mat[0][0] = *((float *) &stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT00]); @@ -912,8 +914,6 @@ static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *statebl } } -#undef GLINFO_LOCATION - static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_atifs }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, @@ -1126,11 +1126,11 @@ static HRESULT atifs_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } -#define GLINFO_LOCATION This->adapter->gl_info /* Context activation is done by the caller. */ static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *context) { IWineD3DDeviceImpl *This = context; + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; struct atifs_ffp_desc *entry_ati = WINE_RB_ENTRY_VALUE(entry, struct atifs_ffp_desc, parent.entry); ENTER_GL(); @@ -1150,7 +1150,6 @@ static void atifs_free(IWineD3DDevice *iface) { HeapFree(GetProcessHeap(), 0, priv); This->fragment_priv = NULL; } -#undef GLINFO_LOCATION static BOOL atifs_color_fixup_supported(struct color_fixup_desc fixup) {

1 0

Henri Verbeet : wined3d: Set the arb_program_shader. c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 4d4654a0149e8a315cfabe2dcc7e663d6b5340af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d4654a0149e8a315cfabe2dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 25 12:02:02 2010 +0200 wined3d: Set the arb_program_shader.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3045f4a..97840e5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5537,11 +5537,10 @@ static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen caps->MaxTextureBlendStages = 8; caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); } -#undef GLINFO_LOCATION -#define GLINFO_LOCATION stateblock->device->adapter->gl_info static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; float col[4]; @@ -5563,6 +5562,7 @@ static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *statebloc static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; float col[4]; @@ -5591,6 +5591,7 @@ static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateb static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; float mat[2][2]; @@ -5627,6 +5628,7 @@ static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, s static void tex_bumpenvlum_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; float param[4]; @@ -5874,6 +5876,7 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta /* The stateblock is passed for GLINFO_LOCATION */ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWineD3DStateBlockImpl *stateblock) { + const struct wined3d_gl_info *gl_info = &stateblock->device->adapter->gl_info; unsigned int stage; struct wined3d_shader_buffer buffer; BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; @@ -6148,6 +6151,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; struct shader_arb_priv *priv = device->fragment_priv; BOOL use_pshader = use_ps(stateblock); @@ -6184,7 +6188,7 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, return; } new_desc->num_textures_used = 0; - for (i = 0; i < context->gl_info->limits.texture_stages; ++i) + for (i = 0; i < gl_info->limits.texture_stages; ++i) { if(settings.op[i].cop == WINED3DTOP_DISABLE) break; new_desc->num_textures_used = i; @@ -6280,8 +6284,6 @@ static void textransform(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } } -#undef GLINFO_LOCATION - static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, @@ -6443,8 +6445,6 @@ const struct fragment_pipeline arbfp_fragment_pipeline = { TRUE /* We can disable projected textures */ }; -#define GLINFO_LOCATION device->adapter->gl_info - struct arbfp_blit_priv { GLenum yuy2_rect_shader, yuy2_2d_shader; GLenum uyvy_rect_shader, uyvy_2d_shader; @@ -6466,6 +6466,7 @@ static HRESULT arbfp_blit_alloc(IWineD3DDevice *iface) { /* Context activation is done by the caller. */ static void arbfp_blit_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; ENTER_GL(); @@ -6722,6 +6723,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype, static GLuint gen_p8_shader(IWineD3DDeviceImpl *device, GLenum textype) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; GLenum shader; struct wined3d_shader_buffer buffer; struct arbfp_blit_priv *priv = device->blit_priv; @@ -6791,6 +6793,7 @@ static void upload_palette(IWineD3DSurfaceImpl *surface) { BYTE table[256][4]; IWineD3DDeviceImpl *device = surface->resource.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; BOOL colorkey = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE; @@ -6821,6 +6824,7 @@ static void upload_palette(IWineD3DSurfaceImpl *surface) /* Context activation is done by the caller. */ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum complex_fixup yuv_fixup, GLenum textype) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; GLenum shader; struct wined3d_shader_buffer buffer; char luminance_component; @@ -6979,6 +6983,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac { GLenum shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; float size[4] = {surface->pow2Width, surface->pow2Height, 1, 1}; struct arbfp_blit_priv *priv = device->blit_priv; enum complex_fixup fixup; @@ -7182,5 +7187,3 @@ const struct blit_shader arbfp_blit = { arbfp_blit_supported, arbfp_blit_color_fill }; - -#undef GLINFO_LOCATION

1 0

Alexandre Julliard : user.exe: Store the GDI instance when it' s first loaded.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: a157959dbee696790b668142a9d5854066b3ee44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a157959dbee696790b668142a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 23:35:37 2010 +0200 user.exe: Store the GDI instance when it's first loaded. --- dlls/user.exe16/user.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index c536a6d..710ed62 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -60,6 +60,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); WORD USER_HeapSel = 0; /* USER heap selector */ +static HINSTANCE16 gdi_inst; + struct gray_string_info { GRAYSTRINGPROC16 proc; @@ -1760,11 +1762,8 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) { STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); HANDLE16 oldDS = stack16->ds; - HINSTANCE16 gdi_inst; int userPercent, gdiPercent; - if ((gdi_inst = GetModuleHandle16( "gdi" )) < 32) return 0; - switch(resType) { case GFSR_USERRESOURCES: @@ -2060,7 +2059,7 @@ BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds, USER_HeapSel = ds; register_wow_handlers(); - LoadLibrary16( "gdi.exe" ); + gdi_inst = LoadLibrary16( "gdi.exe" ); LoadLibrary16( "display.drv" ); LoadLibrary16( "keyboard.drv" ); LoadLibrary16( "mouse.drv" );

1 0

André Hentschel : oledb32/tests: Preset dst_len to encounter more problems.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: aa8457008a6e2761f4470f991a2ce675f0952eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8457008a6e2761f4470f991… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 24 20:51:49 2010 +0200 oledb32/tests: Preset dst_len to encounter more problems. --- dlls/oledb32/tests/convert.c | 282 +++++++++++++++++++++++++++++++++--------- 1 files changed, 223 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa8457008a6e2761f4470…

1 0

Dylan Smith : richedit: Fix assignment to wrong variable (LLVM/Clang).
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: b88b007d95300c320d8533eb078b73f87857c1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88b007d95300c320d8533eb0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 24 16:13:55 2010 -0400 richedit: Fix assignment to wrong variable (LLVM/Clang). --- dlls/riched20/wrap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 790c280..8d75b7f 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -232,7 +232,8 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i } if (piter->member.run.nFlags & MERF_ENDWHITE) { - j = ME_ReverseFindNonWhitespaceV(piter->member.run.strText, i); + i = ME_ReverseFindNonWhitespaceV(piter->member.run.strText, + piter->member.run.strText->nLen); pp = ME_SplitRun(wc, piter, i); wc->pt = pp->member.run.pt; return pp;

1 0

Juan Lang : ole32/tests: Test creating an IPropertySetStorage with an unknown format id.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: b4c3a041650b248a992e53b1f981d6a7c61e9365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c3a041650b248a992e53b1f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 24 12:10:40 2010 -0700 ole32/tests: Test creating an IPropertySetStorage with an unknown format id. --- dlls/ole32/tests/stg_prop.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 37e8e10..4e5fde7 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -59,6 +59,8 @@ static void testProps(void) PROPVARIANT var; CLIPDATA clipdata; unsigned char clipcontent[] = "foobar"; + GUID anyOldGuid = { 0x12345678,0xdead,0xbeef, { + 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07 } }; if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; @@ -290,6 +292,60 @@ static void testProps(void) IStorage_Release(storage); DeleteFileW(filename); + + /* Test creating a property set storage with a random GUID */ + hr = StgCreateDocfile(filename, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, &storage); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + + if(!pStgCreatePropSetStg) + { + IStorage_Release(storage); + DeleteFileW(filename); + return; + } + hr = pStgCreatePropSetStg(storage, 0, &propSetStorage); + ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); + + hr = IPropertySetStorage_Create(propSetStorage, + &anyOldGuid, NULL, PROPSETFLAG_ANSI, + STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, + &propertyStorage); + ok(hr == S_OK, "IPropertySetStorage_Create failed: 0x%08x\n", hr); + + spec.ulKind = PRSPEC_PROPID; + U(spec).propid = PID_FIRST_USABLE; + U(var).lVal = 1; + hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); + ok(hr == S_OK, "WriteMultiple failed: 0x%08x\n", hr); + + IPropertyStorage_Release(propertyStorage); + IPropertySetStorage_Release(propSetStorage); + IStorage_Release(storage); + + /* now open it again */ + hr = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, + NULL, 0, &storage); + ok(hr == S_OK, "StgOpenStorage failed: 0x%08x\n", hr); + + hr = pStgCreatePropSetStg(storage, 0, &propSetStorage); + ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); + + hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); + todo_wine + ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); + + spec.ulKind = PRSPEC_PROPID; + U(spec).propid = PID_FIRST_USABLE; + hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); + ok(hr == S_FALSE, "ReadMultiple failed: 0x%08x\n", hr); + + IPropertyStorage_Release(propertyStorage); + IPropertySetStorage_Release(propSetStorage); + IStorage_Release(storage); + + DeleteFileW(filename); } static void testCodepage(void)

1 0

Juan Lang : ole32: Only read known format ids when attempting to read summary information.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: c94b2687d223100300b61628a77fe942e4f42121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94b2687d223100300b61628a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 24 12:11:22 2010 -0700 ole32: Only read known format ids when attempting to read summary information. --- dlls/ole32/stg_prop.c | 7 +++++++ dlls/ole32/tests/stg_prop.c | 1 - 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index b3362bc..f887d10 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1314,6 +1314,13 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) hr = PropertyStorage_ReadFmtIdOffsetFromStream(This->stm, &fmtOffset); if (FAILED(hr)) goto end; + if (!IsEqualGUID(&fmtOffset.fmtid, &FMTID_DocSummaryInformation) && + !IsEqualGUID(&fmtOffset.fmtid, &FMTID_SummaryInformation)) + { + WARN("not reading unknown fmtid %s\n", debugstr_guid(&fmtOffset.fmtid)); + hr = S_FALSE; + goto end; + } if (fmtOffset.dwOffset > stat.cbSize.u.LowPart) { WARN("invalid offset %d (stream length is %d)\n", fmtOffset.dwOffset, diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 4e5fde7..dff3361 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -333,7 +333,6 @@ static void testProps(void) hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); - todo_wine ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); spec.ulKind = PRSPEC_PROPID;

1 0

André Hentschel : winegcc: Add support for amd64-mingw32msvc platform.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: b723530be0e7c86a193ca1eeb2a12ee269dbaa17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b723530be0e7c86a193ca1eeb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 25 01:04:59 2010 +0200 winegcc: Add support for amd64-mingw32msvc platform. --- tools/winegcc/winegcc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 10a4d7a..7e9c3f6 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -156,6 +156,7 @@ static const struct { "i586", CPU_x86 }, { "i686", CPU_x86 }, { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "alpha", CPU_ALPHA },

1 0

Gerald Pfeifer : msvcrt/tests: Adjust CHECK_TYPE to avoid some two dozen compiler warnings.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 68a94aa90136053b8609f9719d6c78d3ecaf0c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a94aa90136053b8609f9719… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 21:35:47 2010 +0200 msvcrt/tests: Adjust CHECK_TYPE to avoid some two dozen compiler warnings. --- dlls/msvcrt/tests/headers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 80c614b..c39948d 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -68,7 +68,7 @@ #define MSVCRT(x) MSVCRT_##x #define OFFSET(T,F) ((unsigned int)((char *)&((struct T *)0L)->F - (char *)0L)) #define CHECK_SIZE(e) ok(sizeof(e) == sizeof(MSVCRT(e)), "Element has different sizes\n") -#define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = 0; a = b; CHECK_SIZE(t); } +#define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = a; a = b; CHECK_SIZE(t); } #define CHECK_STRUCT(s) ok(sizeof(struct s) == sizeof(struct MSVCRT(s)), "Struct has different sizes\n") #define CHECK_FIELD(s,e) ok(OFFSET(s,e) == OFFSET(MSVCRT(s),e), "Bad offset\n") #define CHECK_DEF(d) ok(d == MSVCRT_##d, "Defines (MSVCRT_)" #d " are different: %d vs. %d\n", d, MSVCRT_##d)

1 0

Gerald Pfeifer : oleaut32/tests: Remove variable rValid which is not really used from test_VarMod.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: dbd2e8cb346c1bbd14516a258675e7d16afb8325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd2e8cb346c1bbd14516a258… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 22:09:54 2010 +0200 oleaut32/tests: Remove variable rValid which is not really used from test_VarMod. --- dlls/oleaut32/tests/vartest.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2374051..8203510 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2347,7 +2347,7 @@ static void test_VarMod(void) static const WCHAR szNum1[] = {'1','0','\0'}; int l, r; BOOL lFound, rFound; - BOOL lValid, rValid; + BOOL lValid; BSTR strNum0, strNum1; CHECKPTR(VarMod); @@ -2531,7 +2531,6 @@ static void test_VarMod(void) } rFound = TRUE; - rValid = TRUE; switch(r) { case VT_EMPTY: @@ -2558,7 +2557,6 @@ static void test_VarMod(void) case VT_VARIANT: case VT_UNKNOWN: case VT_RECORD: - rValid = FALSE; break; default: rFound = FALSE;

1 0