April 2008 - Wine-commits - list.winehq.org

Rob Shearman : services: Split RPC_MainLoop into initialisation and the actual loop.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 559fafebbf648925bbaab61ab61894b11c90c104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=559fafebbf648925bbaab61ab… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 11 10:59:51 2008 +0100 services: Split RPC_MainLoop into initialisation and the actual loop. --- programs/services/rpc.c | 18 +++++++++++++----- programs/services/services.c | 3 ++- programs/services/services.h | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 0adeb12..411fca7 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1333,11 +1333,10 @@ DWORD svcctl_QueryServiceConfig2W( } -DWORD RPC_MainLoop(void) +DWORD RPC_Init(void) { WCHAR transport[] = SVCCTL_TRANSPORT; WCHAR endpoint[] = SVCCTL_ENDPOINT; - HANDLE hSleepHandle; DWORD err; if ((err = RpcServerUseProtseqEpW(transport, 0, endpoint, NULL)) != ERROR_SUCCESS) @@ -1357,17 +1356,26 @@ DWORD RPC_MainLoop(void) WINE_ERR("RpcServerListen failed with error %u\n", err); return err; } + return ERROR_SUCCESS; +} + +DWORD RPC_MainLoop(void) +{ + DWORD err; + HANDLE hExitEvent = __wine_make_process_system(); - WINE_TRACE("Entered main loop\n"); - hSleepHandle = __wine_make_process_system(); SetEvent(g_hStartedEvent); + + WINE_TRACE("Entered main loop\n"); + do { - err = WaitForSingleObjectEx(hSleepHandle, INFINITE, TRUE); + err = WaitForSingleObjectEx(hExitEvent, INFINITE, TRUE); WINE_TRACE("Wait returned %d\n", err); } while (err != WAIT_OBJECT_0); WINE_TRACE("Object signaled - wine shutdown\n"); + CloseHandle(hExitEvent); return ERROR_SUCCESS; } diff --git a/programs/services/services.c b/programs/services/services.c index 01e80cc..8a88e59 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -454,7 +454,8 @@ int main(int argc, char *argv[]) return err; if ((err = scmdatabase_load_services(active_database)) != ERROR_SUCCESS) return err; - err = RPC_MainLoop(); + if ((err = RPC_Init()) == ERROR_SUCCESS) + RPC_MainLoop(); scmdatabase_destroy(active_database); return err; } diff --git a/programs/services/services.h b/programs/services/services.h index 246e1bb..1a5a4ee 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -77,6 +77,7 @@ void service_unlock(struct service_entry *service); extern HANDLE g_hStartedEvent; +DWORD RPC_Init(void); DWORD RPC_MainLoop(void); /* from utils.c */

1 0

Rob Shearman : rpcrt4: Implement I_RpcExceptionFilter.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 9a2914b11f92f1ccb3187eb782f622cbba1e6726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2914b11f92f1ccb3187eb78… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 11 10:59:34 2008 +0100 rpcrt4: Implement I_RpcExceptionFilter. --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index da54ddf..bbf5a01 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -42,7 +42,7 @@ @ stub I_RpcConnectionSetSockBuffSize @ stub I_RpcDeleteMutex @ stub I_RpcEnableWmiTrace # wxp -@ stub I_RpcExceptionFilter # wxp +@ stdcall I_RpcExceptionFilter(long) @ stdcall I_RpcFree(ptr) @ stdcall I_RpcFreeBuffer(ptr) @ stub I_RpcFreePipeBuffer diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 4438f52..02e1dcd 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -937,6 +937,22 @@ LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) } /****************************************************************************** + * I_RpcExceptionFilter (rpcrt4.@) + */ +int WINAPI I_RpcExceptionFilter(ULONG ExceptionCode) +{ + TRACE("0x%x\n", ExceptionCode); + switch (ExceptionCode) + { + case EXCEPTION_ACCESS_VIOLATION: + case EXCEPTION_ILLEGAL_INSTRUCTION: + return EXCEPTION_CONTINUE_SEARCH; + default: + return EXCEPTION_EXECUTE_HANDLER; + } +} + +/****************************************************************************** * RpcErrorStartEnumeration (rpcrt4.@) */ RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(RPC_ERROR_ENUM_HANDLE* EnumHandle)

