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

Matteo Bruni : d3dx9: Improve a FIXME.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: d76e3ac9c6ab25c9270b79e71cc392daec1826ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76e3ac9c6ab25c9270b79e71… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jul 17 21:57:38 2010 +0200 d3dx9: Improve a FIXME. --- dlls/d3dx9_36/bytecodewriter.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index b444365..9fe2bfc 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -1825,7 +1825,8 @@ static HRESULT call_instr_handler(struct bc_writer *writer, i++; } - FIXME("Unhandled instruction %u\n", instr->opcode); + FIXME("Unhandled instruction %u - %s\n", instr->opcode, + debug_print_opcode(instr->opcode)); return E_INVALIDARG; }

1 0

Matteo Bruni : d3dx9: Error out on dcl output instruction where not supported.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 0ea6f7957aeca41d238b7f28c1ee8f1039222918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea6f7957aeca41d238b7f28c… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jul 17 21:57:38 2010 +0200 d3dx9: Error out on dcl output instruction where not supported. --- dlls/d3dx9_36/asmparser.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index f00a12c..b04325c 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -116,6 +116,12 @@ static void asmparser_dcl_output(struct asm_parser *This, DWORD usage, DWORD num } } +static void asmparser_dcl_output_unsupported(struct asm_parser *This, DWORD usage, DWORD num, + const struct shader_reg *reg) { + asmparser_message(This, "Line %u: Output declaration unsupported in this shader version\n", This->line_no); + set_parse_status(This, PARSE_ERR); +} + static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, DWORD mod, const struct shader_reg *reg) { struct instruction instr; @@ -783,7 +789,7 @@ static const struct asmparser_backend parser_vs_1 = { asmparser_predicate_unsupported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input, asmparser_dcl_sampler_unsupported, @@ -803,7 +809,7 @@ static const struct asmparser_backend parser_vs_2 = { asmparser_predicate_supported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input, asmparser_dcl_sampler_unsupported, @@ -843,7 +849,7 @@ static const struct asmparser_backend parser_ps_2 = { asmparser_predicate_unsupported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input_ps_2, asmparser_dcl_sampler, @@ -863,7 +869,7 @@ static const struct asmparser_backend parser_ps_2_x = { asmparser_predicate_supported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input_ps_2, asmparser_dcl_sampler, @@ -883,7 +889,7 @@ static const struct asmparser_backend parser_ps_3 = { asmparser_predicate_supported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input, asmparser_dcl_sampler,

1 0

Matteo Bruni : d3dx9: Check dcl input instruction syntax against shader version.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: c2b0f200fa576674cad3e443c41d0b977448fcdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b0f200fa576674cad3e443c… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jul 17 21:57:38 2010 +0200 d3dx9: Check dcl input instruction syntax against shader version. --- dlls/d3dx9_36/asmparser.c | 5 ----- dlls/d3dx9_36/asmshader.y | 22 ++++++++++++++++++++++ dlls/d3dx9_36/tests/asm.c | 12 ++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index b04325c..e9d0ea0 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -152,11 +152,6 @@ static void asmparser_dcl_input_ps_2(struct asm_parser *This, DWORD usage, DWORD struct instruction instr; if(!This->shader) return; - if(usage != 0) { - asmparser_message(This, "Line %u: Unsupported usage in dcl instruction\n", This->line_no); - set_parse_status(This, PARSE_ERR); - return; - } instr.dstmod = mod; instr.shift = 0; This->funcs->dstreg(This, &instr, reg); diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 689a8fd..501354d 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -549,6 +549,12 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_ERR); } + if(asm_ctx.shader->version == BWRITERPS_VERSION(2, 0) || + asm_ctx.shader->version == BWRITERPS_VERSION(2, 1)) { + asmparser_message(&asm_ctx, "Line %u: Declaration not supported in PS 2\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } ZeroMemory(&reg, sizeof(reg)); reg.type = $4.type; reg.regnum = $4.regnum; @@ -566,6 +572,12 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_ERR); } + if(asm_ctx.shader->version == BWRITERPS_VERSION(2, 0) || + asm_ctx.shader->version == BWRITERPS_VERSION(2, 1)) { + asmparser_message(&asm_ctx, "Line %u: Declaration not supported in PS 2\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } ZeroMemory(&reg, sizeof(reg)); reg.type = $4.type; reg.regnum = $4.regnum; @@ -583,6 +595,11 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_ERR); } + if(asm_ctx.shader->type != ST_PIXEL) { + asmparser_message(&asm_ctx, "Line %u: Declaration needs a semantic\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } ZeroMemory(&reg, sizeof(reg)); reg.type = $3.type; reg.regnum = $3.regnum; @@ -600,6 +617,11 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_ERR); } + if(asm_ctx.shader->type != ST_PIXEL) { + asmparser_message(&asm_ctx, "Line %u: Declaration needs a semantic\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } ZeroMemory(&reg, sizeof(reg)); reg.type = $3.type; reg.regnum = $3.regnum; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 23ec484..0b8b777 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1377,6 +1377,18 @@ static void failure_test(void) { /* shader 47: no samplers in vs_2_0 */ "vs_2_0\n" "dcl_2d s2\n", + /* shader 48: semantic required in vs dcl input instruction */ + "vs_2_0\n" + "dcl v0\n", + /* shader 49: semantic not allowed in ps dcl input instruction*/ + "ps_2_0\n" + "dcl_position0 v0\n", + /* shader 50: dcl instruction not in ps_1_x */ + "ps_1_4\n" + "dcl_position0 v0\n", + /* shader 51: no dcl output instruction in < vs 3.0 */ + "vs_2_0\n" + "dcl_positiont0 o0\n", }; HRESULT hr; unsigned int i;

1 0

Vincent Povirk : gdiplus: Stub GdipGetMetafileHeaderFromFile.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 688eb0688b2c4d209137e5dc4365a66354b4ab98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688eb0688b2c4d209137e5dc4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:36:15 2010 -0500 gdiplus: Stub GdipGetMetafileHeaderFromFile. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ad60942..5e03c53 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -316,7 +316,7 @@ @ stdcall GdipGetMatrixElements(ptr ptr) @ stub GdipGetMetafileDownLevelRasterizationLimit @ stdcall GdipGetMetafileHeaderFromEmf(ptr ptr) -@ stub GdipGetMetafileHeaderFromFile +@ stdcall GdipGetMetafileHeaderFromFile(wstr ptr) @ stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) @ stub GdipGetMetafileHeaderFromStream @ stub GdipGetMetafileHeaderFromWmf diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ca3f0b6..5f2bb96 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2228,6 +2228,24 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hEmf, return Ok; } +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, + MetafileHeader *header) +{ + static int calls; + + TRACE("(%s,%p)\n", debugstr_w(filename), header); + + if(!filename || !header) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + memset(header, 0, sizeof(MetafileHeader)); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, UINT num, PropertyItem* items) {

1 0

Vincent Povirk : gdiplus: Stub GdipGetMetafileHeaderFromStream.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 3847c2dec9be2163bc5b141d1c1d056751a1cf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3847c2dec9be2163bc5b141d1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:38:04 2010 -0500 gdiplus: Stub GdipGetMetafileHeaderFromStream. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5e03c53..6d07cb5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -318,7 +318,7 @@ @ stdcall GdipGetMetafileHeaderFromEmf(ptr ptr) @ stdcall GdipGetMetafileHeaderFromFile(wstr ptr) @ stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) -@ stub GdipGetMetafileHeaderFromStream +@ stdcall GdipGetMetafileHeaderFromStream(ptr ptr) @ stub GdipGetMetafileHeaderFromWmf @ stdcall GdipGetNearestColor(ptr ptr) @ stdcall GdipGetPageScale(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5f2bb96..d72ae8d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2246,6 +2246,24 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, return Ok; } +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream *stream, + MetafileHeader *header) +{ + static int calls; + + TRACE("(%p,%p)\n", stream, header); + + if(!stream || !header) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + memset(header, 0, sizeof(MetafileHeader)); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, UINT num, PropertyItem* items) {

1 0

Vincent Povirk : gdiplus: Return copies of fonts from GdipGetFontCollectionFamilyList.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 5694825ae3c3a581976716a62e1b2d1fb54e5674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5694825ae3c3a581976716a62… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:50:00 2010 -0500 gdiplus: Return copies of fonts from GdipGetFontCollectionFamilyList. --- dlls/gdiplus/font.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f198863..2670e81 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -963,18 +963,33 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList( GpFontFamily* gpfamilies[], INT* numFound) { INT i; + GpStatus stat=Ok; TRACE("%p, %d, %p, %p\n", fontCollection, numSought, gpfamilies, numFound); if (!(fontCollection && gpfamilies && numFound)) return InvalidParameter; - for (i = 0; i < numSought && i < fontCollection->count; i++) + memset(gpfamilies, 0, sizeof(*gpfamilies) * numSought); + + for (i = 0; i < numSought && i < fontCollection->count && stat == Ok; i++) { - gpfamilies[i] = fontCollection->FontFamilies[i]; + stat = GdipCloneFontFamily(fontCollection->FontFamilies[i], &gpfamilies[i]); } - *numFound = i; - return Ok; + + if (stat == Ok) + *numFound = i; + else + { + int numToFree=i; + for (i=0; i<numToFree; i++) + { + GdipDeleteFontFamily(gpfamilies[i]); + gpfamilies[i] = NULL; + } + } + + return stat; } void free_installed_fonts(void)

1 0

Vincent Povirk : gdiplus: Stub GdipGetPenCompoundCount.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 3506521f167fa7c9b4c7f43705a58b1e56940360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3506521f167fa7c9b4c7f4370… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:52:39 2010 -0500 gdiplus: Stub GdipGetPenCompoundCount. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6d07cb5..6129356 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -351,7 +351,7 @@ @ stdcall GdipGetPenBrushFill(ptr ptr) @ stdcall GdipGetPenColor(ptr ptr) @ stub GdipGetPenCompoundArray -@ stub GdipGetPenCompoundCount +@ stdcall GdipGetPenCompoundCount(ptr ptr) @ stdcall GdipGetPenCustomEndCap(ptr ptr) @ stdcall GdipGetPenCustomStartCap(ptr ptr) @ stdcall GdipGetPenDashArray(ptr ptr long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 930317c..9b23ebe 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -443,6 +443,16 @@ GpStatus WINGDIPAPI GdipSetPenColor(GpPen *pen, ARGB argb) return GdipSetSolidFillColor(((GpSolidFill*)pen->brush), argb); } +GpStatus WINGDIPAPI GdipGetPenCompoundCount(GpPen *pen, INT *count) +{ + FIXME("(%p, %p): stub\n", pen, count); + + if (!pen || !count) + return InvalidParameter; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen *pen, GDIPCONST REAL *dash, INT count) {

1 0

Vincent Povirk : gdiplus: Stub GdipMultiplyPenTransform.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 2a74569230c8711607faac09dd0bfc947f27c3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a74569230c8711607faac09d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:54:49 2010 -0500 gdiplus: Stub GdipMultiplyPenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6129356..06aa0cb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -445,7 +445,7 @@ @ stdcall GdipMultiplyLineTransform(ptr ptr long) @ stdcall GdipMultiplyMatrix(ptr ptr long) @ stub GdipMultiplyPathGradientTransform -@ stub GdipMultiplyPenTransform +@ stdcall GdipMultiplyPenTransform(ptr ptr long) @ stdcall GdipMultiplyTextureTransform(ptr ptr long) @ stdcall GdipMultiplyWorldTransform(ptr ptr long) @ stdcall GdipNewInstalledFontCollection(ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 9b23ebe..53e47f0 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -419,6 +419,22 @@ GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrix return NotImplemented; } +GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, + GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%p,%u)\n", pen, matrix, order); + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { TRACE("(%p, %p)\n", pen, brush);

1 0

David Hedberg : include: Fix ExplorerBrowser interface declaration.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: bd6b80624a63f8df8bd8ae75eba10006bc600b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6b80624a63f8df8bd8ae75e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 16:52:47 2010 +0200 include: Fix ExplorerBrowser interface declaration. --- include/shobjidl.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index c8d91b3..ee9d949 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1791,5 +1791,5 @@ interface IExplorerBrowser : IUnknown HRESULT GetCurrentView( [in] REFIID riid, - [out, iid_is(riid)] IUnknown **ppv); + [out, iid_is(riid)] void **ppv); }

