December 2010 - Wine-Commits

Alexandre Julliard : wine.inf: Don' t set the ProgramFiles environment variables through the registry.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: bb80fdf744192af33cb542e075f7dcaba382f422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb80fdf744192af33cb542e07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 22:49:01 2010 +0100 wine.inf: Don't set the ProgramFiles environment variables through the registry. --- tools/wine.inf.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 57ecddb..aa3b354 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -565,11 +565,9 @@ HKLM,%Control%\Session Manager,HeapDeCommitFreeBlockThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapDeCommitTotalFreeThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 -HKLM,%Control%\Session Manager\Environment,"CommonProgramFiles",,"%16427%" HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" -HKLM,%Control%\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,%Control%\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,%Control%\Session Manager\Environment,"SYSTEMROOT",,"%10%" HKLM,%Control%\Session Manager\Environment,"TEMP",0x00020002,"%10%\temp"

1 0

Alexandre Julliard : kernel32: Update the environment variables that vary across 32-bit/64-bit/Wow64.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 01af5452c55c06ef827be23007482880649070d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01af5452c55c06ef827be2300… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 22:48:44 2010 +0100 kernel32: Update the environment variables that vary across 32-bit/64-bit/Wow64. --- dlls/kernel32/process.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2b427b9..e29e1b2 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -542,6 +542,87 @@ static void set_additional_environment(void) } /*********************************************************************** + * set_wow64_environment + * + * Set the environment variables that change across 32/64/Wow64. + */ +static void set_wow64_environment(void) +{ + static const WCHAR archW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; + static const WCHAR arch6432W[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','W','6','4','3','2',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR versionW[] = {'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; + static const WCHAR progdirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',0}; + static const WCHAR progdir86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; + static const WCHAR progfilesW[] = {'P','r','o','g','r','a','m','F','i','l','e','s',0}; + static const WCHAR progw6432W[] = {'P','r','o','g','r','a','m','W','6','4','3','2',0}; + static const WCHAR commondirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',0}; + static const WCHAR commondir86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; + static const WCHAR commonfilesW[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s',0}; + static const WCHAR commonw6432W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','W','6','4','3','2',0}; + + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + WCHAR arch[64]; + WCHAR *value; + HANDLE hkey; + + /* set the PROCESSOR_ARCHITECTURE variable */ + + if (GetEnvironmentVariableW( arch6432W, arch, sizeof(arch) )) + { + if (is_win64) + { + SetEnvironmentVariableW( archW, arch ); + SetEnvironmentVariableW( arch6432W, NULL ); + } + } + else if (GetEnvironmentVariableW( archW, arch, sizeof(arch) )) + { + if (is_wow64) + { + SetEnvironmentVariableW( arch6432W, arch ); + SetEnvironmentVariableW( archW, x86W ); + } + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, versionW ); + if (NtOpenKey( &hkey, KEY_READ | KEY_WOW64_64KEY, &attr )) return; + + /* set the ProgramFiles variables */ + + if ((value = get_reg_value( hkey, progdirW ))) + { + if (is_win64 || is_wow64) SetEnvironmentVariableW( progw6432W, value ); + if (is_win64 || !is_wow64) SetEnvironmentVariableW( progfilesW, value ); + } + if (is_wow64 && (value = get_reg_value( hkey, progdir86W ))) + SetEnvironmentVariableW( progfilesW, value ); + + /* set the CommonProgramFiles variables */ + + if ((value = get_reg_value( hkey, commondirW ))) + { + if (is_win64 || is_wow64) SetEnvironmentVariableW( commonw6432W, value ); + if (is_win64 || !is_wow64) SetEnvironmentVariableW( commonfilesW, value ); + } + if (is_wow64 && (value = get_reg_value( hkey, commondir86W ))) + SetEnvironmentVariableW( commonfilesW, value ); + + NtClose( hkey ); +} + +/*********************************************************************** * set_library_wargv * * Set the Wine library Unicode argv global variables. @@ -1125,6 +1206,7 @@ void CDECL __wine_kernel_init(void) set_registry_environment( got_environment ); set_additional_environment(); } + set_wow64_environment(); if (!(peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ))) {

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_get_registers_used().
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 51f06dcf0c7d65bae6f88fefc6f8741a99d5b5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f06dcf0c7d65bae6f88fefc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:30:59 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_get_registers_used(). --- dlls/wined3d/shader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 31ece02..0a0aae8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -448,11 +448,10 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN } /* Note that this does not count the loop register as an address register. */ -static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, +static HRESULT shader_get_registers_used(IWineD3DBaseShaderImpl *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature_element *input_signature, struct wined3d_shader_signature_element *output_signature, const DWORD *byte_code, DWORD constf_size) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; unsigned int cur_loop_depth = 0, max_loop_depth = 0; void *fe_data = shader->baseShader.frontend_data; struct wined3d_shader_version shader_version; @@ -1607,7 +1606,7 @@ static HRESULT shader_set_function(IWineD3DBaseShaderImpl *shader, const DWORD * list_init(&shader->baseShader.constantsI); /* Second pass: figure out which registers are used, what the semantics are, etc. */ - hr = shader_get_registers_used((IWineD3DBaseShader *)shader, fe, + hr = shader_get_registers_used(shader, fe, reg_maps, shader->baseShader.input_signature, shader->baseShader.output_signature, byte_code, float_const_count); if (FAILED(hr)) return hr;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_main().
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 2f36d600ef7c4c13af08ac2f9cd4db3763369866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f36d600ef7c4c13af08ac2f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:31:00 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_main(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1526e70..3bcb71b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3771,7 +3771,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); + shader_generate_main((IWineD3DBaseShaderImpl *)This, buffer, reg_maps, function, &priv_ctx); if(args->super.srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3], @@ -4182,7 +4182,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* The shader starts with the main function */ priv_ctx.in_main_func = TRUE; /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); + shader_generate_main((IWineD3DBaseShaderImpl *)This, buffer, reg_maps, function, &priv_ctx); if (!priv_ctx.footer_written) vshader_add_footer(&priv_ctx, shader_data, args, reg_maps, gl_info, buffer); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6062231..45d098b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4004,7 +4004,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); + shader_generate_main((IWineD3DBaseShaderImpl *)This, buffer, reg_maps, function, &priv_ctx); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) @@ -4089,7 +4089,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_generate_glsl_declarations(context, buffer, (IWineD3DBaseShaderImpl *)This, reg_maps, &priv_ctx); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, &priv_ctx); + shader_generate_main((IWineD3DBaseShaderImpl *)This, buffer, reg_maps, function, &priv_ctx); /* Unpack outputs */ shader_addline(buffer, "order_ps_input(OUT);\n"); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0a0aae8..ef25a0c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1162,10 +1162,9 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, /* Shared code in order to generate the bulk of the shader string. * NOTE: A description of how to parse tokens can be found on MSDN. */ -void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffer *buffer, +void shader_generate_main(IWineD3DBaseShaderImpl *shader, struct wined3d_shader_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; IWineD3DDeviceImpl *device = shader->baseShader.device; const struct wined3d_shader_frontend *fe = shader->baseShader.frontend; void *fe_data = shader->baseShader.frontend_data; @@ -1186,7 +1185,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe loop_state.current_depth = 0; loop_state.current_reg = 0; - ctx.shader = iface; + ctx.shader = (IWineD3DBaseShader *)shader; ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6769956..6f30716 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2782,7 +2782,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, const struct wined3d_shader_version *shader_version) DECLSPEC_HIDDEN; unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_maps *reg_maps, unsigned int max) DECLSPEC_HIDDEN; -void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffer *buffer, +void shader_generate_main(IWineD3DBaseShaderImpl *shader, struct wined3d_shader_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, WINED3DDECLUSAGE usage) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wineboot: Set the correct architecture in the process identifier variable.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 6838b4629ef980a70dedba606ae5149cce4ad866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6838b4629ef980a70dedba606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 22:48:11 2010 +0100 wineboot: Set the correct architecture in the process identifier variable. --- programs/wineboot/wineboot.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4407e17..43cdf3b 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -268,12 +268,13 @@ static void create_environment_registry_keys( void ) static const WCHAR ProcRevW[] = {'P','R','O','C','E','S','S','O','R','_','R','E','V','I','S','I','O','N',0}; static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR Percent04XW[] = {'%','0','4','x',0}; - static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + static const WCHAR IntelCpuDescrW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',',',' ','G','e','n','u','i','n','e','I','n','t','e','l',0}; HKEY env_key; SYSTEM_CPU_INFORMATION sci; WCHAR buffer[60]; + const WCHAR *arch; NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); @@ -284,20 +285,15 @@ static void create_environment_registry_keys( void ) switch(sci.Architecture) { - case PROCESSOR_ARCHITECTURE_AMD64: - set_reg_value( env_key, ProcArchW, AMD64W ); - break; - case PROCESSOR_ARCHITECTURE_IA64: - set_reg_value( env_key, ProcArchW, IA64W ); - break; - case PROCESSOR_ARCHITECTURE_INTEL: - default: - set_reg_value( env_key, ProcArchW, x86W ); - break; + case PROCESSOR_ARCHITECTURE_AMD64: arch = AMD64W; break; + case PROCESSOR_ARCHITECTURE_IA64: arch = IA64W; break; + default: + case PROCESSOR_ARCHITECTURE_INTEL: arch = x86W; break; } + set_reg_value( env_key, ProcArchW, arch ); /* TODO: currently hardcoded Intel, add different processors */ - sprintfW( buffer, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + sprintfW( buffer, IntelCpuDescrW, arch, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); set_reg_value( env_key, ProcIdW, buffer ); sprintfW( buffer, PercentDW, sci.Level );

