wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Andrew Eikum : winedbg: Allow user to specify length of stack info output.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: d3f80c1e9f144ac73bfcb9f60d64158a2803bbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f80c1e9f144ac73bfcb9f60… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 24 17:48:36 2010 -0500 winedbg: Allow user to specify length of stack info output. --- programs/winedbg/dbg.y | 3 ++- programs/winedbg/debugger.h | 2 +- programs/winedbg/info.c | 2 +- programs/winedbg/stack.c | 13 ++++++++----- programs/winedbg/tgt_active.c | 2 +- programs/winedbg/tgt_minidump.c | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 855407f..336f993 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -274,7 +274,8 @@ info_command: | tINFO tALLREGS { be_cpu->print_context(dbg_curr_thread->handle, &dbg_context, 1); } | tINFO tSEGMENTS expr_rvalue { info_win32_segments($3 >> 3, 1); } | tINFO tSEGMENTS { info_win32_segments(0, -1); } - | tINFO tSTACK { stack_info(); } + | tINFO tSTACK tNUM { stack_info($3); } + | tINFO tSTACK { stack_info(-1); } | tINFO tSYMBOL tSTRING { symbol_info($3); } | tINFO tLOCAL { symbol_info_locals(); } | tINFO tDISPLAY { display_info(); } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 8ebac1e..ae949f2 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -384,7 +384,7 @@ extern void source_nuke_path(struct dbg_process* p); extern void source_free_files(struct dbg_process* p); /* stack.c */ -extern void stack_info(void); +extern void stack_info(int len); extern void stack_backtrace(DWORD threadID); extern BOOL stack_set_frame(int newframe); extern BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e501f43..a09af5d 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -106,7 +106,7 @@ void info_help(void) " info segments <pid> Displays information about all known segments", " info share Displays all loaded modules", " info share <addr> Displays internal module state", - " info stack Dumps information about top of stack", + " info stack [<len>] Dumps information about top of stack, up to len words", " info symbol <sym> Displays information about a given symbol", " info thread Shows all running threads", " info wnd <handle> Displays internal window state", diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index bccb56a..be535f9 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -33,12 +33,15 @@ /*********************************************************************** * stack_info * - * Dump the top of the stack + * Dump the top of the stack. If len <= 0, a default length is used. */ -void stack_info(void) +void stack_info(int len) { struct dbg_lvalue lvalue; + if(len <= 0) + len = 24; + lvalue.cookie = 0; lvalue.type.id = dbg_itype_segptr; lvalue.type.module = 0; @@ -51,14 +54,14 @@ void stack_info(void) switch (lvalue.addr.Mode) { case AddrModeFlat: /* 32-bit or 64-bit mode */ - memory_examine(&lvalue, 24, 'a'); + memory_examine(&lvalue, len, 'a'); break; case AddrMode1632: /* 32-bit mode */ - memory_examine(&lvalue, 24, 'x'); + memory_examine(&lvalue, len, 'x'); break; case AddrModeReal: /* 16-bit mode */ case AddrMode1616: - memory_examine(&lvalue, 24, 'w'); + memory_examine(&lvalue, len, 'w'); break; } } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 0572d95..c0c12dd 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -182,7 +182,7 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC { /* This is a real crash, dump some info */ be_cpu->print_context(dbg_curr_thread->handle, &dbg_context, 0); - stack_info(); + stack_info(-1); be_cpu->print_segment_info(dbg_curr_thread->handle, &dbg_context); stack_backtrace(dbg_curr_tid); } diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index f099b4e..c24fd8c 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -389,7 +389,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) memory_get_current_pc(&addr); stack_fetch_frames(&dbg_context); be_cpu->print_context(dbg_curr_thread->handle, &dbg_context, 0); - stack_info(); + stack_info(-1); be_cpu->print_segment_info(dbg_curr_thread->handle, &dbg_context); stack_backtrace(mes->ThreadId); source_list_from_addr(&addr, 0);

1 0

