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

Christian Costa : winemp3: Add missing sampling frequencies.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: a513d401ac4f88c390e7b40cb796901a34fa9fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a513d401ac4f88c390e7b40cb… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Mar 28 11:14:23 2009 +0100 winemp3: Add missing sampling frequencies. --- dlls/winemp3.acm/mpegl3.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index e0f0ebd..3ebd94c 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -75,16 +75,26 @@ static const Format PCM_Formats[] = { {1, 8, 8000}, {2, 8, 8000}, {1, 16, 8000}, {2, 16, 8000}, {1, 8, 11025}, {2, 8, 11025}, {1, 16, 11025}, {2, 16, 11025}, + {1, 8, 12000}, {2, 8, 12000}, {1, 16, 12000}, {2, 16, 12000}, + {1, 8, 16000}, {2, 8, 16000}, {1, 16, 16000}, {2, 16, 16000}, {1, 8, 22050}, {2, 8, 22050}, {1, 16, 22050}, {2, 16, 22050}, + {1, 8, 24000}, {2, 8, 24000}, {1, 16, 24000}, {2, 16, 24000}, + {1, 8, 32000}, {2, 8, 32000}, {1, 16, 32000}, {2, 16, 32000}, {1, 8, 44100}, {2, 8, 44100}, {1, 16, 44100}, {2, 16, 44100}, - {1, 8, 48000}, {2, 8, 48000}, {1, 16, 48000}, {2, 16, 48000}, + {1, 8, 48000}, {2, 8, 48000}, {1, 16, 48000}, {2, 16, 48000} }; static const Format MPEG3_Formats[] = { - {1, 0, 8000}, {2, 0, 8000}, {1, 0, 11025}, {2, 0, 11025}, - {1, 0, 22050}, {2, 0, 22050}, {1, 0, 44100}, {2, 0, 44100}, - {1, 0, 48000}, {2, 0, 48000}, + {1, 0, 8000}, {2, 0, 8000}, + {1, 0, 11025}, {2, 0, 11025}, + {1, 0, 12000}, {2, 0, 12000}, + {1, 0, 16000}, {2, 0, 16000}, + {1, 0, 22050}, {2, 0, 22050}, + {1, 0, 24000}, {2, 0, 24000}, + {1, 0, 32000}, {2, 0, 32000}, + {1, 0, 44100}, {2, 0, 44100}, + {1, 0, 48000}, {2, 0, 48000} }; #define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0]))

1 0