1 0

André Hentschel : shdocvw: Add Resizer control to the iexplore window.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: e8a766b4bf2e07ccb66d206908204d3710a88b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a766b4bf2e07ccb66d20690… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 14 15:30:44 2010 +0100 shdocvw: Add Resizer control to the iexplore window. --- dlls/shdocvw/iexplore.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index fb873f5..745cb17 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -488,7 +488,8 @@ static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) This->menu = create_ie_menu(); - This->status_hwnd = CreateStatusWindowW(CCS_NODIVIDER|WS_CHILD|WS_VISIBLE, NULL, hwnd, IDC_BROWSE_STATUSBAR); + This->status_hwnd = CreateStatusWindowW(WS_VISIBLE|WS_CHILD|SBT_NOBORDERS|CCS_NODIVIDER, + NULL, hwnd, IDC_BROWSE_STATUSBAR); SendMessageW(This->status_hwnd, SB_SIMPLE, TRUE, 0); create_rebar(hwnd);

1 0

André Hentschel : shell32: Fix shelllink test to not crash on NT4.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: c0a86cc103923595308111f62c94c9c0aa126c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a86cc103923595308111f62… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 14 14:05:25 2010 +0100 shell32: Fix shelllink test to not crash on NT4. With much help from Francois. --- dlls/shell32/tests/shelllink.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 2277e5e..f213221 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -168,15 +168,15 @@ static void test_get_set(void) CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&slW); - if (!slW) - skip("SetPath with NULL parameter crashes on Win9x\n"); + if (!slW /* Win9x */ || !pGetLongPathNameA /* NT4 */) + skip("SetPath with NULL parameter crashes on Win9x and some NT4\n"); else { IShellLinkW_Release(slW); r = IShellLinkA_SetPath(sl, NULL); ok(r==E_INVALIDARG || broken(r==S_OK), /* Some Win95 and NT4 */ - "SetPath failed (0x%08x)\n", r); + "SetPath returned wrong error (0x%08x)\n", r); } r = IShellLinkA_SetPath(sl, ""); @@ -808,11 +808,16 @@ static void test_datalink(void) ok( r == E_FAIL, "CopyDataBlock failed\n"); ok( dar == NULL, "should be null\n"); - r = IShellLinkW_SetPath(sl, NULL); - ok(r == E_INVALIDARG, "set path failed\n"); + if (!pGetLongPathNameA /* NT4 */) + skip("SetPath with NULL parameter crashes on NT4\n"); + else + { + r = IShellLinkW_SetPath(sl, NULL); + ok(r == E_INVALIDARG, "SetPath returned wrong error (0x%08x)\n", r); + } r = IShellLinkW_SetPath(sl, lnk); - ok(r == S_OK, "set path failed\n"); + ok(r == S_OK, "SetPath failed\n"); if (0) {

1 0

Maarten Lankhorst : winegstreamer: Correct a state transition.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 9ef5a863e395df8b37a6f562c03fd35ce10dd155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef5a863e395df8b37a6f562c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:59 2010 +0100 winegstreamer: Correct a state transition. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 41190ec..46cd9ec 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1190,7 +1190,7 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) { return S_OK; if (now == GST_STATE_PAUSED) { GstStateChangeReturn ret; - ret = gst_element_set_state(This->gstfilter, GST_STATE_PAUSED); + ret = gst_element_set_state(This->gstfilter, GST_STATE_PLAYING); if (ret == GST_STATE_CHANGE_ASYNC) return S_FALSE; return S_OK;

1 0

Maarten Lankhorst : quartz: Handle EndOfStream more elegantly in dsound renderer.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 220d610b3da682c75343f07bed0688a7affd5801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220d610b3da682c75343f07be… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:57 2010 +0100 quartz: Handle EndOfStream more elegantly in dsound renderer. --- dlls/quartz/dsoundrender.c | 47 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 975eee1..f48cc77 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -226,6 +226,42 @@ end: return S_OK; } +static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) +{ + HRESULT hr; + IMediaEventSink *pEventSink; + + while (1) + { + DWORD pos1, pos2; + DSoundRender_UpdatePositions(This, &pos1, &pos2); + if (pos1 == pos2) + break; + + This->in_loop = 1; + LeaveCriticalSection(&This->filter.csFilter); + WaitForSingleObject(This->blocked, 10); + EnterCriticalSection(&This->filter.csFilter); + This->in_loop = 0; + if (This->pInputPin->flushing || + This->filter.state != State_Running) { + SetEvent(This->state_change); + return S_FALSE; + } + } + + if (!This->filter.filterInfo.pGraph) + return S_OK; + + hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) + { + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); + IMediaEventSink_Release(pEventSink); + } + return hr; +} + static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIME tStart, REFERENCE_TIME tStop, const BYTE *data, DWORD size) { HRESULT hr; @@ -875,7 +911,6 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = (BaseInputPin*)iface; DSoundRenderImpl *me = (DSoundRenderImpl*)This->pin.pinInfo.pFilter; - IMediaEventSink* pEventSink; HRESULT hr; EnterCriticalSection(This->pin.pCritSec); @@ -889,15 +924,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) return hr; } - if (me->filter.filterInfo.pGraph) - { - hr = IFilterGraph_QueryInterface(me->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) - { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)me); - IMediaEventSink_Release(pEventSink); - } - } + hr = DSoundRender_HandleEndOfStream(me); MediaSeekingPassThru_EOS(me->seekthru_unk); SetEvent(me->state_change); LeaveCriticalSection(This->pin.pCritSec);