1 0

Dmitry Timoshkov : user32: Fix Win64 warnings.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 29565d558fad4dd3be9a5826d289eceef29f2504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29565d558fad4dd3be9a5826d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 11 16:56:08 2008 +0900 user32: Fix Win64 warnings. --- dlls/user32/exticon.c | 2 +- dlls/user32/listbox.c | 2 +- dlls/user32/sysparams.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index e25e9c9..3d28f4c 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -259,7 +259,7 @@ static BOOL CALLBACK extract_icons_callback(HMODULE hModule, LPCWSTR pwszType, L LONG_PTR lParam) { struct extract_icons_state *pState = (struct extract_icons_state *)lParam; - INT idCurrent = (INT)pwszName; + INT idCurrent = LOWORD(pwszName); /* If the handle array pointer is NULL, we just count the number of icons in the module. */ if (!pState->pahIcon) { diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0b318fa..80ff0ac 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2607,7 +2607,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; if (lpcs->style & LBS_COMBOBOX) lphc = (LPHEADCOMBO)lpcs->lpCreateParams; if (!LISTBOX_Create( hwnd, lphc )) return -1; - TRACE("creating wnd=%p descr=%x\n", hwnd, GetWindowLongPtrW( hwnd, 0 ) ); + TRACE("creating hwnd %p descr %p\n", hwnd, (void *)GetWindowLongPtrW( hwnd, 0 ) ); return 0; } /* Ignore all other messages before we get a WM_CREATE */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f5555db..2fa3fee 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2110,7 +2110,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETMOUSESPEED: /* 113 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ { ret = save_int_param( SPI_SETMOUSE_REGKEY, SPI_SETMOUSE_VALNAME3, - &mouse_speed, (INT) pvParam, fWinIni); + &mouse_speed, PtrToInt(pvParam), fWinIni); break; }

1 0

Peter Urbanec : comctl32: Mousewheel support for updown control.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 287561cce53f526fbae117ab8245a778623092b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287561cce53f526fbae117ab8… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Fri Apr 11 17:19:58 2008 +1000 comctl32: Mousewheel support for updown control. --- dlls/comctl32/updown.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 74a96f6..a62e221 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -470,6 +470,28 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) } /*********************************************************************** + * UPDOWN_MouseWheel + * + * Handle mouse wheel scrolling + */ +static LRESULT UPDOWN_MouseWheel(UPDOWN_INFO *infoPtr, WPARAM wParam) +{ + int iWheelDelta = GET_WHEEL_DELTA_WPARAM(wParam) / WHEEL_DELTA; + + if (wParam & (MK_SHIFT | MK_CONTROL)) + return 0; + + if (iWheelDelta != 0) + { + UPDOWN_GetBuddyInt(infoPtr); + UPDOWN_DoAction(infoPtr, abs(iWheelDelta), iWheelDelta > 0 ? FLAG_INCR : FLAG_DECR); + } + + return 1; +} + + +/*********************************************************************** * UPDOWN_Buddy_SubclassProc used to handle messages sent to the buddy * control. */ @@ -486,6 +508,11 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) UPDOWN_KeyPressed(UPDOWN_GetInfoPtr(upDownHwnd), (int)wParam); } + else if (uMsg == WM_MOUSEWHEEL) { + HWND upDownHwnd = GetPropW(hwnd, BUDDY_UPDOWN_HWND); + + UPDOWN_MouseWheel(UPDOWN_GetInfoPtr(upDownHwnd), (int)wParam); + } return CallWindowProcW( superClassWndProc, hwnd, uMsg, wParam, lParam); } @@ -929,6 +956,10 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L UPDOWN_HandleMouseEvent (infoPtr, message, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); break; + case WM_MOUSEWHEEL: + UPDOWN_MouseWheel(infoPtr, wParam); + break; + case WM_KEYDOWN: if((infoPtr->dwStyle & UDS_ARROWKEYS) && UPDOWN_IsEnabled(infoPtr)) return UPDOWN_KeyPressed(infoPtr, (int)wParam);

1 0