Stefan Dösinger : wined3d: Fix some whitespace.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 703dcca61b73933f159c1b37acecdd58a6382aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703dcca61b73933f159c1b37a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 23 19:22:09 2009 +0100 wined3d: Fix some whitespace. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cf5716a..ee7ab90 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3226,23 +3226,23 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), set_bumpmat_arbfp }, 0 }, {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlum_arbfp }, 0 }, {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlum_arbfp }, 0 }, - { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, 0 }, - { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, 0 }, - { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }, 0 }, - { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }, 0 }, - { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }, 0 }, - { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }, 0 }, - { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }, 0 }, - { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }, 0 }, - { STATE_PIXELSHADER, { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, - { STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, - { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, - { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, - { STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, 0 }, - { STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, 0 }, - { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, - { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, - { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, + {STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, 0 }, + {STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, 0 }, + {STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }, 0 }, + {STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }, 0 }, + {STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }, 0 }, + {STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }, 0 }, + {STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }, 0 }, + {STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }, 0 }, + {STATE_PIXELSHADER, { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, + {STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, + {STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, + {STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, + {STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, 0 }, + {STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, 0 }, + {STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, + {STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, + {STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, {STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(0, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(1, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(2, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, @@ -3251,7 +3251,7 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, - { STATE_RENDER(WINED3DRS_SPECULARENABLE), { STATE_RENDER(WINED3DRS_SPECULARENABLE), state_arb_specularenable}, 0 }, + {STATE_RENDER(WINED3DRS_SPECULARENABLE), { STATE_RENDER(WINED3DRS_SPECULARENABLE), state_arb_specularenable}, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, };

1 0

Stefan Dösinger : wined3d: Remove a TODO.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 8d4ac8ac1b64403e22f60ac79f946c064e656819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4ac8ac1b64403e22f60ac79… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 23 19:18:10 2009 +0100 wined3d: Remove a TODO. init_materials() doesn't exist, and I don't know what the TODO means with primitive type (the diffuse stuff is already handled properly). --- dlls/wined3d/state.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 329444c..35f6d0a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1146,7 +1146,6 @@ void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo checkGLcall("glFogf(GL_FOG_DENSITY, (float) Value)"); } -/* TODO: Merge with primitive type + init_materials()!! */ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; GLenum Parm = 0;

1 0

Stefan Dösinger : wined3d: Advertise post pixelshader blending for a few more formats.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 3e099d014750fa5fc2a10c6aa4bf23ddc80a1fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e099d014750fa5fc2a10c6aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 25 21:20:39 2009 +0100 wined3d: Advertise post pixelshader blending for a few more formats. Windows advertises it on all these formats(Nvidia Geforce 7400), and Trackmania Nations needs it on D3DFMT_Q8W8V8U8 to accept ps_3_0 support. --- dlls/wined3d/utils.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 048be9e..02f5255 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -203,19 +203,19 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT2, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT3, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT4, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_MULTI2_ARGB8, 0, 0, 0, 0, 0, 0}, @@ -311,29 +311,29 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* Luminance */ {WINED3DFMT_L8, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_A8L8, GL_LUMINANCE8_ALPHA8, GL_SLUMINANCE8_ALPHA8_EXT, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_A4L4, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE4_ALPHA4, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0}, /* Bump mapping stuff */ {WINED3DFMT_R8G8_SNORM, GL_DSDT8_NV, GL_DSDT8_NV, 0, GL_DSDT_NV, GL_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_L6V5U5, GL_DSDT8_MAG8_NV, GL_DSDT8_MAG8_NV, 0, GL_DSDT_MAG_NV, GL_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_X8L8V8U8, GL_DSDT8_MAG8_INTENSITY8_NV, GL_DSDT8_MAG8_INTENSITY8_NV, 0, GL_DSDT_MAG_VIB_NV, GL_UNSIGNED_INT_8_8_S8_S8_REV_NV, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_R8G8B8A8_SNORM, GL_SIGNED_RGBA8_NV, GL_SIGNED_RGBA8_NV, 0, GL_RGBA, GL_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_R16G16_SNORM, GL_SIGNED_HILO16_NV, GL_SIGNED_HILO16_NV, 0, GL_HILO_NV, GL_SHORT, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_W11V11U10, 0, 0, 0, 0, 0, 0}, @@ -352,19 +352,19 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, {WINED3DFMT_D24S8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, {WINED3DFMT_D24X8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH}, {WINED3DFMT_D24X4S4, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH}, {WINED3DFMT_L16, GL_LUMINANCE16_EXT, GL_LUMINANCE16_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_SHORT, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_D32F_LOCKABLE, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH},

1 0

Stefan Dösinger : wined3d: Update a comment.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 3fbdb64270a48163e96195495fb828299096f5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbdb64270a48163e96195495… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 23 19:27:13 2009 +0100 wined3d: Update a comment. shader_select takes care of compiling the shader since we have the shader duplication infrastructure. However, there's still a motivation to skip the shader_select call if the vertex shader is dirty. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ee7ab90..1bebb21 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3045,8 +3045,8 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, * type overwrites GL_ARB_fragment_program. This is currently the case with GLSL. If we really want to use * atifs or nvrc pixel shaders with arb fragment programs we'd have to disable GL_FRAGMENT_PROGRAM_ARB here * - * Don't call shader_select if the vertex shader is dirty, because some shader backends(GLSL) need both shaders - * to be compiled before activating them(needs some cleanups in the shader backend interface) + * Don't call shader_select if the vertex shader is dirty, because it will be called later on by the vertex + * shader handler */ if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { device->shader_backend->shader_select((IWineD3DDevice *)stateblock->wineD3DDevice, use_pshader, use_vshader);

1 0

Eric Pouech : winmm: Added support for SND_ALIAS_ID in winmm.PlaySound[AW].
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 2dbc7d5c41e03d0456feb83c731a51754e13a812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbc7d5c41e03d0456feb83c7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 29 17:22:43 2009 +0200 winmm: Added support for SND_ALIAS_ID in winmm.PlaySound[AW]. --- dlls/winmm/playsound.c | 40 +++++++++++++++++++++++++++++++++------- include/mmsystem.h | 13 +++++++++++++ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index a4d21ce..143f4a9 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -193,11 +193,12 @@ static BOOL PlaySound_IsString(DWORD fdwSound, const void* psz) /* SND_RESOURCE is 0x40004 while * SND_MEMORY is 0x00004 */ - switch (fdwSound & (SND_RESOURCE|SND_ALIAS|SND_FILENAME)) + switch (fdwSound & (SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME)) { case SND_RESOURCE: return HIWORD(psz) != 0; /* by name or by ID ? */ + case SND_ALIAS_ID: case SND_MEMORY: return FALSE; - case SND_ALIAS: /* what about ALIAS_ID ??? */ + case SND_ALIAS: case SND_FILENAME: case 0: return TRUE; default: FIXME("WTF\n"); return FALSE; @@ -309,6 +310,36 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) } else if (wps->fdwSound & SND_ALIAS) { + if (wps->fdwSound & SND_ALIAS_ID) + { + static const WCHAR wszSystemAsterisk[] = {'S','y','s','t','e','m','A','s','t','e','r','i','s','k',0}; + static const WCHAR wszSystemDefault[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t',0}; + static const WCHAR wszSystemExclamation[] = {'S','y','s','t','e','m','E','x','c','l','a','m','a','t','i','o','n',0}; + static const WCHAR wszSystemExit[] = {'S','y','s','t','e','m','E','x','i','t',0}; + static const WCHAR wszSystemHand[] = {'S','y','s','t','e','m','H','a','n','d',0}; + static const WCHAR wszSystemQuestion[] = {'S','y','s','t','e','m','Q','u','e','s','t','i','o','n',0}; + static const WCHAR wszSystemStart[] = {'S','y','s','t','e','m','S','t','a','r','t',0}; + static const WCHAR wszSystemWelcome[] = {'S','y','s','t','e','m','W','e','l','c','o','m','e',0}; + + wps->fdwSound &= ~(SND_ALIAS_ID ^ SND_ALIAS); + if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMASTERISK) + wps->pszSound = wszSystemAsterisk; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMDEFAULT) + wps->pszSound = wszSystemDefault; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMEXCLAMATION) + wps->pszSound = wszSystemExclamation; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMEXIT) + wps->pszSound = wszSystemExit; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMHAND) + wps->pszSound = wszSystemHand; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMQUESTION) + wps->pszSound = wszSystemQuestion; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMSTART) + wps->pszSound = wszSystemStart; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMWELCOME) + wps->pszSound = wszSystemWelcome; + else return FALSE; + } hmmio = get_mmioFromProfile(wps->fdwSound, wps->pszSound); } else if (wps->fdwSound & SND_FILENAME) @@ -446,11 +477,6 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySoundList != NULL) return FALSE; - if ((fdwSound & SND_ALIAS_ID) == SND_ALIAS_ID) { - FIXME("SND_ALIAS_ID not supported\n"); - return FALSE; - } - /* alloc internal structure, if we need to play something */ if (pszSound && !(fdwSound & SND_PURGE)) { diff --git a/include/mmsystem.h b/include/mmsystem.h index abed551..39f70a1 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -285,6 +285,19 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound); #define SND_PURGE 0x00000040L /* purge all sounds */ #define SND_APPLICATION 0x00000080L /* look for application specific association */ +#define SND_ALIAS_START 0 + +#define sndAlias(ch0, ch1) (SND_ALIAS_START + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8))) + +#define SND_ALIAS_SYSTEMASTERISK sndAlias('S', '*') +#define SND_ALIAS_SYSTEMQUESTION sndAlias('S', '?') +#define SND_ALIAS_SYSTEMHAND sndAlias('S', 'H') +#define SND_ALIAS_SYSTEMEXIT sndAlias('S', 'E') +#define SND_ALIAS_SYSTEMSTART sndAlias('S', 'S') +#define SND_ALIAS_SYSTEMWELCOME sndAlias('S', 'W') +#define SND_ALIAS_SYSTEMEXCLAMATION sndAlias('S', '!') +#define SND_ALIAS_SYSTEMDEFAULT sndAlias('S', 'D') + /* waveform audio error return values */ #define WAVERR_BADFORMAT (WAVERR_BASE + 0) /* unsupported wave format */ #define WAVERR_STILLPLAYING (WAVERR_BASE + 1) /* still something playing */

1 0

Rob Shearman : rpcrt4: RpcServerUseProtseqEp(..., NULL, ...) should return RPC_S_OK.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 4d8057ffef2349fd1dc79a3105b9a0165527736e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8057ffef2349fd1dc79a310… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Mar 29 18:42:20 2009 +0100 rpcrt4: RpcServerUseProtseqEp(..., NULL, ...) should return RPC_S_OK. However, on some buggy platforms it returns RPC_S_INVALID_ENDPOINT_FORMAT. Don't follow this behaviour our implementation of the API. --- dlls/rpcrt4/rpc_server.c | 6 ------ dlls/rpcrt4/tests/rpc_protseq.c | 14 +++++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 4a87bd0..6e9dbe9 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -772,9 +772,6 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC debugstr_a(szep), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - if (!Endpoint) - return RPC_S_INVALID_ENDPOINT_FORMAT; - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA(szps), &ps); if (status != RPC_S_OK) return status; @@ -796,9 +793,6 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - if (!Endpoint) - return RPC_S_INVALID_ENDPOINT_FORMAT; - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); if (status != RPC_S_OK) return status; diff --git a/dlls/rpcrt4/tests/rpc_protseq.c b/dlls/rpcrt4/tests/rpc_protseq.c index 06a82ec..4837f6a 100644 --- a/dlls/rpcrt4/tests/rpc_protseq.c +++ b/dlls/rpcrt4/tests/rpc_protseq.c @@ -43,13 +43,6 @@ static void test_RpcServerUseProtseq(void) static unsigned char np[] = "ncacn_np"; static unsigned char ncalrpc[] = "ncalrpc"; - /* show that RpcServerUseProtseqEp(..., NULL, ...) isn't the same as - * RpcServerUseProtseq(...) */ - status = RpcServerUseProtseqEp(ncalrpc, 0, NULL, NULL); - ok(status == RPC_S_INVALID_ENDPOINT_FORMAT, - "RpcServerUseProtseqEp with NULL endpoint should have failed with " - "RPC_S_INVALID_ENDPOINT_FORMAT instead of %d\n", status); - status = RpcServerInqBindings(&bindings); if (status == RPC_S_NO_BINDINGS) binding_count_before = 0; @@ -60,6 +53,13 @@ static void test_RpcServerUseProtseq(void) RpcBindingVectorFree(&bindings); } + /* show that RpcServerUseProtseqEp(..., NULL, ...) is the same as + * RpcServerUseProtseq(...) */ + status = RpcServerUseProtseqEp(ncalrpc, 0, NULL, NULL); + ok(status == RPC_S_OK || broken(status == RPC_S_INVALID_ENDPOINT_FORMAT), + "RpcServerUseProtseqEp with NULL endpoint failed with status %d\n", + status); + /* register protocol sequences without explicit endpoints */ status = RpcServerUseProtseq(np, 0, NULL); if (status == RPC_S_PROTSEQ_NOT_SUPPORTED)

1 0

Rob Shearman : rpcrt4: Free the memory allocated for the protseq and endpoint strings allocated in RpcServerUseProtseq* functions .
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 317edfd7dabbe4bd25fad4eb8e83f72821c205f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=317edfd7dabbe4bd25fad4eb8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Mar 29 18:42:35 2009 +0100 rpcrt4: Free the memory allocated for the protseq and endpoint strings allocated in RpcServerUseProtseq* functions. Make a copy of the protseq string in alloc_serverprotoseq to simplify memory management in higher-level functions. --- dlls/rpcrt4/rpc_server.c | 31 ++++++++++++++++++------------- dlls/rpcrt4/rpc_server.h | 2 +- dlls/rpcrt4/rpc_transport.c | 6 +++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 6e9dbe9..6214965 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -566,7 +566,7 @@ static void RPCRT4_stop_listen(BOOL auto_listen) LeaveCriticalSection(&listen_cs); } -static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, LPCSTR endpoint) +static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, const char *endpoint) { RpcConnection *conn; EnterCriticalSection(&protseq->cs); @@ -579,7 +579,7 @@ static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, LPC return (conn != NULL); } -static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, LPSTR endpoint) +static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, const char *endpoint) { RPC_STATUS status; @@ -693,7 +693,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpW( RPC_WSTR Protseq, UINT MaxCalls, RPC_W * * Must be called with server_cs held. */ -static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps) +static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcServerProtseq **ps) { const struct protseq_ops *ops = rpcrt4_get_protseq_ops(Protseq); @@ -707,7 +707,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, RpcServerPr if (!*ps) return RPC_S_OUT_OF_RESOURCES; (*ps)->MaxCalls = MaxCalls; - (*ps)->Protseq = Protseq; + (*ps)->Protseq = RPCRT4_strdupA(Protseq); (*ps)->ops = ops; (*ps)->MaxCalls = 0; (*ps)->conn = NULL; @@ -735,7 +735,7 @@ static void destroy_serverprotoseq(RpcServerProtseq *ps) } /* Finds a given protseq or creates a new one if one doesn't already exist */ -static RPC_STATUS RPCRT4_get_or_create_serverprotseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps) +static RPC_STATUS RPCRT4_get_or_create_serverprotseq(UINT MaxCalls, const char *Protseq, RpcServerProtseq **ps) { RPC_STATUS status; RpcServerProtseq *cps; @@ -764,19 +764,18 @@ static RPC_STATUS RPCRT4_get_or_create_serverprotseq(UINT MaxCalls, char *Protse RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC_CSTR Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY lpPolicy ) { - char *szps = (char*)Protseq, *szep = (char*)Endpoint; RpcServerProtseq* ps; RPC_STATUS status; - TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_a(szps), MaxCalls, - debugstr_a(szep), SecurityDescriptor, + TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_a((const char *)Protseq), + MaxCalls, debugstr_a((const char *)Endpoint), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA(szps), &ps); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, (const char *)Protseq, &ps); if (status != RPC_S_OK) return status; - return RPCRT4_use_protseq(ps, szep); + return RPCRT4_use_protseq(ps, (const char *)Endpoint); } /*********************************************************************** @@ -787,13 +786,16 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC { RpcServerProtseq* ps; RPC_STATUS status; + LPSTR ProtseqA; LPSTR EndpointA; TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_w( Protseq ), MaxCalls, debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); + ProtseqA = RPCRT4_strdupWtoA(Protseq); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, ProtseqA, &ps); + RPCRT4_strfree(ProtseqA); if (status != RPC_S_OK) return status; @@ -813,7 +815,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqA(RPC_CSTR Protseq, unsigned int MaxCalls, TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_a((char*)Protseq), MaxCalls, SecurityDescriptor); - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA((const char *)Protseq), &ps); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, (const char *)Protseq, &ps); if (status != RPC_S_OK) return status; @@ -827,10 +829,13 @@ RPC_STATUS WINAPI RpcServerUseProtseqW(RPC_WSTR Protseq, unsigned int MaxCalls, { RPC_STATUS status; RpcServerProtseq* ps; + LPSTR ProtseqA; TRACE("Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_w(Protseq), MaxCalls, SecurityDescriptor); - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); + ProtseqA = RPCRT4_strdupWtoA(Protseq); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, ProtseqA, &ps); + RPCRT4_strfree(ProtseqA); if (status != RPC_S_OK) return status; diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index 0498616..cacce79 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -56,7 +56,7 @@ struct protseq_ops * new connection was established */ int (*wait_for_new_connection)(RpcServerProtseq *protseq, unsigned int count, void *wait_array); /* opens the endpoint and optionally begins listening */ - RPC_STATUS (*open_endpoint)(RpcServerProtseq *protseq, LPSTR endpoint); + RPC_STATUS (*open_endpoint)(RpcServerProtseq *protseq, const char *endpoint); }; typedef struct _RpcServerInterface diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 39908bc..8f159e4 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -255,7 +255,7 @@ static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) return r; } -static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, LPSTR endpoint) +static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, const char *endpoint) { static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; RPC_STATUS r; @@ -313,7 +313,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) return r; } -static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, LPSTR endpoint) +static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { static const char prefix[] = "\\\\."; RPC_STATUS r; @@ -869,7 +869,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) return RPC_S_SERVER_UNAVAILABLE; } -static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *protseq, LPSTR endpoint) +static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { RPC_STATUS status = RPC_S_CANT_CREATE_ENDPOINT; int sock;

1 0

Aurimas Fischer : gphoto2.ds: Add Lithuanian translation.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: 4bec03e3c51c86b69651c99b8e75369c6cca9a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bec03e3c51c86b69651c99b8… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sun Mar 29 18:16:20 2009 +0300 gphoto2.ds: Add Lithuanian translation. --- dlls/gphoto2.ds/gphoto2_Lt.rc | 60 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Lt.rc b/dlls/gphoto2.ds/gphoto2_Lt.rc new file mode 100644 index 0000000..de2a525 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Lt.rc @@ -0,0 +1,60 @@ +/* + * Lithuanian resources for Twain + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Failai kameroje" +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importuoti pažymėtus",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Peržiūra",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Importuoti visus",IDC_IMPORTALL,80,252,64,14 + CONTROL "Praleisti šį dialogo langą",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,90,14 + PUSHBUTTON "Išeiti",IDC_EXIT,329,252,36,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Perduodama" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Perduodama... Prašome palaukti",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Jungiamasi prie kameros" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Jungiamasi prie kameros... Prašome palaukti",IDC_STATIC,124,58, + 140,8 +END + +#pragma code_page(default) diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 79087c8..7746785 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -32,6 +32,7 @@ #include "gphoto2_Es.rc" #include "gphoto2_Fr.rc" #include "gphoto2_Ko.rc" +#include "gphoto2_Lt.rc" #include "gphoto2_Nl.rc" #include "gphoto2_No.rc" #include "gphoto2_Pl.rc"

1 0

Rob Shearman : include: Add definition for CreateProcessWithLogonW and associated flags.
by Alexandre Julliard March 30, 2009

March 30, 2009

Module: wine Branch: master Commit: bbe7927ed5dc93a469b2c18a4d3dfd2209b3b2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe7927ed5dc93a469b2c18a4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Mar 29 18:39:15 2009 +0100 include: Add definition for CreateProcessWithLogonW and associated flags. --- include/winbase.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 3f0a24e..650344f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1270,6 +1270,10 @@ typedef struct _WIN32_STREAM_ID { #define DDD_NO_BROADCAST_SYSTEM 0x00000008 #define DDD_LUID_BROADCAST_DRIVE 0x00000010 +#define LOGON_WITH_PROFILE 0x00000001 +#define LOGON_NETCREDENTIALS_ONLY 0x00000002 +#define LOGON_ZERO_PASSWORD_BUFFER 0x80000000 + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); @@ -1392,6 +1396,7 @@ WINBASEAPI BOOL WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTE WINADVAPI BOOL WINAPI CreateProcessAsUserA(HANDLE,LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION); WINADVAPI BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); #define CreateProcessAsUser WINELIB_NAME_AW(CreateProcessAsUser) +WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE); WINBASEAPI HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR);

1 0