1 0

Michael Stefaniuc : oleaut32/tests: Use an iface instead of an vtbl pointer in IRecordInfoImpl.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 6c94cdc90345dfa000fb59ce61a1b053dd404867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c94cdc90345dfa000fb59ce6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:02:45 2010 +0100 oleaut32/tests: Use an iface instead of an vtbl pointer in IRecordInfoImpl. --- dlls/oleaut32/tests/safearray.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 29e8761..7c16ef7 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -25,6 +25,7 @@ #include <float.h> #define COBJMACROS +#define CONST_VTABLE #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -76,7 +77,7 @@ static BOOL HAVE_OLEAUT32_INT_PTR; */ typedef struct IRecordInfoImpl { - const IRecordInfoVtbl *lpvtbl; + IRecordInfo IRecordInfo_iface; LONG ref; DWORD sizeCalled; DWORD clearCalled; @@ -84,12 +85,17 @@ typedef struct IRecordInfoImpl static const IRecordInfoVtbl IRecordInfoImpl_VTable; +static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) +{ + return CONTAINING_RECORD(iface, IRecordInfoImpl, IRecordInfo_iface); +} + static IRecordInfoImpl *IRecordInfoImpl_Construct(void) { IRecordInfoImpl *rec; rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); - rec->lpvtbl = &IRecordInfoImpl_VTable; + rec->IRecordInfo_iface.lpVtbl = &IRecordInfoImpl_VTable; rec->ref = START_REF_COUNT; rec->clearCalled = 0; rec->sizeCalled = 0; @@ -98,13 +104,13 @@ static IRecordInfoImpl *IRecordInfoImpl_Construct(void) static ULONG CALLBACK IRecordInfoImpl_AddRef(IRecordInfo *iface) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); return InterlockedIncrement(&This->ref); } static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); return InterlockedDecrement(&This->ref); } @@ -112,14 +118,14 @@ static BOOL fail_GetSize; /* Whether to fail the GetSize call */ static HRESULT CALLBACK IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvExisting) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->clearCalled++; return S_OK; } static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->sizeCalled++; *size = 17; if (fail_GetSize) @@ -1449,7 +1455,7 @@ static void test_SafeArrayCreateEx(void) hres = pSafeArrayGetRecordInfo(sa, &saRec); ok(hres == S_OK,"GRI failed\n"); - ok(saRec == (IRecordInfo*)iRec,"Different saRec\n"); + ok(saRec == &iRec->IRecordInfo_iface, "Different saRec\n"); ok(iRec->ref == START_REF_COUNT + 2, "Didn't AddRef %d\n", iRec->ref); if (iRec->ref == START_REF_COUNT + 2) IRecordInfo_Release(saRec);

1 0