Vitaliy Margolen : wininet: Properly initialize struct.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 9f82e4730b3c3f35d2901a46631fcf9381a4e2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f82e4730b3c3f35d2901a466… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Apr 10 22:59:05 2008 -0600 wininet: Properly initialize struct. --- dlls/wininet/utility.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 352b260..2597268 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -71,6 +71,7 @@ time_t ConvertTimeString(LPCWSTR asctime) tmpChar[22]='\0'; tmpChar[25]='\0'; + memset( &t, 0, sizeof(t) ); t.tm_year = atoiW(tmpChar+12) - 1900; t.tm_mday = atoiW(tmpChar+5); t.tm_hour = atoiW(tmpChar+17);

1 0

Dmitry Timoshkov : tools: Fix font structure layout for 64-bit mode.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 7ab35476a757945097d89cd0eb8c849eb685287d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab35476a757945097d89cd0e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 11 16:56:33 2008 +0900 tools: Fix font structure layout for 64-bit mode. --- tools/fnt2bdf.h | 4 ++-- tools/fnt2fon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/fnt2bdf.h b/tools/fnt2bdf.h index 3dc2590..27eafe5 100644 --- a/tools/fnt2bdf.h +++ b/tools/fnt2bdf.h @@ -30,8 +30,8 @@ enum data_types {dfChar, dfShort, dfLong, dfString}; typedef struct tagFontHeader { - short dfVersion; /* Version */ - long dfSize; /* Total File Size */ + SHORT dfVersion; /* Version */ + LONG dfSize; /* Total File Size */ char dfCopyright[60]; /* Copyright notice */ FONTINFO16 fi; /* FONTINFO structure */ } fnt_hdrS; diff --git a/tools/fnt2fon.c b/tools/fnt2fon.c index 87c5ab7..aa7d72b 100644 --- a/tools/fnt2fon.c +++ b/tools/fnt2fon.c @@ -40,8 +40,8 @@ #include "pshpack1.h" struct _fnt_header { - short dfVersion; - long dfSize; + SHORT dfVersion; + LONG dfSize; char dfCopyright[60]; FONTINFO16 fi; };

1 0

Jeremy White : include: Add a resource type for scalable font resource (. fot) files.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 40c3718d52bb743af5cbb37b86d4c3750abd9eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c3718d52bb743af5cbb37b8… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Apr 9 22:37:12 2008 -0500 include: Add a resource type for scalable font resource (.fot) files. --- include/wine/winbase16.h | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 21d8dca..83c410c 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -300,18 +300,19 @@ typedef struct */ } NE_TYPEINFO; -#define NE_RSCTYPE_CURSOR 0x8001 -#define NE_RSCTYPE_BITMAP 0x8002 -#define NE_RSCTYPE_ICON 0x8003 -#define NE_RSCTYPE_MENU 0x8004 -#define NE_RSCTYPE_DIALOG 0x8005 -#define NE_RSCTYPE_STRING 0x8006 -#define NE_RSCTYPE_FONTDIR 0x8007 -#define NE_RSCTYPE_FONT 0x8008 -#define NE_RSCTYPE_ACCELERATOR 0x8009 -#define NE_RSCTYPE_RCDATA 0x800a -#define NE_RSCTYPE_GROUP_CURSOR 0x800c -#define NE_RSCTYPE_GROUP_ICON 0x800e +#define NE_RSCTYPE_CURSOR 0x8001 +#define NE_RSCTYPE_BITMAP 0x8002 +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_MENU 0x8004 +#define NE_RSCTYPE_DIALOG 0x8005 +#define NE_RSCTYPE_STRING 0x8006 +#define NE_RSCTYPE_FONTDIR 0x8007 +#define NE_RSCTYPE_FONT 0x8008 +#define NE_RSCTYPE_ACCELERATOR 0x8009 +#define NE_RSCTYPE_RCDATA 0x800a +#define NE_RSCTYPE_GROUP_CURSOR 0x800c +#define NE_RSCTYPE_GROUP_ICON 0x800e +#define NE_RSCTYPE_SCALABLE_FONTPATH 0x80cc /* Resource found in .fot files */ #define __AHSHIFT 3 /* don't change! */

1 0

