May 2010 - Wine-Commits - list.winehq.org

Michael Stefaniuc : comctl32: Avoid a potential NULL pointer dereference in a TRACE.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 02b4103868a2055af0fe01d2677729e7e4576dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b4103868a2055af0fe01d26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 25 10:06:33 2010 +0200 comctl32: Avoid a potential NULL pointer dereference in a TRACE. --- dlls/comctl32/propsheet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 25a9218..45c7fe3 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1962,13 +1962,13 @@ static BOOL PROPSHEET_CanSetCurSel(HWND hwndDlg) PSHNOTIFY psn; BOOL res = FALSE; - TRACE("active_page %d\n", psInfo->active_page); if (!psInfo) { res = FALSE; goto end; } + TRACE("active_page %d\n", psInfo->active_page); if (psInfo->active_page < 0) { res = TRUE;

1 0

Henri Verbeet : wined3d: Set the arb_program_shader. c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 4d4654a0149e8a315cfabe2dcc7e663d6b5340af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d4654a0149e8a315cfabe2dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 25 12:02:02 2010 +0200 wined3d: Set the arb_program_shader.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3045f4a..97840e5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5537,11 +5537,10 @@ static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen caps->MaxTextureBlendStages = 8; caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); } -#undef GLINFO_LOCATION -#define GLINFO_LOCATION stateblock->device->adapter->gl_info static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; float col[4]; @@ -5563,6 +5562,7 @@ static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *statebloc static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; float col[4]; @@ -5591,6 +5591,7 @@ static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateb static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; float mat[2][2]; @@ -5627,6 +5628,7 @@ static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, s static void tex_bumpenvlum_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; float param[4]; @@ -5874,6 +5876,7 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta /* The stateblock is passed for GLINFO_LOCATION */ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWineD3DStateBlockImpl *stateblock) { + const struct wined3d_gl_info *gl_info = &stateblock->device->adapter->gl_info; unsigned int stage; struct wined3d_shader_buffer buffer; BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; @@ -6148,6 +6151,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = stateblock->device; struct shader_arb_priv *priv = device->fragment_priv; BOOL use_pshader = use_ps(stateblock); @@ -6184,7 +6188,7 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, return; } new_desc->num_textures_used = 0; - for (i = 0; i < context->gl_info->limits.texture_stages; ++i) + for (i = 0; i < gl_info->limits.texture_stages; ++i) { if(settings.op[i].cop == WINED3DTOP_DISABLE) break; new_desc->num_textures_used = i; @@ -6280,8 +6284,6 @@ static void textransform(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } } -#undef GLINFO_LOCATION - static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, @@ -6443,8 +6445,6 @@ const struct fragment_pipeline arbfp_fragment_pipeline = { TRUE /* We can disable projected textures */ }; -#define GLINFO_LOCATION device->adapter->gl_info - struct arbfp_blit_priv { GLenum yuy2_rect_shader, yuy2_2d_shader; GLenum uyvy_rect_shader, uyvy_2d_shader; @@ -6466,6 +6466,7 @@ static HRESULT arbfp_blit_alloc(IWineD3DDevice *iface) { /* Context activation is done by the caller. */ static void arbfp_blit_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; ENTER_GL(); @@ -6722,6 +6723,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype, static GLuint gen_p8_shader(IWineD3DDeviceImpl *device, GLenum textype) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; GLenum shader; struct wined3d_shader_buffer buffer; struct arbfp_blit_priv *priv = device->blit_priv; @@ -6791,6 +6793,7 @@ static void upload_palette(IWineD3DSurfaceImpl *surface) { BYTE table[256][4]; IWineD3DDeviceImpl *device = surface->resource.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; BOOL colorkey = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE; @@ -6821,6 +6824,7 @@ static void upload_palette(IWineD3DSurfaceImpl *surface) /* Context activation is done by the caller. */ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum complex_fixup yuv_fixup, GLenum textype) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; GLenum shader; struct wined3d_shader_buffer buffer; char luminance_component; @@ -6979,6 +6983,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac { GLenum shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; float size[4] = {surface->pow2Width, surface->pow2Height, 1, 1}; struct arbfp_blit_priv *priv = device->blit_priv; enum complex_fixup fixup; @@ -7182,5 +7187,3 @@ const struct blit_shader arbfp_blit = { arbfp_blit_supported, arbfp_blit_color_fill }; - -#undef GLINFO_LOCATION

1 0

André Hentschel : oledb32/tests: Preset dst_len to encounter more problems.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: aa8457008a6e2761f4470f991a2ce675f0952eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8457008a6e2761f4470f991… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 24 20:51:49 2010 +0200 oledb32/tests: Preset dst_len to encounter more problems. --- dlls/oledb32/tests/convert.c | 282 +++++++++++++++++++++++++++++++++--------- 1 files changed, 223 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa8457008a6e2761f4470…

1 0

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

May 25, 2010

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

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

May 25, 2010

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

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

May 25, 2010

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

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

May 25, 2010

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

Alexandre Julliard : user.exe: Store the GDI instance when it' s first loaded.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: a157959dbee696790b668142a9d5854066b3ee44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a157959dbee696790b668142a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 23:35:37 2010 +0200 user.exe: Store the GDI instance when it's first loaded. --- dlls/user.exe16/user.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index c536a6d..710ed62 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -60,6 +60,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); WORD USER_HeapSel = 0; /* USER heap selector */ +static HINSTANCE16 gdi_inst; + struct gray_string_info { GRAYSTRINGPROC16 proc; @@ -1760,11 +1762,8 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) { STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); HANDLE16 oldDS = stack16->ds; - HINSTANCE16 gdi_inst; int userPercent, gdiPercent; - if ((gdi_inst = GetModuleHandle16( "gdi" )) < 32) return 0; - switch(resType) { case GFSR_USERRESOURCES: @@ -2060,7 +2059,7 @@ BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds, USER_HeapSel = ds; register_wow_handlers(); - LoadLibrary16( "gdi.exe" ); + gdi_inst = LoadLibrary16( "gdi.exe" ); LoadLibrary16( "display.drv" ); LoadLibrary16( "keyboard.drv" ); LoadLibrary16( "mouse.drv" );

1 0

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

May 25, 2010

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

David Hedberg : include: Add ICommDlgBrowser2 and ICommDlgBrowser3 interfaces.
by Alexandre Julliard May 25, 2010

May 25, 2010

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