1 0

David Hedberg : shell32: Fix some return values from the shellview contextmenu.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: d60c9adca2e888da22cf1edb4e9f1da9b56e1f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60c9adca2e888da22cf1edb4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 17:08:18 2010 +0200 shell32: Fix some return values from the shellview contextmenu. --- dlls/shell32/shv_item_cmenu.c | 10 +++- dlls/shell32/tests/shlfolder.c | 109 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 1bab77b..e5d5e5b 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -218,6 +218,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( UINT uFlags) { ItemCmImpl *This = (ItemCmImpl *)iface; + INT uIDMax; TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -231,7 +232,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( if(uFlags & CMF_EXPLORE) RemoveMenu(hmenures, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); - Shell_MergeMenus(hmenu, GetSubMenu(hmenures, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); + uIDMax = Shell_MergeMenus(hmenu, GetSubMenu(hmenures, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); DestroyMenu(hmenures); @@ -255,7 +256,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( else EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND | ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST)); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax); } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); } @@ -561,6 +562,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( break; default: FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); + return E_INVALIDARG; } } else @@ -570,8 +572,10 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( DoDelete(iface); else if (strcmp(lpcmi->lpVerb,"properties")==0) DoOpenProperties(iface, lpcmi->hwnd); - else + else { FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); + return E_FAIL; + } } return NOERROR; } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 085c91e..2909818 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2110,6 +2110,114 @@ static void test_desktop_IPersist(void) IShellFolder_Release(desktop); } +static void test_GetUIObject(void) +{ + IShellFolder *psf_desktop; + IContextMenu *pcm; + LPITEMIDLIST pidl; + HRESULT hr; + WCHAR path[MAX_PATH]; + const WCHAR filename[] = + {'\\','t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; + + if(!pSHBindToParent) + { + win_skip("SHBindToParent missing.\n"); + return; + } + + GetCurrentDirectoryW(MAX_PATH, path); + if(!lstrlenW(path)) + { + skip("GetCurrentDirectoryW returned an empty string.\n"); + return; + } + lstrcatW(path, filename); + SHGetDesktopFolder(&psf_desktop); + + CreateFilesFolders(); + + hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + IShellFolder *psf; + LPCITEMIDLIST pidl_child; + hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IShellFolder_GetUIObjectOf(psf, NULL, 1, (LPCITEMIDLIST*)&pidl_child, + &IID_IContextMenu, NULL, (void**)&pcm); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + HMENU hmenu = CreatePopupMenu(); + INT max_id, max_id_check; + UINT count, i; + const int id_upper_limit = 32767; + hr = IContextMenu_QueryContextMenu(pcm, hmenu, 0, 0, id_upper_limit, CMF_NORMAL); + ok(SUCCEEDED(hr), "Got 0x%08x\n", hr); + max_id = HRESULT_CODE(hr) - 1; /* returns max_id + 1 */ + ok(max_id <= id_upper_limit, "Got %d\n", max_id); + count = GetMenuItemCount(hmenu); + ok(count, "Got %d\n", count); + + max_id_check = 0; + for(i = 0; i < count; i++) + { + MENUITEMINFOA mii; + INT res; + ZeroMemory(&mii, sizeof(MENUITEMINFOA)); + mii.cbSize = sizeof(MENUITEMINFOA); + mii.fMask = MIIM_ID | MIIM_FTYPE; + + SetLastError(0); + res = GetMenuItemInfoA(hmenu, i, TRUE, &mii); + ok(res, "Failed (last error: %d).\n", GetLastError()); + + ok( (mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), + "Got non-separator ID out of range: %d (type: %x) \n", mii.wID, mii.fType); + if(!(mii.fType & MFT_SEPARATOR)) + max_id_check = (mii.wID>max_id_check)?mii.wID:max_id_check; + } + ok((max_id_check == max_id) || + (max_id_check == max_id-1 /* Win 7 */), + "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); + +#define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA) + + if(count && !is_win2k()) /* Test is interactive on w2k, so skip */ + { + CMINVOKECOMMANDINFO cmi; + ZeroMemory(&cmi, sizeof(CMINVOKECOMMANDINFO)); + cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); + + /* Attempt to execute non-existing command */ + cmi.lpVerb = MAKEINTRESOURCEA(9999); + hr = IContextMenu_InvokeCommand(pcm, &cmi); + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + + cmi.lpVerb = "foobar_wine_test"; + hr = IContextMenu_InvokeCommand(pcm, &cmi); + ok( (hr == E_INVALIDARG) || (hr == E_FAIL /* Win7 */) || + (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), + "Got 0x%08x\n", hr); + } +#undef is_win2k + + DestroyMenu(hmenu); + IContextMenu_Release(pcm); + } + IShellFolder_Release(psf); + } + if(pILFree) pILFree(pidl); + } + + IShellFolder_Release(psf_desktop); + Cleanup(); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -2131,6 +2239,7 @@ START_TEST(shlfolder) test_LocalizedNames(); test_SHCreateShellItem(); test_desktop_IPersist(); + test_GetUIObject(); OleUninitialize(); }

1 0