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

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

30 Jun '09

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

1 0

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

30 Jun '09

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

1 0

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

30 Jun '09

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

1 0

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

30 Jun '09

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

1 0

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

30 Jun '09

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

1 0

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

30 Jun '09

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

1 0

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

30 Jun '09

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

1 0

Rein Klazes : comdlg32: Fix a problem with the returned value of a CDN_FILEOK notification.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: ce856684169608139307ec4c8f9407687133482c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce856684169608139307ec4c8… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jun 30 08:41:10 2009 +0200 comdlg32: Fix a problem with the returned value of a CDN_FILEOK notification. --- dlls/comdlg32/filedlg.c | 8 ++-- dlls/comdlg32/tests/filedlg.c | 112 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6e7f985..6f89697 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1760,19 +1760,19 @@ static BOOL FILEDLG95_SendFileOK( HWND hwnd, FileOpenDlgInfos *fodInfos ) /* First send CDN_FILEOK as MSDN doc says */ if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); - if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) + if( retval) { TRACE("canceled\n"); - return (retval == 0); + return FALSE; } /* fodInfos->ofnInfos points to an ASCII or UNICODE structure as appropriate */ retval = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg, fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos); - if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) + if( retval) { TRACE("canceled\n"); - return (retval == 0); + return FALSE; } } return TRUE; diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0cd1e63..0b1561e 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -399,10 +399,122 @@ static void test_resize(void) } } +/* test cases for control message IDOK */ +/* Show case for bug #19079 */ +static struct { + int retval; /* return code of the message handler */ + BOOL setmsgresult; /* set the result in the DWLP_MSGRESULT */ + BOOL usemsgokstr; /* use the FILEOKSTRING message instead of WM_NOTIFY:CDN_FILEOK */ + BOOL do_subclass; /* subclass the dialog hook procedure */ + BOOL expclose; /* is the dialog expected to close ? */ + BOOL actclose; /* has the dialog actually closed ? */ +} ok_testcases[] = { + { 0, FALSE, FALSE, FALSE, TRUE}, + { 0, TRUE, FALSE, FALSE, TRUE}, + { 0, FALSE, FALSE, TRUE, TRUE}, + { 0, TRUE, FALSE, TRUE, TRUE}, + { 1, FALSE, FALSE, FALSE, TRUE}, + { 1, TRUE, FALSE, FALSE, FALSE}, + { 1, FALSE, FALSE, TRUE, FALSE}, + { 1, TRUE, FALSE, TRUE, FALSE}, + /* FILEOKSTRING tests */ + { 1, TRUE, TRUE, FALSE, FALSE}, + { 1, FALSE, TRUE, TRUE, FALSE}, + /* mark the end */ + { -1 } +}; + +/* test_ok_wndproc can be used as hook procedure or a subclass + * window proc for the file dialog */ +static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + HWND parent = GetParent( dlg); + static int index; + static UINT msgFILEOKSTRING; + if (msg == WM_INITDIALOG) + { + index = ((OPENFILENAME*)lParam)->lCustData; + ok_testcases[index].actclose = TRUE; + msgFILEOKSTRING = RegisterWindowMessageA( FILEOKSTRING); + } + if( msg == WM_NOTIFY) { + if(((LPNMHDR)lParam)->code == CDN_INITDONE) { + SetTimer( dlg, 0, 100, 0); + PostMessage( parent, WM_COMMAND, IDOK, 0); + return FALSE; + } else if(((LPNMHDR)lParam)->code == CDN_FILEOK) { + if( ok_testcases[index].usemsgokstr) + return FALSE; + if( ok_testcases[index].setmsgresult) + SetWindowLongPtrA( dlg, DWLP_MSGRESULT, ok_testcases[index].retval); + return ok_testcases[index].retval; + } + } + if( msg == msgFILEOKSTRING) { + if( !ok_testcases[index].usemsgokstr) + return FALSE; + if( ok_testcases[index].setmsgresult) + SetWindowLongPtrA( dlg, DWLP_MSGRESULT, ok_testcases[index].retval); + return ok_testcases[index].retval; + } + if( msg == WM_TIMER) { + /* the dialog did not close automatically */ + ok_testcases[index].actclose = FALSE; + KillTimer( dlg, 0); + PostMessage( parent, WM_COMMAND, IDCANCEL, 0); + return FALSE; + } + if( ok_testcases[index].do_subclass) + return DefWindowProc( dlg, msg, wParam, lParam); + return FALSE; +} + +static LONG_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_SETFONT) + SetWindowLongPtrA( dlg, GWLP_WNDPROC, (LONG_PTR) test_ok_wndproc); + return FALSE; +} + +static void test_ok(void) +{ + OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + char filename[1024] = {0}; + char tmpfilename[ MAX_PATH]; + int i; + DWORD ret; + + if (!GetTempFileNameA(".", "tmp", 0, tmpfilename)) { + skip("Failed to create a temporary file name\n"); + return; + } + ofn.lpstrFile = filename; + ofn.nMaxFile = 1024; + ofn.hInstance = GetModuleHandle(NULL); + ofn.lpTemplateName = "template1"; + ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE ; + for( i = 0; ok_testcases[i].retval != -1; i++) { + strcpy( filename, tmpfilename); + ofn.lCustData = i; + ofn.lpfnHook = ok_testcases[i].do_subclass + ? (LPOFNHOOKPROC) ok_template_hook + : (LPOFNHOOKPROC) test_ok_wndproc; + ret = GetOpenFileNameA(&ofn); + ok( ok_testcases[i].expclose == ok_testcases[i].actclose, + "Open File dialog should %shave closed.\n", + ok_testcases[i].expclose ? "" : "NOT "); + ok(ret == ok_testcases[i].expclose, "GetOpenFileName returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + } + ok( DeleteFileA( tmpfilename), "Failed to delete temporary file\n"); +} + START_TEST(filedlg) { test_DialogCancel(); test_create_view_window2(); test_create_view_template(); test_resize(); + test_ok(); }

1 0

Vitaliy Margolen : dxdiagn: Add fil_data. idl to describe IAMFilterData interface.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 516aac77aa3af8a9b782e820372eb5bafd7e41ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=516aac77aa3af8a9b782e8203… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jun 29 22:06:04 2009 -0600 dxdiagn: Add fil_data.idl to describe IAMFilterData interface. --- .gitignore | 1 + dlls/dxdiagn/Makefile.in | 2 ++ dlls/dxdiagn/fil_data.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a47a096..f096f4a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h dlls/commdlg.dll16 +dlls/dxdiagn/fil_data.h dlls/gdi.exe16 dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index 56ca656..c69df4e 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -13,6 +13,8 @@ C_SRCS = \ RC_SRCS = version.rc +IDL_H_SRCS = fil_data.idl + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dxdiagn/fil_data.idl b/dlls/dxdiagn/fil_data.idl new file mode 100644 index 0000000..806c053 --- /dev/null +++ b/dlls/dxdiagn/fil_data.idl @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2009 Vitaliy Margolen + * + * 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 + */ + +import "objidl.idl"; +import "strmif.idl"; +import "unknwn.idl"; + + +/***************************************************************************** + * IAMFilterData interface + */ +[ + object, + uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), + pointer_default(unique) +] +interface IAMFilterData : IUnknown +{ + typedef [unique] IAMFilterData *LPIAMFILTERDATA; + + HRESULT ParseFilterData( + [in] BYTE * rgbFilterData, + [in] ULONG cb, + [out] BYTE ** prgbRegFilter2); + + HRESULT CreateFilterData( + [in] REGFILTER2 * prf2, + [out] BYTE ** prgbFilterData, + [out] ULONG * pcb); +}

1 0

Vitaliy Margolen : dxdiagn: Use quartz' s IFilterMapper to get DirectShow filter information instead of looking through private structures .
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 27072f296f6770a4fe2407c8aefefe5b25d0b5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=27072f296f6770a4fe2407c8a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jun 29 22:06:30 2009 -0600 dxdiagn: Use quartz's IFilterMapper to get DirectShow filter information instead of looking through private structures. --- dlls/dxdiagn/provider.c | 119 +++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 60 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index d3f0a26..fb13033 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -23,6 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "dxdiag_private.h" #include "wine/unicode.h" #include "winver.h" @@ -33,6 +34,9 @@ #include "mmddk.h" #include "ddraw.h" #include "d3d9.h" +#include "strmif.h" +#include "initguid.h" +#include "fil_data.h" #include "wine/debug.h" @@ -572,28 +576,6 @@ static HRESULT DXDiag_InitDXDiagDirectPlayContainer(IDxDiagContainer* pSubCont) return hr; } -struct REG_RF { - DWORD dwVersion; - DWORD dwMerit; - DWORD dwPins; - DWORD dwUnused; -}; -struct REG_RFP { - BYTE signature[4]; /* e.g. "0pi3" */ - DWORD dwFlags; - DWORD dwInstances; - DWORD dwMediaTypes; - DWORD dwMediums; - DWORD bCategory; /* is there a category clsid? */ - /* optional: dwOffsetCategoryClsid */ -}; -struct REG_TYPE { - BYTE signature[4]; /* e.g. "0ty3" */ - DWORD dwUnused; - DWORD dwOffsetMajor; - DWORD dwOffsetMinor; -}; - static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSubCont) { HRESULT hr = S_OK; static const WCHAR szName[] = {'s','z','N','a','m','e',0}; @@ -603,7 +585,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu static const WCHAR ClsidFilterW[] = {'C','l','s','i','d','F','i','l','t','e','r',0}; static const WCHAR dwInputs[] = {'d','w','I','n','p','u','t','s',0}; static const WCHAR dwOutputs[] = {'d','w','O','u','t','p','u','t','s',0}; - static const WCHAR dwMerit[] = {'d','w','M','e','r','i','t',0}; + static const WCHAR dwMeritW[] = {'d','w','M','e','r','i','t',0}; /* static const WCHAR szFileName[] = {'s','z','F','i','l','e','N','a','m','e',0}; static const WCHAR szFileVersion[] = {'s','z','F','i','l','e','V','e','r','s','i','o','n',0}; @@ -672,13 +654,13 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (void**) &pPropFilterBag); if (SUCCEEDED(hr)) { LPBYTE pData = NULL; - LPBYTE pCurrent = NULL; - struct REG_RF* prrf = NULL; - DWORD it; DWORD dwNOutputs = 0; DWORD dwNInputs = 0; + DWORD dwMerit = 0; WCHAR bufferW[10]; IDxDiagContainer *pDShowSubCont = NULL; + IFilterMapper2 *pFileMapper = NULL; + IAMFilterData *pFilterData = NULL; snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); if (FAILED(DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDShowSubCont)) || @@ -689,6 +671,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu continue; } + bufferW[0] = 0; hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, szName, &v); TRACE("\tName:%s\n", debugstr_w(V_BSTR(&v))); @@ -699,45 +682,61 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, ClsidFilterW, &v); VariantClear(&v); - add_prop_str(pDShowSubCont, szCatName, wszCatName); - add_prop_str(pDShowSubCont, ClsidCatW, wszCatClsid); - - hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL); - hr = SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData); - prrf = (struct REG_RF*) pData; - pCurrent = pData; + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, + (LPVOID*)&pFileMapper); + if (SUCCEEDED(hr) && + SUCCEEDED(IFilterMapper2_QueryInterface(pFileMapper, &IID_IAMFilterData, (void **)&pFilterData))) + { + DWORD array_size; + BYTE *tmp; + REGFILTER2 *pRF = NULL; + + if (SUCCEEDED(IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL)) && + SUCCEEDED(SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData))) + { + ULONG j; + array_size = V_UNION(&v, parray)->rgsabound->cElements; + + if (SUCCEEDED(IAMFilterData_ParseFilterData(pFilterData, pData, array_size, &tmp))) + { + pRF = ((REGFILTER2 **)tmp)[0]; + + snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); + if (pRF->dwVersion == 1) + { + for (j = 0; j < pRF->u.s.cPins; j++) + if (pRF->u.s.rgPins[j].bOutput) + dwNOutputs++; + else + dwNInputs++; + } + else if (pRF->dwVersion == 2) + { + for (j = 0; j < pRF->u.s1.cPins2; j++) + if (pRF->u.s1.rgPins2[j].dwFlags & REG_PINFLAG_B_OUTPUT) + dwNOutputs++; + else + dwNInputs++; + } + + dwMerit = pRF->dwMerit; + CoTaskMemFree(tmp); + } + + SafeArrayUnaccessData(V_UNION(&v, parray)); + VariantClear(&v); + } + IFilterMapper2_Release(pFilterData); + } + if (pFileMapper) IFilterMapper2_Release(pFileMapper); - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, prrf->dwVersion); add_prop_str(pDShowSubCont, szVersionW, bufferW); - - pCurrent += sizeof(struct REG_RF); - for (it = 0; it < prrf->dwPins; ++it) { - struct REG_RFP* prrfp = (struct REG_RFP*) pCurrent; - UINT j; - - if (prrfp->dwFlags & REG_PINFLAG_B_OUTPUT) ++dwNOutputs; - else ++dwNInputs; - - pCurrent += sizeof(struct REG_RFP); - if (prrfp->bCategory) { - pCurrent += sizeof(DWORD); - } - for (j = 0; j < prrfp->dwMediaTypes; ++j) { - struct REG_TYPE* prt = (struct REG_TYPE *)pCurrent; - pCurrent += sizeof(*prt); - } - for (j = 0; j < prrfp->dwMediums; ++j) { - DWORD dwOffset = *(DWORD*) pCurrent; - pCurrent += sizeof(dwOffset); - } - } - + add_prop_str(pDShowSubCont, szCatName, wszCatName); + add_prop_str(pDShowSubCont, ClsidCatW, wszCatClsid); add_prop_ui4(pDShowSubCont, dwInputs, dwNInputs); add_prop_ui4(pDShowSubCont, dwOutputs, dwNOutputs); - add_prop_ui4(pDShowSubCont, dwMerit, prrf->dwMerit); + add_prop_ui4(pDShowSubCont, dwMeritW, dwMerit); - SafeArrayUnaccessData(V_UNION(&v, parray)); - VariantClear(&v); i++; } IPropertyBag_Release(pPropFilterBag); pPropFilterBag = NULL;

1 0