March 2009 - Wine-commits - list.winehq.org

Tobias Jakobi : wined3d: Add texrect_fixup bitfield to ps_compile_args struct.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 1b335dfaaa8fc2f2a45c5979beecaae84e019ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b335dfaaa8fc2f2a45c5979b… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:15:21 2009 +0100 wined3d: Add texrect_fixup bitfield to ps_compile_args struct. Initialization of the bitfield done in find_ps_compile_args based on the previously introduced pow2Matrix_identity flag. --- dlls/wined3d/pixelshader.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a974ca5..de609a7 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -460,6 +460,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set */ args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; + args->texrect_fixup = 0; for(i = 0; i < MAX_FRAGMENT_SAMPLERS; i++) { if(shader->baseShader.reg_maps.samplers[i] == 0) continue; @@ -469,6 +470,11 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp continue; } args->color_fixup[i] = tex->resource.format_desc->color_fixup; + + /* Flag samplers that need NP2 texcoord fixup. */ + if(!tex->baseTexture.pow2Matrix_identity) { + args->texrect_fixup |= (1 << i); + } } if (shader->baseShader.reg_maps.shader_version >= WINED3DPS_VERSION(3,0)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abab9dc..8907b0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -446,11 +446,15 @@ enum fogmode { */ struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; - BOOL srgb_correction; enum vertexprocessing_mode vp_mode; enum fogmode fog; /* Projected textures(ps 1.0-1.3) */ /* Texture types(2D, Cube, 3D) in ps 1.x */ + BOOL srgb_correction; + WORD texrect_fixup; + /* Bitmap for texture rect coord fixups (16 samplers max currently). + D3D9 has a limit of 16 samplers and the fixup is superfluous + in D3D10 (unconditional NP2 support mandatory). */ }; #define MAX_ATTRIBS 16

1 0

Tobias Jakobi : wined3d: GLSL: Implement texrect coord fixup.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 38239be58ca709ca107752ca7d3fee0763832725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38239be58ca709ca107752ca7… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:19:41 2009 +0100 wined3d: GLSL: Implement texrect coord fixup. --- dlls/wined3d/glsl_shader.c | 53 +++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 17 ++++++++++++- 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index da0b1a8..c92f99b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -100,6 +100,7 @@ struct glsl_shader_prog_link { GLint vuniformI_locations[MAX_CONST_I]; GLint puniformI_locations[MAX_CONST_I]; GLint posFixup_location; + GLint rectFixup_location[MAX_FRAGMENT_SAMPLERS]; GLint bumpenvmat_location[MAX_TEXTURES]; GLint luminancescale_location[MAX_TEXTURES]; GLint luminanceoffset_location[MAX_TEXTURES]; @@ -587,6 +588,24 @@ static void shader_glsl_load_constants( } GL_EXTCALL(glUniform4fvARB(prog->ycorrection_location, 1, correction_params)); } + + /* Constant loading for texture rect coord fixup. */ + if (prog->ps_args.texrect_fixup) { + UINT fixup = prog->ps_args.texrect_fixup; + + for (i = 0; fixup; fixup >>= 1, ++i) { + if (-1 != prog->rectFixup_location[i]) { + const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; + if (!tex) { + FIXME("Non-existant texture is flagged for NP2 texcoord fixup\n"); + continue; + } else { + const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]}; + GL_EXTCALL(glUniform2fvARB(prog->rectFixup_location[i], 1, tex_dim)); + } + } + } + } } if (priv->next_constant_version == UINT_MAX) @@ -774,6 +793,14 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s } else { shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } + + if(ps_args->texrect_fixup & (1 << i)) { + /* RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] + * while D3D has them in the (normalized) [0,1]x[0,1] range. + * samplerRectFixup stores texture dimensions and is updated through + * shader_glsl_load_constants when the sampler changes. */ + shader_addline(buffer, "uniform vec2 %csamplerRectFixup%u;\n", prefix, i); + } break; case WINED3DSTT_CUBE: shader_addline(buffer, "uniform samplerCube %csampler%u;\n", prefix, i); @@ -1475,6 +1502,7 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const SHADER_OPCODE_AR const char *sampler_base; char dst_swizzle[6]; struct color_fixup_desc fixup; + BOOL rect_fixup = FALSE; va_list args; shader_glsl_get_swizzle(swizzle, FALSE, arg->dst, dst_swizzle); @@ -1483,6 +1511,14 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const SHADER_OPCODE_AR IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *) arg->shader; fixup = This->cur_args->color_fixup[sampler]; sampler_base = "Psampler"; + + if(This->cur_args->texrect_fixup & (1 << sampler)) { + if(bias) { + FIXME("Biased sampling from RECT textures is unsupported\n"); + } else { + rect_fixup = TRUE; + } + } } else { sampler_base = "Vsampler"; fixup = COLOR_FIXUP_IDENTITY; /* FIXME: Vshader color fixup */ @@ -1499,7 +1535,11 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const SHADER_OPCODE_AR if(bias) { shader_addline(arg->buffer, ", %s)%s);\n", bias, dst_swizzle); } else { - shader_addline(arg->buffer, ")%s);\n", dst_swizzle); + if (rect_fixup) { + shader_addline(arg->buffer, " * PsamplerRectFixup%u)%s);\n", sampler, dst_swizzle); + } else { + shader_addline(arg->buffer, ")%s);\n", dst_swizzle); + } } if(!is_identity_fixup(fixup)) { @@ -3479,6 +3519,17 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use } } + if (use_ps && ps_compile_args.texrect_fixup) { + char name[32]; + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { + if (ps_compile_args.texrect_fixup & (1 << i)) { + sprintf(name, "PsamplerRectFixup%u", i); + entry->rectFixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + } else { + entry->rectFixup_location[i] = -1; + } + } + } entry->posFixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); entry->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0953042..2aa2b78 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3022,8 +3022,12 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(generated) { FIXME("Non-power2 texture being used with generated texture coords\n"); } - TRACE("Non power two matrix multiply fixup\n"); - glMultMatrixf(((IWineD3DTextureImpl *) stateblock->textures[texUnit])->baseTexture.pow2Matrix); + /* NP2 texcoord fixup is implemented for pixelshaders (currently only in GLSL backend) so + only enable the fixed-function-pipeline fixup via pow2Matrix when no PS is used. */ + if (!use_ps(stateblock)) { + TRACE("Non power two matrix multiply fixup\n"); + glMultMatrixf(((IWineD3DTextureImpl *) stateblock->textures[texUnit])->baseTexture.pow2Matrix); + } } } @@ -3375,6 +3379,15 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont state_alpha(WINED3DRS_COLORKEYENABLE, stateblock, context); } } + + /* Trigger shader constant reloading (for NP2 texcoord fixup) + * Only do this if pshaders are used (note: fixup is currently only implemented in GLSL). */ + if (!tex_impl->baseTexture.pow2Matrix_identity && use_ps(stateblock)) { + IWineD3DDeviceImpl* d3ddevice = stateblock->wineD3DDevice; + /* FIXME: add something like shader_load_rectfixup_consts to the backend to only reload the + * constants that are used for the fixup (and not the other ones too) */ + d3ddevice->shader_backend->shader_load_constants((IWineD3DDevice*)d3ddevice, use_ps(stateblock), use_vs(stateblock)); + } } else if(mapped_stage < GL_LIMITS(textures)) { if(sampler < stateblock->lowest_disabled_stage) { /* TODO: What should I do with pixel shaders here ??? */

1 0

Tobias Jakobi : wined3d: Simplify sampler_texmatrix using pow2Matrix_identity.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 94a7cd42ed13d1f644ef5ac4d0e8aa614083541e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a7cd42ed13d1f644ef5ac4d… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:47:58 2009 +0100 wined3d: Simplify sampler_texmatrix using pow2Matrix_identity. --- dlls/wined3d/state.c | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2aa2b78..47a94a0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3290,8 +3290,7 @@ static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, W } static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - BOOL texIsPow2 = FALSE; - DWORD sampler = state - STATE_SAMPLER(0); + const DWORD sampler = state - STATE_SAMPLER(0); IWineD3DBaseTexture *texture = stateblock->textures[sampler]; TRACE("state %#x, stateblock %p, context %p\n", state, stateblock, context); @@ -3305,21 +3304,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W * misc pipeline */ if(sampler < MAX_TEXTURES) { - UINT texture_dimensions = IWineD3DBaseTexture_GetTextureDimensions(texture); - - if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) - { - if(((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0 || - ((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[5] != 1.0 ) { - texIsPow2 = TRUE; - } - } - else if (texture_dimensions == GL_TEXTURE_CUBE_MAP_ARB) - { - if(((IWineD3DCubeTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0) { - texIsPow2 = TRUE; - } - } + const BOOL texIsPow2 = !((IWineD3DBaseTextureImpl *)texture)->baseTexture.pow2Matrix_identity; if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) {

1 0

Igor Tarasov : comctl32: CCS_VERT flips toolbar separators orientation.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 88b64d486d865679ace4eb942df2855ce71310a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b64d486d865679ace4eb942… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Mon Mar 30 21:05:40 2009 +0500 comctl32: CCS_VERT flips toolbar separators orientation. --- dlls/comctl32/toolbar.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 5ef701d..92a1366 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -492,9 +492,9 @@ TOOLBAR_DrawFlatSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *info /*********************************************************************** -* TOOLBAR_DrawDDFlatSeparator +* TOOLBAR_DrawFlatHorizontalSeparator * -* This function draws the separator that was flagged as BTNS_DROPDOWN. +* This function draws horizontal separator for toolbars having CCS_VERT style. * In this case, the separator is a pixel high line of COLOR_BTNSHADOW, * followed by a pixel high line of COLOR_BTNHIGHLIGHT. These separators * are horizontal as opposed to the vertical separators for not dropdown @@ -503,7 +503,7 @@ TOOLBAR_DrawFlatSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *info * FIXME: It is possible that the height of each line is really SM_CYBORDER. */ static void -TOOLBAR_DrawDDFlatSeparator (const RECT *lpRect, HDC hdc, +TOOLBAR_DrawFlatHorizontalSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *infoPtr) { RECT myrect; @@ -855,8 +855,8 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc, DWORD dwBaseCustDr /* empirical tests show that iBitmap can/will be non-zero */ /* when drawing the vertical bar... */ if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { - if (btnPtr->fsStyle & BTNS_DROPDOWN) - TOOLBAR_DrawDDFlatSeparator (&rc, hdc, infoPtr); + if (dwStyle & CCS_VERT) + TOOLBAR_DrawFlatHorizontalSeparator (&rc, hdc, infoPtr); else TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); } @@ -1330,10 +1330,9 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ /* */ - /* BTNS_DROPDOWN separators are treated as buttons for */ - /* width. - GA 8/01 */ + /* horizontal separators are treated as buttons for width */ if ((btnPtr[i].fsStyle & BTNS_SEP) && - !(btnPtr[i].fsStyle & BTNS_DROPDOWN)) + !(infoPtr->dwStyle & CCS_VERT)) cx = (btnPtr[i].iBitmap > 0) ? btnPtr[i].iBitmap : SEPARATOR_WIDTH; else @@ -1689,7 +1688,7 @@ TOOLBAR_LayoutToolbar(HWND hwnd) /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ if (btnPtr->fsStyle & BTNS_SEP) { - if (btnPtr->fsStyle & BTNS_DROPDOWN) { + if (infoPtr->dwStyle & CCS_VERT) { cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; cx = infoPtr->nButtonWidth; @@ -1762,7 +1761,7 @@ TOOLBAR_LayoutToolbar(HWND hwnd) /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ - if ( !(btnPtr->fsStyle & BTNS_DROPDOWN)) + if ( !(infoPtr->dwStyle & CCS_VERT)) y += cy + ( (btnPtr->iBitmap > 0 ) ? btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3; else

1 0

Maik Schulz : corrective patch for german 1.1.18 release news item
by Jeremy Newman 31 Mar '09

31 Mar '09

Module: website Branch: master Commit: 24d82638c565acdac059cd8e891da4244f6d6faf URL: http://source.winehq.org/git/website.git/?a=commit;h=24d82638c565acdac059cd… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Tue Mar 31 00:14:03 2009 +0200 corrective patch for german 1.1.18 release news item Hi, my first translation patch missed the date and title tags, here is the correction. Cheers, -Maik >From 5cfacf2f43df711dba21fa8d393d9693c22c1392 Mon Sep 17 00:00:00 2001 From: Maik Schulz <maik.schulz(a)gmail.com> Date: Tue, 31 Mar 2009 00:11:47 +0200 Subject: correction of german 1.1.18 news item --- news/de/2009032701.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/news/de/2009032701.xml b/news/de/2009032701.xml index ec1e6dd..545f435 100644 --- a/news/de/2009032701.xml +++ b/news/de/2009032701.xml @@ -1,6 +1,6 @@ <news> -<date>March 27, 2009</date> -<title>Wine 1.1.18 Released</title> +<date>27. März 2009</date> +<title>Wine 1.1.18 Freigegeben</title> <body> Die Entwicklungsversion 1.1.18 von Wine ist jetzt verfügbar. <a href="{$root}/announce/1.1.18">Neuerungen (en)</a> in dieser Version:

1 0

Christoph Korn : wine-website: German template sync
by Jeremy Newman 30 Mar '09

30 Mar '09

Module: website Branch: master Commit: 1b5891d10510bfd5b873212b9d56c2dc79a8596c URL: http://source.winehq.org/git/website.git/?a=commit;h=1b5891d10510bfd5b87321… Author: Christoph Korn <c_korn(a)gmx.de> Date: Mon Mar 30 22:50:17 2009 +0200 wine-website: German template sync Just a template sync for the jaunty download. Christoph >From 15caea52d7a63272d62b769c81af501dd4908190 Mon Sep 17 00:00:00 2001 From: Christoph Korn <c_korn(a)gmx.de> Date: Mon, 30 Mar 2009 22:45:10 +0200 Subject: German template sync. Sync commit "Update-download-and-download-deb-page-for-Ubuntu-9.04" Commit: 7ed6536bc070fa779ec67e82669184872ea13d9a --- templates/de/download.template | 2 +- templates/de/download/deb.template | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index e46cc97..70fd6e6 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,7 +62,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Ubuntu</a> - binär und Quellcode .debs für Ubuntu Hardy (8.04) und Intrepid (8.10) + binär und Quellcode .debs für Ubuntu Hardy (8.04), Intrepid (8.10) und Jaunty (9.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index 7ed2f4a..bc5315e 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -32,6 +32,8 @@ von Drittanbietern-Reiter und klicke auf Hinzufügen. Dann, copy-paste eine der unteren Zeilen in Abhängigkeit welche Version du benutzt. +Für Ubuntu Jaunty (9.04): +deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" Für Ubuntu Intrepid (8.10): deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" Für Ubuntu Hardy (8.04): @@ -88,6 +90,8 @@ in das Terminal copy-pastest.: Danach, füge das Repository zu den APT-Quellen Deines Systems hinzu: +Für Ubuntu Jaunty (9.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list Für Ubuntu Intrepid (8.10): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list Für Ubuntu Hardy (8.04):

1 0

Rico Schüller : Implement d3dx9_41 and forward the functions to d3dx9_36.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 3400c03346b8afe45db00bbdc2ddc3270ccd9106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3400c03346b8afe45db00bbdc… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 29 15:41:21 2009 +0200 Implement d3dx9_41 and forward the functions to d3dx9_36. --- configure | 9 + configure.ac | 1 + dlls/d3dx9_41/Makefile.in | 15 ++ dlls/d3dx9_41/d3dx9_41.spec | 336 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_41/d3dx9_41_main.c | 63 ++++++++ dlls/d3dx9_41/version.rc | 27 ++++ 6 files changed, 451 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3400c03346b8afe45db00…

1 0

Joerg-Cyril.Hoehle@t-systems.com : amstream: Log GUID instead of pointer.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 110c287f2f14108e04761cb76bd8124ef06dfc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110c287f2f14108e04761cb76… Author: Joerg-Cyril.Hoehle(a)t-systems.com <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Mon Mar 30 13:21:45 2009 +0200 amstream: Log GUID instead of pointer. --- dlls/amstream/amstream.c | 4 ++-- dlls/amstream/mediastream.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 6c544f6..a709c7b 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -129,7 +129,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream MSPID PurposeId; unsigned int i; - TRACE("(%p/%p)->(%p,%p)\n", This, iface, idPurpose, ppMediaStream); + TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_guid(idPurpose), ppMediaStream); for (i = 0; i < This->nbStreams; i++) { @@ -268,7 +268,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream IMediaStream* pStream; IMediaStream** pNewStreams; - FIXME("(%p/%p)->(%p,%p,%x,%p) partial stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream); + FIXME("(%p/%p)->(%p,%s,%x,%p) partial stub!\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) hr = DirectDrawMediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 39e9a28..697b03b 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -58,7 +58,7 @@ HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, S { IMediaStreamImpl* object; - TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream); + TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); if (!object) @@ -198,7 +198,7 @@ HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPu { IDirectDrawMediaStreamImpl* object; - TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream); + TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); if (!object)

1 0

Aric Stewart : advapi32: Alias some sids in LookupAccountName and make comparison case insensitive.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 4ea704d15a2bb3c5f628f1edd48be1dcee16d3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea704d15a2bb3c5f628f1edd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 27 09:47:43 2009 -0500 advapi32: Alias some sids in LookupAccountName and make comparison case insensitive. --- dlls/advapi32/security.c | 10 +++++-- dlls/advapi32/tests/security.c | 56 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a220ddb..a26e81a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -167,6 +167,7 @@ typedef struct _AccountSid { LPCWSTR account; LPCWSTR domain; SID_NAME_USE name_use; + LPCWSTR alias; } AccountSid; static const WCHAR Account_Operators[] = { 'A','c','c','o','u','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; @@ -200,9 +201,11 @@ static const WCHAR Guests[] = { 'G','u','e','s','t','s',0 }; static const WCHAR INTERACTIVE[] = { 'I','N','T','E','R','A','C','T','I','V','E',0 }; static const WCHAR LOCAL[] = { 'L','O','C','A','L',0 }; static const WCHAR LOCAL_SERVICE[] = { 'L','O','C','A','L',' ','S','E','R','V','I','C','E',0 }; +static const WCHAR LOCAL_SERVICE2[] = { 'L','O','C','A','L','S','E','R','V','I','C','E',0 }; static const WCHAR NETWORK[] = { 'N','E','T','W','O','R','K',0 }; static const WCHAR Network_Configuration_Operators[] = { 'N','e','t','w','o','r','k',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR NETWORK_SERVICE[] = { 'N','E','T','W','O','R','K',' ','S','E','R','V','I','C','E',0 }; +static const WCHAR NETWORK_SERVICE2[] = { 'N','E','T','W','O','R','K','S','E','R','V','I','C','E',0 }; static const WCHAR NT_AUTHORITY[] = { 'N','T',' ','A','U','T','H','O','R','I','T','Y',0 }; static const WCHAR NT_Pseudo_Domain[] = { 'N','T',' ','P','s','e','u','d','o',' ','D','o','m','a','i','n',0 }; static const WCHAR NTML_Authentication[] = { 'N','T','M','L',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; @@ -252,8 +255,8 @@ static const AccountSid ACCOUNT_SIDS[] = { { WinTerminalServerSid, TERMINAL_SERVER_USER, NT_AUTHORITY, SidTypeWellKnownGroup }, { WinRemoteLogonIdSid, REMOTE_INTERACTIVE_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, { WinLocalSystemSid, SYSTEM, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, + { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup, LOCAL_SERVICE2 }, + { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup , NETWORK_SERVICE2}, { WinBuiltinDomainSid, BUILTIN, BUILTIN, SidTypeDomain }, { WinBuiltinAdministratorsSid, Administrators, BUILTIN, SidTypeAlias }, { WinBuiltinUsersSid, Users, BUILTIN, SidTypeAlias }, @@ -2667,7 +2670,8 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) { - if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account)) + if (!strcmpiW(lpAccountName, ACCOUNT_SIDS[i].account) || + (ACCOUNT_SIDS[i].alias && !strcmpiW(lpAccountName, ACCOUNT_SIDS[i].alias))) { DWORD sidLen = SECURITY_MAX_SID_SIZE; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e82167a..dd6879d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1700,6 +1700,40 @@ static void get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) LookupAccountSidA(NULL, psid, account, &size, domain, &dom_size, &use); } +static void check_wellknown_name(const char* name, const char* exp_account, int exp_size, SID_NAME_USE exp_use, BOOL exp_succ) +{ + DWORD sid_size, domain_size; + SID_NAME_USE sid_use; + LPSTR domain, account, sid_dom; + PSID psid; + BOOL ret; + + sid_size = 0; + domain_size = 0; + ret = LookupAccountNameA(NULL, name, NULL, &sid_size, NULL, &domain_size, &sid_use); + psid = HeapAlloc(GetProcessHeap(),0,sid_size); + domain = HeapAlloc(GetProcessHeap(),0,domain_size); + ret = LookupAccountNameA(NULL, name, psid, &sid_size, domain, &domain_size, &sid_use); + + get_sid_info(psid, &account, &sid_dom); + + if (!exp_succ) + { + ok(!ret, " %s Should have failed to lookup account name\n",name); + return; + } + ok(ret, "Failed to lookup account name %s\n",name); + ok(sid_size != 0, "sid_size was zero\n"); + ok(!lstrcmp(account, exp_account), "Expected %s , got %s\n", exp_account, account); + ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); + ok(domain_size == exp_size, "Expected %i, got %d\n", exp_size, domain_size); + ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); + ok(sid_use == exp_use, "Expected (%d), got %d\n", exp_use, sid_use); + + HeapFree(GetProcessHeap(),0,psid); + HeapFree(GetProcessHeap(),0,domain); +} + static void test_LookupAccountName(void) { DWORD sid_size, domain_size, user_size; @@ -1898,6 +1932,28 @@ static void test_LookupAccountName(void) HeapFree(GetProcessHeap(), 0, domain); HeapFree(GetProcessHeap(), 0, psid); } + + /* Well Known names */ + check_wellknown_name("LocalService", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); + check_wellknown_name("Local Service", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); + /* 2 spaces */ + check_wellknown_name("Local Service", "", 0, 0, FALSE); + check_wellknown_name("NetworkService", "NETWORK SERVICE", 12, SidTypeWellKnownGroup, TRUE); + check_wellknown_name("Network Service", "NETWORK SERVICE", 12, SidTypeWellKnownGroup, TRUE); + + /* example of some names where the spaces are not optional */ + check_wellknown_name("Terminal Server User", "TERMINAL SERVER USER", 12, SidTypeWellKnownGroup, TRUE); + check_wellknown_name("TerminalServer User", "", 0, 0, FALSE); + check_wellknown_name("TerminalServerUser", "", 0, 0, FALSE); + check_wellknown_name("Terminal ServerUser", "", 0, 0, FALSE); + + check_wellknown_name("enterprise domain controllers", "ENTERPRISE DOMAIN CONTROLLERS", 12, SidTypeWellKnownGroup, TRUE); + check_wellknown_name("enterprisedomain controllers", "", 0, 0, FALSE); + check_wellknown_name("enterprise domaincontrollers", "", 0, 0, FALSE); + check_wellknown_name("enterprisedomaincontrollers", "", 0, 0, FALSE); + + /* case insensitivity */ + check_wellknown_name("lOCAlServICE", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); } static void test_security_descriptor(void)

1 0

Detlef Riekenberg : msi/tests: Fix a copy & paste typo in a test message.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 03ff6ba6414a8bfe5d18213f063f6856538a158b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ff6ba6414a8bfe5d18213f0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Mar 30 17:33:09 2009 +0200 msi/tests: Fix a copy & paste typo in a test message. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6dbcf31..768ece1 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1779,7 +1779,7 @@ static void test_MsiInstallProduct(void) type = REG_SZ; res = RegQueryValueExA(hkey, "OrderTestName", NULL, &type, (LPBYTE)path, &size); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!lstrcmpA(path, "OrderTestValue"), "Expected imaname, got %s\n", path); + ok(!lstrcmpA(path, "OrderTestValue"), "Expected OrderTestValue, got %s\n", path); check_service_is_installed();

1 0