Matteo Bruni : d3dx9: Stricter checks for relative addressing in the shader assembler.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 084d5f1f6c248a68feb1ee956dbc9ce836368570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084d5f1f6c248a68feb1ee956… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon May 24 17:18:55 2010 +0200 d3dx9: Stricter checks for relative addressing in the shader assembler. --- dlls/d3dx9_36/asmparser.c | 121 +++++++++++++++++++++++--------------------- dlls/d3dx9_36/tests/asm.c | 15 ++++++ 2 files changed, 78 insertions(+), 58 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 539cacd..0242909 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -382,6 +382,7 @@ static void check_ps_dstmod(struct asm_parser *This, DWORD dstmod) { struct allowed_reg_type { DWORD type; DWORD count; + BOOL reladdr; }; static BOOL check_reg_type(const struct shader_reg *reg, @@ -390,9 +391,13 @@ static BOOL check_reg_type(const struct shader_reg *reg, while(allowed[i].type != ~0U) { if(reg->type == allowed[i].type) { - if(reg->rel_reg) return TRUE; /* The relative addressing register - can have a negative value, we - can't check the register index */ + if(reg->rel_reg) { + if(allowed[i].reladdr) + return TRUE; /* The relative addressing register + can have a negative value, we + can't check the register index */ + return FALSE; + } if(reg->regnum < allowed[i].count) return TRUE; return FALSE; } @@ -403,18 +408,18 @@ static BOOL check_reg_type(const struct shader_reg *reg, /* Native assembler doesn't do separate checks for src and dst registers */ static const struct allowed_reg_type vs_2_reg_allowed[] = { - { BWRITERSPR_TEMP, 12 }, - { BWRITERSPR_INPUT, 16 }, - { BWRITERSPR_CONST, ~0U }, - { BWRITERSPR_ADDR, 1 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_LOOP, 1 }, - { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_PREDICATE, 1 }, - { BWRITERSPR_RASTOUT, 3 }, /* oPos, oFog and oPts */ - { BWRITERSPR_ATTROUT, 2 }, - { BWRITERSPR_TEXCRDOUT, 8 }, + { BWRITERSPR_TEMP, 12, FALSE }, + { BWRITERSPR_INPUT, 16, FALSE }, + { BWRITERSPR_CONST, ~0U, TRUE }, + { BWRITERSPR_ADDR, 1, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_LOOP, 1, FALSE }, + { BWRITERSPR_LABEL, 2048, FALSE }, + { BWRITERSPR_PREDICATE, 1, FALSE }, + { BWRITERSPR_RASTOUT, 3, FALSE }, /* oPos, oFog and oPts */ + { BWRITERSPR_ATTROUT, 2, FALSE }, + { BWRITERSPR_TEXCRDOUT, 8, FALSE }, { ~0U, 0 } /* End tag */ }; @@ -437,17 +442,17 @@ static void asmparser_srcreg_vs_2(struct asm_parser *This, } static const struct allowed_reg_type vs_3_reg_allowed[] = { - { BWRITERSPR_TEMP, 32 }, - { BWRITERSPR_INPUT, 16 }, - { BWRITERSPR_CONST, ~0U }, - { BWRITERSPR_ADDR, 1 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_LOOP, 1 }, - { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_PREDICATE, 1 }, - { BWRITERSPR_SAMPLER, 4 }, - { BWRITERSPR_OUTPUT, 12 }, + { BWRITERSPR_TEMP, 32, FALSE }, + { BWRITERSPR_INPUT, 16, TRUE }, + { BWRITERSPR_CONST, ~0U, TRUE }, + { BWRITERSPR_ADDR, 1, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_LOOP, 1, FALSE }, + { BWRITERSPR_LABEL, 2048, FALSE }, + { BWRITERSPR_PREDICATE, 1, FALSE }, + { BWRITERSPR_SAMPLER, 4, FALSE }, + { BWRITERSPR_OUTPUT, 12, TRUE }, { ~0U, 0 } /* End tag */ }; @@ -466,15 +471,15 @@ static void asmparser_srcreg_vs_3(struct asm_parser *This, } static const struct allowed_reg_type ps_2_0_reg_allowed[] = { - { BWRITERSPR_INPUT, 2 }, - { BWRITERSPR_TEMP, 32 }, - { BWRITERSPR_CONST, 32 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_SAMPLER, 16 }, - { BWRITERSPR_TEXTURE, 8 }, - { BWRITERSPR_COLOROUT, 4 }, - { BWRITERSPR_DEPTHOUT, 1 }, + { BWRITERSPR_INPUT, 2, FALSE }, + { BWRITERSPR_TEMP, 32, FALSE }, + { BWRITERSPR_CONST, 32, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_SAMPLER, 16, FALSE }, + { BWRITERSPR_TEXTURE, 8, FALSE }, + { BWRITERSPR_COLOROUT, 4, FALSE }, + { BWRITERSPR_DEPTHOUT, 1, FALSE }, { ~0U, 0 } /* End tag */ }; @@ -496,17 +501,17 @@ static void asmparser_srcreg_ps_2(struct asm_parser *This, } static const struct allowed_reg_type ps_2_x_reg_allowed[] = { - { BWRITERSPR_INPUT, 2 }, - { BWRITERSPR_TEMP, 32 }, - { BWRITERSPR_CONST, 32 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_PREDICATE, 1 }, - { BWRITERSPR_SAMPLER, 16 }, - { BWRITERSPR_TEXTURE, 8 }, - { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_COLOROUT, 4 }, - { BWRITERSPR_DEPTHOUT, 1 }, + { BWRITERSPR_INPUT, 2, FALSE }, + { BWRITERSPR_TEMP, 32, FALSE }, + { BWRITERSPR_CONST, 32, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_PREDICATE, 1, FALSE }, + { BWRITERSPR_SAMPLER, 16, FALSE }, + { BWRITERSPR_TEXTURE, 8, FALSE }, + { BWRITERSPR_LABEL, 2048, FALSE }, + { BWRITERSPR_COLOROUT, 4, FALSE }, + { BWRITERSPR_DEPTHOUT, 1, FALSE }, { ~0U, 0 } /* End tag */ }; @@ -528,18 +533,18 @@ static void asmparser_srcreg_ps_2_x(struct asm_parser *This, } static const struct allowed_reg_type ps_3_reg_allowed[] = { - { BWRITERSPR_INPUT, 10 }, - { BWRITERSPR_TEMP, 32 }, - { BWRITERSPR_CONST, 224 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_PREDICATE, 1 }, - { BWRITERSPR_SAMPLER, 16 }, - { BWRITERSPR_MISCTYPE, 2 }, /* vPos and vFace */ - { BWRITERSPR_LOOP, 1 }, - { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_COLOROUT, 4 }, - { BWRITERSPR_DEPTHOUT, 1 }, + { BWRITERSPR_INPUT, 10, TRUE }, + { BWRITERSPR_TEMP, 32, FALSE }, + { BWRITERSPR_CONST, 224, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_PREDICATE, 1, FALSE }, + { BWRITERSPR_SAMPLER, 16, FALSE }, + { BWRITERSPR_MISCTYPE, 2, FALSE }, /* vPos and vFace */ + { BWRITERSPR_LOOP, 1, FALSE }, + { BWRITERSPR_LABEL, 2048, FALSE }, + { BWRITERSPR_COLOROUT, 4, FALSE }, + { BWRITERSPR_DEPTHOUT, 1, FALSE }, { ~0U, 0 } /* End tag */ }; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 7202d62..7daa91f 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1291,6 +1291,21 @@ static void failure_test(void) { /* shader 32: t5 not allowed in ps_1_3 */ "ps_1_3\n" "tex t5\n", + /* shader 33: no temporary registers relative addressing */ + "vs_3_0\n" + "add r0, r0[ a0.x ], r1\n", + /* shader 34: no input registers relative addressing in vs_2_0 */ + "vs_2_0\n" + "add r0, v[ a0.x ], r1\n", + /* shader 35: no aL register in ps_2_0 */ + "ps_2_0\n" + "add r0, v[ aL ], r1\n", + /* shader 36: no relative addressing in ps_2_0 */ + "ps_2_0\n" + "add r0, v[ r0 ], r1\n", + /* shader 37: no a0 register in ps_3_0 */ + "ps_3_0\n" + "add r0, v[ a0.x ], r1\n", }; HRESULT hr; unsigned int i;

1 0

David Hedberg : include: Add ICommDlgBrowser2 and ICommDlgBrowser3 interfaces.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 75c146510e4b19ff4486ace8cc3d34d1b4631a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c146510e4b19ff4486ace8c… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon May 24 16:40:43 2010 +0200 include: Add ICommDlgBrowser2 and ICommDlgBrowser3 interfaces. --- include/shobjidl.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index cf05b33..002ec3e 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1012,6 +1012,55 @@ cpp_quote("#define CDBOSC_STATECHANGE 0x00000004") /***************************************************************************** + * ICommDlgBrowser2 interface + */ +[ + object, + uuid(10339516-2894-11D2-9039-00C04F8EEB3E), + pointer_default(unique) +] +interface ICommDlgBrowser2 : ICommDlgBrowser +{ + + HRESULT Notify( + [in] IShellView *ppshv, + [in] DWORD dwNotifyType); + + HRESULT GetDefaultMenuText( + [in] IShellView *ppshv, + [out, string, size_is(cchMax)] LPWSTR pszText, + [in] int cchMax); + + HRESULT GetViewFlags( + [out] DWORD *pdwFlags); +} + + +/***************************************************************************** + * ICommDlgBrowser3 interface + */ +[ + object, + uuid(C8AD25A1-3294-41EE-8165-71174BD01C57), + pointer_default(unique) +] +interface ICommDlgBrowser3 : ICommDlgBrowser2 +{ + + HRESULT OnColumnClicked( + [in] IShellView *ppshv, + [in] int iColumn); + + HRESULT GetCurrentFilter( + [out, string, size_is(cchFileSpec)] LPWSTR pszFileSpec, + [in] int cchFileSpec); + + HRESULT OnPreviewCreated( + [in] IShellView *ppshv); +} + + +/***************************************************************************** * IDockingWindowFrame interface */ [

1 0

David Hedberg : include: Add IExplorerBrowserEvents, IExplorerPaneVisibility and IExplorerBrowser interface declarations and related GUID 's.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: a72b1eff0e1d27d87662c0bc0f09bc027999a1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72b1eff0e1d27d87662c0bc0… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon May 24 16:40:42 2010 +0200 include: Add IExplorerBrowserEvents, IExplorerPaneVisibility and IExplorerBrowser interface declarations and related GUID's. --- include/shlguid.h | 12 +++++ include/shobjidl.idl | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/shtypes.idl | 2 + 3 files changed, 143 insertions(+), 0 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index 0055d38..bd75cc3 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -164,4 +164,16 @@ DEFINE_GUID(VID_Thumbnails, 0x8bebb290, 0x52d0, 0x11d0, 0xb7, 0xf4, 0x00, 0xc0, DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); +/* IExplorerBrowser */ +DEFINE_GUID(CLSID_ExplorerBrowser, 0x71F96385, 0xDDD6, 0x48D3, 0xA0, 0xC1, 0xAE, 0x06, 0xE8, 0xB0, 0x55, 0xFB); + +DEFINE_GUID(EP_NavPane, 0xCB316B22, 0x25F7, 0x42B8, 0x8A, 0x09, 0x54, 0x0D, 0x23, 0xA4, 0x3C, 0x2F); +DEFINE_GUID(EP_Commands,0xD9745868, 0xCA5F, 0x4A76, 0x91, 0xCD, 0xF5, 0xA1, 0x29, 0xFB, 0xB0, 0x76); +DEFINE_GUID(EP_Commands_Organize, 0x72E81700, 0xE3EC, 0x4660, 0xBF, 0x24, 0x3C, 0x3B, 0x7B, 0x64, 0x88, 0x06); +DEFINE_GUID(EP_Commands_View, 0x21F7C32D, 0xEEAA, 0x439B, 0xBB, 0x51, 0x37, 0xB9, 0x6F, 0xD6, 0xA9, 0x43); +DEFINE_GUID(EP_DetailsPane, 0x43ABF98B, 0x89B8, 0x472D, 0xB9, 0xCE, 0xE6, 0x9B, 0x82, 0x29, 0xF0, 0x19); +DEFINE_GUID(EP_PreviewPane, 0x893C63D1, 0x45C8, 0x4D17, 0xBE, 0x19, 0x22, 0x3B, 0xE7, 0x1B, 0xE3, 0x65); +DEFINE_GUID(EP_QueryPane, 0x65BCDE4F, 0x4F07, 0x4F27, 0x83, 0xA7, 0x1A, 0xFC, 0xA4, 0xDF, 0x7D, 0xDD); +DEFINE_GUID(EP_AdvQueryPane, 0xB4E9DB8B, 0x34BA, 0x4C39, 0xB5, 0xCC, 0x16, 0xA1, 0xBD, 0x2C, 0x41, 0x1C); + #endif /* __WINE_SHLGUID_H */ diff --git a/include/shobjidl.idl b/include/shobjidl.idl index a106248..cf05b33 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1569,3 +1569,132 @@ interface IProfferService : IUnknown HRESULT RevokeService([in] DWORD cookie); } + +/***************************************************************************** + * IExplorerBrowserEvents interface + */ +[ + object, + uuid(361BBDC7-E6EE-4E13-BE58-58E2240C810F) +] +interface IExplorerBrowserEvents : IUnknown +{ + HRESULT OnNavigationPending( + [in] PCIDLIST_ABSOLUTE pidlFolder); + + HRESULT OnViewCreated( + [in] IShellView *psv); + + HRESULT OnNavigationComplete( + [in] PCIDLIST_ABSOLUTE pidlFolder); + + HRESULT OnNavigationFailed( + [in] PCIDLIST_ABSOLUTE pidlFolder); +} + +typedef GUID EXPLORERPANE; +typedef EXPLORERPANE *REFEXPLORERPANE; + +/***************************************************************************** + * IExplorerPaneVisibility interface + */ +[ + object, + uuid(E07010EC-BC17-44C0-97B0-46C7C95B9EDC) +] +interface IExplorerPaneVisibility : IUnknown +{ + typedef enum tagEXPLORERPANESTATE { + EPS_DONTCARE = 0x0, + EPS_DEFAULT_ON = 0x1, + EPS_DEFAULT_OFF = 0x2, + EPS_STATE_MASK = 0xffff, + EPS_INITIALSTATE = 0x10000, + EPS_FORCE = 0x20000 + } EXPLORERPANESTATE; + + HRESULT GetPaneState( + [in] REFEXPLORERPANE ep, + [out] EXPLORERPANESTATE *peps); +} + +typedef [v1_enum] enum tagEXPLORER_BROWSER_FILL_FLAGS { + EBF_NONE = 0, + EBF_SELECTFROMDATAOBJECT = 0x100, + EBF_NODROPTARGET = 0x200 +} EXPLORER_BROWSER_FILL_FLAGS; + +typedef [v1_enum] enum tagEXPLORER_BROWSER_OPTIONS { + EBO_NONE = 0x00, + EBO_NAVIGATEONCE = 0x01, + EBO_SHOWFRAMES = 0x02, + EBO_ALWAYSNAVIGATE = 0x04, + EBO_NOTRAVELLOG = 0x08, + EBO_NOWRAPPERWINDOW = 0x10, + EBO_HTMLSHAREPOINTVIEW = 0x20 +} EXPLORER_BROWSER_OPTIONS; + +cpp_quote("#define SID_SExplorerBrowserFrame IID_ICommDlgBrowser") + +/***************************************************************************** + * IExplorerBrowser interface + */ +[ + object, + uuid(DFD3B6B5-C10C-4BE9-85F6-A66969F402F6), + pointer_default(unique) +] +interface IExplorerBrowser : IUnknown +{ + + [local] HRESULT Initialize( + [in] HWND hwndParent, + [in] const RECT *prc, + [in, unique] const FOLDERSETTINGS *pfs); + + HRESULT Destroy(); + + [local] HRESULT SetRect( + [in,out,unique] HDWP *phdwp, + [in] RECT rcBrowser); + + HRESULT SetPropertyBag( + [in, string] LPCWSTR pszPropertyBag); + + HRESULT SetEmptyText( + [in, string] LPCWSTR pszEmptyText); + + HRESULT SetFolderSettings( + [in] const FOLDERSETTINGS *pfs); + + HRESULT Advise( + [in] IExplorerBrowserEvents *psbe, + [out] DWORD *pdwCookie); + + HRESULT Unadvise( + [in] DWORD dwCookie); + + HRESULT SetOptions( + [in] EXPLORER_BROWSER_OPTIONS dwFlag); + + HRESULT GetOptions( + [out] EXPLORER_BROWSER_OPTIONS *pdwFlag); + + HRESULT BrowseToIDList( + [in] PCUIDLIST_RELATIVE pidl, + [in] UINT uFlags); + + HRESULT BrowseToObject( + [in] IUnknown *punk, + [in] UINT uFlags); + + HRESULT FillFromObject( + [in] IUnknown *punk, + [in] EXPLORER_BROWSER_FILL_FLAGS dwFlags); + + HRESULT RemoveAll(); + + HRESULT GetCurrentView( + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppv); +} diff --git a/include/shtypes.idl b/include/shtypes.idl index dd908e3..5ed8daf 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -38,6 +38,8 @@ typedef LPITEMIDLIST PITEMID_CHILD; typedef const PITEMID_CHILD PCITEMID_CHILD; typedef LPCITEMIDLIST PCUITEMID_CHILD; typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY; +typedef LPCITEMIDLIST PCUIDLIST_RELATIVE; +typedef LPCITEMIDLIST PCIDLIST_ABSOLUTE; cpp_quote("#include <poppack.h>") #ifndef MAX_PATH

1 0

Gerald Pfeifer : oleaut32/tests: Remove variable rValid which is not really used from test_VarMod.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: dbd2e8cb346c1bbd14516a258675e7d16afb8325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd2e8cb346c1bbd14516a258… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 22:09:54 2010 +0200 oleaut32/tests: Remove variable rValid which is not really used from test_VarMod. --- dlls/oleaut32/tests/vartest.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2374051..8203510 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2347,7 +2347,7 @@ static void test_VarMod(void) static const WCHAR szNum1[] = {'1','0','\0'}; int l, r; BOOL lFound, rFound; - BOOL lValid, rValid; + BOOL lValid; BSTR strNum0, strNum1; CHECKPTR(VarMod); @@ -2531,7 +2531,6 @@ static void test_VarMod(void) } rFound = TRUE; - rValid = TRUE; switch(r) { case VT_EMPTY: @@ -2558,7 +2557,6 @@ static void test_VarMod(void) case VT_VARIANT: case VT_UNKNOWN: case VT_RECORD: - rValid = FALSE; break; default: rFound = FALSE;

1 0

Gerald Pfeifer : msvcrt/tests: Adjust CHECK_TYPE to avoid some two dozen compiler warnings.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 68a94aa90136053b8609f9719d6c78d3ecaf0c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a94aa90136053b8609f9719… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 21:35:47 2010 +0200 msvcrt/tests: Adjust CHECK_TYPE to avoid some two dozen compiler warnings. --- dlls/msvcrt/tests/headers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 80c614b..c39948d 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -68,7 +68,7 @@ #define MSVCRT(x) MSVCRT_##x #define OFFSET(T,F) ((unsigned int)((char *)&((struct T *)0L)->F - (char *)0L)) #define CHECK_SIZE(e) ok(sizeof(e) == sizeof(MSVCRT(e)), "Element has different sizes\n") -#define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = 0; a = b; CHECK_SIZE(t); } +#define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = a; a = b; CHECK_SIZE(t); } #define CHECK_STRUCT(s) ok(sizeof(struct s) == sizeof(struct MSVCRT(s)), "Struct has different sizes\n") #define CHECK_FIELD(s,e) ok(OFFSET(s,e) == OFFSET(MSVCRT(s),e), "Bad offset\n") #define CHECK_DEF(d) ok(d == MSVCRT_##d, "Defines (MSVCRT_)" #d " are different: %d vs. %d\n", d, MSVCRT_##d)

1 0

André Hentschel : winegcc: Add support for amd64-mingw32msvc platform.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: b723530be0e7c86a193ca1eeb2a12ee269dbaa17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b723530be0e7c86a193ca1eeb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 25 01:04:59 2010 +0200 winegcc: Add support for amd64-mingw32msvc platform. --- tools/winegcc/winegcc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 10a4d7a..7e9c3f6 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -156,6 +156,7 @@ static const struct { "i586", CPU_x86 }, { "i686", CPU_x86 }, { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "alpha", CPU_ALPHA },

1 0

Juan Lang : ole32: Only read known format ids when attempting to read summary information.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: c94b2687d223100300b61628a77fe942e4f42121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94b2687d223100300b61628a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 24 12:11:22 2010 -0700 ole32: Only read known format ids when attempting to read summary information. --- dlls/ole32/stg_prop.c | 7 +++++++ dlls/ole32/tests/stg_prop.c | 1 - 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index b3362bc..f887d10 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1314,6 +1314,13 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) hr = PropertyStorage_ReadFmtIdOffsetFromStream(This->stm, &fmtOffset); if (FAILED(hr)) goto end; + if (!IsEqualGUID(&fmtOffset.fmtid, &FMTID_DocSummaryInformation) && + !IsEqualGUID(&fmtOffset.fmtid, &FMTID_SummaryInformation)) + { + WARN("not reading unknown fmtid %s\n", debugstr_guid(&fmtOffset.fmtid)); + hr = S_FALSE; + goto end; + } if (fmtOffset.dwOffset > stat.cbSize.u.LowPart) { WARN("invalid offset %d (stream length is %d)\n", fmtOffset.dwOffset, diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 4e5fde7..dff3361 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -333,7 +333,6 @@ static void testProps(void) hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); - todo_wine ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); spec.ulKind = PRSPEC_PROPID;

1 0

Juan Lang : ole32/tests: Test creating an IPropertySetStorage with an unknown format id.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: b4c3a041650b248a992e53b1f981d6a7c61e9365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c3a041650b248a992e53b1f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 24 12:10:40 2010 -0700 ole32/tests: Test creating an IPropertySetStorage with an unknown format id. --- dlls/ole32/tests/stg_prop.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 37e8e10..4e5fde7 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -59,6 +59,8 @@ static void testProps(void) PROPVARIANT var; CLIPDATA clipdata; unsigned char clipcontent[] = "foobar"; + GUID anyOldGuid = { 0x12345678,0xdead,0xbeef, { + 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07 } }; if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; @@ -290,6 +292,60 @@ static void testProps(void) IStorage_Release(storage); DeleteFileW(filename); + + /* Test creating a property set storage with a random GUID */ + hr = StgCreateDocfile(filename, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, &storage); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + + if(!pStgCreatePropSetStg) + { + IStorage_Release(storage); + DeleteFileW(filename); + return; + } + hr = pStgCreatePropSetStg(storage, 0, &propSetStorage); + ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); + + hr = IPropertySetStorage_Create(propSetStorage, + &anyOldGuid, NULL, PROPSETFLAG_ANSI, + STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, + &propertyStorage); + ok(hr == S_OK, "IPropertySetStorage_Create failed: 0x%08x\n", hr); + + spec.ulKind = PRSPEC_PROPID; + U(spec).propid = PID_FIRST_USABLE; + U(var).lVal = 1; + hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); + ok(hr == S_OK, "WriteMultiple failed: 0x%08x\n", hr); + + IPropertyStorage_Release(propertyStorage); + IPropertySetStorage_Release(propSetStorage); + IStorage_Release(storage); + + /* now open it again */ + hr = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, + NULL, 0, &storage); + ok(hr == S_OK, "StgOpenStorage failed: 0x%08x\n", hr); + + hr = pStgCreatePropSetStg(storage, 0, &propSetStorage); + ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); + + hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); + todo_wine + ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); + + spec.ulKind = PRSPEC_PROPID; + U(spec).propid = PID_FIRST_USABLE; + hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); + ok(hr == S_FALSE, "ReadMultiple failed: 0x%08x\n", hr); + + IPropertyStorage_Release(propertyStorage); + IPropertySetStorage_Release(propSetStorage); + IStorage_Release(storage); + + DeleteFileW(filename); } static void testCodepage(void)

1 0

Dylan Smith : richedit: Fix assignment to wrong variable (LLVM/Clang).
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: b88b007d95300c320d8533eb078b73f87857c1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88b007d95300c320d8533eb0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 24 16:13:55 2010 -0400 richedit: Fix assignment to wrong variable (LLVM/Clang). --- dlls/riched20/wrap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 790c280..8d75b7f 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -232,7 +232,8 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i } if (piter->member.run.nFlags & MERF_ENDWHITE) { - j = ME_ReverseFindNonWhitespaceV(piter->member.run.strText, i); + i = ME_ReverseFindNonWhitespaceV(piter->member.run.strText, + piter->member.run.strText->nLen); pp = ME_SplitRun(wc, piter, i); wc->pt = pp->member.run.pt; return pp;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010