Piotr Caban : oleview: Removed memory leak in EnumImplTypes.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 3023a186b979386889b472e92f73bf484405a577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3023a186b979386889b472e92… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 01:11:03 2008 +0200 oleview: Removed memory leak in EnumImplTypes. --- programs/oleview/typelib.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 96e7574..7215980 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -744,8 +744,16 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent if(FAILED(ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo))) continue; if(FAILED(ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, - NULL, NULL, NULL))) continue; - if(FAILED(ITypeInfo_GetTypeAttr(pRefTypeInfo, &pTypeAttr))) continue; + NULL, NULL, NULL))) + { + ITypeInfo_Release(pRefTypeInfo); + continue; + } + if(FAILED(ITypeInfo_GetTypeAttr(pRefTypeInfo, &pTypeAttr))) + { + ITypeInfo_Release(pRefTypeInfo); + continue; + } U(tvis).item.cchTextMax = SysStringLen(bstrName); U(tvis).item.pszText = bstrName;

1 0

Piotr Caban : oleview: CreateCoclassHeader partially implemented.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: aad4547d953bd5dd4f8424c11c3d402f9fc7a657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad4547d953bd5dd4f8424c11… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 01:11:45 2008 +0200 oleview: CreateCoclassHeader partially implemented. --- programs/oleview/main.h | 1 + programs/oleview/typelib.c | 60 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index c196883..a6f199a 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -37,6 +37,7 @@ #define MAX_WINDOW_WIDTH 30000 #define MIN_FUNC_ID 0x60000000 #define MIN_VAR_ID 0x40000000 +#define TAB_SIZE 4 #define STATUS_WINDOW 2000 #define TREE_WINDOW 2001 diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 7215980..626abea 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -634,7 +634,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen if(pFuncDesc->cParams != 1) { AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, 4); + AddSpaces(tld, TAB_SIZE); } bFirst = TRUE; #define ENUM_PARAM_FLAG(x)\ @@ -808,7 +808,7 @@ static void EnumCoclassImplTypes(ITypeInfo *pTypeInfo, continue; } - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); ITypeInfo_GetImplTypeFlags(pTypeInfo, i, &flags); bFirst = TRUE; #define ENUM_IMPLTYPEFLAG(x)\ @@ -943,12 +943,12 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz AddToTLDataStrW(pTLData, wszNewLine); if(pTypeAttr->typekind != TKIND_DISPATCH) { - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszOdl); AddToTLDataStrW(pTLData, wszComa); AddToTLDataStrW(pTLData, wszNewLine); } - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszUUID); AddToTLDataStrW(pTLData, wszOpenBrackets2); StringFromGUID2(&(pTypeAttr->guid), wszGuid, MAX_LOAD_STRING); @@ -959,7 +959,7 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz { AddToTLDataStrW(pTLData, wszComa); AddToTLDataStrW(pTLData, wszNewLine); - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszHelpstring); AddToTLDataStrW(pTLData, wszOpenBrackets2); AddToTLDataStrW(pTLData, wszInvertedComa); @@ -971,7 +971,7 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz { AddToTLDataStrW(pTLData, wszComa); AddToTLDataStrW(pTLData, wszNewLine); - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszHelpcontext); AddToTLDataStrW(pTLData, wszOpenBrackets2); wsprintfW(wszHelpContext, wszFormat, ulHelpContext); @@ -985,7 +985,7 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz {\ AddToTLDataStrW(pTLData, wszComa);\ AddToTLDataStrW(pTLData, wszNewLine);\ - AddSpaces(pTLData, 4);\ + AddSpaces(pTLData, TAB_SIZE);\ AddToTLDataStrW(pTLData, wsz##x);\ } ENUM_FLAGS(TYPEFLAG_FAPPOBJECT); @@ -1078,9 +1078,49 @@ static void CreateTypedefHeader(ITypeInfo *pTypeInfo, static void CreateCoclassHeader(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData) { + WCHAR wszGuid[MAX_LOAD_STRING]; + BSTR bstrHelpString; + const WCHAR wszNoncreatable[] + = { 'n','o','n','c','r','e','a','t','a','b','l','e','\0' }; + AddToTLDataStrW(pTLData, wszOpenBrackets1); AddToTLDataStrW(pTLData, wszNewLine); + AddSpaces(pTLData, TAB_SIZE); + AddToTLDataStrW(pTLData, wszUUID); + AddToTLDataStrW(pTLData, wszOpenBrackets2); + StringFromGUID2(&(pTypeAttr->guid), wszGuid, MAX_LOAD_STRING); + wszGuid[lstrlenW(wszGuid)-1] = '\0'; + AddToTLDataStrW(pTLData, &wszGuid[1]); + AddToTLDataStrW(pTLData, wszCloseBrackets2); + + if(SUCCEEDED(ITypeInfo_GetDocumentation(pTypeInfo, MEMBERID_NIL, NULL, + &bstrHelpString, NULL, NULL))) + { + if(SysStringLen(bstrHelpString)) + { + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszNewLine); + AddSpaces(pTLData, TAB_SIZE); + AddToTLDataStrW(pTLData, wszHelpstring); + AddToTLDataStrW(pTLData, wszOpenBrackets1); + AddToTLDataStrW(pTLData, wszInvertedComa); + AddToTLDataStrW(pTLData, bstrHelpString); + AddToTLDataStrW(pTLData, wszInvertedComa); + AddToTLDataStrW(pTLData, wszCloseBrackets1); + } + SysFreeString(bstrHelpString); + } + + if(!(pTypeAttr->wTypeFlags & TYPEFLAG_FCANCREATE)) + { + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszNewLine); + AddSpaces(pTLData, TAB_SIZE); + AddToTLDataStrW(pTLData, wszNoncreatable); + } + + AddToTLDataStrW(pTLData, wszNewLine); AddToTLDataStrW(pTLData, wszCloseBrackets1); AddToTLDataStrW(pTLData, wszNewLine); } @@ -1165,7 +1205,7 @@ static int PopulateTree(void) AddToTLDataStrW(tld, wszNewLine); AddToTLDataStrW(tld, wszOpenBrackets1); AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, 4); + AddSpaces(tld, TAB_SIZE); AddToTLDataStrW(tld, wszUUID); AddToTLDataStrW(tld, wszOpenBrackets2); StringFromGUID2(&(pTLibAttr->guid), wszText, MAX_LOAD_STRING); @@ -1174,12 +1214,12 @@ static int PopulateTree(void) AddToTLDataStrW(tld, wszCloseBrackets2); AddToTLDataStrW(tld, wszComa); AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, 4); + AddSpaces(tld, TAB_SIZE); wsprintfW(wszText, wszFormat2, pTLibAttr->wMajorVerNum, pTLibAttr->wMinorVerNum); AddToTLDataStrW(tld, wszText); AddToTLDataStrW(tld, wszComa); AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, 4); + AddSpaces(tld, TAB_SIZE); AddToTLDataStrW(tld, wszHelpstring); AddToTLDataStrW(tld, wszOpenBrackets2); AddToTLDataStrW(tld, wszInvertedComa);

