July 2009 - Wine-Commits - list.winehq.org

Roderick Colenbrander : winex11: Add support for GCs at more depths.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: e082bf66268519653ed37ccc4984285443e5ce0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e082bf66268519653ed37ccc4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 19 15:03:24 2009 +0200 winex11: Add support for GCs at more depths. --- dlls/winex11.drv/bitmap.c | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 4fb3ef0..a288352 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -31,20 +31,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* GCs used for B&W and color bitmap operations */ -GC BITMAP_monoGC = 0, BITMAP_colorGC = 0; +static GC bitmap_gc[32]; X_PHYSBITMAP BITMAP_stock_phys_bitmap = { 0 }; /* phys bitmap for the default stock bitmap */ static XContext bitmap_context; /* X context to associate a phys bitmap to a handle */ GC get_bitmap_gc(int depth) { - switch(depth) - { - case 1: - return BITMAP_monoGC; - default: - return BITMAP_colorGC; - } + if(depth < 1 || depth > 32) + return 0; + + return bitmap_gc[depth-1]; } /*********************************************************************** @@ -52,28 +49,38 @@ GC get_bitmap_gc(int depth) */ void X11DRV_BITMAP_Init(void) { + int depth_count, index, i; + int *depth_list; Pixmap tmpPixmap; - /* Create the necessary GCs */ - wine_tsx11_lock(); bitmap_context = XUniqueContext(); BITMAP_stock_phys_bitmap.pixmap_depth = 1; BITMAP_stock_phys_bitmap.pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 1 ); - BITMAP_monoGC = XCreateGC( gdi_display, BITMAP_stock_phys_bitmap.pixmap, 0, NULL ); - XSetGraphicsExposures( gdi_display, BITMAP_monoGC, False ); - XSetSubwindowMode( gdi_display, BITMAP_monoGC, IncludeInferiors ); - - if (screen_depth != 1) + bitmap_gc[0] = XCreateGC( gdi_display, BITMAP_stock_phys_bitmap.pixmap, 0, NULL ); + XSetGraphicsExposures( gdi_display, bitmap_gc[0], False ); + XSetSubwindowMode( gdi_display, bitmap_gc[0], IncludeInferiors ); + + /* Create a GC for all available depths. GCs at depths other than 1-bit/screen_depth are for use + * in combination with XRender which allows us to create dibsections at more depths. + */ + depth_list = XListDepths(gdi_display, DefaultScreen(gdi_display), &depth_count); + for (i = 0; i < depth_count; i++) { - if ((tmpPixmap = XCreatePixmap( gdi_display, root_window, 1, 1, screen_depth ))) + index = depth_list[i] - 1; + if (bitmap_gc[index]) continue; + if ((tmpPixmap = XCreatePixmap( gdi_display, root_window, 1, 1, depth_list[i]))) { - BITMAP_colorGC = XCreateGC( gdi_display, tmpPixmap, 0, NULL ); - XSetGraphicsExposures( gdi_display, BITMAP_colorGC, False ); - XSetSubwindowMode( gdi_display, BITMAP_colorGC, IncludeInferiors ); + if ((bitmap_gc[index] = XCreateGC( gdi_display, tmpPixmap, 0, NULL ))) + { + XSetGraphicsExposures( gdi_display, bitmap_gc[index], False ); + XSetSubwindowMode( gdi_display, bitmap_gc[index], IncludeInferiors ); + } XFreePixmap( gdi_display, tmpPixmap ); } } + XFree( depth_list ); + wine_tsx11_unlock(); }

1 0