1 0

Piotr Caban : oleview: Added coclass handling base.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: cdc3ee70b3a69b5d24fb6671ed98fb4a48cc0da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc3ee70b3a69b5d24fb6671e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 01:10:27 2008 +0200 oleview: Added coclass handling base. --- programs/oleview/typelib.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 922fa11..96e7574 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -763,6 +763,84 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent return 0; } +static void EnumCoclassImplTypes(ITypeInfo *pTypeInfo, + int cImplTypes, TYPELIB_DATA *pTLData) +{ + int i; + ITypeInfo *pRefTypeInfo; + HREFTYPE hRefType; + TYPEATTR *pTypeAttr; + BSTR bstrName; + BOOL bFirst; + INT flags; + const WCHAR wszTKIND_INTERFACE[] = { 'i','n','t','e','r','f','a','c','e',' ','\0' }; + const WCHAR wszTKIND_DISPATCH[] + = { 'd','i','s','p','i','n','t','e','r','f','a','c','e',' ','\0' }; + const WCHAR wszIMPLTYPEFLAG_FDEFAULT[] + = { 'd','e','f','a','u','l','t','\0' }; + const WCHAR wszIMPLTYPEFLAG_FSOURCE[] + = { 's','o','u','r','c','e','\0' }; + const WCHAR wszIMPLTYPEFLAG_FRESTRICTED[] + = { 'r','e','s','t','r','i','c','t','e','d','\0' }; + + for(i=0; i<cImplTypes; i++) + { + if(FAILED(ITypeInfo_GetRefTypeOfImplType(pTypeInfo, i, &hRefType))) continue; + if(FAILED(ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo))) + continue; + if(FAILED(ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, + NULL, NULL, NULL))) + { + ITypeInfo_Release(pRefTypeInfo); + continue; + } + if(FAILED(ITypeInfo_GetTypeAttr(pRefTypeInfo, &pTypeAttr))) + { + ITypeInfo_Release(pRefTypeInfo); + continue; + } + + AddSpaces(pTLData, 4); + ITypeInfo_GetImplTypeFlags(pTypeInfo, i, &flags); + bFirst = TRUE; +#define ENUM_IMPLTYPEFLAG(x)\ + if(flags & x) \ + {\ + if(bFirst) AddToTLDataStrW(pTLData,\ + wszOpenBrackets1);\ + else\ + {\ + AddToTLDataStrW(pTLData, wszComa);\ + AddToTLDataStrW(pTLData, wszSpace);\ + }\ + bFirst = FALSE;\ + AddToTLDataStrW(pTLData, wsz##x);\ + } + ENUM_IMPLTYPEFLAG(IMPLTYPEFLAG_FDEFAULT); + ENUM_IMPLTYPEFLAG(IMPLTYPEFLAG_FSOURCE); + ENUM_IMPLTYPEFLAG(IMPLTYPEFLAG_FRESTRICTED); + if(!bFirst) + { + AddToTLDataStrW(pTLData, wszCloseBrackets1); + AddToTLDataStrW(pTLData, wszSpace); + } + + if(pTypeAttr->typekind == TKIND_INTERFACE) + AddToTLDataStrW(pTLData, wszTKIND_INTERFACE); + else if(pTypeAttr->typekind == TKIND_DISPATCH) + AddToTLDataStrW(pTLData, wszTKIND_DISPATCH); + AddToTLDataStrW(pTLData, wszSpace); + + AddToTLDataStrW(pTLData, bstrName); + AddToTLDataStrW(pTLData, wszSemicolon); + AddToTLDataStrW(pTLData, wszNewLine); + + SysFreeString(bstrName); + ITypeInfo_ReleaseTypeAttr(pRefTypeInfo, pTypeAttr); + ITypeInfo_Release(pRefTypeInfo); + } +} + static void AddIdlData(HTREEITEM hCur, TYPELIB_DATA *pTLData) { TVITEM tvi; @@ -989,6 +1067,16 @@ static void CreateTypedefHeader(ITypeInfo *pTypeInfo, } } +static void CreateCoclassHeader(ITypeInfo *pTypeInfo, + TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData) +{ + AddToTLDataStrW(pTLData, wszOpenBrackets1); + AddToTLDataStrW(pTLData, wszNewLine); + + AddToTLDataStrW(pTLData, wszCloseBrackets1); + AddToTLDataStrW(pTLData, wszNewLine); +} + static int PopulateTree(void) { TVINSERTSTRUCT tvis; @@ -1175,6 +1263,23 @@ static int PopulateTree(void) case TKIND_COCLASS: AddToStrW(wszText, wszTKIND_COCLASS); AddToStrW(wszText, bstrName); + + CreateCoclassHeader(pTypeInfo, pTypeAttr, tld); + AddToTLDataStrW(tld, wszTKIND_COCLASS); + AddToTLDataStrW(tld, bstrName); + AddToTLDataStrW(tld, wszSpace); + AddToTLDataStrW(tld, wszOpenBrackets3); + AddToTLDataStrW(tld, wszNewLine); + + EnumCoclassImplTypes(pTypeInfo, pTypeAttr->cImplTypes, tld); + + AddToStrW(tld->wszInsertAfter, wszCloseBrackets3); + AddToStrW(tld->wszInsertAfter, wszSemicolon); + AddToStrW(tld->wszInsertAfter, wszNewLine); + + bInsert = FALSE; + hParent = TreeView_InsertItem(typelib.hTree, &tvis); + AddToTLDataStrW(tld, tld->wszInsertAfter); break; case TKIND_UNION: AddToStrW(wszText, wszTKIND_UNION);

1 0