Rein Klazes : user32: Get rid of internal function MENU_SetItemData, use SetMenuItemInfo_common instead.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 50cfcffd32084e5282e552cc4410a7d66cd33ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cfcffd32084e5282e552cc4… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 23 07:56:08 2009 +0200 user32: Get rid of internal function MENU_SetItemData, use SetMenuItemInfo_common instead. --- dlls/user32/menu.c | 140 +++++++++++++++++++--------------------------------- 1 files changed, 51 insertions(+), 89 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 64e536b..460378c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -185,6 +185,8 @@ static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFONT hFont); +static BOOL SetMenuItemInfo_common( MENUITEM *, const MENUITEMINFOW *, BOOL); + /********************************************************************* * menu class descriptor */ @@ -2048,92 +2050,6 @@ static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset ) /********************************************************************** - * MENU_SetItemData - * - * Set an item's flags, id and text ptr. Called by InsertMenu() and - * ModifyMenu(). - */ -static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT_PTR id, - LPCWSTR str ) -{ - debug_print_menuitem("MENU_SetItemData from: ", item, ""); - TRACE("flags=%x str=%p\n", flags, str); - - if (IS_STRING_ITEM(flags)) - { - LPWSTR prevText = item->text; - if (!str) - { - flags |= MF_SEPARATOR; - item->text = NULL; - } - else - { - LPWSTR text; - /* Item beginning with a backspace is a help item */ - if (*str == '\b') - { - flags |= MF_HELP; - str++; - } - if (!(text = HeapAlloc( GetProcessHeap(), 0, (strlenW(str)+1) * sizeof(WCHAR) ))) - return FALSE; - strcpyW( text, str ); - item->text = text; - } - item->hbmpItem = NULL; - HeapFree( GetProcessHeap(), 0, prevText ); - } - else if(( flags & MFT_BITMAP)) { - item->hbmpItem = HBITMAP_32(LOWORD(str)); - /* setting bitmap clears text */ - HeapFree( GetProcessHeap(), 0, item->text ); - item->text = NULL; - } - - if (flags & MF_SEPARATOR) flags |= MF_GRAYED | MF_DISABLED; - - if (flags & MF_OWNERDRAW) - item->dwItemData = (DWORD_PTR)str; - else - item->dwItemData = 0; - - if ((item->fType & MF_POPUP) && (flags & MF_POPUP) && (item->hSubMenu != (HMENU)id) ) - DestroyMenu( item->hSubMenu ); /* ModifyMenu() spec */ - - if (flags & MF_POPUP) - { - POPUPMENU *menu = MENU_GetMenu((HMENU)id); - if (menu) menu->wFlags |= MF_POPUP; - else - { - item->wID = 0; - item->hSubMenu = 0; - item->fType = 0; - item->fState = 0; - return FALSE; - } - } - - item->wID = id; - if (flags & MF_POPUP) item->hSubMenu = (HMENU)id; - - if ((item->fType & MF_POPUP) && !(flags & MF_POPUP) ) - flags |= MF_POPUP; /* keep popup */ - - item->fType = flags & TYPE_MASK; - /* MFS_DEFAULT is not accepted. MF_HILITE is not listed as a valid flag - for ModifyMenu, but Windows accepts it */ - item->fState = flags & MENUITEMINFO_STATE_MASK & ~MFS_DEFAULT; - - /* Don't call SetRectEmpty here! */ - - debug_print_menuitem("MENU_SetItemData to : ", item, ""); - return TRUE; -} - - -/********************************************************************** * MENU_InsertItem * * Insert (allocate) a new item into a menu. @@ -3826,6 +3742,49 @@ UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos ) } +/********************************************************************** + * MENU_mnu2mnuii + * + * Uses flags, id and text ptr, passed by InsertMenu() and + * ModifyMenu() to setup a MenuItemInfo structure. + */ +static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, + LPMENUITEMINFOW pmii) +{ + ZeroMemory( pmii, sizeof( MENUITEMINFOW)); + pmii->cbSize = sizeof( MENUITEMINFOW); + pmii->fMask = MIIM_STATE | MIIM_ID | MIIM_FTYPE; + /* setting bitmap clears text and vice versa */ + if( IS_STRING_ITEM(flags)) { + pmii->fMask |= MIIM_STRING | MIIM_BITMAP; + if( !str) + flags |= MF_SEPARATOR; + /* Item beginning with a backspace is a help item */ + /* FIXME: wrong place, this is only true in win16 */ + else if( *str == '\b') { + flags |= MF_HELP; + str++; + } + pmii->dwTypeData = (LPWSTR)str; + } else if( flags & MFT_BITMAP){ + pmii->fMask |= MIIM_BITMAP | MIIM_STRING; + pmii->hbmpItem = HBITMAP_32(LOWORD(str)); + } + if( flags & MF_OWNERDRAW){ + pmii->fMask |= MIIM_DATA; + pmii->dwItemData = (ULONG_PTR) str; + } + if( flags & MF_POPUP) { + pmii->fMask |= MIIM_SUBMENU; + pmii->hSubMenu = (HMENU)id; + } + if( flags & MF_SEPARATOR) flags |= MF_GRAYED | MF_DISABLED; + pmii->fState = flags & MENUITEMINFO_STATE_MASK & ~MFS_DEFAULT; + pmii->fType = flags & MENUITEMINFO_TYPE_MASK; + pmii->wID = (UINT)id; +} + + /******************************************************************* * InsertMenuW (USER32.@) */ @@ -3833,6 +3792,7 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { MENUITEM *item; + MENUITEMINFOW mii; if (IS_STRING_ITEM(flags) && str) TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %s\n", @@ -3841,8 +3801,8 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, hMenu, pos, flags, id, str ); if (!(item = MENU_InsertItem( hMenu, pos, flags ))) return FALSE; - - if (!(MENU_SetItemData( item, flags, id, str ))) + MENU_mnu2mnuii( flags, id, str, &mii); + if (!(SetMenuItemInfo_common( item, &mii, TRUE))) { RemoveMenu( hMenu, pos, flags ); return FALSE; @@ -3954,6 +3914,7 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { MENUITEM *item; + MENUITEMINFOW mii; if (IS_STRING_ITEM(flags)) TRACE("%p %d %04x %04lx %s\n", hMenu, pos, flags, id, debugstr_w(str) ); @@ -3962,7 +3923,8 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, if (!(item = MENU_FindItem( &hMenu, &pos, flags ))) return FALSE; MENU_GetMenu(hMenu)->Height = 0; /* force size recalculate */ - return MENU_SetItemData( item, flags, id, str ); + MENU_mnu2mnuii( flags, id, str, &mii); + return SetMenuItemInfo_common( item, &mii, TRUE); }

1 0

Rein Klazes : user32: When setting a menu item, handle MIIM_TYPE flag by setting approriate MIIM_BITMAP, MIIM_FTYPE and MIIM_STRING flags.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 95551710444cf31ddc1d7aed62edc48b5fa79b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95551710444cf31ddc1d7aed6… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 23 07:56:07 2009 +0200 user32: When setting a menu item, handle MIIM_TYPE flag by setting approriate MIIM_BITMAP, MIIM_FTYPE and MIIM_STRING flags. --- dlls/user32/menu.c | 47 ++++++++++++++++++++++------------------------- 1 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6d81e69..64e536b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4666,6 +4666,9 @@ static inline void set_menu_item_text( MENUITEM *menu, LPCWSTR text, BOOL unicod /********************************************************************** * SetMenuItemInfo_common + * + * Note: does not support the MIIM_TYPE flag. Use the MIIM_FTYPE, + * MIIM_BITMAP and MIIM_STRING flags instead. */ static BOOL SetMenuItemInfo_common(MENUITEM * menu, @@ -4676,30 +4679,7 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, debug_print_menuitem("SetMenuItemInfo_common from: ", menu, ""); - if (lpmii->fMask & MIIM_TYPE ) { - if( lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) { - WARN("invalid combination of fMask bits used\n"); - /* this does not happen on Win9x/ME */ - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Remove the old type bits and replace them with the new ones */ - menu->fType &= ~MENUITEMINFO_TYPE_MASK; - menu->fType |= lpmii->fType & MENUITEMINFO_TYPE_MASK; - - if (IS_STRING_ITEM(menu->fType)) { - HeapFree(GetProcessHeap(), 0, menu->text); - set_menu_item_text( menu, lpmii->dwTypeData, unicode ); - } else if( (menu->fType) & MFT_BITMAP) - menu->hbmpItem = HBITMAP_32(LOWORD(lpmii->dwTypeData)); - } - if (lpmii->fMask & MIIM_FTYPE ) { - if(( lpmii->fType & MFT_BITMAP)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } menu->fType &= ~MENUITEMINFO_TYPE_MASK; menu->fType |= lpmii->fType & MENUITEMINFO_TYPE_MASK; } @@ -4710,11 +4690,9 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, } if (lpmii->fMask & MIIM_STATE) - { /* Other menu items having MFS_DEFAULT are not converted to normal items */ menu->fState = lpmii->fState & MENUITEMINFO_STATE_MASK; - } if (lpmii->fMask & MIIM_ID) menu->wID = lpmii->wID; @@ -4776,6 +4754,25 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, pmii_out->cbSize = sizeof( MENUITEMINFOW); pmii_out->hbmpItem = NULL; } + /* test for invalid bit combinations */ + if( (pmii_out->fMask & MIIM_TYPE && + pmii_out->fMask & (MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) || + (pmii_out->fMask & MIIM_FTYPE && pmii_out->fType & MFT_BITMAP)) { + WARN("invalid combination of fMask bits used\n"); + /* this does not happen on Win9x/ME */ + SetLastError( ERROR_INVALID_PARAMETER); + return FALSE; + } + /* convert old style (MIIM_TYPE) to the new */ + if( pmii_out->fMask & MIIM_TYPE){ + pmii_out->fMask |= MIIM_FTYPE; + if( IS_STRING_ITEM(pmii_out->fType)){ + pmii_out->fMask |= MIIM_STRING; + } else if( (pmii_out->fType) & MFT_BITMAP){ + pmii_out->fMask |= MIIM_BITMAP; + pmii_out->hbmpItem = HBITMAP_32(LOWORD(pmii_out->dwTypeData)); + } + } return TRUE; }

1 0

Rein Klazes : user32: Put some repeated code for checking and extending of a MENUITEMINFO structure in a separate function .
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: e9f4c6bb02c4360333b1957311ef2d77a7a75f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f4c6bb02c4360333b195731… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 23 12:32:30 2009 +0200 user32: Put some repeated code for checking and extending of a MENUITEMINFO structure in a separate function. --- dlls/user32/menu.c | 78 ++++++++++++++++++++++----------------------------- 1 files changed, 34 insertions(+), 44 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e35372b..6d81e69 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4755,27 +4755,44 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, } /********************************************************************** + * MENU_NormalizeMenuItemInfoStruct + * + * Helper for SetMenuItemInfo and InsertMenuItemInfo: + * check, copy and extend the MENUITEMINFO struct from the version that the application + * supplied to the version used by wine source. */ +static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, + MENUITEMINFOW *pmii_out ) +{ + /* do we recognize the size? */ + if( pmii_in->cbSize != sizeof( MENUITEMINFOW) && + pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) { + SetLastError( ERROR_INVALID_PARAMETER); + return FALSE; + } + /* copy the fields that we have */ + memcpy( pmii_out, pmii_in, pmii_in->cbSize); + /* if the hbmpItem member is missing then extend */ + if( pmii_in->cbSize != sizeof( MENUITEMINFOW)) { + pmii_out->cbSize = sizeof( MENUITEMINFOW); + pmii_out->hbmpItem = NULL; + } + return TRUE; +} + +/********************************************************************** * SetMenuItemInfoA (USER32.@) */ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) { - MENUITEMINFOA mii; + MENUITEMINFOW mii; TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); - if( lpmii->cbSize != sizeof( mii) && - lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - memcpy( &mii, lpmii, lpmii->cbSize); - if( lpmii->cbSize != sizeof( mii)) { - mii.cbSize = sizeof( mii); - mii.hbmpItem = NULL; - } + if (!MENU_NormalizeMenuItemInfoStruct( (MENUITEMINFOW *)lpmii, &mii )) return FALSE; + return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0), - (const MENUITEMINFOW *)&mii, FALSE); + &mii, FALSE); } /********************************************************************** @@ -4788,16 +4805,7 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); - if( lpmii->cbSize != sizeof( mii) && - lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - memcpy( &mii, lpmii, lpmii->cbSize); - if( lpmii->cbSize != sizeof( mii)) { - mii.cbSize = sizeof( mii); - mii.hbmpItem = NULL; - } + if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0), &mii, TRUE); } @@ -4900,23 +4908,14 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOA *lpmii) { MENUITEM *item; - MENUITEMINFOA mii; + MENUITEMINFOW mii; TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); - if( lpmii->cbSize != sizeof( mii) && - lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - memcpy( &mii, lpmii, lpmii->cbSize); - if( lpmii->cbSize != sizeof( mii)) { - mii.cbSize = sizeof( mii); - mii.hbmpItem = NULL; - } + if (!MENU_NormalizeMenuItemInfoStruct( (MENUITEMINFOW *)lpmii, &mii )) return FALSE; item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); - return SetMenuItemInfo_common(item, (const MENUITEMINFOW *)&mii, FALSE); + return SetMenuItemInfo_common(item, &mii, FALSE); } @@ -4931,16 +4930,7 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); - if( lpmii->cbSize != sizeof( mii) && - lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - memcpy( &mii, lpmii, lpmii->cbSize); - if( lpmii->cbSize != sizeof( mii)) { - mii.cbSize = sizeof( mii); - mii.hbmpItem = NULL; - } + if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); return SetMenuItemInfo_common(item, &mii, TRUE);

1 0

Jacek Caban : mshtml: Added VT_UINT handling to debugstr_variant.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 57f23b875c630a30d8554d13df387e2cae29d641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f23b875c630a30d8554d13d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 15:25:38 2009 +0200 mshtml: Added VT_UINT handling to debugstr_variant. --- dlls/mshtml/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 3057276..548c50c 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -433,6 +433,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); case VT_BOOL: return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + case VT_UINT: + return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0

Huw Davies : include: Add crtrow.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 8d8bef944d88abe7e010be637af1565f941af90f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8bef944d88abe7e010be637… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 23 11:53:34 2009 +0100 include: Add crtrow.idl. --- include/Makefile.in | 1 + include/crtrow.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 4 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 603de27..aee348f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -121,6 +121,7 @@ SRCDIR_INCLUDES = \ corerror.h \ corhdr.h \ cpl.h \ + crtrow.idl \ cryptdlg.h \ cryptuiapi.h \ custcntl.h \ diff --git a/include/crtrow.idl b/include/crtrow.idl new file mode 100644 index 0000000..da26a72 --- /dev/null +++ b/include/crtrow.idl @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * 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 + */ + +[ + object, + uuid(0c733ab2-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICreateRow : IUnknown +{ + [local] + HRESULT CreateRow([in, unique] IUnknown *pUnkOuter, + [in] LPCOLESTR pwszURL, + [in] DBBINDURLFLAG dwBindURLFlags, + [in] REFGUID rguid, + [in] REFIID riid, + [in, unique] IAuthenticate *pAuthenticate, + [in, out, unique] DBIMPLICITSESSION *pImplSession, + [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, + [out, /*annotation("__deref_opt_out_opt")*/] LPOLESTR *ppwszNewURL, + [out, iid_is(riid)] IUnknown **ppUnk); + + [call_as(CreateRow)] + HRESULT RemoteCreateRow([in] IUnknown *pUnkOuter, + [in] LPCOLESTR pwszURL, + [in] DBBINDURLFLAG dwBindURLFlags, + [in] REFGUID rguid, + [in] REFIID riid, + [in] IAuthenticate *pAuthenticate, + [in] IUnknown *pSessionUnkOuter, + [in, unique] IID *piid, + [in, out, unique, iid_is(piid)] IUnknown **ppSession, + [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, + [in, out, unique] LPOLESTR *ppwszNewURL, + [out, iid_is(riid)] IUnknown **ppUnk); +} diff --git a/include/oledb.idl b/include/oledb.idl index 5cb5c0e..31e2111 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -35,3 +35,4 @@ typedef ULONG DBCOUNTITEM; #include "sesprp.idl" #include "opnrst.idl" #include "binres.idl" +#include "crtrow.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 775de81..fb15697 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -110,6 +110,7 @@ my %private_idl_headers = ( "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1, + "crtrow.idl" => 1, "dbccmd.idl" => 1, "dbcses.idl" => 1, "dbdsad.idl" => 1,

1 0

Huw Davies : include: Add binres.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: d328e9a14ac86dfe09261535dfa9def115aefd75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d328e9a14ac86dfe09261535d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 17:18:50 2009 +0100 include: Add binres.idl. --- include/Makefile.in | 1 + include/binres.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ include/dbs.idl | 10 ++++++++++ include/oledb.idl | 2 ++ tools/make_makefiles | 1 + 5 files changed, 63 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 8cc4fb8..603de27 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -106,6 +106,7 @@ SRCDIR_INCLUDES = \ basetsd.h \ basetyps.h \ bcrypt.h \ + binres.idl \ bitsmsg.h \ cderr.h \ cfgmgr32.h \ diff --git a/include/binres.idl b/include/binres.idl new file mode 100644 index 0000000..3797c02 --- /dev/null +++ b/include/binres.idl @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * 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 + */ + +[ + object, + uuid(0c733ab1-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IBindResource : IUnknown +{ + [local] + HRESULT Bind([in] IUnknown *pUnkOuter, + [in] LPCOLESTR pwszURL, + [in] DBBINDURLFLAG dwBindURLFlags, + [in] REFGUID rguid, + [in] REFIID riid, + [in] IAuthenticate *pAuthenticate, + [in, out, unique] DBIMPLICITSESSION *pImplSession, + [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, + [out, iid_is(riid)] IUnknown **ppUnk); + + [call_as(Bind)] + HRESULT RemoteBind([in] IUnknown *pUnkOuter, + [in] LPCOLESTR pwszURL, + [in] DBBINDURLFLAG dwBindURLFlags, + [in] REFGUID rguid, + [in] REFIID riid, + [in] IAuthenticate *pAuthenticate, + [in] IUnknown *pSessionUnkOuter, + [in, unique] IID *piid, + [in, out, unique, iid_is(piid)] IUnknown **ppSession, + [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, + [out, iid_is(riid)] IUnknown **ppUnk); +} diff --git a/include/dbs.idl b/include/dbs.idl index 19c2997..9909c9d 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -99,3 +99,13 @@ typedef struct tagDBPROPINFOSET { ULONG cPropertyInfos; GUID guidPropertySet; } DBPROPINFOSET; + +typedef DWORD DBBINDURLFLAG; +typedef DWORD DBBINDURLSTATUS; + +typedef struct tagDBIMPLICITSESSION +{ + IUnknown *pUnkOuter; + IID *piid; + IUnknown *pSession; +} DBIMPLICITSESSION; diff --git a/include/oledb.idl b/include/oledb.idl index 181b00a..5cb5c0e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -20,6 +20,7 @@ import "wtypes.idl"; import "oaidl.idl"; import "ocidl.idl"; import "propidl.idl"; +import "urlmon.idl"; typedef ULONG DBBYTEOFFSET; typedef ULONG DBCOUNTITEM; @@ -33,3 +34,4 @@ typedef ULONG DBCOUNTITEM; #include "dbdsad.idl" #include "sesprp.idl" #include "opnrst.idl" +#include "binres.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 075916f..775de81 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -109,6 +109,7 @@ my %exported_wine_headers = ( my %private_idl_headers = ( "axcore.idl" => 1, "axextend.idl" => 1, + "binres.idl" => 1, "dbccmd.idl" => 1, "dbcses.idl" => 1, "dbdsad.idl" => 1,

1 0

Huw Davies : include: Add a missing parameter and fix a few attributes.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: c04275d75395848e43b765d65dd1ecb7511fe96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04275d75395848e43b765d65… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 16:42:27 2009 +0100 include: Add a missing parameter and fix a few attributes. --- include/dbprop.idl | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/dbprop.idl b/include/dbprop.idl index 5ed5301..088cf8c 100644 --- a/include/dbprop.idl +++ b/include/dbprop.idl @@ -30,7 +30,7 @@ interface IDBProperties : IUnknown { [call_as(GetProperties)] HRESULT RemoteGetProperties( [in] ULONG cPropertyIDSets, - [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], [in, out] ULONG *pcPropertySets, [out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets, [out] IErrorInfo **ppErrorInfoRem); @@ -39,17 +39,18 @@ interface IDBProperties : IUnknown { [in] ULONG cPropertyIDSets, [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], [in, out] ULONG *pcPropertyInfoSets, - [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets); + [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, + [out, /*annotation("__deref_out_z_opt")*/] OLECHAR **ppDescBuffer); [call_as(GetPropertyInfo)] HRESULT RemoteGetPropertyInfo( [in] ULONG cPropertyIDSets, - [in,size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, [in, out] ULONG *pcPropertyInfoSets, [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, [in, out] ULONG *pcOffsets, [out, size_is(,*pcOffsets)] DBBYTEOFFSET **prgDescOffsets, [in, out] ULONG *pcbDescBuffer, - [out, size_is(,*pcbDescBuffer)] OLECHAR **ppDescBuffer, + [in, out, unique, size_is(,*pcbDescBuffer)] OLECHAR **ppDescBuffer, [out] IErrorInfo **ppErrorInfoRem); [local] HRESULT SetProperties( @@ -58,7 +59,7 @@ interface IDBProperties : IUnknown { [call_as(SetProperties)] HRESULT RemoteSetProperties( [in] ULONG cPropertySets, - [in, out, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [in, unique, size_is(cPropertySets)] DBPROPSET *rgPropertySets, [in] ULONG cTotalProps, [out, size_is(cTotalProps)] DBPROPSTATUS *rgPropStatus, [out] IErrorInfo **ppErrorInfoRem);

1 0

Huw Davies : include: Add sesprp.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: f80c419585928ebf946ceffa417594204f69d6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80c419585928ebf946ceffa4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 16:33:17 2009 +0100 include: Add sesprp.idl. --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/sesprp.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c3c8cb0..8cc4fb8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -401,6 +401,7 @@ SRCDIR_INCLUDES = \ secext.h \ security.h \ sensapi.h \ + sesprp.idl \ setupapi.h \ sfc.h \ shdispid.h \ diff --git a/include/oledb.idl b/include/oledb.idl index c415d3a..181b00a 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -31,4 +31,5 @@ typedef ULONG DBCOUNTITEM; #include "dbprop.idl" #include "dbinit.idl" #include "dbdsad.idl" +#include "sesprp.idl" #include "opnrst.idl" diff --git a/include/sesprp.idl b/include/sesprp.idl new file mode 100644 index 0000000..11e6391 --- /dev/null +++ b/include/sesprp.idl @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * 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 + */ + +[ + object, + uuid(0c733a85-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ISessionProperties : IUnknown +{ + [local] + HRESULT GetProperties([in] ULONG cPropertyIDSets, + [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, out] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets)] const DBPROPSET **prgPropertySets); + + [call_as(GetProperties)] + HRESULT RemoteGetProperties([in] ULONG cPropertyIDSets, + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, out] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets)] const DBPROPSET **prgPropertySets, + [out] IErrorInfo **ppErrorInfoRem); + + + [local] + HRESULT SetProperties([in] ULONG cPropertySets, + [in, out, unique, size_is(cPropertySets)] DBPROPSET rgPropertySets[]); + + [call_as(SetProperties)] + HRESULT RemoteSetProperties([in] ULONG cPropertySets, + [in, unique, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [in] ULONG cTotalProps, + [out, size_is(cTotalProps)] DBPROPSTATUS *rgPropStatus, + [out] IErrorInfo **ppErrorInfoRem); + +} diff --git a/tools/make_makefiles b/tools/make_makefiles index ee4bdf6..075916f 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -118,6 +118,7 @@ my %private_idl_headers = ( "devenum.idl" => 1, "dyngraph.idl" => 1, "opnrst.idl" => 1, + "sesprp.idl" => 1, "vmrender.idl" => 1, "wine/wined3d.idl" => 1, "wine/winedxgi.idl" => 1,

1 0

Huw Davies : include: Add dbdsad.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 50c43ed868316a31e56658f72ed447a5b6119b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c43ed868316a31e56658f72… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 15:49:06 2009 +0100 include: Add dbdsad.idl. --- include/Makefile.in | 1 + include/dbdsad.idl | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 2 + tools/make_makefiles | 1 + 4 files changed, 79 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 716cec3..c3c8cb0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -150,6 +150,7 @@ SRCDIR_INCLUDES = \ d3dx9tex.h \ dbccmd.idl \ dbcses.idl \ + dbdsad.idl \ dbghelp.h \ dbinit.idl \ dbprop.idl \ diff --git a/include/dbdsad.idl b/include/dbdsad.idl new file mode 100644 index 0000000..1fb8c9f --- /dev/null +++ b/include/dbdsad.idl @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * 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 + */ + +[ + object, + uuid(0c733a7a-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBDataSourceAdmin : IUnknown +{ + [local] + HRESULT CreateDataSource([in] ULONG cPropertySets, + [in, out, size_is(cPropertySets)] DBPROPSET rgPropertySets[], + [in] IUnknown *pUnkOuter, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppDBSession); + + [call_as(CreateDataSource)] + HRESULT RemoteCreateDataSource([in] ULONG cPropertySets, + [in, unique, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [in] IUnknown *pUnkOuter, + [in] REFIID riid, + [in, out, unique, iid_is(riid)] IUnknown **ppDBSession, + [in] ULONG cTotalProps, + [out, size_is(cTotalProps)] DBPROPSTATUS *rgPropStatus, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT DestroyDataSource(); + + [call_as(DestroyDataSource)] + HRESULT RemoteDestroyDataSource([out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetCreationProperties([in] ULONG cPropertyIDSets, + [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, out] ULONG *pcPropertyInfoSets, + [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, + [out, /*annotation("__deref_out_z_opt")*/] OLECHAR **ppDescBuffer); + + [call_as(GetCreationProperties)] + HRESULT RemoteGetCreationProperties([in] ULONG cPropertyIDSets, + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, out] ULONG *pcPropertyInfoSets, + [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, + [in, out] DBCOUNTITEM *pcOffsets, + [out, size_is(,(ULONG)*pcOffsets)] DBBYTEOFFSET **prgDescOffsets, + [in, out] ULONG *pcbDescBuffer, + [in, out, unique, size_is(,*pcbDescBuffer)] OLECHAR **ppDescBuffer, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT ModifyDataSource([in] ULONG cPropertySets, + [in, size_is(cPropertySets)] DBPROPSET rgPropertySets[]); + + [call_as(ModifyDataSource)] + HRESULT RemoteModifyDataSource([in] ULONG cPropertySets, + [in, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/include/oledb.idl b/include/oledb.idl index a2f70d5..c415d3a 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -22,6 +22,7 @@ import "ocidl.idl"; import "propidl.idl"; typedef ULONG DBBYTEOFFSET; +typedef ULONG DBCOUNTITEM; #include "dbs.idl" @@ -29,4 +30,5 @@ typedef ULONG DBBYTEOFFSET; #include "dbcses.idl" #include "dbprop.idl" #include "dbinit.idl" +#include "dbdsad.idl" #include "opnrst.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 8f9ca56..ee4bdf6 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -111,6 +111,7 @@ my %private_idl_headers = ( "axextend.idl" => 1, "dbccmd.idl" => 1, "dbcses.idl" => 1, + "dbdsad.idl" => 1, "dbinit.idl" => 1, "dbprop.idl" => 1, "dbs.idl" => 1,

1 0